Merge branch 'release/0.23.17/master'

CHANGES.md

@@ -1,3 +1,10 @@
+## Changes in 0.23.17 (2022-08-31)
+
+🙌 Improvements
+
+- KeyBackups: Add build flag for symmetric backup ([#1567](https://github.com/matrix-org/matrix-ios-sdk/pull/1567))
+
+
 ## Changes in 0.23.16 (2022-08-24)
 
 ✨ Features

MatrixSDK.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "MatrixSDK"
-  s.version      = "0.23.16"
+  s.version      = "0.23.17"
   s.summary      = "The iOS SDK to build apps compatible with Matrix (https://www.matrix.org)"
 
   s.description  = <<-DESC

MatrixSDK/Crypto/KeyBackup/MXKeyBackup.m

@@ -75,10 +75,19 @@ @implementation MXKeyBackup
 
 + (void)initialize
 {
-    AlgorithmClassesByName = @{
-        kMXCryptoCurve25519KeyBackupAlgorithm: MXCurve25519KeyBackupAlgorithm.class,
-        kMXCryptoAes256KeyBackupAlgorithm: MXAes256KeyBackupAlgorithm.class
-    };
+    if (MXSDKOptions.sharedInstance.enableSymmetricBackup)
+    {
+        AlgorithmClassesByName = @{
+            kMXCryptoCurve25519KeyBackupAlgorithm: MXCurve25519KeyBackupAlgorithm.class,
+            kMXCryptoAes256KeyBackupAlgorithm: MXAes256KeyBackupAlgorithm.class
+        };
+    }
+    else
+    {
+        AlgorithmClassesByName = @{
+            kMXCryptoCurve25519KeyBackupAlgorithm: MXCurve25519KeyBackupAlgorithm.class,
+        };
+    }
     DefaultAlgorithmClass = MXCurve25519KeyBackupAlgorithm.class;
 }
 

MatrixSDK/Crypto/MXCrypto.m

@@ -664,9 +664,9 @@ - (MXEventDecryptionResult *)decryptEvent2:(MXEvent *)event inTimeline:(NSString
             NSDictionary *details = @{
                 @"event_id": event.eventId ?: @"unknown",
                 @"error": result.error ?: @"unknown",
-                @"event": event.JSONDictionary ?: @"unknown"
             };
             MXLogErrorDetails(@"[MXCrypto] decryptEvent", details);
+            MXLogDebug(@"[MXCrypto] decryptEvent: Unable to decrypt event %@", event.JSONDictionary);
 
             if ([result.error.domain isEqualToString:MXDecryptingErrorDomain]
                 && result.error.code == MXDecryptingErrorBadEncryptedMessageCode)

MatrixSDK/MXSDKOptions.h

@@ -216,6 +216,13 @@ NS_ASSUME_NONNULL_BEGIN
 
 #endif
 
+/**
+ Enable symmetric room key backups
+ 
+ @remark NO by default
+ */
+@property (nonatomic) BOOL enableSymmetricBackup;
+
 @end
 
 NS_ASSUME_NONNULL_END

MatrixSDK/MXSDKOptions.m

@@ -58,6 +58,8 @@ - (instancetype)init
         #if DEBUG
         _enableCryptoV2 = NO;
         #endif
+
+        _enableSymmetricBackup = NO;
     }
 
     return self;

MatrixSDK/MatrixSDKVersion.m

@@ -16,4 +16,4 @@
 
 #import <Foundation/Foundation.h>
 
-NSString *const MatrixSDKVersion = @"0.23.16";
+NSString *const MatrixSDKVersion = @"0.23.17";

MatrixSDKTests/MXAes256KeyBackupTests.m

@@ -29,6 +29,16 @@ @interface MXAes256KeyBackupTests : MXBaseKeyBackupTests
 
 @implementation MXAes256KeyBackupTests
 
+- (void)setUp
+{
+    MXSDKOptions.sharedInstance.enableSymmetricBackup = YES;
+}
+
+- (void)tearDown
+{
+    MXSDKOptions.sharedInstance.enableSymmetricBackup = NO;
+}
+
 - (NSString *)algorithm
 {
     return kMXCryptoAes256KeyBackupAlgorithm;