Merge pull request #4747 from dignow/fix/mobile_connection_login_state

Fix/mobile connection login state

flutter/lib/desktop/pages/connection_page.dart

@@ -1,7 +1,6 @@
 // main window right pane
 
 import 'dart:async';
-import 'dart:convert';
 import 'dart:io';
 
 import 'package:auto_size_text/auto_size_text.dart';
@@ -9,7 +8,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_hbb/consts.dart';
 import 'package:flutter_hbb/desktop/widgets/scroll_wrapper.dart';
 import 'package:flutter_hbb/models/state_model.dart';
-import 'package:flutter_hbb/models/user_model.dart';
 import 'package:get/get.dart';
 import 'package:url_launcher/url_launcher_string.dart';
 import 'package:window_manager/window_manager.dart';
@@ -37,13 +35,12 @@ class _ConnectionPageState extends State<ConnectionPage>
   /// Nested scroll controller
   final _scrollController = ScrollController();
 
-  Timer? _updateTimer;
+  Timer? _svcStatusTimer;
 
   final RxBool _idInputFocused = false.obs;
   final FocusNode _idFocusNode = FocusNode();
 
   var svcStopped = Get.find<RxBool>(tag: 'stop-service');
-  var svcIsUsingPublicServer = true.obs;
 
   bool isWindowMinimized = false;
 
@@ -60,8 +57,8 @@ class _ConnectionPageState extends State<ConnectionPage>
         }
       }();
     }
-    _updateTimer = periodic_immediate(Duration(seconds: 1), () async {
-      updateStatus();
+    _svcStatusTimer = periodic_immediate(Duration(seconds: 1), () async {
+      stateGlobal.updateSvcStatus();
     });
     _idFocusNode.addListener(() {
       _idInputFocused.value = _idFocusNode.hasFocus;
@@ -75,7 +72,8 @@ class _ConnectionPageState extends State<ConnectionPage>
   @override
   void dispose() {
     _idController.dispose();
-    _updateTimer?.cancel();
+    _svcStatusTimer?.cancel();
+    _svcStatusTimer = null;
     windowManager.removeListener(this);
     super.dispose();
   }
@@ -288,7 +286,7 @@ class _ConnectionPageState extends State<ConnectionPage>
                 child: Offstage(
                   offstage: !(!svcStopped.value &&
                       stateGlobal.svcStatus.value == SvcStatus.ready &&
-                      svcIsUsingPublicServer.value),
+                      stateGlobal.svcIsUsingPublicServer.value),
                   child: Row(
                     crossAxisAlignment: CrossAxisAlignment.center,
                     children: [
@@ -327,31 +325,4 @@ class _ConnectionPageState extends State<ConnectionPage>
       }
     });
   }
-
-  updateStatus() async {
-    final status =
-        jsonDecode(await bind.mainGetConnectStatus()) as Map<String, dynamic>;
-    final statusNum = status['status_num'] as int;
-    final preStatus = stateGlobal.svcStatus.value;
-    if (statusNum == 0) {
-      stateGlobal.svcStatus.value = SvcStatus.connecting;
-    } else if (statusNum == -1) {
-      stateGlobal.svcStatus.value = SvcStatus.notReady;
-    } else if (statusNum == 1) {
-      stateGlobal.svcStatus.value = SvcStatus.ready;
-      if (preStatus != SvcStatus.ready) {
-        gFFI.userModel.refreshCurrentUser();
-      }
-    } else {
-      stateGlobal.svcStatus.value = SvcStatus.notReady;
-    }
-    if (stateGlobal.svcStatus.value != SvcStatus.ready) {
-      gFFI.userModel.isAdmin.value = false;
-      gFFI.groupModel.reset();
-    }
-    if (preStatus != stateGlobal.svcStatus.value) {
-      UserModel.updateOtherModels();
-    }
-    svcIsUsingPublicServer.value = await bind.mainIsUsingPublicServer();
-  }
 }

flutter/lib/main.dart

@@ -151,6 +151,7 @@ void runMobileApp() async {
   await initEnv(kAppTypeMain);
   if (isAndroid) androidChannelInit();
   platformFFI.syncAndroidServiceAppDirConfigPath();
+  gFFI.userModel.refreshCurrentUser();
   runApp(App());
 }
 

flutter/lib/mobile/pages/server_page.dart

@@ -11,6 +11,7 @@ import '../../common/widgets/dialog.dart';
 import '../../consts.dart';
 import '../../models/platform_model.dart';
 import '../../models/server_model.dart';
+import '../../models/state_model.dart';
 import 'home_page.dart';
 
 class ServerPage extends StatefulWidget implements PageShape {
@@ -200,7 +201,6 @@ class ServerInfo extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final isPermanent = model.verificationMethod == kUsePermanentPassword;
-    final serverModel = Provider.of<ServerModel>(context);
 
     const Color colorPositive = Colors.green;
     const Color colorNegative = Colors.red;
@@ -216,28 +216,29 @@ class ServerInfo extends StatelessWidget {
       showToast(translate('Copied'));
     }
 
-    Widget ConnectionStateNotification() {
-      if (serverModel.connectStatus == -1) {
-        return Row(children: [
-          const Icon(Icons.warning_amber_sharp,
-                  color: colorNegative, size: iconSize)
-              .marginOnly(right: iconMarginRight),
-          Expanded(child: Text(translate('not_ready_status')))
-        ]);
-      } else if (serverModel.connectStatus == 0) {
-        return Row(children: [
-          SizedBox(width: 20, height: 20, child: CircularProgressIndicator())
-              .marginOnly(left: 4, right: iconMarginRight),
-          Expanded(child: Text(translate('connecting_status')))
-        ]);
-      } else {
-        return Row(children: [
-          const Icon(Icons.check, color: colorPositive, size: iconSize)
-              .marginOnly(right: iconMarginRight),
-          Expanded(child: Text(translate('Ready')))
-        ]);
-      }
-    }
+    Widget ConnectionStateNotification() => Obx(() {
+          if (stateGlobal.svcStatus.value == SvcStatus.notReady) {
+            return Row(children: [
+              const Icon(Icons.warning_amber_sharp,
+                      color: colorNegative, size: iconSize)
+                  .marginOnly(right: iconMarginRight),
+              Expanded(child: Text(translate('not_ready_status')))
+            ]);
+          } else if (stateGlobal.svcStatus.value == SvcStatus.connecting) {
+            return Row(children: [
+              SizedBox(
+                      width: 20, height: 20, child: CircularProgressIndicator())
+                  .marginOnly(left: 4, right: iconMarginRight),
+              Expanded(child: Text(translate('connecting_status')))
+            ]);
+          } else {
+            return Row(children: [
+              const Icon(Icons.check, color: colorPositive, size: iconSize)
+                  .marginOnly(right: iconMarginRight),
+              Expanded(child: Text(translate('Ready')))
+            ]);
+          }
+        });
 
     return PaddingCard(
         title: translate('Your Device'),

flutter/lib/models/server_model.dart

@@ -15,7 +15,8 @@ import '../common/formatter/id_formatter.dart';
 import '../desktop/pages/server_page.dart' as desktop;
 import '../desktop/widgets/tabbar_widget.dart';
 import '../mobile/pages/server_page.dart';
-import 'model.dart';
+import './model.dart';
+import './state_model.dart';
 
 const kLoginDialogTag = "LOGIN";
 
@@ -31,7 +32,6 @@ class ServerModel with ChangeNotifier {
   bool _fileOk = false;
   bool _showElevation = false;
   bool _hideCm = false;
-  int _connectStatus = 0; // Rendezvous Server status
   String _verificationMethod = "";
   String _temporaryPasswordLength = "";
   String _approveMode = "";
@@ -61,8 +61,6 @@ class ServerModel with ChangeNotifier {
 
   bool get hideCm => _hideCm;
 
-  int get connectStatus => _connectStatus;
-
   String get verificationMethod {
     final index = [
       kUseTemporaryPassword,
@@ -120,15 +118,7 @@ class ServerModel with ChangeNotifier {
     _serverId = IDTextEditingController(text: _emptyIdShow);
 
     timerCallback() async {
-      var status = await bind.mainGetOnlineStatue();
-      if (status > 0) {
-        status = 1;
-      }
-      if (status != _connectStatus) {
-        _connectStatus = status;
-        notifyListeners();
-      }
-
+      stateGlobal.updateSvcStatus();
       if (desktopType == DesktopType.cm) {
         final res = await bind.cmCheckClientsLength(length: _clients.length);
         if (res != null) {

flutter/lib/models/state_model.dart

@@ -1,10 +1,15 @@
+import 'dart:convert';
 import 'dart:io';
+import 'dart:async';
 
 import 'package:desktop_multi_window/desktop_multi_window.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 
 import '../consts.dart';
+import '../common.dart';
+
+import './platform_model.dart';
 
 enum SvcStatus { notReady, connecting, ready }
 
@@ -18,7 +23,9 @@ class StateGlobal {
   final RxDouble _windowBorderWidth = RxDouble(kWindowBorderWidth);
   final RxBool showRemoteToolBar = false.obs;
   final RxInt displaysCount = 0.obs;
+
   final svcStatus = SvcStatus.notReady.obs;
+  final svcIsUsingPublicServer = true.obs;
 
   // Use for desktop -> remote toolbar -> resolution
   final Map<String, Map<int, String?>> _lastResolutionGroupValues = {};
@@ -84,6 +91,31 @@ class StateGlobal {
     }
   }
 
+  updateSvcStatus() async {
+    final status =
+        jsonDecode(await bind.mainGetConnectStatus()) as Map<String, dynamic>;
+    final statusNum = status['status_num'] as int;
+    final preStatus = stateGlobal.svcStatus.value;
+    if (statusNum == 0) {
+      stateGlobal.svcStatus.value = SvcStatus.connecting;
+    } else if (statusNum == -1) {
+      stateGlobal.svcStatus.value = SvcStatus.notReady;
+    } else if (statusNum == 1) {
+      stateGlobal.svcStatus.value = SvcStatus.ready;
+      if (preStatus != SvcStatus.ready) {
+        gFFI.userModel.refreshCurrentUser();
+      }
+    } else {
+      stateGlobal.svcStatus.value = SvcStatus.notReady;
+    }
+    if (stateGlobal.svcStatus.value != SvcStatus.ready) {
+      gFFI.userModel.isAdmin.value = false;
+      gFFI.groupModel.reset();
+    }
+    stateGlobal.svcIsUsingPublicServer.value =
+        await bind.mainIsUsingPublicServer();
+  }
+
   StateGlobal._();
 
   static final StateGlobal instance = StateGlobal._();