Merge branch 'master' into fix/wake-node-polish

Author: ovitrif

app/src/main/java/to/bitkit/data/CacheStore.kt

@@ -98,10 +98,6 @@ class CacheStore @Inject constructor(
         }
     }
 
-    suspend fun setLastLightningPayment(paymentId: String) {
-        store.updateData { it.copy(lastLightningPaymentId = paymentId) }
-    }
-
     suspend fun setBackgroundReceive(details: NewTransactionSheetDetails) = store.updateData {
         it.copy(backgroundReceive = details)
     }
@@ -130,7 +126,6 @@ data class AppCacheData(
     val balance: BalanceState? = null,
     val backupStatuses: Map<BackupCategory, BackupItemStatus> = mapOf(),
     val deletedActivities: List<String> = listOf(),
-    val lastLightningPaymentId: String? = null,
     val pendingBoostActivities: List<PendingBoostActivity> = listOf(),
     val backgroundReceive: NewTransactionSheetDetails? = null,
 ) {

app/src/main/java/to/bitkit/domain/commands/NotifyPaymentReceivedHandler.kt

@@ -36,38 +36,13 @@ class NotifyPaymentReceivedHandler @Inject constructor(
     ): Result<NotifyPaymentReceived.Result> = withContext(ioDispatcher) {
         runCatching {
             val shouldShow = when (command) {
-                is NotifyPaymentReceived.Command.Lightning -> true
-                is NotifyPaymentReceived.Command.Onchain -> {
-                    activityRepo.handleOnchainTransactionReceived(command.event.txid, command.event.details)
-                    if (command.event.details.amountSats > 0) {
-                        delay(DELAY_FOR_ACTIVITY_SYNC_MS)
-                        activityRepo.shouldShowReceivedSheet(
-                            command.event.txid,
-                            command.event.details.amountSats.toULong()
-                        )
-                    } else {
-                        false
-                    }
-                }
+                is NotifyPaymentReceived.Command.Lightning -> shouldShowLightning(command)
+                is NotifyPaymentReceived.Command.Onchain -> shouldShowOnchain(command)
             }
 
             if (!shouldShow) return@runCatching NotifyPaymentReceived.Result.Skip
 
-            val details = NewTransactionSheetDetails(
-                type = when (command) {
-                    is NotifyPaymentReceived.Command.Lightning -> NewTransactionSheetType.LIGHTNING
-                    is NotifyPaymentReceived.Command.Onchain -> NewTransactionSheetType.ONCHAIN
-                },
-                direction = NewTransactionSheetDirection.RECEIVED,
-                paymentHashOrTxId = when (command) {
-                    is NotifyPaymentReceived.Command.Lightning -> command.event.paymentHash
-                    is NotifyPaymentReceived.Command.Onchain -> command.event.txid
-                },
-                sats = when (command) {
-                    is NotifyPaymentReceived.Command.Lightning -> (command.event.amountMsat / 1000u).toLong()
-                    is NotifyPaymentReceived.Command.Onchain -> command.event.details.amountSats
-                },
-            )
+            val details = buildSheetDetails(command)
 
             if (command.includeNotification) {
                 val notification = buildNotificationContent(details.sats)
@@ -80,6 +55,45 @@ class NotifyPaymentReceivedHandler @Inject constructor(
         }
     }
 
+    private suspend fun shouldShowLightning(command: NotifyPaymentReceived.Command.Lightning): Boolean {
+        val paymentId = command.event.paymentId ?: return false
+        delay(DELAY_FOR_ACTIVITY_SYNC_MS)
+        if (activityRepo.isActivitySeen(paymentId)) return false
+        activityRepo.markActivityAsSeen(paymentId)
+        return true
+    }
+
+    private suspend fun shouldShowOnchain(command: NotifyPaymentReceived.Command.Onchain): Boolean {
+        activityRepo.handleOnchainTransactionReceived(command.event.txid, command.event.details)
+        if (command.event.details.amountSats <= 0) return false
+
+        delay(DELAY_FOR_ACTIVITY_SYNC_MS)
+        val shouldShowSheet = activityRepo.shouldShowReceivedSheet(
+            command.event.txid,
+            command.event.details.amountSats.toULong()
+        )
+        if (shouldShowSheet) {
+            activityRepo.markOnchainActivityAsSeen(command.event.txid)
+        }
+        return shouldShowSheet
+    }
+
+    private fun buildSheetDetails(command: NotifyPaymentReceived.Command) = NewTransactionSheetDetails(
+        type = when (command) {
+            is NotifyPaymentReceived.Command.Lightning -> NewTransactionSheetType.LIGHTNING
+            is NotifyPaymentReceived.Command.Onchain -> NewTransactionSheetType.ONCHAIN
+        },
+        direction = NewTransactionSheetDirection.RECEIVED,
+        paymentHashOrTxId = when (command) {
+            is NotifyPaymentReceived.Command.Lightning -> command.event.paymentHash
+            is NotifyPaymentReceived.Command.Onchain -> command.event.txid
+        },
+        sats = when (command) {
+            is NotifyPaymentReceived.Command.Lightning -> (command.event.amountMsat / 1000u).toLong()
+            is NotifyPaymentReceived.Command.Onchain -> command.event.details.amountSats
+        },
+    )
+
     private suspend fun buildNotificationContent(sats: Long): NotificationDetails {
         val settings = settingsStore.data.first()
         val title = context.getString(R.string.notification_received_title)

app/src/main/java/to/bitkit/repositories/ActivityRepo.kt

@@ -41,6 +41,7 @@ import javax.inject.Inject
 import javax.inject.Singleton
 import kotlin.time.Clock
 import kotlin.time.ExperimentalTime
+import com.synonym.bitkitcore.TransactionDetails as BitkitCoreTransactionDetails
 
 private const val SYNC_TIMEOUT_MS = 40_000L
 
@@ -232,6 +233,24 @@ class ActivityRepo @Inject constructor(
         return coreService.activity.shouldShowReceivedSheet(txid, value)
     }
 
+    suspend fun isActivitySeen(activityId: String): Boolean {
+        return coreService.activity.isActivitySeen(activityId)
+    }
+
+    suspend fun markActivityAsSeen(activityId: String) {
+        coreService.activity.markActivityAsSeen(activityId)
+        notifyActivitiesChanged()
+    }
+
+    suspend fun markOnchainActivityAsSeen(txid: String) {
+        coreService.activity.markOnchainActivityAsSeen(txid)
+        notifyActivitiesChanged()
+    }
+
+    suspend fun getTransactionDetails(txid: String): Result<BitkitCoreTransactionDetails?> = runCatching {
+        coreService.activity.getTransactionDetails(txid)
+    }
+
     suspend fun getBoostTxDoesExist(boostTxIds: List<String>): Map<String, Boolean> {
         return coreService.activity.getBoostTxDoesExist(boostTxIds)
     }
@@ -529,7 +548,7 @@ class ActivityRepo @Inject constructor(
                         preimage = null,
                         createdAt = now,
                         updatedAt = null,
-                        seenAt = null, // TODO implement synonymdev/bitkit-ios#270 changes
+                        seenAt = null,
                     )
                 )
             )

app/src/main/java/to/bitkit/repositories/LightningRepo.kt

@@ -334,6 +334,12 @@ class LightningRepo @Inject constructor(
         Result.success(Unit)
     }
 
+    fun syncAsync() = scope.launch {
+        sync().onFailure { error ->
+            Logger.warn("Sync failed", e = error, context = TAG)
+        }
+    }
+
     /** Clear pending sync flag. Called when manual pull-to-refresh takes priority. */
     fun clearPendingSync() {
         syncPending.set(false)
@@ -728,12 +734,6 @@ class LightningRepo @Inject constructor(
         Result.success(payments)
     }
 
-    suspend fun getTransactionDetails(txid: Txid): Result<TransactionDetails?> = executeWhenNodeRunning(
-        "Get transaction details by txid"
-    ) {
-        Result.success(lightningService.getTransactionDetails(txid))
-    }
-
     suspend fun getAddressBalance(address: String): Result<ULong> = executeWhenNodeRunning("Get address balance") {
         runCatching {
             lightningService.getAddressBalance(address)