Merge branch 'release/1.11.22/master'

CHANGES.md

@@ -1,3 +1,11 @@
+## Changes in 1.11.22 (2024-12-10)
+
+🐛 Bugfixes
+
+- Fix a crash when restoring from a backup and a bug where you couldn't reset cross-signing. ([#7883](https://github.com/element-hq/element-ios/pull/7883))
+- Fix display of incoming call for group calls when receiving VOIP notification. ([#7858](https://github.com/element-hq/element-ios/issues/7858))
+
+
 ## Changes in 1.11.21 (2024-11-14)
 
 No significant changes.

Config/AppVersion.xcconfig

@@ -15,5 +15,5 @@
 //
 
 // Version
-MARKETING_VERSION = 1.11.21
-CURRENT_PROJECT_VERSION = 1.11.21
+MARKETING_VERSION = 1.11.22
+CURRENT_PROJECT_VERSION = 1.11.22

Podfile.lock

@@ -39,16 +39,16 @@ PODS:
   - LoggerAPI (1.9.200):
     - Logging (~> 1.1)
   - Logging (1.4.0)
-  - MatrixSDK (0.27.15):
-    - MatrixSDK/Core (= 0.27.15)
-  - MatrixSDK/Core (0.27.15):
+  - MatrixSDK (0.27.16):
+    - MatrixSDK/Core (= 0.27.16)
+  - MatrixSDK/Core (0.27.16):
     - AFNetworking (~> 4.0.0)
     - GZIP (~> 1.3.0)
     - libbase58 (~> 0.1.4)
     - MatrixSDKCrypto (= 0.4.3)
     - Realm (= 10.27.0)
     - SwiftyBeaver (= 1.9.5)
-  - MatrixSDK/JingleCallStack (0.27.15):
+  - MatrixSDK/JingleCallStack (0.27.16):
     - JitsiMeetSDKLite (= 8.1.2-lite)
     - MatrixSDK/Core
   - MatrixSDKCrypto (0.4.3)
@@ -179,7 +179,7 @@ SPEC CHECKSUMS:
   libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75
   LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d
   Logging: beeb016c9c80cf77042d62e83495816847ef108b
-  MatrixSDK: 12b379749b84ab5b3662042acb1914b9f9bb692b
+  MatrixSDK: ce8f2cec670c2212144a129cc617d4144c89b97f
   MatrixSDKCrypto: 27bee960e0e8b3a3039f3f3e93dd2ec88299c77e
   ReadMoreTextView: 19147adf93abce6d7271e14031a00303fe28720d
   Realm: 9ca328bd7e700cc19703799785e37f77d1a130f2
@@ -198,6 +198,6 @@ SPEC CHECKSUMS:
   zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
   ZXingObjC: 8898711ab495761b2dbbdec76d90164a6d7e14c5
 
-PODFILE CHECKSUM: 484a1cdf04951cc82156f29de196efd76d3ad893
+PODFILE CHECKSUM: 9148246fffa2c32e3c9b29a51cae4bb037497056
 
 COCOAPODS: 1.14.3

Riot/Assets/ka.lproj/InfoPlist.strings

@@ -0,0 +1 @@
+

Riot/Assets/ro.lproj/Vector.strings

@@ -1,11 +1,14 @@
 // String for App Store
 "store_short_description" = "// String pe App Store";
 "title_favourites" = "Favorite";
-"title_people" = "Oamei";
+"title_people" = "Oameni";
 "title_rooms" = "Camere";
 "title_groups" = "Comunități";
 "warning" = "Greșeală";
 // Actions
 "view" = "Văzut";
 "next" = "Următorul";
 "back" = "Înapoi";
+
+// Titles
+"title_home" = "Acasă";

Riot/Assets/sk.lproj/Localizable.strings

@@ -171,3 +171,4 @@
 
 /* New voice broadcast from a specific person, not referencing a room. */
 "VOICE_BROADCAST_FROM_USER" = "%@ začal/a hlasové vysielanie";
+"UNSUPPORTED_CALL" = "Nepodporovaný hovor";

Riot/Assets/sk.lproj/Vector.strings

@@ -2977,3 +2977,4 @@
 
 // MARK: - WYSIWYG Composer
 "wysiwyg_composer_action_minimise_action" = "Zmenšiť editor";
+"call_unsupported_matrix_rtc_call" = "Nepodporovaný hovor. Na pripojenie k tomuto hovoru je potrebná nová aplikácia Element X.";

Riot/Assets/sv.lproj/Localizable.strings

@@ -121,3 +121,4 @@
 
 /* New voice broadcast from a specific person, not referencing a room. */
 "VOICE_BROADCAST_FROM_USER" = "%@ påbörjade en röstsändning";
+"UNSUPPORTED_CALL" = "Samtal stöds inte";

Riot/Assets/sv.lproj/Vector.strings

@@ -2721,3 +2721,4 @@
 
 // MARK: - WYSIWYG Composer
 "wysiwyg_composer_action_minimise_action" = "Krymp redigerare";
+"call_unsupported_matrix_rtc_call" = "Samtal stöds inte. Nya Element X-appen behövs för att gå med i det här samtalet.";

Riot/Assets/uk.lproj/Localizable.strings

@@ -121,3 +121,4 @@
 
 /* New voice broadcast from a specific person, not referencing a room. */
 "VOICE_BROADCAST_FROM_USER" = "%@ розпочинає голосову трансляцію";
+"UNSUPPORTED_CALL" = "Непідтримуваний виклик";

Riot/Assets/uk.lproj/Vector.strings

@@ -2979,3 +2979,4 @@
 
 // MARK: - WYSIWYG Composer
 "wysiwyg_composer_action_minimise_action" = "Зменшити редактор";
+"call_unsupported_matrix_rtc_call" = "Непідтримуваний виклик. Потрібен застосунок Element X, щоб приєднатися до цього виклику.";

Riot/Assets/zh_Hans.lproj/Vector.strings

@@ -2227,7 +2227,7 @@
 "authentication_qr_login_start_subtitle" = "用此设备的相机扫描显示在你的其他设备上的QR码：";
 "authentication_qr_login_start_title" = "扫描QR码";
 "authentication_choose_password_signout_all_devices" = "登出全部设备";
-"authentication_login_with_qr" = "用QR码登录";
+"authentication_login_with_qr" = "使用二维码登录";
 "onboarding_congratulations_home_button" = "带我到主页";
 "onboarding_use_case_message" = "我们将帮助你连接";
 "invite_to" = "邀请到%@";
@@ -2426,3 +2426,5 @@
 "network_offline_message" = "您已离线，请检查您的网络链接。";
 "key_verification_alert_body" = "重新检查以确保您的账户安全。";
 "key_verification_scan_qr_code_title" = "扫描 QR Code";
+"room_action_report" = "举报房间";
+"pill_message_from" = "来自 %@ 的消息";

Riot/Managers/Call/CallPresenter.swift

@@ -309,8 +309,11 @@ class CallPresenter: NSObject {
                     return
                 }
                 let user = session.user(withUserId: event.sender)
-                let displayName = NSString.localizedUserNotificationString(forKey: "GROUP_CALL_FROM_USER",
-                                                                           arguments: [user?.displayname as Any])
+                let displayNameUNLocalizedString = NSString.localizedUserNotificationString(forKey: "GROUP_CALL_FROM_USER",
+                                                                                            arguments: [user?.displayname as Any])
+
+                // will fix app crash when CXCallUpdate accesses the localizedCallerName property because list of allowed classes for com.apple.callkit.callsourcehost service contains only NSString
+                let displayName = NSString(string: displayNameUNLocalizedString) as String
 
                 MXLog.debug("[CallPresenter] processWidgetEvent: Report new incoming call with id: \(newUUID.uuidString)")
 

Riot/Modules/CrossSigning/Setup/CrossSigningSetupCoordinator.swift

@@ -45,49 +45,48 @@ final class CrossSigningSetupCoordinator: CrossSigningSetupCoordinatorType {
     // MARK: - Public methods
 
     func start() {
-        self.showReauthentication()
+        setupCrossSigning()
     }
 
     func toPresentable() -> UIViewController {
         return self.parameters.presenter.toPresentable()
     }
 
     // MARK: - Private methods
-
-    private func showReauthentication() {
+
+    private func setupCrossSigning(with authenticationParameters: [String: Any] = [:]) {
+        guard let crossSigning = parameters.session.crypto?.crossSigning else { return }
 
+        crossSigning.setup(withAuthParams: authenticationParameters) { [weak self] in
+            guard let self else { return }
+            delegate?.crossSigningSetupCoordinatorDidComplete(self)
+        } failure: { [weak self] error in
+            guard let self else { return }
+
+            if let responseData = (error as NSError).userInfo[MXHTTPClientErrorResponseDataKey] as? [AnyHashable: Any],
+               let authenticationSession = MXAuthenticationSession(fromJSON: responseData) {
+                showReauthentication(authenticationSession: authenticationSession)
+            } else {
+                delegate?.crossSigningSetupCoordinator(self, didFailWithError: error)
+            }
+        }
+    }
+
+    private func showReauthentication(authenticationSession: MXAuthenticationSession) {
         let setupCrossSigningRequest = self.crossSigningService.setupCrossSigningRequest()
 
         let reauthenticationParameters = ReauthenticationCoordinatorParameters(session: parameters.session,
                                                                                presenter: parameters.presenter,
                                                                                title: parameters.title,
                                                                                message: parameters.message,
-                                                                               authenticatedEndpointRequest: setupCrossSigningRequest)
+                                                                               authenticationSession: authenticationSession)
 
         let coordinator = ReauthenticationCoordinator(parameters: reauthenticationParameters)
         coordinator.delegate = self
         self.add(childCoordinator: coordinator)
 
         coordinator.start()
     }
-
-    private func setupCrossSigning(with authenticationParameters: [String: Any]) {
-        guard let crossSigning = self.parameters.session.crypto?.crossSigning else {
-            return
-        }
-
-        crossSigning.setup(withAuthParams: authenticationParameters) { [weak self] in
-            guard let self = self else {
-                return
-            }
-            self.delegate?.crossSigningSetupCoordinatorDidComplete(self)
-        } failure: { [weak self] error in
-            guard let self = self else {
-                return
-            }
-            self.delegate?.crossSigningSetupCoordinator(self, didFailWithError: error)
-        }
-    }
 }
 
 // MARK: - ReauthenticationCoordinatorDelegate