TIQR-453: Open recent notification if available

Tiqr · Aug 29, 2024 · 04af82c · 04af82c
1 parent 566ab1e
commit 04af82c
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 6 deletions.
diff --git a/app/src/main/kotlin/nl/eduid/ActivityViewModel.kt b/app/src/main/kotlin/nl/eduid/ActivityViewModel.kt
@@ -0,0 +1,18 @@
+package nl.eduid
+
+import android.content.Context
+import androidx.lifecycle.ViewModel
+import dagger.hilt.android.lifecycle.HiltViewModel
+import org.tiqr.data.repository.NotificationCacheRepository
+import javax.inject.Inject
+
+@HiltViewModel
+class ActivityViewModel @Inject constructor(
+    private val notificationCacheRepository: NotificationCacheRepository
+): ViewModel() {
+
+    fun getLastNotificationChallenge(context: Context): String? {
+        return notificationCacheRepository.getLastNotificationChallenge(context)
+    }
+
+}
diff --git a/app/src/main/kotlin/nl/eduid/MainComposeActivity.kt b/app/src/main/kotlin/nl/eduid/MainComposeActivity.kt
@@ -1,10 +1,14 @@
 package nl.eduid
 
 import android.content.Intent
+import android.net.Uri
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
+import androidx.activity.viewModels
+import androidx.navigation.NavController
+import androidx.navigation.NavHostController
 import androidx.navigation.compose.rememberNavController
 import dagger.hilt.android.AndroidEntryPoint
 import nl.eduid.graphs.MainGraph
@@ -14,12 +18,18 @@ import timber.log.Timber
 @AndroidEntryPoint
 class MainComposeActivity : ComponentActivity() {
 
+    internal val viewModel by viewModels<ActivityViewModel>()
+    private var navController: NavHostController? = null
+
     override fun onCreate(savedInstanceState: Bundle?) {
         enableEdgeToEdge()
         super.onCreate(savedInstanceState)
         setContent {
             EduidAppAndroidTheme {
-                MainGraph(navController = rememberNavController())
+                navController = rememberNavController().also {
+                    MainGraph(navController = it)
+                }
+
             }
         }
     }
@@ -29,5 +39,14 @@ class MainComposeActivity : ComponentActivity() {
         if (intent != null && intent.action == Intent.ACTION_VIEW) {
             Timber.d("Intent captured by MainComposeActivity ${this.hashCode()}: Received: ${intent.dataString}.")
         }
+        if (intent?.dataString == null) {
+            viewModel.getLastNotificationChallenge(this)?.let { challenge ->
+                if (intent == null) {
+                    intent = Intent()
+                }
+                intent.setData(Uri.parse(challenge))
+                navController?.navigate(Uri.parse(challenge))
+            }
+        }
     }
-}
+}
diff --git a/app/src/main/kotlin/nl/eduid/messaging/EduIdMessagingService.kt b/app/src/main/kotlin/nl/eduid/messaging/EduIdMessagingService.kt
@@ -17,6 +17,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.launch
 import nl.eduid.R
+import org.tiqr.data.repository.NotificationCacheRepository
 import org.tiqr.data.repository.base.TokenRegistrarRepository
 import timber.log.Timber
 import javax.inject.Inject
@@ -33,13 +34,16 @@ class EduIdMessagingService : FirebaseMessagingService() {
     private val scope = CoroutineScope(Dispatchers.IO + job)
 
     @Inject
-    internal lateinit var repository: TokenRegistrarRepository
+    internal lateinit var tokenRegistrarRepository: TokenRegistrarRepository
+
+    @Inject
+    internal lateinit var notificationCacheRepository: NotificationCacheRepository
 
     override fun onNewToken(token: String) {
         super.onNewToken(token)
 
         scope.launch {
-            repository.registerDeviceToken(token)
+            tokenRegistrarRepository.registerDeviceToken(token)
         }
     }
 
@@ -96,8 +100,11 @@ class EduIdMessagingService : FirebaseMessagingService() {
                 .setColor(resources.getColor(R.color.primaryColor))
                 .build()
                 .apply {
-                    Timber.e("Sending notification")
-                    notificationManager.notify(0, this)
+                    val identifier = System.currentTimeMillis().toInt()
+                    Timber.e("Sending notification with ID: $identifier")
+                    val authenticationTimeout = message.data["authenticationTimeout"]?.toIntOrNull() ?: 150
+                    notificationManager.notify(identifier, this)
+                    notificationCacheRepository.saveLastNotificationData(challenge, authenticationTimeout, identifier)
                 }
         }
     }