highperfocused/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2025-09-28 21:43:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Reverts old migration of accounts due the fact that some people were still in the old model

Browse Source
This commit is contained in:
Vitor Pamplona
2024-06-20 16:29:48 -04:00
parent 82f99faec8
commit 9e9e0667cd
1 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/main/java/com/vitorpamplona/amethyst/LocalPreferences.kt
View File

@@ -72,6 +72,7 @@ data class AccountInfo(
private object PrefKeys { private object PrefKeys {
const val CURRENT_ACCOUNT = "currently_logged_in_account" const val CURRENT_ACCOUNT = "currently_logged_in_account"
const val SAVED_ACCOUNTS = "all_saved_accounts"
const val NOSTR_PRIVKEY = "nostr_privkey" const val NOSTR_PRIVKEY = "nostr_privkey"
const val NOSTR_PUBKEY = "nostr_pubkey" const val NOSTR_PUBKEY = "nostr_pubkey"
const val RELAYS = "relays" const val RELAYS = "relays"
@@ -140,8 +141,24 @@ object LocalPreferences {
Event.mapper.readValue<List<AccountInfo>>(it) Event.mapper.readValue<List<AccountInfo>>(it)
} }
if (newSystemOfAccounts != null && newSystemOfAccounts.isNotEmpty()) { if (!newSystemOfAccounts.isNullOrEmpty()) {
savedAccounts = newSystemOfAccounts savedAccounts = newSystemOfAccounts
} else {
val oldAccounts = getString(PrefKeys.SAVED_ACCOUNTS, null)?.split(COMMA) ?: listOf()
val migrated =
oldAccounts.map { npub ->
AccountInfo(
npub,
encryptedPreferences(npub).getBoolean(PrefKeys.LOGIN_WITH_EXTERNAL_SIGNER, false),
(encryptedPreferences(npub).getString(PrefKeys.NOSTR_PRIVKEY, "") ?: "")
.isNotBlank(),
)
}
savedAccounts = migrated
edit().apply { putString(PrefKeys.ALL_ACCOUNT_INFO, Event.mapper.writeValueAsString(savedAccounts)) }.apply()
} }
} }
} }