From 1591375aa20b47ac96e63201cc4fcb4ab7f152b0 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Mon, 20 Sep 2021 16:35:53 +0100
Subject: [PATCH 01/24] adding ability to remove push targets from the
 notification target screen

---
 .../features/settings/push/PushGateWayController.kt  |  5 +++++
 .../app/features/settings/push/PushGatewayAction.kt  |  2 ++
 .../app/features/settings/push/PushGatewayItem.kt    | 12 ++++++++++++
 .../features/settings/push/PushGatewaysFragment.kt   |  4 ++++
 .../features/settings/push/PushGatewaysViewModel.kt  | 11 ++++++++++-
 vector/src/main/res/layout/item_pushgateway.xml      |  7 ++++++-
 vector/src/main/res/values/strings.xml               |  1 +
 7 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/settings/push/PushGateWayController.kt b/vector/src/main/java/im/vector/app/features/settings/push/PushGateWayController.kt
index 679f406832..6cb19b13c5 100644
--- a/vector/src/main/java/im/vector/app/features/settings/push/PushGateWayController.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/push/PushGateWayController.kt
@@ -26,6 +26,8 @@ class PushGateWayController @Inject constructor(
         private val stringProvider: StringProvider
 ) : TypedEpoxyController<PushGatewayViewState>() {
 
+    var interactionListener: PushGatewayItemInteractions? = null
+
     override fun buildModels(data: PushGatewayViewState?) {
         val host = this
         data?.pushGateways?.invoke()?.let { pushers ->
@@ -39,6 +41,9 @@ class PushGateWayController @Inject constructor(
                     pushGatewayItem {
                         id("${it.pushKey}_${it.appId}")
                         pusher(it)
+                        host.interactionListener?.let {
+                            interactions(it)
+                        }
                     }
                 }
             }
diff --git a/vector/src/main/java/im/vector/app/features/settings/push/PushGatewayAction.kt b/vector/src/main/java/im/vector/app/features/settings/push/PushGatewayAction.kt
index 566a068a7d..034b0b5ac7 100644
--- a/vector/src/main/java/im/vector/app/features/settings/push/PushGatewayAction.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/push/PushGatewayAction.kt
@@ -17,7 +17,9 @@
 package im.vector.app.features.settings.push
 
 import im.vector.app.core.platform.VectorViewModelAction
+import org.matrix.android.sdk.api.session.pushers.Pusher
 
 sealed class PushGatewayAction : VectorViewModelAction {
     object Refresh : PushGatewayAction()
+    data class RemovePusher(val pusher: Pusher) : PushGatewayAction()
 }
diff --git a/vector/src/main/java/im/vector/app/features/settings/push/PushGatewayItem.kt b/vector/src/main/java/im/vector/app/features/settings/push/PushGatewayItem.kt
index dc66e1983b..ec67e362ee 100644
--- a/vector/src/main/java/im/vector/app/features/settings/push/PushGatewayItem.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/push/PushGatewayItem.kt
@@ -16,6 +16,7 @@
 
 package im.vector.app.features.settings.push
 
+import android.view.View
 import android.widget.TextView
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
@@ -30,6 +31,9 @@ abstract class PushGatewayItem : EpoxyModelWithHolder<PushGatewayItem.Holder>()
     @EpoxyAttribute
     lateinit var pusher: Pusher
 
+    @EpoxyAttribute
+    lateinit var interactions: PushGatewayItemInteractions
+
     override fun bind(holder: Holder) {
         super.bind(holder)
         holder.kind.text = when (pusher.kind) {
@@ -45,6 +49,9 @@ abstract class PushGatewayItem : EpoxyModelWithHolder<PushGatewayItem.Holder>()
         holder.url.text = pusher.data.url
         holder.format.text = pusher.data.format
         holder.deviceName.text = pusher.deviceDisplayName
+        holder.removeButton.setOnClickListener {
+            interactions.onRemovePushTapped(pusher)
+        }
     }
 
     class Holder : VectorEpoxyHolder() {
@@ -55,8 +62,13 @@ abstract class PushGatewayItem : EpoxyModelWithHolder<PushGatewayItem.Holder>()
         val url by bind<TextView>(R.id.pushGatewayURLValue)
         val appName by bind<TextView>(R.id.pushGatewayAppNameValue)
         val appId by bind<TextView>(R.id.pushGatewayAppIdValue)
+        val removeButton by bind<View>(R.id.pushGatewayDeleteButton)
     }
 }
 
+interface PushGatewayItemInteractions {
+    fun onRemovePushTapped(pusher: Pusher)
+}
+
 //
 // abstract class ReactionInfoSimpleItem : EpoxyModelWithHolder<ReactionInfoSimpleItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/app/features/settings/push/PushGatewaysFragment.kt b/vector/src/main/java/im/vector/app/features/settings/push/PushGatewaysFragment.kt
index be2457397d..696505cc52 100644
--- a/vector/src/main/java/im/vector/app/features/settings/push/PushGatewaysFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/push/PushGatewaysFragment.kt
@@ -29,6 +29,7 @@ import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.databinding.FragmentGenericRecyclerBinding
+import org.matrix.android.sdk.api.session.pushers.Pusher
 
 import javax.inject.Inject
 
@@ -64,6 +65,9 @@ class PushGatewaysFragment @Inject constructor(
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        epoxyController.interactionListener = object : PushGatewayItemInteractions {
+            override fun onRemovePushTapped(pusher: Pusher) = viewModel.handle(PushGatewayAction.RemovePusher(pusher))
+        }
         views.genericRecyclerView.configureWith(epoxyController, dividerDrawable = R.drawable.divider_horizontal)
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/settings/push/PushGatewaysViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/push/PushGatewaysViewModel.kt
index 7981d71ce1..9910526878 100644
--- a/vector/src/main/java/im/vector/app/features/settings/push/PushGatewaysViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/push/PushGatewaysViewModel.kt
@@ -16,6 +16,7 @@
 
 package im.vector.app.features.settings.push
 
+import androidx.lifecycle.viewModelScope
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.FragmentViewModelContext
 import com.airbnb.mvrx.MvRxState
@@ -28,6 +29,7 @@ import dagger.assisted.AssistedFactory
 import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.platform.EmptyViewEvents
 import im.vector.app.core.platform.VectorViewModel
+import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.pushers.Pusher
 import org.matrix.android.sdk.rx.RxSession
@@ -70,10 +72,17 @@ class PushGatewaysViewModel @AssistedInject constructor(@Assisted initialState:
 
     override fun handle(action: PushGatewayAction) {
         when (action) {
-            is PushGatewayAction.Refresh -> handleRefresh()
+            is PushGatewayAction.Refresh      -> handleRefresh()
+            is PushGatewayAction.RemovePusher -> removePusher(action.pusher)
         }.exhaustive
     }
 
+    private fun removePusher(pusher: Pusher) {
+        viewModelScope.launch {
+            session.removeHttpPusher(pusher.pushKey, pusher.appId)
+        }
+    }
+
     private fun handleRefresh() {
         session.refreshPushers()
     }
diff --git a/vector/src/main/res/layout/item_pushgateway.xml b/vector/src/main/res/layout/item_pushgateway.xml
index 28bcef1ee2..b1cec859b1 100644
--- a/vector/src/main/res/layout/item_pushgateway.xml
+++ b/vector/src/main/res/layout/item_pushgateway.xml
@@ -120,7 +120,6 @@
         android:text="@string/push_gateway_item_format"
         android:textStyle="bold" />
 
-
     <TextView
         android:id="@+id/pushGatewayFormatValue"
         style="@style/Widget.Vector.TextView.Body"
@@ -130,5 +129,11 @@
         android:textStyle=""
         tools:text="event_id_only" />
 
+    <Button
+        android:id="@+id/pushGatewayDeleteButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:text="@string/push_gateway_item_remove" />
 
 </LinearLayout>
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 06832ab5c3..b6fec520ef 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -2245,6 +2245,7 @@
     <string name="push_gateway_item_device_name">session_name:</string>
     <string name="push_gateway_item_url">Url:</string>
     <string name="push_gateway_item_format">Format:</string>
+    <string name="push_gateway_item_remove">Remove</string>
 
     <string name="preference_voice_and_video">Voice &amp; Video</string>
     <string name="preference_root_help_about">Help &amp; About</string>

From ee3f2877e954b48b3c6a093d51fddbf6da0c8ab8 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Tue, 21 Sep 2021 09:46:51 +0100
Subject: [PATCH 02/24] adding matrix SDK support for email adding and removing
 email pushes

- email pushes make use of a new undocumented `brand` field, for now this field maps directly to the app display name so we can resuse it
---
 .../sdk/api/session/pushers/PushersService.kt | 28 ++++++++-
 .../sdk/internal/session/SessionComponent.kt  |  4 +-
 ...HttpPusherWorker.kt => AddPusherWorker.kt} |  4 +-
 .../session/pushers/DefaultPushersService.kt  | 61 +++++++++++++------
 .../session/pushers/JsonPusherData.kt         |  5 +-
 5 files changed, 77 insertions(+), 25 deletions(-)
 rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/{AddHttpPusherWorker.kt => AddPusherWorker.kt} (95%)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt
index a5ec100f64..2766147cc9 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt
@@ -27,7 +27,6 @@ interface PushersService {
 
     /**
      * Add a new HTTP pusher.
-     * Note that only `http` kind is supported by the SDK for now.
      * Ref: https://matrix.org/docs/spec/client_server/latest#post-matrix-client-r0-pushers-set
      *
      * @param pushkey           This is a unique identifier for this pusher. The value you should use for
@@ -64,6 +63,28 @@ interface PushersService {
                       append: Boolean,
                       withEventIdOnly: Boolean): UUID
 
+    /**
+     * Add a new Email pusher.
+     * Ref: https://matrix.org/docs/spec/client_server/latest#post-matrix-client-r0-pushers-set
+     *
+     * @param email             The email address to send notifications to.
+     *                          If the kind is "email", this is the email address to send notifications to.
+     * @param lang              The preferred language for receiving notifications (e.g. "en" or "en-US").
+     * @param appDisplayName    A human readable string that will allow the user to identify what application owns this pusher.
+     * @param deviceDisplayName A human readable string that will allow the user to identify what device owns this pusher.
+     * @param append            If true, the homeserver should add another pusher with the given pushkey and App ID in addition
+     *                          to any others with different user IDs. Otherwise, the homeserver must remove any other pushers
+     *                          with the same App ID and pushkey for different users.
+     * @return                  A work request uuid. Can be used to listen to the status
+     *                          (LiveData<WorkInfo> status = workManager.getWorkInfoByIdLiveData(<UUID>))
+     * @throws [InvalidParameterException] if a parameter is not correct
+     */
+    fun addEmailPusher(email: String,
+                       lang: String,
+                       appDisplayName: String,
+                       deviceDisplayName: String,
+                       append: Boolean): UUID
+
     /**
      * Directly ask the push gateway to send a push to this device
      * If successful, the push gateway has accepted the request. In this case, the app should receive a Push with the provided eventId.
@@ -84,6 +105,11 @@ interface PushersService {
      */
     suspend fun removeHttpPusher(pushkey: String, appId: String)
 
+    /**
+     * Remove the email pusher for a given email
+     */
+    suspend fun removeEmailPusher(email: String)
+
     /**
      * Get the current pushers, as a LiveData
      */
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionComponent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionComponent.kt
index 9a936b73c2..2003a66c94 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionComponent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionComponent.kt
@@ -43,7 +43,7 @@ import org.matrix.android.sdk.internal.session.integrationmanager.IntegrationMan
 import org.matrix.android.sdk.internal.session.media.MediaModule
 import org.matrix.android.sdk.internal.session.openid.OpenIdModule
 import org.matrix.android.sdk.internal.session.profile.ProfileModule
-import org.matrix.android.sdk.internal.session.pushers.AddHttpPusherWorker
+import org.matrix.android.sdk.internal.session.pushers.AddPusherWorker
 import org.matrix.android.sdk.internal.session.pushers.PushersModule
 import org.matrix.android.sdk.internal.session.room.RoomModule
 import org.matrix.android.sdk.internal.session.room.relation.SendRelationWorker
@@ -127,7 +127,7 @@ internal interface SessionComponent {
 
     fun inject(worker: SyncWorker)
 
-    fun inject(worker: AddHttpPusherWorker)
+    fun inject(worker: AddPusherWorker)
 
     fun inject(worker: SendVerificationMessageWorker)
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/AddHttpPusherWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/AddPusherWorker.kt
similarity index 95%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/AddHttpPusherWorker.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/AddPusherWorker.kt
index c9d7ad2193..079fd1d3e5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/AddHttpPusherWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/AddPusherWorker.kt
@@ -33,8 +33,8 @@ import org.matrix.android.sdk.internal.worker.SessionSafeCoroutineWorker
 import org.matrix.android.sdk.internal.worker.SessionWorkerParams
 import javax.inject.Inject
 
-internal class AddHttpPusherWorker(context: Context, params: WorkerParameters)
-    : SessionSafeCoroutineWorker<AddHttpPusherWorker.Params>(context, params, Params::class.java) {
+internal class AddPusherWorker(context: Context, params: WorkerParameters)
+    : SessionSafeCoroutineWorker<AddPusherWorker.Params>(context, params, Params::class.java) {
 
     @JsonClass(generateAdapter = true)
     internal data class Params(
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt
index a772cf5ebb..a7fd3d435f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt
@@ -66,27 +66,38 @@ internal class DefaultPushersService @Inject constructor(
                                deviceDisplayName: String,
                                url: String,
                                append: Boolean,
-                               withEventIdOnly: Boolean)
-            : UUID {
-        // Do some parameter checks. It's ok to throw Exception, to inform developer of the problem
-        if (pushkey.length > 512) throw InvalidParameterException("pushkey should not exceed 512 chars")
-        if (appId.length > 64) throw InvalidParameterException("appId should not exceed 64 chars")
-        if ("/_matrix/push/v1/notify" !in url) throw InvalidParameterException("url should contain '/_matrix/push/v1/notify'")
+                               withEventIdOnly: Boolean
+    ) = addPusher(
+            JsonPusher(
+                    pushKey = pushkey,
+                    kind = "http",
+                    appId = appId,
+                    profileTag = profileTag,
+                    lang = lang,
+                    appDisplayName = appDisplayName,
+                    deviceDisplayName = deviceDisplayName,
+                    data = JsonPusherData(url, EVENT_ID_ONLY.takeIf { withEventIdOnly }),
+                    append = append
+            )
+    )
 
-        val pusher = JsonPusher(
-                pushKey = pushkey,
-                kind = "http",
-                appId = appId,
-                appDisplayName = appDisplayName,
-                deviceDisplayName = deviceDisplayName,
-                profileTag = profileTag,
-                lang = lang,
-                data = JsonPusherData(url, EVENT_ID_ONLY.takeIf { withEventIdOnly }),
-                append = append)
+    override fun addEmailPusher(email: String, lang: String, appDisplayName: String, deviceDisplayName: String, append: Boolean) = addPusher(
+            JsonPusher(pushKey = email,
+                    kind = "email",
+                    appId = "m.email",
+                    profileTag = "",
+                    lang = lang,
+                    appDisplayName = appDisplayName,
+                    deviceDisplayName = deviceDisplayName,
+                    data = JsonPusherData(brand = appDisplayName),
+                    append = append
+            )
+    )
 
-        val params = AddHttpPusherWorker.Params(sessionId, pusher)
-
-        val request = workManagerProvider.matrixOneTimeWorkRequestBuilder<AddHttpPusherWorker>()
+    private fun addPusher(pusher: JsonPusher): UUID {
+        pusher.validateParameters()
+        val params = AddPusherWorker.Params(sessionId, pusher)
+        val request = workManagerProvider.matrixOneTimeWorkRequestBuilder<AddPusherWorker>()
                 .setConstraints(WorkManagerProvider.workConstraints)
                 .setInputData(WorkerParamsFactory.toData(params))
                 .setBackoffCriteria(BackoffPolicy.LINEAR, WorkManagerProvider.BACKOFF_DELAY_MILLIS, TimeUnit.MILLISECONDS)
@@ -95,11 +106,23 @@ internal class DefaultPushersService @Inject constructor(
         return request.id
     }
 
+    private fun JsonPusher.validateParameters() {
+        // Do some parameter checks. It's ok to throw Exception, to inform developer of the problem
+        if (this.pushKey.length > 512) throw InvalidParameterException("pushkey should not exceed 512 chars")
+        if (this.appId.length > 64) throw InvalidParameterException("appId should not exceed 64 chars")
+        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) {
         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) },
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/JsonPusherData.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/JsonPusherData.kt
index c8d4d77fb1..42a8fa6ff3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/JsonPusherData.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/JsonPusherData.kt
@@ -32,5 +32,8 @@ internal data class JsonPusherData(
          * Currently the only format available is 'event_id_only'.
          */
         @Json(name = "format")
-        val format: String? = null
+        val format: String? = null,
+
+        @Json(name = "brand")
+        val brand: String? = null
 )

From 410cf5c0626e6d37ae9f93a9fcf5f2bec0789285 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Tue, 21 Sep 2021 10:47:03 +0100
Subject: [PATCH 03/24] adding UI toggle for email notifications in
 /settings/notifications - will display a _no emails_ when the matrix account
 has no emails set and tapping will navigate to the emails and phone numbers
 screen where the user can add an email - toggling the email notification with
 register and unregister push notification for the given email address

---
 .../vector/app/core/pushers/PushersManager.kt | 16 +++++++
 .../features/settings/VectorPreferences.kt    |  1 +
 .../settings/VectorSettingsActivity.kt        |  5 +++
 ...ctorSettingsFragmentInteractionListener.kt |  2 +
 ...rSettingsNotificationPreferenceFragment.kt | 43 +++++++++++++++++++
 vector/src/main/res/values/strings.xml        |  4 ++
 .../res/xml/vector_settings_notifications.xml |  6 +++
 7 files changed, 77 insertions(+)

diff --git a/vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt b/vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
index 5896122393..fa39823c36 100644
--- a/vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
+++ b/vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
@@ -61,6 +61,22 @@ class PushersManager @Inject constructor(
         )
     }
 
+    fun registerEmailForPush(email: String) {
+        val currentSession = activeSessionHolder.getActiveSession()
+        currentSession.addEmailPusher(
+                email = email,
+                lang = localeProvider.current().language,
+                appDisplayName = appNameProvider.getAppName(),
+                deviceDisplayName = currentSession.sessionParams.deviceId ?: "MOBILE",
+                append = true,
+        )
+    }
+
+    suspend fun unregisterEmailPusher(email: String) {
+        val currentSession = activeSessionHolder.getSafeActiveSession() ?: return
+        currentSession.removeEmailPusher(email)
+    }
+
     suspend fun unregisterPusher(pushKey: String) {
         val currentSession = activeSessionHolder.getSafeActiveSession() ?: return
         currentSession.removeHttpPusher(pushKey, stringProvider.getString(R.string.pusher_app_id))
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt b/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
index 259c3662fc..d184f8eb6a 100755
--- a/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
@@ -117,6 +117,7 @@ class VectorPreferences @Inject constructor(private val context: Context) {
         // notifications
         const val SETTINGS_ENABLE_ALL_NOTIF_PREFERENCE_KEY = "SETTINGS_ENABLE_ALL_NOTIF_PREFERENCE_KEY"
         const val SETTINGS_ENABLE_THIS_DEVICE_PREFERENCE_KEY = "SETTINGS_ENABLE_THIS_DEVICE_PREFERENCE_KEY"
+        const val SETTINGS_EMAIL_NOTIFICATION_CATEGORY_PREFERENCE_KEY = "SETTINGS_EMAIL_NOTIFICATION_CATEGORY_PREFERENCE_KEY"
 
         //    public static final String SETTINGS_TURN_SCREEN_ON_PREFERENCE_KEY = "SETTINGS_TURN_SCREEN_ON_PREFERENCE_KEY";
         const val SETTINGS_SYSTEM_CALL_NOTIFICATION_PREFERENCE_KEY = "SETTINGS_SYSTEM_CALL_NOTIFICATION_PREFERENCE_KEY"
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsActivity.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsActivity.kt
index 4546313198..caf42e7cf9 100755
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsActivity.kt
@@ -29,6 +29,7 @@ import im.vector.app.databinding.ActivityVectorSettingsBinding
 import im.vector.app.features.discovery.DiscoverySettingsFragment
 import im.vector.app.features.settings.devices.VectorSettingsDevicesFragment
 import im.vector.app.features.settings.notifications.VectorSettingsNotificationPreferenceFragment
+import im.vector.app.features.settings.threepids.ThreePidsSettingsFragment
 
 import org.matrix.android.sdk.api.failure.GlobalError
 import org.matrix.android.sdk.api.session.Session
@@ -136,6 +137,10 @@ class VectorSettingsActivity : VectorBaseActivity<ActivityVectorSettingsBinding>
         return keyToHighlight
     }
 
+    override fun navigateToEmailAndPhoneNumbers() {
+        navigateTo(ThreePidsSettingsFragment::class.java)
+    }
+
     override fun handleInvalidToken(globalError: GlobalError.InvalidToken) {
         if (ignoreInvalidTokenError) {
             Timber.w("Ignoring invalid token global error")
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsFragmentInteractionListener.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsFragmentInteractionListener.kt
index b815ce653d..ddfcc93287 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsFragmentInteractionListener.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsFragmentInteractionListener.kt
@@ -20,4 +20,6 @@ interface VectorSettingsFragmentInteractionListener {
     fun requestHighlightPreferenceKeyOnResume(key: String?)
 
     fun requestedKeyToHighlight(): String?
+
+    fun navigateToEmailAndPhoneNumbers()
 }
diff --git a/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt b/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
index 40f575c853..c57ce2a86a 100644
--- a/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
@@ -47,6 +47,9 @@ import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.pushrules.RuleIds
 import org.matrix.android.sdk.api.pushrules.RuleKind
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.identity.ThreePid
+import org.matrix.android.sdk.api.session.pushers.Pusher
 import javax.inject.Inject
 
 // Referenced in vector_settings_preferences_root.xml
@@ -116,11 +119,51 @@ class VectorSettingsNotificationPreferenceFragment @Inject constructor(
             }
         }
 
+        bindEmailNotifications()
         refreshBackgroundSyncPrefs()
 
         handleSystemPreference()
     }
 
+    private fun bindEmailNotifications() {
+        val emails = session.getEmailsWithPushInformation()
+        findPreference<VectorPreferenceCategory>(VectorPreferences.SETTINGS_EMAIL_NOTIFICATION_CATEGORY_PREFERENCE_KEY)?.let { category ->
+            if (emails.isEmpty()) {
+                val vectorPreference = VectorPreference(requireContext())
+                vectorPreference.title = resources.getString(R.string.settings_notification_emails_no_emails)
+                category.addPreference(vectorPreference)
+                vectorPreference.setOnPreferenceClickListener {
+                    interactionListener?.navigateToEmailAndPhoneNumbers()
+                    true
+                }
+            } else {
+                emails.forEach { (emailPid, pusher) ->
+                    val pref = VectorSwitchPreference(requireContext())
+                    pref.title = resources.getString(R.string.settings_notification_emails_enable_for_email, emailPid.email)
+                    pref.isChecked = pusher != null
+                    pref.setOnPreferenceChangeListener { _, newValue ->
+                        if (newValue as Boolean) {
+                            pushManager.registerEmailForPush(emailPid.email)
+                        } else {
+                            lifecycleScope.launch {
+                                pushManager.unregisterEmailPusher(emailPid.email)
+                            }
+                        }
+                        true
+                    }
+                    category.addPreference(pref)
+                }
+            }
+        }
+    }
+
+    private fun Session.getEmailsWithPushInformation(): List<Pair<ThreePid.Email, Pusher?>> {
+        val emailPushers = this.getPushers().filter { it.kind == "email" }
+        return this.getThreePids()
+                .filterIsInstance<ThreePid.Email>()
+                .map { it to emailPushers.firstOrNull { pusher -> pusher.pushKey == it.email } }
+    }
+
     private val batteryStartForActivityResult = registerStartForActivityResult {
         // Noop
     }
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index b6fec520ef..08c4467234 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -1112,6 +1112,10 @@
     <string name="settings_notification_advanced">Advanced Notification Settings</string>
     <string name="settings_notification_by_event">Notification importance by event</string>
 
+    <string name="settings_notification_emails_category">Email notification</string>
+    <string name="settings_notification_emails_no_emails">To receive email with notification, please associate an email to your Matrix account</string>
+    <string name="settings_notification_emails_enable_for_email">Enable email notifications for %s</string>
+
     <string name="settings_notification_default">Default Notifications</string>
     <string name="settings_notification_mentions_and_keywords">Mentions and Keywords</string>
     <string name="settings_notification_other">Other</string>
diff --git a/vector/src/main/res/xml/vector_settings_notifications.xml b/vector/src/main/res/xml/vector_settings_notifications.xml
index 33581105e1..f471c1156b 100644
--- a/vector/src/main/res/xml/vector_settings_notifications.xml
+++ b/vector/src/main/res/xml/vector_settings_notifications.xml
@@ -55,6 +55,12 @@
 
     </im.vector.app.core.preference.VectorPreferenceCategory>
 
+    <im.vector.app.core.preference.VectorPreferenceCategory
+        android:key="SETTINGS_EMAIL_NOTIFICATION_CATEGORY_PREFERENCE_KEY"
+        android:title="@string/settings_notification_emails_category">
+
+    </im.vector.app.core.preference.VectorPreferenceCategory>
+
     <im.vector.app.core.preference.VectorPreferenceCategory
         android:persistent="false"
         android:title="@string/settings_notification_configuration">

From 0b293d08ccb4ebf8f654f45ff7c1e4c6d336febc Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Tue, 21 Sep 2021 11:15:32 +0100
Subject: [PATCH 04/24] handling errors when enabling/disabling email
 notifications - Extracts out a transactional switch helper to handle
 reverting the switch back to its original state if an error occurs - Reuses
 existing toast message for unknown error - Does not include the isAdded to
 the async callback as the couroutine is tied to the fragment lifecycle scope

---
 ...rSettingsNotificationPreferenceFragment.kt | 26 ++++++++++++++-----
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt b/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
index c57ce2a86a..0a123b8281 100644
--- a/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
@@ -43,6 +43,7 @@ import im.vector.app.features.settings.VectorPreferences
 import im.vector.app.features.settings.VectorSettingsBaseFragment
 import im.vector.app.features.settings.VectorSettingsFragmentInteractionListener
 import im.vector.app.push.fcm.FcmHelper
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.pushrules.RuleIds
@@ -141,15 +142,12 @@ class VectorSettingsNotificationPreferenceFragment @Inject constructor(
                     val pref = VectorSwitchPreference(requireContext())
                     pref.title = resources.getString(R.string.settings_notification_emails_enable_for_email, emailPid.email)
                     pref.isChecked = pusher != null
-                    pref.setOnPreferenceChangeListener { _, newValue ->
-                        if (newValue as Boolean) {
+                    pref.setTransactionalSwitchChangeListener(lifecycleScope) { isChecked ->
+                        if (isChecked) {
                             pushManager.registerEmailForPush(emailPid.email)
                         } else {
-                            lifecycleScope.launch {
-                                pushManager.unregisterEmailPusher(emailPid.email)
-                            }
+                            pushManager.unregisterEmailPusher(emailPid.email)
                         }
-                        true
                     }
                     category.addPreference(pref)
                 }
@@ -386,3 +384,19 @@ class VectorSettingsNotificationPreferenceFragment @Inject constructor(
                 }
     }
 }
+
+private fun SwitchPreference.setTransactionalSwitchChangeListener(scope: CoroutineScope, transaction: suspend (Boolean) -> Unit) {
+    val originalState = this.isChecked
+    this.setOnPreferenceChangeListener { switchPreference, isChecked ->
+        scope.launch {
+            try {
+                transaction(isChecked as Boolean)
+            } catch (failure: Throwable) {
+                require(switchPreference is SwitchPreference)
+                switchPreference.isChecked = originalState
+                Toast.makeText(switchPreference.context, R.string.unknown_error, Toast.LENGTH_SHORT).show()
+            }
+        }
+        true
+    }
+}

From 516bb6ed951005a991671920feea7fd1e3ed4a73 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Tue, 21 Sep 2021 11:26:11 +0100
Subject: [PATCH 05/24] lifting the email branding to its own parameter so
 clients of the sdk can configure it

---
 .../android/sdk/api/session/pushers/PushersService.kt      | 2 ++
 .../sdk/internal/session/pushers/DefaultPushersService.kt  | 7 ++++---
 .../main/java/im/vector/app/core/pushers/PushersManager.kt | 4 +++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt
index 2766147cc9..fc080a0985 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt
@@ -70,6 +70,7 @@ interface PushersService {
      * @param email             The email address to send notifications to.
      *                          If the kind is "email", this is the email address to send notifications to.
      * @param lang              The preferred language for receiving notifications (e.g. "en" or "en-US").
+     * @param emailBranding     The branding placeholder to include in the email communications.
      * @param appDisplayName    A human readable string that will allow the user to identify what application owns this pusher.
      * @param deviceDisplayName A human readable string that will allow the user to identify what device owns this pusher.
      * @param append            If true, the homeserver should add another pusher with the given pushkey and App ID in addition
@@ -81,6 +82,7 @@ interface PushersService {
      */
     fun addEmailPusher(email: String,
                        lang: String,
+                       emailBranding: String,
                        appDisplayName: String,
                        deviceDisplayName: String,
                        append: Boolean): UUID
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt
index a7fd3d435f..61e875b8e5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt
@@ -81,15 +81,16 @@ internal class DefaultPushersService @Inject constructor(
             )
     )
 
-    override fun addEmailPusher(email: String, lang: String, appDisplayName: String, deviceDisplayName: String, append: Boolean) = addPusher(
-            JsonPusher(pushKey = email,
+    override fun addEmailPusher(email: String, lang: String, emailBranding: String, appDisplayName: String, deviceDisplayName: String, append: Boolean) = addPusher(
+            JsonPusher(
+                    pushKey = email,
                     kind = "email",
                     appId = "m.email",
                     profileTag = "",
                     lang = lang,
                     appDisplayName = appDisplayName,
                     deviceDisplayName = deviceDisplayName,
-                    data = JsonPusherData(brand = appDisplayName),
+                    data = JsonPusherData(brand = emailBranding),
                     append = append
             )
     )
diff --git a/vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt b/vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
index fa39823c36..03f82d3fc9 100644
--- a/vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
+++ b/vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
@@ -63,10 +63,12 @@ class PushersManager @Inject constructor(
 
     fun registerEmailForPush(email: String) {
         val currentSession = activeSessionHolder.getActiveSession()
+        val appName = appNameProvider.getAppName()
         currentSession.addEmailPusher(
                 email = email,
                 lang = localeProvider.current().language,
-                appDisplayName = appNameProvider.getAppName(),
+                emailBranding = appName,
+                appDisplayName = appName,
                 deviceDisplayName = currentSession.sessionParams.deviceId ?: "MOBILE",
                 append = true,
         )

From 78d70eab12f58806c4b27d14673f7c14a8fc3282 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Tue, 21 Sep 2021 11:32:33 +0100
Subject: [PATCH 06/24] enforcing emails pushes to always be appended - always
 appending allows the same email to be used for other accounts see
 https://github.com/matrix-org/matrix-react-sdk/pull/2727
 https://github.com/matrix-org/matrix-react-sdk/pull/2727/files#diff-ec232520bf51337e5e6939b885d21f428ad6da3306c8e17a3ff660b2b341179dR165

---
 .../android/sdk/api/session/pushers/PushersService.kt       | 6 +-----
 .../sdk/internal/session/pushers/DefaultPushersService.kt   | 4 ++--
 .../main/java/im/vector/app/core/pushers/PushersManager.kt  | 1 -
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt
index fc080a0985..f2f74cb24b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt
@@ -73,9 +73,6 @@ interface PushersService {
      * @param emailBranding     The branding placeholder to include in the email communications.
      * @param appDisplayName    A human readable string that will allow the user to identify what application owns this pusher.
      * @param deviceDisplayName A human readable string that will allow the user to identify what device owns this pusher.
-     * @param append            If true, the homeserver should add another pusher with the given pushkey and App ID in addition
-     *                          to any others with different user IDs. Otherwise, the homeserver must remove any other pushers
-     *                          with the same App ID and pushkey for different users.
      * @return                  A work request uuid. Can be used to listen to the status
      *                          (LiveData<WorkInfo> status = workManager.getWorkInfoByIdLiveData(<UUID>))
      * @throws [InvalidParameterException] if a parameter is not correct
@@ -84,8 +81,7 @@ interface PushersService {
                        lang: String,
                        emailBranding: String,
                        appDisplayName: String,
-                       deviceDisplayName: String,
-                       append: Boolean): UUID
+                       deviceDisplayName: String): UUID
 
     /**
      * Directly ask the push gateway to send a push to this device
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt
index 61e875b8e5..be39eb7aba 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt
@@ -81,7 +81,7 @@ internal class DefaultPushersService @Inject constructor(
             )
     )
 
-    override fun addEmailPusher(email: String, lang: String, emailBranding: String, appDisplayName: String, deviceDisplayName: String, append: Boolean) = addPusher(
+    override fun addEmailPusher(email: String, lang: String, emailBranding: String, appDisplayName: String, deviceDisplayName: String) = addPusher(
             JsonPusher(
                     pushKey = email,
                     kind = "email",
@@ -91,7 +91,7 @@ internal class DefaultPushersService @Inject constructor(
                     appDisplayName = appDisplayName,
                     deviceDisplayName = deviceDisplayName,
                     data = JsonPusherData(brand = emailBranding),
-                    append = append
+                    append = true
             )
     )
 
diff --git a/vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt b/vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
index 03f82d3fc9..248e03161b 100644
--- a/vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
+++ b/vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
@@ -70,7 +70,6 @@ class PushersManager @Inject constructor(
                 emailBranding = appName,
                 appDisplayName = appName,
                 deviceDisplayName = currentSession.sessionParams.deviceId ?: "MOBILE",
-                append = true,
         )
     }
 

From 2c25efc36ade1cc2fd272e94ff62f00051f34960 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Tue, 21 Sep 2021 12:06:26 +0100
Subject: [PATCH 07/24] 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

---
 .../android/sdk/api/session/pushers/PushersService.kt  | 10 +++-------
 .../internal/session/pushers/DefaultPushersService.kt  |  7 +------
 .../java/im/vector/app/core/pushers/PushersManager.kt  |  4 ++--
 .../features/settings/push/PushGatewaysViewModel.kt    |  2 +-
 4 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt
index f2f74cb24b..ee9828fa63 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt
+++ b/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
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt
index be39eb7aba..a6336ff571 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt
+++ b/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) },
diff --git a/vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt b/vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
index 248e03161b..3f77e6a422 100644
--- a/vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
+++ b/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 {
diff --git a/vector/src/main/java/im/vector/app/features/settings/push/PushGatewaysViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/push/PushGatewaysViewModel.kt
index 9910526878..c3f799730c 100644
--- a/vector/src/main/java/im/vector/app/features/settings/push/PushGatewaysViewModel.kt
+++ b/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)
         }
     }
 

From 710f2f92cbbf4b96de6a20c2c1996a963cd6b463 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Tue, 21 Sep 2021 12:06:53 +0100
Subject: [PATCH 08/24] cleaning up the notification email group xml definition
 to include a self closing tag - the category is dynamically populated so we
 shouldn't be adding anything static here anyways!

---
 vector/src/main/res/xml/vector_settings_notifications.xml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/vector/src/main/res/xml/vector_settings_notifications.xml b/vector/src/main/res/xml/vector_settings_notifications.xml
index f471c1156b..7d41bdbd86 100644
--- a/vector/src/main/res/xml/vector_settings_notifications.xml
+++ b/vector/src/main/res/xml/vector_settings_notifications.xml
@@ -57,9 +57,7 @@
 
     <im.vector.app.core.preference.VectorPreferenceCategory
         android:key="SETTINGS_EMAIL_NOTIFICATION_CATEGORY_PREFERENCE_KEY"
-        android:title="@string/settings_notification_emails_category">
-
-    </im.vector.app.core.preference.VectorPreferenceCategory>
+        android:title="@string/settings_notification_emails_category"/>
 
     <im.vector.app.core.preference.VectorPreferenceCategory
         android:persistent="false"
@@ -120,7 +118,6 @@
             android:key="SETTINGS_START_ON_BOOT_PREFERENCE_KEY"
             android:title="@string/settings_start_on_boot" />
 
-
     </im.vector.app.core.preference.VectorPreferenceCategory>
 
     <im.vector.app.core.preference.VectorPreferenceCategory android:title="@string/settings_troubleshoot_title">

From 03eb36636d46bd07092f353c002dc7964923ef35 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Tue, 21 Sep 2021 15:26:51 +0100
Subject: [PATCH 09/24] capturing the original switch state at the point of
 clicking the switch rather than when the listener is initially set

---
 .../VectorSettingsNotificationPreferenceFragment.kt             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt b/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
index 0a123b8281..28564389f2 100644
--- a/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
@@ -386,8 +386,8 @@ class VectorSettingsNotificationPreferenceFragment @Inject constructor(
 }
 
 private fun SwitchPreference.setTransactionalSwitchChangeListener(scope: CoroutineScope, transaction: suspend (Boolean) -> Unit) {
-    val originalState = this.isChecked
     this.setOnPreferenceChangeListener { switchPreference, isChecked ->
+        val originalState = this.isChecked
         scope.launch {
             try {
                 transaction(isChecked as Boolean)

From 0617179c200dd783b4cfb9b3d8011ba072e27b3d Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Tue, 21 Sep 2021 15:59:29 +0100
Subject: [PATCH 10/24] removing trailing comma for lint

---
 .../src/main/java/im/vector/app/core/pushers/PushersManager.kt  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt b/vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
index 3f77e6a422..df4c2e4d5a 100644
--- a/vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
+++ b/vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
@@ -69,7 +69,7 @@ class PushersManager @Inject constructor(
                 lang = localeProvider.current().language,
                 emailBranding = appName,
                 appDisplayName = appName,
-                deviceDisplayName = currentSession.sessionParams.deviceId ?: "MOBILE",
+                deviceDisplayName = currentSession.sessionParams.deviceId ?: "MOBILE"
         )
     }
 

From 52d9600c4f28a36b04314823fbcdc2445eeabb8a Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Tue, 21 Sep 2021 16:07:19 +0100
Subject: [PATCH 11/24] adding changelog entry for notifications

---
 changelog.d/2243.feature | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/2243.feature

diff --git a/changelog.d/2243.feature b/changelog.d/2243.feature
new file mode 100644
index 0000000000..428c5240d0
--- /dev/null
+++ b/changelog.d/2243.feature
@@ -0,0 +1 @@
+Adds email notification registration to Settings
\ No newline at end of file

From 8734d5d2e7aa73b7f4037abb826ca71cbea81512 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Tue, 21 Sep 2021 16:08:46 +0100
Subject: [PATCH 12/24] removing redundant comments about pusher kind from apis
 which don't have a kind field

---
 .../matrix/android/sdk/api/session/pushers/PushersService.kt    | 2 --
 1 file changed, 2 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt
index ee9828fa63..9e1d7ed144 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt
@@ -33,7 +33,6 @@ interface PushersService {
      *                          this is the routing or destination address information for the notification,
      *                          for example, the APNS token for APNS or the Registration ID for GCM. If your
      *                          notification client has no such concept, use any unique identifier. Max length, 512 chars.
-     *                          If the kind is "email", this is the email address to send notifications to.
      * @param appId             the application id
      *                          This is a reverse-DNS style identifier for the application. It is recommended
      *                          that this end with the platform, such that different platform versions get
@@ -68,7 +67,6 @@ interface PushersService {
      * Ref: https://matrix.org/docs/spec/client_server/latest#post-matrix-client-r0-pushers-set
      *
      * @param email             The email address to send notifications to.
-     *                          If the kind is "email", this is the email address to send notifications to.
      * @param lang              The preferred language for receiving notifications (e.g. "en" or "en-US").
      * @param emailBranding     The branding placeholder to include in the email communications.
      * @param appDisplayName    A human readable string that will allow the user to identify what application owns this pusher.

From 8316728e5303f393b862c03eb8e110b70e28228a Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Thu, 23 Sep 2021 11:45:06 +0100
Subject: [PATCH 13/24] removing this. usages where there's no clashes

---
 .../internal/session/pushers/DefaultPushersService.kt  |  6 +++---
 .../VectorSettingsNotificationPreferenceFragment.kt    | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt
index a6336ff571..de33428adb 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt
@@ -109,9 +109,9 @@ internal class DefaultPushersService @Inject constructor(
 
     private fun JsonPusher.validateParameters() {
         // Do some parameter checks. It's ok to throw Exception, to inform developer of the problem
-        if (this.pushKey.length > 512) throw InvalidParameterException("pushkey should not exceed 512 chars")
-        if (this.appId.length > 64) throw InvalidParameterException("appId should not exceed 64 chars")
-        this.data?.url?.let { url -> if ("/_matrix/push/v1/notify" !in url) throw InvalidParameterException("url should contain '/_matrix/push/v1/notify'") }
+        if (pushKey.length > 512) throw InvalidParameterException("pushkey should not exceed 512 chars")
+        if (appId.length > 64) throw InvalidParameterException("appId should not exceed 64 chars")
+        data?.url?.let { url -> if ("/_matrix/push/v1/notify" !in url) throw InvalidParameterException("url should contain '/_matrix/push/v1/notify'") }
     }
 
     override suspend fun removePusher(pushkey: String, appId: String) {
diff --git a/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt b/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
index 28564389f2..e13f68eb3a 100644
--- a/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
@@ -156,8 +156,8 @@ class VectorSettingsNotificationPreferenceFragment @Inject constructor(
     }
 
     private fun Session.getEmailsWithPushInformation(): List<Pair<ThreePid.Email, Pusher?>> {
-        val emailPushers = this.getPushers().filter { it.kind == "email" }
-        return this.getThreePids()
+        val emailPushers = getPushers().filter { it.kind == "email" }
+        return getThreePids()
                 .filterIsInstance<ThreePid.Email>()
                 .map { it to emailPushers.firstOrNull { pusher -> pusher.pushKey == it.email } }
     }
@@ -386,13 +386,13 @@ class VectorSettingsNotificationPreferenceFragment @Inject constructor(
 }
 
 private fun SwitchPreference.setTransactionalSwitchChangeListener(scope: CoroutineScope, transaction: suspend (Boolean) -> Unit) {
-    this.setOnPreferenceChangeListener { switchPreference, isChecked ->
-        val originalState = this.isChecked
+    setOnPreferenceChangeListener { switchPreference, isChecked ->
+        require(switchPreference is SwitchPreference)
+        val originalState = switchPreference.isChecked
         scope.launch {
             try {
                 transaction(isChecked as Boolean)
             } catch (failure: Throwable) {
-                require(switchPreference is SwitchPreference)
                 switchPreference.isChecked = originalState
                 Toast.makeText(switchPreference.context, R.string.unknown_error, Toast.LENGTH_SHORT).show()
             }

From efec63e9799dc9b49ba5bbc92a69d8c22968dfc7 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Thu, 23 Sep 2021 12:02:46 +0100
Subject: [PATCH 14/24] documenting the getEmails function and lifting it out
 of the class as it's not directly tied to the class

---
 ...rSettingsNotificationPreferenceFragment.kt | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt b/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
index e13f68eb3a..fb30fae7e4 100644
--- a/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
@@ -155,13 +155,6 @@ class VectorSettingsNotificationPreferenceFragment @Inject constructor(
         }
     }
 
-    private fun Session.getEmailsWithPushInformation(): List<Pair<ThreePid.Email, Pusher?>> {
-        val emailPushers = getPushers().filter { it.kind == "email" }
-        return getThreePids()
-                .filterIsInstance<ThreePid.Email>()
-                .map { it to emailPushers.firstOrNull { pusher -> pusher.pushKey == it.email } }
-    }
-
     private val batteryStartForActivityResult = registerStartForActivityResult {
         // Noop
     }
@@ -400,3 +393,17 @@ private fun SwitchPreference.setTransactionalSwitchChangeListener(scope: Corouti
         true
     }
 }
+
+/**
+ * Fetches the current users 3pid emails and pairs them with pushers with same email as the push key.
+ * If no pusher is available for a given emails we can infer that push is not registered for the email.
+ * @return a list of ThreePid emails paired with its associated Pusher or null.
+ * @see ThreePid.Email
+ * @see Pusher
+ */
+private fun Session.getEmailsWithPushInformation(): List<Pair<ThreePid.Email, Pusher?>> {
+    val emailPushers = getPushers().filter { it.kind == "email" }
+    return getThreePids()
+            .filterIsInstance<ThreePid.Email>()
+            .map { it to emailPushers.firstOrNull { pusher -> pusher.pushKey == it.email } }
+}

From 4c4f2fce74d3b0f0dc4fe6136b40b9e440e90116 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Thu, 23 Sep 2021 12:27:56 +0100
Subject: [PATCH 15/24] catching remove pusher errors in the notification
 targets screen - displays a dialog with a human readable version of the error

---
 .../settings/push/PushGatewayViewEvents.kt    | 23 +++++++++++++++++++
 .../settings/push/PushGatewaysFragment.kt     | 13 +++++++++++
 .../settings/push/PushGatewaysViewModel.kt    |  9 ++++++--
 3 files changed, 43 insertions(+), 2 deletions(-)
 create mode 100644 vector/src/main/java/im/vector/app/features/settings/push/PushGatewayViewEvents.kt

diff --git a/vector/src/main/java/im/vector/app/features/settings/push/PushGatewayViewEvents.kt b/vector/src/main/java/im/vector/app/features/settings/push/PushGatewayViewEvents.kt
new file mode 100644
index 0000000000..8b2a833b5c
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/push/PushGatewayViewEvents.kt
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2021 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 im.vector.app.features.settings.push
+
+import im.vector.app.core.platform.VectorViewEvents
+
+sealed class PushGatewayViewEvents : VectorViewEvents {
+    data class RemovePusherFailed(val cause: Throwable): PushGatewayViewEvents()
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/push/PushGatewaysFragment.kt b/vector/src/main/java/im/vector/app/features/settings/push/PushGatewaysFragment.kt
index 696505cc52..9602804bf8 100644
--- a/vector/src/main/java/im/vector/app/features/settings/push/PushGatewaysFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/push/PushGatewaysFragment.kt
@@ -24,9 +24,11 @@ import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import im.vector.app.R
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
+import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.databinding.FragmentGenericRecyclerBinding
 import org.matrix.android.sdk.api.session.pushers.Pusher
@@ -69,6 +71,17 @@ class PushGatewaysFragment @Inject constructor(
             override fun onRemovePushTapped(pusher: Pusher) = viewModel.handle(PushGatewayAction.RemovePusher(pusher))
         }
         views.genericRecyclerView.configureWith(epoxyController, dividerDrawable = R.drawable.divider_horizontal)
+        viewModel.observeViewEvents {
+            when(it) {
+                is PushGatewayViewEvents.RemovePusherFailed -> {
+                    MaterialAlertDialogBuilder(requireContext())
+                            .setTitle(R.string.dialog_title_error)
+                            .setMessage(errorFormatter.toHumanReadable(it.cause))
+                            .setPositiveButton(android.R.string.ok, null)
+                            .show()
+                }
+            }.exhaustive
+        }
     }
 
     override fun onDestroyView() {
diff --git a/vector/src/main/java/im/vector/app/features/settings/push/PushGatewaysViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/push/PushGatewaysViewModel.kt
index c3f799730c..20c0605fb3 100644
--- a/vector/src/main/java/im/vector/app/features/settings/push/PushGatewaysViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/push/PushGatewaysViewModel.kt
@@ -29,6 +29,7 @@ import dagger.assisted.AssistedFactory
 import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.platform.EmptyViewEvents
 import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.features.home.HomeActivityViewEvents
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.pushers.Pusher
@@ -40,7 +41,7 @@ data class PushGatewayViewState(
 
 class PushGatewaysViewModel @AssistedInject constructor(@Assisted initialState: PushGatewayViewState,
                                                         private val session: Session)
-    : VectorViewModel<PushGatewayViewState, PushGatewayAction, EmptyViewEvents>(initialState) {
+    : VectorViewModel<PushGatewayViewState, PushGatewayAction, PushGatewayViewEvents>(initialState) {
 
     @AssistedFactory
     interface Factory {
@@ -79,7 +80,11 @@ class PushGatewaysViewModel @AssistedInject constructor(@Assisted initialState:
 
     private fun removePusher(pusher: Pusher) {
         viewModelScope.launch {
-            session.removePusher(pusher.pushKey, pusher.appId)
+            kotlin.runCatching {
+                session.removePusher(pusher.pushKey, pusher.appId)
+            }.onFailure {
+                _viewEvents.post(PushGatewayViewEvents.RemovePusherFailed(it))
+            }
         }
     }
 

From d31ad7e18758f3da57b0d83571d2fe1b0384972c Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Thu, 23 Sep 2021 12:33:48 +0100
Subject: [PATCH 16/24] extracting constants for the pusher kinds and email
 appId

---
 .../matrix/android/sdk/api/session/pushers/Pusher.kt   | 10 +++++++++-
 .../internal/session/pushers/DefaultPushersService.kt  |  6 +++---
 .../app/features/settings/push/PushGatewayItem.kt      |  7 +++----
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/Pusher.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/Pusher.kt
index eed75c9daf..139bd72c6a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/Pusher.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/Pusher.kt
@@ -26,7 +26,15 @@ data class Pusher(
         val data: PusherData,
 
         val state: PusherState
-)
+) {
+    companion object {
+
+        const val KIND_EMAIL = "email"
+        const val KIND_HTTP = "http"
+        const val APP_ID_EMAIL = "m.email"
+
+    }
+}
 
 enum class PusherState {
     UNREGISTERED,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt
index de33428adb..999a0c7ee1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt
@@ -70,7 +70,7 @@ internal class DefaultPushersService @Inject constructor(
     ) = addPusher(
             JsonPusher(
                     pushKey = pushkey,
-                    kind = "http",
+                    kind = Pusher.KIND_HTTP,
                     appId = appId,
                     profileTag = profileTag,
                     lang = lang,
@@ -84,8 +84,8 @@ internal class DefaultPushersService @Inject constructor(
     override fun addEmailPusher(email: String, lang: String, emailBranding: String, appDisplayName: String, deviceDisplayName: String) = addPusher(
             JsonPusher(
                     pushKey = email,
-                    kind = "email",
-                    appId = "m.email",
+                    kind = Pusher.KIND_EMAIL,
+                    appId = Pusher.APP_ID_EMAIL,
                     profileTag = "",
                     lang = lang,
                     appDisplayName = appDisplayName,
diff --git a/vector/src/main/java/im/vector/app/features/settings/push/PushGatewayItem.kt b/vector/src/main/java/im/vector/app/features/settings/push/PushGatewayItem.kt
index ec67e362ee..ee0ef87cc7 100644
--- a/vector/src/main/java/im/vector/app/features/settings/push/PushGatewayItem.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/push/PushGatewayItem.kt
@@ -37,10 +37,9 @@ abstract class PushGatewayItem : EpoxyModelWithHolder<PushGatewayItem.Holder>()
     override fun bind(holder: Holder) {
         super.bind(holder)
         holder.kind.text = when (pusher.kind) {
-            // TODO Create const
-            "http" -> "Http Pusher"
-            "mail" -> "Email Pusher"
-            else   -> pusher.kind
+            Pusher.KIND_HTTP  -> "Http Pusher"
+            Pusher.KIND_EMAIL -> "Email Pusher"
+            else              -> pusher.kind
         }
 
         holder.appId.text = pusher.appId

From 1865e3c450483be7e43d0a399ba767493bbd4850 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Thu, 23 Sep 2021 12:54:52 +0100
Subject: [PATCH 17/24] hiding the notification url/format UI fields when
 they're null (which is the case for email pushers)

---
 .../im/vector/app/core/extensions/ViewExtensions.kt  | 12 ++++++++++++
 .../app/features/settings/push/PushGatewayItem.kt    |  7 +++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/core/extensions/ViewExtensions.kt b/vector/src/main/java/im/vector/app/core/extensions/ViewExtensions.kt
index b28f33816b..06aa1225c9 100644
--- a/vector/src/main/java/im/vector/app/core/extensions/ViewExtensions.kt
+++ b/vector/src/main/java/im/vector/app/core/extensions/ViewExtensions.kt
@@ -22,6 +22,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.EditText
 import android.widget.ImageView
+import android.widget.TextView
 import androidx.appcompat.widget.SearchView
 import androidx.core.view.isVisible
 import im.vector.app.R
@@ -58,3 +59,14 @@ fun ImageView.setDrawableOrHide(drawableRes: Drawable?) {
     setImageDrawable(drawableRes)
     isVisible = drawableRes != null
 }
+
+fun TextView.setText(text: String?, nullVisibility: Int, vararg relatedViews: View) {
+    if (text == null) {
+        visibility = nullVisibility
+        relatedViews.forEach { it.visibility = nullVisibility }
+    } else {
+        visibility = View.VISIBLE
+        relatedViews.forEach { it.visibility = View.VISIBLE }
+        this.text = text
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/push/PushGatewayItem.kt b/vector/src/main/java/im/vector/app/features/settings/push/PushGatewayItem.kt
index ee0ef87cc7..2ac156d9fd 100644
--- a/vector/src/main/java/im/vector/app/features/settings/push/PushGatewayItem.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/push/PushGatewayItem.kt
@@ -23,6 +23,7 @@ import com.airbnb.epoxy.EpoxyModelClass
 import com.airbnb.epoxy.EpoxyModelWithHolder
 import im.vector.app.R
 import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.extensions.setText
 import org.matrix.android.sdk.api.session.pushers.Pusher
 
 @EpoxyModelClass(layout = R.layout.item_pushgateway)
@@ -45,8 +46,8 @@ abstract class PushGatewayItem : EpoxyModelWithHolder<PushGatewayItem.Holder>()
         holder.appId.text = pusher.appId
         holder.pushKey.text = pusher.pushKey
         holder.appName.text = pusher.appDisplayName
-        holder.url.text = pusher.data.url
-        holder.format.text = pusher.data.format
+        holder.url.setText(pusher.data.url, nullVisibility = View.GONE, holder.urlTitle)
+        holder.format.setText(pusher.data.format, nullVisibility = View.GONE, holder.formatTitle)
         holder.deviceName.text = pusher.deviceDisplayName
         holder.removeButton.setOnClickListener {
             interactions.onRemovePushTapped(pusher)
@@ -57,7 +58,9 @@ abstract class PushGatewayItem : EpoxyModelWithHolder<PushGatewayItem.Holder>()
         val kind by bind<TextView>(R.id.pushGatewayKind)
         val pushKey by bind<TextView>(R.id.pushGatewayKeyValue)
         val deviceName by bind<TextView>(R.id.pushGatewayDeviceNameValue)
+        val formatTitle by bind<View>(R.id.pushGatewayFormat)
         val format by bind<TextView>(R.id.pushGatewayFormatValue)
+        val urlTitle by bind<View>(R.id.pushGatewayURL)
         val url by bind<TextView>(R.id.pushGatewayURLValue)
         val appName by bind<TextView>(R.id.pushGatewayAppNameValue)
         val appId by bind<TextView>(R.id.pushGatewayAppIdValue)

From 1d4c909b50b5b9f4ed8656ee71b340c3f7310cc3 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Thu, 23 Sep 2021 13:02:36 +0100
Subject: [PATCH 18/24] adding translator note about the enable email
 placeholder

---
 vector/src/main/res/values/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 08c4467234..b2a9d27d22 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -1114,6 +1114,8 @@
 
     <string name="settings_notification_emails_category">Email notification</string>
     <string name="settings_notification_emails_no_emails">To receive email with notification, please associate an email to your Matrix account</string>
+
+    <!-- The variable is a single email address, eg Enable email notifications for example@matrix.org -->
     <string name="settings_notification_emails_enable_for_email">Enable email notifications for %s</string>
 
     <string name="settings_notification_default">Default Notifications</string>

From 43eff8b85bbfa4c20f21204c9d3d05444b3b1770 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Thu, 23 Sep 2021 13:05:18 +0100
Subject: [PATCH 19/24] reusing existing remove string

---
 vector/src/main/res/layout/item_pushgateway.xml | 2 +-
 vector/src/main/res/values/strings.xml          | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/vector/src/main/res/layout/item_pushgateway.xml b/vector/src/main/res/layout/item_pushgateway.xml
index b1cec859b1..d3b1f3ed76 100644
--- a/vector/src/main/res/layout/item_pushgateway.xml
+++ b/vector/src/main/res/layout/item_pushgateway.xml
@@ -134,6 +134,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
-        android:text="@string/push_gateway_item_remove" />
+        android:text="@string/remove" />
 
 </LinearLayout>
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index b2a9d27d22..b56a518a3f 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -2251,7 +2251,6 @@
     <string name="push_gateway_item_device_name">session_name:</string>
     <string name="push_gateway_item_url">Url:</string>
     <string name="push_gateway_item_format">Format:</string>
-    <string name="push_gateway_item_remove">Remove</string>
 
     <string name="preference_voice_and_video">Voice &amp; Video</string>
     <string name="preference_root_help_about">Help &amp; About</string>

From 0302d19f474bfc9c58457008f7756156e185fb2b Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Thu, 23 Sep 2021 13:20:01 +0100
Subject: [PATCH 20/24] formatting

---
 .../org/matrix/android/sdk/api/session/pushers/Pusher.kt   | 1 -
 .../sdk/internal/session/pushers/DefaultPushersService.kt  | 7 ++++++-
 .../app/features/settings/push/PushGatewaysFragment.kt     | 2 +-
 .../app/features/settings/push/PushGatewaysViewModel.kt    | 2 --
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/Pusher.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/Pusher.kt
index 139bd72c6a..b85ab32b21 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/Pusher.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/Pusher.kt
@@ -32,7 +32,6 @@ data class Pusher(
         const val KIND_EMAIL = "email"
         const val KIND_HTTP = "http"
         const val APP_ID_EMAIL = "m.email"
-
     }
 }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt
index 999a0c7ee1..8f91374688 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt
@@ -81,7 +81,12 @@ internal class DefaultPushersService @Inject constructor(
             )
     )
 
-    override fun addEmailPusher(email: String, lang: String, emailBranding: String, appDisplayName: String, deviceDisplayName: String) = addPusher(
+    override fun addEmailPusher(email: String,
+                                lang: String,
+                                emailBranding: String,
+                                appDisplayName: String,
+                                deviceDisplayName: String
+    ) = addPusher(
             JsonPusher(
                     pushKey = email,
                     kind = Pusher.KIND_EMAIL,
diff --git a/vector/src/main/java/im/vector/app/features/settings/push/PushGatewaysFragment.kt b/vector/src/main/java/im/vector/app/features/settings/push/PushGatewaysFragment.kt
index 9602804bf8..cd1899741f 100644
--- a/vector/src/main/java/im/vector/app/features/settings/push/PushGatewaysFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/push/PushGatewaysFragment.kt
@@ -72,7 +72,7 @@ class PushGatewaysFragment @Inject constructor(
         }
         views.genericRecyclerView.configureWith(epoxyController, dividerDrawable = R.drawable.divider_horizontal)
         viewModel.observeViewEvents {
-            when(it) {
+            when (it) {
                 is PushGatewayViewEvents.RemovePusherFailed -> {
                     MaterialAlertDialogBuilder(requireContext())
                             .setTitle(R.string.dialog_title_error)
diff --git a/vector/src/main/java/im/vector/app/features/settings/push/PushGatewaysViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/push/PushGatewaysViewModel.kt
index 20c0605fb3..77dedbc490 100644
--- a/vector/src/main/java/im/vector/app/features/settings/push/PushGatewaysViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/push/PushGatewaysViewModel.kt
@@ -27,9 +27,7 @@ import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import dagger.assisted.AssistedFactory
 import im.vector.app.core.extensions.exhaustive
-import im.vector.app.core.platform.EmptyViewEvents
 import im.vector.app.core.platform.VectorViewModel
-import im.vector.app.features.home.HomeActivityViewEvents
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.pushers.Pusher

From 3a1cb1c07a02a3bd3a52f5f3bd0b0019bbb304b9 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Thu, 23 Sep 2021 14:43:26 +0100
Subject: [PATCH 21/24] monitoring the ThreePids so that the notifications
 screen updates when returning from adding an email - makes use of both sync
 and async fetching so that the page can avoid jumping around on the initial
 load

---
 ...rSettingsNotificationPreferenceFragment.kt | 43 ++++++++++++++-----
 1 file changed, 33 insertions(+), 10 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt b/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
index fb30fae7e4..098d1b2caa 100644
--- a/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
@@ -23,7 +23,10 @@ import android.media.RingtoneManager
 import android.net.Uri
 import android.os.Parcelable
 import android.widget.Toast
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.distinctUntilChanged
 import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.map
 import androidx.preference.Preference
 import androidx.preference.SwitchPreference
 import im.vector.app.R
@@ -127,8 +130,18 @@ class VectorSettingsNotificationPreferenceFragment @Inject constructor(
     }
 
     private fun bindEmailNotifications() {
-        val emails = session.getEmailsWithPushInformation()
+        val initialEmails = session.getEmailsWithPushInformation()
+        bindEmailNotificationCategory(initialEmails)
+        session.getEmailsWithPushInformationLive().observe(this) { emails ->
+            if (initialEmails != emails) {
+                bindEmailNotificationCategory(emails)
+            }
+        }
+    }
+
+    private fun bindEmailNotificationCategory(emails: List<Pair<ThreePid.Email, Boolean>>) {
         findPreference<VectorPreferenceCategory>(VectorPreferences.SETTINGS_EMAIL_NOTIFICATION_CATEGORY_PREFERENCE_KEY)?.let { category ->
+            category.removeAll()
             if (emails.isEmpty()) {
                 val vectorPreference = VectorPreference(requireContext())
                 vectorPreference.title = resources.getString(R.string.settings_notification_emails_no_emails)
@@ -138,10 +151,10 @@ class VectorSettingsNotificationPreferenceFragment @Inject constructor(
                     true
                 }
             } else {
-                emails.forEach { (emailPid, pusher) ->
+                emails.forEach { (emailPid, isEnabled) ->
                     val pref = VectorSwitchPreference(requireContext())
                     pref.title = resources.getString(R.string.settings_notification_emails_enable_for_email, emailPid.email)
-                    pref.isChecked = pusher != null
+                    pref.isChecked = isEnabled
                     pref.setTransactionalSwitchChangeListener(lifecycleScope) { isChecked ->
                         if (isChecked) {
                             pushManager.registerEmailForPush(emailPid.email)
@@ -395,15 +408,25 @@ private fun SwitchPreference.setTransactionalSwitchChangeListener(scope: Corouti
 }
 
 /**
- * Fetches the current users 3pid emails and pairs them with pushers with same email as the push key.
- * If no pusher is available for a given emails we can infer that push is not registered for the email.
- * @return a list of ThreePid emails paired with its associated Pusher or null.
+ * Fetches the current users 3pid emails and pairs them with their enabled state.
+ * If no pusher is available for a given email we can infer that push is not registered for the email.
+ * @return a list of ThreePid emails paired with the email notification enabled state. true if email notifications are enabled, false if not.
  * @see ThreePid.Email
- * @see Pusher
  */
-private fun Session.getEmailsWithPushInformation(): List<Pair<ThreePid.Email, Pusher?>> {
-    val emailPushers = getPushers().filter { it.kind == "email" }
+private fun Session.getEmailsWithPushInformation(): List<Pair<ThreePid.Email, Boolean>> {
+    val emailPushers = getPushers().filter { it.kind == Pusher.KIND_EMAIL }
     return getThreePids()
             .filterIsInstance<ThreePid.Email>()
-            .map { it to emailPushers.firstOrNull { pusher -> pusher.pushKey == it.email } }
+            .map { it to emailPushers.any { pusher -> pusher.pushKey == it.email } }
+}
+
+private fun Session.getEmailsWithPushInformationLive(): LiveData<List<Pair<ThreePid.Email, Boolean>>> {
+    return getThreePidsLive(refreshData = false)
+            .distinctUntilChanged()
+            .map { threePids ->
+                val emailPushers = getPushers().filter { it.kind == Pusher.KIND_EMAIL }
+                threePids
+                        .filterIsInstance<ThreePid.Email>()
+                        .map { it to emailPushers.any { pusher -> pusher.pushKey == it.email } }
+            }
 }

From 95b4f99970d1978f7420255b2993f9d2d7eb5f70 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Fri, 24 Sep 2021 15:39:08 +0100
Subject: [PATCH 22/24] making the add email pusher append parameter
 configurable by clients, typically we wouldn't want to overwrite other
 accounts but we can expose the option to clients if they want that behaviour

---
 .../android/sdk/api/session/pushers/PushersService.kt      | 7 ++++++-
 .../sdk/internal/session/pushers/DefaultPushersService.kt  | 5 +++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt
index 9e1d7ed144..625cff78c5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt
@@ -71,6 +71,10 @@ interface PushersService {
      * @param emailBranding     The branding placeholder to include in the email communications.
      * @param appDisplayName    A human readable string that will allow the user to identify what application owns this pusher.
      * @param deviceDisplayName A human readable string that will allow the user to identify what device owns this pusher.
+     * @param append            If true, the homeserver should add another pusher with the given pushkey and App ID in addition
+     *                          to any others with different user IDs. Otherwise, the homeserver must remove any other pushers
+     *                          with the same App ID and pushkey for different users. Typically We always want to append for
+     *                          email pushers since we don't want to stop other accounts notifying to the same email address.
      * @return                  A work request uuid. Can be used to listen to the status
      *                          (LiveData<WorkInfo> status = workManager.getWorkInfoByIdLiveData(<UUID>))
      * @throws [InvalidParameterException] if a parameter is not correct
@@ -79,7 +83,8 @@ interface PushersService {
                        lang: String,
                        emailBranding: String,
                        appDisplayName: String,
-                       deviceDisplayName: String): UUID
+                       deviceDisplayName: String,
+                       append: Boolean = true): UUID
 
     /**
      * Directly ask the push gateway to send a push to this device
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt
index 8f91374688..4b546701db 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt
@@ -85,7 +85,8 @@ internal class DefaultPushersService @Inject constructor(
                                 lang: String,
                                 emailBranding: String,
                                 appDisplayName: String,
-                                deviceDisplayName: String
+                                deviceDisplayName: String,
+                                append: Boolean
     ) = addPusher(
             JsonPusher(
                     pushKey = email,
@@ -96,7 +97,7 @@ internal class DefaultPushersService @Inject constructor(
                     appDisplayName = appDisplayName,
                     deviceDisplayName = deviceDisplayName,
                     data = JsonPusherData(brand = emailBranding),
-                    append = true
+                    append = append
             )
     )
 

From 7fd794bd7adf0b6a8b88e21d4a0c5f239fc7aaa6 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Fri, 24 Sep 2021 15:44:10 +0100
Subject: [PATCH 23/24] reusing existing setTextOrHide by adding an additional
 parameter to hide other views

---
 .../java/im/vector/app/core/extensions/TextView.kt   |  4 +++-
 .../im/vector/app/core/extensions/ViewExtensions.kt  | 12 ------------
 .../app/features/settings/push/PushGatewayItem.kt    |  6 +++---
 3 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/core/extensions/TextView.kt b/vector/src/main/java/im/vector/app/core/extensions/TextView.kt
index 1c424f7071..0872edeafd 100644
--- a/vector/src/main/java/im/vector/app/core/extensions/TextView.kt
+++ b/vector/src/main/java/im/vector/app/core/extensions/TextView.kt
@@ -39,13 +39,15 @@ import im.vector.app.features.themes.ThemeUtils
 /**
  * Set a text in the TextView, or set visibility to GONE if the text is null
  */
-fun TextView.setTextOrHide(newText: CharSequence?, hideWhenBlank: Boolean = true) {
+fun TextView.setTextOrHide(newText: CharSequence?, hideWhenBlank: Boolean = true, vararg relatedViews: View = emptyArray()) {
     if (newText == null
             || (newText.isBlank() && hideWhenBlank)) {
         isVisible = false
+        relatedViews.forEach { it.isVisible = false }
     } else {
         this.text = newText
         isVisible = true
+        relatedViews.forEach { it.isVisible = true }
     }
 }
 
diff --git a/vector/src/main/java/im/vector/app/core/extensions/ViewExtensions.kt b/vector/src/main/java/im/vector/app/core/extensions/ViewExtensions.kt
index 06aa1225c9..b28f33816b 100644
--- a/vector/src/main/java/im/vector/app/core/extensions/ViewExtensions.kt
+++ b/vector/src/main/java/im/vector/app/core/extensions/ViewExtensions.kt
@@ -22,7 +22,6 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.EditText
 import android.widget.ImageView
-import android.widget.TextView
 import androidx.appcompat.widget.SearchView
 import androidx.core.view.isVisible
 import im.vector.app.R
@@ -59,14 +58,3 @@ fun ImageView.setDrawableOrHide(drawableRes: Drawable?) {
     setImageDrawable(drawableRes)
     isVisible = drawableRes != null
 }
-
-fun TextView.setText(text: String?, nullVisibility: Int, vararg relatedViews: View) {
-    if (text == null) {
-        visibility = nullVisibility
-        relatedViews.forEach { it.visibility = nullVisibility }
-    } else {
-        visibility = View.VISIBLE
-        relatedViews.forEach { it.visibility = View.VISIBLE }
-        this.text = text
-    }
-}
diff --git a/vector/src/main/java/im/vector/app/features/settings/push/PushGatewayItem.kt b/vector/src/main/java/im/vector/app/features/settings/push/PushGatewayItem.kt
index 2ac156d9fd..04aa2747d7 100644
--- a/vector/src/main/java/im/vector/app/features/settings/push/PushGatewayItem.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/push/PushGatewayItem.kt
@@ -23,7 +23,7 @@ import com.airbnb.epoxy.EpoxyModelClass
 import com.airbnb.epoxy.EpoxyModelWithHolder
 import im.vector.app.R
 import im.vector.app.core.epoxy.VectorEpoxyHolder
-import im.vector.app.core.extensions.setText
+import im.vector.app.core.extensions.setTextOrHide
 import org.matrix.android.sdk.api.session.pushers.Pusher
 
 @EpoxyModelClass(layout = R.layout.item_pushgateway)
@@ -46,8 +46,8 @@ abstract class PushGatewayItem : EpoxyModelWithHolder<PushGatewayItem.Holder>()
         holder.appId.text = pusher.appId
         holder.pushKey.text = pusher.pushKey
         holder.appName.text = pusher.appDisplayName
-        holder.url.setText(pusher.data.url, nullVisibility = View.GONE, holder.urlTitle)
-        holder.format.setText(pusher.data.format, nullVisibility = View.GONE, holder.formatTitle)
+        holder.url.setTextOrHide(pusher.data.url, hideWhenBlank = true, holder.urlTitle)
+        holder.format.setTextOrHide(pusher.data.format, hideWhenBlank = true, holder.formatTitle)
         holder.deviceName.text = pusher.deviceDisplayName
         holder.removeButton.setOnClickListener {
             interactions.onRemovePushTapped(pusher)

From 4482cbdaa649ff299044a064fa1a9957a3db1819 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Fri, 24 Sep 2021 17:00:48 +0100
Subject: [PATCH 24/24] using dedicated pusher removal methods for the
 different types of pushers - also adds a separate removePusher which supports
 removing any type of pusher

---
 .../sdk/api/session/pushers/PushersService.kt  | 18 +++++++++++++++---
 .../session/pushers/DefaultPushersService.kt   | 16 ++++++++++++++--
 .../vector/app/core/pushers/PushersManager.kt  |  4 ++--
 .../settings/push/PushGatewaysViewModel.kt     |  2 +-
 4 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt
index 625cff78c5..2cd17952c6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt
@@ -102,10 +102,22 @@ interface PushersService {
                          eventId: String)
 
     /**
-     * Remove the pusher
-     * When the appId is m.email then an email address is expected in the pushkey
+     * Remove a registered pusher
+     * @param pusher the pusher to remove, can be http or email
      */
-    suspend fun removePusher(pushkey: String, appId: String)
+    suspend fun removePusher(pusher: Pusher)
+
+    /**
+     * Remove a Http pusher by its pushkey and appId
+     * @see addHttpPusher
+     */
+    suspend fun removeHttpPusher(pushkey: String, appId: String)
+
+    /**
+     * Remove an Email pusher
+     * @see addEmailPusher
+     */
+    suspend fun removeEmailPusher(email: String)
 
     /**
      * Get the current pushers, as a LiveData
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt
index 4b546701db..9a50abfe35 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt
@@ -120,8 +120,20 @@ internal class DefaultPushersService @Inject constructor(
         data?.url?.let { url -> if ("/_matrix/push/v1/notify" !in url) throw InvalidParameterException("url should contain '/_matrix/push/v1/notify'") }
     }
 
-    override suspend fun removePusher(pushkey: String, appId: String) {
-        val params = RemovePusherTask.Params(pushkey, appId)
+    override suspend fun removePusher(pusher: Pusher) {
+        removePusher(pusher.pushKey, pusher.appId)
+    }
+
+    override suspend fun removeHttpPusher(pushkey: String, appId: String) {
+        removePusher(pushkey, appId)
+    }
+
+    override suspend fun removeEmailPusher(email: String) {
+        removePusher(pushKey = email, Pusher.APP_ID_EMAIL)
+    }
+
+    private suspend fun removePusher(pushKey: String, pushAppId: String) {
+        val params = RemovePusherTask.Params(pushKey, pushAppId)
         removePusherTask.execute(params)
     }
 
diff --git a/vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt b/vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
index df4c2e4d5a..a27765bf4f 100644
--- a/vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
+++ b/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.removePusher(email, appId = "m.email")
+        currentSession.removeEmailPusher(email)
     }
 
     suspend fun unregisterPusher(pushKey: String) {
         val currentSession = activeSessionHolder.getSafeActiveSession() ?: return
-        currentSession.removePusher(pushKey, stringProvider.getString(R.string.pusher_app_id))
+        currentSession.removeHttpPusher(pushKey, stringProvider.getString(R.string.pusher_app_id))
     }
 
     companion object {
diff --git a/vector/src/main/java/im/vector/app/features/settings/push/PushGatewaysViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/push/PushGatewaysViewModel.kt
index 77dedbc490..9a47fa2a15 100644
--- a/vector/src/main/java/im/vector/app/features/settings/push/PushGatewaysViewModel.kt
+++ b/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 {
             kotlin.runCatching {
-                session.removePusher(pusher.pushKey, pusher.appId)
+                session.removePusher(pusher)
             }.onFailure {
                 _viewEvents.post(PushGatewayViewEvents.RemovePusherFailed(it))
             }