fixed secureStorage await write to avoid crash on web

frnandu · Sep 12, 2023 · a1b78e4 · a1b78e4
1 parent 4b00f5a
commit a1b78e4
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/lib/provider/setting_provider.dart b/lib/provider/setting_provider.dart
@@ -102,7 +102,7 @@ class SettingProvider extends ChangeNotifier {
     return _keyIsPrivateMap[_settingData!.privateKeyIndex.toString()] ?? false;
   }
 
-  int addAndChangeKey(String key, bool isPrivate, {bool updateUI = false}) {
+  Future<int> addAndChangeKey(String key, bool isPrivate, {bool updateUI = false}) async {
     int? findIndex;
     var entries = _keyMap.entries;
     for (var entry in entries) {
@@ -125,8 +125,8 @@ class SettingProvider extends ChangeNotifier {
 
         _settingData!.privateKeyIndex = i;
 
-        secureStorage.write(key: KEYS_MAP,value: json.encode(_keyMap));
-        secureStorage.write(key: IS_PRIVATE_MAP,value: json.encode(_keyIsPrivateMap));
+        await secureStorage.write(key: KEYS_MAP,value: json.encode(_keyMap));
+        await secureStorage.write(key: IS_PRIVATE_MAP,value: json.encode(_keyIsPrivateMap));
         saveAndNotifyListeners(updateUI: updateUI);
 
         return i;

diff --git a/lib/router/index/account_manager_component.dart b/lib/router/index/account_manager_component.dart
@@ -131,7 +131,7 @@ class AccountsState extends State<AccountsComponent> {
           }
           // logout current and login new
           var oldIndex = settingProvider.privateKeyIndex;
-          var newIndex = settingProvider.addAndChangeKey(key, !isPublic);
+          var newIndex = await settingProvider.addAndChangeKey(key, !isPublic);
           if (oldIndex != newIndex) {
             clearCurrentMemInfo();
             doLogin();

diff --git a/lib/router/login/login_router.dart b/lib/router/login/login_router.dart
@@ -137,8 +137,8 @@ class _LoginRouter extends State<LoginRouter>
     list.add(Container(
       margin: const EdgeInsets.all(Base.BASE_PADDING),
       child: InkWell(
-        onTap: () {
-          doLogin(controller.text, false, false);
+        onTap: () async {
+          await doLogin(controller.text, false, false);
         },
         child: Container(
           height: 36,
@@ -168,7 +168,7 @@ class _LoginRouter extends State<LoginRouter>
                 BotToast.showText(text: pubKey);
                 print("PUBLIC KEY: " + pubKey);
               }
-              doLogin(pubKey, true, false);
+              await doLogin(pubKey, true, false);
             } else {
               BotToast.showText(text: "Invalid public key");
             }
@@ -195,9 +195,9 @@ class _LoginRouter extends State<LoginRouter>
     list.add(Container(
       margin: const EdgeInsets.all(Base.BASE_PADDING),
       child: InkWell(
-        onTap: () {
+        onTap: () async {
           generatePK();
-          doLogin(controller.text, false, true);
+          await doLogin(controller.text, false, true);
         },
         child: Container(
           height: 40,
@@ -310,7 +310,7 @@ class _LoginRouter extends State<LoginRouter>
     );
   }
 
-  void doLogin(String key,bool pubOnly, bool newKey) {
+  Future<void> doLogin(String key,bool pubOnly, bool newKey) async {
     if (StringUtil.isBlank(key)) {
       BotToast.showText(text: I18n.of(context).Private_key_is_null);
       return;
@@ -322,7 +322,7 @@ class _LoginRouter extends State<LoginRouter>
       if (Nip19.isPubkey(key) || Nip19.isPrivateKey(key)) {
         key = Nip19.decode(key);
       }
-      settingProvider.addAndChangeKey(key, !isPublic, updateUI: false);
+      await settingProvider.addAndChangeKey(key, !isPublic, updateUI: false);
       if (!newKey) {
         var tempNostr = Nostr(privateKey: !isPublic?key:null, publicKey: isPublic?key:null);