From bf533e05729018cb6b1fff37f7fafb225bd6d0d9 Mon Sep 17 00:00:00 2001 From: Doug <6060466+pixlwave@users.noreply.github.com> Date: Mon, 3 Nov 2025 19:09:31 +0000 Subject: [PATCH] Fix a potential bug where the token couldn't be refreshed when the cached server `/versions` had expired. (#4687) * Update SDK mocks for UniFFI 0.30.0 * Update the SDK. * Update the SDK again Includes a temporary workaround that patches the SDK's generated Swift files so that our tests don't crash: https://github.com/element-hq/matrix-rust-components-swift/commit/3f0075fb8acaf202755512dfbafc28024e5125b2 --- ElementX.xcodeproj/project.pbxproj | 75 +- .../xcshareddata/swiftpm/Package.resolved | 4 +- .../Mocks/Generated/SDKGeneratedMocks.swift | 1471 +++++++++++------ .../View/MessageForwardingScreen.swift | 2 +- .../AuthenticationClientFactory.swift | 5 +- .../MockTimelineController.swift | 2 +- .../Services/Timeline/TimelineItemProxy.swift | 2 +- .../UserSession/UserSessionStore.swift | 6 +- NSE/Sources/NSEUserSession.swift | 6 +- Tools/Sourcery/SDKAutoMockable.stencil | 6 +- UnitTests/Sources/HomeScreenRoomTests.swift | 2 +- UnitTests/Sources/LoggingTests.swift | 8 +- ...essageForwardingScreenViewModelTests.swift | 2 +- .../Sources/RoomSummaryProviderTests.swift | 2 +- UnitTests/Sources/RoomSummaryTests.swift | 2 +- project.yml | 2 +- 16 files changed, 1062 insertions(+), 535 deletions(-) diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj index 4a10b8304..c827b8fcc 100644 --- a/ElementX.xcodeproj/project.pbxproj +++ b/ElementX.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 63; + objectVersion = 77; objects = { /* Begin PBXAggregateTarget section */ @@ -1521,7 +1521,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 = ""; }; @@ -1601,7 +1601,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 = ""; }; @@ -1621,7 +1621,7 @@ 16D09C79746BDCD9173EB3A7 /* RoomDetailsEditScreenModels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomDetailsEditScreenModels.swift; sourceTree = ""; }; 16D353E10A64172D863769BF /* TombstonedAvatarImage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TombstonedAvatarImage.swift; sourceTree = ""; }; 1715E3D7F53C0748AA50C91C /* PostHogAnalyticsClient.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PostHogAnalyticsClient.swift; sourceTree = ""; }; - 174E4AEF3DED300AA81046EC /* compound-ios */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "compound-ios"; sourceTree = SOURCE_ROOT; }; + 174E4AEF3DED300AA81046EC /* compound-ios */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "compound-ios"; path = "compound-ios"; sourceTree = SOURCE_ROOT; }; 17A8AA0DFA06012A9DAB951E /* TimelineProxyMock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimelineProxyMock.swift; sourceTree = ""; }; 17BAE25A0E9E9F2F1BBA8930 /* DeactivateAccountScreenViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeactivateAccountScreenViewModel.swift; sourceTree = ""; }; 181CF280BC8E3F335AFCB4B8 /* RemotePreferenceTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RemotePreferenceTests.swift; sourceTree = ""; }; @@ -1711,7 +1711,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 = ""; }; @@ -1794,7 +1794,7 @@ 355C8C46DA9C0B45F1B7FC4F /* SpaceRoomProxy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SpaceRoomProxy.swift; sourceTree = ""; }; 35A057BA9BE0F079784CD061 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = ""; }; 35AFCF4C05DEED04E3DB1A16 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Localizable.strings; 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 = ""; }; 3747C96188856006F784BF49 /* ko */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = ko; path = ko.lproj/Localizable.stringsdict; sourceTree = ""; }; 37A63A59BFDDC494B1C20119 /* CallScreenViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CallScreenViewModel.swift; sourceTree = ""; }; @@ -1907,7 +1907,7 @@ 4A2B5274C1D3D2999D643786 /* EncryptionResetPasswordScreenViewModelProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EncryptionResetPasswordScreenViewModelProtocol.swift; sourceTree = ""; }; 4A5B4CD611DE7E94F5BA87B2 /* AppLockTimerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppLockTimerTests.swift; sourceTree = ""; }; 4AB29A2D95D3469B5F016655 /* SecureBackupControllerMock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecureBackupControllerMock.swift; sourceTree = ""; }; - 4B1F71AC585827E6C416C15A /* AppIcon.icon */ = {isa = PBXFileReference; lastKnownFileType = folder.iconcomposer.icon; path = AppIcon.icon; sourceTree = ""; }; + 4B1F71AC585827E6C416C15A /* AppIcon.icon */ = {isa = PBXFileReference; path = AppIcon.icon; sourceTree = ""; }; 4B2B564CA6570E1487A7C7CC /* SpaceRoomListProxy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SpaceRoomListProxy.swift; sourceTree = ""; }; 4B2D4EEBE8C098BBADD10939 /* SecureBackupKeyBackupScreenCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecureBackupKeyBackupScreenCoordinator.swift; sourceTree = ""; }; 4B41FABA2B0AEF4389986495 /* LoginMode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginMode.swift; sourceTree = ""; }; @@ -1921,7 +1921,7 @@ 4E2245243369B99216C7D84E /* ImageCache.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageCache.swift; sourceTree = ""; }; 4E600B315B920B9687F8EE1B /* ComposerDraftServiceMock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposerDraftServiceMock.swift; sourceTree = ""; }; 4E625B0EB2F86B37C14EF7E6 /* SettingsScreenViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsScreenViewModel.swift; sourceTree = ""; }; - 4E6690212271866C899AD2BA /* new-message.caf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "new-message.caf"; sourceTree = ""; }; + 4E6690212271866C899AD2BA /* new-message.caf */ = {isa = PBXFileReference; path = "new-message.caf"; sourceTree = ""; }; 4E7F7A975514E850A834B29F /* PaginationIndicatorRoomTimelineView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PaginationIndicatorRoomTimelineView.swift; sourceTree = ""; }; 4F5F0662483ED69791D63B16 /* et */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = et; path = et.lproj/Localizable.stringsdict; sourceTree = ""; }; 4F75EF13F49DD2204E760910 /* FileRoomTimelineView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FileRoomTimelineView.swift; sourceTree = ""; }; @@ -2237,7 +2237,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 = ""; }; @@ -2383,7 +2383,7 @@ AAD8234D0E9C9B12BF9F240B /* LocationAnnotation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocationAnnotation.swift; sourceTree = ""; }; AB07F03461023BC39C730922 /* PhishingDetector.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhishingDetector.swift; sourceTree = ""; }; AB26D5444A4A7E095222DE8B /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = "zh-Hans"; path = "zh-Hans.lproj/Localizable.stringsdict"; sourceTree = ""; }; - AB389C38BD41EB3E47092CFB /* AccessibilityTests.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = AccessibilityTests.xctestplan; sourceTree = ""; }; + AB389C38BD41EB3E47092CFB /* AccessibilityTests.xctestplan */ = {isa = PBXFileReference; path = AccessibilityTests.xctestplan; sourceTree = ""; }; ABA4CF2F5B4F68D02E412004 /* ServerConfirmationScreenViewModelProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ServerConfirmationScreenViewModelProtocol.swift; sourceTree = ""; }; AC0275CEE9CA078B34028BDF /* AppLockScreenViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppLockScreenViewModelTests.swift; sourceTree = ""; }; AC1DA29A5A041CC0BACA7CB0 /* MockImageCache.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockImageCache.swift; sourceTree = ""; }; @@ -2451,7 +2451,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 = ""; }; B6404166CBF5CC88673FF9E2 /* RoomDetails.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomDetails.swift; sourceTree = ""; }; B65DDCF8E41759890355ACBC /* AuthenticationStartScreenViewModelProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthenticationStartScreenViewModelProtocol.swift; sourceTree = ""; }; B682FE2C44C5E163E7023B05 /* CopyTextButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CopyTextButton.swift; sourceTree = ""; }; @@ -2481,7 +2481,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 = ""; }; @@ -2585,7 +2585,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 = ""; }; CF19027E7FFA5E63D148873A /* CreateRoomScreenViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CreateRoomScreenViewModel.swift; sourceTree = ""; }; CF847A34FC4C8C937CD39E08 /* LabsScreenViewModelProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LabsScreenViewModelProtocol.swift; sourceTree = ""; }; CFFA5E881D281810AB428EA3 /* RoomPowerLevelsProxy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomPowerLevelsProxy.swift; sourceTree = ""; }; @@ -2654,7 +2654,7 @@ 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 = ""; }; @@ -2701,7 +2701,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 = ""; }; @@ -2748,7 +2748,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 = ""; }; EDDE826EAB1BAB80C1104980 /* SpaceFlowCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SpaceFlowCoordinator.swift; sourceTree = ""; }; @@ -5842,13 +5842,6 @@ path = MapLibre; sourceTree = ""; }; - C18958141C8ED6D778F779A4 /* CreateRoom */ = { - isa = PBXGroup; - children = ( - ); - path = CreateRoom; - sourceTree = ""; - }; C1CD278862878F9545608040 /* SessionVerificationScreen */ = { isa = PBXGroup; children = ( @@ -6231,7 +6224,6 @@ 53FB148CD26AFB6A5B9E20B3 /* BugReportScreen */, 1185EECDD07495D65AC84AFC /* CallScreen */, 90DC2E28718955ED87AD1456 /* CreatePollScreen */, - C18958141C8ED6D778F779A4 /* CreateRoom */, 821EB0D1C0019E3C7BBAEDBB /* CreateRoomScreen */, 3E1CCC4B607946CE90B4A827 /* DeclineAndBlockScreen */, 45F2BCFD6E9A6F040CC20582 /* EditRoomAddressScreen */, @@ -6966,6 +6958,7 @@ EE40B0E16A55BD23ECBFFD22 /* XCRemoteSwiftPackageReference "matrix-rich-text-editor-swift" */, C89CF7729E028671C5DC461E /* XCLocalSwiftPackageReference "compound-ios" */, ); + preferredProjectObjectVersion = 77; projectDirPath = ""; projectRoot = ""; targets = ( @@ -8783,7 +8776,9 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - OTHER_SWIFT_FLAGS = "-DRELEASE"; + OTHER_SWIFT_FLAGS = ( + "-DRELEASE", + ); PRODUCT_BUNDLE_IDENTIFIER = "${BASE_BUNDLE_IDENTIFIER}.accessibility.tests"; PRODUCT_NAME = AccessibilityTests; SDKROOT = iphoneos; @@ -8802,7 +8797,9 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - OTHER_SWIFT_FLAGS = "-DDEBUG"; + OTHER_SWIFT_FLAGS = ( + "-DDEBUG", + ); PRODUCT_BUNDLE_IDENTIFIER = "${BASE_BUNDLE_IDENTIFIER}.accessibility.tests"; PRODUCT_NAME = AccessibilityTests; SDKROOT = iphoneos; @@ -8824,7 +8821,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; @@ -8873,7 +8872,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)"; @@ -8899,7 +8900,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)"; @@ -9124,7 +9127,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; @@ -9143,7 +9148,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; @@ -9165,7 +9172,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; @@ -9420,7 +9429,7 @@ repositoryURL = "https://github.com/element-hq/matrix-rust-components-swift"; requirement = { kind = exactVersion; - version = 25.10.27; + version = 25.11.03; }; }; 701C7BEF8F70F7A83E852DCC /* XCRemoteSwiftPackageReference "GZIP" */ = { diff --git a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 9ac6ba3aa..57a8593a5 100644 --- a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -149,8 +149,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/element-hq/matrix-rust-components-swift", "state" : { - "revision" : "496a5e7846f81180cb6a0b5c5b74dc88e096fc0c", - "version" : "25.10.27" + "revision" : "0c991f498db5d7f8296472f28bd933b249382717", + "version" : "25.11.3" } }, { diff --git a/ElementX/Sources/Mocks/Generated/SDKGeneratedMocks.swift b/ElementX/Sources/Mocks/Generated/SDKGeneratedMocks.swift index a50a97e62..082c7a8d8 100644 --- a/ElementX/Sources/Mocks/Generated/SDKGeneratedMocks.swift +++ b/ElementX/Sources/Mocks/Generated/SDKGeneratedMocks.swift @@ -8,14 +8,18 @@ import Foundation open class CheckCodeSenderSDKMock: MatrixRustSDK.CheckCodeSender, @unchecked Sendable { init() { - super.init(noPointer: .init()) + super.init(noHandle: .init()) } - public required init(unsafeFromRawPointer pointer: UnsafeMutableRawPointer) { - fatalError("init(unsafeFromRawPointer:) has not been implemented") + public required init(unsafeFromHandle handle: UInt64) { + fatalError("init(unsafeFromHandle:) has not been implemented") } - fileprivate var pointer: UnsafeMutableRawPointer! + fileprivate var handle: UInt64 { + get { return underlyingHandle } + set(value) { underlyingHandle = value } + } + fileprivate var underlyingHandle: UInt64! //MARK: - send @@ -65,14 +69,18 @@ open class CheckCodeSenderSDKMock: MatrixRustSDK.CheckCodeSender, @unchecked Sen } open class ClientSDKMock: MatrixRustSDK.Client, @unchecked Sendable { init() { - super.init(noPointer: .init()) + super.init(noHandle: .init()) } - public required init(unsafeFromRawPointer pointer: UnsafeMutableRawPointer) { - fatalError("init(unsafeFromRawPointer:) has not been implemented") + public required init(unsafeFromHandle handle: UInt64) { + fatalError("init(unsafeFromHandle:) has not been implemented") } - fileprivate var pointer: UnsafeMutableRawPointer! + fileprivate var handle: UInt64 { + get { return underlyingHandle } + set(value) { underlyingHandle = value } + } + fileprivate var underlyingHandle: UInt64! //MARK: - abortOidcAuth @@ -5769,14 +5777,18 @@ open class ClientSDKMock: MatrixRustSDK.Client, @unchecked Sendable { } open class ClientBuilderSDKMock: MatrixRustSDK.ClientBuilder, @unchecked Sendable { init() { - super.init(noPointer: .init()) + super.init(noHandle: .init()) } - public required init(unsafeFromRawPointer pointer: UnsafeMutableRawPointer) { - fatalError("init(unsafeFromRawPointer:) has not been implemented") + public required init(unsafeFromHandle handle: UInt64) { + fatalError("init(unsafeFromHandle:) has not been implemented") } - fileprivate var pointer: UnsafeMutableRawPointer! + fileprivate var handle: UInt64 { + get { return underlyingHandle } + set(value) { underlyingHandle = value } + } + fileprivate var underlyingHandle: UInt64! //MARK: - addRootCertificates @@ -6675,6 +6687,71 @@ open class ClientBuilderSDKMock: MatrixRustSDK.ClientBuilder, @unchecked Sendabl } } + //MARK: - inMemoryStore + + var inMemoryStoreUnderlyingCallsCount = 0 + open var inMemoryStoreCallsCount: Int { + get { + if Thread.isMainThread { + return inMemoryStoreUnderlyingCallsCount + } else { + var returnValue: Int? = nil + DispatchQueue.main.sync { + returnValue = inMemoryStoreUnderlyingCallsCount + } + + return returnValue! + } + } + set { + if Thread.isMainThread { + inMemoryStoreUnderlyingCallsCount = newValue + } else { + DispatchQueue.main.sync { + inMemoryStoreUnderlyingCallsCount = newValue + } + } + } + } + open var inMemoryStoreCalled: Bool { + return inMemoryStoreCallsCount > 0 + } + + var inMemoryStoreUnderlyingReturnValue: ClientBuilder! + open var inMemoryStoreReturnValue: ClientBuilder! { + get { + if Thread.isMainThread { + return inMemoryStoreUnderlyingReturnValue + } else { + var returnValue: ClientBuilder? = nil + DispatchQueue.main.sync { + returnValue = inMemoryStoreUnderlyingReturnValue + } + + return returnValue! + } + } + set { + if Thread.isMainThread { + inMemoryStoreUnderlyingReturnValue = newValue + } else { + DispatchQueue.main.sync { + inMemoryStoreUnderlyingReturnValue = newValue + } + } + } + } + open var inMemoryStoreClosure: (() -> ClientBuilder)? + + open override func inMemoryStore() -> ClientBuilder { + inMemoryStoreCallsCount += 1 + if let inMemoryStoreClosure = inMemoryStoreClosure { + return inMemoryStoreClosure() + } else { + return inMemoryStoreReturnValue + } + } + //MARK: - proxy var proxyUrlUnderlyingCallsCount = 0 @@ -7030,219 +7107,6 @@ open class ClientBuilderSDKMock: MatrixRustSDK.ClientBuilder, @unchecked Sendabl } } - //MARK: - sessionCacheSize - - var sessionCacheSizeCacheSizeUnderlyingCallsCount = 0 - open var sessionCacheSizeCacheSizeCallsCount: Int { - get { - if Thread.isMainThread { - return sessionCacheSizeCacheSizeUnderlyingCallsCount - } else { - var returnValue: Int? = nil - DispatchQueue.main.sync { - returnValue = sessionCacheSizeCacheSizeUnderlyingCallsCount - } - - return returnValue! - } - } - set { - if Thread.isMainThread { - sessionCacheSizeCacheSizeUnderlyingCallsCount = newValue - } else { - DispatchQueue.main.sync { - sessionCacheSizeCacheSizeUnderlyingCallsCount = newValue - } - } - } - } - open var sessionCacheSizeCacheSizeCalled: Bool { - return sessionCacheSizeCacheSizeCallsCount > 0 - } - open var sessionCacheSizeCacheSizeReceivedCacheSize: UInt32? - open var sessionCacheSizeCacheSizeReceivedInvocations: [UInt32?] = [] - - var sessionCacheSizeCacheSizeUnderlyingReturnValue: ClientBuilder! - open var sessionCacheSizeCacheSizeReturnValue: ClientBuilder! { - get { - if Thread.isMainThread { - return sessionCacheSizeCacheSizeUnderlyingReturnValue - } else { - var returnValue: ClientBuilder? = nil - DispatchQueue.main.sync { - returnValue = sessionCacheSizeCacheSizeUnderlyingReturnValue - } - - return returnValue! - } - } - set { - if Thread.isMainThread { - sessionCacheSizeCacheSizeUnderlyingReturnValue = newValue - } else { - DispatchQueue.main.sync { - sessionCacheSizeCacheSizeUnderlyingReturnValue = newValue - } - } - } - } - open var sessionCacheSizeCacheSizeClosure: ((UInt32?) -> ClientBuilder)? - - open override func sessionCacheSize(cacheSize: UInt32?) -> ClientBuilder { - sessionCacheSizeCacheSizeCallsCount += 1 - sessionCacheSizeCacheSizeReceivedCacheSize = cacheSize - DispatchQueue.main.async { - self.sessionCacheSizeCacheSizeReceivedInvocations.append(cacheSize) - } - if let sessionCacheSizeCacheSizeClosure = sessionCacheSizeCacheSizeClosure { - return sessionCacheSizeCacheSizeClosure(cacheSize) - } else { - return sessionCacheSizeCacheSizeReturnValue - } - } - - //MARK: - sessionJournalSizeLimit - - var sessionJournalSizeLimitLimitUnderlyingCallsCount = 0 - open var sessionJournalSizeLimitLimitCallsCount: Int { - get { - if Thread.isMainThread { - return sessionJournalSizeLimitLimitUnderlyingCallsCount - } else { - var returnValue: Int? = nil - DispatchQueue.main.sync { - returnValue = sessionJournalSizeLimitLimitUnderlyingCallsCount - } - - return returnValue! - } - } - set { - if Thread.isMainThread { - sessionJournalSizeLimitLimitUnderlyingCallsCount = newValue - } else { - DispatchQueue.main.sync { - sessionJournalSizeLimitLimitUnderlyingCallsCount = newValue - } - } - } - } - open var sessionJournalSizeLimitLimitCalled: Bool { - return sessionJournalSizeLimitLimitCallsCount > 0 - } - open var sessionJournalSizeLimitLimitReceivedLimit: UInt32? - open var sessionJournalSizeLimitLimitReceivedInvocations: [UInt32?] = [] - - var sessionJournalSizeLimitLimitUnderlyingReturnValue: ClientBuilder! - open var sessionJournalSizeLimitLimitReturnValue: ClientBuilder! { - get { - if Thread.isMainThread { - return sessionJournalSizeLimitLimitUnderlyingReturnValue - } else { - var returnValue: ClientBuilder? = nil - DispatchQueue.main.sync { - returnValue = sessionJournalSizeLimitLimitUnderlyingReturnValue - } - - return returnValue! - } - } - set { - if Thread.isMainThread { - sessionJournalSizeLimitLimitUnderlyingReturnValue = newValue - } else { - DispatchQueue.main.sync { - sessionJournalSizeLimitLimitUnderlyingReturnValue = newValue - } - } - } - } - open var sessionJournalSizeLimitLimitClosure: ((UInt32?) -> ClientBuilder)? - - open override func sessionJournalSizeLimit(limit: UInt32?) -> ClientBuilder { - sessionJournalSizeLimitLimitCallsCount += 1 - sessionJournalSizeLimitLimitReceivedLimit = limit - DispatchQueue.main.async { - self.sessionJournalSizeLimitLimitReceivedInvocations.append(limit) - } - if let sessionJournalSizeLimitLimitClosure = sessionJournalSizeLimitLimitClosure { - return sessionJournalSizeLimitLimitClosure(limit) - } else { - return sessionJournalSizeLimitLimitReturnValue - } - } - - //MARK: - sessionPassphrase - - var sessionPassphrasePassphraseUnderlyingCallsCount = 0 - open var sessionPassphrasePassphraseCallsCount: Int { - get { - if Thread.isMainThread { - return sessionPassphrasePassphraseUnderlyingCallsCount - } else { - var returnValue: Int? = nil - DispatchQueue.main.sync { - returnValue = sessionPassphrasePassphraseUnderlyingCallsCount - } - - return returnValue! - } - } - set { - if Thread.isMainThread { - sessionPassphrasePassphraseUnderlyingCallsCount = newValue - } else { - DispatchQueue.main.sync { - sessionPassphrasePassphraseUnderlyingCallsCount = newValue - } - } - } - } - open var sessionPassphrasePassphraseCalled: Bool { - return sessionPassphrasePassphraseCallsCount > 0 - } - open var sessionPassphrasePassphraseReceivedPassphrase: String? - open var sessionPassphrasePassphraseReceivedInvocations: [String?] = [] - - var sessionPassphrasePassphraseUnderlyingReturnValue: ClientBuilder! - open var sessionPassphrasePassphraseReturnValue: ClientBuilder! { - get { - if Thread.isMainThread { - return sessionPassphrasePassphraseUnderlyingReturnValue - } else { - var returnValue: ClientBuilder? = nil - DispatchQueue.main.sync { - returnValue = sessionPassphrasePassphraseUnderlyingReturnValue - } - - return returnValue! - } - } - set { - if Thread.isMainThread { - sessionPassphrasePassphraseUnderlyingReturnValue = newValue - } else { - DispatchQueue.main.sync { - sessionPassphrasePassphraseUnderlyingReturnValue = newValue - } - } - } - } - open var sessionPassphrasePassphraseClosure: ((String?) -> ClientBuilder)? - - open override func sessionPassphrase(passphrase: String?) -> ClientBuilder { - sessionPassphrasePassphraseCallsCount += 1 - sessionPassphrasePassphraseReceivedPassphrase = passphrase - DispatchQueue.main.async { - self.sessionPassphrasePassphraseReceivedInvocations.append(passphrase) - } - if let sessionPassphrasePassphraseClosure = sessionPassphrasePassphraseClosure { - return sessionPassphrasePassphraseClosure(passphrase) - } else { - return sessionPassphrasePassphraseReturnValue - } - } - //MARK: - sessionPaths var sessionPathsDataPathCachePathUnderlyingCallsCount = 0 @@ -7314,77 +7178,6 @@ open class ClientBuilderSDKMock: MatrixRustSDK.ClientBuilder, @unchecked Sendabl } } - //MARK: - sessionPoolMaxSize - - var sessionPoolMaxSizePoolMaxSizeUnderlyingCallsCount = 0 - open var sessionPoolMaxSizePoolMaxSizeCallsCount: Int { - get { - if Thread.isMainThread { - return sessionPoolMaxSizePoolMaxSizeUnderlyingCallsCount - } else { - var returnValue: Int? = nil - DispatchQueue.main.sync { - returnValue = sessionPoolMaxSizePoolMaxSizeUnderlyingCallsCount - } - - return returnValue! - } - } - set { - if Thread.isMainThread { - sessionPoolMaxSizePoolMaxSizeUnderlyingCallsCount = newValue - } else { - DispatchQueue.main.sync { - sessionPoolMaxSizePoolMaxSizeUnderlyingCallsCount = newValue - } - } - } - } - open var sessionPoolMaxSizePoolMaxSizeCalled: Bool { - return sessionPoolMaxSizePoolMaxSizeCallsCount > 0 - } - open var sessionPoolMaxSizePoolMaxSizeReceivedPoolMaxSize: UInt32? - open var sessionPoolMaxSizePoolMaxSizeReceivedInvocations: [UInt32?] = [] - - var sessionPoolMaxSizePoolMaxSizeUnderlyingReturnValue: ClientBuilder! - open var sessionPoolMaxSizePoolMaxSizeReturnValue: ClientBuilder! { - get { - if Thread.isMainThread { - return sessionPoolMaxSizePoolMaxSizeUnderlyingReturnValue - } else { - var returnValue: ClientBuilder? = nil - DispatchQueue.main.sync { - returnValue = sessionPoolMaxSizePoolMaxSizeUnderlyingReturnValue - } - - return returnValue! - } - } - set { - if Thread.isMainThread { - sessionPoolMaxSizePoolMaxSizeUnderlyingReturnValue = newValue - } else { - DispatchQueue.main.sync { - sessionPoolMaxSizePoolMaxSizeUnderlyingReturnValue = newValue - } - } - } - } - open var sessionPoolMaxSizePoolMaxSizeClosure: ((UInt32?) -> ClientBuilder)? - - open override func sessionPoolMaxSize(poolMaxSize: UInt32?) -> ClientBuilder { - sessionPoolMaxSizePoolMaxSizeCallsCount += 1 - sessionPoolMaxSizePoolMaxSizeReceivedPoolMaxSize = poolMaxSize - DispatchQueue.main.async { - self.sessionPoolMaxSizePoolMaxSizeReceivedInvocations.append(poolMaxSize) - } - if let sessionPoolMaxSizePoolMaxSizeClosure = sessionPoolMaxSizePoolMaxSizeClosure { - return sessionPoolMaxSizePoolMaxSizeClosure(poolMaxSize) - } else { - return sessionPoolMaxSizePoolMaxSizeReturnValue - } - } - //MARK: - setSessionDelegate var setSessionDelegateSessionDelegateUnderlyingCallsCount = 0 @@ -7527,6 +7320,77 @@ open class ClientBuilderSDKMock: MatrixRustSDK.ClientBuilder, @unchecked Sendabl } } + //MARK: - sqliteStore + + var sqliteStoreConfigUnderlyingCallsCount = 0 + open var sqliteStoreConfigCallsCount: Int { + get { + if Thread.isMainThread { + return sqliteStoreConfigUnderlyingCallsCount + } else { + var returnValue: Int? = nil + DispatchQueue.main.sync { + returnValue = sqliteStoreConfigUnderlyingCallsCount + } + + return returnValue! + } + } + set { + if Thread.isMainThread { + sqliteStoreConfigUnderlyingCallsCount = newValue + } else { + DispatchQueue.main.sync { + sqliteStoreConfigUnderlyingCallsCount = newValue + } + } + } + } + open var sqliteStoreConfigCalled: Bool { + return sqliteStoreConfigCallsCount > 0 + } + open var sqliteStoreConfigReceivedConfig: SqliteStoreBuilder? + open var sqliteStoreConfigReceivedInvocations: [SqliteStoreBuilder] = [] + + var sqliteStoreConfigUnderlyingReturnValue: ClientBuilder! + open var sqliteStoreConfigReturnValue: ClientBuilder! { + get { + if Thread.isMainThread { + return sqliteStoreConfigUnderlyingReturnValue + } else { + var returnValue: ClientBuilder? = nil + DispatchQueue.main.sync { + returnValue = sqliteStoreConfigUnderlyingReturnValue + } + + return returnValue! + } + } + set { + if Thread.isMainThread { + sqliteStoreConfigUnderlyingReturnValue = newValue + } else { + DispatchQueue.main.sync { + sqliteStoreConfigUnderlyingReturnValue = newValue + } + } + } + } + open var sqliteStoreConfigClosure: ((SqliteStoreBuilder) -> ClientBuilder)? + + open override func sqliteStore(config: SqliteStoreBuilder) -> ClientBuilder { + sqliteStoreConfigCallsCount += 1 + sqliteStoreConfigReceivedConfig = config + DispatchQueue.main.async { + self.sqliteStoreConfigReceivedInvocations.append(config) + } + if let sqliteStoreConfigClosure = sqliteStoreConfigClosure { + return sqliteStoreConfigClosure(config) + } else { + return sqliteStoreConfigReturnValue + } + } + //MARK: - systemIsMemoryConstrained var systemIsMemoryConstrainedUnderlyingCallsCount = 0 @@ -7807,14 +7671,18 @@ open class ClientBuilderSDKMock: MatrixRustSDK.ClientBuilder, @unchecked Sendabl } open class EncryptionSDKMock: MatrixRustSDK.Encryption, @unchecked Sendable { init() { - super.init(noPointer: .init()) + super.init(noHandle: .init()) } - public required init(unsafeFromRawPointer pointer: UnsafeMutableRawPointer) { - fatalError("init(unsafeFromRawPointer:) has not been implemented") + public required init(unsafeFromHandle handle: UInt64) { + fatalError("init(unsafeFromHandle:) has not been implemented") } - fileprivate var pointer: UnsafeMutableRawPointer! + fileprivate var handle: UInt64 { + get { return underlyingHandle } + set(value) { underlyingHandle = value } + } + fileprivate var underlyingHandle: UInt64! //MARK: - backupExistsOnServer @@ -9134,14 +9002,18 @@ open class EncryptionSDKMock: MatrixRustSDK.Encryption, @unchecked Sendable { } open class HomeserverLoginDetailsSDKMock: MatrixRustSDK.HomeserverLoginDetails, @unchecked Sendable { init() { - super.init(noPointer: .init()) + super.init(noHandle: .init()) } - public required init(unsafeFromRawPointer pointer: UnsafeMutableRawPointer) { - fatalError("init(unsafeFromRawPointer:) has not been implemented") + public required init(unsafeFromHandle handle: UInt64) { + fatalError("init(unsafeFromHandle:) has not been implemented") } - fileprivate var pointer: UnsafeMutableRawPointer! + fileprivate var handle: UInt64 { + get { return underlyingHandle } + set(value) { underlyingHandle = value } + } + fileprivate var underlyingHandle: UInt64! //MARK: - slidingSyncVersion @@ -9535,14 +9407,18 @@ open class HomeserverLoginDetailsSDKMock: MatrixRustSDK.HomeserverLoginDetails, } open class IdentityResetHandleSDKMock: MatrixRustSDK.IdentityResetHandle, @unchecked Sendable { init() { - super.init(noPointer: .init()) + super.init(noHandle: .init()) } - public required init(unsafeFromRawPointer pointer: UnsafeMutableRawPointer) { - fatalError("init(unsafeFromRawPointer:) has not been implemented") + public required init(unsafeFromHandle handle: UInt64) { + fatalError("init(unsafeFromHandle:) has not been implemented") } - fileprivate var pointer: UnsafeMutableRawPointer! + fileprivate var handle: UInt64 { + get { return underlyingHandle } + set(value) { underlyingHandle = value } + } + fileprivate var underlyingHandle: UInt64! //MARK: - authType @@ -9693,14 +9569,18 @@ open class IdentityResetHandleSDKMock: MatrixRustSDK.IdentityResetHandle, @unche } open class InReplyToDetailsSDKMock: MatrixRustSDK.InReplyToDetails, @unchecked Sendable { init() { - super.init(noPointer: .init()) + super.init(noHandle: .init()) } - public required init(unsafeFromRawPointer pointer: UnsafeMutableRawPointer) { - fatalError("init(unsafeFromRawPointer:) has not been implemented") + public required init(unsafeFromHandle handle: UInt64) { + fatalError("init(unsafeFromHandle:) has not been implemented") } - fileprivate var pointer: UnsafeMutableRawPointer! + fileprivate var handle: UInt64 { + get { return underlyingHandle } + set(value) { underlyingHandle = value } + } + fileprivate var underlyingHandle: UInt64! //MARK: - event @@ -9834,14 +9714,18 @@ open class InReplyToDetailsSDKMock: MatrixRustSDK.InReplyToDetails, @unchecked S } open class KnockRequestActionsSDKMock: MatrixRustSDK.KnockRequestActions, @unchecked Sendable { init() { - super.init(noPointer: .init()) + super.init(noHandle: .init()) } - public required init(unsafeFromRawPointer pointer: UnsafeMutableRawPointer) { - fatalError("init(unsafeFromRawPointer:) has not been implemented") + public required init(unsafeFromHandle handle: UInt64) { + fatalError("init(unsafeFromHandle:) has not been implemented") } - fileprivate var pointer: UnsafeMutableRawPointer! + fileprivate var handle: UInt64 { + get { return underlyingHandle } + set(value) { underlyingHandle = value } + } + fileprivate var underlyingHandle: UInt64! //MARK: - accept @@ -10017,14 +9901,18 @@ open class KnockRequestActionsSDKMock: MatrixRustSDK.KnockRequestActions, @unche } open class LazyTimelineItemProviderSDKMock: MatrixRustSDK.LazyTimelineItemProvider, @unchecked Sendable { init() { - super.init(noPointer: .init()) + super.init(noHandle: .init()) } - public required init(unsafeFromRawPointer pointer: UnsafeMutableRawPointer) { - fatalError("init(unsafeFromRawPointer:) has not been implemented") + public required init(unsafeFromHandle handle: UInt64) { + fatalError("init(unsafeFromHandle:) has not been implemented") } - fileprivate var pointer: UnsafeMutableRawPointer! + fileprivate var handle: UInt64 { + get { return underlyingHandle } + set(value) { underlyingHandle = value } + } + fileprivate var underlyingHandle: UInt64! //MARK: - containsOnlyEmojis @@ -10294,14 +10182,18 @@ open class LazyTimelineItemProviderSDKMock: MatrixRustSDK.LazyTimelineItemProvid } open class LeaveSpaceHandleSDKMock: MatrixRustSDK.LeaveSpaceHandle, @unchecked Sendable { init() { - super.init(noPointer: .init()) + super.init(noHandle: .init()) } - public required init(unsafeFromRawPointer pointer: UnsafeMutableRawPointer) { - fatalError("init(unsafeFromRawPointer:) has not been implemented") + public required init(unsafeFromHandle handle: UInt64) { + fatalError("init(unsafeFromHandle:) has not been implemented") } - fileprivate var pointer: UnsafeMutableRawPointer! + fileprivate var handle: UInt64 { + get { return underlyingHandle } + set(value) { underlyingHandle = value } + } + fileprivate var underlyingHandle: UInt64! //MARK: - leave @@ -10416,14 +10308,18 @@ open class LeaveSpaceHandleSDKMock: MatrixRustSDK.LeaveSpaceHandle, @unchecked S } open class LoginWithQrCodeHandlerSDKMock: MatrixRustSDK.LoginWithQrCodeHandler, @unchecked Sendable { init() { - super.init(noPointer: .init()) + super.init(noHandle: .init()) } - public required init(unsafeFromRawPointer pointer: UnsafeMutableRawPointer) { - fatalError("init(unsafeFromRawPointer:) has not been implemented") + public required init(unsafeFromHandle handle: UInt64) { + fatalError("init(unsafeFromHandle:) has not been implemented") } - fileprivate var pointer: UnsafeMutableRawPointer! + fileprivate var handle: UInt64 { + get { return underlyingHandle } + set(value) { underlyingHandle = value } + } + fileprivate var underlyingHandle: UInt64! //MARK: - generate @@ -10519,14 +10415,18 @@ open class LoginWithQrCodeHandlerSDKMock: MatrixRustSDK.LoginWithQrCodeHandler, } open class MediaFileHandleSDKMock: MatrixRustSDK.MediaFileHandle, @unchecked Sendable { init() { - super.init(noPointer: .init()) + super.init(noHandle: .init()) } - public required init(unsafeFromRawPointer pointer: UnsafeMutableRawPointer) { - fatalError("init(unsafeFromRawPointer:) has not been implemented") + public required init(unsafeFromHandle handle: UInt64) { + fatalError("init(unsafeFromHandle:) has not been implemented") } - fileprivate var pointer: UnsafeMutableRawPointer! + fileprivate var handle: UInt64 { + get { return underlyingHandle } + set(value) { underlyingHandle = value } + } + fileprivate var underlyingHandle: UInt64! //MARK: - path @@ -10674,14 +10574,18 @@ open class MediaFileHandleSDKMock: MatrixRustSDK.MediaFileHandle, @unchecked Sen } open class MediaSourceSDKMock: MatrixRustSDK.MediaSource, @unchecked Sendable { init() { - super.init(noPointer: .init()) + super.init(noHandle: .init()) } - public required init(unsafeFromRawPointer pointer: UnsafeMutableRawPointer) { - fatalError("init(unsafeFromRawPointer:) has not been implemented") + public required init(unsafeFromHandle handle: UInt64) { + fatalError("init(unsafeFromHandle:) has not been implemented") } - fileprivate var pointer: UnsafeMutableRawPointer! + fileprivate var handle: UInt64 { + get { return underlyingHandle } + set(value) { underlyingHandle = value } + } + fileprivate var underlyingHandle: UInt64! static func reset() { } @@ -10818,14 +10722,18 @@ open class MediaSourceSDKMock: MatrixRustSDK.MediaSource, @unchecked Sendable { } open class NotificationClientSDKMock: MatrixRustSDK.NotificationClient, @unchecked Sendable { init() { - super.init(noPointer: .init()) + super.init(noHandle: .init()) } - public required init(unsafeFromRawPointer pointer: UnsafeMutableRawPointer) { - fatalError("init(unsafeFromRawPointer:) has not been implemented") + public required init(unsafeFromHandle handle: UInt64) { + fatalError("init(unsafeFromHandle:) has not been implemented") } - fileprivate var pointer: UnsafeMutableRawPointer! + fileprivate var handle: UInt64 { + get { return underlyingHandle } + set(value) { underlyingHandle = value } + } + fileprivate var underlyingHandle: UInt64! //MARK: - getNotification @@ -11054,14 +10962,18 @@ open class NotificationClientSDKMock: MatrixRustSDK.NotificationClient, @uncheck } open class NotificationSettingsSDKMock: MatrixRustSDK.NotificationSettings, @unchecked Sendable { init() { - super.init(noPointer: .init()) + super.init(noHandle: .init()) } - public required init(unsafeFromRawPointer pointer: UnsafeMutableRawPointer) { - fatalError("init(unsafeFromRawPointer:) has not been implemented") + public required init(unsafeFromHandle handle: UInt64) { + fatalError("init(unsafeFromHandle:) has not been implemented") } - fileprivate var pointer: UnsafeMutableRawPointer! + fileprivate var handle: UInt64 { + get { return underlyingHandle } + set(value) { underlyingHandle = value } + } + fileprivate var underlyingHandle: UInt64! //MARK: - canHomeserverPushEncryptedEventToDevice @@ -12353,14 +12265,18 @@ open class NotificationSettingsSDKMock: MatrixRustSDK.NotificationSettings, @unc } open class OAuthAuthorizationDataSDKMock: MatrixRustSDK.OAuthAuthorizationData, @unchecked Sendable { init() { - super.init(noPointer: .init()) + super.init(noHandle: .init()) } - public required init(unsafeFromRawPointer pointer: UnsafeMutableRawPointer) { - fatalError("init(unsafeFromRawPointer:) has not been implemented") + public required init(unsafeFromHandle handle: UInt64) { + fatalError("init(unsafeFromHandle:) has not been implemented") } - fileprivate var pointer: UnsafeMutableRawPointer! + fileprivate var handle: UInt64 { + get { return underlyingHandle } + set(value) { underlyingHandle = value } + } + fileprivate var underlyingHandle: UInt64! //MARK: - loginUrl @@ -12429,14 +12345,18 @@ open class OAuthAuthorizationDataSDKMock: MatrixRustSDK.OAuthAuthorizationData, } open class QrCodeDataSDKMock: MatrixRustSDK.QrCodeData, @unchecked Sendable { init() { - super.init(noPointer: .init()) + super.init(noHandle: .init()) } - public required init(unsafeFromRawPointer pointer: UnsafeMutableRawPointer) { - fatalError("init(unsafeFromRawPointer:) has not been implemented") + public required init(unsafeFromHandle handle: UInt64) { + fatalError("init(unsafeFromHandle:) has not been implemented") } - fileprivate var pointer: UnsafeMutableRawPointer! + fileprivate var handle: UInt64 { + get { return underlyingHandle } + set(value) { underlyingHandle = value } + } + fileprivate var underlyingHandle: UInt64! static func reset() { } @@ -12508,14 +12428,18 @@ open class QrCodeDataSDKMock: MatrixRustSDK.QrCodeData, @unchecked Sendable { } open class RoomSDKMock: MatrixRustSDK.Room, @unchecked Sendable { init() { - super.init(noPointer: .init()) + super.init(noHandle: .init()) } - public required init(unsafeFromRawPointer pointer: UnsafeMutableRawPointer) { - fatalError("init(unsafeFromRawPointer:) has not been implemented") + public required init(unsafeFromHandle handle: UInt64) { + fatalError("init(unsafeFromHandle:) has not been implemented") } - fileprivate var pointer: UnsafeMutableRawPointer! + fileprivate var handle: UInt64 { + get { return underlyingHandle } + set(value) { underlyingHandle = value } + } + fileprivate var underlyingHandle: UInt64! //MARK: - activeMembersCount @@ -14884,6 +14808,52 @@ open class RoomSDKMock: MatrixRustSDK.Room, @unchecked Sendable { } } + //MARK: - markAsFullyReadUnchecked + + open var markAsFullyReadUncheckedEventIdThrowableError: Error? + var markAsFullyReadUncheckedEventIdUnderlyingCallsCount = 0 + open var markAsFullyReadUncheckedEventIdCallsCount: Int { + get { + if Thread.isMainThread { + return markAsFullyReadUncheckedEventIdUnderlyingCallsCount + } else { + var returnValue: Int? = nil + DispatchQueue.main.sync { + returnValue = markAsFullyReadUncheckedEventIdUnderlyingCallsCount + } + + return returnValue! + } + } + set { + if Thread.isMainThread { + markAsFullyReadUncheckedEventIdUnderlyingCallsCount = newValue + } else { + DispatchQueue.main.sync { + markAsFullyReadUncheckedEventIdUnderlyingCallsCount = newValue + } + } + } + } + open var markAsFullyReadUncheckedEventIdCalled: Bool { + return markAsFullyReadUncheckedEventIdCallsCount > 0 + } + open var markAsFullyReadUncheckedEventIdReceivedEventId: String? + open var markAsFullyReadUncheckedEventIdReceivedInvocations: [String] = [] + open var markAsFullyReadUncheckedEventIdClosure: ((String) async throws -> Void)? + + open override func markAsFullyReadUnchecked(eventId: String) async throws { + if let error = markAsFullyReadUncheckedEventIdThrowableError { + throw error + } + markAsFullyReadUncheckedEventIdCallsCount += 1 + markAsFullyReadUncheckedEventIdReceivedEventId = eventId + DispatchQueue.main.async { + self.markAsFullyReadUncheckedEventIdReceivedInvocations.append(eventId) + } + try await markAsFullyReadUncheckedEventIdClosure?(eventId) + } + //MARK: - markAsRead open var markAsReadReceiptTypeThrowableError: Error? @@ -18225,14 +18195,18 @@ open class RoomSDKMock: MatrixRustSDK.Room, @unchecked Sendable { } open class RoomDirectorySearchSDKMock: MatrixRustSDK.RoomDirectorySearch, @unchecked Sendable { init() { - super.init(noPointer: .init()) + super.init(noHandle: .init()) } - public required init(unsafeFromRawPointer pointer: UnsafeMutableRawPointer) { - fatalError("init(unsafeFromRawPointer:) has not been implemented") + public required init(unsafeFromHandle handle: UInt64) { + fatalError("init(unsafeFromHandle:) has not been implemented") } - fileprivate var pointer: UnsafeMutableRawPointer! + fileprivate var handle: UInt64 { + get { return underlyingHandle } + set(value) { underlyingHandle = value } + } + fileprivate var underlyingHandle: UInt64! //MARK: - isAtLastPage @@ -18531,14 +18505,18 @@ open class RoomDirectorySearchSDKMock: MatrixRustSDK.RoomDirectorySearch, @unche } open class RoomListSDKMock: MatrixRustSDK.RoomList, @unchecked Sendable { init() { - super.init(noPointer: .init()) + super.init(noHandle: .init()) } - public required init(unsafeFromRawPointer pointer: UnsafeMutableRawPointer) { - fatalError("init(unsafeFromRawPointer:) has not been implemented") + public required init(unsafeFromHandle handle: UInt64) { + fatalError("init(unsafeFromHandle:) has not been implemented") } - fileprivate var pointer: UnsafeMutableRawPointer! + fileprivate var handle: UInt64 { + get { return underlyingHandle } + set(value) { underlyingHandle = value } + } + fileprivate var underlyingHandle: UInt64! //MARK: - entriesWithDynamicAdapters @@ -18834,14 +18812,18 @@ open class RoomListSDKMock: MatrixRustSDK.RoomList, @unchecked Sendable { } open class RoomListDynamicEntriesControllerSDKMock: MatrixRustSDK.RoomListDynamicEntriesController, @unchecked Sendable { init() { - super.init(noPointer: .init()) + super.init(noHandle: .init()) } - public required init(unsafeFromRawPointer pointer: UnsafeMutableRawPointer) { - fatalError("init(unsafeFromRawPointer:) has not been implemented") + public required init(unsafeFromHandle handle: UInt64) { + fatalError("init(unsafeFromHandle:) has not been implemented") } - fileprivate var pointer: UnsafeMutableRawPointer! + fileprivate var handle: UInt64 { + get { return underlyingHandle } + set(value) { underlyingHandle = value } + } + fileprivate var underlyingHandle: UInt64! //MARK: - addOnePage @@ -18988,14 +18970,18 @@ open class RoomListDynamicEntriesControllerSDKMock: MatrixRustSDK.RoomListDynami } open class RoomListEntriesWithDynamicAdaptersResultSDKMock: MatrixRustSDK.RoomListEntriesWithDynamicAdaptersResult, @unchecked Sendable { init() { - super.init(noPointer: .init()) + super.init(noHandle: .init()) } - public required init(unsafeFromRawPointer pointer: UnsafeMutableRawPointer) { - fatalError("init(unsafeFromRawPointer:) has not been implemented") + public required init(unsafeFromHandle handle: UInt64) { + fatalError("init(unsafeFromHandle:) has not been implemented") } - fileprivate var pointer: UnsafeMutableRawPointer! + fileprivate var handle: UInt64 { + get { return underlyingHandle } + set(value) { underlyingHandle = value } + } + fileprivate var underlyingHandle: UInt64! //MARK: - controller @@ -19129,14 +19115,18 @@ open class RoomListEntriesWithDynamicAdaptersResultSDKMock: MatrixRustSDK.RoomLi } open class RoomListServiceSDKMock: MatrixRustSDK.RoomListService, @unchecked Sendable { init() { - super.init(noPointer: .init()) + super.init(noHandle: .init()) } - public required init(unsafeFromRawPointer pointer: UnsafeMutableRawPointer) { - fatalError("init(unsafeFromRawPointer:) has not been implemented") + public required init(unsafeFromHandle handle: UInt64) { + fatalError("init(unsafeFromHandle:) has not been implemented") } - fileprivate var pointer: UnsafeMutableRawPointer! + fileprivate var handle: UInt64 { + get { return underlyingHandle } + set(value) { underlyingHandle = value } + } + fileprivate var underlyingHandle: UInt64! //MARK: - allRooms @@ -19472,14 +19462,18 @@ open class RoomListServiceSDKMock: MatrixRustSDK.RoomListService, @unchecked Sen } open class RoomMembersIteratorSDKMock: MatrixRustSDK.RoomMembersIterator, @unchecked Sendable { init() { - super.init(noPointer: .init()) + super.init(noHandle: .init()) } - public required init(unsafeFromRawPointer pointer: UnsafeMutableRawPointer) { - fatalError("init(unsafeFromRawPointer:) has not been implemented") + public required init(unsafeFromHandle handle: UInt64) { + fatalError("init(unsafeFromHandle:) has not been implemented") } - fileprivate var pointer: UnsafeMutableRawPointer! + fileprivate var handle: UInt64 { + get { return underlyingHandle } + set(value) { underlyingHandle = value } + } + fileprivate var underlyingHandle: UInt64! //MARK: - len @@ -19619,14 +19613,18 @@ open class RoomMembersIteratorSDKMock: MatrixRustSDK.RoomMembersIterator, @unche } open class RoomMessageEventContentWithoutRelationSDKMock: MatrixRustSDK.RoomMessageEventContentWithoutRelation, @unchecked Sendable { init() { - super.init(noPointer: .init()) + super.init(noHandle: .init()) } - public required init(unsafeFromRawPointer pointer: UnsafeMutableRawPointer) { - fatalError("init(unsafeFromRawPointer:) has not been implemented") + public required init(unsafeFromHandle handle: UInt64) { + fatalError("init(unsafeFromHandle:) has not been implemented") } - fileprivate var pointer: UnsafeMutableRawPointer! + fileprivate var handle: UInt64 { + get { return underlyingHandle } + set(value) { underlyingHandle = value } + } + fileprivate var underlyingHandle: UInt64! //MARK: - withMentions @@ -19701,14 +19699,18 @@ open class RoomMessageEventContentWithoutRelationSDKMock: MatrixRustSDK.RoomMess } open class RoomPowerLevelsSDKMock: MatrixRustSDK.RoomPowerLevels, @unchecked Sendable { init() { - super.init(noPointer: .init()) + super.init(noHandle: .init()) } - public required init(unsafeFromRawPointer pointer: UnsafeMutableRawPointer) { - fatalError("init(unsafeFromRawPointer:) has not been implemented") + public required init(unsafeFromHandle handle: UInt64) { + fatalError("init(unsafeFromHandle:) has not been implemented") } - fileprivate var pointer: UnsafeMutableRawPointer! + fileprivate var handle: UInt64 { + get { return underlyingHandle } + set(value) { underlyingHandle = value } + } + fileprivate var underlyingHandle: UInt64! //MARK: - canOwnUserBan @@ -21114,14 +21116,18 @@ open class RoomPowerLevelsSDKMock: MatrixRustSDK.RoomPowerLevels, @unchecked Sen } open class RoomPreviewSDKMock: MatrixRustSDK.RoomPreview, @unchecked Sendable { init() { - super.init(noPointer: .init()) + super.init(noHandle: .init()) } - public required init(unsafeFromRawPointer pointer: UnsafeMutableRawPointer) { - fatalError("init(unsafeFromRawPointer:) has not been implemented") + public required init(unsafeFromHandle handle: UInt64) { + fatalError("init(unsafeFromHandle:) has not been implemented") } - fileprivate var pointer: UnsafeMutableRawPointer! + fileprivate var handle: UInt64 { + get { return underlyingHandle } + set(value) { underlyingHandle = value } + } + fileprivate var underlyingHandle: UInt64! //MARK: - forget @@ -21400,14 +21406,18 @@ open class RoomPreviewSDKMock: MatrixRustSDK.RoomPreview, @unchecked Sendable { } open class SendAttachmentJoinHandleSDKMock: MatrixRustSDK.SendAttachmentJoinHandle, @unchecked Sendable { init() { - super.init(noPointer: .init()) + super.init(noHandle: .init()) } - public required init(unsafeFromRawPointer pointer: UnsafeMutableRawPointer) { - fatalError("init(unsafeFromRawPointer:) has not been implemented") + public required init(unsafeFromHandle handle: UInt64) { + fatalError("init(unsafeFromHandle:) has not been implemented") } - fileprivate var pointer: UnsafeMutableRawPointer! + fileprivate var handle: UInt64 { + get { return underlyingHandle } + set(value) { underlyingHandle = value } + } + fileprivate var underlyingHandle: UInt64! //MARK: - cancel @@ -21487,14 +21497,18 @@ open class SendAttachmentJoinHandleSDKMock: MatrixRustSDK.SendAttachmentJoinHand } open class SendGalleryJoinHandleSDKMock: MatrixRustSDK.SendGalleryJoinHandle, @unchecked Sendable { init() { - super.init(noPointer: .init()) + super.init(noHandle: .init()) } - public required init(unsafeFromRawPointer pointer: UnsafeMutableRawPointer) { - fatalError("init(unsafeFromRawPointer:) has not been implemented") + public required init(unsafeFromHandle handle: UInt64) { + fatalError("init(unsafeFromHandle:) has not been implemented") } - fileprivate var pointer: UnsafeMutableRawPointer! + fileprivate var handle: UInt64 { + get { return underlyingHandle } + set(value) { underlyingHandle = value } + } + fileprivate var underlyingHandle: UInt64! //MARK: - cancel @@ -21574,14 +21588,18 @@ open class SendGalleryJoinHandleSDKMock: MatrixRustSDK.SendGalleryJoinHandle, @u } open class SendHandleSDKMock: MatrixRustSDK.SendHandle, @unchecked Sendable { init() { - super.init(noPointer: .init()) + super.init(noHandle: .init()) } - public required init(unsafeFromRawPointer pointer: UnsafeMutableRawPointer) { - fatalError("init(unsafeFromRawPointer:) has not been implemented") + public required init(unsafeFromHandle handle: UInt64) { + fatalError("init(unsafeFromHandle:) has not been implemented") } - fileprivate var pointer: UnsafeMutableRawPointer! + fileprivate var handle: UInt64 { + get { return underlyingHandle } + set(value) { underlyingHandle = value } + } + fileprivate var underlyingHandle: UInt64! //MARK: - abort @@ -21694,14 +21712,18 @@ open class SendHandleSDKMock: MatrixRustSDK.SendHandle, @unchecked Sendable { } open class SessionVerificationControllerSDKMock: MatrixRustSDK.SessionVerificationController, @unchecked Sendable { init() { - super.init(noPointer: .init()) + super.init(noHandle: .init()) } - public required init(unsafeFromRawPointer pointer: UnsafeMutableRawPointer) { - fatalError("init(unsafeFromRawPointer:) has not been implemented") + public required init(unsafeFromHandle handle: UInt64) { + fatalError("init(unsafeFromHandle:) has not been implemented") } - fileprivate var pointer: UnsafeMutableRawPointer! + fileprivate var handle: UInt64 { + get { return underlyingHandle } + set(value) { underlyingHandle = value } + } + fileprivate var underlyingHandle: UInt64! //MARK: - acceptVerificationRequest @@ -22079,14 +22101,18 @@ open class SessionVerificationControllerSDKMock: MatrixRustSDK.SessionVerificati } open class SessionVerificationEmojiSDKMock: MatrixRustSDK.SessionVerificationEmoji, @unchecked Sendable { init() { - super.init(noPointer: .init()) + super.init(noHandle: .init()) } - public required init(unsafeFromRawPointer pointer: UnsafeMutableRawPointer) { - fatalError("init(unsafeFromRawPointer:) has not been implemented") + public required init(unsafeFromHandle handle: UInt64) { + fatalError("init(unsafeFromHandle:) has not been implemented") } - fileprivate var pointer: UnsafeMutableRawPointer! + fileprivate var handle: UInt64 { + get { return underlyingHandle } + set(value) { underlyingHandle = value } + } + fileprivate var underlyingHandle: UInt64! //MARK: - description @@ -22220,14 +22246,18 @@ open class SessionVerificationEmojiSDKMock: MatrixRustSDK.SessionVerificationEmo } open class SpaceRoomListSDKMock: MatrixRustSDK.SpaceRoomList, @unchecked Sendable { init() { - super.init(noPointer: .init()) + super.init(noHandle: .init()) } - public required init(unsafeFromRawPointer pointer: UnsafeMutableRawPointer) { - fatalError("init(unsafeFromRawPointer:) has not been implemented") + public required init(unsafeFromHandle handle: UInt64) { + fatalError("init(unsafeFromHandle:) has not been implemented") } - fileprivate var pointer: UnsafeMutableRawPointer! + fileprivate var handle: UInt64 { + get { return underlyingHandle } + set(value) { underlyingHandle = value } + } + fileprivate var underlyingHandle: UInt64! //MARK: - paginate @@ -22679,14 +22709,18 @@ open class SpaceRoomListSDKMock: MatrixRustSDK.SpaceRoomList, @unchecked Sendabl } open class SpaceServiceSDKMock: MatrixRustSDK.SpaceService, @unchecked Sendable { init() { - super.init(noPointer: .init()) + super.init(noHandle: .init()) } - public required init(unsafeFromRawPointer pointer: UnsafeMutableRawPointer) { - fatalError("init(unsafeFromRawPointer:) has not been implemented") + public required init(unsafeFromHandle handle: UInt64) { + fatalError("init(unsafeFromHandle:) has not been implemented") } - fileprivate var pointer: UnsafeMutableRawPointer! + fileprivate var handle: UInt64 { + get { return underlyingHandle } + set(value) { underlyingHandle = value } + } + fileprivate var underlyingHandle: UInt64! //MARK: - joinedSpaces @@ -22976,14 +23010,18 @@ open class SpaceServiceSDKMock: MatrixRustSDK.SpaceService, @unchecked Sendable } open class SpanSDKMock: MatrixRustSDK.Span, @unchecked Sendable { init() { - super.init(noPointer: .init()) + super.init(noHandle: .init()) } - public required init(unsafeFromRawPointer pointer: UnsafeMutableRawPointer) { - fatalError("init(unsafeFromRawPointer:) has not been implemented") + public required init(unsafeFromHandle handle: UInt64) { + fatalError("init(unsafeFromHandle:) has not been implemented") } - fileprivate var pointer: UnsafeMutableRawPointer! + fileprivate var handle: UInt64 { + get { return underlyingHandle } + set(value) { underlyingHandle = value } + } + fileprivate var underlyingHandle: UInt64! static func reset() { } @@ -23125,16 +23163,384 @@ open class SpanSDKMock: MatrixRustSDK.Span, @unchecked Sendable { } } } +open class SqliteStoreBuilderSDKMock: MatrixRustSDK.SqliteStoreBuilder, @unchecked Sendable { + init() { + super.init(noHandle: .init()) + } + + public required init(unsafeFromHandle handle: UInt64) { + fatalError("init(unsafeFromHandle:) has not been implemented") + } + + fileprivate var handle: UInt64 { + get { return underlyingHandle } + set(value) { underlyingHandle = value } + } + fileprivate var underlyingHandle: UInt64! + + //MARK: - cacheSize + + var cacheSizeCacheSizeUnderlyingCallsCount = 0 + open var cacheSizeCacheSizeCallsCount: Int { + get { + if Thread.isMainThread { + return cacheSizeCacheSizeUnderlyingCallsCount + } else { + var returnValue: Int? = nil + DispatchQueue.main.sync { + returnValue = cacheSizeCacheSizeUnderlyingCallsCount + } + + return returnValue! + } + } + set { + if Thread.isMainThread { + cacheSizeCacheSizeUnderlyingCallsCount = newValue + } else { + DispatchQueue.main.sync { + cacheSizeCacheSizeUnderlyingCallsCount = newValue + } + } + } + } + open var cacheSizeCacheSizeCalled: Bool { + return cacheSizeCacheSizeCallsCount > 0 + } + open var cacheSizeCacheSizeReceivedCacheSize: UInt32? + open var cacheSizeCacheSizeReceivedInvocations: [UInt32?] = [] + + var cacheSizeCacheSizeUnderlyingReturnValue: SqliteStoreBuilder! + open var cacheSizeCacheSizeReturnValue: SqliteStoreBuilder! { + get { + if Thread.isMainThread { + return cacheSizeCacheSizeUnderlyingReturnValue + } else { + var returnValue: SqliteStoreBuilder? = nil + DispatchQueue.main.sync { + returnValue = cacheSizeCacheSizeUnderlyingReturnValue + } + + return returnValue! + } + } + set { + if Thread.isMainThread { + cacheSizeCacheSizeUnderlyingReturnValue = newValue + } else { + DispatchQueue.main.sync { + cacheSizeCacheSizeUnderlyingReturnValue = newValue + } + } + } + } + open var cacheSizeCacheSizeClosure: ((UInt32?) -> SqliteStoreBuilder)? + + open override func cacheSize(cacheSize: UInt32?) -> SqliteStoreBuilder { + cacheSizeCacheSizeCallsCount += 1 + cacheSizeCacheSizeReceivedCacheSize = cacheSize + DispatchQueue.main.async { + self.cacheSizeCacheSizeReceivedInvocations.append(cacheSize) + } + if let cacheSizeCacheSizeClosure = cacheSizeCacheSizeClosure { + return cacheSizeCacheSizeClosure(cacheSize) + } else { + return cacheSizeCacheSizeReturnValue + } + } + + //MARK: - journalSizeLimit + + var journalSizeLimitLimitUnderlyingCallsCount = 0 + open var journalSizeLimitLimitCallsCount: Int { + get { + if Thread.isMainThread { + return journalSizeLimitLimitUnderlyingCallsCount + } else { + var returnValue: Int? = nil + DispatchQueue.main.sync { + returnValue = journalSizeLimitLimitUnderlyingCallsCount + } + + return returnValue! + } + } + set { + if Thread.isMainThread { + journalSizeLimitLimitUnderlyingCallsCount = newValue + } else { + DispatchQueue.main.sync { + journalSizeLimitLimitUnderlyingCallsCount = newValue + } + } + } + } + open var journalSizeLimitLimitCalled: Bool { + return journalSizeLimitLimitCallsCount > 0 + } + open var journalSizeLimitLimitReceivedLimit: UInt32? + open var journalSizeLimitLimitReceivedInvocations: [UInt32?] = [] + + var journalSizeLimitLimitUnderlyingReturnValue: SqliteStoreBuilder! + open var journalSizeLimitLimitReturnValue: SqliteStoreBuilder! { + get { + if Thread.isMainThread { + return journalSizeLimitLimitUnderlyingReturnValue + } else { + var returnValue: SqliteStoreBuilder? = nil + DispatchQueue.main.sync { + returnValue = journalSizeLimitLimitUnderlyingReturnValue + } + + return returnValue! + } + } + set { + if Thread.isMainThread { + journalSizeLimitLimitUnderlyingReturnValue = newValue + } else { + DispatchQueue.main.sync { + journalSizeLimitLimitUnderlyingReturnValue = newValue + } + } + } + } + open var journalSizeLimitLimitClosure: ((UInt32?) -> SqliteStoreBuilder)? + + open override func journalSizeLimit(limit: UInt32?) -> SqliteStoreBuilder { + journalSizeLimitLimitCallsCount += 1 + journalSizeLimitLimitReceivedLimit = limit + DispatchQueue.main.async { + self.journalSizeLimitLimitReceivedInvocations.append(limit) + } + if let journalSizeLimitLimitClosure = journalSizeLimitLimitClosure { + return journalSizeLimitLimitClosure(limit) + } else { + return journalSizeLimitLimitReturnValue + } + } + + //MARK: - passphrase + + var passphrasePassphraseUnderlyingCallsCount = 0 + open var passphrasePassphraseCallsCount: Int { + get { + if Thread.isMainThread { + return passphrasePassphraseUnderlyingCallsCount + } else { + var returnValue: Int? = nil + DispatchQueue.main.sync { + returnValue = passphrasePassphraseUnderlyingCallsCount + } + + return returnValue! + } + } + set { + if Thread.isMainThread { + passphrasePassphraseUnderlyingCallsCount = newValue + } else { + DispatchQueue.main.sync { + passphrasePassphraseUnderlyingCallsCount = newValue + } + } + } + } + open var passphrasePassphraseCalled: Bool { + return passphrasePassphraseCallsCount > 0 + } + open var passphrasePassphraseReceivedPassphrase: String? + open var passphrasePassphraseReceivedInvocations: [String?] = [] + + var passphrasePassphraseUnderlyingReturnValue: SqliteStoreBuilder! + open var passphrasePassphraseReturnValue: SqliteStoreBuilder! { + get { + if Thread.isMainThread { + return passphrasePassphraseUnderlyingReturnValue + } else { + var returnValue: SqliteStoreBuilder? = nil + DispatchQueue.main.sync { + returnValue = passphrasePassphraseUnderlyingReturnValue + } + + return returnValue! + } + } + set { + if Thread.isMainThread { + passphrasePassphraseUnderlyingReturnValue = newValue + } else { + DispatchQueue.main.sync { + passphrasePassphraseUnderlyingReturnValue = newValue + } + } + } + } + open var passphrasePassphraseClosure: ((String?) -> SqliteStoreBuilder)? + + open override func passphrase(passphrase: String?) -> SqliteStoreBuilder { + passphrasePassphraseCallsCount += 1 + passphrasePassphraseReceivedPassphrase = passphrase + DispatchQueue.main.async { + self.passphrasePassphraseReceivedInvocations.append(passphrase) + } + if let passphrasePassphraseClosure = passphrasePassphraseClosure { + return passphrasePassphraseClosure(passphrase) + } else { + return passphrasePassphraseReturnValue + } + } + + //MARK: - poolMaxSize + + var poolMaxSizePoolMaxSizeUnderlyingCallsCount = 0 + open var poolMaxSizePoolMaxSizeCallsCount: Int { + get { + if Thread.isMainThread { + return poolMaxSizePoolMaxSizeUnderlyingCallsCount + } else { + var returnValue: Int? = nil + DispatchQueue.main.sync { + returnValue = poolMaxSizePoolMaxSizeUnderlyingCallsCount + } + + return returnValue! + } + } + set { + if Thread.isMainThread { + poolMaxSizePoolMaxSizeUnderlyingCallsCount = newValue + } else { + DispatchQueue.main.sync { + poolMaxSizePoolMaxSizeUnderlyingCallsCount = newValue + } + } + } + } + open var poolMaxSizePoolMaxSizeCalled: Bool { + return poolMaxSizePoolMaxSizeCallsCount > 0 + } + open var poolMaxSizePoolMaxSizeReceivedPoolMaxSize: UInt32? + open var poolMaxSizePoolMaxSizeReceivedInvocations: [UInt32?] = [] + + var poolMaxSizePoolMaxSizeUnderlyingReturnValue: SqliteStoreBuilder! + open var poolMaxSizePoolMaxSizeReturnValue: SqliteStoreBuilder! { + get { + if Thread.isMainThread { + return poolMaxSizePoolMaxSizeUnderlyingReturnValue + } else { + var returnValue: SqliteStoreBuilder? = nil + DispatchQueue.main.sync { + returnValue = poolMaxSizePoolMaxSizeUnderlyingReturnValue + } + + return returnValue! + } + } + set { + if Thread.isMainThread { + poolMaxSizePoolMaxSizeUnderlyingReturnValue = newValue + } else { + DispatchQueue.main.sync { + poolMaxSizePoolMaxSizeUnderlyingReturnValue = newValue + } + } + } + } + open var poolMaxSizePoolMaxSizeClosure: ((UInt32?) -> SqliteStoreBuilder)? + + open override func poolMaxSize(poolMaxSize: UInt32?) -> SqliteStoreBuilder { + poolMaxSizePoolMaxSizeCallsCount += 1 + poolMaxSizePoolMaxSizeReceivedPoolMaxSize = poolMaxSize + DispatchQueue.main.async { + self.poolMaxSizePoolMaxSizeReceivedInvocations.append(poolMaxSize) + } + if let poolMaxSizePoolMaxSizeClosure = poolMaxSizePoolMaxSizeClosure { + return poolMaxSizePoolMaxSizeClosure(poolMaxSize) + } else { + return poolMaxSizePoolMaxSizeReturnValue + } + } + + //MARK: - systemIsMemoryConstrained + + var systemIsMemoryConstrainedUnderlyingCallsCount = 0 + open var systemIsMemoryConstrainedCallsCount: Int { + get { + if Thread.isMainThread { + return systemIsMemoryConstrainedUnderlyingCallsCount + } else { + var returnValue: Int? = nil + DispatchQueue.main.sync { + returnValue = systemIsMemoryConstrainedUnderlyingCallsCount + } + + return returnValue! + } + } + set { + if Thread.isMainThread { + systemIsMemoryConstrainedUnderlyingCallsCount = newValue + } else { + DispatchQueue.main.sync { + systemIsMemoryConstrainedUnderlyingCallsCount = newValue + } + } + } + } + open var systemIsMemoryConstrainedCalled: Bool { + return systemIsMemoryConstrainedCallsCount > 0 + } + + var systemIsMemoryConstrainedUnderlyingReturnValue: SqliteStoreBuilder! + open var systemIsMemoryConstrainedReturnValue: SqliteStoreBuilder! { + get { + if Thread.isMainThread { + return systemIsMemoryConstrainedUnderlyingReturnValue + } else { + var returnValue: SqliteStoreBuilder? = nil + DispatchQueue.main.sync { + returnValue = systemIsMemoryConstrainedUnderlyingReturnValue + } + + return returnValue! + } + } + set { + if Thread.isMainThread { + systemIsMemoryConstrainedUnderlyingReturnValue = newValue + } else { + DispatchQueue.main.sync { + systemIsMemoryConstrainedUnderlyingReturnValue = newValue + } + } + } + } + open var systemIsMemoryConstrainedClosure: (() -> SqliteStoreBuilder)? + + open override func systemIsMemoryConstrained() -> SqliteStoreBuilder { + systemIsMemoryConstrainedCallsCount += 1 + if let systemIsMemoryConstrainedClosure = systemIsMemoryConstrainedClosure { + return systemIsMemoryConstrainedClosure() + } else { + return systemIsMemoryConstrainedReturnValue + } + } +} open class SsoHandlerSDKMock: MatrixRustSDK.SsoHandler, @unchecked Sendable { init() { - super.init(noPointer: .init()) + super.init(noHandle: .init()) } - public required init(unsafeFromRawPointer pointer: UnsafeMutableRawPointer) { - fatalError("init(unsafeFromRawPointer:) has not been implemented") + public required init(unsafeFromHandle handle: UInt64) { + fatalError("init(unsafeFromHandle:) has not been implemented") } - fileprivate var pointer: UnsafeMutableRawPointer! + fileprivate var handle: UInt64 { + get { return underlyingHandle } + set(value) { underlyingHandle = value } + } + fileprivate var underlyingHandle: UInt64! //MARK: - finish @@ -23249,14 +23655,18 @@ open class SsoHandlerSDKMock: MatrixRustSDK.SsoHandler, @unchecked Sendable { } open class SyncServiceSDKMock: MatrixRustSDK.SyncService, @unchecked Sendable { init() { - super.init(noPointer: .init()) + super.init(noHandle: .init()) } - public required init(unsafeFromRawPointer pointer: UnsafeMutableRawPointer) { - fatalError("init(unsafeFromRawPointer:) has not been implemented") + public required init(unsafeFromHandle handle: UInt64) { + fatalError("init(unsafeFromHandle:) has not been implemented") } - fileprivate var pointer: UnsafeMutableRawPointer! + fileprivate var handle: UInt64 { + get { return underlyingHandle } + set(value) { underlyingHandle = value } + } + fileprivate var underlyingHandle: UInt64! //MARK: - expireSessions @@ -23504,14 +23914,18 @@ open class SyncServiceSDKMock: MatrixRustSDK.SyncService, @unchecked Sendable { } open class SyncServiceBuilderSDKMock: MatrixRustSDK.SyncServiceBuilder, @unchecked Sendable { init() { - super.init(noPointer: .init()) + super.init(noHandle: .init()) } - public required init(unsafeFromRawPointer pointer: UnsafeMutableRawPointer) { - fatalError("init(unsafeFromRawPointer:) has not been implemented") + public required init(unsafeFromHandle handle: UInt64) { + fatalError("init(unsafeFromHandle:) has not been implemented") } - fileprivate var pointer: UnsafeMutableRawPointer! + fileprivate var handle: UInt64 { + get { return underlyingHandle } + set(value) { underlyingHandle = value } + } + fileprivate var underlyingHandle: UInt64! //MARK: - finish @@ -23785,14 +24199,18 @@ open class SyncServiceBuilderSDKMock: MatrixRustSDK.SyncServiceBuilder, @uncheck } open class TaskHandleSDKMock: MatrixRustSDK.TaskHandle, @unchecked Sendable { init() { - super.init(noPointer: .init()) + super.init(noHandle: .init()) } - public required init(unsafeFromRawPointer pointer: UnsafeMutableRawPointer) { - fatalError("init(unsafeFromRawPointer:) has not been implemented") + public required init(unsafeFromHandle handle: UInt64) { + fatalError("init(unsafeFromHandle:) has not been implemented") } - fileprivate var pointer: UnsafeMutableRawPointer! + fileprivate var handle: UInt64 { + get { return underlyingHandle } + set(value) { underlyingHandle = value } + } + fileprivate var underlyingHandle: UInt64! //MARK: - cancel @@ -23897,14 +24315,18 @@ open class TaskHandleSDKMock: MatrixRustSDK.TaskHandle, @unchecked Sendable { } open class ThreadSummarySDKMock: MatrixRustSDK.ThreadSummary, @unchecked Sendable { init() { - super.init(noPointer: .init()) + super.init(noHandle: .init()) } - public required init(unsafeFromRawPointer pointer: UnsafeMutableRawPointer) { - fatalError("init(unsafeFromRawPointer:) has not been implemented") + public required init(unsafeFromHandle handle: UInt64) { + fatalError("init(unsafeFromHandle:) has not been implemented") } - fileprivate var pointer: UnsafeMutableRawPointer! + fileprivate var handle: UInt64 { + get { return underlyingHandle } + set(value) { underlyingHandle = value } + } + fileprivate var underlyingHandle: UInt64! //MARK: - latestEvent @@ -24038,14 +24460,18 @@ open class ThreadSummarySDKMock: MatrixRustSDK.ThreadSummary, @unchecked Sendabl } open class TimelineSDKMock: MatrixRustSDK.Timeline, @unchecked Sendable { init() { - super.init(noPointer: .init()) + super.init(noHandle: .init()) } - public required init(unsafeFromRawPointer pointer: UnsafeMutableRawPointer) { - fatalError("init(unsafeFromRawPointer:) has not been implemented") + public required init(unsafeFromHandle handle: UInt64) { + fatalError("init(unsafeFromHandle:) has not been implemented") } - fileprivate var pointer: UnsafeMutableRawPointer! + fileprivate var handle: UInt64 { + get { return underlyingHandle } + set(value) { underlyingHandle = value } + } + fileprivate var underlyingHandle: UInt64! //MARK: - addListener @@ -24484,6 +24910,71 @@ open class TimelineSDKMock: MatrixRustSDK.Timeline, @unchecked Sendable { } } + //MARK: - latestEventId + + var latestEventIdUnderlyingCallsCount = 0 + open var latestEventIdCallsCount: Int { + get { + if Thread.isMainThread { + return latestEventIdUnderlyingCallsCount + } else { + var returnValue: Int? = nil + DispatchQueue.main.sync { + returnValue = latestEventIdUnderlyingCallsCount + } + + return returnValue! + } + } + set { + if Thread.isMainThread { + latestEventIdUnderlyingCallsCount = newValue + } else { + DispatchQueue.main.sync { + latestEventIdUnderlyingCallsCount = newValue + } + } + } + } + open var latestEventIdCalled: Bool { + return latestEventIdCallsCount > 0 + } + + var latestEventIdUnderlyingReturnValue: String? + open var latestEventIdReturnValue: String? { + get { + if Thread.isMainThread { + return latestEventIdUnderlyingReturnValue + } else { + var returnValue: String?? = nil + DispatchQueue.main.sync { + returnValue = latestEventIdUnderlyingReturnValue + } + + return returnValue! + } + } + set { + if Thread.isMainThread { + latestEventIdUnderlyingReturnValue = newValue + } else { + DispatchQueue.main.sync { + latestEventIdUnderlyingReturnValue = newValue + } + } + } + } + open var latestEventIdClosure: (() async -> String?)? + + open override func latestEventId() async -> String? { + latestEventIdCallsCount += 1 + if let latestEventIdClosure = latestEventIdClosure { + return await latestEventIdClosure() + } else { + return latestEventIdReturnValue + } + } + //MARK: - loadReplyDetails open var loadReplyDetailsEventIdStrThrowableError: Error? @@ -25854,14 +26345,18 @@ open class TimelineSDKMock: MatrixRustSDK.Timeline, @unchecked Sendable { } open class TimelineEventSDKMock: MatrixRustSDK.TimelineEvent, @unchecked Sendable { init() { - super.init(noPointer: .init()) + super.init(noHandle: .init()) } - public required init(unsafeFromRawPointer pointer: UnsafeMutableRawPointer) { - fatalError("init(unsafeFromRawPointer:) has not been implemented") + public required init(unsafeFromHandle handle: UInt64) { + fatalError("init(unsafeFromHandle:) has not been implemented") } - fileprivate var pointer: UnsafeMutableRawPointer! + fileprivate var handle: UInt64 { + get { return underlyingHandle } + set(value) { underlyingHandle = value } + } + fileprivate var underlyingHandle: UInt64! //MARK: - eventId @@ -26194,28 +26689,36 @@ open class TimelineEventSDKMock: MatrixRustSDK.TimelineEvent, @unchecked Sendabl } open class TimelineEventTypeFilterSDKMock: MatrixRustSDK.TimelineEventTypeFilter, @unchecked Sendable { init() { - super.init(noPointer: .init()) + super.init(noHandle: .init()) } - public required init(unsafeFromRawPointer pointer: UnsafeMutableRawPointer) { - fatalError("init(unsafeFromRawPointer:) has not been implemented") + public required init(unsafeFromHandle handle: UInt64) { + fatalError("init(unsafeFromHandle:) has not been implemented") } - fileprivate var pointer: UnsafeMutableRawPointer! + fileprivate var handle: UInt64 { + get { return underlyingHandle } + set(value) { underlyingHandle = value } + } + fileprivate var underlyingHandle: UInt64! static func reset() { } } open class TimelineItemSDKMock: MatrixRustSDK.TimelineItem, @unchecked Sendable { init() { - super.init(noPointer: .init()) + super.init(noHandle: .init()) } - public required init(unsafeFromRawPointer pointer: UnsafeMutableRawPointer) { - fatalError("init(unsafeFromRawPointer:) has not been implemented") + public required init(unsafeFromHandle handle: UInt64) { + fatalError("init(unsafeFromHandle:) has not been implemented") } - fileprivate var pointer: UnsafeMutableRawPointer! + fileprivate var handle: UInt64 { + get { return underlyingHandle } + set(value) { underlyingHandle = value } + } + fileprivate var underlyingHandle: UInt64! //MARK: - asEvent @@ -26479,14 +26982,18 @@ open class TimelineItemSDKMock: MatrixRustSDK.TimelineItem, @unchecked Sendable } open class UnreadNotificationsCountSDKMock: MatrixRustSDK.UnreadNotificationsCount, @unchecked Sendable { init() { - super.init(noPointer: .init()) + super.init(noHandle: .init()) } - public required init(unsafeFromRawPointer pointer: UnsafeMutableRawPointer) { - fatalError("init(unsafeFromRawPointer:) has not been implemented") + public required init(unsafeFromHandle handle: UInt64) { + fatalError("init(unsafeFromHandle:) has not been implemented") } - fileprivate var pointer: UnsafeMutableRawPointer! + fileprivate var handle: UInt64 { + get { return underlyingHandle } + set(value) { underlyingHandle = value } + } + fileprivate var underlyingHandle: UInt64! //MARK: - hasNotifications @@ -26685,14 +27192,18 @@ open class UnreadNotificationsCountSDKMock: MatrixRustSDK.UnreadNotificationsCou } open class UserIdentitySDKMock: MatrixRustSDK.UserIdentity, @unchecked Sendable { init() { - super.init(noPointer: .init()) + super.init(noHandle: .init()) } - public required init(unsafeFromRawPointer pointer: UnsafeMutableRawPointer) { - fatalError("init(unsafeFromRawPointer:) has not been implemented") + public required init(unsafeFromHandle handle: UInt64) { + fatalError("init(unsafeFromHandle:) has not been implemented") } - fileprivate var pointer: UnsafeMutableRawPointer! + fileprivate var handle: UInt64 { + get { return underlyingHandle } + set(value) { underlyingHandle = value } + } + fileprivate var underlyingHandle: UInt64! //MARK: - hasVerificationViolation @@ -27036,14 +27547,18 @@ open class UserIdentitySDKMock: MatrixRustSDK.UserIdentity, @unchecked Sendable } open class WidgetDriverSDKMock: MatrixRustSDK.WidgetDriver, @unchecked Sendable { init() { - super.init(noPointer: .init()) + super.init(noHandle: .init()) } - public required init(unsafeFromRawPointer pointer: UnsafeMutableRawPointer) { - fatalError("init(unsafeFromRawPointer:) has not been implemented") + public required init(unsafeFromHandle handle: UInt64) { + fatalError("init(unsafeFromHandle:) has not been implemented") } - fileprivate var pointer: UnsafeMutableRawPointer! + fileprivate var handle: UInt64 { + get { return underlyingHandle } + set(value) { underlyingHandle = value } + } + fileprivate var underlyingHandle: UInt64! //MARK: - run @@ -27089,14 +27604,18 @@ open class WidgetDriverSDKMock: MatrixRustSDK.WidgetDriver, @unchecked Sendable } open class WidgetDriverHandleSDKMock: MatrixRustSDK.WidgetDriverHandle, @unchecked Sendable { init() { - super.init(noPointer: .init()) + super.init(noHandle: .init()) } - public required init(unsafeFromRawPointer pointer: UnsafeMutableRawPointer) { - fatalError("init(unsafeFromRawPointer:) has not been implemented") + public required init(unsafeFromHandle handle: UInt64) { + fatalError("init(unsafeFromHandle:) has not been implemented") } - fileprivate var pointer: UnsafeMutableRawPointer! + fileprivate var handle: UInt64 { + get { return underlyingHandle } + set(value) { underlyingHandle = value } + } + fileprivate var underlyingHandle: UInt64! //MARK: - recv diff --git a/ElementX/Sources/Screens/MessageForwardingScreen/View/MessageForwardingScreen.swift b/ElementX/Sources/Screens/MessageForwardingScreen/View/MessageForwardingScreen.swift index ad1322db0..e72b8d5a3 100644 --- a/ElementX/Sources/Screens/MessageForwardingScreen/View/MessageForwardingScreen.swift +++ b/ElementX/Sources/Screens/MessageForwardingScreen/View/MessageForwardingScreen.swift @@ -97,7 +97,7 @@ struct MessageForwardingScreen_Previews: PreviewProvider, TestablePreview { let summaryProvider = RoomSummaryProviderMock(.init(state: .loaded(.mockRooms))) let viewModel = MessageForwardingScreenViewModel(forwardingItem: .init(id: .randomEvent, roomID: "", - content: .init(noPointer: .init())), + content: .init(noHandle: .init())), userSession: UserSessionMock(.init()), roomSummaryProvider: summaryProvider, userIndicatorController: UserIndicatorControllerMock()) diff --git a/ElementX/Sources/Services/Authentication/AuthenticationClientFactory.swift b/ElementX/Sources/Services/Authentication/AuthenticationClientFactory.swift index 9af3384a0..314e94dc8 100644 --- a/ElementX/Sources/Services/Authentication/AuthenticationClientFactory.swift +++ b/ElementX/Sources/Services/Authentication/AuthenticationClientFactory.swift @@ -35,9 +35,8 @@ struct AuthenticationClientFactory: AuthenticationClientFactoryProtocol { enableOnlySignedDeviceIsolationMode: appSettings.enableOnlySignedDeviceIsolationMode, enableKeyShareOnInvite: appSettings.enableKeyShareOnInvite, threadsEnabled: appSettings.threadsEnabled) - .sessionPaths(dataPath: sessionDirectories.dataPath, - cachePath: sessionDirectories.cachePath) - .sessionPassphrase(passphrase: passphrase) + .sqliteStore(config: .init(dataPath: sessionDirectories.dataPath, cachePath: sessionDirectories.cachePath) + .passphrase(passphrase: passphrase)) .serverNameOrHomeserverUrl(serverNameOrUrl: homeserverAddress) .build() } diff --git a/ElementX/Sources/Services/Timeline/TimelineController/MockTimelineController.swift b/ElementX/Sources/Services/Timeline/TimelineController/MockTimelineController.swift index cec966770..fc5daedb6 100644 --- a/ElementX/Sources/Services/Timeline/TimelineController/MockTimelineController.swift +++ b/ElementX/Sources/Services/Timeline/TimelineController/MockTimelineController.swift @@ -141,7 +141,7 @@ class MockTimelineController: TimelineControllerProtocol { func unpin(eventID: String) async { } func messageEventContent(for itemID: TimelineItemIdentifier) -> RoomMessageEventContentWithoutRelation? { - .init(noPointer: .init()) + .init(noHandle: .init()) } func debugInfo(for itemID: TimelineItemIdentifier) -> TimelineItemDebugInfo { diff --git a/ElementX/Sources/Services/Timeline/TimelineItemProxy.swift b/ElementX/Sources/Services/Timeline/TimelineItemProxy.swift index ebec45125..75a04544f 100644 --- a/ElementX/Sources/Services/Timeline/TimelineItemProxy.swift +++ b/ElementX/Sources/Services/Timeline/TimelineItemProxy.swift @@ -212,7 +212,7 @@ struct SendHandleProxy: Hashable { static var mock: SendHandleProxy { .init(itemID: .event(uniqueID: .init(UUID().uuidString), eventOrTransactionID: .eventID(UUID().uuidString)), - underlyingHandle: .init(noPointer: .init())) + underlyingHandle: .init(noHandle: .init())) } } diff --git a/ElementX/Sources/Services/UserSession/UserSessionStore.swift b/ElementX/Sources/Services/UserSession/UserSessionStore.swift index bd8b08b9c..1e1590715 100644 --- a/ElementX/Sources/Services/UserSession/UserSessionStore.swift +++ b/ElementX/Sources/Services/UserSession/UserSessionStore.swift @@ -123,11 +123,11 @@ class UserSessionStore: UserSessionStoreProtocol { enableOnlySignedDeviceIsolationMode: appSettings.enableOnlySignedDeviceIsolationMode, enableKeyShareOnInvite: appSettings.enableKeyShareOnInvite, threadsEnabled: appSettings.threadsEnabled) - .sessionPaths(dataPath: credentials.restorationToken.sessionDirectories.dataPath, - cachePath: credentials.restorationToken.sessionDirectories.cachePath) + .sqliteStore(config: .init(dataPath: credentials.restorationToken.sessionDirectories.dataPath, + cachePath: credentials.restorationToken.sessionDirectories.cachePath) + .passphrase(passphrase: credentials.restorationToken.passphrase)) .username(username: credentials.userID) .homeserverUrl(url: homeserverURL) - .sessionPassphrase(passphrase: credentials.restorationToken.passphrase) do { let client = try await builder.build() diff --git a/NSE/Sources/NSEUserSession.swift b/NSE/Sources/NSEUserSession.swift index 0f0b1a1a9..ca8cbc9a6 100644 --- a/NSE/Sources/NSEUserSession.swift +++ b/NSE/Sources/NSEUserSession.swift @@ -65,11 +65,11 @@ final class NSEUserSession { maxRequestRetryTime: 5000, threadsEnabled: appSettings.threadsEnabled) .systemIsMemoryConstrained() - .sessionPaths(dataPath: credentials.restorationToken.sessionDirectories.dataPath, - cachePath: credentials.restorationToken.sessionDirectories.cachePath) + .sqliteStore(config: .init(dataPath: credentials.restorationToken.sessionDirectories.dataPath, + cachePath: credentials.restorationToken.sessionDirectories.cachePath) + .passphrase(passphrase: credentials.restorationToken.passphrase)) .username(username: credentials.userID) .homeserverUrl(url: homeserverURL) - .sessionPassphrase(passphrase: credentials.restorationToken.passphrase) baseClient = try await clientBuilder.build() delegateHandle = try baseClient.setDelegate(delegate: ClientDelegateWrapper()) diff --git a/Tools/Sourcery/SDKAutoMockable.stencil b/Tools/Sourcery/SDKAutoMockable.stencil index c80b26d8b..9c2c0e803 100644 --- a/Tools/Sourcery/SDKAutoMockable.stencil +++ b/Tools/Sourcery/SDKAutoMockable.stencil @@ -225,11 +225,11 @@ import {{ import }} {% call accessLevel type.accessLevel %}class {{ type.name | replace:"Protocol","" }}SDKMock: MatrixRustSDK.{{ type.name }}, @unchecked Sendable { {% if type.accessLevel == "open" %} init() { - super.init(noPointer: .init()) + super.init(noHandle: .init()) } - public required init(unsafeFromRawPointer pointer: UnsafeMutableRawPointer) { - fatalError("init(unsafeFromRawPointer:) has not been implemented") + public required init(unsafeFromHandle handle: UInt64) { + fatalError("init(unsafeFromHandle:) has not been implemented") } {% endif %} diff --git a/UnitTests/Sources/HomeScreenRoomTests.swift b/UnitTests/Sources/HomeScreenRoomTests.swift index 6e2c25bb1..243fd27e3 100644 --- a/UnitTests/Sources/HomeScreenRoomTests.swift +++ b/UnitTests/Sources/HomeScreenRoomTests.swift @@ -21,7 +21,7 @@ class HomeScreenRoomTests: XCTestCase { unreadNotificationsCount: UInt, notificationMode: RoomNotificationModeProxy, hasOngoingCall: Bool) { - roomSummary = RoomSummary(room: .init(noPointer: .init()), + roomSummary = RoomSummary(room: .init(noHandle: .init()), id: "Test room", joinRequestType: nil, name: "Test room", diff --git a/UnitTests/Sources/LoggingTests.swift b/UnitTests/Sources/LoggingTests.swift index 6da1b5b99..21bdf603c 100644 --- a/UnitTests/Sources/LoggingTests.swift +++ b/UnitTests/Sources/LoggingTests.swift @@ -71,7 +71,7 @@ class LoggingTests: XCTestCase { let roomName = "Private Conversation" let lastMessage = "Secret information" let heroName = "Pseudonym" - let roomSummary = RoomSummary(room: .init(noPointer: .init()), + let roomSummary = RoomSummary(room: .init(noHandle: .init()), id: "myroomid", joinRequestType: nil, name: roomName, @@ -224,19 +224,19 @@ class LoggingTests: XCTestCase { let rustImageMessage = ImageMessageContent(filename: "ImageString", caption: "ImageString", formattedCaption: nil, - source: MediaSource(noPointer: .init()), + source: MediaSource(noHandle: .init()), info: nil) let rustVideoMessage = VideoMessageContent(filename: "VideoString", caption: "VideoString", formattedCaption: nil, - source: MediaSource(noPointer: .init()), + source: MediaSource(noHandle: .init()), info: nil) let rustFileMessage = FileMessageContent(filename: "FileString", caption: "FileString", formattedCaption: nil, - source: MediaSource(noPointer: .init()), + source: MediaSource(noHandle: .init()), info: nil) // When logging that value diff --git a/UnitTests/Sources/MessageForwardingScreenViewModelTests.swift b/UnitTests/Sources/MessageForwardingScreenViewModelTests.swift index fc15b9980..9959af3b9 100644 --- a/UnitTests/Sources/MessageForwardingScreenViewModelTests.swift +++ b/UnitTests/Sources/MessageForwardingScreenViewModelTests.swift @@ -15,7 +15,7 @@ import XCTest class MessageForwardingScreenViewModelTests: XCTestCase { let forwardingItem = MessageForwardingItem(id: .event(uniqueID: .init("t1"), eventOrTransactionID: .eventID("t1")), roomID: "1", - content: .init(noPointer: .init())) + content: .init(noHandle: .init())) var viewModel: MessageForwardingScreenViewModelProtocol! var context: MessageForwardingScreenViewModelType.Context! var cancellables = Set() diff --git a/UnitTests/Sources/RoomSummaryProviderTests.swift b/UnitTests/Sources/RoomSummaryProviderTests.swift index 01e69ddab..6d3fb12e5 100644 --- a/UnitTests/Sources/RoomSummaryProviderTests.swift +++ b/UnitTests/Sources/RoomSummaryProviderTests.swift @@ -106,7 +106,7 @@ final class RoomSummaryProviderTests: XCTestCase { dynamicAdaptersResult.controllerReturnValue = dynamicEntriesController roomList = RoomListSDKMock() roomList.entriesWithDynamicAdaptersWithPageSizeEnableLatestEventSorterListenerReturnValue = dynamicAdaptersResult - roomList.loadingStateListenerReturnValue = .some(.init(state: .notLoaded, stateStream: .init(noPointer: .init()))) + roomList.loadingStateListenerReturnValue = .some(.init(state: .notLoaded, stateStream: .init(noHandle: .init()))) roomSummaryProvider.setRoomList(roomList) } } diff --git a/UnitTests/Sources/RoomSummaryTests.swift b/UnitTests/Sources/RoomSummaryTests.swift index 2957f3765..0aac4ea3d 100644 --- a/UnitTests/Sources/RoomSummaryTests.swift +++ b/UnitTests/Sources/RoomSummaryTests.swift @@ -90,7 +90,7 @@ class RoomSummaryTests: XCTestCase { // MARK: - Helpers func makeSummary(isDirect: Bool, isSpace: Bool, hasRoomAvatar: Bool, isTombstoned: Bool) -> RoomSummary { - RoomSummary(room: .init(noPointer: .init()), + RoomSummary(room: .init(noHandle: .init()), id: roomDetails.id, joinRequestType: nil, name: roomDetails.name, diff --git a/project.yml b/project.yml index f27ce7d09..b82027661 100644 --- a/project.yml +++ b/project.yml @@ -71,7 +71,7 @@ packages: # Element/Matrix dependencies MatrixRustSDK: url: https://github.com/element-hq/matrix-rust-components-swift - exactVersion: 25.10.27 + exactVersion: 25.11.03 # path: ../matrix-rust-sdk Compound: path: compound-ios