chore: improve qr scan result handling #27
@@ -94,17 +94,18 @@ fun ImportScreen() {
|
|||||||
LaunchedEffect(qrScanResult.content) {
|
LaunchedEffect(qrScanResult.content) {
|
||||||
qrScanResult.content?.let { result ->
|
qrScanResult.content?.let { result ->
|
||||||
runCatching {
|
runCatching {
|
||||||
if (result.startsWith("nsec")) {
|
if (result.startsWith("nsec1")) {
|
||||||
Keys.parse(result)
|
Keys.parse(result)
|
||||||
} else if (result.startsWith("bunker://")) {
|
} else if (result.startsWith("bunker://")) {
|
||||||
NostrConnectUri.parse(result)
|
NostrConnectUri.parse(result)
|
||||||
} else {
|
} else {
|
||||||
throw IllegalArgumentException("Invalid secret: $result")
|
throw IllegalArgumentException("Unsupported secret format")
|
||||||
}
|
}
|
||||||
|
}.onSuccess {
|
||||||
|
secret = result
|
||||||
|
}.onFailure { e ->
|
||||||
|
snackbarHostState.showSnackbar("Invalid secret: ${e.message}")
|
||||||
}
|
}
|
||||||
.onSuccess { it -> secret = result }
|
|
||||||
.onFailure { e -> println("Failed to parse QR: ${e.message}") }
|
|
||||||
|
|
||||||
// Clear the nav state
|
// Clear the nav state
|
||||||
qrScanResult.clear()
|
qrScanResult.clear()
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -109,14 +109,13 @@ fun NewChatScreen() {
|
|||||||
LaunchedEffect(qrScanResult.content) {
|
LaunchedEffect(qrScanResult.content) {
|
||||||
qrScanResult.content?.let { result ->
|
qrScanResult.content?.let { result ->
|
||||||
// Verify the content
|
// Verify the content
|
||||||
runCatching { PublicKey.parse(result) }
|
runCatching {
|
||||||
.onSuccess { pubkey ->
|
PublicKey.parse(result)
|
||||||
selectedReceivers.add(pubkey)
|
}.onSuccess { pubkey ->
|
||||||
}
|
selectedReceivers.add(pubkey)
|
||||||
.onFailure { e ->
|
}.onFailure { e ->
|
||||||
println("Failed to parse QR: ${e.message}")
|
snackbarHostState.showSnackbar("Invalid address: ${e.message}")
|
||||||
}
|
}
|
||||||
|
|
||||||
// Clear the nav state
|
// Clear the nav state
|
||||||
qrScanResult.clear()
|
qrScanResult.clear()
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -98,12 +98,12 @@ fun ScanScreen() {
|
|||||||
.border(2.dp, Color.White, RoundedCornerShape(12.dp))
|
.border(2.dp, Color.White, RoundedCornerShape(12.dp))
|
||||||
)
|
)
|
||||||
Text(
|
Text(
|
||||||
|
modifier = Modifier
|
||||||
|
.align(Alignment.BottomCenter)
|
||||||
|
.padding(bottom = 64.dp),
|
||||||
text = "Scan a Nostr address",
|
text = "Scan a Nostr address",
|
||||||
style = MaterialTheme.typography.titleSmallEmphasized,
|
style = MaterialTheme.typography.titleSmallEmphasized,
|
||||||
color = Color.White,
|
color = Color.White,
|
||||||
modifier = Modifier
|
|
||||||
.align(Alignment.BottomCenter)
|
|
||||||
.padding(bottom = 64.dp)
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user