Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

UnifiedPush: correctly unregister the provider.

Browse source
This commit is contained in:
Benoit Marty 2024-05-06 22:31:06 +02:00 • committed by Benoit Marty
parent 3d5fdfc22e
commit eb0dcd6b8c
2 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/UnifiedPushProvider.kt
View file

@ -71,7 +71,7 @@ class UnifiedPushProvider @Inject constructor(
override suspend fun unregister(matrixClient: MatrixClient) { override suspend fun unregister(matrixClient: MatrixClient) {
val clientSecret = pushClientSecret.getSecretForUser(matrixClient.sessionId) val clientSecret = pushClientSecret.getSecretForUser(matrixClient.sessionId)
unRegisterUnifiedPushUseCase.execute(clientSecret) unRegisterUnifiedPushUseCase.execute(matrixClient, clientSecret)
} }
override suspend fun getCurrentUserPushConfig(): CurrentUserPushConfig? { override suspend fun getCurrentUserPushConfig(): CurrentUserPushConfig? {

22
libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/UnregisterUnifiedPushUseCase.kt
View file

@ -18,26 +18,26 @@ package io.element.android.libraries.pushproviders.unifiedpush
import android.content.Context import android.content.Context
import io.element.android.libraries.di.ApplicationContext import io.element.android.libraries.di.ApplicationContext
import io.element.android.libraries.matrix.api.MatrixClient
import io.element.android.libraries.pushproviders.api.PusherSubscriber
import org.unifiedpush.android.connector.UnifiedPush import org.unifiedpush.android.connector.UnifiedPush
import timber.log.Timber import timber.log.Timber
import javax.inject.Inject import javax.inject.Inject
class UnregisterUnifiedPushUseCase @Inject constructor( class UnregisterUnifiedPushUseCase @Inject constructor(
@ApplicationContext private val context: Context, @ApplicationContext private val context: Context,
// private val pushDataStore: PushDataStore,
private val unifiedPushStore: UnifiedPushStore, private val unifiedPushStore: UnifiedPushStore,
// private val unifiedPushGatewayResolver: UnifiedPushGatewayResolver, private val pusherSubscriber: PusherSubscriber,
) { ) {
suspend fun execute(clientSecret: String) { suspend fun execute(matrixClient: MatrixClient, clientSecret: String) {
// val mode = BackgroundSyncMode.FDROID_BACKGROUND_SYNC_MODE_FOR_REALTIME val endpoint = unifiedPushStore.getEndpoint(clientSecret)
// pushDataStore.setFdroidSyncBackgroundMode(mode) val gateway = unifiedPushStore.getPushGateway(clientSecret)
try { if (endpoint != null && gateway != null) {
unifiedPushStore.getEndpoint(clientSecret)?.let { try {
Timber.d("Removing $it") pusherSubscriber.unregisterPusher(matrixClient, endpoint, gateway)
// TODO pushersManager?.unregisterPusher(it) } catch (e: Exception) {
Timber.d(e, "Probably unregistering a non existing pusher")
} }
} catch (e: Exception) {
Timber.d(e, "Probably unregistering a non existing pusher")
} }
unifiedPushStore.storeUpEndpoint(null, clientSecret) unifiedPushStore.storeUpEndpoint(null, clientSecret)
unifiedPushStore.storePushGateway(null, clientSecret) unifiedPushStore.storePushGateway(null, clientSecret)