🟢 Apply (polls) push rules client side for encrypted rooms

MatrixSDK/Background/MXBackgroundPushRulesManager.swift

@@ -115,8 +115,8 @@ import Foundation
  .roomMemberCount: memberCountConditionChecker,
  .senderNotificationPermission: permissionConditionChecker
  ]
-
- let eventDictionary = event.jsonDictionary()
+ // getting the unencrypted event if present or fallback
+ let eventDictionary = (event.clear ?? event).jsonDictionary()
  let equivalentCondition = MXPushRuleCondition()
 
  for rule in flatRules.filter({ $0.enabled }) {

MatrixSDK/Background/MXBackgroundSyncService.swift

@@ -98,13 +98,9 @@ public enum MXBackgroundSyncServiceError: Error {
  }()
 
  pushRulesManager = MXBackgroundPushRulesManager(withCredentials: credentials)
- if let accountData = syncResponseStoreManager.syncResponseStore.accountData {
- pushRulesManager.handleAccountData(accountData)
- } else if let accountData = store.userAccountData ?? nil {
- pushRulesManager.handleAccountData(accountData)
- }
  MXLog.debug("[MXBackgroundSyncService] init complete")
  super.init()
+ syncPushRuleManagerWithAccountData()
  }
 
  /// Fetch event with given event and room identifiers. It performs a sync if the event not found in session store.
@@ -500,5 +496,15 @@ public enum MXBackgroundSyncServiceError: Error {
  MXLog.debug("[MXBackgroundSyncService] updateBackgroundServiceStoresIfNeeded: Reset MXBackgroundCryptoStore")
  crypto.reset()
  }
+
+ syncPushRuleManagerWithAccountData()
+ }
+
+ private func syncPushRuleManagerWithAccountData() {
+ if let accountData = syncResponseStoreManager.syncResponseStore.accountData {
+ pushRulesManager.handleAccountData(accountData)
+ } else if let accountData = store.userAccountData ?? nil {
+ pushRulesManager.handleAccountData(accountData)
+ }
  }
 }

changelog.d/pr-1714.change

@@ -0,0 +1 @@
+Push Rules: Apply push rules client side for encrypted rooms, including mentions and keywords.