Merge branch 'release/1.10.8/master'

CHANGES.md

@@ -1,3 +1,11 @@
+## Changes in 1.10.8 (2023-03-28)
+
+🙌 Improvements
+
+- Verification: Display upgrade verification prompt ([#7454](https://github.com/vector-im/element-ios/pull/7454))
+- Upgrade MatrixSDK version ([v0.26.5](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.26.5)).
+
+
 ## Changes in 1.10.7 (2023-03-22)
 
 🙌 Improvements

Config/AppVersion.xcconfig

@@ -15,5 +15,5 @@
 //
 
 // Version
-MARKETING_VERSION = 1.10.7
-CURRENT_PROJECT_VERSION = 1.10.7
+MARKETING_VERSION = 1.10.8
+CURRENT_PROJECT_VERSION = 1.10.8

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.26.4'
+$matrixSDKVersion = '= 0.26.5'
 # $matrixSDKVersion = :local
 # $matrixSDKVersion = { :branch => 'develop'}
 # $matrixSDKVersion = { :specHash => { git: 'https://git.io/fork123', branch: 'fix' } }

Podfile.lock

@@ -37,9 +37,9 @@ PODS:
   - LoggerAPI (1.9.200):
     - Logging (~> 1.1)
   - Logging (1.4.0)
-  - MatrixSDK (0.26.4):
-    - MatrixSDK/Core (= 0.26.4)
-  - MatrixSDK/Core (0.26.4):
+  - MatrixSDK (0.26.5):
+    - MatrixSDK/Core (= 0.26.5)
+  - MatrixSDK/Core (0.26.5):
     - AFNetworking (~> 4.0.0)
     - GZIP (~> 1.3.0)
     - libbase58 (~> 0.1.4)
@@ -47,7 +47,7 @@ PODS:
     - OLMKit (~> 3.2.5)
     - Realm (= 10.27.0)
     - SwiftyBeaver (= 1.9.5)
-  - MatrixSDK/JingleCallStack (0.26.4):
+  - MatrixSDK/JingleCallStack (0.26.5):
     - JitsiMeetSDK (= 5.0.2)
     - MatrixSDK/Core
   - MatrixSDKCrypto (0.3.0)
@@ -100,8 +100,8 @@ DEPENDENCIES:
   - KeychainAccess (~> 4.2.2)
   - KTCenterFlowLayout (~> 1.3.1)
   - libPhoneNumber-iOS (~> 0.9.13)
-  - MatrixSDK (= 0.26.4)
-  - MatrixSDK/JingleCallStack (= 0.26.4)
+  - MatrixSDK (= 0.26.5)
+  - MatrixSDK/JingleCallStack (= 0.26.5)
   - OLMKit
   - PostHog (~> 2.0.0)
   - ReadMoreTextView (~> 3.0.1)
@@ -183,7 +183,7 @@ SPEC CHECKSUMS:
   libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75
   LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d
   Logging: beeb016c9c80cf77042d62e83495816847ef108b
-  MatrixSDK: f336fa2ba23d5db48873fa78d3e9565f768a2cda
+  MatrixSDK: 6711f8925fc3767ab7f52fd0c5d4c0380f2109c3
   MatrixSDKCrypto: 05ebe373ccebf40f8a0cff37d8f8b24fd01b9883
   OLMKit: da115f16582e47626616874e20f7bb92222c7a51
   PostHog: 660ec6c9d80cec17b685e148f17f6785a88b597d
@@ -204,6 +204,6 @@ SPEC CHECKSUMS:
   zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
   ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb
 
-PODFILE CHECKSUM: 741947b0cd7b44554c29e7ca268403622ba770b4
+PODFILE CHECKSUM: b87055864fa0465c098334ad789366081a7f9c3c
 
 COCOAPODS: 1.11.3

Riot/Assets/en.lproj/Vector.strings

@@ -1560,6 +1560,11 @@ Tap the + to start adding people.";
 "key_verification_self_verify_current_session_alert_message" = "Other users may not trust it.";
 "key_verification_self_verify_current_session_alert_validate_action" = "Verify";
 
+// Legacy to Rust security upgrade
+
+"key_verification_self_verify_security_upgrade_alert_title" = "App updated";
+"key_verification_self_verify_security_upgrade_alert_message" = "Secure messaging has been improved with the latest update. Please re-verify your device.";
+
 // Unverified sessions
 "key_verification_alert_title" = "You have unverified sessions";
 "key_verification_alert_body" = "Review to ensure your account is safe.";

Riot/Experiments/CryptoSDKFeature.swift

@@ -40,7 +40,18 @@ import MatrixSDKCrypto
         RiotSettings.shared.enableCryptoSDK
     }
     
+    var needsVerificationUpgrade: Bool {
+        get {
+            return RiotSettings.shared.showVerificationUpgradeAlert
+        }
+        set {
+            RiotSettings.shared.showVerificationUpgradeAlert = newValue
+        }
+    }
+    
     private static let FeatureName = "ios-crypto-sdk"
+    private static let FeatureNameV2 = "ios-crypto-sdk-v2"
+    
     private let remoteFeature: RemoteFeaturesClientProtocol
     private let localFeature: PhasedRolloutFeature
     
@@ -98,6 +109,13 @@ import MatrixSDKCrypto
     }
     
     private func isFeatureEnabled(userId: String) -> Bool {
-        remoteFeature.isFeatureEnabled(Self.FeatureName) || localFeature.isEnabled(userId: userId)
+        // This feature includes app version with a bug, and thus will not be rolled out to 100% users
+        remoteFeature.isFeatureEnabled(Self.FeatureName)
+        
+        // Second version of the remote feature with a bugfix and released eventually to 100% users
+        || remoteFeature.isFeatureEnabled(Self.FeatureNameV2)
+        
+        // Local feature
+        || localFeature.isEnabled(userId: userId)
     }
 }

Riot/Generated/Strings.swift

@@ -3027,6 +3027,14 @@ public class VectorL10n: NSObject {
   public static var keyVerificationSelfVerifyCurrentSessionAlertValidateAction: String { 
     return VectorL10n.tr("Vector", "key_verification_self_verify_current_session_alert_validate_action") 
   }
+  /// Secure messaging has been improved with the latest update. Please re-verify your device.
+  public static var keyVerificationSelfVerifySecurityUpgradeAlertMessage: String { 
+    return VectorL10n.tr("Vector", "key_verification_self_verify_security_upgrade_alert_message") 
+  }
+  /// App updated
+  public static var keyVerificationSelfVerifySecurityUpgradeAlertTitle: String { 
+    return VectorL10n.tr("Vector", "key_verification_self_verify_security_upgrade_alert_title") 
+  }
   /// Review
   public static var keyVerificationSelfVerifyUnverifiedSessionsAlertValidateAction: String { 
     return VectorL10n.tr("Vector", "key_verification_self_verify_unverified_sessions_alert_validate_action") 

Riot/Managers/Settings/RiotSettings.swift

@@ -211,6 +211,9 @@ final class RiotSettings: NSObject {
     @UserDefault(key: "hideVerifyThisSessionAlert", defaultValue: false, storage: defaults)
     var hideVerifyThisSessionAlert
     
+    @UserDefault(key: "showVerificationUpgradeAlert", defaultValue: false, storage: defaults)
+    var showVerificationUpgradeAlert
+    
     @UserDefault(key: "matrixApps", defaultValue: false, storage: defaults)
     var matrixApps
     

Riot/Modules/Home/AllChats/AllChatsViewController.swift

@@ -985,8 +985,20 @@ extension AllChatsViewController: SplitViewMasterViewControllerProtocol {
     private func presentVerifyCurrentSessionAlert(with session: MXSession) {
         MXLog.debug("[AllChatsViewController] presentVerifyCurrentSessionAlertWithSession")
         
-        let alert = UIAlertController(title: VectorL10n.keyVerificationSelfVerifyCurrentSessionAlertTitle,
-                                      message: VectorL10n.keyVerificationSelfVerifyCurrentSessionAlertMessage,
+        let title: String
+        let message: String
+        
+        if let feature = MXSDKOptions.sharedInstance().cryptoSDKFeature,
+           feature.isEnabled && feature.needsVerificationUpgrade {
+            title = VectorL10n.keyVerificationSelfVerifySecurityUpgradeAlertTitle
+            message = VectorL10n.keyVerificationSelfVerifySecurityUpgradeAlertMessage
+        } else {
+            title = VectorL10n.keyVerificationSelfVerifyCurrentSessionAlertTitle
+            message = VectorL10n.keyVerificationSelfVerifyCurrentSessionAlertMessage
+        }
+        
+        let alert = UIAlertController(title: title,
+                                      message: message,
                                       preferredStyle: .alert)
         
         alert.addAction(UIAlertAction(title: VectorL10n.keyVerificationSelfVerifyCurrentSessionAlertValidateAction,