From ec41094ae9f1983dc9fef7d09f92c264e1841fe6 Mon Sep 17 00:00:00 2001 From: Oscar Mira Date: Mon, 4 Mar 2024 19:46:08 +0100 Subject: [PATCH] demo: clear selected remote nodes on network toggle --- .../im/molly/monero/demo/ui/AddWalletViewModel.kt | 13 +------------ .../im/molly/monero/demo/ui/AddWalletWizard.kt | 2 +- .../main/kotlin/im/molly/monero/RemoteNodeClient.kt | 3 +++ 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/demo/android/src/main/kotlin/im/molly/monero/demo/ui/AddWalletViewModel.kt b/demo/android/src/main/kotlin/im/molly/monero/demo/ui/AddWalletViewModel.kt index 2dae50b..4f5b2e0 100644 --- a/demo/android/src/main/kotlin/im/molly/monero/demo/ui/AddWalletViewModel.kt +++ b/demo/android/src/main/kotlin/im/molly/monero/demo/ui/AddWalletViewModel.kt @@ -49,20 +49,9 @@ class AddWalletViewModel( private fun getSelectedRemoteNodeIds() = selectedRemoteNodes.filterValues { checked -> checked }.keys.filterNotNull() - init { - val previousNodes = mutableSetOf() - - currentRemoteNodes.onEach { remoteNodes -> - val unseenNodes = remoteNodes.filter { it !in previousNodes } - unseenNodes.forEach { node -> - selectedRemoteNodes[node.id] = true - previousNodes.add(node) - } - }.launchIn(viewModelScope) - } - fun toggleSelectedNetwork(network: MoneroNetwork) { viewModelState.update { it.copy(network = network) } + selectedRemoteNodes.clear() } fun updateWalletName(name: String) { diff --git a/demo/android/src/main/kotlin/im/molly/monero/demo/ui/AddWalletWizard.kt b/demo/android/src/main/kotlin/im/molly/monero/demo/ui/AddWalletWizard.kt index 425db73..c67662f 100644 --- a/demo/android/src/main/kotlin/im/molly/monero/demo/ui/AddWalletWizard.kt +++ b/demo/android/src/main/kotlin/im/molly/monero/demo/ui/AddWalletWizard.kt @@ -317,7 +317,7 @@ private fun SecondStepScreen( AlertDialog(onDismissRequest = { showOffLineConfirmationDialog = false }, title = { Text("No remote nodes selected") }, text = { - Text("There are no remote nodes added to your wallet settings. Are you sure you want to create an offline wallet?") + Text("It seems there are no remote nodes added to your wallet settings. Are you sure you want to create an offline wallet?") }, confirmButton = { TextButton(onClick = { showOffLineConfirmationDialog = false diff --git a/lib/android/src/main/kotlin/im/molly/monero/RemoteNodeClient.kt b/lib/android/src/main/kotlin/im/molly/monero/RemoteNodeClient.kt index 6eec40c..206e314 100644 --- a/lib/android/src/main/kotlin/im/molly/monero/RemoteNodeClient.kt +++ b/lib/android/src/main/kotlin/im/molly/monero/RemoteNodeClient.kt @@ -149,7 +149,10 @@ class RemoteNodeClient private constructor( delay(retryBackoff.waitTime(retryCount)) + logger.d("HTTP: $method $uri") + val response = try { + val request = requestBuilder.url(uri.toString()).build() httpClient.newCall(request).await()