(android) Remove splash payment navigation for offers

Incoming payment for offers display a "payment received"
system notification.

Author: dpad85

phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/AppView.kt

@@ -57,6 +57,7 @@ import com.google.accompanist.permissions.ExperimentalPermissionsApi
 import com.google.accompanist.permissions.isGranted
 import com.google.accompanist.permissions.rememberPermissionState
 import com.google.firebase.messaging.FirebaseMessaging
+import fr.acinq.lightning.db.IncomingPayment
 import fr.acinq.lightning.utils.currentTimestampMillis
 import fr.acinq.phoenix.PhoenixBusiness
 import fr.acinq.phoenix.android.components.Button
@@ -89,6 +90,7 @@ import fr.acinq.phoenix.android.settings.walletinfo.SwapInWallet
 import fr.acinq.phoenix.android.settings.walletinfo.WalletInfoView
 import fr.acinq.phoenix.android.startup.LegacySwitcherView
 import fr.acinq.phoenix.android.startup.StartupView
+import fr.acinq.phoenix.android.utils.SystemNotificationHelper
 import fr.acinq.phoenix.android.utils.appBackground
 import fr.acinq.phoenix.android.utils.logger
 import fr.acinq.phoenix.data.BitcoinUnit
@@ -479,11 +481,18 @@ fun AppView(
 
     val isDataMigrationExpected by LegacyPrefsDatastore.getDataMigrationExpected(context).collectAsState(initial = null)
     val lastCompletedPayment by business.paymentsManager.lastCompletedPayment.collectAsState()
-    lastCompletedPayment?.let {
-//        log.debug { "completed payment=${lastCompletedPayment?.id()} with data-migration=$isDataMigrationExpected" }
-        LaunchedEffect(key1 = it.walletPaymentId()) {
+    val userPrefs = userPrefs
+    val exchangeRates = fiatRates
+    lastCompletedPayment?.let { payment ->
+        LaunchedEffect(key1 = payment.walletPaymentId()) {
             if (isDataMigrationExpected == false) {
-                navigateToPaymentDetails(navController, id = it.walletPaymentId(), isFromEvent = true)
+                if (payment is IncomingPayment && payment.origin is IncomingPayment.Origin.Offer) {
+                    SystemNotificationHelper.notifyPaymentsReceived(
+                        context, userPrefs, paymentHash = payment.paymentHash, amount = payment.amount, rates = exchangeRates, isHeadless = false
+                    )
+                } else {
+                    navigateToPaymentDetails(navController, id = payment.walletPaymentId(), isFromEvent = true)
+                }
             }
         }
     }

phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/utils/SystemNotificationHelper.kt

@@ -277,17 +277,10 @@ object SystemNotificationHelper {
         return NotificationCompat.Builder(context, PAYMENT_RECEIVED_NOTIF_CHANNEL).apply {
             setContentTitle(context.getString(R.string.notif_headless_received, amount.toPrettyString(unit, rate, withUnit = true)))
             setSmallIcon(R.drawable.ic_phoenix_outline)
-            setContentIntent(TaskStackBuilder.create(context).run {
-                addNextIntentWithParentStack(
-                    Intent(
-                        Intent.ACTION_VIEW,
-                        "phoenix:payments/${WalletPaymentId.DbType.INCOMING.value}/${paymentHash.toHex()}".toUri(),
-                        context,
-                        MainActivity::class.java
-                    )
-                )
-                getPendingIntent(0, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)
-            })
+            val intent = Intent(Intent.ACTION_VIEW,"phoenix:payments/${WalletPaymentId.DbType.INCOMING.value}/${paymentHash.toHex()}".toUri(), context, MainActivity::class.java).apply {
+                Intent.FLAG_ACTIVITY_SINGLE_TOP
+            }
+            setContentIntent(PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT))
             setAutoCancel(true)
         }.build().also {
             if (ActivityCompat.checkSelfPermission(context, Manifest.permission.POST_NOTIFICATIONS) == PackageManager.PERMISSION_GRANTED) {

phoenix-shared/src/commonMain/kotlin/fr.acinq.phoenix/managers/PaymentsManager.kt

@@ -3,6 +3,8 @@ package fr.acinq.phoenix.managers
 import fr.acinq.bitcoin.TxId
 import fr.acinq.lightning.blockchain.electrum.ElectrumClient
 import fr.acinq.lightning.db.InboundLiquidityOutgoingPayment
+import fr.acinq.lightning.db.IncomingPayment
+import fr.acinq.lightning.db.LightningOutgoingPayment
 import fr.acinq.lightning.db.SpliceCpfpOutgoingPayment
 import fr.acinq.lightning.db.WalletPayment
 import fr.acinq.lightning.logging.LoggerFactory
@@ -87,8 +89,11 @@ class PaymentsManager(
             if (index > 0) {
                 for (row in list) {
                     val paymentInfo = fetcher.getPayment(row, WalletPaymentFetchOptions.None)
-                    if (paymentInfo?.payment is InboundLiquidityOutgoingPayment || paymentInfo?.payment is SpliceCpfpOutgoingPayment) {
-                        // ignore cpfp/inbound
+                    val payment = paymentInfo?.payment
+                    if (payment is InboundLiquidityOutgoingPayment || payment is SpliceCpfpOutgoingPayment
+                        || (payment is LightningOutgoingPayment && payment.details is LightningOutgoingPayment.Details.Blinded)
+                    ) {
+                        // ignore cpfp/inbound/blinded
                     } else {
                         val completedAt = paymentInfo?.payment?.completedAt
                         if (completedAt != null && completedAt > appLaunchTimestamp) {