App hangs when switching to an account that was logged into with the …

…npub just because it waits to decrypt the hidden user list.
vitorpamplona · Nov 11, 2024 · b31ace7 · b31ace7
1 parent 37a92c2
commit b31ace7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/LocalPreferences.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/LocalPreferences.kt
@@ -434,6 +434,7 @@ object LocalPreferences {
                     }.apply()
             }
         }
+        Log.d("LocalPreferences", "Saved to encrypted storage")
     }
 
     suspend fun loadCurrentAccountFromEncryptedStorage(): AccountSettings? = currentAccount()?.let { loadCurrentAccountFromEncryptedStorage(it) }

diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/Account.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/Account.kt
@@ -915,7 +915,7 @@ class Account(
     }
 
     suspend fun decryptPeopleList(event: PeopleListEvent?): PeopleListEvent.UsersAndWords {
-        if (event == null) return PeopleListEvent.UsersAndWords()
+        if (event == null || !isWriteable()) return PeopleListEvent.UsersAndWords()
 
         return tryAndWait { continuation ->
             event.publicAndPrivateUsersAndWords(signer) {
@@ -925,7 +925,7 @@ class Account(
     }
 
     suspend fun decryptMuteList(event: MuteListEvent?): PeopleListEvent.UsersAndWords {
-        if (event == null) return PeopleListEvent.UsersAndWords()
+        if (event == null || !isWriteable()) return PeopleListEvent.UsersAndWords()
 
         return tryAndWait { continuation ->
             event.publicAndPrivateUsersAndWords(signer) {