Skip to content

Commit 598ece7

Browse files
Velin92Velin92
committed
removed function that is not used anymor
1 parent ebfa0cd commit 598ece7

File tree

11 files changed

+0
-312
lines changed

11 files changed

+0
-312
lines changed

‎MatrixSDK.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,6 @@
174174
324095221AFA432F00D81C97 /* MXCallStackCall.h in Headers */ = {isa = PBXBuildFile; fileRef = 3240951E1AFA432F00D81C97 /* MXCallStackCall.h */; settings = {ATTRIBUTES = (Public, ); }; };
175175
3240969D1F9F751600DBA607 /* MXPushRuleSenderNotificationPermissionConditionChecker.h in Headers */ = {isa = PBXBuildFile; fileRef = 3240969B1F9F751600DBA607 /* MXPushRuleSenderNotificationPermissionConditionChecker.h */; settings = {ATTRIBUTES = (Public, ); }; };
176176
3240969E1F9F751600DBA607 /* MXPushRuleSenderNotificationPermissionConditionChecker.m in Sources */ = {isa = PBXBuildFile; fileRef = 3240969C1F9F751600DBA607 /* MXPushRuleSenderNotificationPermissionConditionChecker.m */; };
177-
32442FB121EDD21300D2411B /* MXKeyBackupPassword.h in Headers */ = {isa = PBXBuildFile; fileRef = 32442FAF21EDD21300D2411B /* MXKeyBackupPassword.h */; settings = {ATTRIBUTES = (Public, ); }; };
178-
32442FB221EDD21300D2411B /* MXKeyBackupPassword.m in Sources */ = {isa = PBXBuildFile; fileRef = 32442FB021EDD21300D2411B /* MXKeyBackupPassword.m */; };
179177
3245A7501AF7B2930001D8A7 /* MXCall.h in Headers */ = {isa = PBXBuildFile; fileRef = 3245A74C1AF7B2930001D8A7 /* MXCall.h */; settings = {ATTRIBUTES = (Public, ); }; };
180178
3245A7511AF7B2930001D8A7 /* MXCall.m in Sources */ = {isa = PBXBuildFile; fileRef = 3245A74D1AF7B2930001D8A7 /* MXCall.m */; };
181179
3245A7521AF7B2930001D8A7 /* MXCallManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 3245A74E1AF7B2930001D8A7 /* MXCallManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -952,7 +950,6 @@
952950
B14EF2852397E90400758AF0 /* (null) in Sources */ = {isa = PBXBuildFile; };
953951
B14EF2862397E90400758AF0 /* MXRealmMediaScanStore.m in Sources */ = {isa = PBXBuildFile; fileRef = B146D4F521A5BB9F00D8C2C6 /* MXRealmMediaScanStore.m */; };
954952
B14EF2872397E90400758AF0 /* MXPusherData.m in Sources */ = {isa = PBXBuildFile; fileRef = 32999DE222DCD1AD004FF987 /* MXPusherData.m */; };
955-
B14EF2892397E90400758AF0 /* MXKeyBackupPassword.m in Sources */ = {isa = PBXBuildFile; fileRef = 32442FB021EDD21300D2411B /* MXKeyBackupPassword.m */; };
956953
B14EF28A2397E90400758AF0 /* MXTools.m in Sources */ = {isa = PBXBuildFile; fileRef = 329FB1781A0A74B100A5E88E /* MXTools.m */; };
957954
B14EF28B2397E90400758AF0 /* MXRoomSummaryUpdater.m in Sources */ = {isa = PBXBuildFile; fileRef = 329D3E611E251027002E2F1E /* MXRoomSummaryUpdater.m */; };
958955
B14EF28C2397E90400758AF0 /* MXScanRealmInMemoryProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = B146D4C721A5A44E00D8C2C6 /* MXScanRealmInMemoryProvider.m */; };
@@ -1076,7 +1073,6 @@
10761073
B14EF31C2397E90400758AF0 /* MXEventEditsListener.h in Headers */ = {isa = PBXBuildFile; fileRef = B10AFB4522AA8A8D0092E6AF /* MXEventEditsListener.h */; };
10771074
B14EF31D2397E90400758AF0 /* MXEventDecryptionResult.h in Headers */ = {isa = PBXBuildFile; fileRef = 32F634A91FC5E3470054EF49 /* MXEventDecryptionResult.h */; settings = {ATTRIBUTES = (Public, ); }; };
10781075
B14EF31F2397E90400758AF0 /* MXPusherData.h in Headers */ = {isa = PBXBuildFile; fileRef = 32999DE122DCD1AD004FF987 /* MXPusherData.h */; settings = {ATTRIBUTES = (Public, ); }; };
1079-
B14EF3202397E90400758AF0 /* MXKeyBackupPassword.h in Headers */ = {isa = PBXBuildFile; fileRef = 32442FAF21EDD21300D2411B /* MXKeyBackupPassword.h */; settings = {ATTRIBUTES = (Public, ); }; };
10801076
B14EF3212397E90400758AF0 /* MXRestClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 320DFDD419DD99B60068622A /* MXRestClient.h */; settings = {ATTRIBUTES = (Public, ); }; };
10811077
B14EF3222397E90400758AF0 /* MXKeyVerificationManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 3252DCAC224BE5D40032264F /* MXKeyVerificationManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
10821078
B14EF3232397E90400758AF0 /* MXRoomState.h in Headers */ = {isa = PBXBuildFile; fileRef = 3265CB361A14C43E00E24B2F /* MXRoomState.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -2114,8 +2110,6 @@
21142110
3240951E1AFA432F00D81C97 /* MXCallStackCall.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MXCallStackCall.h; sourceTree = "<group>"; };
21152111
3240969B1F9F751600DBA607 /* MXPushRuleSenderNotificationPermissionConditionChecker.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MXPushRuleSenderNotificationPermissionConditionChecker.h; sourceTree = "<group>"; };
21162112
3240969C1F9F751600DBA607 /* MXPushRuleSenderNotificationPermissionConditionChecker.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MXPushRuleSenderNotificationPermissionConditionChecker.m; sourceTree = "<group>"; };
2117-
32442FAF21EDD21300D2411B /* MXKeyBackupPassword.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MXKeyBackupPassword.h; sourceTree = "<group>"; };
2118-
32442FB021EDD21300D2411B /* MXKeyBackupPassword.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MXKeyBackupPassword.m; sourceTree = "<group>"; };
21192113
3245A74C1AF7B2930001D8A7 /* MXCall.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MXCall.h; sourceTree = "<group>"; };
21202114
3245A74D1AF7B2930001D8A7 /* MXCall.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MXCall.m; sourceTree = "<group>"; };
21212115
3245A74E1AF7B2930001D8A7 /* MXCallManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MXCallManager.h; sourceTree = "<group>"; };
@@ -3954,8 +3948,6 @@
39543948
32FFB4ED217DC0E900C96002 /* MXKeyBackup_Private.h */,
39553949
32FFB4EE217E146A00C96002 /* MXRecoveryKey.h */,
39563950
32FFB4EF217E146A00C96002 /* MXRecoveryKey.m */,
3957-
32442FAF21EDD21300D2411B /* MXKeyBackupPassword.h */,
3958-
32442FB021EDD21300D2411B /* MXKeyBackupPassword.m */,
39593951
);
39603952
path = KeyBackup;
39613953
sourceTree = "<group>";
@@ -5784,7 +5776,6 @@
57845776
32F634AB1FC5E3480054EF49 /* MXEventDecryptionResult.h in Headers */,
57855777
32999DE322DCD1AD004FF987 /* MXPusherData.h in Headers */,
57865778
A75CAD6C2A979AC500F06072 /* MXWellKnownAuthentication.h in Headers */,
5787-
32442FB121EDD21300D2411B /* MXKeyBackupPassword.h in Headers */,
57885779
320DFDE419DD99B60068622A /* MXRestClient.h in Headers */,
57895780
3252DCAE224BE5D40032264F /* MXKeyVerificationManager.h in Headers */,
57905781
3265CB381A14C43E00E24B2F /* MXRoomState.h in Headers */,
@@ -6119,7 +6110,6 @@
61196110
B14EF31C2397E90400758AF0 /* MXEventEditsListener.h in Headers */,
61206111
B14EF31D2397E90400758AF0 /* MXEventDecryptionResult.h in Headers */,
61216112
B14EF31F2397E90400758AF0 /* MXPusherData.h in Headers */,
6122-
B14EF3202397E90400758AF0 /* MXKeyBackupPassword.h in Headers */,
61236113
B14EF3212397E90400758AF0 /* MXRestClient.h in Headers */,
61246114
324DD2B2246BDC6800377005 /* MXSecretStorage_Private.h in Headers */,
61256115
ED01915928C64E0400ED3A69 /* MXForwardedRoomKeyEventContent.h in Headers */,
@@ -6965,7 +6955,6 @@
69656955
EC60ED5F265CFC2C00B39A4E /* MXSyncResponse.m in Sources */,
69666956
EC383BA2253DE4B1002FBBE6 /* MXBackgroundSyncService.swift in Sources */,
69676957
18121F7D273E835D00B68ADF /* PollModels.swift in Sources */,
6968-
32442FB221EDD21300D2411B /* MXKeyBackupPassword.m in Sources */,
69696958
3A108A9A25810F62005EEBE9 /* MXAesKeyData.m in Sources */,
69706959
329FB17A1A0A74B100A5E88E /* MXTools.m in Sources */,
69716960
B1EE98D9280723BE00AB63F0 /* MXBeaconInfoSummary.swift in Sources */,
@@ -7580,7 +7569,6 @@
75807569
EC8A53B625B1BC77004E0802 /* MXCallHangupEventContent.m in Sources */,
75817570
ED5EF14C297AB29F00A5ADDA /* MXDeviceVerification+LocalTrust.swift in Sources */,
75827571
B14766BA23D9D9420091F721 /* MXUsersTrustLevelSummary.m in Sources */,
7583-
B14EF2892397E90400758AF0 /* MXKeyBackupPassword.m in Sources */,
75847572
180F858727A2AF3000F4E5A5 /* MXWellKnownTileServerConfig.m in Sources */,
75857573
3A108A9B25810F62005EEBE9 /* MXAesKeyData.m in Sources */,
75867574
A777E5792C98D79D00B39397 /* MXQRCodeTransaction.m in Sources */,

‎MatrixSDK/Crypto/KeyBackup/MXKeyBackup.m‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
#import "MXKeyBackup_Private.h"
1919

2020
#import "MXRecoveryKey.h"
21-
#import "MXKeyBackupPassword.h"
2221
#import "MXSession.h"
2322
#import "MXTools.h"
2423
#import "MXBase64Tools.h"

‎MatrixSDK/Crypto/KeyBackup/MXKeyBackupPassword.h‎

Lines changed: 0 additions & 39 deletions
This file was deleted.

‎MatrixSDK/Crypto/KeyBackup/MXKeyBackupPassword.m‎

Lines changed: 0 additions & 42 deletions
This file was deleted.

‎MatrixSDK/Crypto/Recovery/MXRecoveryService.h‎

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -120,44 +120,6 @@ typedef NS_ENUM(NSInteger, MXRecoveryServiceErrorCode)
120120

121121
#pragma mark - Backup to recovery
122122

123-
/**
124-
Create a recovery and store secrets there.
125-
126-
It will send keys from the local storage to the recovery on the homeserver.
127-
Those keys are sent encrypted thanks to SSSS that implements this recovery.
128-
129-
@param secrets secrets ids to store in the recovery. Nil for all self.supportedSecrets.
130-
@param privateKey a private key used to generate the recovery key to encrypt keys.
131-
@param createServicesBackups YES to create backups for associated services. Only keyBackup is supported.
132-
133-
@param success A block object called when the operation succeeds.
134-
@param failure A block object called when the operation fails.
135-
*/
136-
- (void)createRecoveryForSecrets:(nullable NSArray<NSString*>*)secrets
137-
withPrivateKey:(NSData*)privateKey
138-
createServicesBackups:(BOOL)createServicesBackups
139-
success:(void (^)(MXSecretStorageKeyCreationInfo *keyCreationInfo))success
140-
failure:(void (^)(NSError *error))failure;
141-
142-
/**
143-
Create a recovery and store secrets there.
144-
145-
It will send keys from the local storage to the recovery on the homeserver.
146-
Those keys are sent encrypted thanks to SSSS that implements this recovery.
147-
148-
@param secrets secrets ids to store in the recovery. Nil for all self.supportedSecrets.
149-
@param passphrase a passphrase used to generate the recovery key to encrypt keys. Nil will generate it.
150-
@param createServicesBackups YES to create backups for associated services. Only keyBackup is supported.
151-
152-
@param success A block object called when the operation succeeds.
153-
@param failure A block object called when the operation fails.
154-
*/
155-
- (void)createRecoveryForSecrets:(nullable NSArray<NSString*>*)secrets
156-
withPassphrase:(nullable NSString*)passphrase
157-
createServicesBackups:(BOOL)createServicesBackups
158-
success:(void (^)(MXSecretStorageKeyCreationInfo *keyCreationInfo))success
159-
failure:(void (^)(NSError *error))failure;
160-
161123
/**
162124
Update secrets to the existing recovery.
163125

‎MatrixSDK/Crypto/Recovery/MXRecoveryService.m‎

Lines changed: 0 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
#import "MXRecoveryService_Private.h"
1818
#import "MXKeyBackup_Private.h"
1919

20-
#import "MXKeyBackupPassword.h"
2120
#import "MXRecoveryKey.h"
2221
#import "MXAesHmacSha2.h"
2322
#import "MXTools.h"
@@ -238,39 +237,6 @@ - (NSArray*)secretsStoredLocally
238237

239238
#pragma mark - Backup to recovery
240239

241-
- (void)createRecoveryForSecrets:(nullable NSArray<NSString*>*)secrets
242-
withPrivateKey:(NSData*)privateKey
243-
createServicesBackups:(BOOL)createServicesBackups
244-
success:(void (^)(MXSecretStorageKeyCreationInfo *keyCreationInfo))success
245-
failure:(void (^)(NSError *error))failure
246-
{
247-
MXLogDebug(@"[MXRecoveryService] createRecovery: secrets: %@. createServicesBackups: %@", secrets, @(createServicesBackups));
248-
249-
if (self.hasRecovery)
250-
{
251-
MXLogDebug(@"[MXRecoveryService] createRecovery: Error: A recovery already exists.");
252-
NSError *error = [NSError errorWithDomain:MXRecoveryServiceErrorDomain
253-
code:MXRecoveryServiceSSSSAlreadyExistsErrorCode
254-
userInfo:@{
255-
NSLocalizedDescriptionKey: @"MXRecoveryService: A secret storage already exists",
256-
}];
257-
failure(error);
258-
return;
259-
}
260-
261-
if (createServicesBackups
262-
&& (!secrets || [secrets containsObject:MXSecretId.keyBackup]))
263-
{
264-
[self createKeyBackupWithSuccess:^{
265-
[self createRecoveryForSecrets:secrets withPrivateKey:privateKey success:success failure:failure];
266-
} failure:failure];
267-
}
268-
else
269-
{
270-
[self createRecoveryForSecrets:secrets withPrivateKey:privateKey success:success failure:failure];
271-
}
272-
}
273-
274240
- (void)createRecoveryForSecrets:(nullable NSArray<NSString*>*)secrets
275241
withPassphrase:(nullable NSString*)passphrase
276242
createServicesBackups:(BOOL)createServicesBackups
@@ -304,30 +270,6 @@ - (void)createRecoveryForSecrets:(nullable NSArray<NSString*>*)secrets
304270
}
305271
}
306272

307-
- (void)createRecoveryForSecrets:(nullable NSArray<NSString*>*)secrets
308-
withPrivateKey:(NSData*)privateKey
309-
success:(void (^)(MXSecretStorageKeyCreationInfo *keyCreationInfo))success
310-
failure:(void (^)(NSError *error))failure
311-
{
312-
MXWeakify(self);
313-
[self.dependencies.secretStorage createKeyWithKeyId:nil keyName:nil privateKey:privateKey success:^(MXSecretStorageKeyCreationInfo * _Nonnull keyCreationInfo) {
314-
315-
// Set this recovery as the default SSSS key id
316-
[self.dependencies.secretStorage setAsDefaultKeyWithKeyId:keyCreationInfo.keyId success:^{
317-
MXStrongifyAndReturnIfNil(self);
318-
319-
[self updateRecoveryForSecrets:secrets withPrivateKey:keyCreationInfo.privateKey success:^{
320-
success(keyCreationInfo);
321-
} failure:failure];
322-
323-
} failure:failure];
324-
325-
} failure:^(NSError * _Nonnull error) {
326-
MXLogDebug(@"[MXRecoveryService] createRecovery: Failed to create SSSS. Error: %@", error);
327-
failure(error);
328-
}];
329-
}
330-
331273
- (void)createRecoveryForSecrets:(nullable NSArray<NSString*>*)secrets
332274
withPassphrase:(nullable NSString*)passphrase
333275
success:(void (^)(MXSecretStorageKeyCreationInfo *keyCreationInfo))success

0 commit comments

Comments
 (0)