From 0fa62fa8ba40f32dc19f8b3fc970da52272da90b Mon Sep 17 00:00:00 2001 From: Doug Date: Wed, 1 May 2024 12:00:14 +0100 Subject: [PATCH 01/12] Prepare for new sprint --- Config/AppVersion.xcconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Config/AppVersion.xcconfig b/Config/AppVersion.xcconfig index 5df7a12db..86d2d6377 100644 --- a/Config/AppVersion.xcconfig +++ b/Config/AppVersion.xcconfig @@ -15,5 +15,5 @@ // // Version -MARKETING_VERSION = 1.11.10 -CURRENT_PROJECT_VERSION = 1.11.10 +MARKETING_VERSION = 1.11.11 +CURRENT_PROJECT_VERSION = 1.11.11 From 15fded87c6f64e4658a90b40ff71ae6e721b7a0b Mon Sep 17 00:00:00 2001 From: Mauro Romito Date: Fri, 3 May 2024 14:09:38 +0200 Subject: [PATCH 02/12] added accessbility --- Riot/Assets/en.lproj/Vector.strings | 2 ++ Riot/Generated/Strings.swift | 8 ++++++++ RiotSwiftUI/Modules/Room/Composer/View/Composer.swift | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/Riot/Assets/en.lproj/Vector.strings b/Riot/Assets/en.lproj/Vector.strings index 6a7f09c6e..924bda31c 100644 --- a/Riot/Assets/en.lproj/Vector.strings +++ b/Riot/Assets/en.lproj/Vector.strings @@ -2603,6 +2603,8 @@ To enable access, tap Settings> Location and select Always"; // MARK: - WYSIWYG Composer +"wysiwyg_composer_action_minimise_action" = "Shrink composer"; +"wysiwyg_composer_action_maximise_action" = "Expand composer"; // Send Media Actions "wysiwyg_composer_start_action_media_picker" = "Photo Library"; diff --git a/Riot/Generated/Strings.swift b/Riot/Generated/Strings.swift index f5cc6ae5b..999f821c3 100644 --- a/Riot/Generated/Strings.swift +++ b/Riot/Generated/Strings.swift @@ -9567,6 +9567,14 @@ public class VectorL10n: NSObject { public static var widgetStickerPickerNoStickerpacksAlertAddNow: String { return VectorL10n.tr("Vector", "widget_sticker_picker_no_stickerpacks_alert_add_now") } + /// Expand composer + public static var wysiwygComposerActionMaximiseAction: String { + return VectorL10n.tr("Vector", "wysiwyg_composer_action_maximise_action") + } + /// Shrink composer + public static var wysiwygComposerActionMinimiseAction: String { + return VectorL10n.tr("Vector", "wysiwyg_composer_action_minimise_action") + } /// Apply bold format public static var wysiwygComposerFormatActionBold: String { return VectorL10n.tr("Vector", "wysiwyg_composer_format_action_bold") diff --git a/RiotSwiftUI/Modules/Room/Composer/View/Composer.swift b/RiotSwiftUI/Modules/Room/Composer/View/Composer.swift index 585098092..54f42cf74 100644 --- a/RiotSwiftUI/Modules/Room/Composer/View/Composer.swift +++ b/RiotSwiftUI/Modules/Room/Composer/View/Composer.swift @@ -82,6 +82,10 @@ struct Composer: View { wysiwygViewModel.maximised ? "minimiseButton" : "maximiseButton" } + private var toggleButtonAccessibilityLabel: String { + wysiwygViewModel.maximised ? VectorL10n.wysiwygComposerActionMinimiseAction : VectorL10n.wysiwygComposerActionMaximiseAction + } + private var toggleButtonImageName: String { wysiwygViewModel.maximised ? Asset.Images.minimiseComposer.name : Asset.Images.maximiseComposer.name } @@ -171,6 +175,7 @@ struct Composer: View { .frame(width: 16, height: 16) } .accessibilityIdentifier(toggleButtonAcccessibilityIdentifier) + .accessibilityLabel(toggleButtonAccessibilityLabel) .padding(.leading, 12) .padding(.trailing, 4) } From 1ccf0b609bdc1fd04f107e8a2df04300918a3e9a Mon Sep 17 00:00:00 2001 From: Hugh Nimmo-Smith Date: Wed, 8 May 2024 11:09:30 +0100 Subject: [PATCH 03/12] Add note about MSC3886, MSC3903 and MSC3906 being closed (#7788) --- Riot/Modules/Rendezvous/RendezvousService.swift | 4 ++++ .../QRLogin/Common/Service/MatrixSDK/QRLoginService.swift | 3 +++ 2 files changed, 7 insertions(+) diff --git a/Riot/Modules/Rendezvous/RendezvousService.swift b/Riot/Modules/Rendezvous/RendezvousService.swift index de8f07979..c7bf13bcd 100644 --- a/Riot/Modules/Rendezvous/RendezvousService.swift +++ b/Riot/Modules/Rendezvous/RendezvousService.swift @@ -40,6 +40,10 @@ enum RendezvousFlow: String { case SETUP_ADDITIONAL_DEVICE_V2 = "org.matrix.msc3906.setup.additional_device.v2" } +// n.b MSC3886/MSC3903/MSC3906 that this is based on are now closed. +// However, we want to keep this implementation around for some time. +// TODO: define an end-of-life date for this implementation. + /// Allows communication through a secure channel. Based on MSC3886 and MSC3903 @MainActor class RendezvousService { diff --git a/RiotSwiftUI/Modules/Authentication/QRLogin/Common/Service/MatrixSDK/QRLoginService.swift b/RiotSwiftUI/Modules/Authentication/QRLogin/Common/Service/MatrixSDK/QRLoginService.swift index daf2e93f5..cd645dd94 100644 --- a/RiotSwiftUI/Modules/Authentication/QRLogin/Common/Service/MatrixSDK/QRLoginService.swift +++ b/RiotSwiftUI/Modules/Authentication/QRLogin/Common/Service/MatrixSDK/QRLoginService.swift @@ -23,6 +23,9 @@ import ZXingObjC // MARK: - QRLoginService +// n.b MSC3886/MSC3903/MSC3906 that this is based on are now closed. +// However, we want to keep this implementation around for some time. +// TODO: define an end-of-life date for this implementation. class QRLoginService: NSObject, QRLoginServiceProtocol { private let client: AuthenticationRestClient private let sessionCreator: SessionCreatorProtocol From 0f75601b0add8c11bab27fbf3ac5d630c8df7827 Mon Sep 17 00:00:00 2001 From: Stefan Ceriu Date: Wed, 29 May 2024 13:39:02 +0300 Subject: [PATCH 04/12] Bump the `matrix-rich-text-editor-swift` to `v2.37.3` --- .../xcshareddata/xcschemes/Riot.xcscheme | 37 ++++++++----------- .../xcshareddata/swiftpm/Package.resolved | 8 ++-- project.yml | 4 +- 3 files changed, 21 insertions(+), 28 deletions(-) diff --git a/Riot.xcodeproj/xcshareddata/xcschemes/Riot.xcscheme b/Riot.xcodeproj/xcshareddata/xcschemes/Riot.xcscheme index 52ec9a4e1..9350fef63 100644 --- a/Riot.xcodeproj/xcshareddata/xcschemes/Riot.xcscheme +++ b/Riot.xcodeproj/xcshareddata/xcschemes/Riot.xcscheme @@ -1,11 +1,10 @@ + version = "1.3"> + buildImplicitDependencies = "YES"> @@ -35,11 +34,20 @@ + + + + @@ -52,17 +60,6 @@ - - - - - - - - - - diff --git a/Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved index 511ea29a7..2d8489845 100644 --- a/Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -46,12 +46,12 @@ } }, { - "identity" : "matrix-wysiwyg-composer-swift", + "identity" : "matrix-rich-text-editor-swift", "kind" : "remoteSourceControl", - "location" : "https://github.com/matrix-org/matrix-wysiwyg-composer-swift", + "location" : "https://github.com/matrix-org/matrix-rich-text-editor-swift", "state" : { - "revision" : "f788fe2482c0b89019f679a1f43dccf9c25a0782", - "version" : "2.29.0" + "revision" : "21c0dd6e9c0b38d19d97af8e3e99fe01df56825d", + "version" : "2.37.3" } }, { diff --git a/project.yml b/project.yml index 72c0ff8d4..c44219382 100644 --- a/project.yml +++ b/project.yml @@ -58,8 +58,8 @@ packages: url: https://github.com/element-hq/swift-ogg branch: 0.0.1 WysiwygComposer: - url: https://github.com/matrix-org/matrix-wysiwyg-composer-swift - version: 2.29.0 + url: https://github.com/matrix-org/matrix-rich-text-editor-swift + version: 2.37.3 DeviceKit: url: https://github.com/devicekit/DeviceKit majorVersion: 4.7.0 From 5b3498c0eddac08d91766d8f7663795b7c79a071 Mon Sep 17 00:00:00 2001 From: Stefan Ceriu Date: Wed, 29 May 2024 14:34:06 +0300 Subject: [PATCH 05/12] Bump the SDK, fix unit tests --- Podfile | 2 +- Podfile.lock | 24 ++++++++++++------------ RiotTests/FakeUtils.swift | 3 +++ 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/Podfile b/Podfile index f2df4910e..a2e54f0e9 100644 --- a/Podfile +++ b/Podfile @@ -16,7 +16,7 @@ use_frameworks! # - `{ :specHash => {sdk spec hash}` to depend on specific pod options (:git => …, :podspec => …) for MatrixSDK repo. Used by Fastfile during CI # # Warning: our internal tooling depends on the name of this variable name, so be sure not to change it -$matrixSDKVersion = '= 0.27.7' +$matrixSDKVersion = '= 0.27.8' # $matrixSDKVersion = :local # $matrixSDKVersion = { :branch => 'develop'} # $matrixSDKVersion = { :specHash => { git: 'https://git.io/fork123', branch: 'fix' } } diff --git a/Podfile.lock b/Podfile.lock index c8298201a..e78aa4b07 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -39,20 +39,20 @@ PODS: - LoggerAPI (1.9.200): - Logging (~> 1.1) - Logging (1.4.0) - - MatrixSDK (0.27.7): - - MatrixSDK/Core (= 0.27.7) - - MatrixSDK/Core (0.27.7): + - MatrixSDK (0.27.8): + - MatrixSDK/Core (= 0.27.8) + - MatrixSDK/Core (0.27.8): - AFNetworking (~> 4.0.0) - GZIP (~> 1.3.0) - libbase58 (~> 0.1.4) - - MatrixSDKCrypto (= 0.3.13) + - MatrixSDKCrypto (= 0.4.2) - OLMKit (~> 3.2.5) - Realm (= 10.27.0) - SwiftyBeaver (= 1.9.5) - - MatrixSDK/JingleCallStack (0.27.7): + - MatrixSDK/JingleCallStack (0.27.8): - JitsiMeetSDKLite (= 8.1.2-lite) - MatrixSDK/Core - - MatrixSDKCrypto (0.3.13) + - MatrixSDKCrypto (0.4.2) - OLMKit (3.2.12): - OLMKit/olmc (= 3.2.12) - OLMKit/olmcpp (= 3.2.12) @@ -102,8 +102,8 @@ DEPENDENCIES: - KeychainAccess (~> 4.2.2) - KTCenterFlowLayout (~> 1.3.1) - libPhoneNumber-iOS (~> 0.9.13) - - MatrixSDK (= 0.27.7) - - MatrixSDK/JingleCallStack (= 0.27.7) + - MatrixSDK (= 0.27.8) + - MatrixSDK/JingleCallStack (= 0.27.8) - OLMKit - PostHog (~> 2.0.0) - ReadMoreTextView (~> 3.0.1) @@ -187,8 +187,8 @@ SPEC CHECKSUMS: libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75 LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d Logging: beeb016c9c80cf77042d62e83495816847ef108b - MatrixSDK: e07b2309f3c6498c1df987441da7006d099c47a4 - MatrixSDKCrypto: bf08b72f2cd015d8749420a2b8b92fc0536bedf4 + MatrixSDK: 4c5a8572a481340ab233451ad36c1322d371fae5 + MatrixSDKCrypto: 736069ee0a5ec12852ab3498bf2242acecc443fc OLMKit: da115f16582e47626616874e20f7bb92222c7a51 PostHog: 660ec6c9d80cec17b685e148f17f6785a88b597d ReadMoreTextView: 19147adf93abce6d7271e14031a00303fe28720d @@ -208,6 +208,6 @@ SPEC CHECKSUMS: zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c ZXingObjC: 8898711ab495761b2dbbdec76d90164a6d7e14c5 -PODFILE CHECKSUM: 1197abec9c5affbef652747dd5cd6aaf00ef3a47 +PODFILE CHECKSUM: b6073389caf93d20d47c9e511f4b9c3e1ad6dc5d -COCOAPODS: 1.14.3 +COCOAPODS: 1.15.2 diff --git a/RiotTests/FakeUtils.swift b/RiotTests/FakeUtils.swift index f6b1fe477..6077a449e 100644 --- a/RiotTests/FakeUtils.swift +++ b/RiotTests/FakeUtils.swift @@ -260,6 +260,9 @@ class FakeCrypto: NSObject, MXCrypto { } + func invalidateCache(_ done: @escaping () -> Void) { + + } } From 4f4688fc484e21236f9d5437de2e409508efc868 Mon Sep 17 00:00:00 2001 From: Stefan Ceriu Date: Wed, 29 May 2024 14:37:54 +0300 Subject: [PATCH 06/12] version++ --- CHANGES.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index 0e6621096..5d1881ff8 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,8 @@ +## Changes in 1.11.11 (2024-05-29) + +No significant changes. + + ## Changes in 1.11.10 (2024-05-01) 🙌 Improvements From a31a9de299b4db5c0912c57288c7652d4764c3ad Mon Sep 17 00:00:00 2001 From: Stefan Ceriu Date: Wed, 29 May 2024 15:17:34 +0300 Subject: [PATCH 07/12] finish version++ --- Podfile.lock | 2 +- .../xcshareddata/xcschemes/Riot.xcscheme | 37 +++++++++++-------- 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/Podfile.lock b/Podfile.lock index e78aa4b07..99552b321 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -210,4 +210,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: b6073389caf93d20d47c9e511f4b9c3e1ad6dc5d -COCOAPODS: 1.15.2 +COCOAPODS: 1.14.3 diff --git a/Riot.xcodeproj/xcshareddata/xcschemes/Riot.xcscheme b/Riot.xcodeproj/xcshareddata/xcschemes/Riot.xcscheme index 9350fef63..52ec9a4e1 100644 --- a/Riot.xcodeproj/xcshareddata/xcschemes/Riot.xcscheme +++ b/Riot.xcodeproj/xcshareddata/xcschemes/Riot.xcscheme @@ -1,10 +1,11 @@ + version = "1.7"> + buildImplicitDependencies = "YES" + runPostActionsOnFailure = "NO"> @@ -34,20 +35,11 @@ - - - - @@ -60,6 +52,17 @@ + + + + + + + + + + From 5664c418c4cdf89e84e7b4500c503721294ee29c Mon Sep 17 00:00:00 2001 From: Stefan Ceriu Date: Wed, 29 May 2024 15:17:42 +0300 Subject: [PATCH 08/12] Prepare for new sprint --- Config/AppVersion.xcconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Config/AppVersion.xcconfig b/Config/AppVersion.xcconfig index 86d2d6377..c4af686bf 100644 --- a/Config/AppVersion.xcconfig +++ b/Config/AppVersion.xcconfig @@ -15,5 +15,5 @@ // // Version -MARKETING_VERSION = 1.11.11 -CURRENT_PROJECT_VERSION = 1.11.11 +MARKETING_VERSION = 1.11.12 +CURRENT_PROJECT_VERSION = 1.11.12 From af17fd1647ec05d6f3ca58023c9f690346d094db Mon Sep 17 00:00:00 2001 From: Doug <6060466+pixlwave@users.noreply.github.com> Date: Thu, 30 May 2024 13:11:19 +0100 Subject: [PATCH 09/12] Fix a crash when the user taps play multiple times and the download fails. (#7799) --- .../Room/Attachements/MXKAttachmentsViewController.m | 8 +++++++- changelog.d/7791.bugfix | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 changelog.d/7791.bugfix diff --git a/Riot/Modules/Room/Attachements/MXKAttachmentsViewController.m b/Riot/Modules/Room/Attachements/MXKAttachmentsViewController.m index 331121341..48bcc8085 100644 --- a/Riot/Modules/Room/Attachements/MXKAttachmentsViewController.m +++ b/Riot/Modules/Room/Attachements/MXKAttachmentsViewController.m @@ -107,6 +107,8 @@ The attachments array (MXAttachment instances). @property (nonatomic) BOOL customAnimationsEnabled; +@property (nonatomic) BOOL isLoadingVideo; + @end @implementation MXKAttachmentsViewController @@ -969,8 +971,10 @@ - (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPa navigationBarDisplayTimer = [NSTimer scheduledTimerWithTimeInterval:5 target:self selector:@selector(hideNavigationBar) userInfo:self repeats:NO]; } } - else + else if (!self.isLoadingVideo) { + self.isLoadingVideo = YES; + MXKPieChartView *pieChartView = [[MXKPieChartView alloc] initWithFrame:CGRectMake(0, 0, 40, 40)]; pieChartView.progress = 0; pieChartView.progressColor = [UIColor colorWithRed:1 green:1 blue:1 alpha:0.25]; @@ -1020,6 +1024,7 @@ - (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPa [selectedCell.moviePlayer.player play]; [pieChartView removeFromSuperview]; + self.isLoadingVideo = NO; [self hideNavigationBar]; } @@ -1035,6 +1040,7 @@ - (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPa MXLogDebug(@"[MXKAttachmentsVC] video download failed"); [pieChartView removeFromSuperview]; + self.isLoadingVideo = NO; // Display the navigation bar so that the user can leave this screen self.navigationBarContainer.hidden = NO; diff --git a/changelog.d/7791.bugfix b/changelog.d/7791.bugfix new file mode 100644 index 000000000..9bd6b87db --- /dev/null +++ b/changelog.d/7791.bugfix @@ -0,0 +1 @@ +Fix a crash when the user taps play multiple times and the video download fails. \ No newline at end of file From 995b3f63cb0096dffd89405f3aba0a2b2d38eadb Mon Sep 17 00:00:00 2001 From: Doug Date: Thu, 30 May 2024 13:15:25 +0100 Subject: [PATCH 10/12] version++ --- CHANGES.md | 7 +++++++ changelog.d/7791.bugfix | 1 - 2 files changed, 7 insertions(+), 1 deletion(-) delete mode 100644 changelog.d/7791.bugfix diff --git a/CHANGES.md b/CHANGES.md index 5d1881ff8..bf6fc003b 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,10 @@ +## Changes in 1.11.12 (2024-05-30) + +🐛 Bugfixes + +- Fix a crash when the user taps play multiple times and the video download fails. ([#7791](https://github.com/element-hq/element-ios/issues/7791)) + + ## Changes in 1.11.11 (2024-05-29) No significant changes. diff --git a/changelog.d/7791.bugfix b/changelog.d/7791.bugfix deleted file mode 100644 index 9bd6b87db..000000000 --- a/changelog.d/7791.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fix a crash when the user taps play multiple times and the video download fails. \ No newline at end of file From c5cbcab44a47acce512994362835a96700393caa Mon Sep 17 00:00:00 2001 From: Doug Date: Thu, 30 May 2024 14:23:14 +0100 Subject: [PATCH 11/12] finish version++ From 263e713f17e529a14da2a4ec3699d111e4c3fae9 Mon Sep 17 00:00:00 2001 From: Nicolas Buquet Date: Wed, 5 Jun 2024 14:06:11 +0200 Subject: [PATCH 12/12] Resolve conflicts on Rebase/Element-v1.11.12 into Tchap --- Config/AppVersion.xcconfig | 5 ----- Podfile.lock | 24 ++++++++++-------------- 2 files changed, 10 insertions(+), 19 deletions(-) diff --git a/Config/AppVersion.xcconfig b/Config/AppVersion.xcconfig index ac0691f0d..ca0d8e7b3 100644 --- a/Config/AppVersion.xcconfig +++ b/Config/AppVersion.xcconfig @@ -15,10 +15,5 @@ // // Version -<<<<<<< HEAD MARKETING_VERSION = 2.7.7 CURRENT_PROJECT_VERSION = 1 -======= -MARKETING_VERSION = 1.11.12 -CURRENT_PROJECT_VERSION = 1.11.12 ->>>>>>> v1.11.12 diff --git a/Podfile.lock b/Podfile.lock index 99fbf2ae6..8566bd194 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -39,20 +39,20 @@ PODS: - LoggerAPI (1.9.200): - Logging (~> 1.1) - Logging (1.4.0) - - MatrixSDK (0.27.8): - - MatrixSDK/Core (= 0.27.8) - - MatrixSDK/Core (0.27.8): + - MatrixSDK (0.27.7): + - MatrixSDK/Core (= 0.27.7) + - MatrixSDK/Core (0.27.7): - AFNetworking (~> 4.0.0) - GZIP (~> 1.3.0) - libbase58 (~> 0.1.4) - - MatrixSDKCrypto (= 0.4.2) + - MatrixSDKCrypto (= 0.3.13) - OLMKit (~> 3.2.5) - Realm (= 10.27.0) - SwiftyBeaver (= 1.9.5) - - MatrixSDK/JingleCallStack (0.27.8): + - MatrixSDK/JingleCallStack (0.27.7): - JitsiMeetSDKLite (= 8.1.2-lite) - MatrixSDK/Core - - MatrixSDKCrypto (0.4.2) + - MatrixSDKCrypto (0.3.13) - OLMKit (3.2.12): - OLMKit/olmc (= 3.2.12) - OLMKit/olmcpp (= 3.2.12) @@ -102,8 +102,8 @@ DEPENDENCIES: - KeychainAccess (~> 4.2.2) - KTCenterFlowLayout (~> 1.3.1) - libPhoneNumber-iOS (~> 0.9.13) - - MatrixSDK (= 0.27.8) - - MatrixSDK/JingleCallStack (= 0.27.8) + - MatrixSDK (= 0.27.7) + - MatrixSDK/JingleCallStack (= 0.27.7) - OLMKit - PostHog (~> 2.0.0) - ReadMoreTextView (~> 3.0.1) @@ -187,8 +187,8 @@ SPEC CHECKSUMS: libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75 LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d Logging: beeb016c9c80cf77042d62e83495816847ef108b - MatrixSDK: 4c5a8572a481340ab233451ad36c1322d371fae5 - MatrixSDKCrypto: 736069ee0a5ec12852ab3498bf2242acecc443fc + MatrixSDK: e07b2309f3c6498c1df987441da7006d099c47a4 + MatrixSDKCrypto: bf08b72f2cd015d8749420a2b8b92fc0536bedf4 OLMKit: da115f16582e47626616874e20f7bb92222c7a51 PostHog: 660ec6c9d80cec17b685e148f17f6785a88b597d ReadMoreTextView: 19147adf93abce6d7271e14031a00303fe28720d @@ -208,10 +208,6 @@ SPEC CHECKSUMS: zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c ZXingObjC: 8898711ab495761b2dbbdec76d90164a6d7e14c5 -<<<<<<< HEAD PODFILE CHECKSUM: 3db384be27ed06c11b15ee9abc4616afd45428c1 -======= -PODFILE CHECKSUM: b6073389caf93d20d47c9e511f4b9c3e1ad6dc5d ->>>>>>> v1.11.12 COCOAPODS: 1.14.3