Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Store sharedHistory flag for inbound Megolm sessions #1444

Merged
merged 7 commits into from
Apr 26, 2022
Merged

Store sharedHistory flag for inbound Megolm sessions #1444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
70e4519
Store `sharedHistory` flag for inbound Megolm sessions
Anderas Apr 13, 2022
bd629fd
Revert refactor
Anderas Apr 21, 2022
792377b
Store history visibility in room summary
Anderas Apr 22, 2022
574433a
Fix typos and include unit tests
Anderas Apr 22, 2022
2233a5d
Include whole classes in unit tests plan
Anderas Apr 22, 2022
d2ce706
Remove logger unit tests due to CI issues
Anderas Apr 25, 2022
5843890
Fix xcode project
Anderas Apr 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 61 additions & 9 deletions MatrixSDK.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1408,8 +1408,6 @@
EC0B941227184E8A00B4D440 /* MXRoomSummaryMO.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC0B940927184E8A00B4D440 /* MXRoomSummaryMO.swift */; };
EC0B941327184E8A00B4D440 /* MXRoomMembersCountMO.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC0B940A27184E8A00B4D440 /* MXRoomMembersCountMO.swift */; };
EC0B941427184E8A00B4D440 /* MXRoomMembersCountMO.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC0B940A27184E8A00B4D440 /* MXRoomMembersCountMO.swift */; };
EC0B941527184E8A00B4D440 /* MXCoreDataRoomSummaryStore.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = EC0B940B27184E8A00B4D440 /* MXCoreDataRoomSummaryStore.xcdatamodeld */; };
EC0B941627184E8A00B4D440 /* MXCoreDataRoomSummaryStore.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = EC0B940B27184E8A00B4D440 /* MXCoreDataRoomSummaryStore.xcdatamodeld */; };
EC0B9418271855CA00B4D440 /* MXCoreDataRoomSummaryStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC0B9417271855C900B4D440 /* MXCoreDataRoomSummaryStore.swift */; };
EC0B9419271855CA00B4D440 /* MXCoreDataRoomSummaryStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC0B9417271855C900B4D440 /* MXCoreDataRoomSummaryStore.swift */; };
EC0B941B2718654B00B4D440 /* NSManagedObject+MatrixSDK.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC0B941A2718654B00B4D440 /* NSManagedObject+MatrixSDK.swift */; };
Expand Down Expand Up @@ -1737,6 +1735,14 @@
ECF29BDF264195320053E6D6 /* MXAssertedIdentityModel.h in Headers */ = {isa = PBXBuildFile; fileRef = ECF29BDD264195320053E6D6 /* MXAssertedIdentityModel.h */; settings = {ATTRIBUTES = (Public, ); }; };
ECF29BE52641953C0053E6D6 /* MXAssertedIdentityModel.m in Sources */ = {isa = PBXBuildFile; fileRef = ECF29BE42641953C0053E6D6 /* MXAssertedIdentityModel.m */; };
ECF29BE62641953C0053E6D6 /* MXAssertedIdentityModel.m in Sources */ = {isa = PBXBuildFile; fileRef = ECF29BE42641953C0053E6D6 /* MXAssertedIdentityModel.m */; };
ED21F68528104DA2002FF83D /* MXMegolmEncryptionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED21F68428104DA2002FF83D /* MXMegolmEncryptionTests.swift */; };
ED21F68628104DA2002FF83D /* MXMegolmEncryptionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED21F68428104DA2002FF83D /* MXMegolmEncryptionTests.swift */; };
ED35652C281150310002BF6A /* MXOlmInboundGroupSessionUnitTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED35652B281150310002BF6A /* MXOlmInboundGroupSessionUnitTests.swift */; };
ED35652D281150310002BF6A /* MXOlmInboundGroupSessionUnitTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED35652B281150310002BF6A /* MXOlmInboundGroupSessionUnitTests.swift */; };
ED35652F281153480002BF6A /* MXMegolmSessionDataUnitTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED35652E281153480002BF6A /* MXMegolmSessionDataUnitTests.swift */; };
ED356530281153480002BF6A /* MXMegolmSessionDataUnitTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED35652E281153480002BF6A /* MXMegolmSessionDataUnitTests.swift */; };
ED5AE8C52816C8CF00105072 /* MXCoreDataRoomSummaryStore.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = ED5AE8C22816C8CF00105072 /* MXCoreDataRoomSummaryStore.xcdatamodeld */; };
ED5AE8C62816C8CF00105072 /* MXCoreDataRoomSummaryStore.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = ED5AE8C22816C8CF00105072 /* MXCoreDataRoomSummaryStore.xcdatamodeld */; };
ED88999127F2065D00718486 /* MXRoomAliasResolution.h in Headers */ = {isa = PBXBuildFile; fileRef = ED88998F27F2065C00718486 /* MXRoomAliasResolution.h */; settings = {ATTRIBUTES = (Public, ); }; };
ED88999227F2065D00718486 /* MXRoomAliasResolution.h in Headers */ = {isa = PBXBuildFile; fileRef = ED88998F27F2065C00718486 /* MXRoomAliasResolution.h */; settings = {ATTRIBUTES = (Public, ); }; };
ED88999327F2065D00718486 /* MXRoomAliasResolution.m in Sources */ = {isa = PBXBuildFile; fileRef = ED88999027F2065D00718486 /* MXRoomAliasResolution.m */; };
Expand Down Expand Up @@ -2539,7 +2545,6 @@
EC0B940827184E8A00B4D440 /* MXUsersTrustLevelSummaryMO.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MXUsersTrustLevelSummaryMO.swift; sourceTree = "<group>"; };
EC0B940927184E8A00B4D440 /* MXRoomSummaryMO.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MXRoomSummaryMO.swift; sourceTree = "<group>"; };
EC0B940A27184E8A00B4D440 /* MXRoomMembersCountMO.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MXRoomMembersCountMO.swift; sourceTree = "<group>"; };
EC0B940C27184E8A00B4D440 /* MXRoomSummaryCoreDataStore.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = MXRoomSummaryCoreDataStore.xcdatamodel; sourceTree = "<group>"; };
EC0B9417271855C900B4D440 /* MXCoreDataRoomSummaryStore.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MXCoreDataRoomSummaryStore.swift; sourceTree = "<group>"; };
EC0B941A2718654B00B4D440 /* NSManagedObject+MatrixSDK.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSManagedObject+MatrixSDK.swift"; sourceTree = "<group>"; };
EC0B941D27186C3500B4D440 /* MXRoomListDataSortable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MXRoomListDataSortable.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -2720,7 +2725,12 @@
ECF29BD2264194BB0053E6D6 /* MXCallAssertedIdentityEventContent.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MXCallAssertedIdentityEventContent.m; sourceTree = "<group>"; };
ECF29BDD264195320053E6D6 /* MXAssertedIdentityModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MXAssertedIdentityModel.h; sourceTree = "<group>"; };
ECF29BE42641953C0053E6D6 /* MXAssertedIdentityModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MXAssertedIdentityModel.m; sourceTree = "<group>"; };
ED21F68428104DA2002FF83D /* MXMegolmEncryptionTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MXMegolmEncryptionTests.swift; sourceTree = "<group>"; };
ED2F344856EFFCA383E37B22 /* Pods-SDK-MatrixSDK.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SDK-MatrixSDK.release.xcconfig"; path = "Target Support Files/Pods-SDK-MatrixSDK/Pods-SDK-MatrixSDK.release.xcconfig"; sourceTree = "<group>"; };
ED35652B281150310002BF6A /* MXOlmInboundGroupSessionUnitTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MXOlmInboundGroupSessionUnitTests.swift; sourceTree = "<group>"; };
ED35652E281153480002BF6A /* MXMegolmSessionDataUnitTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MXMegolmSessionDataUnitTests.swift; sourceTree = "<group>"; };
ED5AE8C32816C8CF00105072 /* MXRoomSummaryCoreDataStore2.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = MXRoomSummaryCoreDataStore2.xcdatamodel; sourceTree = "<group>"; };
ED5AE8C42816C8CF00105072 /* MXRoomSummaryCoreDataStore.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = MXRoomSummaryCoreDataStore.xcdatamodel; sourceTree = "<group>"; };
ED88998F27F2065C00718486 /* MXRoomAliasResolution.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MXRoomAliasResolution.h; sourceTree = "<group>"; };
ED88999027F2065D00718486 /* MXRoomAliasResolution.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MXRoomAliasResolution.m; sourceTree = "<group>"; };
ED8943D327E34762000FC39C /* MXMemoryRoomStoreTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MXMemoryRoomStoreTests.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -3839,6 +3849,7 @@
32C6F93919DD814400EA4E9C /* MatrixSDKTests */ = {
isa = PBXGroup;
children = (
ED21F67A28104B9A002FF83D /* Crypto */,
EDB4209727DF841A0036AF39 /* JSONModels */,
EDB4208E27DF76C60036AF39 /* Data */,
322985C526FA66FD001890BC /* Utils */,
Expand Down Expand Up @@ -4420,7 +4431,7 @@
isa = PBXGroup;
children = (
EC0B9417271855C900B4D440 /* MXCoreDataRoomSummaryStore.swift */,
EC0B940B27184E8A00B4D440 /* MXCoreDataRoomSummaryStore.xcdatamodeld */,
ED5AE8C22816C8CF00105072 /* MXCoreDataRoomSummaryStore.xcdatamodeld */,
EC0B941A2718654B00B4D440 /* NSManagedObject+MatrixSDK.swift */,
EC0B940627184E8A00B4D440 /* Models */,
);
Expand Down Expand Up @@ -4799,6 +4810,40 @@
path = Common;
sourceTree = "<group>";
};
ED21F67A28104B9A002FF83D /* Crypto */ = {
isa = PBXGroup;
children = (
ED35652A281150230002BF6A /* Data */,
ED21F67B28104BA1002FF83D /* Algorithms */,
);
path = Crypto;
sourceTree = "<group>";
};
ED21F67B28104BA1002FF83D /* Algorithms */ = {
isa = PBXGroup;
children = (
ED21F67C28104BA7002FF83D /* Megolm */,
);
path = Algorithms;
sourceTree = "<group>";
};
ED21F67C28104BA7002FF83D /* Megolm */ = {
isa = PBXGroup;
children = (
ED21F68428104DA2002FF83D /* MXMegolmEncryptionTests.swift */,
);
path = Megolm;
sourceTree = "<group>";
};
ED35652A281150230002BF6A /* Data */ = {
isa = PBXGroup;
children = (
ED35652B281150310002BF6A /* MXOlmInboundGroupSessionUnitTests.swift */,
ED35652E281153480002BF6A /* MXMegolmSessionDataUnitTests.swift */,
);
path = Data;
sourceTree = "<group>";
};
ED8943D127E3474A000FC39C /* Store */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -6092,7 +6137,6 @@
EC1848C52685F64D00865E16 /* MXiOSAudioOutputRoute.swift in Sources */,
EC60EE08265CFFF400B39A4E /* MXGroupSyncProfile.m in Sources */,
B19A30A0240424BD00FB6F35 /* MXQRCodeTransaction.m in Sources */,
EC0B941527184E8A00B4D440 /* MXCoreDataRoomSummaryStore.xcdatamodeld in Sources */,
C63E78B01F26588000AC692F /* MXRoomPowerLevels.swift in Sources */,
EC0B943F271DB68F00B4D440 /* MXVoidRoomSummaryStore.m in Sources */,
EC383BA5253DE6C9002FBBE6 /* MXSyncResponseStore.swift in Sources */,
Expand Down Expand Up @@ -6236,6 +6280,7 @@
EC1848C72686174E00865E16 /* MXiOSAudioOutputRouteType.swift in Sources */,
3220093919EFA4C9008DE41D /* MXEventListener.m in Sources */,
EC5C562A27A36EDB0014CBE9 /* MXInReplyTo.m in Sources */,
ED5AE8C52816C8CF00105072 /* MXCoreDataRoomSummaryStore.xcdatamodeld in Sources */,
C6481AF21F1678A9000DB8A0 /* MXSessionEventListener.swift in Sources */,
32A1514F1DAF897600400192 /* MXOlmSessionResult.m in Sources */,
ECF29BD3264194BB0053E6D6 /* MXCallAssertedIdentityEventContent.m in Sources */,
Expand Down Expand Up @@ -6308,6 +6353,7 @@
32832B5E1BCC048300241108 /* MXStoreNoStoreTests.m in Sources */,
A816247C25F60C7700A46F05 /* MXDeviceListOperationsPoolUnitTests.swift in Sources */,
B1660F1C260A20B900C3AA12 /* MXSpaceServiceTest.swift in Sources */,
ED35652C281150310002BF6A /* MXOlmInboundGroupSessionUnitTests.swift in Sources */,
32C9B71823E81A1C00C6F30A /* MXCrossSigningVerificationTests.m in Sources */,
323C5A081A70E53500FB0549 /* MXToolsUnitTests.m in Sources */,
3281E89E19E299C000976E1A /* MXErrorUnitTests.m in Sources */,
Expand Down Expand Up @@ -6365,10 +6411,12 @@
32D8CAC219DEE6ED002AF8A0 /* MXRestClientNoAuthAPITests.m in Sources */,
32FCAB4D19E578860049C555 /* MXRestClientTests.m in Sources */,
32C78BA7256D227D008130B1 /* MXCryptoMigrationTests.m in Sources */,
ED21F68528104DA2002FF83D /* MXMegolmEncryptionTests.swift in Sources */,
322985CB26FAF898001890BC /* MXSession.swift in Sources */,
EC131B192779D8D500712964 /* MXThreadEventTimelineUnitTests.swift in Sources */,
B135067427EB201E00BD3276 /* MXLocationServiceTests.swift in Sources */,
18C26C4F273C0EB300805154 /* MXPollAggregatorTests.swift in Sources */,
ED35652F281153480002BF6A /* MXMegolmSessionDataUnitTests.swift in Sources */,
32EEA83F2603CA140041425B /* MXRestClientExtensionsTests.m in Sources */,
18121F7A273E6E4200B68ADF /* PollBuilder.swift in Sources */,
18121F7F273E837300B68ADF /* PollModels.swift in Sources */,
Expand Down Expand Up @@ -6620,7 +6668,6 @@
B14EF23D2397E90400758AF0 /* MXCallManager.m in Sources */,
B14EF23E2397E90400758AF0 /* MXPeekingRoom.m in Sources */,
B14EF23F2397E90400758AF0 /* MXEncryptedContentFile.m in Sources */,
EC0B941627184E8A00B4D440 /* MXCoreDataRoomSummaryStore.xcdatamodeld in Sources */,
EC8A539625B1BC77004E0802 /* MXUserModel.m in Sources */,
EC0B9440271DB68F00B4D440 /* MXVoidRoomSummaryStore.m in Sources */,
B14EF2402397E90400758AF0 /* MXSessionEventListener.m in Sources */,
Expand Down Expand Up @@ -6765,6 +6812,7 @@
ECCA02BF27348FE300B6F34F /* MXThread.swift in Sources */,
320B3937239FA56900BE2C06 /* MXKeyVerificationByDMRequest.m in Sources */,
B14EF2832397E90400758AF0 /* MXRoomCreateContent.m in Sources */,
ED5AE8C62816C8CF00105072 /* MXCoreDataRoomSummaryStore.xcdatamodeld in Sources */,
EC5C562B27A36EDB0014CBE9 /* MXInReplyTo.m in Sources */,
EC8A53B025B1BC77004E0802 /* MXCallAnswerEventContent.m in Sources */,
EC60ED7E265CFCD100B39A4E /* MXDeviceListResponse.m in Sources */,
Expand Down Expand Up @@ -6837,6 +6885,7 @@
32C9B71923E81A1C00C6F30A /* MXCrossSigningVerificationTests.m in Sources */,
B1E09A1D2397FCE90057C069 /* MXCryptoKeyVerificationTests.m in Sources */,
B1E09A472397FD990057C069 /* MXEventScanStoreUnitTests.m in Sources */,
ED35652D281150310002BF6A /* MXOlmInboundGroupSessionUnitTests.swift in Sources */,
B1E09A3D2397FD820057C069 /* MXStoreFileStoreTests.m in Sources */,
32CEEF3E23AD134A0039BA98 /* MXCrossSigningTests.m in Sources */,
32EEA8402603CA140041425B /* MXRestClientExtensionsTests.m in Sources */,
Expand Down Expand Up @@ -6894,10 +6943,12 @@
32B477902638133D00EA5800 /* MXAggregatedReferenceUnitTests.m in Sources */,
EC116598270FCA8B0089FA56 /* MXBackgroundTaskUnitTests.swift in Sources */,
B1E09A322397FD750057C069 /* MXRoomTests.m in Sources */,
ED21F68628104DA2002FF83D /* MXMegolmEncryptionTests.swift in Sources */,
322985CC26FAF898001890BC /* MXSession.swift in Sources */,
EC131B1A2779D8D500712964 /* MXThreadEventTimelineUnitTests.swift in Sources */,
B135067527EB201E00BD3276 /* MXLocationServiceTests.swift in Sources */,
18C26C50273C0EB400805154 /* MXPollAggregatorTests.swift in Sources */,
ED356530281153480002BF6A /* MXMegolmSessionDataUnitTests.swift in Sources */,
32C78BA8256D227D008130B1 /* MXCryptoMigrationTests.m in Sources */,
18121F7B273E6E4200B68ADF /* PollBuilder.swift in Sources */,
18121F80273E837400B68ADF /* PollModels.swift in Sources */,
Expand Down Expand Up @@ -7329,12 +7380,13 @@
/* End XCConfigurationList section */

/* Begin XCVersionGroup section */
EC0B940B27184E8A00B4D440 /* MXCoreDataRoomSummaryStore.xcdatamodeld */ = {
ED5AE8C22816C8CF00105072 /* MXCoreDataRoomSummaryStore.xcdatamodeld */ = {
isa = XCVersionGroup;
children = (
EC0B940C27184E8A00B4D440 /* MXRoomSummaryCoreDataStore.xcdatamodel */,
ED5AE8C32816C8CF00105072 /* MXRoomSummaryCoreDataStore2.xcdatamodel */,
ED5AE8C42816C8CF00105072 /* MXRoomSummaryCoreDataStore.xcdatamodel */,
);
currentVersion = EC0B940C27184E8A00B4D440 /* MXRoomSummaryCoreDataStore.xcdatamodel */;
currentVersion = ED5AE8C32816C8CF00105072 /* MXRoomSummaryCoreDataStore2.xcdatamodel */;
path = MXCoreDataRoomSummaryStore.xcdatamodeld;
sourceTree = "<group>";
versionGroupType = wrapper.xcdatamodel;
Expand Down
9 changes: 8 additions & 1 deletion MatrixSDK/Background/MXBackgroundSyncService.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,7 +585,14 @@ public enum MXBackgroundSyncServiceError: Error {
senderKey: senderKey,
forwardingCurve25519KeyChain: forwardingKeyChain,
keysClaimed: keysClaimed,
exportFormat: exportFormat)
exportFormat: exportFormat,
sharedHistory: isRoomSharingHistory(roomId: roomId))
}

private func isRoomSharingHistory(roomId: String) -> Bool {
let summary = roomSummary(forRoomId: roomId)
let visibility = MXRoomHistoryVisibility(identifier: summary?.historyVisibility)
return visibility == .worldReadable || visibility == .shared
}

private func updateBackgroundServiceStoresIfNeeded() {
Expand Down
10 changes: 9 additions & 1 deletion MatrixSDK/Crypto/Algorithms/Megolm/MXMegolmDecryption.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,15 @@ - (void)onRoomKeyEvent:(MXEvent *)event

MXLogDebug(@"[MXMegolmDecryption] onRoomKeyEvent: Adding key for megolm session %@|%@ from %@ event", senderKey, sessionId, event.type);

[olmDevice addInboundGroupSession:sessionId sessionKey:sessionKey roomId:roomId senderKey:senderKey forwardingCurve25519KeyChain:forwardingKeyChain keysClaimed:keysClaimed exportFormat:exportFormat];
BOOL sharedHistory = [crypto isRoomSharingHistory:roomId];
[olmDevice addInboundGroupSession:sessionId
sessionKey:sessionKey
roomId:roomId
senderKey:senderKey
forwardingCurve25519KeyChain:forwardingKeyChain
keysClaimed:keysClaimed
exportFormat:exportFormat
sharedHistory:sharedHistory];

[crypto.backup maybeSendKeyBackup];

Expand Down
Loading