laantungir/Amber
1
0
Fork 0
mirror of https://github.com/greenart7c3/Amber.git synced 2026-10-06 03:18:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Show the error in the login screen

Browse Source
This commit is contained in:
greenart7c3
2025-04-23 09:01:17 -03:00
parent 524464fe47
commit c5c0b7e428
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/greenart7c3/nostrsigner/ui/AccountStateViewModel.kt
+4 -4
View File
@@ -127,7 +127,7 @@ class AccountStateViewModel(npub: String?) : ViewModel() {
tryLoginExistingAccount(route, npub)
}
fun isValidKey(key: String, password: String): Boolean {
fun isValidKey(key: String, password: String): Pair<Boolean, String> {
try {
val account =
if (key.startsWith("ncryptsec")) {
@@ -174,9 +174,9 @@ class AccountStateViewModel(npub: String?) : ViewModel() {
didBackup = true,
)
}
return account.signer.keyPair.privKey != null
} catch (_: Exception) {
return false
return Pair(account.signer.keyPair.privKey != null, "")
} catch (e: Exception) {
return Pair(false, e.message ?: "Unknown error")
}
}
app/src/main/java/com/greenart7c3/nostrsigner/ui/LoginScreen.kt
+9 -6
View File
@@ -794,12 +794,13 @@ fun LoginPage(
}
if (key.value.text.isNotBlank() && !(needsPassword.value && password.value.text.isBlank())) {
if (accountViewModel.isValidKey(key.value.text.toLowerCase(Locale.current).trim(), password.value.text)) {
val isValid = accountViewModel.isValidKey(key.value.text.toLowerCase(Locale.current).trim(), password.value.text)
if (isValid.first) {
scope.launch {
pageState.animateScrollToPage(1)
}
} else {
errorMessage = context.getString(R.string.invalid_key)
errorMessage = isValid.second
}
}
},
@@ -869,12 +870,13 @@ fun LoginPage(
}
if (key.value.text.isNotBlank() && !(needsPassword.value && password.value.text.isBlank())) {
if (accountViewModel.isValidKey(key.value.text.toLowerCase(Locale.current).trim(), password.value.text)) {
val isValid = accountViewModel.isValidKey(key.value.text.toLowerCase(Locale.current).trim(), password.value.text)
if (isValid.first) {
scope.launch {
pageState.animateScrollToPage(1)
}
} else {
errorMessage = context.getString(R.string.invalid_key)
errorMessage = isValid.second
}
}
},
@@ -901,13 +903,14 @@ fun LoginPage(
}
if (key.value.text.isNotBlank() && !(needsPassword.value && password.value.text.isBlank())) {
if (accountViewModel.isValidKey(key.value.text.toLowerCase(Locale.current).trim(), password.value.text)) {
val isValid = accountViewModel.isValidKey(key.value.text.toLowerCase(Locale.current).trim(), password.value.text)
if (isValid.first) {
keyboardController?.hide()
scope.launch {
pageState.animateScrollToPage(1)
}
} else {
errorMessage = context.getString(R.string.invalid_key)
errorMessage = isValid.second
}
}
},