From d16a3c759e0b3b1e760c2aa3a2b3ceb66aad8e84 Mon Sep 17 00:00:00 2001
From: Juan Gilsanz Polo <juangilsanz@gmail.com>
Date: Fri, 16 Jun 2023 14:38:19 +0200
Subject: [PATCH] Bug fixes

---
 lib/models/dhcp.dart                       | 2 +-
 lib/models/dns_info.dart                   | 2 +-
 lib/screens/settings/dhcp/dhcp.dart        | 2 +-
 lib/screens/settings/dns/upstream_dns.dart | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/models/dhcp.dart b/lib/models/dhcp.dart
index 26caac0..7bba2ca 100644
--- a/lib/models/dhcp.dart
+++ b/lib/models/dhcp.dart
@@ -54,7 +54,7 @@ DhcpStatus dhcpStatusFromJson(String str) => DhcpStatus.fromJson(json.decode(str
 String dhcpStatusToJson(DhcpStatus data) => json.encode(data.toJson());
 
 class DhcpStatus {
-  String interfaceName;
+  String? interfaceName;
   IpVersion v4;
   IpVersion v6;
   List<Lease> leases;
diff --git a/lib/models/dns_info.dart b/lib/models/dns_info.dart
index d1e0107..2f23fd5 100644
--- a/lib/models/dns_info.dart
+++ b/lib/models/dns_info.dart
@@ -8,7 +8,7 @@ class DnsInfo {
   bool ednsCsEnabled;
   bool dnssecEnabled;
   bool disableIpv6;
-  String upstreamMode;
+  String? upstreamMode;
   int cacheSize;
   int cacheTtlMin;
   int cacheTtlMax;
diff --git a/lib/screens/settings/dhcp/dhcp.dart b/lib/screens/settings/dhcp/dhcp.dart
index 49ab29c..d0ab42c 100644
--- a/lib/screens/settings/dhcp/dhcp.dart
+++ b/lib/screens/settings/dhcp/dhcp.dart
@@ -58,7 +58,7 @@ class _DhcpScreenState extends State<DhcpScreen> {
       final dhcpProvider = Provider.of<DhcpProvider>(context, listen: false);
       if (dhcpProvider.dhcp != null) {
         setState(() {
-          if (dhcpProvider.dhcp!.dhcpStatus.interfaceName != '') {
+          if (dhcpProvider.dhcp!.dhcpStatus.interfaceName != null && dhcpProvider.dhcp!.dhcpStatus.interfaceName != '') {
             selectedInterface = dhcpProvider.dhcp!.networkInterfaces.firstWhere((iface) => iface.name == dhcpProvider.dhcp!.dhcpStatus.interfaceName);
             enabled = dhcpProvider.dhcp!.dhcpStatus.enabled;
             ipv4StartRangeController.text = dhcpProvider.dhcp!.dhcpStatus.v4.rangeStart;
diff --git a/lib/screens/settings/dns/upstream_dns.dart b/lib/screens/settings/dns/upstream_dns.dart
index 3041da4..a46dab7 100644
--- a/lib/screens/settings/dns/upstream_dns.dart
+++ b/lib/screens/settings/dns/upstream_dns.dart
@@ -59,7 +59,7 @@ class _UpstreamDnsScreenState extends State<UpstreamDnsScreen> {
         });
       }
     }
-    upstreamMode = dnsProvider.dnsInfo!.upstreamMode;
+    upstreamMode = dnsProvider.dnsInfo!.upstreamMode ?? "";
     validValues = true;
     super.initState();
   }