Merge branch 'beta'

Author: JGeek00

lib/models/domain.dart

@@ -5,6 +5,15 @@ Domain domainFromJson(String str) => Domain.fromJson(json.decode(str));
 String domainToJson(Domain data) => json.encode(data.toJson());
 
 class Domain {
+  int id;
+  int type;
+  String domain;
+  int enabled;
+  DateTime dateAdded;
+  DateTime dateModified;
+  String? comment;
+  List<int> groups;
+
   Domain({
     required this.id,
     required this.type,
@@ -16,15 +25,6 @@ class Domain {
     required this.groups,
   });
 
-  int id;
-  int type;
-  String domain;
-  int enabled;
-  DateTime dateAdded;
-  DateTime dateModified;
-  String comment;
-  List<int> groups;
-
   factory Domain.fromJson(Map<String, dynamic> json) => Domain(
     id: json["id"],
     type: json["type"],

lib/models/log.dart

@@ -3,9 +3,9 @@ class Log {
   final String type;
   final String url;
   final String device;
-  final String status;
+  final String? status;
   final String replyType;
-  final int replyTime;
+  final BigInt replyTime;
   final String? answeredBy;
 
   const Log({
@@ -43,7 +43,7 @@ class Log {
     device: data[3],
     status: data[4],
     replyType: replyTypes[int.parse(data[6])],
-    replyTime: int.parse(data[7]),
-    answeredBy: data[4] == '2' ? data[10] : null
+    replyTime: BigInt.parse(data[7]),
+    answeredBy: data[4] == '2' ? data.length >= 10 ? data[10] : null : null
   );
 }

lib/screens/domains/domain_details_screen.dart

@@ -91,12 +91,12 @@ class DomainDetailsScreen extends StatelessWidget {
           Material(
             color: Colors.transparent,
             child: InkWell(
-              onTap: domain.comment != "" 
+              onTap: domain.comment != null && domain.comment != "" 
                 ? () => {
                   showModal(
                     context: context, 
                     builder: (context) => DomainCommentModal(
-                      comment: domain.comment
+                      comment: domain.comment!
                     )
                   )
                 } : null,

lib/screens/home/clients_last_hours.dart

@@ -25,7 +25,6 @@ class ClientsLastHours extends StatelessWidget {
       gridData: FlGridData(
         show: true,
         drawVerticalLine: false,
-        horizontalInterval: (data['topPoint']/5).toDouble(),
         getDrawingHorizontalLine: (value) => FlLine(
           color: selectedTheme == ThemeMode.light
             ? Colors.black12

lib/screens/logs/log_details_screen.dart

@@ -116,10 +116,10 @@ class LogDetailsScreen extends StatelessWidget {
             label: AppLocalizations.of(context)!.time, 
             description: formatTimestamp(log.dateTime, 'HH:mm:ss'),
           ),
-          item(
+          if (log.status != null) item(
             Icons.shield_outlined, 
             AppLocalizations.of(context)!.status, 
-            LogStatus(status: log.status, showIcon: false)
+            LogStatus(status: log.status!, showIcon: false)
           ),
           if (log.status == '2' && log.answeredBy != null) CustomListTile(
             leadingIcon: Icons.domain, 
@@ -129,7 +129,7 @@ class LogDetailsScreen extends StatelessWidget {
           CustomListTile(
             leadingIcon: Icons.system_update_alt_outlined, 
             label: AppLocalizations.of(context)!.reply, 
-            description: "${log.replyType} (${(log.replyTime/10)} ms)",
+            description: "${log.replyType} (${(log.replyTime/BigInt.from(10))} ms)",
           ),
         ],
       ),

lib/screens/logs/log_tile.dart

@@ -46,7 +46,7 @@ class LogTile extends StatelessWidget {
                     child: Column(
                       crossAxisAlignment: CrossAxisAlignment.start,
                       children: [
-                        LogStatus(status: log.status, showIcon: true),
+                        if (log.status != null) LogStatus(status: log.status!, showIcon: true),
                         const SizedBox(height: 10),
                         SizedBox(
                           child: Text(
@@ -102,7 +102,7 @@ class LogTile extends StatelessWidget {
                   child: Column(
                     crossAxisAlignment: CrossAxisAlignment.start,
                     children: [
-                      LogStatus(status: log.status, showIcon: true),
+                      if (log.status != null) LogStatus(status: log.status!, showIcon: true),
                       const SizedBox(height: 10),
                       SizedBox(
                         child: Text(

lib/screens/logs/logs.dart

@@ -136,7 +136,7 @@ class _LogsState extends State<Logs> {
     List<Log> tempLogs = logs != null ? [...logs] : [...logsList];
 
     tempLogs = tempLogs.where((log) {
-      if (statusSelected.contains(int.parse(log.status))) {
+      if (log.status != null && statusSelected.contains(int.parse(log.status!))) {
         return true;
       }
       else {

lib/screens/servers/add_server_fullscreen.dart

@@ -222,9 +222,14 @@ class _AddServerFullscreenState extends State<AddServerFullscreen> {
           ));
         }
         else {
-          setState(() {
+          if (mounted) {
+            setState(() {
+              isConnecting = false;
+            });
+          }
+          else {
             isConnecting = false;
-          });
+          }
           if (result['result'] == 'socket') {
             showSnackBar(
               appConfigProvider: appConfigProvider,

lib/screens/servers/servers_tile_item.dart

@@ -115,7 +115,7 @@ class _ServersTileItemState extends State<ServersTileItem> with SingleTickerProv
       if (result['result'] == 'success') {
         await connectSuccess(result);
       }
-      else {
+      else if (mounted) {
         showSnackBar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.cannotConnect,