fix
This commit is contained in:
@@ -13,12 +13,6 @@ class ExternalSignerLauncher {
|
||||
this.launcher = launcher
|
||||
}
|
||||
|
||||
fun unregister() {
|
||||
launcher = null
|
||||
pendingResult?.cancel()
|
||||
pendingResult = null
|
||||
}
|
||||
|
||||
suspend fun launch(intent: Intent): ActivityResult {
|
||||
val deferred = CompletableDeferred<ActivityResult>()
|
||||
pendingResult = deferred
|
||||
|
||||
@@ -17,7 +17,9 @@ import su.reya.coop.coop.storage.SecretStore
|
||||
import kotlin.system.exitProcess
|
||||
|
||||
class MainActivity : ComponentActivity() {
|
||||
private val externalSignerLauncher = ExternalSignerLauncher()
|
||||
companion object {
|
||||
val externalSignerLauncher = ExternalSignerLauncher()
|
||||
}
|
||||
|
||||
private val viewModel: NostrViewModel by viewModels {
|
||||
object : ViewModelProvider.Factory {
|
||||
@@ -81,9 +83,4 @@ class MainActivity : ComponentActivity() {
|
||||
super.onNewIntent(intent)
|
||||
setIntent(intent)
|
||||
}
|
||||
|
||||
override fun onDestroy() {
|
||||
externalSignerLauncher.unregister()
|
||||
super.onDestroy()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -160,10 +160,9 @@ fun OnboardingScreen() {
|
||||
if (viewModel.isExternalSignerAvailable()) {
|
||||
try {
|
||||
viewModel.connectExternalSigner()
|
||||
navigator.navigate(Screen.Home)
|
||||
} catch (e: Exception) {
|
||||
e.message?.let { snackbarHostState.showSnackbar(it) }
|
||||
} finally {
|
||||
navigator.navigate(Screen.Home)
|
||||
}
|
||||
} else {
|
||||
val result = snackbarHostState.showSnackbar(
|
||||
|
||||
Reference in New Issue
Block a user