Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove the "device" field from get /pushrules response model. #7918

Merged
merged 1 commit into from
Jan 10, 2023
Merged

Remove the "device" field from get /pushrules response model. #7918

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions ...oid/src/main/java/org/matrix/android/sdk/internal/session/pushers/GetPushRulesResponse.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,4 @@ internal data class GetPushRulesResponse(
*/
@Json(name = "global")
val global: RuleSet,

/**
* Device specific rules, apply only to current device.
*/
@Json(name = "device")
val device: RuleSet? = null
)
1 change: 0 additions & 1 deletion ...ndroid/src/main/java/org/matrix/android/sdk/internal/session/pushers/SavePushRulesTask.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ internal class DefaultSavePushRulesTask @Inject constructor(@SessionDatabase pri
.findAll()
.forEach { it.deleteOnCascade() }

// Save only global rules for the moment
val globalRules = params.pushRules.global

val content = PushRulesEntity(RuleScope.GLOBAL).apply { kind = RuleSetKey.CONTENT }
Expand Down