diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj index d861be3ef..41356ce76 100644 --- a/ElementX.xcodeproj/project.pbxproj +++ b/ElementX.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 63; + objectVersion = 54; objects = { /* Begin PBXAggregateTarget section */ @@ -475,6 +475,7 @@ 5C33976A720B64094CBC56B1 /* VideoMediaEventsTimelineView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2B1FB56520A847DD2532D5C8 /* VideoMediaEventsTimelineView.swift */; }; 5C61810ED7B7CB48346B1B9D /* portrait_test_video.mp4 in Resources */ = {isa = PBXBuildFile; fileRef = E5E7D4EE7CA295E5039FDA21 /* portrait_test_video.mp4 */; }; 5C8804B4F25903516E2DAB81 /* RoomInfoProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 40A66E8BC8D9AE4A08EFB2DF /* RoomInfoProxy.swift */; }; + 5CEA0BF496F00339A9E4486B /* TimelineItemProviderProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 829D3CE4F6C4DF6CC02D33C3 /* TimelineItemProviderProtocol.swift */; }; 5D27B6537591471A42C89027 /* EmoteRoomTimelineItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 450E04B2A976CC4C8CC1807C /* EmoteRoomTimelineItem.swift */; }; 5D52925FEB1B780C65B0529F /* PinnedEventsTimelineScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA4F6D7000EDCD187E0989E7 /* PinnedEventsTimelineScreen.swift */; }; 5D53AE9342A4C06B704247ED /* MediaLoaderProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A02406480C351B8C6E0682C /* MediaLoaderProtocol.swift */; }; @@ -485,7 +486,6 @@ 5DD85A0FE3D85AEC3C7EFE36 /* DeveloperOptionsScreenCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C7C7CFA6B2A62A685FF6CE3 /* DeveloperOptionsScreenCoordinator.swift */; }; 5DFC2A889D3B39DD47AC63A8 /* PillUtilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = C537DE821FED94D23467B6C4 /* PillUtilities.swift */; }; 5EB116B58533C9A0EBA22717 /* ThreadTimelineScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = BC2E7CEE6E9314FD69FE0ED9 /* ThreadTimelineScreen.swift */; }; - 5EC046E41755C095DAB1C3FF /* TimelineItemProviderProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD8C9BBB729C941BEE0E2A63 /* TimelineItemProviderProtocol.swift */; }; 5EDBDE802761B5ECB54E6787 /* LogLevel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2711E5996016ABD6EAAEB58A /* LogLevel.swift */; }; 5F06AD3C66884CE793AE6119 /* FileManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04DF593C3F7AF4B2FBAEB05D /* FileManager.swift */; }; 5F0B5797D1BFF2A51084B4C3 /* PinnedEventsTimelineScreenViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 86D7CD5CA270BFC3EBB450CA /* PinnedEventsTimelineScreenViewModel.swift */; }; @@ -873,6 +873,7 @@ A6D4C5EEA85A6A0ABA1559D6 /* RoomDetailsEditScreenModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = 16D09C79746BDCD9173EB3A7 /* RoomDetailsEditScreenModels.swift */; }; A6DEC1ADEC8FEEC206A0FA37 /* AttributedStringBuilderProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 72F37B5DA798C9AE436F2C2C /* AttributedStringBuilderProtocol.swift */; }; A6F345328CCC5C9B0DAE2257 /* LogViewerScreenViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0BB05221D7D941CC82DC8480 /* LogViewerScreenViewModel.swift */; }; + A6FFC4C5154C446BAD6B40D8 /* TimelineItemProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8520AFD6680CBAD388F6D927 /* TimelineItemProvider.swift */; }; A722F426FD81FC67706BB1E0 /* CustomLayoutLabelStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 42236480CF0431535EBE8387 /* CustomLayoutLabelStyle.swift */; }; A74438ED16F8683A4B793E6A /* AnalyticsSettingsScreenViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0BCE3FAF40932AC7C7639AC4 /* AnalyticsSettingsScreenViewModel.swift */; }; A7D48E44D485B143AADDB77D /* Strings+Untranslated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A18F6CE4D694D21E4EA9B25 /* Strings+Untranslated.swift */; }; @@ -1105,7 +1106,6 @@ D97C782FE0005995C36FA04A /* portrait_test_video.mp4 in Resources */ = {isa = PBXBuildFile; fileRef = E5E7D4EE7CA295E5039FDA21 /* portrait_test_video.mp4 */; }; D98B5EE8C4F5A2CE84687AE8 /* UTType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 897DF5E9A70CE05A632FC8AF /* UTType.swift */; }; D9F80CE61BF8FF627FDB0543 /* LoadableImage.swift in Sources */ = {isa = PBXBuildFile; fileRef = C352359663A0E52BA20761EE /* LoadableImage.swift */; }; - DA03B4F28C4D248EECE3429F /* TimelineItemProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 371B248460BD1A3F20318137 /* TimelineItemProvider.swift */; }; DA10C99BA43A0F1E732F6274 /* LogLevel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2711E5996016ABD6EAAEB58A /* LogLevel.swift */; }; DA7E867F5EAFF8E20B2EE3B6 /* SecureBackupScreenModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B3D16709ADD4F4BCC710B1E /* SecureBackupScreenModels.swift */; }; DAF63A9CF9932CA8F6830F11 /* ShareExtensionModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCAC01A97A43BE07B9E94E43 /* ShareExtensionModels.swift */; }; @@ -1395,7 +1395,7 @@ 044E501B8331B339874D1B96 /* CompoundIcon.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CompoundIcon.swift; sourceTree = ""; }; 045253F9967A535EE5B16691 /* Label.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Label.swift; sourceTree = ""; }; 046C0D3F53B0B5EF0A1F5BEA /* RoomSummaryTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomSummaryTests.swift; sourceTree = ""; }; - 048A21188AB19349D026BECD /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = ""; }; + 048A21188AB19349D026BECD /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; path = PrivacyInfo.xcprivacy; sourceTree = ""; }; 04BB8DDE245ED86C489BA983 /* AccessibilityIdentifiers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccessibilityIdentifiers.swift; sourceTree = ""; }; 04DF593C3F7AF4B2FBAEB05D /* FileManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FileManager.swift; sourceTree = ""; }; 0516C69708D5CBDE1A8E77EC /* RoomDirectorySearchProxyProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomDirectorySearchProxyProtocol.swift; sourceTree = ""; }; @@ -1468,7 +1468,7 @@ 128501375217576AF0FE3E92 /* RoomAttachmentPicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomAttachmentPicker.swift; sourceTree = ""; }; 12B09A94C519227264A41208 /* RoomMembershipDetailsProxy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomMembershipDetailsProxy.swift; sourceTree = ""; }; 12FD5280AF55AB7F50F8E47D /* preview_avatar_room.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = preview_avatar_room.jpg; sourceTree = ""; }; - 1304D9191300873EADA52D6E /* IntegrationTests.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = IntegrationTests.xctestplan; sourceTree = ""; }; + 1304D9191300873EADA52D6E /* IntegrationTests.xctestplan */ = {isa = PBXFileReference; path = IntegrationTests.xctestplan; sourceTree = ""; }; 130ED565A078F7E0B59D9D25 /* UNTextInputNotificationResponse+Creator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UNTextInputNotificationResponse+Creator.swift"; sourceTree = ""; }; 136F80A613B55BDD071DCEA5 /* JoinRoomScreenModels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JoinRoomScreenModels.swift; sourceTree = ""; }; 13802897C7AFA360EA74C0B0 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = en; path = en.lproj/Localizable.stringsdict; sourceTree = ""; }; @@ -1571,7 +1571,7 @@ 25F7FE40EF7490A7E09D7BE6 /* NotificationItemProxy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationItemProxy.swift; sourceTree = ""; }; 25F8664F1FB95AF3C4202478 /* PollFormScreenCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PollFormScreenCoordinator.swift; sourceTree = ""; }; 260004737C573A56FA01E86E /* Encodable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Encodable.swift; sourceTree = ""; }; - 267BB1D5B08A9511F894CB57 /* PreviewTests.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = PreviewTests.xctestplan; sourceTree = ""; }; + 267BB1D5B08A9511F894CB57 /* PreviewTests.xctestplan */ = {isa = PBXFileReference; path = PreviewTests.xctestplan; sourceTree = ""; }; 26B0A96B8FE4849227945067 /* VoiceMessageRecorder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VoiceMessageRecorder.swift; sourceTree = ""; }; 26EAAB54C6CE91D64B69A9F8 /* AppLockServiceProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppLockServiceProtocol.swift; sourceTree = ""; }; 2711E5996016ABD6EAAEB58A /* LogLevel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LogLevel.swift; sourceTree = ""; }; @@ -1648,9 +1648,8 @@ 3558A15CFB934F9229301527 /* RestorationToken.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RestorationToken.swift; sourceTree = ""; }; 35AFCF4C05DEED04E3DB1A16 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Localizable.strings; sourceTree = ""; }; 35FA991289149D31F4286747 /* UserPreference.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserPreference.swift; sourceTree = ""; }; - 36DA824791172B9821EACBED /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = ""; }; + 36DA824791172B9821EACBED /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; path = PrivacyInfo.xcprivacy; sourceTree = ""; }; 36FD673E24FBFCFDF398716A /* RoomMemberProxyMock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomMemberProxyMock.swift; sourceTree = ""; }; - 371B248460BD1A3F20318137 /* TimelineItemProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimelineItemProvider.swift; sourceTree = ""; }; 37A63A59BFDDC494B1C20119 /* CallScreenViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CallScreenViewModel.swift; sourceTree = ""; }; 37CA26F55123E36B50DB0B3A /* AttributedStringTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AttributedStringTests.swift; sourceTree = ""; }; 37F46CC4FD89ECF4CF26391A /* AuthenticationFlowCoordinatorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthenticationFlowCoordinatorTests.swift; sourceTree = ""; }; @@ -1997,6 +1996,7 @@ 81B17DB1BC3B0C62AF84D230 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = ""; }; 81F0325E252B057FAEEE1B2D /* TypingIndicatorView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TypingIndicatorView.swift; sourceTree = ""; }; 8296D6FB451E25CEC0767BBA /* RoomNotificationSettingsScreenCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomNotificationSettingsScreenCoordinator.swift; sourceTree = ""; }; + 829D3CE4F6C4DF6CC02D33C3 /* TimelineItemProviderProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimelineItemProviderProtocol.swift; sourceTree = ""; }; 82B612853BFB68373249777B /* SecureBackupKeyBackupScreenViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecureBackupKeyBackupScreenViewModel.swift; sourceTree = ""; }; 82DFA1B7B088D033E0794B82 /* RoomChangeRolesScreenCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomChangeRolesScreenCoordinator.swift; sourceTree = ""; }; 82EE3B877D91030248B1242D /* DeactivateAccountScreenViewModelProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeactivateAccountScreenViewModelProtocol.swift; sourceTree = ""; }; @@ -2015,6 +2015,7 @@ 8512B82404B1751D0BCC82D2 /* MediaEventsTimelineScreenCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MediaEventsTimelineScreenCoordinator.swift; sourceTree = ""; }; 85149F56BA333619900E2410 /* UserDetailsEditScreenViewModelProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserDetailsEditScreenViewModelProtocol.swift; sourceTree = ""; }; 851B95BB98649B8E773D6790 /* AppLockService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppLockService.swift; sourceTree = ""; }; + 8520AFD6680CBAD388F6D927 /* TimelineItemProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimelineItemProvider.swift; sourceTree = ""; }; 8536B40F578BA7FDB23D97B1 /* UserIdentityProxyMock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserIdentityProxyMock.swift; sourceTree = ""; }; 8544F7058D31DBEB8DBFF0F5 /* NotificationSettingsEditScreenViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationSettingsEditScreenViewModelTests.swift; sourceTree = ""; }; 854BCEAF2A832176FAACD2CB /* SplashScreenCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SplashScreenCoordinator.swift; sourceTree = ""; }; @@ -2062,7 +2063,7 @@ 8D55702474F279D910D2D162 /* RoomStateEventStringBuilder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomStateEventStringBuilder.swift; sourceTree = ""; }; 8D8169443E5AC5FF71BFB3DB /* cs */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = cs; path = cs.lproj/Localizable.strings; sourceTree = ""; }; 8DA1E8F287680C8ED25EDBAC /* NetworkMonitorMock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkMonitorMock.swift; sourceTree = ""; }; - 8E088F2A1B9EC529D3221931 /* UITests.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = UITests.xctestplan; sourceTree = ""; }; + 8E088F2A1B9EC529D3221931 /* UITests.xctestplan */ = {isa = PBXFileReference; path = UITests.xctestplan; sourceTree = ""; }; 8E1584F8BCF407BB94F48F04 /* EncryptionResetPasswordScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EncryptionResetPasswordScreen.swift; sourceTree = ""; }; 8EAF4A49F3ACD8BB8B0D2371 /* ClientSDKMock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ClientSDKMock.swift; sourceTree = ""; }; 8F062DD2CCD95DC33528A16F /* KnockRequestProxy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KnockRequestProxy.swift; sourceTree = ""; }; @@ -2265,7 +2266,7 @@ B53AC78E49A297AC1D72A7CF /* AppMediator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppMediator.swift; sourceTree = ""; }; B590BD4507D4F0A377FDE01A /* LoadableAvatarImage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoadableAvatarImage.swift; sourceTree = ""; }; B5D829FD8958376614504B18 /* TargetConfiguration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TargetConfiguration.swift; sourceTree = ""; }; - B61C339A2FDDBD067FF6635C /* ConfettiScene.scn */ = {isa = PBXFileReference; lastKnownFileType = file.bplist; path = ConfettiScene.scn; sourceTree = ""; }; + B61C339A2FDDBD067FF6635C /* ConfettiScene.scn */ = {isa = PBXFileReference; path = ConfettiScene.scn; sourceTree = ""; }; B63B69F9A2BC74DD40DC75C8 /* AdvancedSettingsScreenViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdvancedSettingsScreenViewModel.swift; sourceTree = ""; }; B6404166CBF5CC88673FF9E2 /* RoomDetails.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomDetails.swift; sourceTree = ""; }; B655A536341D2695158C6664 /* AuthenticationClientBuilderFactory.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthenticationClientBuilderFactory.swift; sourceTree = ""; }; @@ -2293,7 +2294,7 @@ BA40B98B098B6F0371B750B3 /* TemplateScreenModels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TemplateScreenModels.swift; sourceTree = ""; }; BA919F521E9F0EE3638AFC85 /* BugReportScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BugReportScreen.swift; sourceTree = ""; }; BB284643AF7AB131E307DCE0 /* AudioSessionProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AudioSessionProtocol.swift; sourceTree = ""; }; - BB576F4118C35E6B5124FA22 /* test_apple_image.heic */ = {isa = PBXFileReference; lastKnownFileType = file; path = test_apple_image.heic; sourceTree = ""; }; + BB576F4118C35E6B5124FA22 /* test_apple_image.heic */ = {isa = PBXFileReference; path = test_apple_image.heic; sourceTree = ""; }; BB5B00A014307CE37B2812CD /* TimelineViewModelProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimelineViewModelProtocol.swift; sourceTree = ""; }; BB6ED50FE104992419310EEB /* NotificationHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationHandler.swift; sourceTree = ""; }; BB8BC4C791D0E88CFCF4E5DF /* ServerSelectionScreenCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ServerSelectionScreenCoordinator.swift; sourceTree = ""; }; @@ -2394,7 +2395,7 @@ CDB3227C7A74B734924942E9 /* RoomSummaryProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomSummaryProvider.swift; sourceTree = ""; }; CDE3F3911FF7CC639BDE5844 /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/Localizable.strings; sourceTree = ""; }; CEE20623EB4A9B88FB29F2BA /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/SAS.strings; sourceTree = ""; }; - CEE41494C837AA403A06A5D9 /* UnitTests.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = UnitTests.xctestplan; sourceTree = ""; }; + CEE41494C837AA403A06A5D9 /* UnitTests.xctestplan */ = {isa = PBXFileReference; path = UnitTests.xctestplan; sourceTree = ""; }; D01FD1171FF40E34D707FD00 /* BigIcon.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BigIcon.swift; sourceTree = ""; }; D046ABB22E680F7C5054441B /* SecurityAndPrivacyScreenViewModelProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecurityAndPrivacyScreenViewModelProtocol.swift; sourceTree = ""; }; D071F86CD47582B9196C9D16 /* UserDiscoverySection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserDiscoverySection.swift; sourceTree = ""; }; @@ -2457,11 +2458,10 @@ DC0AEA686E425F86F6BA0404 /* UNNotification+Creator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UNNotification+Creator.swift"; sourceTree = ""; }; DC10CCC8D68B863E20660DBC /* MessageForwardingScreenViewModelProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageForwardingScreenViewModelProtocol.swift; sourceTree = ""; }; DC528B3764E3CF7FCFEF40E7 /* PollInteractionHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PollInteractionHandler.swift; sourceTree = ""; }; - DCA2D836BD10303F37FAAEED /* test_voice_message.m4a */ = {isa = PBXFileReference; lastKnownFileType = file; path = test_voice_message.m4a; sourceTree = ""; }; + DCA2D836BD10303F37FAAEED /* test_voice_message.m4a */ = {isa = PBXFileReference; path = test_voice_message.m4a; sourceTree = ""; }; DCAC01A97A43BE07B9E94E43 /* ShareExtensionModels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShareExtensionModels.swift; sourceTree = ""; }; DCDAB580109C09A6AA97AF7E /* PollFormScreenTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PollFormScreenTests.swift; sourceTree = ""; }; DCF239C619971FDE48132550 /* SecureBackupLogoutConfirmationScreenModels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecureBackupLogoutConfirmationScreenModels.swift; sourceTree = ""; }; - DD8C9BBB729C941BEE0E2A63 /* TimelineItemProviderProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimelineItemProviderProtocol.swift; sourceTree = ""; }; DD955A0380C287C418F1A74D /* PhotoLibraryManagerMock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhotoLibraryManagerMock.swift; sourceTree = ""; }; DD97F9661ABF08CE002054A2 /* AppLockServiceTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppLockServiceTests.swift; sourceTree = ""; }; DE5127D6EA05B2E45D0A7D59 /* JoinRoomScreenViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JoinRoomScreenViewModelTests.swift; sourceTree = ""; }; @@ -2500,7 +2500,7 @@ E5272BC4A60B6AD7553BACA1 /* BlurHashDecode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BlurHashDecode.swift; sourceTree = ""; }; E53BFB7E4F329621C844E8C3 /* AnalyticsPromptScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnalyticsPromptScreen.swift; sourceTree = ""; }; E55B5EA766E89FF1F87C3ACB /* RoomNotificationSettingsProxyProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomNotificationSettingsProxyProtocol.swift; sourceTree = ""; }; - E5E7D4EE7CA295E5039FDA21 /* portrait_test_video.mp4 */ = {isa = PBXFileReference; lastKnownFileType = file; path = portrait_test_video.mp4; sourceTree = ""; }; + E5E7D4EE7CA295E5039FDA21 /* portrait_test_video.mp4 */ = {isa = PBXFileReference; path = portrait_test_video.mp4; sourceTree = ""; }; E5E94DCFEE803E5ABAE8ACCE /* KeychainControllerProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeychainControllerProtocol.swift; sourceTree = ""; }; E5F2B6443D1ED8602F328539 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = ru; path = ru.lproj/Localizable.stringsdict; sourceTree = ""; }; E5FDFAA04174CC99FB66391C /* EditRoomAddressScreenViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditRoomAddressScreenViewModel.swift; sourceTree = ""; }; @@ -2542,7 +2542,7 @@ ED0CBEAB5F796BEFBAF7BB6A /* VideoRoomTimelineView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VideoRoomTimelineView.swift; sourceTree = ""; }; ED1D792EB82506A19A72C8DE /* RoomTimelineItemProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomTimelineItemProtocol.swift; sourceTree = ""; }; ED33988DA4FD4FC666800106 /* SessionVerificationScreenViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SessionVerificationScreenViewModel.swift; sourceTree = ""; }; - ED482057AE39D5C6D9C5F3D8 /* message.caf */ = {isa = PBXFileReference; lastKnownFileType = file; path = message.caf; sourceTree = ""; }; + ED482057AE39D5C6D9C5F3D8 /* message.caf */ = {isa = PBXFileReference; path = message.caf; sourceTree = ""; }; ED49073BB1C1FC649DAC2CCD /* LocationRoomTimelineView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocationRoomTimelineView.swift; sourceTree = ""; }; ED60E4D2CD678E1EBF16F77A /* BlockedUsersScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BlockedUsersScreen.swift; sourceTree = ""; }; EE378083653EF0C9B5E9D580 /* EmoteRoomTimelineItemContent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmoteRoomTimelineItemContent.swift; sourceTree = ""; }; @@ -6084,10 +6084,10 @@ 190EC7285D3CFEF0D3011BCF /* GeoURI.swift */, 0DF5CBAF69BDF5DF31C661E1 /* IntentionalMentions.swift */, E48C91C8BE55CAE1A3DBC3BC /* TimelineItemIdentifier.swift */, + 8520AFD6680CBAD388F6D927 /* TimelineItemProvider.swift */, + 829D3CE4F6C4DF6CC02D33C3 /* TimelineItemProviderProtocol.swift */, 2D505843AB66822EB91F0DF0 /* TimelineItemProxy.swift */, 55AEEF8142DF1B59DB40FB93 /* TimelineItemSender.swift */, - 371B248460BD1A3F20318137 /* TimelineItemProvider.swift */, - DD8C9BBB729C941BEE0E2A63 /* TimelineItemProviderProtocol.swift */, F9E543072DE58E751F028998 /* TimelineProxy.swift */, B50F03079F6B5EF9CA005F14 /* TimelineProxyProtocol.swift */, 3EA31CC7012EA2A5653DAFC9 /* Fixtures */, @@ -6468,6 +6468,7 @@ EC6D0C817B1C21D9D096505A /* XCRemoteSwiftPackageReference "Version" */, EE40B0E16A55BD23ECBFFD22 /* XCRemoteSwiftPackageReference "matrix-rich-text-editor-swift" */, ); + preferredProjectObjectVersion = 54; projectDirPath = ""; projectRoot = ""; targets = ( @@ -7745,6 +7746,8 @@ 6C98153D60FF9B648C166C27 /* TimelineItemMenu.swift in Sources */, AE07F215EBC2B9CBF17AA54B /* TimelineItemMenuAction.swift in Sources */, 12CD8B5CC30A05061228BF9E /* TimelineItemMenuActionProvider.swift in Sources */, + A6FFC4C5154C446BAD6B40D8 /* TimelineItemProvider.swift in Sources */, + 5CEA0BF496F00339A9E4486B /* TimelineItemProviderProtocol.swift in Sources */, 440123E29E2F9B001A775BBE /* TimelineItemProxy.swift in Sources */, 9586E90A447C4896C0CA3A8E /* TimelineItemReplyDetails.swift in Sources */, F3ECA377FF77E81A4F1FA062 /* TimelineItemSendInfoLabel.swift in Sources */, @@ -7761,9 +7764,7 @@ A32384E3D85CA65342D3A908 /* TimelineMediaPreviewRedactConfirmationView.swift in Sources */, 86769B62BAE17601B3AE1B60 /* TimelineMediaPreviewViewModel.swift in Sources */, B818580464CFB5400A3EF6AE /* TimelineModels.swift in Sources */, - DA03B4F28C4D248EECE3429F /* TimelineItemProvider.swift in Sources */, 4E4EF97B9F9CEFAC726BA72F /* TimelineProviderMock.swift in Sources */, - 5EC046E41755C095DAB1C3FF /* TimelineItemProviderProtocol.swift in Sources */, E82E13CC3EB923CCB8F8273C /* TimelineProxy.swift in Sources */, 16A1F6C703305FCAF4E14EC6 /* TimelineProxyMock.swift in Sources */, 2FEC6652055984389CE1BBEC /* TimelineProxyProtocol.swift in Sources */, @@ -8123,7 +8124,9 @@ "@executable_path/../../Frameworks", ); MARKETING_VERSION = "$(MARKETING_VERSION)"; - OTHER_SWIFT_FLAGS = "-DIS_NSE"; + OTHER_SWIFT_FLAGS = ( + "-DIS_NSE", + ); PRODUCT_BUNDLE_IDENTIFIER = "${BASE_BUNDLE_IDENTIFIER}.nse"; PRODUCT_DISPLAY_NAME = "$(APP_DISPLAY_NAME)"; PRODUCT_NAME = NSE; @@ -8172,7 +8175,9 @@ "@executable_path/Frameworks", ); MARKETING_VERSION = "$(MARKETING_VERSION)"; - OTHER_SWIFT_FLAGS = "-DIS_MAIN_APP"; + OTHER_SWIFT_FLAGS = ( + "-DIS_MAIN_APP", + ); PILLS_UT_TYPE_IDENTIFIER = "$(BASE_BUNDLE_IDENTIFIER).pills"; PRODUCT_BUNDLE_IDENTIFIER = "$(BASE_BUNDLE_IDENTIFIER)"; PRODUCT_NAME = "$(APP_NAME)"; @@ -8198,7 +8203,9 @@ "@executable_path/Frameworks", ); MARKETING_VERSION = "$(MARKETING_VERSION)"; - OTHER_SWIFT_FLAGS = "-DIS_MAIN_APP"; + OTHER_SWIFT_FLAGS = ( + "-DIS_MAIN_APP", + ); PILLS_UT_TYPE_IDENTIFIER = "$(BASE_BUNDLE_IDENTIFIER).pills"; PRODUCT_BUNDLE_IDENTIFIER = "$(BASE_BUNDLE_IDENTIFIER)"; PRODUCT_NAME = "$(APP_NAME)"; @@ -8423,7 +8430,9 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - OTHER_SWIFT_FLAGS = "-DDEBUG"; + OTHER_SWIFT_FLAGS = ( + "-DDEBUG", + ); PRODUCT_BUNDLE_IDENTIFIER = "${BASE_BUNDLE_IDENTIFIER}.ui.tests"; PRODUCT_NAME = UITests; SDKROOT = iphoneos; @@ -8442,7 +8451,9 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - OTHER_SWIFT_FLAGS = "-DRELEASE"; + OTHER_SWIFT_FLAGS = ( + "-DRELEASE", + ); PRODUCT_BUNDLE_IDENTIFIER = "${BASE_BUNDLE_IDENTIFIER}.ui.tests"; PRODUCT_NAME = UITests; SDKROOT = iphoneos; @@ -8464,7 +8475,9 @@ "@executable_path/../../Frameworks", ); MARKETING_VERSION = "$(MARKETING_VERSION)"; - OTHER_SWIFT_FLAGS = "-DIS_NSE"; + OTHER_SWIFT_FLAGS = ( + "-DIS_NSE", + ); PRODUCT_BUNDLE_IDENTIFIER = "${BASE_BUNDLE_IDENTIFIER}.nse"; PRODUCT_DISPLAY_NAME = "$(APP_DISPLAY_NAME)"; PRODUCT_NAME = NSE; @@ -8695,7 +8708,7 @@ repositoryURL = "https://github.com/element-hq/matrix-rust-components-swift"; requirement = { kind = exactVersion; - version = 25.05.26; + version = "25.05.26-2"; }; }; 701C7BEF8F70F7A83E852DCC /* XCRemoteSwiftPackageReference "GZIP" */ = { diff --git a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 7a410b3fb..2cc93ad84 100644 --- a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -158,8 +158,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/element-hq/matrix-rust-components-swift", "state" : { - "revision" : "966e64d8145b857a4dd586c735024a7762efe603", - "version" : "25.5.26" + "revision" : "ac83025d7b22c7db45eed3441448aefa6baa2ebd", + "version" : "25.5.26-2" } }, { diff --git a/ElementX/Sources/Mocks/Generated/SDKGeneratedMocks.swift b/ElementX/Sources/Mocks/Generated/SDKGeneratedMocks.swift index 3fbe13c80..275c5be31 100644 --- a/ElementX/Sources/Mocks/Generated/SDKGeneratedMocks.swift +++ b/ElementX/Sources/Mocks/Generated/SDKGeneratedMocks.swift @@ -13420,6 +13420,71 @@ open class RoomSDKMock: MatrixRustSDK.Room, @unchecked Sendable { } } + //MARK: - isEncrypted + + var isEncryptedUnderlyingCallsCount = 0 + open var isEncryptedCallsCount: Int { + get { + if Thread.isMainThread { + return isEncryptedUnderlyingCallsCount + } else { + var returnValue: Int? = nil + DispatchQueue.main.sync { + returnValue = isEncryptedUnderlyingCallsCount + } + + return returnValue! + } + } + set { + if Thread.isMainThread { + isEncryptedUnderlyingCallsCount = newValue + } else { + DispatchQueue.main.sync { + isEncryptedUnderlyingCallsCount = newValue + } + } + } + } + open var isEncryptedCalled: Bool { + return isEncryptedCallsCount > 0 + } + + var isEncryptedUnderlyingReturnValue: Bool! + open var isEncryptedReturnValue: Bool! { + get { + if Thread.isMainThread { + return isEncryptedUnderlyingReturnValue + } else { + var returnValue: Bool? = nil + DispatchQueue.main.sync { + returnValue = isEncryptedUnderlyingReturnValue + } + + return returnValue! + } + } + set { + if Thread.isMainThread { + isEncryptedUnderlyingReturnValue = newValue + } else { + DispatchQueue.main.sync { + isEncryptedUnderlyingReturnValue = newValue + } + } + } + } + open var isEncryptedClosure: (() async -> Bool)? + + open override func isEncrypted() async -> Bool { + isEncryptedCallsCount += 1 + if let isEncryptedClosure = isEncryptedClosure { + return await isEncryptedClosure() + } else { + return isEncryptedReturnValue + } + } + //MARK: - isPublic var isPublicUnderlyingCallsCount = 0 @@ -13900,6 +13965,71 @@ open class RoomSDKMock: MatrixRustSDK.Room, @unchecked Sendable { } } + //MARK: - latestEvent + + var latestEventUnderlyingCallsCount = 0 + open var latestEventCallsCount: Int { + get { + if Thread.isMainThread { + return latestEventUnderlyingCallsCount + } else { + var returnValue: Int? = nil + DispatchQueue.main.sync { + returnValue = latestEventUnderlyingCallsCount + } + + return returnValue! + } + } + set { + if Thread.isMainThread { + latestEventUnderlyingCallsCount = newValue + } else { + DispatchQueue.main.sync { + latestEventUnderlyingCallsCount = newValue + } + } + } + } + open var latestEventCalled: Bool { + return latestEventCallsCount > 0 + } + + var latestEventUnderlyingReturnValue: EventTimelineItem? + open var latestEventReturnValue: EventTimelineItem? { + get { + if Thread.isMainThread { + return latestEventUnderlyingReturnValue + } else { + var returnValue: EventTimelineItem?? = nil + DispatchQueue.main.sync { + returnValue = latestEventUnderlyingReturnValue + } + + return returnValue! + } + } + set { + if Thread.isMainThread { + latestEventUnderlyingReturnValue = newValue + } else { + DispatchQueue.main.sync { + latestEventUnderlyingReturnValue = newValue + } + } + } + } + open var latestEventClosure: (() async -> EventTimelineItem?)? + + open override func latestEvent() async -> EventTimelineItem? { + latestEventCallsCount += 1 + if let latestEventClosure = latestEventClosure { + return await latestEventClosure() + } else { + return latestEventReturnValue + } + } + //MARK: - leave open var leaveThrowableError: Error? @@ -14767,6 +14897,81 @@ open class RoomSDKMock: MatrixRustSDK.Room, @unchecked Sendable { } } + //MARK: - previewRoom + + open var previewRoomViaThrowableError: Error? + var previewRoomViaUnderlyingCallsCount = 0 + open var previewRoomViaCallsCount: Int { + get { + if Thread.isMainThread { + return previewRoomViaUnderlyingCallsCount + } else { + var returnValue: Int? = nil + DispatchQueue.main.sync { + returnValue = previewRoomViaUnderlyingCallsCount + } + + return returnValue! + } + } + set { + if Thread.isMainThread { + previewRoomViaUnderlyingCallsCount = newValue + } else { + DispatchQueue.main.sync { + previewRoomViaUnderlyingCallsCount = newValue + } + } + } + } + open var previewRoomViaCalled: Bool { + return previewRoomViaCallsCount > 0 + } + open var previewRoomViaReceivedVia: [String]? + open var previewRoomViaReceivedInvocations: [[String]] = [] + + var previewRoomViaUnderlyingReturnValue: RoomPreview! + open var previewRoomViaReturnValue: RoomPreview! { + get { + if Thread.isMainThread { + return previewRoomViaUnderlyingReturnValue + } else { + var returnValue: RoomPreview? = nil + DispatchQueue.main.sync { + returnValue = previewRoomViaUnderlyingReturnValue + } + + return returnValue! + } + } + set { + if Thread.isMainThread { + previewRoomViaUnderlyingReturnValue = newValue + } else { + DispatchQueue.main.sync { + previewRoomViaUnderlyingReturnValue = newValue + } + } + } + } + open var previewRoomViaClosure: (([String]) async throws -> RoomPreview)? + + open override func previewRoom(via: [String]) async throws -> RoomPreview { + if let error = previewRoomViaThrowableError { + throw error + } + previewRoomViaCallsCount += 1 + previewRoomViaReceivedVia = via + DispatchQueue.main.async { + self.previewRoomViaReceivedInvocations.append(via) + } + if let previewRoomViaClosure = previewRoomViaClosure { + return try await previewRoomViaClosure(via) + } else { + return previewRoomViaReturnValue + } + } + //MARK: - publishRoomAliasInRoomDirectory open var publishRoomAliasInRoomDirectoryAliasThrowableError: Error? @@ -17464,13 +17669,13 @@ open class RoomListSDKMock: MatrixRustSDK.RoomList, @unchecked Sendable { open var roomRoomIdReceivedRoomId: String? open var roomRoomIdReceivedInvocations: [String] = [] - var roomRoomIdUnderlyingReturnValue: RoomListItem! - open var roomRoomIdReturnValue: RoomListItem! { + var roomRoomIdUnderlyingReturnValue: Room! + open var roomRoomIdReturnValue: Room! { get { if Thread.isMainThread { return roomRoomIdUnderlyingReturnValue } else { - var returnValue: RoomListItem? = nil + var returnValue: Room? = nil DispatchQueue.main.sync { returnValue = roomRoomIdUnderlyingReturnValue } @@ -17488,9 +17693,9 @@ open class RoomListSDKMock: MatrixRustSDK.RoomList, @unchecked Sendable { } } } - open var roomRoomIdClosure: ((String) throws -> RoomListItem)? + open var roomRoomIdClosure: ((String) throws -> Room)? - open override func room(roomId: String) throws -> RoomListItem { + open override func room(roomId: String) throws -> Room { if let error = roomRoomIdThrowableError { throw error } @@ -17801,681 +18006,6 @@ open class RoomListEntriesWithDynamicAdaptersResultSDKMock: MatrixRustSDK.RoomLi } } } -open class RoomListItemSDKMock: MatrixRustSDK.RoomListItem, @unchecked Sendable { - init() { - super.init(noPointer: .init()) - } - - public required init(unsafeFromRawPointer pointer: UnsafeMutableRawPointer) { - fatalError("init(unsafeFromRawPointer:) has not been implemented") - } - - fileprivate var pointer: UnsafeMutableRawPointer! - - //MARK: - avatarUrl - - var avatarUrlUnderlyingCallsCount = 0 - open var avatarUrlCallsCount: Int { - get { - if Thread.isMainThread { - return avatarUrlUnderlyingCallsCount - } else { - var returnValue: Int? = nil - DispatchQueue.main.sync { - returnValue = avatarUrlUnderlyingCallsCount - } - - return returnValue! - } - } - set { - if Thread.isMainThread { - avatarUrlUnderlyingCallsCount = newValue - } else { - DispatchQueue.main.sync { - avatarUrlUnderlyingCallsCount = newValue - } - } - } - } - open var avatarUrlCalled: Bool { - return avatarUrlCallsCount > 0 - } - - var avatarUrlUnderlyingReturnValue: String? - open var avatarUrlReturnValue: String? { - get { - if Thread.isMainThread { - return avatarUrlUnderlyingReturnValue - } else { - var returnValue: String?? = nil - DispatchQueue.main.sync { - returnValue = avatarUrlUnderlyingReturnValue - } - - return returnValue! - } - } - set { - if Thread.isMainThread { - avatarUrlUnderlyingReturnValue = newValue - } else { - DispatchQueue.main.sync { - avatarUrlUnderlyingReturnValue = newValue - } - } - } - } - open var avatarUrlClosure: (() -> String?)? - - open override func avatarUrl() -> String? { - avatarUrlCallsCount += 1 - if let avatarUrlClosure = avatarUrlClosure { - return avatarUrlClosure() - } else { - return avatarUrlReturnValue - } - } - - //MARK: - canonicalAlias - - var canonicalAliasUnderlyingCallsCount = 0 - open var canonicalAliasCallsCount: Int { - get { - if Thread.isMainThread { - return canonicalAliasUnderlyingCallsCount - } else { - var returnValue: Int? = nil - DispatchQueue.main.sync { - returnValue = canonicalAliasUnderlyingCallsCount - } - - return returnValue! - } - } - set { - if Thread.isMainThread { - canonicalAliasUnderlyingCallsCount = newValue - } else { - DispatchQueue.main.sync { - canonicalAliasUnderlyingCallsCount = newValue - } - } - } - } - open var canonicalAliasCalled: Bool { - return canonicalAliasCallsCount > 0 - } - - var canonicalAliasUnderlyingReturnValue: String? - open var canonicalAliasReturnValue: String? { - get { - if Thread.isMainThread { - return canonicalAliasUnderlyingReturnValue - } else { - var returnValue: String?? = nil - DispatchQueue.main.sync { - returnValue = canonicalAliasUnderlyingReturnValue - } - - return returnValue! - } - } - set { - if Thread.isMainThread { - canonicalAliasUnderlyingReturnValue = newValue - } else { - DispatchQueue.main.sync { - canonicalAliasUnderlyingReturnValue = newValue - } - } - } - } - open var canonicalAliasClosure: (() -> String?)? - - open override func canonicalAlias() -> String? { - canonicalAliasCallsCount += 1 - if let canonicalAliasClosure = canonicalAliasClosure { - return canonicalAliasClosure() - } else { - return canonicalAliasReturnValue - } - } - - //MARK: - displayName - - var displayNameUnderlyingCallsCount = 0 - open var displayNameCallsCount: Int { - get { - if Thread.isMainThread { - return displayNameUnderlyingCallsCount - } else { - var returnValue: Int? = nil - DispatchQueue.main.sync { - returnValue = displayNameUnderlyingCallsCount - } - - return returnValue! - } - } - set { - if Thread.isMainThread { - displayNameUnderlyingCallsCount = newValue - } else { - DispatchQueue.main.sync { - displayNameUnderlyingCallsCount = newValue - } - } - } - } - open var displayNameCalled: Bool { - return displayNameCallsCount > 0 - } - - var displayNameUnderlyingReturnValue: String? - open var displayNameReturnValue: String? { - get { - if Thread.isMainThread { - return displayNameUnderlyingReturnValue - } else { - var returnValue: String?? = nil - DispatchQueue.main.sync { - returnValue = displayNameUnderlyingReturnValue - } - - return returnValue! - } - } - set { - if Thread.isMainThread { - displayNameUnderlyingReturnValue = newValue - } else { - DispatchQueue.main.sync { - displayNameUnderlyingReturnValue = newValue - } - } - } - } - open var displayNameClosure: (() -> String?)? - - open override func displayName() -> String? { - displayNameCallsCount += 1 - if let displayNameClosure = displayNameClosure { - return displayNameClosure() - } else { - return displayNameReturnValue - } - } - - //MARK: - id - - var idUnderlyingCallsCount = 0 - open var idCallsCount: Int { - get { - if Thread.isMainThread { - return idUnderlyingCallsCount - } else { - var returnValue: Int? = nil - DispatchQueue.main.sync { - returnValue = idUnderlyingCallsCount - } - - return returnValue! - } - } - set { - if Thread.isMainThread { - idUnderlyingCallsCount = newValue - } else { - DispatchQueue.main.sync { - idUnderlyingCallsCount = newValue - } - } - } - } - open var idCalled: Bool { - return idCallsCount > 0 - } - - var idUnderlyingReturnValue: String! - open var idReturnValue: String! { - get { - if Thread.isMainThread { - return idUnderlyingReturnValue - } else { - var returnValue: String? = nil - DispatchQueue.main.sync { - returnValue = idUnderlyingReturnValue - } - - return returnValue! - } - } - set { - if Thread.isMainThread { - idUnderlyingReturnValue = newValue - } else { - DispatchQueue.main.sync { - idUnderlyingReturnValue = newValue - } - } - } - } - open var idClosure: (() -> String)? - - open override func id() -> String { - idCallsCount += 1 - if let idClosure = idClosure { - return idClosure() - } else { - return idReturnValue - } - } - - //MARK: - isDirect - - var isDirectUnderlyingCallsCount = 0 - open var isDirectCallsCount: Int { - get { - if Thread.isMainThread { - return isDirectUnderlyingCallsCount - } else { - var returnValue: Int? = nil - DispatchQueue.main.sync { - returnValue = isDirectUnderlyingCallsCount - } - - return returnValue! - } - } - set { - if Thread.isMainThread { - isDirectUnderlyingCallsCount = newValue - } else { - DispatchQueue.main.sync { - isDirectUnderlyingCallsCount = newValue - } - } - } - } - open var isDirectCalled: Bool { - return isDirectCallsCount > 0 - } - - var isDirectUnderlyingReturnValue: Bool! - open var isDirectReturnValue: Bool! { - get { - if Thread.isMainThread { - return isDirectUnderlyingReturnValue - } else { - var returnValue: Bool? = nil - DispatchQueue.main.sync { - returnValue = isDirectUnderlyingReturnValue - } - - return returnValue! - } - } - set { - if Thread.isMainThread { - isDirectUnderlyingReturnValue = newValue - } else { - DispatchQueue.main.sync { - isDirectUnderlyingReturnValue = newValue - } - } - } - } - open var isDirectClosure: (() async -> Bool)? - - open override func isDirect() async -> Bool { - isDirectCallsCount += 1 - if let isDirectClosure = isDirectClosure { - return await isDirectClosure() - } else { - return isDirectReturnValue - } - } - - //MARK: - isEncrypted - - var isEncryptedUnderlyingCallsCount = 0 - open var isEncryptedCallsCount: Int { - get { - if Thread.isMainThread { - return isEncryptedUnderlyingCallsCount - } else { - var returnValue: Int? = nil - DispatchQueue.main.sync { - returnValue = isEncryptedUnderlyingCallsCount - } - - return returnValue! - } - } - set { - if Thread.isMainThread { - isEncryptedUnderlyingCallsCount = newValue - } else { - DispatchQueue.main.sync { - isEncryptedUnderlyingCallsCount = newValue - } - } - } - } - open var isEncryptedCalled: Bool { - return isEncryptedCallsCount > 0 - } - - var isEncryptedUnderlyingReturnValue: Bool! - open var isEncryptedReturnValue: Bool! { - get { - if Thread.isMainThread { - return isEncryptedUnderlyingReturnValue - } else { - var returnValue: Bool? = nil - DispatchQueue.main.sync { - returnValue = isEncryptedUnderlyingReturnValue - } - - return returnValue! - } - } - set { - if Thread.isMainThread { - isEncryptedUnderlyingReturnValue = newValue - } else { - DispatchQueue.main.sync { - isEncryptedUnderlyingReturnValue = newValue - } - } - } - } - open var isEncryptedClosure: (() async -> Bool)? - - open override func isEncrypted() async -> Bool { - isEncryptedCallsCount += 1 - if let isEncryptedClosure = isEncryptedClosure { - return await isEncryptedClosure() - } else { - return isEncryptedReturnValue - } - } - - //MARK: - latestEvent - - var latestEventUnderlyingCallsCount = 0 - open var latestEventCallsCount: Int { - get { - if Thread.isMainThread { - return latestEventUnderlyingCallsCount - } else { - var returnValue: Int? = nil - DispatchQueue.main.sync { - returnValue = latestEventUnderlyingCallsCount - } - - return returnValue! - } - } - set { - if Thread.isMainThread { - latestEventUnderlyingCallsCount = newValue - } else { - DispatchQueue.main.sync { - latestEventUnderlyingCallsCount = newValue - } - } - } - } - open var latestEventCalled: Bool { - return latestEventCallsCount > 0 - } - - var latestEventUnderlyingReturnValue: EventTimelineItem? - open var latestEventReturnValue: EventTimelineItem? { - get { - if Thread.isMainThread { - return latestEventUnderlyingReturnValue - } else { - var returnValue: EventTimelineItem?? = nil - DispatchQueue.main.sync { - returnValue = latestEventUnderlyingReturnValue - } - - return returnValue! - } - } - set { - if Thread.isMainThread { - latestEventUnderlyingReturnValue = newValue - } else { - DispatchQueue.main.sync { - latestEventUnderlyingReturnValue = newValue - } - } - } - } - open var latestEventClosure: (() async -> EventTimelineItem?)? - - open override func latestEvent() async -> EventTimelineItem? { - latestEventCallsCount += 1 - if let latestEventClosure = latestEventClosure { - return await latestEventClosure() - } else { - return latestEventReturnValue - } - } - - //MARK: - membership - - var membershipUnderlyingCallsCount = 0 - open var membershipCallsCount: Int { - get { - if Thread.isMainThread { - return membershipUnderlyingCallsCount - } else { - var returnValue: Int? = nil - DispatchQueue.main.sync { - returnValue = membershipUnderlyingCallsCount - } - - return returnValue! - } - } - set { - if Thread.isMainThread { - membershipUnderlyingCallsCount = newValue - } else { - DispatchQueue.main.sync { - membershipUnderlyingCallsCount = newValue - } - } - } - } - open var membershipCalled: Bool { - return membershipCallsCount > 0 - } - - var membershipUnderlyingReturnValue: Membership! - open var membershipReturnValue: Membership! { - get { - if Thread.isMainThread { - return membershipUnderlyingReturnValue - } else { - var returnValue: Membership? = nil - DispatchQueue.main.sync { - returnValue = membershipUnderlyingReturnValue - } - - return returnValue! - } - } - set { - if Thread.isMainThread { - membershipUnderlyingReturnValue = newValue - } else { - DispatchQueue.main.sync { - membershipUnderlyingReturnValue = newValue - } - } - } - } - open var membershipClosure: (() -> Membership)? - - open override func membership() -> Membership { - membershipCallsCount += 1 - if let membershipClosure = membershipClosure { - return membershipClosure() - } else { - return membershipReturnValue - } - } - - //MARK: - previewRoom - - open var previewRoomViaThrowableError: Error? - var previewRoomViaUnderlyingCallsCount = 0 - open var previewRoomViaCallsCount: Int { - get { - if Thread.isMainThread { - return previewRoomViaUnderlyingCallsCount - } else { - var returnValue: Int? = nil - DispatchQueue.main.sync { - returnValue = previewRoomViaUnderlyingCallsCount - } - - return returnValue! - } - } - set { - if Thread.isMainThread { - previewRoomViaUnderlyingCallsCount = newValue - } else { - DispatchQueue.main.sync { - previewRoomViaUnderlyingCallsCount = newValue - } - } - } - } - open var previewRoomViaCalled: Bool { - return previewRoomViaCallsCount > 0 - } - open var previewRoomViaReceivedVia: [String]? - open var previewRoomViaReceivedInvocations: [[String]] = [] - - var previewRoomViaUnderlyingReturnValue: RoomPreview! - open var previewRoomViaReturnValue: RoomPreview! { - get { - if Thread.isMainThread { - return previewRoomViaUnderlyingReturnValue - } else { - var returnValue: RoomPreview? = nil - DispatchQueue.main.sync { - returnValue = previewRoomViaUnderlyingReturnValue - } - - return returnValue! - } - } - set { - if Thread.isMainThread { - previewRoomViaUnderlyingReturnValue = newValue - } else { - DispatchQueue.main.sync { - previewRoomViaUnderlyingReturnValue = newValue - } - } - } - } - open var previewRoomViaClosure: (([String]) async throws -> RoomPreview)? - - open override func previewRoom(via: [String]) async throws -> RoomPreview { - if let error = previewRoomViaThrowableError { - throw error - } - previewRoomViaCallsCount += 1 - previewRoomViaReceivedVia = via - DispatchQueue.main.async { - self.previewRoomViaReceivedInvocations.append(via) - } - if let previewRoomViaClosure = previewRoomViaClosure { - return try await previewRoomViaClosure(via) - } else { - return previewRoomViaReturnValue - } - } - - //MARK: - roomInfo - - open var roomInfoThrowableError: Error? - var roomInfoUnderlyingCallsCount = 0 - open var roomInfoCallsCount: Int { - get { - if Thread.isMainThread { - return roomInfoUnderlyingCallsCount - } else { - var returnValue: Int? = nil - DispatchQueue.main.sync { - returnValue = roomInfoUnderlyingCallsCount - } - - return returnValue! - } - } - set { - if Thread.isMainThread { - roomInfoUnderlyingCallsCount = newValue - } else { - DispatchQueue.main.sync { - roomInfoUnderlyingCallsCount = newValue - } - } - } - } - open var roomInfoCalled: Bool { - return roomInfoCallsCount > 0 - } - - var roomInfoUnderlyingReturnValue: RoomInfo! - open var roomInfoReturnValue: RoomInfo! { - get { - if Thread.isMainThread { - return roomInfoUnderlyingReturnValue - } else { - var returnValue: RoomInfo? = nil - DispatchQueue.main.sync { - returnValue = roomInfoUnderlyingReturnValue - } - - return returnValue! - } - } - set { - if Thread.isMainThread { - roomInfoUnderlyingReturnValue = newValue - } else { - DispatchQueue.main.sync { - roomInfoUnderlyingReturnValue = newValue - } - } - } - } - open var roomInfoClosure: (() async throws -> RoomInfo)? - - open override func roomInfo() async throws -> RoomInfo { - if let error = roomInfoThrowableError { - throw error - } - roomInfoCallsCount += 1 - if let roomInfoClosure = roomInfoClosure { - return try await roomInfoClosure() - } else { - return roomInfoReturnValue - } - } -} open class RoomListServiceSDKMock: MatrixRustSDK.RoomListService, @unchecked Sendable { init() { super.init(noPointer: .init()) @@ -18589,13 +18119,13 @@ open class RoomListServiceSDKMock: MatrixRustSDK.RoomListService, @unchecked Sen open var roomRoomIdReceivedRoomId: String? open var roomRoomIdReceivedInvocations: [String] = [] - var roomRoomIdUnderlyingReturnValue: RoomListItem! - open var roomRoomIdReturnValue: RoomListItem! { + var roomRoomIdUnderlyingReturnValue: Room! + open var roomRoomIdReturnValue: Room! { get { if Thread.isMainThread { return roomRoomIdUnderlyingReturnValue } else { - var returnValue: RoomListItem? = nil + var returnValue: Room? = nil DispatchQueue.main.sync { returnValue = roomRoomIdUnderlyingReturnValue } @@ -18613,9 +18143,9 @@ open class RoomListServiceSDKMock: MatrixRustSDK.RoomListService, @unchecked Sen } } } - open var roomRoomIdClosure: ((String) throws -> RoomListItem)? + open var roomRoomIdClosure: ((String) throws -> Room)? - open override func room(roomId: String) throws -> RoomListItem { + open override func room(roomId: String) throws -> Room { if let error = roomRoomIdThrowableError { throw error } diff --git a/ElementX/Sources/Mocks/RoomSummaryProviderMock.swift b/ElementX/Sources/Mocks/RoomSummaryProviderMock.swift index 4fa0240f7..a41b5d316 100644 --- a/ElementX/Sources/Mocks/RoomSummaryProviderMock.swift +++ b/ElementX/Sources/Mocks/RoomSummaryProviderMock.swift @@ -71,7 +71,7 @@ extension RoomSummary { static func mock(id: String, name: String, canonicalAlias: String? = nil) -> RoomSummary { - RoomSummary(roomListItem: RoomListItemSDKMock(), + RoomSummary(room: RoomSDKMock(), id: id, joinRequestType: nil, name: name, @@ -95,7 +95,7 @@ extension RoomSummary { extension Array where Element == RoomSummary { static let mockRooms: [Element] = [ - RoomSummary(roomListItem: RoomListItemSDKMock(), + RoomSummary(room: RoomSDKMock(), id: "1", joinRequestType: nil, name: "Foundation 🔭🪐🌌", @@ -114,7 +114,7 @@ extension Array where Element == RoomSummary { hasOngoingCall: false, isMarkedUnread: false, isFavourite: false), - RoomSummary(roomListItem: RoomListItemSDKMock(), + RoomSummary(room: RoomSDKMock(), id: "2", joinRequestType: nil, name: "Foundation and Empire", @@ -133,7 +133,7 @@ extension Array where Element == RoomSummary { hasOngoingCall: false, isMarkedUnread: false, isFavourite: false), - RoomSummary(roomListItem: RoomListItemSDKMock(), + RoomSummary(room: RoomSDKMock(), id: "3", joinRequestType: nil, name: "Second Foundation", @@ -152,7 +152,7 @@ extension Array where Element == RoomSummary { hasOngoingCall: false, isMarkedUnread: false, isFavourite: false), - RoomSummary(roomListItem: RoomListItemSDKMock(), + RoomSummary(room: RoomSDKMock(), id: "4", joinRequestType: nil, name: "Foundation's Edge", @@ -171,7 +171,7 @@ extension Array where Element == RoomSummary { hasOngoingCall: false, isMarkedUnread: false, isFavourite: false), - RoomSummary(roomListItem: RoomListItemSDKMock(), + RoomSummary(room: RoomSDKMock(), id: "5", joinRequestType: nil, name: "Foundation and Earth", @@ -190,7 +190,7 @@ extension Array where Element == RoomSummary { hasOngoingCall: true, isMarkedUnread: false, isFavourite: false), - RoomSummary(roomListItem: RoomListItemSDKMock(), + RoomSummary(room: RoomSDKMock(), id: "6", joinRequestType: nil, name: "Prelude to Foundation", @@ -209,7 +209,7 @@ extension Array where Element == RoomSummary { hasOngoingCall: true, isMarkedUnread: false, isFavourite: false), - RoomSummary(roomListItem: RoomListItemSDKMock(), + RoomSummary(room: RoomSDKMock(), id: "0", joinRequestType: nil, name: "Unknown", @@ -244,7 +244,7 @@ extension Array where Element == RoomSummary { // Incrementing id value for each combination let id = result.count + 1 - let room = RoomSummary(roomListItem: RoomListItemSDKMock(), + let room = RoomSummary(room: RoomSDKMock(), id: "\(id)", settingsMode: mode, hasUnreadMessages: hasUnreadMessages, @@ -261,7 +261,7 @@ extension Array where Element == RoomSummary { }() static let mockInvites: [Element] = [ - RoomSummary(roomListItem: RoomListItemSDKMock(), + RoomSummary(room: RoomSDKMock(), id: "someAwesomeRoomId1", joinRequestType: .invite(inviter: RoomMemberProxyMock.mockCharlie), name: "First room", @@ -280,7 +280,7 @@ extension Array where Element == RoomSummary { hasOngoingCall: false, isMarkedUnread: false, isFavourite: false), - RoomSummary(roomListItem: RoomListItemSDKMock(), + RoomSummary(room: RoomSDKMock(), id: "someAwesomeRoomId2", joinRequestType: .invite(inviter: RoomMemberProxyMock.mockCharlie), name: "Second room", diff --git a/ElementX/Sources/Screens/HomeScreen/View/HomeScreenInviteCell.swift b/ElementX/Sources/Screens/HomeScreen/View/HomeScreenInviteCell.swift index 65d1b34d4..de16ddd1a 100644 --- a/ElementX/Sources/Screens/HomeScreen/View/HomeScreenInviteCell.swift +++ b/ElementX/Sources/Screens/HomeScreen/View/HomeScreenInviteCell.swift @@ -199,7 +199,7 @@ private extension HomeScreenRoom { inviter.displayName = "Some Guy" inviter.userID = "@someone:somewhere.com" - let summary = RoomSummary(roomListItem: RoomListItemSDKMock(), + let summary = RoomSummary(room: RoomSDKMock(), id: "@someone:somewhere.com", joinRequestType: .invite(inviter: inviter), name: "Some Guy", @@ -228,7 +228,7 @@ private extension HomeScreenRoom { inviter.userID = "@jack:somewhi.nl" inviter.avatarURL = avatarURL.map { _ in .mockMXCUserAvatar } - let summary = RoomSummary(roomListItem: RoomListItemSDKMock(), + let summary = RoomSummary(room: RoomSDKMock(), id: "@someone:somewhere.com", joinRequestType: .invite(inviter: inviter), name: "Awesome Room", diff --git a/ElementX/Sources/Screens/HomeScreen/View/HomeScreenKnockedCell.swift b/ElementX/Sources/Screens/HomeScreen/View/HomeScreenKnockedCell.swift index f70ed74c9..43d67b0f5 100644 --- a/ElementX/Sources/Screens/HomeScreen/View/HomeScreenKnockedCell.swift +++ b/ElementX/Sources/Screens/HomeScreen/View/HomeScreenKnockedCell.swift @@ -144,7 +144,7 @@ private extension HomeScreenRoom { inviter.displayName = "Jack" inviter.userID = "@jack:somewhere.com" - let summary = RoomSummary(roomListItem: RoomListItemSDKMock(), + let summary = RoomSummary(room: RoomSDKMock(), id: "@someone:somewhere.com", joinRequestType: .invite(inviter: inviter), name: "Some Guy", @@ -173,7 +173,7 @@ private extension HomeScreenRoom { inviter.userID = "@jack:somewhi.nl" inviter.avatarURL = avatarURL - let summary = RoomSummary(roomListItem: RoomListItemSDKMock(), + let summary = RoomSummary(room: RoomSDKMock(), id: "@someone:somewhere.com", joinRequestType: .invite(inviter: inviter), name: "Awesome Room", diff --git a/ElementX/Sources/Screens/JoinRoomScreen/JoinRoomScreenViewModel.swift b/ElementX/Sources/Screens/JoinRoomScreen/JoinRoomScreenViewModel.swift index 38f82d13e..4edcd010a 100644 --- a/ElementX/Sources/Screens/JoinRoomScreen/JoinRoomScreenViewModel.swift +++ b/ElementX/Sources/Screens/JoinRoomScreen/JoinRoomScreenViewModel.swift @@ -149,7 +149,7 @@ class JoinRoomScreenViewModel: JoinRoomScreenViewModelType, JoinRoomScreenViewMo .roomListPublisher .compactMap { summaries -> Void? in guard let roomSummary = summaries.first(where: { $0.id == roomInfo?.id }), - roomSummary.roomListItem.membership() != .knocked else { + roomSummary.room.membership() != .knocked else { return nil } return () diff --git a/ElementX/Sources/Services/Room/RoomSummary/RoomSummary.swift b/ElementX/Sources/Services/Room/RoomSummary/RoomSummary.swift index da50d29ba..b7eb022d5 100644 --- a/ElementX/Sources/Services/Room/RoomSummary/RoomSummary.swift +++ b/ElementX/Sources/Services/Room/RoomSummary/RoomSummary.swift @@ -29,7 +29,7 @@ struct RoomSummary { } } - let roomListItem: RoomListItem + let room: Room let id: String @@ -100,8 +100,8 @@ extension RoomSummary: CustomStringConvertible { } extension RoomSummary { - init(roomListItem: RoomListItem, id: String, settingsMode: RoomNotificationModeProxy, hasUnreadMessages: Bool, hasUnreadMentions: Bool, hasUnreadNotifications: Bool) { - self.roomListItem = roomListItem + init(room: Room, id: String, settingsMode: RoomNotificationModeProxy, hasUnreadMessages: Bool, hasUnreadMentions: Bool, hasUnreadNotifications: Bool) { + self.room = room self.id = id let string = "\(settingsMode) - messages: \(hasUnreadMessages) - mentions: \(hasUnreadMentions) - notifications: \(hasUnreadNotifications)" name = string diff --git a/ElementX/Sources/Services/Room/RoomSummary/RoomSummaryProvider.swift b/ElementX/Sources/Services/Room/RoomSummary/RoomSummaryProvider.swift index 1a4ac72ef..86789bbfb 100644 --- a/ElementX/Sources/Services/Room/RoomSummary/RoomSummaryProvider.swift +++ b/ElementX/Sources/Services/Room/RoomSummary/RoomSummaryProvider.swift @@ -212,7 +212,7 @@ class RoomSummaryProvider: RoomSummaryProviderProtocol { return updatedItems } - private func fetchRoomDetails(from roomListItem: RoomListItem) -> (roomInfo: RoomInfo?, latestEvent: EventTimelineItem?) { + private func fetchRoomDetails(from room: Room) -> (roomInfo: RoomInfo?, latestEvent: EventTimelineItem?) { class FetchResult { var roomInfo: RoomInfo? var latestEvent: EventTimelineItem? @@ -223,8 +223,8 @@ class RoomSummaryProvider: RoomSummaryProviderProtocol { Task { do { - result.latestEvent = await roomListItem.latestEvent() - result.roomInfo = try await roomListItem.roomInfo() + result.latestEvent = await room.latestEvent() + result.roomInfo = try await room.roomInfo() } catch { MXLog.error("Failed fetching room info with error: \(error)") } @@ -234,11 +234,11 @@ class RoomSummaryProvider: RoomSummaryProviderProtocol { return (result.roomInfo, result.latestEvent) } - private func buildRoomSummary(from roomListItem: RoomListItem) -> RoomSummary { - let roomDetails = fetchRoomDetails(from: roomListItem) + private func buildRoomSummary(from room: Room) -> RoomSummary { + let roomDetails = fetchRoomDetails(from: room) guard let roomInfo = roomDetails.roomInfo else { - fatalError("Missing room info for \(roomListItem.id())") + fatalError("Missing room info for \(room.id())") } var attributedLastMessage: AttributedString? @@ -263,7 +263,7 @@ class RoomSummaryProvider: RoomSummaryProviderProtocol { default: nil } - return RoomSummary(roomListItem: roomListItem, + return RoomSummary(room: room, id: roomInfo.id, joinRequestType: joinRequestType, name: roomInfo.displayName ?? roomInfo.id, @@ -367,7 +367,7 @@ class RoomSummaryProvider: RoomSummaryProviderProtocol { MXLog.info("\(name): Rebuilding room summaries for \(rooms.count) rooms") rooms = rooms.map { - self.buildRoomSummary(from: $0.roomListItem) + self.buildRoomSummary(from: $0.room) } MXLog.info("\(name): Finished rebuilding room summaries (\(rooms.count) rooms)") diff --git a/UnitTests/Sources/HomeScreenRoomTests.swift b/UnitTests/Sources/HomeScreenRoomTests.swift index 7d292378d..389e89ccd 100644 --- a/UnitTests/Sources/HomeScreenRoomTests.swift +++ b/UnitTests/Sources/HomeScreenRoomTests.swift @@ -20,7 +20,7 @@ class HomeScreenRoomTests: XCTestCase { unreadNotificationsCount: UInt, notificationMode: RoomNotificationModeProxy, hasOngoingCall: Bool) { - roomSummary = RoomSummary(roomListItem: .init(noPointer: .init()), + roomSummary = RoomSummary(room: .init(noPointer: .init()), id: "Test room", joinRequestType: nil, name: "Test room", diff --git a/UnitTests/Sources/LoggingTests.swift b/UnitTests/Sources/LoggingTests.swift index 64236171c..2e55053e7 100644 --- a/UnitTests/Sources/LoggingTests.swift +++ b/UnitTests/Sources/LoggingTests.swift @@ -78,7 +78,7 @@ class LoggingTests: XCTestCase { let roomName = "Private Conversation" let lastMessage = "Secret information" let heroName = "Pseudonym" - let roomSummary = RoomSummary(roomListItem: .init(noPointer: .init()), + let roomSummary = RoomSummary(room: .init(noPointer: .init()), id: "myroomid", joinRequestType: nil, name: roomName, diff --git a/UnitTests/Sources/RoomSummaryTests.swift b/UnitTests/Sources/RoomSummaryTests.swift index 0226d1756..f4bec212d 100644 --- a/UnitTests/Sources/RoomSummaryTests.swift +++ b/UnitTests/Sources/RoomSummaryTests.swift @@ -54,7 +54,7 @@ class RoomSummaryTests: XCTestCase { // MARK: - Helpers func makeSummary(isDirect: Bool, hasRoomAvatar: Bool) -> RoomSummary { - RoomSummary(roomListItem: .init(noPointer: .init()), + RoomSummary(room: .init(noPointer: .init()), id: roomDetails.id, joinRequestType: nil, name: roomDetails.name, diff --git a/project.yml b/project.yml index caf24eeee..a14ed94cc 100644 --- a/project.yml +++ b/project.yml @@ -65,7 +65,7 @@ packages: # Element/Matrix dependencies MatrixRustSDK: url: https://github.com/element-hq/matrix-rust-components-swift - exactVersion: 25.05.26 + exactVersion: 25.05.26-2 # path: ../matrix-rust-sdk Compound: url: https://github.com/element-hq/compound-ios