Merge pull request matrix-org#1809 from matrix-org/stefan/variousBugF…

…ixes Various bug fixes
Topheee · Aug 23, 2023 · 33b67a5 · 33b67a5
2 parents 71631c1 + ff18f2f
commit 33b67a5
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 4 deletions.
diff --git a/MatrixSDK/Background/MXBackgroundPushRulesManager.swift b/MatrixSDK/Background/MXBackgroundPushRulesManager.swift
@@ -42,7 +42,9 @@ import Foundation
  }
  }
 
- flatRules = tmpRules
+ // vector-im/element-ios/issues/7636
+ // Intentionally disable new backend push rules as they're not handle properly and break notification sounds
+ flatRules = tmpRules.filter { $0.ruleId != ".m.rule.is_user_mention" && $0.ruleId != ".m.rule.is_room_mention" }
  }
  }
  private var flatRules: [MXPushRule] = []
@@ -129,7 +131,9 @@ import Foundation
  var conditionsOk: Bool = true
  var runEquivalent: Bool = false
 
- guard let kind = MXPushRuleKind(identifier: rule.kind) else { continue }
+ guard let kind = MXPushRuleKind(identifier: rule.kind) else {
+ continue
+ }
 
  switch kind {
  case .override, .underride:

diff --git a/MatrixSDK/Data/Store/MXFileStore/MXFileStore.m b/MatrixSDK/Data/Store/MXFileStore/MXFileStore.m
@@ -2209,7 +2209,23 @@ - (void)saveReceipts
 
  // Store new data
  [self checkFolderExistenceForRoom:roomId forBackup:NO];
- [NSKeyedArchiver archiveRootObject:receiptsStore toFile:file];
+
+ NSError *error = nil;
+ NSData *result = [NSKeyedArchiver archivedDataWithRootObject:receiptsStore requiringSecureCoding:false error:&error];
+
+ if (error != nil)
+ {
+ MXLogErrorDetails(@"Failed archiving receipts store", error);
+ continue;
+ }
+
+ [result writeToURL:[NSURL fileURLWithPath:file] options: NSDataWritingAtomic error: &error];
+
+ if (error != nil)
+ {
+ MXLogErrorDetails(@"Failed writing receipts store to file", error);
+ continue;
+ }
  }
  }
  }

diff --git a/MatrixSDK/Space/MXSpace.swift b/MatrixSDK/Space/MXSpace.swift
@@ -346,7 +346,11 @@ public class MXSpace: NSObject {
  ///
  /// - Returns: the mimnimum power level required to add a room to this space
  public func minimumPowerLevelForAddingRoom(with powerLevels: MXRoomPowerLevels) -> Int {
- return powerLevels.events["m.space.child"] as? Int ?? powerLevels.stateDefault
+ guard let events = powerLevels.events else {
+ return powerLevels.stateDefault
+ }
+
+ return events["m.space.child"] as? Int ?? powerLevels.stateDefault
  }
 
  // MARK: - Private

diff --git a/changelog.d/1810.bugfix b/changelog.d/1810.bugfix
@@ -0,0 +1 @@
+Prevent keyed archiver encoding crashes when writing read receipts to the file store
diff --git a/changelog.d/7636.bugfix b/changelog.d/7636.bugfix
@@ -0,0 +1 @@
+Fix incoming push notifications not triggering sounds
diff --git a/changelog.d/pr-1809.bugfix b/changelog.d/pr-1809.bugfix
@@ -0,0 +1 @@
+Fixes power level events force unwrap crash