do not show login screen when account doesn't exists

greenart7c3 · Oct 2, 2023 · 480321c · 480321c
1 parent ddbdcc2
commit 480321c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/ui/AccountStateViewModel.kt b/app/src/main/java/com/greenart7c3/nostrsigner/ui/AccountStateViewModel.kt
@@ -25,7 +25,10 @@ class AccountStateViewModel(npub: String?) : ViewModel() {
     }
 
     private fun tryLoginExistingAccount(route: String?, npub: String?) {
-        val currentUser = npub ?: LocalPreferences.currentAccount()
+        var currentUser = npub ?: LocalPreferences.currentAccount()
+        if (currentUser != null && !LocalPreferences.containsAccount(currentUser)) {
+            currentUser = LocalPreferences.currentAccount()
+        }
         LocalPreferences.loadFromEncryptedStorage(currentUser)?.let {
             startUI(it, route)
         }

diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/ui/MainScreen.kt b/app/src/main/java/com/greenart7c3/nostrsigner/ui/MainScreen.kt
@@ -89,10 +89,8 @@ fun sendResult(
         // Convert the compressed data to Base64
         val compressedData = byteArrayOutputStream.toByteArray()
         val encodedString = Base64.getEncoder().encodeToString(compressedData)
-        val encodedString2 = Uri.encode(encodedString)
-
         val intent = Intent(Intent.ACTION_VIEW)
-        intent.data = Uri.parse(callBackUrl + encodedString2)
+        intent.data = Uri.parse(callBackUrl + Uri.encode("Signer1$encodedString"))
         context.startActivity(intent)
     } else {
         clipboardManager.setText(AnnotatedString(value))