Merge branch 'beta'

This commit is contained in:
Juan Gilsanz Polo 2023-06-13 13:17:44 +02:00
commit c9f8c48bcb
3 changed files with 3 additions and 3 deletions

View file

@ -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"],

View file

@ -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"],

View file

@ -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);