Expect getting firebase token to fail

When called for the first time and there is no internet connection, the token is not returned.
Concordium · Nov 25, 2024 · 8a4db20 · 8a4db20
1 parent bd5daa1
commit 8a4db20
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@
 
 - Crash on launch when Google Play Services is disabled
 - Inconsistent transaction fee for invoke smart contract
+- Crashing when first launching the app offline 
 
 ### Changed
 

diff --git a/...n/java/com/concordium/wallet/core/notifications/UpdateNotificationsSubscriptionUseCase.kt b/...n/java/com/concordium/wallet/core/notifications/UpdateNotificationsSubscriptionUseCase.kt
@@ -21,7 +21,7 @@ class UpdateNotificationsSubscriptionUseCase(
     private val accountRepository: AccountRepository,
     private val notificationsPreferences: NotificationsPreferences,
     private val notificationsBackend: NotificationsBackend,
-    private val application: Application
+    private val application: Application,
 ) {
     constructor(application: Application) : this(
         accountRepository = WalletDatabase.getDatabase(application).accountDao()
@@ -31,16 +31,28 @@ class UpdateNotificationsSubscriptionUseCase(
         application = application
     )
 
+    /**
+     * @return **true** on successful update
+     */
     suspend operator fun invoke(
         isCcdTxEnabled: Boolean = notificationsPreferences.areCcdTxNotificationsEnabled,
-        isCis2TxEnabled: Boolean = notificationsPreferences.areCis2TxNotificationsEnabled
+        isCis2TxEnabled: Boolean = notificationsPreferences.areCis2TxNotificationsEnabled,
     ): Boolean {
         val googleApiAvailability = GoogleApiAvailability.getInstance()
-        val resultCode = googleApiAvailability.isGooglePlayServicesAvailable(application)
-        var fcmToken = ""
+        val fcmToken = when (googleApiAvailability.isGooglePlayServicesAvailable(application)) {
+            ConnectionResult.SUCCESS -> {
+                try {
+                    FirebaseMessaging.getInstance().token.await()
+                } catch (e: Exception) {
+                    Log.e("token_not_available", e)
+                    return false
+                }
+            }
 
-        if (resultCode == ConnectionResult.SUCCESS) {
-            fcmToken = FirebaseMessaging.getInstance().token.await()
+            else -> {
+                Log.e("google_api_not_available")
+                return false
+            }
         }
 
         val accounts = accountRepository.getAllDone()