Unset Http pusher: use SDK API.

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/pusher/PushersService.kt

@@ -18,5 +18,5 @@ package io.element.android.libraries.matrix.api.pusher
 
 interface PushersService {
     suspend fun setHttpPusher(setHttpPusherData: SetHttpPusherData): Result<Unit>
-    suspend fun unsetHttpPusher(): Result<Unit>
+    suspend fun unsetHttpPusher(unsetHttpPusherData: UnsetHttpPusherData): Result<Unit>
 }

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/pusher/UnsetHttpPusherData.kt

@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2024 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.element.android.libraries.matrix.api.pusher
+
+data class UnsetHttpPusherData(
+    val pushKey: String,
+    val appId: String,
+)

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

@@ -19,6 +19,7 @@ package io.element.android.libraries.matrix.impl.pushers
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 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 kotlinx.coroutines.withContext
 import org.matrix.rustcomponents.sdk.Client
 import org.matrix.rustcomponents.sdk.HttpPusherData
@@ -54,8 +55,16 @@ class RustPushersService(
         }
     }
 
-    override suspend fun unsetHttpPusher(): Result<Unit> {
-        // TODO Missing client API. We need to set the pusher with Kind == null, but we do not have access to this field from the SDK.
-        return Result.success(Unit)
+    override suspend fun unsetHttpPusher(unsetHttpPusherData: UnsetHttpPusherData): Result<Unit> {
+        return withContext(dispatchers.io) {
+            runCatching {
+                client.deletePusher(
+                    identifiers = PusherIdentifiers(
+                        pushkey = unsetHttpPusherData.pushKey,
+                        appId = unsetHttpPusherData.appId
+                    ),
+                )
+            }
+        }
     }
 }

libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/pushers/FakePushersService.kt

@@ -18,8 +18,9 @@ package io.element.android.libraries.matrix.test.pushers
 
 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
 
 class FakePushersService : PushersService {
     override suspend fun setHttpPusher(setHttpPusherData: SetHttpPusherData) = Result.success(Unit)
-    override suspend fun unsetHttpPusher(): Result<Unit> = Result.success(Unit)
+    override suspend fun unsetHttpPusher(unsetHttpPusherData: UnsetHttpPusherData): Result<Unit> = Result.success(Unit)
 }

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

@@ -26,6 +26,7 @@ import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.libraries.matrix.api.pusher.SetHttpPusherData
+import io.element.android.libraries.matrix.api.pusher.UnsetHttpPusherData
 import io.element.android.libraries.push.impl.pushgateway.PushGatewayNotifyRequest
 import io.element.android.libraries.pushproviders.api.CurrentUserPushConfig
 import io.element.android.libraries.pushproviders.api.PusherSubscriber
@@ -107,7 +108,12 @@ class PushersManager @Inject constructor(
     }
 
     override suspend fun unregisterPusher(matrixClient: MatrixClient, pushKey: String, gateway: String) {
-        matrixClient.pushersService().unsetHttpPusher()
+        matrixClient.pushersService().unsetHttpPusher(
+            unsetHttpPusherData = UnsetHttpPusherData(
+                pushKey = pushKey,
+                appId = PushConfig.PUSHER_APP_ID
+            )
+        )
     }
 
     companion object {