Merge branch 'release/1.11.23/master'

Author: pixlwave

CHANGES.md

@@ -1,3 +1,13 @@
+## Changes in 1.11.23 (2025-01-10)
+
+🙌 Improvements
+
+- Show sunset banners, guiding users to install Element X when registering a new account against a server with MAS. ([#7889](https://github.com/element-hq/element-ios/issues/7889))
+
+⚠️ API Changes
+
+- Adds a BuildSettings.replacementApp setting, used to control the sunset banners. ([#7889](https://github.com/element-hq/element-ios/issues/7889))
+
 ## Changes in 1.11.22 (2024-12-10)
 
 🐛 Bugfixes

Config/AppVersion.xcconfig

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

Config/BuildSettings.swift

@@ -441,4 +441,25 @@ final class BuildSettings: NSObject {
 
     // MARK: - Alerts
     static let showUnverifiedSessionsAlert = true
+    
+    // MARK: - Sunset
+    
+    /// Meta data about the app that will replaces this one with Matrix 2.0 support.
+    struct ReplacementApp {
+        /// The app's display name, used in marketing banners.
+        let name = "Element X"
+        /// A link that will be opened to tell the user more about the new app, Matrix 2.0 and the migration.
+        let learnMoreURL = URL(string: "https://element.io/app-for-productivity")!
+        /// The app's iTunes/product ID, used to show the App Store page in-app.
+        let productID = "1631335820"
+        /// A fallback URL that will be opened if there are any issues showing the App Store page in-app.
+        let appStoreURL = URL(string: "https://apps.apple.com/app/element-x-secure-chat-call/id1631335820")!
+    }
+    
+    /// Information about the Matrix 2.0 compatible app that will replace this one in the future.
+    ///
+    /// The presence of this setting acts as a feature flag to show marketing banners for the app
+    /// when it is detected that the homeserver is running Matrix 2.0. Set this to `nil` until you
+    /// are ready to migrate your users.
+    static let replacementApp: ReplacementApp? = .init()
 }

Podfile.lock

@@ -39,16 +39,16 @@ PODS:
   - LoggerAPI (1.9.200):
     - Logging (~> 1.1)
   - Logging (1.4.0)
-  - MatrixSDK (0.27.16):
-    - MatrixSDK/Core (= 0.27.16)
-  - MatrixSDK/Core (0.27.16):
+  - MatrixSDK (0.27.17):
+    - MatrixSDK/Core (= 0.27.17)
+  - MatrixSDK/Core (0.27.17):
     - 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.16):
+  - MatrixSDK/JingleCallStack (0.27.17):
     - 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: ce8f2cec670c2212144a129cc617d4144c89b97f
+  MatrixSDK: e3096b0b47f8a0bde6ae3f614f9c49e7e92b03ea
   MatrixSDKCrypto: 27bee960e0e8b3a3039f3f3e93dd2ec88299c77e
   ReadMoreTextView: 19147adf93abce6d7271e14031a00303fe28720d
   Realm: 9ca328bd7e700cc19703799785e37f77d1a130f2

Riot/Assets/Images.xcassets/Sunset/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Riot/Assets/Images.xcassets/sunset_banner_icon.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "ElementXBannerIcon.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Riot/Assets/Images.xcassets/sunset_banner_icon.imageset/ElementXBannerIcon.png

@@ -98,6 +98,14 @@
 "accessibility_button_label" = "button";
 "accessibility_selected" = "selected";
 
+// MARK: Sunset
+"sunset_delegated_oidc_registration_not_supported_title" = "You can no longer create an account with %1$@ using this app";
+"sunset_delegated_oidc_registration_not_supported_message" = "Download %1$@ to use %2$@ for your account or choose a different homeserver.";
+"sunset_delegated_oidc_registration_not_supported_generic_error" = "You can no longer create an account with the entered homeserver using this app";
+"sunset_download_banner_title" = "Download %1$@";
+"sunset_download_banner_message" = "Faster, more secure, and packed with powerful collaboration tools.";
+"sunset_download_banner_learn_more" = "Learn more";
+
 // MARK: Onboarding
 "onboarding_splash_register_button_title" = "Create account";
 "onboarding_splash_login_button_title" = "I already have an account";