fix: ensure users are loaded in for the init check

ExpidusOS-archive · Jun 5, 2024 · 70e0451 · 70e0451
1 parent 55fd610
commit 70e0451
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 24 deletions.
diff --git a/lib/logic/account.dart b/lib/logic/account.dart
@@ -11,14 +11,18 @@ class AccountManager extends ChangeNotifier {
     channel.setMethodCallHandler((call) async {
       switch (call.method) {
         case 'loaded':
-          _sync();
+          sync().catchError((err) {
+            print(err);
+          });
           break;
         default:
           throw MissingPluginException();
       }
     });
 
-    _sync();
+    sync().catchError((err) {
+      print(err);
+    });
   }
 
   final List<Account> _accounts = [];
@@ -48,24 +52,21 @@ class AccountManager extends ChangeNotifier {
     return null;
   }
 
-  void _sync() {
-    channel.invokeListMethod('list').then((list) {
-      _accounts.clear();
-      _accounts.addAll(list!.map(
-        (account) =>
-          Account(
-            name: account['name'],
-            uid: account['uid'],
-            icon: account['icon'],
-            displayName: account['displayName'],
-            home: account['home'],
-            passwordHint: account['passwordHint'],
-          )
-      ));
-      notifyListeners();
-    }).catchError((err) {
-      print(err);
-    });
+  Future<void> sync() async {
+    final list = await channel.invokeListMethod('list');
+    _accounts.clear();
+    _accounts.addAll(list!.map(
+      (account) =>
+        Account(
+          name: account['name'],
+          uid: account['uid'],
+          icon: account['icon'],
+          displayName: account['displayName'],
+          home: account['home'],
+          passwordHint: account['passwordHint'],
+        )
+    ));
+    notifyListeners();
   }
 }
 

diff --git a/lib/main.dart b/lib/main.dart
@@ -119,12 +119,16 @@ class _GenesisShellAppState extends State<GenesisShellApp> {
     _systemManager = SystemManager();
 
     if (!widget.disableInitSetupCheck) {
-      WidgetsBinding.instance.addPostFrameCallback((_) {
+      _accountManager.sync().then((_) {
         WidgetsBinding.instance.addPostFrameCallback((_) {
-          if (_accountManager.account.isEmpty) {
-            _navKey.currentState!.pushReplacementNamed('/system/setup');
-          }
+          WidgetsBinding.instance.addPostFrameCallback((_) {
+            if (_accountManager.account.isEmpty) {
+              _navKey.currentState!.pushReplacementNamed('/system/setup');
+            }
+          });
         });
+      }).catchError((err) {
+        print(err);
       });
     }
   }