Matrix/element-android-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-android.git synced 2024-11-27 15:28:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7918 from vector-im/feature/bma/pushRuleModel

Browse Source 
Remove the "device" field from get `/pushrules` response model.
This commit is contained in:
Benoit Marty 2023-01-10 11:15:03 +01:00 committed by GitHub
commit 4f829f11d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,10 +30,4 @@ internal data class GetPushRulesResponse(
*/ */
@Json(name = "global") @Json(name = "global")
val global: RuleSet, val global: RuleSet,
/**
* Device specific rules, apply only to current device.
*/
@Json(name = "device")
val device: RuleSet? = null
) )

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

@ -42,7 +42,6 @@ internal class DefaultSavePushRulesTask @Inject constructor(@SessionDatabase pri
.findAll() .findAll()
.forEach { it.deleteOnCascade() } .forEach { it.deleteOnCascade() }
// Save only global rules for the moment
val globalRules = params.pushRules.global val globalRules = params.pushRules.global
val content = PushRulesEntity(RuleScope.GLOBAL).apply { kind = RuleSetKey.CONTENT } val content = PushRulesEntity(RuleScope.GLOBAL).apply { kind = RuleSetKey.CONTENT }