Fix sync transactions and push notification handling

Author: furenster

app/src/main/kotlin/com/gemwallet/android/MainActivity.kt

@@ -181,16 +181,7 @@ class MainActivity : FragmentActivity(), AuthRequester {
 
     override fun onNewIntent(intent: Intent) {
         super.onNewIntent(intent)
-        if (intent.hasExtra("walletIndex")) {
-            val walletIndex = intent.getIntExtra("walletIndex", -1)
-            viewModel.onNotification(walletIndex)
-        }
-        val data = intent.data ?: return
-        when (data.scheme) {
-            "wc" -> viewModel.addPairing(data.toString())
-        }
-
-        viewModel.intent.update { intent }
+        viewModel.handleIntent(intent)
     }
 
     @Composable
@@ -417,7 +408,8 @@ class MainViewModel @Inject constructor(
         pauseTime.store(SystemClock.uptimeMillis())
     }
 
-    fun onNotification(walletIndex: Int) = viewModelScope.launch(Dispatchers.IO) {
+
+    suspend fun onWallet(walletIndex: Int) {
         walletIndex.takeIf { it > 0 }?.let { walletIndex ->
             if (sessionRepository.getSession()?.wallet?.index != walletIndex) {
                 walletsRepository.getAll().firstOrNull()?.firstOrNull { it.index == walletIndex }?.let {
@@ -427,6 +419,22 @@ class MainViewModel @Inject constructor(
         }
     }
 
+    fun handleIntent(intent: Intent) {
+        viewModelScope.launch(Dispatchers.IO) {
+            if (intent.hasExtra("walletIndex")) {
+                val walletIndex = intent.getIntExtra("walletIndex", -1)
+                onWallet(walletIndex)
+            }
+
+            val data = intent.data ?: return@launch
+
+            when (data.scheme) {
+                "wc" -> addPairing(data.toString())
+                else -> this@MainViewModel.intent.update { intent }
+
+            }
+        }
+    }
 
     data class MainState(
         val initialAuth: AuthState = AuthState.Required,

app/src/main/kotlin/com/gemwallet/android/features/notifications/ShowSystemNotification.kt

@@ -17,7 +17,6 @@ import com.gemwallet.android.MainActivity
 import com.gemwallet.android.cases.pushes.ShowSystemNotification
 import com.gemwallet.android.ui.R
 import com.gemwallet.android.ui.navigation.routes.assetRouteUri
-import com.gemwallet.android.ui.navigation.routes.transactionRouteUri
 import com.wallet.core.primitives.PushNotificationAsset
 import com.wallet.core.primitives.PushNotificationTransaction
 import dagger.hilt.android.qualifiers.ApplicationContext
@@ -42,7 +41,7 @@ class ShowSystemNotification @Inject constructor(@ApplicationContext val applica
         val extra = Bundle().apply {
             putInt("walletIndex", data.walletIndex)
         }
-        showNotification(title, subtitle, channelId, extra, "$transactionRouteUri/${data.transactionId}".toUri())
+        showNotification(title, subtitle, channelId, extra, "$assetRouteUri/${data.assetId}".toUri())
     }
 
     override fun showNotification(

app/src/main/kotlin/com/gemwallet/android/ui/navigation/WalletNavGraph.kt

@@ -122,135 +122,130 @@ fun WalletNavGraph(
             MainScreen(navController = navController, currentTab = currentTab)
         }
 
-        navigation(
-            startDestination = assetsRoute,
-            route = "wallet-group",
-        ) {
-            assetsScreen(
-                onShowWallets = navController::navigateToWalletsScreen,
-                onShowAssetManage = navController::navigateToAssetsManageScreen,
-                onSendClick = navController::navigateToRecipientInput,
-                onReceiveClick = navController::navigateToReceiveScreen,
-                onBuyClick = navController::navigateToBuyScreen,
-                onAssetClick = navController::navigateToAssetScreen,
-            )
-
-            assetScreen(
-                onCancel = onCancel,
-                onTransfer = navController::navigateToRecipientInput,
-                onReceive = navController::navigateToReceiveScreen,
-                onBuy = navController::navigateToBuyScreen,
-                onSwap = navController::navigateToSwap,
-                onTransaction = navController::navigateToTransactionScreen,
-                onChart = navController::navigateToAssetChartScreen,
-                openNetwork = navController::navigateToAssetScreen,
-                onStake = navController::navigateToStake,
-                onConfirm = navController::navigateToConfirmScreen
-            )
+        assetsScreen(
+            onShowWallets = navController::navigateToWalletsScreen,
+            onShowAssetManage = navController::navigateToAssetsManageScreen,
+            onSendClick = navController::navigateToRecipientInput,
+            onReceiveClick = navController::navigateToReceiveScreen,
+            onBuyClick = navController::navigateToBuyScreen,
+            onAssetClick = navController::navigateToAssetScreen,
+        )
 
-            assetChartScreen(
-                onCancel = onCancel
-            )
+        assetScreen(
+            onCancel = onCancel,
+            onTransfer = navController::navigateToRecipientInput,
+            onReceive = navController::navigateToReceiveScreen,
+            onBuy = navController::navigateToBuyScreen,
+            onSwap = navController::navigateToSwap,
+            onTransaction = navController::navigateToTransactionScreen,
+            onChart = navController::navigateToAssetChartScreen,
+            openNetwork = navController::navigateToAssetScreen,
+            onStake = navController::navigateToStake,
+            onConfirm = navController::navigateToConfirmScreen
+        )
 
-            assetsManageScreen(
-                onAddAsset = navController::navigateToAddAssetScreen,
-                onCancel = onCancel,
-            )
+        assetChartScreen(
+            onCancel = onCancel
+        )
 
-            navigation<Transfer>(startDestination = SendSelect) {
-                swap(
-                    onConfirm = navController::navigateToConfirmScreen,
-                    onCancel = onCancel
-                )
-
-                recipientInput(
-                    cancelAction = onCancel,
-                    recipientAction = navController::navigateToRecipientInput,
-                    amountAction = navController::navigateToAmountScreen,
-                    confirmAction = navController::navigateToConfirmScreen,
-                )
-
-                amount(
-                    onCancel = onCancel,
-                    onSend = navController::navigateToSendScreen,
-                    onConfirm = navController::navigateToConfirmScreen,
-                )
-
-                confirm(
-                    finishAction = { assetId, hash, route ->
-                        when (route) {
-                            assetRoutePath -> NavigateAfterConfirm.Transfer(assetId).navigate(navController)
-                            stakeRoute -> NavigateAfterConfirm.Stake(assetId).navigate(navController)
-                            swapRoute -> NavigateAfterConfirm.Swap(assetId).navigate(navController)
-                        }
-                    },
-                    onBuy = navController::navigateToBuyScreen,
-                    cancelAction = onCancel
-                )
-            }
+        assetsManageScreen(
+            onAddAsset = navController::navigateToAddAssetScreen,
+            onCancel = onCancel,
+        )
 
-            nftCollection(
-                cancelAction = onCancel,
-                collectionIdAction = navController::navigateToNftCollection,
-                assetIdAction = navController::navigateToNftAsset,
-                onRecipient = navController::navigateToRecipientInput
+        navigation<Transfer>(startDestination = SendSelect) {
+            swap(
+                onConfirm = navController::navigateToConfirmScreen,
+                onCancel = onCancel
             )
 
-            fiatScreen(
+            recipientInput(
                 cancelAction = onCancel,
-                onBuy = navController::navigateToBuyScreen
+                recipientAction = navController::navigateToRecipientInput,
+                amountAction = navController::navigateToAmountScreen,
+                confirmAction = navController::navigateToConfirmScreen,
             )
 
-            receiveScreen(
+            amount(
                 onCancel = onCancel,
-                onReceive = navController::navigateToReceiveScreen,
+                onSend = navController::navigateToSendScreen,
+                onConfirm = navController::navigateToConfirmScreen,
             )
 
-            walletsScreen(
-                onCreateWallet = navController::navigateToCreateWalletRulesScreen,
-                onImportWallet = navController::navigateToImportWalletScreen,
-                onEditWallet = navController::navigateToWalletScreen,
-                onSelectWallet = {
-                    navController.navigateToRoot()
-                    currentTab.value = assetsRoute
-                },
-                onBoard = {
-                    navController.navigate(OnboardingDest.route) {
-                        popUpTo(0) {
-                            inclusive = true
-                        }
+            confirm(
+                finishAction = { assetId, hash, route ->
+                    when (route) {
+                        assetRoutePath -> NavigateAfterConfirm.Transfer(assetId).navigate(navController)
+                        stakeRoute -> NavigateAfterConfirm.Stake(assetId).navigate(navController)
+                        swapRoute -> NavigateAfterConfirm.Swap(assetId).navigate(navController)
                     }
                 },
-                onCancel = onCancel
+                onBuy = navController::navigateToBuyScreen,
+                cancelAction = onCancel
             )
+        }
 
-            walletScreen(
-                onCancel = onCancel,
-                onBoard = {
-                    navController.navigate(OnboardingDest.route) {
-                        popUpTo(0) {
-                            inclusive = true
-                        }
-                    }
-                },
-                onPhraseShow = navController::navigateToPhraseScreen
-            )
+        nftCollection(
+            cancelAction = onCancel,
+            collectionIdAction = navController::navigateToNftCollection,
+            assetIdAction = navController::navigateToNftAsset,
+            onRecipient = navController::navigateToRecipientInput
+        )
 
-            stake(
-                onAmount = navController::navigateToAmountScreen,
-                onConfirm = navController::navigateToConfirmScreen,
-                onDelegation = navController::navigateToDelegation,
-                onCancel = onCancel,
-            )
+        fiatScreen(
+            cancelAction = onCancel,
+            onBuy = navController::navigateToBuyScreen
+        )
 
-            addAssetScreen(
-                onCancel = onCancel,
-                onFinish = {
-                    navController.navigateToRoot()
-                    currentTab.value = assetsRoute
+        receiveScreen(
+            onCancel = onCancel,
+            onReceive = navController::navigateToReceiveScreen,
+        )
+
+        walletsScreen(
+            onCreateWallet = navController::navigateToCreateWalletRulesScreen,
+            onImportWallet = navController::navigateToImportWalletScreen,
+            onEditWallet = navController::navigateToWalletScreen,
+            onSelectWallet = {
+                navController.navigateToRoot()
+                currentTab.value = assetsRoute
+            },
+            onBoard = {
+                navController.navigate(OnboardingDest.route) {
+                    popUpTo(0) {
+                        inclusive = true
+                    }
                 }
-            )
-        }
+            },
+            onCancel = onCancel
+        )
+
+        walletScreen(
+            onCancel = onCancel,
+            onBoard = {
+                navController.navigate(OnboardingDest.route) {
+                    popUpTo(0) {
+                        inclusive = true
+                    }
+                }
+            },
+            onPhraseShow = navController::navigateToPhraseScreen
+        )
+
+        stake(
+            onAmount = navController::navigateToAmountScreen,
+            onConfirm = navController::navigateToConfirmScreen,
+            onDelegation = navController::navigateToDelegation,
+            onCancel = onCancel,
+        )
+
+        addAssetScreen(
+            onCancel = onCancel,
+            onFinish = {
+                navController.navigateToRoot()
+                currentTab.value = assetsRoute
+            }
+        )
 
         activitiesScreen(onTransaction = navController::navigateToTransactionScreen)
 

app/src/main/kotlin/com/gemwallet/android/ui/navigation/routes/Activities.kt

@@ -14,7 +14,6 @@ import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
 const val activitiesRoute = "transactions"
-const val transactionRoute = "transaction"
 const val transactionRouteUri = "gem://transaction"
 
 @Serializable

app/src/main/kotlin/com/gemwallet/android/ui/navigation/routes/Asset.kt

@@ -12,14 +12,17 @@ import com.gemwallet.android.ui.models.actions.AssetIdAction
 import com.gemwallet.features.asset.presents.chart.views.AssetChartScene
 import com.gemwallet.features.asset.presents.details.views.AssetDetailsScene
 import com.wallet.core.primitives.AssetId
+import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
 
 const val assetRoutePath = "asset"
-const val assetRouteUri = "gem://$assetRoutePath"
+const val assetRouteUri = "gem://asset"
 
 @Serializable
-data class AssetRoute(val assetId: String)
+data class AssetRoute(
+    @SerialName("assetId") val assetId: String
+)
 
 @Serializable
 data class AssetChartRoute(val assetId: String)

data/repositories/src/main/kotlin/com/gemwallet/android/data/repositoreis/session/SessionRepositoryImpl.kt

@@ -37,7 +37,7 @@ class SessionRepositoryImpl(
 
     override fun hasSession(): Boolean = getSession() != null
 
-    override suspend fun setWallet(wallet: Wallet)  = withContext(Dispatchers.IO) {
+    override suspend fun setWallet(wallet: Wallet) {
         val oldSession = runBlocking(Dispatchers.IO) { sessionDao.getSession() }
         val session = if (oldSession == null) {
             DbSession( // Create session

data/repositories/src/main/kotlin/com/gemwallet/android/data/repositoreis/transactions/SyncTransactionsService.kt

@@ -1,5 +1,6 @@
 package com.gemwallet.android.data.repositoreis.transactions
 
+import android.util.Log
 import com.gemwallet.android.cases.device.GetDeviceIdCase
 import com.gemwallet.android.cases.transactions.GetTransactionUpdateTime
 import com.gemwallet.android.cases.transactions.PutTransactions
@@ -25,7 +26,7 @@ class SyncTransactionsService @Inject constructor(
 
     override suspend fun syncTransactions(wallet: Wallet) = withContext(Dispatchers.IO) {
         val deviceId = getDeviceIdCase.getDeviceId()
-        val lastSyncTime = getTransactionUpdateTime.getTransactionUpdateTime(wallet.id) / 1000
+        val lastSyncTime = getTransactionUpdateTime.getTransactionUpdateTime(wallet.id) / 1000L
         val response = runCatching {
             val result: List<Transaction>? = try {
                 gemApiClient.getTransactions(deviceId, wallet.index, lastSyncTime)

data/services/store/src/main/kotlin/com/gemwallet/android/data/service/store/database/GemDatabase.kt

@@ -31,7 +31,7 @@ import com.gemwallet.android.data.service.store.database.entities.DbTxSwapMetada
 import com.gemwallet.android.data.service.store.database.entities.DbWallet
 
 @Database(
-    version = 51,
+    version = 52,
     entities = [
         DbWallet::class,
         DbAccount::class,

data/services/store/src/main/kotlin/com/gemwallet/android/data/service/store/database/di/DatabaseModule.kt

@@ -86,6 +86,7 @@ object DatabaseModule {
         .addMigrations(Migration_48_49)
         .addMigrations(Migration_49_50)
         .addMigrations(Migration_50_51)
+        .addMigrations(Migration_51_52)
         .build()
 
     @Singleton

data/services/store/src/main/kotlin/com/gemwallet/android/data/service/store/database/di/Migration_51_52.kt

@@ -0,0 +1,10 @@
+package com.gemwallet.android.data.service.store.database.di
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+object Migration_51_52 : Migration(51, 52) {
+    override fun migrate(db: SupportSQLiteDatabase) {
+        db.execSQL("DELETE FROM transactions")
+    }
+}