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

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

@@ -99,14 +99,10 @@ interface PushersService {
                          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)
-
-    /**
-     * Remove the email pusher for a given email
-     */
-    suspend fun removeEmailPusher(email: String)
+    suspend fun removePusher(pushkey: String, appId: String)
 
     /**
      * Get the current pushers, as a LiveData

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

@@ -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'") }
     }
 
-    override suspend fun removeHttpPusher(pushkey: String, appId: String) {
+    override suspend fun removePusher(pushkey: String, appId: String) {
         val params = RemovePusherTask.Params(pushkey, appId)
         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>> {
         return monarchy.findAllMappedWithChanges(
                 { realm -> PusherEntity.where(realm) },

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

@@ -75,12 +75,12 @@ class PushersManager @Inject constructor(
 
     suspend fun unregisterEmailPusher(email: String) {
         val currentSession = activeSessionHolder.getSafeActiveSession() ?: return
-        currentSession.removeEmailPusher(email)
+        currentSession.removePusher(email, appId = "m.email")
     }
 
     suspend fun unregisterPusher(pushKey: String) {
         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 {

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

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