Render an error dialog in case registering a pusher fails.

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/exception/ClientException.kt

@@ -20,3 +20,7 @@ sealed class ClientException(message: String) : Exception(message) {
     class Generic(message: String) : ClientException(message)
     class Other(message: String) : ClientException(message)
 }
+
+fun ClientException.isNetworkError(): Boolean {
+    return this is ClientException.Generic && message?.contains("error sending request for url", ignoreCase = true) == true
+}

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/pushers/RustPushersService.kt

@@ -17,9 +17,11 @@
 package io.element.android.libraries.matrix.impl.pushers
 
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
+import io.element.android.libraries.core.extensions.mapFailure
 import io.element.android.libraries.matrix.api.pusher.PushersService
 import io.element.android.libraries.matrix.api.pusher.SetHttpPusherData
 import io.element.android.libraries.matrix.api.pusher.UnsetHttpPusherData
+import io.element.android.libraries.matrix.impl.exception.mapClientException
 import kotlinx.coroutines.withContext
 import org.matrix.rustcomponents.sdk.Client
 import org.matrix.rustcomponents.sdk.HttpPusherData
@@ -52,6 +54,7 @@ class RustPushersService(
                     lang = setHttpPusherData.lang
                 )
             }
+                .mapFailure { it.mapClientException() }
         }
     }
 

libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/DefaultPusherSubscriber.kt

@@ -18,14 +18,17 @@ package io.element.android.libraries.push.impl
 
 import com.squareup.anvil.annotations.ContributesBinding
 import io.element.android.appconfig.PushConfig
+import io.element.android.libraries.core.extensions.mapFailure
 import io.element.android.libraries.core.log.logger.LoggerTag
 import io.element.android.libraries.core.meta.BuildMeta
 import io.element.android.libraries.di.AppScope
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.core.SessionId
+import io.element.android.libraries.matrix.api.exception.ClientException
 import io.element.android.libraries.matrix.api.pusher.SetHttpPusherData
 import io.element.android.libraries.matrix.api.pusher.UnsetHttpPusherData
 import io.element.android.libraries.pushproviders.api.PusherSubscriber
+import io.element.android.libraries.pushproviders.api.RegistrationFailure
 import io.element.android.libraries.pushstore.api.UserPushStoreFactory
 import io.element.android.libraries.pushstore.api.clientsecret.PushClientSecret
 import timber.log.Timber
@@ -50,7 +53,8 @@ class DefaultPusherSubscriber @Inject constructor(
         gateway: String,
     ): Result<Unit> {
         val userDataStore = userPushStoreFactory.getOrCreate(matrixClient.sessionId)
-        if (userDataStore.getCurrentRegisteredPushKey() == pushKey) {
+        val isRegisteringAgain = userDataStore.getCurrentRegisteredPushKey() == pushKey
+        if (isRegisteringAgain) {
             Timber.tag(loggerTag.value)
                 .d("Unnecessary to register again the same pusher, but do it in case the pusher has been removed from the server")
         }
@@ -61,8 +65,14 @@ class DefaultPusherSubscriber @Inject constructor(
             .onSuccess {
                 userDataStore.setCurrentRegisteredPushKey(pushKey)
             }
-            .onFailure { throwable ->
+            .mapFailure { throwable ->
                 Timber.tag(loggerTag.value).e(throwable, "Unable to register the pusher")
+                if (throwable is ClientException) {
+                    // It should always be the case.
+                    RegistrationFailure(throwable, isRegisteringAgain = isRegisteringAgain)
+                } else {
+                    throwable
+                }
             }
     }
 

libraries/pushproviders/api/src/main/kotlin/io/element/android/libraries/pushproviders/api/PusherSubscriber.kt

@@ -17,8 +17,21 @@
 package io.element.android.libraries.pushproviders.api
 
 import io.element.android.libraries.matrix.api.MatrixClient
+import io.element.android.libraries.matrix.api.exception.ClientException
 
 interface PusherSubscriber {
+    /**
+     * Register a pusher. Note that failure will be a [RegistrationFailure].
+     */
     suspend fun registerPusher(matrixClient: MatrixClient, pushKey: String, gateway: String): Result<Unit>
+
+    /**
+     * Unregister a pusher.
+     */
     suspend fun unregisterPusher(matrixClient: MatrixClient, pushKey: String, gateway: String): Result<Unit>
 }
+
+class RegistrationFailure(
+    val clientException: ClientException,
+    val isRegisteringAgain: Boolean
+) : Exception(clientException)

libraries/ui-strings/src/main/res/values/localazy.xml

@@ -135,6 +135,9 @@
   <string name="common_encryption_enabled">"Encryption enabled"</string>
   <string name="common_enter_your_pin">"Enter your PIN"</string>
   <string name="common_error">"Error"</string>
+  <string name="common_error_registering_pusher_android">"An error occurred, you may not receive notifications for new messages. Please troubleshoot notifications from the settings.
+
+Reason: %1$s."</string>
   <string name="common_everyone">"Everyone"</string>
   <string name="common_failed">"Failed"</string>
   <string name="common_favourite">"Favourite"</string>