fix: always run CoinJoinService and simplify

dashpay · Nov 6, 2023 · 57e83ad · 57e83ad
1 parent b7291d1
commit 57e83ad
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/wallet/src/de/schildbach/wallet/service/BlockchainServiceImpl.java b/wallet/src/de/schildbach/wallet/service/BlockchainServiceImpl.java
@@ -164,6 +164,7 @@ public class BlockchainServiceImpl extends LifecycleService implements Blockchai
     @Inject PackageInfoProvider packageInfoProvider;
     @Inject ConnectivityManager connectivityManager;
     @Inject BlockchainStateDataProvider blockchainStateDataProvider;
+    @Inject CoinJoinService coinJoinService; // not used in this class, but we need to create it
     private BlockStore blockStore;
     private BlockStore headerStore;
     private File blockChainFile;

diff --git a/wallet/src/de/schildbach/wallet/service/CoinJoinService.kt b/wallet/src/de/schildbach/wallet/service/CoinJoinService.kt
@@ -141,7 +141,6 @@ class CoinJoinMixingService @Inject constructor(
     override val mixingProgress: Flow<Double>
         get() = _progressFlow
     private val _progressFlow = MutableStateFlow(0.00)
-    private var clientOptionsConfigured = false
 
     init {
         blockchainStateProvider.observeNetworkStatus()
@@ -168,10 +167,7 @@ class CoinJoinMixingService @Inject constructor(
             .launchIn(coroutineScope)
 
         walletDataProvider.observeBalance()
-            .onEach { balance ->
-                log.info("coinjoin: total balance: $balance (before distinct)")
-            }
-            //.distinctUntilChanged()
+            .distinctUntilChanged()
             .onEach { balance ->
                 // switch to our context
                 coroutineScope.launch {
@@ -337,10 +333,7 @@ class CoinJoinMixingService @Inject constructor(
     private val requestDecryptedKey = RequestDecryptedKey { decryptKey(it) }
 
     private fun configureMixing() {
-        if (!clientOptionsConfigured) {
-            configureMixing(walletDataProvider.getWalletBalance())
-            clientOptionsConfigured = true;
-        }
+        configureMixing(walletDataProvider.getWalletBalance())
     }
     /** set CoinJoinClientOptions based on CoinJoinMode */
     private fun configureMixing(amount: Coin) {