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
This commit is contained in:
Adam Brown 2021-09-21 11:32:33 +01:00
parent 516bb6ed95
commit 78d70eab12
3 changed files with 3 additions and 8 deletions

View File

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

View File

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

View File

@ -70,7 +70,6 @@ class PushersManager @Inject constructor(
emailBranding = appName,
appDisplayName = appName,
deviceDisplayName = currentSession.sessionParams.deviceId ?: "MOBILE",
append = true,
)
}