Skip to content

Commit df784bd

Browse files
committed
fix
1 parent 26e0ff5 commit df784bd

File tree

2 files changed

+80
-0
lines changed

2 files changed

+80
-0
lines changed

MatrixSDK.xcodeproj/project.pbxproj

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -675,6 +675,8 @@
675675
A0A2397A295202930001F722 /* MXAggregatedPollsUpdater.swift in Sources */ = {isa = PBXBuildFile; fileRef = A0A23978295202930001F722 /* MXAggregatedPollsUpdater.swift */; };
676676
A0B1217F295306F700E704C2 /* MXAggregatedPollsUpdaterTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A0B1217E295306F700E704C2 /* MXAggregatedPollsUpdaterTests.swift */; };
677677
A0B12180295306F700E704C2 /* MXAggregatedPollsUpdaterTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A0B1217E295306F700E704C2 /* MXAggregatedPollsUpdaterTests.swift */; };
678+
A759E23D2C98EE7D002429A8 /* MXCrypto.m in Sources */ = {isa = PBXBuildFile; fileRef = A759E23C2C98EE7D002429A8 /* MXCrypto.m */; };
679+
A759E23E2C98EE7D002429A8 /* MXCrypto.m in Sources */ = {isa = PBXBuildFile; fileRef = A759E23C2C98EE7D002429A8 /* MXCrypto.m */; };
678680
A75CAD692A9796DE00F06072 /* MXWellKnownAuthentication.m in Sources */ = {isa = PBXBuildFile; fileRef = A75CAD682A9796DE00F06072 /* MXWellKnownAuthentication.m */; };
679681
A75CAD6A2A9796DE00F06072 /* MXWellKnownAuthentication.m in Sources */ = {isa = PBXBuildFile; fileRef = A75CAD682A9796DE00F06072 /* MXWellKnownAuthentication.m */; };
680682
A75CAD6C2A979AC500F06072 /* MXWellKnownAuthentication.h in Headers */ = {isa = PBXBuildFile; fileRef = A75CAD6B2A97970500F06072 /* MXWellKnownAuthentication.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -2505,6 +2507,7 @@
25052507
9274AFE71EE580240009BEB6 /* MXCallKitAdapter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MXCallKitAdapter.m; sourceTree = "<group>"; };
25062508
A0A23978295202930001F722 /* MXAggregatedPollsUpdater.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MXAggregatedPollsUpdater.swift; sourceTree = "<group>"; };
25072509
A0B1217E295306F700E704C2 /* MXAggregatedPollsUpdaterTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MXAggregatedPollsUpdaterTests.swift; sourceTree = "<group>"; };
2510+
A759E23C2C98EE7D002429A8 /* MXCrypto.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MXCrypto.m; sourceTree = "<group>"; };
25082511
A75CAD682A9796DE00F06072 /* MXWellKnownAuthentication.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MXWellKnownAuthentication.m; sourceTree = "<group>"; };
25092512
A75CAD6B2A97970500F06072 /* MXWellKnownAuthentication.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MXWellKnownAuthentication.h; sourceTree = "<group>"; };
25102513
A777E5742C98D6F100B39397 /* MXKeyVerificationManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MXKeyVerificationManager.m; sourceTree = "<group>"; };
@@ -3328,6 +3331,7 @@
33283331
3252DCAB224BE59E0032264F /* Verification */,
33293332
ED2DD110286C450600F06731 /* CryptoMachine */,
33303333
322A51B41D9AB15900C8536D /* MXCrypto.h */,
3334+
A759E23C2C98EE7D002429A8 /* MXCrypto.m */,
33313335
ED47CB6C28523995004FD755 /* MXCryptoV2.swift */,
33323336
ED5EF151297AB33E00A5ADDA /* MXCryptoV2Factory.swift */,
33333337
);
@@ -6840,6 +6844,7 @@
68406844
3A59A52B25A7B1B000DDA1FC /* MXOutboundSessionInfo.m in Sources */,
68416845
32A1515C1DB525DA00400192 /* NSObject+sortedKeys.m in Sources */,
68426846
32792BD52295A86600F4FC9D /* MXAggregatedReactionsUpdater.m in Sources */,
6847+
A759E23D2C98EE7D002429A8 /* MXCrypto.m in Sources */,
68436848
32618E7C20EFA45B00E1D2EA /* MXRoomMembers.m in Sources */,
68446849
ED2DD118286C450600F06731 /* MXCryptoRequests.swift in Sources */,
68456850
EDAAC41928E2FCFE00DD89B5 /* MXCryptoSecretStoreV2.swift in Sources */,
@@ -7468,6 +7473,7 @@
74687473
EC1165C527107E330089FA56 /* MXRoomListDataFilterOptions.swift in Sources */,
74697474
3A858DE227528EEB006322C1 /* MXHomeserverCapabilitiesService.swift in Sources */,
74707475
ECDA764F27BA963D000C48CF /* MXBooleanCapability.m in Sources */,
7476+
A759E23E2C98EE7D002429A8 /* MXCrypto.m in Sources */,
74717477
B14EF24C2397E90400758AF0 /* MXCredentials.m in Sources */,
74727478
ED6F4EFD2987F0FC007D1191 /* MXEncryptedKeyBackup.swift in Sources */,
74737479
EC116590270F3ABF0089FA56 /* RLMRealm+MatrixSDK.m in Sources */,

MatrixSDK/Crypto/MXCrypto.m

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
/*
2+
Copyright 2016 OpenMarket Ltd
3+
Copyright 2017 Vector Creations Ltd
4+
Copyright 2018 New Vector Ltd
5+
Copyright 2020 The Matrix.org Foundation C.I.C
6+
7+
Licensed under the Apache License, Version 2.0 (the "License");
8+
you may not use this file except in compliance with the License.
9+
You may obtain a copy of the License at
10+
11+
http://www.apache.org/licenses/LICENSE-2.0
12+
13+
Unless required by applicable law or agreed to in writing, software
14+
distributed under the License is distributed on an "AS IS" BASIS,
15+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
See the License for the specific language governing permissions and
17+
limitations under the License.
18+
*/
19+
20+
#import "MXCrypto.h"
21+
22+
#import "MXCrypto_Private.h"
23+
24+
#import "MXSession.h"
25+
#import "MXTools.h"
26+
27+
#import "MXOlmDevice.h"
28+
#import "MXUsersDevicesMap.h"
29+
#import "MXDeviceInfo.h"
30+
#import "MXKey.h"
31+
32+
#import "MXRealmCryptoStore.h"
33+
#import "MXCryptoMigration.h"
34+
35+
#import "MXMegolmSessionData.h"
36+
#import "MXMegolmExportEncryption.h"
37+
38+
#import "MXOutgoingRoomKeyRequestManager.h"
39+
#import "MXIncomingRoomKeyRequestManager.h"
40+
41+
#import "MXSecretStorage_Private.h"
42+
#import "MXSecretShareManager_Private.h"
43+
#import "MXRecoveryService_Private.h"
44+
45+
#import "MXKeyVerificationManager_Private.h"
46+
#import "MXDeviceInfo_Private.h"
47+
#import "MXCrossSigningInfo_Private.h"
48+
#import "MXCrossSigning_Private.h"
49+
50+
#import "NSArray+MatrixSDK.h"
51+
52+
#import "MXDeviceListResponse.h"
53+
54+
#import "MatrixSDKSwiftHeader.h"
55+
#import "MXSharedHistoryKeyService.h"
56+
#import "MXNativeKeyBackupEngine.h"
57+
58+
#warning File has not been annotated with nullability, see MX_ASSUME_MISSING_NULLABILITY_BEGIN
59+
60+
/**
61+
The store to use for crypto.
62+
*/
63+
#define MXCryptoStoreClass MXRealmCryptoStore
64+
65+
NSString *const kMXCryptoRoomKeyRequestNotification = @"kMXCryptoRoomKeyRequestNotification";
66+
NSString *const kMXCryptoRoomKeyRequestNotificationRequestKey = @"kMXCryptoRoomKeyRequestNotificationRequestKey";
67+
NSString *const kMXCryptoRoomKeyRequestCancellationNotification = @"kMXCryptoRoomKeyRequestCancellationNotification";
68+
NSString *const kMXCryptoRoomKeyRequestCancellationNotificationRequestKey = @"kMXCryptoRoomKeyRequestCancellationNotificationRequestKey";
69+
70+
NSString *const MXDeviceListDidUpdateUsersDevicesNotification = @"MXDeviceListDidUpdateUsersDevicesNotification";
71+
72+
static NSString *const kMXCryptoOneTimeKeyClaimCompleteNotification = @"kMXCryptoOneTimeKeyClaimCompleteNotification";
73+
static NSString *const kMXCryptoOneTimeKeyClaimCompleteNotificationDevicesKey = @"kMXCryptoOneTimeKeyClaimCompleteNotificationDevicesKey";
74+
static NSString *const kMXCryptoOneTimeKeyClaimCompleteNotificationErrorKey = @"kMXCryptoOneTimeKeyClaimCompleteNotificationErrorKey";

0 commit comments

Comments
 (0)