fix address book state

Signed-off-by: fufesou <shuanglongchen@yeah.net>

flutter/lib/common/widgets/address_book.dart

@@ -30,43 +30,28 @@ class _AddressBookState extends State<AddressBook> {
   }
 
   @override
-  Widget build(BuildContext context) => Obx(() => Offstage(
+  Widget build(BuildContext context) => Obx(() {
-        offstage: stateGlobal.svcStatus.value != SvcStatus.ready,
+        if (gFFI.userModel.userName.value.isEmpty) {
-        child: FutureBuilder<Widget>(
+          return Center(
-            future: buildBody(context),
+              child: ElevatedButton(
-            builder: (context, snapshot) {
+                  onPressed: loginDialog, child: Text(translate("Login"))));
-              if (snapshot.hasData) {
+        } else {
-                return snapshot.data!;
+          if (gFFI.abModel.abLoading.value) {
-              } else {
+            return const Center(
-                return const Offstage();
+              child: CircularProgressIndicator(),
-              }
+            );
-            }),
+          }
-      ));
+          if (gFFI.abModel.abError.isNotEmpty) {
-
+            return _buildShowError(gFFI.abModel.abError.value);
-  Future<Widget> buildBody(BuildContext context) async {
+          }
-    return Obx(() {
+          if (gFFI.abModel.fromServer.isFalse) {
-      if (gFFI.userModel.userName.value.isEmpty) {
+            return Offstage();
-        return Center(
+          }
-            child: ElevatedButton(
+          return isDesktop
-                onPressed: loginDialog, child: Text(translate("Login"))));
+              ? _buildAddressBookDesktop()
-      } else {
+              : _buildAddressBookMobile();
-        if (gFFI.abModel.abLoading.value) {
-          return const Center(
-            child: CircularProgressIndicator(),
-          );
         }
-        if (gFFI.abModel.abError.isNotEmpty) {
+      });
-          return _buildShowError(gFFI.abModel.abError.value);
-        }
-        if (gFFI.abModel.fromServer.isFalse) {
-          return Offstage();
-        }
-        return isDesktop
-            ? _buildAddressBookDesktop()
-            : _buildAddressBookMobile();
-      }
-    });
-  }
 
   Widget _buildShowError(String error) {
     return Center(

flutter/lib/common/widgets/login.dart

@@ -526,9 +526,7 @@ Future<bool?> loginDialog() async {
   });
 
   if (res != null) {
-    // update ab and group status
+    await UserModel.updateOtherModels();
-    await gFFI.abModel.pullAb();
-    await gFFI.groupModel.pull();
   }
 
   return res;

flutter/lib/desktop/pages/connection_page.dart

@@ -9,6 +9,7 @@ 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';
@@ -339,7 +340,6 @@ class _ConnectionPageState extends State<ConnectionPage>
       stateGlobal.svcStatus.value = SvcStatus.ready;
       if (preStatus != SvcStatus.ready) {
         gFFI.userModel.refreshCurrentUser();
-        gFFI.groupModel.pull();
       }
     } else {
       stateGlobal.svcStatus.value = SvcStatus.notReady;
@@ -348,6 +348,9 @@ class _ConnectionPageState extends State<ConnectionPage>
       gFFI.userModel.isAdmin.value = false;
       gFFI.groupModel.reset();
     }
+    if (preStatus != stateGlobal.svcStatus.value) {
+      UserModel.updateOtherModels();
+    }
     svcIsUsingPublicServer.value = await bind.mainIsUsingPublicServer();
   }
 }

flutter/lib/models/user_model.dart

@@ -21,7 +21,7 @@ class UserModel {
   void refreshCurrentUser() async {
     final token = bind.mainGetLocalOption(key: 'access_token');
     if (token == '') {
-      await _updateOtherModels();
+      await updateOtherModels();
       return;
     }
     _updateLocalUserInfo();
@@ -53,7 +53,7 @@ class UserModel {
     } catch (e) {
       print('Failed to refreshCurrentUser: $e');
     } finally {
-      await _updateOtherModels();
+      await updateOtherModels();
     }
   }
 
@@ -86,7 +86,8 @@ class UserModel {
     isAdmin.value = user.isAdmin;
   }
 
-  Future<void> _updateOtherModels() async {
+  // update ab and group status
+  static Future<void> updateOtherModels() async {
     await gFFI.abModel.pullAb();
     await gFFI.groupModel.pull();
   }