Removes account migration and unused keys for shared preferences.
This commit is contained in:
@@ -72,7 +72,6 @@ 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"
|
||||||
@@ -99,14 +98,7 @@ private object PrefKeys {
|
|||||||
const val WARN_ABOUT_REPORTS = "warn_about_reports"
|
const val WARN_ABOUT_REPORTS = "warn_about_reports"
|
||||||
const val FILTER_SPAM_FROM_STRANGERS = "filter_spam_from_strangers"
|
const val FILTER_SPAM_FROM_STRANGERS = "filter_spam_from_strangers"
|
||||||
const val LAST_READ_PER_ROUTE = "last_read_route_per_route"
|
const val LAST_READ_PER_ROUTE = "last_read_route_per_route"
|
||||||
const val AUTOMATICALLY_SHOW_IMAGES = "automatically_show_images"
|
|
||||||
const val AUTOMATICALLY_START_PLAYBACK = "automatically_start_playback"
|
|
||||||
const val THEME = "theme"
|
|
||||||
const val PREFERRED_LANGUAGE = "preferred_Language"
|
|
||||||
const val AUTOMATICALLY_LOAD_URL_PREVIEW = "automatically_load_url_preview"
|
|
||||||
const val AUTOMATICALLY_HIDE_NAV_BARS = "automatically_hide_nav_bars"
|
|
||||||
const val LOGIN_WITH_EXTERNAL_SIGNER = "login_with_external_signer"
|
const val LOGIN_WITH_EXTERNAL_SIGNER = "login_with_external_signer"
|
||||||
const val AUTOMATICALLY_SHOW_PROFILE_PICTURE = "automatically_show_profile_picture"
|
|
||||||
const val SIGNER_PACKAGE_NAME = "signer_package_name"
|
const val SIGNER_PACKAGE_NAME = "signer_package_name"
|
||||||
const val HAS_DONATED_IN_VERSION = "has_donated_in_version"
|
const val HAS_DONATED_IN_VERSION = "has_donated_in_version"
|
||||||
const val PENDING_ATTESTATIONS = "pending_attestations"
|
const val PENDING_ATTESTATIONS = "pending_attestations"
|
||||||
@@ -150,20 +142,6 @@ object LocalPreferences {
|
|||||||
|
|
||||||
if (newSystemOfAccounts != null && newSystemOfAccounts.isNotEmpty()) {
|
if (newSystemOfAccounts != null && newSystemOfAccounts.isNotEmpty()) {
|
||||||
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
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -265,9 +243,7 @@ object LocalPreferences {
|
|||||||
saveToEncryptedStorage(account)
|
saveToEncryptedStorage(account)
|
||||||
}
|
}
|
||||||
|
|
||||||
fun allSavedAccounts(): List<AccountInfo> {
|
fun allSavedAccounts(): List<AccountInfo> = savedAccounts()
|
||||||
return savedAccounts()
|
|
||||||
}
|
|
||||||
|
|
||||||
suspend fun saveToEncryptedStorage(account: Account) {
|
suspend fun saveToEncryptedStorage(account: Account) {
|
||||||
Log.d("LocalPreferences", "Saving to encrypted storage")
|
Log.d("LocalPreferences", "Saving to encrypted storage")
|
||||||
@@ -345,14 +321,11 @@ object LocalPreferences {
|
|||||||
PrefKeys.PENDING_ATTESTATIONS,
|
PrefKeys.PENDING_ATTESTATIONS,
|
||||||
Event.mapper.writeValueAsString(account.pendingAttestations.value),
|
Event.mapper.writeValueAsString(account.pendingAttestations.value),
|
||||||
)
|
)
|
||||||
}
|
}.apply()
|
||||||
.apply()
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
suspend fun loadCurrentAccountFromEncryptedStorage(): Account? {
|
suspend fun loadCurrentAccountFromEncryptedStorage(): Account? = currentAccount()?.let { loadCurrentAccountFromEncryptedStorage(it) }
|
||||||
return currentAccount()?.let { loadCurrentAccountFromEncryptedStorage(it) }
|
|
||||||
}
|
|
||||||
|
|
||||||
suspend fun saveSharedSettings(
|
suspend fun saveSharedSettings(
|
||||||
sharedSettings: Settings,
|
sharedSettings: Settings,
|
||||||
|
|||||||
Reference in New Issue
Block a user