From aaa7b095018ba5fcf333d498a9b3a57b21d54cfe Mon Sep 17 00:00:00 2001 From: HashEngineering Date: Mon, 7 Oct 2024 12:54:57 -0700 Subject: [PATCH 1/3] fix: change context to IO for time queries --- wallet/src/de/schildbach/wallet/ui/main/WalletActivityExt.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wallet/src/de/schildbach/wallet/ui/main/WalletActivityExt.kt b/wallet/src/de/schildbach/wallet/ui/main/WalletActivityExt.kt index 66f572063..77a26640f 100644 --- a/wallet/src/de/schildbach/wallet/ui/main/WalletActivityExt.kt +++ b/wallet/src/de/schildbach/wallet/ui/main/WalletActivityExt.kt @@ -143,7 +143,7 @@ object WalletActivityExt { fun MainActivity.checkTimeSkew(viewModel: MainViewModel, force: Boolean = false) { lifecycleScope.launch { - val (isTimeSkewed, timeSkew) = viewModel.getDeviceTimeSkew(force) + val (isTimeSkewed, timeSkew) = withContext(Dispatchers.IO) { viewModel.getDeviceTimeSkew(force) } val coinJoinOn = viewModel.getCoinJoinMode() != CoinJoinMode.NONE if (isTimeSkewed && (!timeSkewDialogShown || force)) { timeSkewDialogShown = true From 4fcc49ae77d65535def0d1eb99a99aac788ee539 Mon Sep 17 00:00:00 2001 From: HashEngineering Date: Mon, 7 Oct 2024 12:55:03 -0700 Subject: [PATCH 2/3] fix: change context to IO for time queries --- wallet/src/de/schildbach/wallet/ui/main/WalletActivityExt.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/wallet/src/de/schildbach/wallet/ui/main/WalletActivityExt.kt b/wallet/src/de/schildbach/wallet/ui/main/WalletActivityExt.kt index 77a26640f..5dc290a9e 100644 --- a/wallet/src/de/schildbach/wallet/ui/main/WalletActivityExt.kt +++ b/wallet/src/de/schildbach/wallet/ui/main/WalletActivityExt.kt @@ -58,8 +58,10 @@ import de.schildbach.wallet.WalletBalanceWidgetProvider import de.schildbach.wallet.service.CoinJoinMode import de.schildbach.wallet.ui.more.MoreFragment import de.schildbach.wallet_test.R +import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.delay import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext import org.dash.wallet.common.services.analytics.AnalyticsConstants import org.dash.wallet.common.ui.components.ComposeHostFrameLayout import org.dash.wallet.common.ui.components.Toast From 4efc2d107a678dc14a140e52d8630836688eef02 Mon Sep 17 00:00:00 2001 From: HashEngineering Date: Mon, 7 Oct 2024 12:55:26 -0700 Subject: [PATCH 3/3] fix: use dashj 21.1.1-SNAPSHOT to resolve one ANR --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 9b67b19eb..2fc713fb8 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ buildscript { kotlin_version = '1.9.23' coroutinesVersion = '1.6.4' ok_http_version = '4.9.1' - dashjVersion = '21.1.0' + dashjVersion = '21.1.1-SNAPSHOT' hiltVersion = '2.51' hiltCompilerVersion = '1.2.0' hiltWorkVersion = '1.0.0'