fix(flipcash): handle notification presentation while app in foreground

also expose push token when beta enabled

Signed-off-by: Brandon McAnsh <git@bmcreations.dev>

Author: bmc08gt

apps/flipcash/app/src/main/AndroidManifest.xml

@@ -10,7 +10,6 @@
     <uses-permission android:name="android.permission.CAMERA" />
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <!-- needed for network connectivity detection in Api24NetworkObserver -->

apps/flipcash/core/src/main/res/values/strings.xml

@@ -103,6 +103,7 @@
     <string name="title_clipboardLabelDepositAddress">Deposit Address</string>
     <string name="title_clipboardLabelPublicKey">Public Key</string>
     <string name="title_clipboardLabelAccountId">Account ID</string>
+    <string name="title_clipboardLabelPushToken">Push Token</string>
 
     <string name="prompt_description_viewAccessKey">Your Access Key will grant access to your Flipcash account. Keep it private and safe.</string>
 

apps/flipcash/features/myaccount/src/main/kotlin/com/flipcash/app/myaccount/internal/AccountInfoHeader.kt

@@ -47,15 +47,26 @@ internal fun AccountInfoHeader(
             modifier = Modifier.fillMaxSize(),
             verticalArrangement = Arrangement.spacedBy(CodeTheme.dimens.grid.x1)
         ) {
-            CopyableTextEntry(
-                label = "Public Key",
-                value = state.publicKey.orEmpty()
-            ) { dispatch(MyAccountScreenViewModel.Event.CopyPublicKey) }
+            if (!state.publicKey.isNullOrEmpty()) {
+                CopyableTextEntry(
+                    label = "Public Key",
+                    value = state.publicKey
+                ) { dispatch(MyAccountScreenViewModel.Event.CopyPublicKey) }
+            }
 
-            CopyableTextEntry(
-                label = "Account ID",
-                value = state.accountId.orEmpty()
-            ) { dispatch(MyAccountScreenViewModel.Event.CopyAccountId) }
+            if (!state.accountId.isNullOrEmpty()) {
+                CopyableTextEntry(
+                    label = "Account ID",
+                    value = state.accountId
+                ) { dispatch(MyAccountScreenViewModel.Event.CopyAccountId) }
+            }
+
+            if (!state.pushToken.isNullOrEmpty()) {
+                CopyableTextEntry(
+                    label = "Push Token",
+                    value = state.pushToken
+                ) { dispatch(MyAccountScreenViewModel.Event.CopyPushToken) }
+            }
 
             BetaIndicator(
                 modifier = Modifier.align(Alignment.End)

apps/flipcash/features/myaccount/src/main/kotlin/com/flipcash/app/myaccount/internal/MyAccountScreenViewModel.kt

@@ -47,30 +47,42 @@ internal class MyAccountScreenViewModel @Inject constructor(
         val showAccountInfo: Boolean = false,
         val accountId: String? = null,
         val publicKey: String? = null,
+        val pushToken: String? = null,
         val items: List<MenuItem<Event>> = FullMenuList
     )
 
     internal sealed interface Event {
-        data class OnUserAssociated(val userId: String?, val publicKey: String?) : Event
+        data class OnUserAssociated(
+            val userId: String?,
+            val publicKey: String?,
+            val pushToken: String? = null
+        ) : Event
+
         data class OnBetaFeaturesUnlocked(val unlocked: Boolean) : Event
-        data object OnTitleClicked: Event
+        data object OnTitleClicked : Event
         data class ToggleAccountInfo(val show: Boolean) : Event
         data object OnAccessKeyClicked : Event
-        data object OnViewAccessKey: Event
+        data object OnViewAccessKey : Event
         data object OnDeleteAccountClicked : Event
         data object OnAccountDeleted : Event
         data object CopyPublicKey : Event
         data object CopyAccountId : Event
+        data object CopyPushToken : Event
     }
 
     init {
         userManager.state
-            .map { it.accountId to it.cluster }
-            .onEach { (id, cluster) ->
-                val userId = id?.base58
-                val publicKey = cluster?.authorityPublicKey?.base58()
-
-                dispatchEvent(Event.OnUserAssociated(userId, publicKey))
+            .onEach {
+                val userId = it.accountId?.base58
+                val publicKey = it.cluster?.authorityPublicKey?.base58()
+
+                dispatchEvent(
+                    Event.OnUserAssociated(
+                        userId = userId,
+                        publicKey = publicKey,
+                        pushToken = it.pushToken
+                    )
+                )
             }.launchIn(viewModelScope)
 
         combine(
@@ -138,6 +150,16 @@ internal class MyAccountScreenViewModel @Inject constructor(
                 )
             }.launchIn(viewModelScope)
 
+        eventFlow
+            .filterIsInstance<Event.CopyPushToken>()
+            .mapNotNull { stateFlow.value.pushToken }
+            .onEach {
+                clipboardManager.setText(
+                    text = it,
+                    label = resources.getString(R.string.title_clipboardLabelPushToken)
+                )
+            }.launchIn(viewModelScope)
+
         eventFlow
             .filterIsInstance<Event.OnAccessKeyClicked>()
             .onEach {
@@ -161,12 +183,14 @@ internal class MyAccountScreenViewModel @Inject constructor(
                     state.copy(
                         accountId = event.userId,
                         publicKey = event.publicKey,
+                        pushToken = event.pushToken
                     )
                 }
 
                 Event.OnViewAccessKey,
                 Event.CopyPublicKey,
                 Event.CopyAccountId,
+                Event.CopyPushToken,
                 Event.OnTitleClicked,
                 Event.OnDeleteAccountClicked,
                 Event.OnAccountDeleted,

apps/flipcash/shared/authentication/src/main/kotlin/com/flipcash/app/auth/AuthManager.kt

@@ -198,6 +198,7 @@ class AuthManager @Inject constructor(
         val pushToken = Firebase.messaging.token() ?: return
         pushController.addToken(pushToken)
             .onSuccess {
+                userManager.set(pushToken = pushToken)
                 trace("push token updated", type = TraceType.Silent)
             }.onFailure {
                 trace(message = "Failure updating push token", error = it)

apps/flipcash/shared/notifications/src/main/AndroidManifest.xml

@@ -1,5 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+
     <application>
         <service
             android:name="com.flipcash.app.notifications.NotificationService"
@@ -15,7 +17,7 @@
 
         <meta-data
             android:name="com.google.firebase.messaging.default_notification_color"
-            android:value="#FF001A0C" />
+            android:value="@color/notification_color" />
     </application>
 
 </manifest>

apps/flipcash/shared/notifications/src/main/kotlin/com/flipcash/app/notifications/NotificationService.kt

@@ -1,15 +1,30 @@
 package com.flipcash.app.notifications
 
+import android.Manifest
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.media.RingtoneManager
+import android.net.Uri
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.toArgb
+import androidx.core.app.ActivityCompat
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationManagerCompat
 import com.flipcash.app.auth.AuthManager
 import com.flipcash.services.controllers.PushController
 import com.flipcash.services.user.UserManager
+import com.flipcash.shared.notifications.R
 import com.getcode.utils.TraceType
 import com.getcode.utils.trace
 import com.google.firebase.messaging.FirebaseMessagingService
+import com.google.firebase.messaging.RemoteMessage
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import java.security.SecureRandom
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -24,12 +39,16 @@ class NotificationService: FirebaseMessagingService(), CoroutineScope by Corouti
     @Inject
     lateinit var pushController: PushController
 
+    @Inject
+    lateinit var notificationManager: NotificationManagerCompat
+
     override fun onNewToken(token: String) {
         super.onNewToken(token)
         authenticateIfNeeded {
             launch {
                 pushController.addToken(token)
                     .onSuccess {
+                        userManager.set(pushToken = token)
                         trace("push token updated", type = TraceType.Silent)
                     }.onFailure {
                         trace(message = "Failure updating push token", error = it)
@@ -38,11 +57,47 @@ class NotificationService: FirebaseMessagingService(), CoroutineScope by Corouti
         }
     }
 
+    override fun onMessageReceived(message: RemoteMessage) {
+        super.onMessageReceived(message)
+        message.notification?.let { notification ->
+            val notificationBuilder: NotificationCompat.Builder =
+                NotificationCompat.Builder(this, "fcm_fallback_notification_channel")
+                    .setPriority(NotificationCompat.PRIORITY_HIGH)
+                    .setSound(RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION))
+                    .setSmallIcon(R.drawable.flipcash_logo)
+                    .setColor(getColor(R.color.notification_color))
+                    .setAutoCancel(true)
+                    .setContentTitle(notification.title)
+                    .setContentText(notification.body)
+                    .setContentIntent(buildContentIntent())
+
+            val random = SecureRandom()
+            val notificationId = random.nextInt(256)
+
+            if (ActivityCompat.checkSelfPermission(
+                    this,
+                    Manifest.permission.POST_NOTIFICATIONS
+                ) == PackageManager.PERMISSION_GRANTED
+            ) {
+                notificationManager.notify(notificationId, notificationBuilder.build())
+            }
+        }
+    }
+
     private fun authenticateIfNeeded(block: () -> Unit) {
         if (userManager.accountCluster == null) {
             authManager.init { block() }
         } else {
             block()
         }
     }
+
+    internal fun Context.buildContentIntent(): PendingIntent {
+        return PendingIntent.getActivity(
+            this,
+            99,
+            packageManager.getLaunchIntentForPackage(packageName),
+            PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
+        )
+    }
 }

apps/flipcash/shared/notifications/src/main/res/values/colors.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="notification_color">#FF001A0C</color>
+</resources>

services/flipcash/src/main/kotlin/com/flipcash/services/user/UserManager.kt

@@ -12,6 +12,8 @@ import com.getcode.opencode.model.core.ID
 import com.getcode.opencode.model.core.NoId
 import com.getcode.opencode.model.core.uuid
 import com.getcode.services.opencode.BuildConfig
+import com.google.firebase.ktx.Firebase
+import com.google.firebase.messaging.ktx.messaging
 import com.hoc081098.channeleventbus.ChannelEventBus
 import com.mixpanel.android.mpmetrics.MixpanelAPI
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -76,12 +78,17 @@ class UserManager @Inject constructor(
         val accountId: ID? = null,
         val flags: UserFlags? = null,
         val isTimelockUnlocked: Boolean = false,
+        val pushToken: String? = null,
     )
 
     init {
         balanceController.onTimelockUnlocked = {
             didDetectUnlockedAccount()
         }
+
+        Firebase.messaging.token.addOnSuccessListener { token ->
+            set(pushToken = token)
+        }
     }
 
     fun establish(entropy: String) {
@@ -133,6 +140,10 @@ class UserManager @Inject constructor(
         associate()
     }
 
+    fun set(pushToken: String?) {
+        _state.update { it.copy(pushToken = pushToken) }
+    }
+
     private fun didDetectUnlockedAccount() {
         _state.update {
             if (!it.isTimelockUnlocked) {