felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-05-04 06:58:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add missing NotificationPushRuleIds

Browse Source
This commit is contained in:
Alfonso Grillo
2023-01-27 11:37:35 +01:00
parent 1385c16c4a
commit 290dfa0e95
3 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
RiotSwiftUI/Modules/Settings/Notifications/Model/NotificationPushRuleDefinitions.swift
+2 -2
View File
@@ -42,7 +42,7 @@ extension NotificationPushRuleId {
case .silent: return .notify
case .noisy: return .highlight
}
case .oneToOneRoom, .msc3930oneToOnePollStart, .msc3930oneToOnePollEnd:
case .oneToOneRoom, .oneToOnePollStart, .msc3930oneToOnePollStart, .oneToOnePollEnd, .msc3930oneToOnePollEnd:
switch index {
case .off: return .dontNotify
case .silent: return .notify
@@ -54,7 +54,7 @@ extension NotificationPushRuleId {
case .silent: return .notify
case .noisy: return .notifyDefaultSound
}
case .allOtherMessages, .msc3930pollStart, .msc3930pollEnd:
case .allOtherMessages, .pollStart, .msc3930pollStart, .pollEnd, .msc3930pollEnd:
switch index {
case .off: return .dontNotify
case .silent: return .notify
RiotSwiftUI/Modules/Settings/Notifications/Model/NotificationPushRuleIds.swift
+13 -5
View File
@@ -29,11 +29,19 @@ enum NotificationPushRuleId: String {
case oneToOneRoom = ".m.rule.room_one_to_one"
case allOtherMessages = ".m.rule.message"
case encrypted = ".m.rule.encrypted"
case msc3930pollStart = ".org.matrix.msc3930.rule.poll_start"
case msc3930oneToOnePollStart = ".org.matrix.msc3930.rule.poll_start_one_to_one"
case msc3930pollEnd = ".org.matrix.msc3930.rule.poll_end"
case msc3930oneToOnePollEnd = ".org.matrix.msc3930.rule.poll_end_one_to_one"
case keywords = "_keywords"
// poll started event
case pollStart = ".m.rule.poll_start"
case msc3930pollStart = ".org.matrix.msc3930.rule.poll_start"
// poll started event (one to one)
case oneToOnePollStart = ".m.rule.poll_start_one_to_one"
case msc3930oneToOnePollStart = ".org.matrix.msc3930.rule.poll_start_one_to_one"
// poll ended event
case pollEnd = ".m.rule.poll_end"
case msc3930pollEnd = ".org.matrix.msc3930.rule.poll_end"
// poll ended event (one to one)
case oneToOnePollEnd = ".m.rule.poll_end_one_to_one"
case msc3930oneToOnePollEnd = ".org.matrix.msc3930.rule.poll_end_one_to_one"
}
extension NotificationPushRuleId: Identifiable {
@@ -69,7 +77,7 @@ extension NotificationPushRuleId {
return VectorL10n.settingsEncryptedGroupMessages
case .keywords:
return VectorL10n.settingsMessagesContainingKeywords
case .msc3930pollStart, .msc3930oneToOnePollStart, .msc3930pollEnd, .msc3930oneToOnePollEnd:
case .pollStart, .msc3930pollStart, .oneToOnePollStart, .msc3930oneToOnePollStart, .pollEnd, .msc3930pollEnd, .oneToOnePollEnd, .msc3930oneToOnePollEnd:
// They don't need to be rendered on the UI
return ""
}
RiotSwiftUI/Modules/Settings/Notifications/ViewModel/NotificationSettingsViewModel.swift
+2 -2
View File
@@ -114,9 +114,9 @@ final class NotificationSettingsViewModel: NotificationSettingsViewModelType, Ob
case .keywords: // Keywords is handled differently to other settings
updateKeywords(isChecked: isChecked)
case .oneToOneRoom:
updatePushActions(for: [ruleID, .msc3930oneToOnePollStart, .msc3930oneToOnePollEnd], enabled: enabled, standardActions: standardActions)
updatePushActions(for: [ruleID, .oneToOnePollStart, .msc3930oneToOnePollStart, .oneToOnePollEnd, .msc3930oneToOnePollEnd], enabled: enabled, standardActions: standardActions)
case .allOtherMessages:
updatePushActions(for: [ruleID, .msc3930pollStart, .msc3930pollEnd], enabled: enabled, standardActions: standardActions)
updatePushActions(for: [ruleID, .pollStart, .msc3930pollStart, .pollEnd, .msc3930pollEnd], enabled: enabled, standardActions: standardActions)
default:
updatePushActions(for: [ruleID], enabled: enabled, standardActions: standardActions)
}