filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

making the removePusher more generic as it can handle email and http pushers 

- Updates the doc to reflect that to remove emails an appId of m.email is required
This commit is contained in:
Adam Brown 2021-09-21 12:06:26 +01:00
parent 78d70eab12
commit 2c25efc36a
4 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt
View File

@ -99,14 +99,10 @@ interface PushersService {
eventId: String) eventId: String)
/** /**
* Remove the http pusher * Remove the pusher
* When the appId is m.email then an email address is expected in the pushkey
*/ */
suspend fun removeHttpPusher(pushkey: String, appId: String) suspend fun removePusher(pushkey: String, appId: String)
/**
* Remove the email pusher for a given email
*/
suspend fun removeEmailPusher(email: String)
/** /**
* Get the current pushers, as a LiveData * Get the current pushers, as a LiveData

7
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt
View File

@ -114,16 +114,11 @@ internal class DefaultPushersService @Inject constructor(
this.data?.url?.let { url -> if ("/_matrix/push/v1/notify" !in url) throw InvalidParameterException("url should contain '/_matrix/push/v1/notify'") } this.data?.url?.let { url -> if ("/_matrix/push/v1/notify" !in url) throw InvalidParameterException("url should contain '/_matrix/push/v1/notify'") }
} }
override suspend fun removeHttpPusher(pushkey: String, appId: String) { override suspend fun removePusher(pushkey: String, appId: String) {
val params = RemovePusherTask.Params(pushkey, appId) val params = RemovePusherTask.Params(pushkey, appId)
removePusherTask.execute(params) removePusherTask.execute(params)
} }
override suspend fun removeEmailPusher(email: String) {
val params = RemovePusherTask.Params(email, "m.email")
removePusherTask.execute(params)
}
override fun getPushersLive(): LiveData<List<Pusher>> { override fun getPushersLive(): LiveData<List<Pusher>> {
return monarchy.findAllMappedWithChanges( return monarchy.findAllMappedWithChanges(
{ realm -> PusherEntity.where(realm) }, { realm -> PusherEntity.where(realm) },

4
vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
View File

@ -75,12 +75,12 @@ class PushersManager @Inject constructor(
suspend fun unregisterEmailPusher(email: String) { suspend fun unregisterEmailPusher(email: String) {
val currentSession = activeSessionHolder.getSafeActiveSession() ?: return val currentSession = activeSessionHolder.getSafeActiveSession() ?: return
currentSession.removeEmailPusher(email) currentSession.removePusher(email, appId = "m.email")
} }
suspend fun unregisterPusher(pushKey: String) { suspend fun unregisterPusher(pushKey: String) {
val currentSession = activeSessionHolder.getSafeActiveSession() ?: return val currentSession = activeSessionHolder.getSafeActiveSession() ?: return
currentSession.removeHttpPusher(pushKey, stringProvider.getString(R.string.pusher_app_id)) currentSession.removePusher(pushKey, stringProvider.getString(R.string.pusher_app_id))
} }
companion object { companion object {

2
vector/src/main/java/im/vector/app/features/settings/push/PushGatewaysViewModel.kt
View File

@ -79,7 +79,7 @@ class PushGatewaysViewModel @AssistedInject constructor(@Assisted initialState:
private fun removePusher(pusher: Pusher) { private fun removePusher(pusher: Pusher) {
viewModelScope.launch { viewModelScope.launch {
session.removeHttpPusher(pusher.pushKey, pusher.appId) session.removePusher(pusher.pushKey, pusher.appId)
} }
} }