chore: log lock screen activation parameters

build.gradle

@@ -4,7 +4,7 @@ buildscript {
         coroutinesVersion = '1.6.4'
         ok_http_version = '4.9.1'
         dashjVersion = '21.1.6'
-        dppVersion = "1.7.2"
+        dppVersion = "1.7.3"
         hiltVersion = '2.51'
         hiltCompilerVersion = '1.2.0'
         hiltWorkVersion = '1.0.0'

common/src/main/java/org/dash/wallet/common/WalletDataProvider.kt

@@ -74,4 +74,6 @@ interface WalletDataProvider {
     fun checkSendingConditions(address: Address?, amount: Coin)
 
     fun observeMostRecentTransaction(): Flow<Transaction>
+    fun observeMixedBalance(): Flow<Coin>
+    fun observeTotalBalance(): Flow<Coin>
 }

common/src/main/java/org/dash/wallet/common/data/WalletUIConfig.kt

@@ -63,6 +63,8 @@ open class WalletUIConfig @Inject constructor(
         val SHOW_TAP_TO_HIDE_HINT = booleanPreferencesKey("show_tap_to_hide_balance_hint")
         val SELECTED_CURRENCY = stringPreferencesKey("exchange_currency")
         val EXCHANGE_CURRENCY_DETECTED = booleanPreferencesKey("exchange_currency_detected")
+        val LAST_TOTAL_BALANCE = longPreferencesKey("last_total_balance")
+        val LAST_MIXED_BALANCE = longPreferencesKey("last_mixed_balance")
     }
 
     suspend fun getExchangeCurrencyCode(): String {

features/exploredash/src/main/java/org/dash/wallet/features/exploredash/ui/dashdirect/DashDirectViewModel.kt

@@ -99,7 +99,7 @@ class DashDirectViewModel @Inject constructor(
             .launchIn(viewModelScope)
 
         walletDataProvider
-            .observeBalance()
+            .observeTotalBalance()
             .distinctUntilChanged()
             .onEach(_balance::postValue)
             .launchIn(viewModelScope)

integrations/coinbase/src/main/java/org/dash/wallet/integrations/coinbase/viewmodels/TransferDashViewModel.kt

@@ -96,7 +96,7 @@ class TransferDashViewModel @Inject constructor(
     init {
         getUserAccountAddress()
         getUserData()
-        walletDataProvider.observeBalance()
+        walletDataProvider.observeTotalBalance()
             .onEach(_dashBalanceInWalletState::postValue)
             .launchIn(viewModelScope)
 

integrations/crowdnode/src/main/java/org/dash/wallet/integrations/crowdnode/ui/CrowdNodeViewModel.kt

@@ -131,7 +131,7 @@ class CrowdNodeViewModel @Inject constructor(
             (crowdNodeBalance.value?.balance?.isLessThan(CrowdNodeConstants.MINIMUM_DASH_DEPOSIT) ?: true)
 
     init {
-        walletDataProvider.observeBalance()
+        walletDataProvider.observeTotalBalance()
             .distinctUntilChanged()
             .onEach {
                 _dashBalance.postValue(it)

integrations/crowdnode/src/test/java/org/dash/wallet/integrations/crowdnode/CrowdNodeViewModelTest.kt

@@ -77,7 +77,7 @@ class CrowdNodeViewModelTest {
     }
 
     private val walletData = mock<WalletDataProvider> {
-        on { observeBalance() } doReturn MutableStateFlow(balance)
+        on { observeTotalBalance() } doReturn MutableStateFlow(balance)
         on {
             freshReceiveAddress()
         } doReturn Address.fromBase58(TestNet3Params.get(), "ydW78zVxRgNhANX2qtG4saSCC5ejNQjw2U")

wallet/res/layout/wallet_transactions_fragment.xml

@@ -22,7 +22,8 @@
         android:gravity="center_horizontal"
         android:textAlignment="gravity"
         android:text="@string/wallet_transactions_fragment_empty_text"
-        android:textSize="@dimen/font_size_small" />
+        android:textSize="@dimen/font_size_small"
+        android:visibility="invisible"/>
 
     <LinearLayout
         android:layout_width="match_parent"

wallet/src/de/schildbach/wallet/Constants.java

@@ -63,6 +63,8 @@ public final class Constants {
     public static boolean SUPPORTS_PLATFORM;
     // TODO: remove all references to this when invites are enabled and functional
     public static boolean SUPPORTS_INVITES;
+    // TODO: remove all references to this when transaction metadata is saved on platform
+    public static final boolean SUPPORTS_TXMETADATA;
 
     public static final EnumSet<MasternodeSync.SYNC_FLAGS> SYNC_FLAGS = MasternodeSync.SYNC_DEFAULT_SPV;
     public static final EnumSet<MasternodeSync.VERIFY_FLAGS> VERIFY_FLAGS = MasternodeSync.VERIFY_DEFAULT_SPV;
@@ -92,6 +94,7 @@ public final class Constants {
                 org.dash.wallet.common.util.Constants.INSTANCE.setEXPLORE_GC_FILE_PATH("explore/explore.db");
                 SUPPORTS_PLATFORM = !is32Bit;
                 SUPPORTS_INVITES = false;
+                SUPPORTS_TXMETADATA = false;
                 SYNC_FLAGS.add(MasternodeSync.SYNC_FLAGS.SYNC_HEADERS_MN_LIST_FIRST);
                 if (SUPPORTS_PLATFORM) {
                     SYNC_FLAGS.add(MasternodeSync.SYNC_FLAGS.SYNC_BLOCKS_AFTER_PREPROCESSING);
@@ -110,6 +113,7 @@ public final class Constants {
                 WALLET_NAME_CURRENCY_CODE = "tdash";
                 SUPPORTS_PLATFORM = !is32Bit;
                 SUPPORTS_INVITES = false;
+                SUPPORTS_TXMETADATA = false;
                 SYNC_FLAGS.add(MasternodeSync.SYNC_FLAGS.SYNC_HEADERS_MN_LIST_FIRST);
                 if (SUPPORTS_PLATFORM) {
                     SYNC_FLAGS.add(MasternodeSync.SYNC_FLAGS.SYNC_BLOCKS_AFTER_PREPROCESSING);
@@ -130,7 +134,9 @@ public final class Constants {
                 FEE_NETWORK_SUFFIX = "-testnet"; // use the same fee file as testnet
                 WALLET_NAME_CURRENCY_CODE = "tdash";
                 org.dash.wallet.common.util.Constants.EXPLORE_GC_FILE_PATH = "explore/explore-devnet.db";
-                SUPPORTS_PLATFORM = true;
+                SUPPORTS_PLATFORM = !is32Bit;
+                SUPPORTS_INVITES = false;
+                SUPPORTS_TXMETADATA = false;
                 SYNC_FLAGS.add(MasternodeSync.SYNC_FLAGS.SYNC_HEADERS_MN_LIST_FIRST);
                 SYNC_FLAGS.add(MasternodeSync.SYNC_FLAGS.SYNC_BLOCKS_AFTER_PREPROCESSING);
                 org.dash.wallet.common.util.Constants.FAUCET_URL = String.format("http://faucet.%s.networks.dash.org/", devNetName);

wallet/src/de/schildbach/wallet/WalletApplication.java

@@ -61,24 +61,21 @@
 import org.bitcoinj.core.TransactionBag;
 import org.bitcoinj.core.VerificationException;
 import org.bitcoinj.crypto.LinuxSecureRandom;
-import org.bitcoinj.manager.DashSystem;
 import org.bitcoinj.utils.Threading;
-import org.bitcoinj.core.VersionMessage;
-import org.bitcoinj.crypto.IKey;
 import org.bitcoinj.wallet.AuthenticationKeyChain;
 import org.bitcoinj.wallet.CoinSelector;
 import org.bitcoinj.wallet.Protos;
 import org.bitcoinj.wallet.UnreadableWalletException;
 import org.bitcoinj.wallet.Wallet;
 import org.bitcoinj.wallet.WalletEx;
-import org.bitcoinj.wallet.WalletExtension;
 import org.bitcoinj.wallet.WalletProtobufSerializer;
 import org.bitcoinj.wallet.authentication.AuthenticationGroupExtension;
 import org.bitcoinj.wallet.authentication.AuthenticationKeyUsage;
 import org.dash.wallet.common.AutoLogoutTimerHandler;
 import org.dash.wallet.common.Configuration;
 import org.dash.wallet.common.InteractionAwareActivity;
 import org.dash.wallet.common.WalletDataProvider;
+import org.dash.wallet.common.data.WalletUIConfig;
 import org.dash.wallet.common.services.LeftoverBalanceException;
 import org.dash.wallet.common.services.TransactionMetadataProvider;
 import org.dash.wallet.common.services.analytics.AnalyticsService;
@@ -91,17 +88,18 @@
 
 import ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy;
 import ch.qos.logback.core.util.FileSize;
+import de.schildbach.wallet.data.CoinJoinConfig;
 import de.schildbach.wallet.service.BlockchainStateDataProvider;
 import de.schildbach.wallet.service.DashSystemService;
 import de.schildbach.wallet.service.PackageInfoProvider;
 import de.schildbach.wallet.service.WalletFactory;
 import de.schildbach.wallet.transactions.MasternodeObserver;
+import de.schildbach.wallet.transactions.WalletBalanceObserver;
 import de.schildbach.wallet.ui.buy_sell.LiquidClient;
 import org.dash.wallet.integrations.uphold.api.UpholdClient;
 import org.dash.wallet.integrations.uphold.data.UpholdConstants;
 import org.dash.wallet.integrations.crowdnode.utils.CrowdNodeConfig;
 import org.dash.wallet.integrations.crowdnode.utils.CrowdNodeBalanceCondition;
-import org.dash.wallet.integrations.crowdnode.utils.CrowdNodeConfig;
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -118,7 +116,6 @@
 import java.util.EnumSet;
 import java.util.List;
 import java.util.Set;
-import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
 import javax.inject.Inject;
@@ -130,8 +127,6 @@
 import ch.qos.logback.classic.spi.ILoggingEvent;
 import ch.qos.logback.core.rolling.RollingFileAppender;
 import dagger.hilt.android.HiltAndroidApp;
-import org.dash.wallet.common.data.entity.BlockchainState;
-import de.schildbach.wallet.database.dao.BlockchainStateDao;
 import de.schildbach.wallet.security.SecurityGuard;
 import de.schildbach.wallet.service.BlockchainService;
 import de.schildbach.wallet.service.BlockchainServiceImpl;
@@ -216,6 +211,9 @@ public class WalletApplication extends MultiDexApplication
     WalletFactory walletFactory;
     @Inject
     DashSystemService dashSystemService;
+    @Inject
+    WalletUIConfig walletUIConfig;
+    private WalletBalanceObserver walletBalanceObserver;
 
     @Override
     protected void attachBaseContext(Context base) {
@@ -580,6 +578,9 @@ private void afterLoadWallet() {
         // make sure there is at least one recent backup
         if (!getFileStreamPath(Constants.Files.WALLET_KEY_BACKUP_PROTOBUF).exists())
             backupWallet();
+
+        // setup WalletBalanceObserver
+        walletBalanceObserver = new WalletBalanceObserver(wallet, walletUIConfig);
     }
 
     private void deleteBlockchainFiles() {
@@ -1041,6 +1042,8 @@ public void finalizeWipe() {
         // wallet must be null for the OnboardingActivity flow
         log.info("removing wallet from memory during wipe");
         wallet = null;
+        walletBalanceObserver.close();
+        walletBalanceObserver = null;
         if (afterWipeFunction != null)
             afterWipeFunction.invoke();
         afterWipeFunction = null;
@@ -1103,7 +1106,28 @@ public Coin getWalletBalance() {
             return Coin.ZERO;
         }
 
-        return wallet.getBalance(Wallet.BalanceType.ESTIMATED);
+        //return wallet.getBalance(Wallet.BalanceType.ESTIMATED);
+       return  walletBalanceObserver.getTotalBalance().getValue();
+    }
+
+    @NonNull
+    @Override
+    public Flow<Coin> observeTotalBalance() {
+        if (wallet == null) {
+            return FlowKt.emptyFlow();
+        }
+
+        return walletBalanceObserver.getTotalBalance();
+    }
+
+    @NonNull
+    @Override
+    public Flow<Coin> observeMixedBalance() {
+        if (wallet == null) {
+            return FlowKt.emptyFlow();
+        }
+
+        return walletBalanceObserver.getMixedBalance();
     }
 
     @NonNull
@@ -1116,7 +1140,7 @@ public Flow<Coin> observeBalance(
             return FlowKt.emptyFlow();
         }
 
-        return new WalletBalanceObserver(wallet, balanceType, coinSelector).observe();
+        return walletBalanceObserver.observe(balanceType, coinSelector);
     }
 
     @NonNull

wallet/src/de/schildbach/wallet/service/BlockchainServiceImpl.kt

@@ -65,6 +65,7 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.withContext
 import org.bitcoinj.core.Address
 import org.bitcoinj.core.Block
@@ -169,6 +170,7 @@ class BlockchainServiceImpl : LifecycleService(), BlockchainService {
     private val serviceJob = SupervisorJob()
     private val serviceScope = CoroutineScope(Dispatchers.IO + serviceJob)
     private val onCreateCompleted = CompletableDeferred<Unit>()
+    private var checkMutex = Mutex(false)
 
     @Inject lateinit var  application: WalletApplication
 
@@ -215,7 +217,6 @@ class BlockchainServiceImpl : LifecycleService(), BlockchainService {
     private var peerGroup: PeerGroup? = null
     private val handler = Handler()
     private val delayHandler = Handler()
-    private val metadataHandler = Handler()
     private var wakeLock: PowerManager.WakeLock? = null
     private var peerConnectivityListener: PeerConnectivityListener? = null
     private var nm: NotificationManager? = null
@@ -241,6 +242,8 @@ class BlockchainServiceImpl : LifecycleService(), BlockchainService {
     private var syncPercentage = 0 // 0 to 100%
     private var mixingStatus = MixingStatus.NOT_STARTED
     private var mixingProgress = 0.0
+    private var balance = Coin.ZERO
+    private var mixedBalance = Coin.ZERO
     private var foregroundService = ForegroundService.NONE
 
     // Risk Analyser for Transactions that is PeerGroup Aware
@@ -254,10 +257,8 @@ class BlockchainServiceImpl : LifecycleService(), BlockchainService {
         CrowdNodeDepositReceivedResponse(Constants.NETWORK_PARAMETERS)
     private var apiConfirmationHandler: CrowdNodeAPIConfirmationHandler? = null
     private fun handleMetadata(tx: Transaction) {
-        metadataHandler.post {
-            transactionMetadataProvider.syncTransactionBlocking(
-                tx
-            )
+        serviceScope.launch {
+            transactionMetadataProvider.syncTransaction(tx)
         }
     }
 
@@ -683,7 +684,12 @@ class BlockchainServiceImpl : LifecycleService(), BlockchainService {
             serviceScope.launch {
                 // make sure that onCreate is finished
                 onCreateCompleted.await()
-                checkService()
+                checkMutex.lock()
+                try {
+                    checkService()
+                } finally {
+                    checkMutex.unlock()
+                }
             }
         }
 
@@ -708,7 +714,7 @@ class BlockchainServiceImpl : LifecycleService(), BlockchainService {
                         packageInfoProvider.packageInfo
                     )
                 }
-                org.bitcoinj.core.Context.propagate(wallet.context)
+                propagateContext()
                 dashSystemService.system.initDashSync(getDir("masternode", MODE_PRIVATE).absolutePath)
                 log.info("starting peergroup")
                 peerGroup = PeerGroup(Constants.NETWORK_PARAMETERS, blockChain, headerChain)
@@ -1012,6 +1018,9 @@ class BlockchainServiceImpl : LifecycleService(), BlockchainService {
     }
 
     private fun propagateContext() {
+        if (application.wallet?.context != Constants.CONTEXT) {
+            log.warn("wallet context does not equal Constants.CONTEXT")
+        }
         org.bitcoinj.core.Context.propagate(Constants.CONTEXT)
     }
 
@@ -1125,21 +1134,31 @@ class BlockchainServiceImpl : LifecycleService(), BlockchainService {
             coinJoinService.observeMixingProgress().observe(this@BlockchainServiceImpl) { mixingProgress ->
                 handleBlockchainStateNotification(blockchainState, mixingStatus, mixingProgress)
             }
+
+            application.observeTotalBalance().observe(this@BlockchainServiceImpl) {
+                balance = it
+                handleBlockchainStateNotification(blockchainState, mixingStatus, mixingProgress)
+            }
+
+            application.observeMixedBalance().observe(this@BlockchainServiceImpl) {
+                mixedBalance = it
+                handleBlockchainStateNotification(blockchainState, mixingStatus, mixingProgress)
+            }
+
             onCreateCompleted.complete(Unit) // Signal completion of onCreate
             log.info(".onCreate() finished")
         }
     }
 
     private fun createCoinJoinNotification(): Notification {
-        val mixedBalance = (application.wallet as WalletEx?)!!.coinJoinBalance
-        val totalBalance = application.wallet!!.balance
         val notificationIntent = createIntent(this)
         val pendingIntent = PendingIntent.getActivity(
             this, 0,
             notificationIntent, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
         )
         val decimalFormat = DecimalFormat("0.000")
         val statusStringId = when (mixingStatus) {
+            MixingStatus.NOT_STARTED -> R.string.coinjoin_not_started
             MixingStatus.MIXING -> R.string.coinjoin_mixing
             MixingStatus.PAUSED -> R.string.coinjoin_paused
             MixingStatus.FINISHED -> R.string.coinjoin_progress_finished
@@ -1150,7 +1169,7 @@ class BlockchainServiceImpl : LifecycleService(), BlockchainService {
             getString(statusStringId),
             mixingProgress,
             decimalFormat.format(mixedBalance.toBigDecimal()),
-            decimalFormat.format(totalBalance.toBigDecimal())
+            decimalFormat.format(balance.toBigDecimal())
         )
         return NotificationCompat.Builder(
             this,
@@ -1300,6 +1319,7 @@ class BlockchainServiceImpl : LifecycleService(), BlockchainService {
         serviceScope.launch {
             try {
                 onCreateCompleted.await() // wait until onCreate is finished
+                checkMutex.lock()
                 WalletApplication.scheduleStartBlockchainService(this@BlockchainServiceImpl) //disconnect feature
                 application.wallet!!.removeChangeEventListener(walletEventListener)
                 application.wallet!!.removeCoinsSentEventListener(walletEventListener)
@@ -1330,6 +1350,7 @@ class BlockchainServiceImpl : LifecycleService(), BlockchainService {
                     throw RuntimeException(x)
                 }
                 if (!deleteWalletFileOnShutdown) {
+                    propagateContext()
                     application.saveWallet()
                 }
                 if (wakeLock!!.isHeld) {
@@ -1353,6 +1374,7 @@ class BlockchainServiceImpl : LifecycleService(), BlockchainService {
             } finally {
                 log.info("serviceJob cancelled after " + (System.currentTimeMillis() - serviceCreatedAt) / 1000 / 60 + " minutes")
                 serviceJob.cancel()
+                checkMutex.unlock()
                 cleanupDeferred?.complete(Unit)
             }
         }