Merge branch 'release/1.11.11/master'

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

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

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' } }

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

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"
       }
     },
     {

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";

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") 

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 {

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

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)
                 }

RiotTests/FakeUtils.swift

@@ -260,6 +260,9 @@ class FakeCrypto: NSObject, MXCrypto {
 
     }
 
+    func invalidateCache(_ done: @escaping () -> Void) {
+
+    }
 }
 
 

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