Merge branch 'beta'

JGeek00 · Jun 13, 2023 · c9f8c48 · c9f8c48
2 parents f5cdfc4 + d1973a5
commit c9f8c48
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/lib/models/logs.dart b/lib/models/logs.dart
@@ -80,7 +80,7 @@ class Log {
     elapsedMs: json["elapsedMs"],
     question: Question.fromJson(json["question"]),
     reason: json["reason"],
-    rules: List<Rule>.from(json["rules"].map((x) => Rule.fromJson(x))),
+    rules: json["rules"] != null ? List<Rule>.from(json["rules"].map((x) => Rule.fromJson(x))) : [],
     status: json["status"],
     time: DateTime.parse(json["time"]),
     upstream: json["upstream"],

diff --git a/lib/models/server_info.dart b/lib/models/server_info.dart
@@ -43,7 +43,7 @@ class ServerInfoData {
     dnsPort: json["dns_port"],
     httpPort: json["http_port"],
     protectionEnabled: json["protection_enabled"],
-    dhcpAvailable: json["dhcp_available"],
+    dhcpAvailable: json["dhcp_available"] ?? false,
     running: json["running"],
     version: json["version"],
     language: json["language"],

diff --git a/lib/widgets/add_server_modal.dart b/lib/widgets/add_server_modal.dart
@@ -392,7 +392,7 @@ class _AddServerModalState extends State<AddServerModal> {
             (version['data'].contains('a') || version['data'].contains('b'))  // alpha or beta
           ) {
             Navigator.pop(context);
-            widget.onUnsupportedVersion(version);
+            widget.onUnsupportedVersion(version['data']);
           }
           else {
             Navigator.pop(context);