lifting the email branding to its own parameter so clients of the sdk can configure it

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

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
             )
     )

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,
         )