Keys backup: Move everything to a dedicated /Crypto/Backup folder

MatrixSDK.xcodeproj/project.pbxproj

@@ -133,10 +133,6 @@
 		328DDEC11A07E57E008C7DC8 /* MXJSONModelTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 328DDEC01A07E57E008C7DC8 /* MXJSONModelTests.m */; };
 		3291D4D41A68FFEB00C3BA41 /* MXFileRoomStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 3291D4D21A68FFEB00C3BA41 /* MXFileRoomStore.h */; };
 		3291D4D51A68FFEB00C3BA41 /* MXFileRoomStore.m in Sources */ = {isa = PBXBuildFile; fileRef = 3291D4D31A68FFEB00C3BA41 /* MXFileRoomStore.m */; };
-		32935F5A216FA0BA00A1BC24 /* MXKeyBackupVersion.h in Headers */ = {isa = PBXBuildFile; fileRef = 32935F58216FA0BA00A1BC24 /* MXKeyBackupVersion.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		32935F5B216FA0BA00A1BC24 /* MXKeyBackupVersion.m in Sources */ = {isa = PBXBuildFile; fileRef = 32935F59216FA0BA00A1BC24 /* MXKeyBackupVersion.m */; };
-		32935F5E216FA19B00A1BC24 /* MXMegolmBackupAuthData.h in Headers */ = {isa = PBXBuildFile; fileRef = 32935F5C216FA19B00A1BC24 /* MXMegolmBackupAuthData.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		32935F5F216FA19B00A1BC24 /* MXMegolmBackupAuthData.m in Sources */ = {isa = PBXBuildFile; fileRef = 32935F5D216FA19B00A1BC24 /* MXMegolmBackupAuthData.m */; };
 		32935F61216FA49D00A1BC24 /* MXCryptoBackupTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 32935F60216FA49D00A1BC24 /* MXCryptoBackupTests.m */; };
 		3293C700214BBA4F009B3DDB /* MXPeekingRoomSummary.h in Headers */ = {isa = PBXBuildFile; fileRef = 3293C6FE214BBA4F009B3DDB /* MXPeekingRoomSummary.h */; };
 		3293C701214BBA4F009B3DDB /* MXPeekingRoomSummary.m in Sources */ = {isa = PBXBuildFile; fileRef = 3293C6FF214BBA4F009B3DDB /* MXPeekingRoomSummary.m */; };
@@ -192,8 +188,12 @@
 		32BA86AC21529E29008F277E /* MXRoomNameStringsLocalizable.h in Headers */ = {isa = PBXBuildFile; fileRef = 32BA86AB21529AE3008F277E /* MXRoomNameStringsLocalizable.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		32BA86AF2152A79E008F277E /* MXRoomNameDefaultStringLocalizations.h in Headers */ = {isa = PBXBuildFile; fileRef = 32BA86AD2152A79E008F277E /* MXRoomNameDefaultStringLocalizations.h */; };
 		32BA86B02152A79E008F277E /* MXRoomNameDefaultStringLocalizations.m in Sources */ = {isa = PBXBuildFile; fileRef = 32BA86AE2152A79E008F277E /* MXRoomNameDefaultStringLocalizations.m */; };
-		32BBAE622178957600D85F46 /* MXKeyBackupData.h in Headers */ = {isa = PBXBuildFile; fileRef = 32BBAE602178957600D85F46 /* MXKeyBackupData.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		32BBAE632178957600D85F46 /* MXKeyBackupData.m in Sources */ = {isa = PBXBuildFile; fileRef = 32BBAE612178957600D85F46 /* MXKeyBackupData.m */; };
+		32BBAE6C2178E99100D85F46 /* MXKeyBackupData.m in Sources */ = {isa = PBXBuildFile; fileRef = 32BBAE662178E99100D85F46 /* MXKeyBackupData.m */; };
+		32BBAE6D2178E99100D85F46 /* MXKeyBackupVersion.h in Headers */ = {isa = PBXBuildFile; fileRef = 32BBAE672178E99100D85F46 /* MXKeyBackupVersion.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		32BBAE6E2178E99100D85F46 /* MXMegolmBackupAuthData.m in Sources */ = {isa = PBXBuildFile; fileRef = 32BBAE682178E99100D85F46 /* MXMegolmBackupAuthData.m */; };
+		32BBAE6F2178E99100D85F46 /* MXKeyBackupVersion.m in Sources */ = {isa = PBXBuildFile; fileRef = 32BBAE692178E99100D85F46 /* MXKeyBackupVersion.m */; };
+		32BBAE702178E99100D85F46 /* MXKeyBackupData.h in Headers */ = {isa = PBXBuildFile; fileRef = 32BBAE6A2178E99100D85F46 /* MXKeyBackupData.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		32BBAE712178E99100D85F46 /* MXMegolmBackupAuthData.h in Headers */ = {isa = PBXBuildFile; fileRef = 32BBAE6B2178E99100D85F46 /* MXMegolmBackupAuthData.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		32BD34BE1E84134A006EDC0D /* MatrixSDKTestsE2EData.m in Sources */ = {isa = PBXBuildFile; fileRef = 32BD34BD1E84134A006EDC0D /* MatrixSDKTestsE2EData.m */; };
 		32BED28F1B00A23F00E668FE /* MXCallStack.h in Headers */ = {isa = PBXBuildFile; fileRef = 32BED28E1B00A23F00E668FE /* MXCallStack.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		32C03CB62123076F00D92712 /* DirectRoomTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 32C03CB52123076F00D92712 /* DirectRoomTests.m */; };
@@ -448,10 +448,6 @@
 		328DDEC01A07E57E008C7DC8 /* MXJSONModelTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MXJSONModelTests.m; sourceTree = "<group>"; };
 		3291D4D21A68FFEB00C3BA41 /* MXFileRoomStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MXFileRoomStore.h; sourceTree = "<group>"; };
 		3291D4D31A68FFEB00C3BA41 /* MXFileRoomStore.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MXFileRoomStore.m; sourceTree = "<group>"; };
-		32935F58216FA0BA00A1BC24 /* MXKeyBackupVersion.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MXKeyBackupVersion.h; sourceTree = "<group>"; };
-		32935F59216FA0BA00A1BC24 /* MXKeyBackupVersion.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MXKeyBackupVersion.m; sourceTree = "<group>"; };
-		32935F5C216FA19B00A1BC24 /* MXMegolmBackupAuthData.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MXMegolmBackupAuthData.h; sourceTree = "<group>"; };
-		32935F5D216FA19B00A1BC24 /* MXMegolmBackupAuthData.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MXMegolmBackupAuthData.m; sourceTree = "<group>"; };
 		32935F60216FA49D00A1BC24 /* MXCryptoBackupTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MXCryptoBackupTests.m; sourceTree = "<group>"; };
 		3293C6FE214BBA4F009B3DDB /* MXPeekingRoomSummary.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MXPeekingRoomSummary.h; sourceTree = "<group>"; };
 		3293C6FF214BBA4F009B3DDB /* MXPeekingRoomSummary.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MXPeekingRoomSummary.m; sourceTree = "<group>"; };
@@ -509,8 +505,12 @@
 		32BA86AB21529AE3008F277E /* MXRoomNameStringsLocalizable.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MXRoomNameStringsLocalizable.h; sourceTree = "<group>"; };
 		32BA86AD2152A79E008F277E /* MXRoomNameDefaultStringLocalizations.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MXRoomNameDefaultStringLocalizations.h; sourceTree = "<group>"; };
 		32BA86AE2152A79E008F277E /* MXRoomNameDefaultStringLocalizations.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MXRoomNameDefaultStringLocalizations.m; sourceTree = "<group>"; };
-		32BBAE602178957600D85F46 /* MXKeyBackupData.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MXKeyBackupData.h; sourceTree = "<group>"; };
-		32BBAE612178957600D85F46 /* MXKeyBackupData.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MXKeyBackupData.m; sourceTree = "<group>"; };
+		32BBAE662178E99100D85F46 /* MXKeyBackupData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MXKeyBackupData.m; sourceTree = "<group>"; };
+		32BBAE672178E99100D85F46 /* MXKeyBackupVersion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MXKeyBackupVersion.h; sourceTree = "<group>"; };
+		32BBAE682178E99100D85F46 /* MXMegolmBackupAuthData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MXMegolmBackupAuthData.m; sourceTree = "<group>"; };
+		32BBAE692178E99100D85F46 /* MXKeyBackupVersion.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MXKeyBackupVersion.m; sourceTree = "<group>"; };
+		32BBAE6A2178E99100D85F46 /* MXKeyBackupData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MXKeyBackupData.h; sourceTree = "<group>"; };
+		32BBAE6B2178E99100D85F46 /* MXMegolmBackupAuthData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MXMegolmBackupAuthData.h; sourceTree = "<group>"; };
 		32BD34BC1E84134A006EDC0D /* MatrixSDKTestsE2EData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MatrixSDKTestsE2EData.h; sourceTree = "<group>"; };
 		32BD34BD1E84134A006EDC0D /* MatrixSDKTestsE2EData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MatrixSDKTestsE2EData.m; sourceTree = "<group>"; };
 		32BED28E1B00A23F00E668FE /* MXCallStack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MXCallStack.h; sourceTree = "<group>"; };
@@ -776,6 +776,7 @@
 				324BE4651E3FADB1008D99D4 /* Utils */,
 				322A51C01D9AC8FE00C8536D /* Algorithms */,
 				32A1513B1DAF768D00400192 /* Data */,
+				32BBAE642178E99100D85F46 /* KeyBackup */,
 				32FA10B21FA1C28100E54233 /* KeySharing */,
 				322A51B41D9AB15900C8536D /* MXCrypto.h */,
 				322A51B51D9AB15900C8536D /* MXCrypto.m */,
@@ -919,19 +920,6 @@
 			path = Store;
 			sourceTree = "<group>";
 		};
-		32935F57216FA09B00A1BC24 /* Backup */ = {
-			isa = PBXGroup;
-			children = (
-				32935F58216FA0BA00A1BC24 /* MXKeyBackupVersion.h */,
-				32935F59216FA0BA00A1BC24 /* MXKeyBackupVersion.m */,
-				32BBAE602178957600D85F46 /* MXKeyBackupData.h */,
-				32BBAE612178957600D85F46 /* MXKeyBackupData.m */,
-				32935F5C216FA19B00A1BC24 /* MXMegolmBackupAuthData.h */,
-				32935F5D216FA19B00A1BC24 /* MXMegolmBackupAuthData.m */,
-			);
-			path = Backup;
-			sourceTree = "<group>";
-		};
 		329571941B024D2B00ABB3BA /* Mocks */ = {
 			isa = PBXGroup;
 			children = (
@@ -957,7 +945,6 @@
 		32A1513B1DAF768D00400192 /* Data */ = {
 			isa = PBXGroup;
 			children = (
-				32935F57216FA09B00A1BC24 /* Backup */,
 				3284A59C1DB7C00600A09972 /* Store */,
 				021AFBA02179E91800742B2C /* MXEncryptedContentFile.h */,
 				021AFBA32179E91800742B2C /* MXEncryptedContentFile.m */,
@@ -1000,6 +987,27 @@
 			name = Lib;
 			sourceTree = "<group>";
 		};
+		32BBAE642178E99100D85F46 /* KeyBackup */ = {
+			isa = PBXGroup;
+			children = (
+				32BBAE652178E99100D85F46 /* Data */,
+			);
+			path = KeyBackup;
+			sourceTree = "<group>";
+		};
+		32BBAE652178E99100D85F46 /* Data */ = {
+			isa = PBXGroup;
+			children = (
+				32BBAE6A2178E99100D85F46 /* MXKeyBackupData.h */,
+				32BBAE662178E99100D85F46 /* MXKeyBackupData.m */,
+				32BBAE672178E99100D85F46 /* MXKeyBackupVersion.h */,
+				32BBAE692178E99100D85F46 /* MXKeyBackupVersion.m */,
+				32BBAE6B2178E99100D85F46 /* MXMegolmBackupAuthData.h */,
+				32BBAE682178E99100D85F46 /* MXMegolmBackupAuthData.m */,
+			);
+			path = Data;
+			sourceTree = "<group>";
+		};
 		32C6F92319DD814400EA4E9C = {
 			isa = PBXGroup;
 			children = (
@@ -1285,7 +1293,6 @@
 				B17982F52119E4A2001FD722 /* MXRoomCreateContent.h in Headers */,
 				32DC15CF1A8CF7AE006F9AD3 /* MXPushRuleConditionChecker.h in Headers */,
 				32954019216385F100E300FC /* MXServerNoticeContent.h in Headers */,
-				32935F5A216FA0BA00A1BC24 /* MXKeyBackupVersion.h in Headers */,
 				327187851DA7D0220071C818 /* MXOlmDecryption.h in Headers */,
 				32D7767D1A27860600FC4AA2 /* MXMemoryStore.h in Headers */,
 				32CE6FB81A409B1F00317F1E /* MXFileStoreMetaData.h in Headers */,
@@ -1301,7 +1308,6 @@
 				92634B821EF2E3C400DB9F60 /* MXCallKitConfiguration.h in Headers */,
 				32618E7120ED2DF500E1D2EA /* MXFilterJSONModel.h in Headers */,
 				322360521A8E610500A3CA81 /* MXPushRuleDisplayNameCondtionChecker.h in Headers */,
-				32BBAE622178957600D85F46 /* MXKeyBackupData.h in Headers */,
 				F03EF5001DF014D9009DF592 /* MXMediaManager.h in Headers */,
 				3245A7521AF7B2930001D8A7 /* MXCallManager.h in Headers */,
 				C6FE1EF01E65C4F7008587E4 /* MXAnalyticsDelegate.h in Headers */,
@@ -1344,6 +1350,7 @@
 				3271877B1DA7CAA60071C818 /* MXEncrypting.h in Headers */,
 				32A31BC420D3FFB0005916C7 /* MXFilter.h in Headers */,
 				32A151481DAF7C0C00400192 /* MXKey.h in Headers */,
+				32BBAE6D2178E99100D85F46 /* MXKeyBackupVersion.h in Headers */,
 				32A151461DAF7C0C00400192 /* MXDeviceInfo.h in Headers */,
 				32CAB1071A91EA34008C5BB9 /* MXPushRuleRoomMemberCountConditionChecker.h in Headers */,
 				C61A4CC41E5F38CB00442158 /* SwiftMatrixSDK.h in Headers */,
@@ -1389,11 +1396,12 @@
 				32DC15D01A8CF7AE006F9AD3 /* MXNotificationCenter.h in Headers */,
 				F0173EAC1FCF0E8900B5F6A3 /* MXGroup.h in Headers */,
 				329FB17F1A0B665800A5E88E /* MXUser.h in Headers */,
-				32935F5E216FA19B00A1BC24 /* MXMegolmBackupAuthData.h in Headers */,
 				320DFDE219DD99B60068622A /* MXError.h in Headers */,
+				32BBAE702178E99100D85F46 /* MXKeyBackupData.h in Headers */,
 				327E37B61A974F75007F026F /* MXLogger.h in Headers */,
 				3256E3811DCB91EB003C9718 /* MXCryptoConstants.h in Headers */,
 				320DFDE619DD99B60068622A /* MXHTTPClient.h in Headers */,
+				32BBAE712178E99100D85F46 /* MXMegolmBackupAuthData.h in Headers */,
 				320DFDDB19DD99B60068622A /* MXRoom.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -1553,9 +1561,9 @@
 				320BBF411D6C81550079890E /* MXEventsByTypesEnumeratorOnArray.m in Sources */,
 				3259CD541DF860C300186944 /* MXRealmCryptoStore.m in Sources */,
 				321B41401E09937E009EEEC7 /* MXRoomSummary.m in Sources */,
+				32BBAE6E2178E99100D85F46 /* MXMegolmBackupAuthData.m in Sources */,
 				32CAB1081A91EA34008C5BB9 /* MXPushRuleRoomMemberCountConditionChecker.m in Sources */,
 				3245A7511AF7B2930001D8A7 /* MXCall.m in Sources */,
-				32935F5B216FA0BA00A1BC24 /* MXKeyBackupVersion.m in Sources */,
 				327F8DB31C6112BA00581CA3 /* MXRoomThirdPartyInvite.m in Sources */,
 				B17982FC2119E4A2001FD722 /* MXRoomPowerLevels.m in Sources */,
 				32C235731F827F3800E38FC5 /* MXRoomOperation.m in Sources */,
@@ -1568,6 +1576,7 @@
 				C6D5D60A1E4FA74000706C0F /* MXEnumConstants.swift in Sources */,
 				3256E3821DCB91EB003C9718 /* MXCryptoConstants.m in Sources */,
 				B18D18C22152B8E4003677D1 /* MXRoomMember.swift in Sources */,
+				32BBAE6F2178E99100D85F46 /* MXKeyBackupVersion.m in Sources */,
 				326056861C76FDF2009D44AD /* MXEventTimeline.m in Sources */,
 				32A1513A1DAD292400400192 /* MXMegolmEncryption.m in Sources */,
 				32F945F71FAB83D900622468 /* MXIncomingRoomKeyRequest.m in Sources */,
@@ -1602,6 +1611,7 @@
 				323E0C5C1A306D7A00A31D73 /* MXEvent.m in Sources */,
 				F03EF5011DF014D9009DF592 /* MXMediaManager.m in Sources */,
 				32CAB10C1A925B41008C5BB9 /* MXHTTPOperation.m in Sources */,
+				32BBAE6C2178E99100D85F46 /* MXKeyBackupData.m in Sources */,
 				3281E8BA19E42DFE00976E1A /* MXJSONModels.m in Sources */,
 				3245A7531AF7B2930001D8A7 /* MXCallManager.m in Sources */,
 				32E226A71D06AC9F00E6CA54 /* MXPeekingRoom.m in Sources */,
@@ -1645,10 +1655,8 @@
 				3220093919EFA4C9008DE41D /* MXEventListener.m in Sources */,
 				C6481AF21F1678A9000DB8A0 /* MXSessionEventListener.swift in Sources */,
 				32A1514F1DAF897600400192 /* MXOlmSessionResult.m in Sources */,
-				32935F5F216FA19B00A1BC24 /* MXMegolmBackupAuthData.m in Sources */,
 				C6F9357C1E5B39CA00FC34BF /* MXRestClient.swift in Sources */,
 				322A51B71D9AB15900C8536D /* MXCrypto.m in Sources */,
-				32BBAE632178957600D85F46 /* MXKeyBackupData.m in Sources */,
 				B17982FB2119E4A2001FD722 /* MXRoomPredecessorInfo.m in Sources */,
 				32DC15D11A8CF7AE006F9AD3 /* MXNotificationCenter.m in Sources */,
 				32637ED51E5B00400011E20D /* MXDeviceList.m in Sources */,