Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-28 15:22:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Apply (polls) push rules client side for encrypted rooms (#7356)

Browse source 
* managing dont notify push rule

* private extension for push rule

* remove mentions and keyword notice footer
This commit is contained in:
Flescio 2023-02-13 11:13:59 +01:00 committed by GitHub
parent 75049c29e8
commit f36f5782fb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
RiotNSE/NotificationService.swift
View file

@ -382,7 +382,13 @@ class NotificationService: UNNotificationServiceExtension {
let currentUserId = account.mxCredentials.userId
let roomDisplayName = roomSummary?.displayname
let pushRule = NotificationService.backgroundSyncService.pushRule(matching: event, roomState: roomState)
// if the push rule must not be notified we complete and return
if pushRule?.dontNotify == true {
onComplete(nil, false)
return
}
switch event.eventType {
case .callInvite:
let offer = event.content["offer"] as? [AnyHashable: Any]
@ -887,3 +893,10 @@ class NotificationService: UNNotificationServiceExtension {
return String(format: format, locale: locale, arguments: args)
}
}
private extension MXPushRule {
var dontNotify: Bool {
let actions = (actions as? [MXPushRuleAction]) ?? []
return actions.contains { $0.actionType == MXPushRuleActionTypeDontNotify }
}
}

3
RiotSwiftUI/Modules/Settings/Notifications/View/MentionsAndKeywordNotificationSettings.swift
View file

@ -21,8 +21,7 @@ struct MentionsAndKeywordNotificationSettings: View {
var keywordSection: some View {
SwiftUI.Section(
header: FormSectionHeader(text: VectorL10n.settingsYourKeywords),
footer: FormSectionFooter(text: VectorL10n.settingsMentionsAndKeywordsEncryptionNotice)
header: FormSectionHeader(text: VectorL10n.settingsYourKeywords)
) {
NotificationSettingsKeywords(viewModel: viewModel)
}

1
changelog.d/pr-7356.change Normal file
View file

@ -0,0 +1 @@
Push Rules: Apply push rules client side for encrypted rooms, hiding in case of dont_notify action