Add ability to not show the pusher registration again.

libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/PushService.kt

@@ -17,8 +17,10 @@
 package io.element.android.libraries.push.api
 
 import io.element.android.libraries.matrix.api.MatrixClient
+import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.libraries.pushproviders.api.Distributor
 import io.element.android.libraries.pushproviders.api.PushProvider
+import kotlinx.coroutines.flow.Flow
 
 interface PushService {
     /**
@@ -43,6 +45,9 @@ interface PushService {
         distributor: Distributor,
     ): Result<Unit>
 
+    fun ignoreRegistrationError(sessionId: SessionId): Flow<Boolean>
+    suspend fun setIgnoreRegistrationError(sessionId: SessionId, ignore: Boolean)
+
     /**
      * Return false in case of early error.
      */

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

@@ -19,12 +19,14 @@ package io.element.android.libraries.push.impl
 import com.squareup.anvil.annotations.ContributesBinding
 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.push.api.GetCurrentPushProvider
 import io.element.android.libraries.push.api.PushService
 import io.element.android.libraries.push.impl.test.TestPush
 import io.element.android.libraries.pushproviders.api.Distributor
 import io.element.android.libraries.pushproviders.api.PushProvider
 import io.element.android.libraries.pushstore.api.UserPushStoreFactory
+import kotlinx.coroutines.flow.Flow
 import timber.log.Timber
 import javax.inject.Inject
 
@@ -72,6 +74,14 @@ class DefaultPushService @Inject constructor(
         return pushProvider.registerWith(matrixClient, distributor)
     }
 
+    override fun ignoreRegistrationError(sessionId: SessionId): Flow<Boolean> {
+        return userPushStoreFactory.getOrCreate(sessionId).ignoreRegistrationError()
+    }
+
+    override suspend fun setIgnoreRegistrationError(sessionId: SessionId, ignore: Boolean) {
+        userPushStoreFactory.getOrCreate(sessionId).setIgnoreRegistrationError(ignore)
+    }
+
     override suspend fun testPush(): Boolean {
         val pushProvider = getCurrentPushProvider() ?: return false
         val config = pushProvider.getCurrentUserPushConfig() ?: return false

libraries/push/test/src/main/kotlin/io/element/android/libraries/push/test/FakePushService.kt

@@ -17,10 +17,13 @@
 package io.element.android.libraries.push.test
 
 import io.element.android.libraries.matrix.api.MatrixClient
+import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.libraries.push.api.PushService
 import io.element.android.libraries.pushproviders.api.Distributor
 import io.element.android.libraries.pushproviders.api.PushProvider
 import io.element.android.tests.testutils.simulateLongTask
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
 
 class FakePushService(
     private val testPushBlock: suspend () -> Boolean = { true },
@@ -53,6 +56,16 @@ class FakePushService(
             }
     }
 
+    private val ignoreRegistrationError = MutableStateFlow(false)
+
+    override fun ignoreRegistrationError(sessionId: SessionId): Flow<Boolean> {
+        return ignoreRegistrationError
+    }
+
+    override suspend fun setIgnoreRegistrationError(sessionId: SessionId, ignore: Boolean) {
+        ignoreRegistrationError.value = ignore
+    }
+
     override suspend fun testPush(): Boolean = simulateLongTask {
         testPushBlock()
     }

libraries/pushstore/api/src/main/kotlin/io/element/android/libraries/pushstore/api/UserPushStore.kt

@@ -29,6 +29,9 @@ interface UserPushStore {
     fun getNotificationEnabledForDevice(): Flow<Boolean>
     suspend fun setNotificationEnabledForDevice(enabled: Boolean)
 
+    fun ignoreRegistrationError(): Flow<Boolean>
+    suspend fun setIgnoreRegistrationError(ignore: Boolean)
+
     /**
      * Return true if Pin code is disabled, or if user set the settings to see full notification content.
      */

libraries/pushstore/impl/src/main/kotlin/io/element/android/libraries/pushstore/impl/UserPushStoreDataStore.kt

@@ -25,6 +25,7 @@ import androidx.datastore.preferences.core.stringPreferencesKey
 import androidx.datastore.preferences.preferencesDataStore
 import androidx.datastore.preferences.preferencesDataStoreFile
 import io.element.android.libraries.androidutils.hash.hash
+import io.element.android.libraries.core.bool.orFalse
 import io.element.android.libraries.core.bool.orTrue
 import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.libraries.pushstore.api.UserPushStore
@@ -61,6 +62,7 @@ class UserPushStoreDataStore(
     private val pushProviderName = stringPreferencesKey("pushProviderName")
     private val currentPushKey = stringPreferencesKey("currentPushKey")
     private val notificationEnabled = booleanPreferencesKey("notificationEnabled")
+    private val ignoreRegistrationError = booleanPreferencesKey("ignoreRegistrationError")
 
     override suspend fun getPushProviderName(): String? {
         return context.dataStore.data.first()[pushProviderName]
@@ -100,6 +102,16 @@ class UserPushStoreDataStore(
         return true
     }
 
+    override fun ignoreRegistrationError(): Flow<Boolean> {
+        return context.dataStore.data.map { it[ignoreRegistrationError].orFalse() }
+    }
+
+    override suspend fun setIgnoreRegistrationError(ignore: Boolean) {
+        context.dataStore.edit {
+            it[ignoreRegistrationError] = ignore
+        }
+    }
+
     override suspend fun reset() {
         context.dataStore.edit {
             it.clear()

libraries/pushstore/test/src/main/kotlin/io/element/android/libraries/pushstore/test/userpushstore/FakeUserPushStore.kt

@@ -25,6 +25,7 @@ class FakeUserPushStore(
 ) : UserPushStore {
     private var currentRegisteredPushKey: String? = null
     private val notificationEnabledForDevice = MutableStateFlow(true)
+    private val ignoreRegistrationError = MutableStateFlow(false)
     override suspend fun getPushProviderName(): String? {
         return pushProviderName
     }
@@ -53,6 +54,14 @@ class FakeUserPushStore(
         return true
     }
 
+    override fun ignoreRegistrationError(): Flow<Boolean> {
+        return ignoreRegistrationError
+    }
+
+    override suspend fun setIgnoreRegistrationError(ignore: Boolean) {
+        ignoreRegistrationError.value = ignore
+    }
+
     override suspend fun reset() {
     }
 }