diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/models/Account.kt b/app/src/main/java/com/greenart7c3/nostrsigner/models/Account.kt index 62ba8eb4..ba78249e 100644 --- a/app/src/main/java/com/greenart7c3/nostrsigner/models/Account.kt +++ b/app/src/main/java/com/greenart7c3/nostrsigner/models/Account.kt @@ -120,7 +120,7 @@ class Account( return signer.signerSync.decrypt(encryptedContent, fromPublicKey) } - suspend fun seedWords() = DataStoreAccess.getEncryptedKey(Amber.instance, npub, DataStoreAccess.SEED_WORDS) + suspend fun seedWords() = runCatching { DataStoreAccess.getEncryptedKey(Amber.instance, npub, DataStoreAccess.SEED_WORDS) }.getOrNull() ?: "" suspend fun decryptZapEvent( data: String, diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/service/AccountExportService.kt b/app/src/main/java/com/greenart7c3/nostrsigner/service/AccountExportService.kt index 4fe1f476..03296532 100644 --- a/app/src/main/java/com/greenart7c3/nostrsigner/service/AccountExportService.kt +++ b/app/src/main/java/com/greenart7c3/nostrsigner/service/AccountExportService.kt @@ -121,7 +121,7 @@ object AccountExportService { */ private suspend fun accountToExportData(account: Account, password: String): AccountExportData { val seedWords = account.seedWords() - val encrypedSeedWords = if (seedWords != null && seedWords.isNotBlank()) account.nip44Encrypt(seedWords, account.hexKey) else "" + val encrypedSeedWords = if (seedWords.isNotBlank()) account.nip44Encrypt(seedWords, account.hexKey) else "" val encryptedNsec = account.nip49Encrypt(password) return AccountExportData( diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/ui/actions/AccountBackupDialog.kt b/app/src/main/java/com/greenart7c3/nostrsigner/ui/actions/AccountBackupDialog.kt index 081ee3d4..40d5db62 100644 --- a/app/src/main/java/com/greenart7c3/nostrsigner/ui/actions/AccountBackupDialog.kt +++ b/app/src/main/java/com/greenart7c3/nostrsigner/ui/actions/AccountBackupDialog.kt @@ -227,7 +227,7 @@ fun AccountBackupScreen( launch(Dispatchers.IO) { localAccount = LocalPreferences.loadFromEncryptedStorage(Amber.instance, it.npub) localAccount?.let { acc -> - seedWords = acc.seedWords() ?: "" + seedWords = acc.seedWords() } } }