Merge branch 'release/1.9.16/master'

.github/workflows/release-alpha.yml

@@ -13,22 +13,10 @@ env:
   MX_GIT_BRANCH: ${{ github.event.pull_request.head.ref }}
 
 jobs:
-  check-secret:
-    runs-on: macos-12
-    outputs:
-      out-key: ${{ steps.out-key.outputs.defined }}
-    steps:
-        - id: out-key
-          env:
-            P12_KEY: ${{ secrets.ALPHA_CERTIFICATES_P12 }}
-            P12_PASSWORD_KEY: ${{ secrets.ALPHA_CERTIFICATES_P12 }}
-          if: "${{ env.P12_KEY != '' || env.P12_PASSWORD_KEY != '' }}"
-          run: echo "::set-output name=defined::true"
   build:
-    # Run job if secrets are available (not available for forks).
-    needs: [check-secret]
+    # Don't run for forks as secrets are unavailable.
     if: |
-      needs.check-secret.outputs.out-key == 'true' &&
+      github.event.pull_request.head.repo.full_name == github.repository &&
       (github.event_name == 'push' ||
       (github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'Trigger-PR-Build')))
 

CHANGES.md

@@ -1,3 +1,43 @@
+## Changes in 1.9.16 (2023-01-24)
+
+✨ Features
+
+- Rich Text Composer: Enable bulleted/numbered lists support ([#7238](https://github.com/vector-im/element-ios/issues/7238))
+- Rich Text Composer: Enable quote & code blocks support ([#7271](https://github.com/vector-im/element-ios/issues/7271))
+- Voice Broadcast: When deleting a voice broadcast, all data is now deleted on server side (MSC3912 implementation). ([#7283](https://github.com/vector-im/element-ios/issues/7283))
+
+🙌 Improvements
+
+- Labs: VoiceBroadcast: Handle VoIP buttons when VB is used ([#7225](https://github.com/vector-im/element-ios/pull/7225))
+- Polls: add UI for active poll history. ([#7267](https://github.com/vector-im/element-ios/pull/7267))
+- CryptoSDK: Add labs settings to enable Crypto SDK ([#7272](https://github.com/vector-im/element-ios/pull/7272))
+- Voice Broadcast: Improved detection of voice broadcast completion during playback. ([#7273](https://github.com/vector-im/element-ios/pull/7273))
+- Remove "Leave" button on Room details screen ([#7275](https://github.com/vector-im/element-ios/pull/7275))
+- Polls: poll history UI for past polls. ([#7278](https://github.com/vector-im/element-ios/pull/7278))
+- Polls: render replies to poll events better. ([#7284](https://github.com/vector-im/element-ios/pull/7284))
+- CryptoV2: Display migration progress during startup ([#7286](https://github.com/vector-im/element-ios/pull/7286))
+- Upgrade MatrixSDK version ([v0.24.8](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.24.8)).
+- Voice broadcast connection error handling while recording. ([#7229](https://github.com/vector-im/element-ios/issues/7229))
+- Handle a connection issue when we try to start a new voice broadcast. ([#7234](https://github.com/vector-im/element-ios/issues/7234))
+- Rich Text Editor: https:// or mailto: scheme is automatically added when creating a link if no scheme is specified. ([#7279](https://github.com/vector-im/element-ios/issues/7279))
+- Rich Text Editor: Adding a link over a blank selection, prompts the user to create a new link with new text to replace such selection. ([#7280](https://github.com/vector-im/element-ios/issues/7280))
+- Voice Broadcast: handle the lost of connectivity with the homeserver while recording. ([#7285](https://github.com/vector-im/element-ios/issues/7285))
+
+🐛 Bugfixes
+
+- Voice Broadcast: The Now Playing Info Center now displays a voice broadcast instead of a voice message when a user is listening to a voice broadcast. ([#7257](https://github.com/vector-im/element-ios/pull/7257))
+- Fix a crash caused by the missing Avatar Service dependency. ([#7268](https://github.com/vector-im/element-ios/pull/7268))
+- The (edited) tag for messages is now light grey like on web and Android. ([#5148](https://github.com/vector-im/element-ios/issues/5148))
+- Live Location Sharing does not work on first selection after granting "Allow always" location permission. ([#7222](https://github.com/vector-im/element-ios/issues/7222))
+- Voice Broadcast: Fixed an issue where the voice broadcast audio player progress bar behaved unexpectedly. ([#7252](https://github.com/vector-im/element-ios/issues/7252))
+- Voice Broadcast: VoiceBroadcast chunks are no longer resent as voice messages ([#7261](https://github.com/vector-im/element-ios/issues/7261))
+- Timeline's links and hyperlinks match now the blue colour of Android and Web. ([#7263](https://github.com/vector-im/element-ios/issues/7263))
+
+🧱 Build
+
+- Fix Element Alpha workflow not being able to run. ([#7256](https://github.com/vector-im/element-ios/pull/7256))
+
+
 ## Changes in 1.9.15 (2023-01-10)
 
 ✨ Features

Config/AppVersion.xcconfig

@@ -15,5 +15,5 @@
 //
 
 // Version
-MARKETING_VERSION = 1.9.15
-CURRENT_PROJECT_VERSION = 1.9.15
+MARKETING_VERSION = 1.9.16
+CURRENT_PROJECT_VERSION = 1.9.16

Config/BuildSettings.swift

@@ -399,6 +399,7 @@ final class BuildSettings: NSObject {
     // MARK: - Polls
 
     static let pollsEnabled = true
+    static var pollsHistoryEnabled: Bool = false
 
     // MARK: - Location Sharing
 

Config/CommonConfiguration.swift

@@ -91,6 +91,12 @@ class CommonConfiguration: NSObject, Configurable {
         MXKeyProvider.sharedInstance().delegate = EncryptionKeyManager.shared
 
         sdkOptions.enableNewClientInformationFeature = RiotSettings.shared.enableClientInformationFeature
+
+        #if DEBUG
+        if sdkOptions.isCryptoSDKAvailable {
+            sdkOptions.enableCryptoSDK = RiotSettings.shared.enableCryptoSDK
+        }
+        #endif
     }
 
     private func makeASCIIUserAgent() -> String? {

DesignKit/Source/ColorValues.swift

@@ -48,5 +48,7 @@ public struct ColorValues: Colors {
 
     public let ems: UIColor
 
+    public let links: UIColor
+
     public let namesAndAvatars: [UIColor]
 }

DesignKit/Source/Colors.swift

@@ -67,6 +67,10 @@ public protocol Colors {
     /// Global color: The EMS brand's purple colour.
     var ems: ColorType { get }
 
+    /// - Links
+    /// - Hyperlinks
+    var links: ColorType { get }
+
     /// - Names in chat timeline
     /// - Avatars default states that include first name letter
     var namesAndAvatars: [ColorType] { get }

DesignKit/Source/ColorsSwiftUI.swift

@@ -21,7 +21,7 @@ import SwiftUI
  Struct for holding colors for use in SwiftUI.
  */
 public struct ColorSwiftUI: Colors {
-
+    
     public let accent: Color
 
     public let alert: Color
@@ -48,8 +48,10 @@ public struct ColorSwiftUI: Colors {
 
     public var ems: Color
 
-    public let namesAndAvatars: [Color]
+    public let links: Color
 
+    public let namesAndAvatars: [Color]
+
     init(values: ColorValues) {
         accent = Color(values.accent)
         alert = Color(values.alert)
@@ -64,6 +66,7 @@ public struct ColorSwiftUI: Colors {
         navigation = Color(values.navigation)
         background = Color(values.background)
         ems = Color(values.ems)
+        links = Color(values.links)
         namesAndAvatars = values.namesAndAvatars.map({ Color($0) })
     }
 }

DesignKit/Source/ColorsUIkit.swift

@@ -45,6 +45,8 @@ import UIKit
     public let navigation: UIColor
 
     public let background: UIColor
+
+    public let links: UIColor
 
     public let namesAndAvatars: [UIColor]
 
@@ -61,6 +63,7 @@ import UIKit
         tile = values.tile
         navigation = values.navigation
         background = values.background
+        links = values.links
         namesAndAvatars = values.namesAndAvatars
     }
 }

DesignKit/Variants/Colors/Dark/DarkColors.swift

@@ -34,6 +34,7 @@ public class DarkColors {
         navigation: UIColor(rgb:0x21262C),
         background: UIColor(rgb:0x15191E),
         ems: UIColor(rgb: 0x7E69FF),
+        links: UIColor(rgb: 0x0086E6),
         namesAndAvatars: [
             UIColor(rgb:0x368BD6),
             UIColor(rgb:0xAC3BA8),

DesignKit/Variants/Colors/Light/LightColors.swift

@@ -35,6 +35,7 @@ public class LightColors {
         navigation: UIColor(rgb:0xF4F6FA),
         background: UIColor(rgb:0xFFFFFF),
         ems: UIColor(rgb: 0x7E69FF),
+        links: UIColor(rgb: 0x0086E6),
         namesAndAvatars: [
             UIColor(rgb:0x368BD6),
             UIColor(rgb:0xAC3BA8),

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

Podfile.lock

@@ -55,22 +55,22 @@ PODS:
   - LoggerAPI (1.9.200):
     - Logging (~> 1.1)
   - Logging (1.4.0)
-  - MatrixSDK (0.24.7):
-    - MatrixSDK/Core (= 0.24.7)
-  - MatrixSDK/Core (0.24.7):
+  - MatrixSDK (0.24.8):
+    - MatrixSDK/Core (= 0.24.8)
+  - MatrixSDK/Core (0.24.8):
     - AFNetworking (~> 4.0.0)
     - GZIP (~> 1.3.0)
     - libbase58 (~> 0.1.4)
     - MatrixSDK/CryptoSDK
     - OLMKit (~> 3.2.5)
     - Realm (= 10.27.0)
     - SwiftyBeaver (= 1.9.5)
-  - MatrixSDK/CryptoSDK (0.24.7):
-    - MatrixSDKCrypto (= 0.1.7)
-  - MatrixSDK/JingleCallStack (0.24.7):
+  - MatrixSDK/CryptoSDK (0.24.8):
+    - MatrixSDKCrypto (= 0.1.8)
+  - MatrixSDK/JingleCallStack (0.24.8):
     - JitsiMeetSDK (= 5.0.2)
     - MatrixSDK/Core
-  - MatrixSDKCrypto (0.1.7)
+  - MatrixSDKCrypto (0.1.8)
   - OLMKit (3.2.12):
     - OLMKit/olmc (= 3.2.12)
     - OLMKit/olmcpp (= 3.2.12)
@@ -122,8 +122,8 @@ DEPENDENCIES:
   - KeychainAccess (~> 4.2.2)
   - KTCenterFlowLayout (~> 1.3.1)
   - libPhoneNumber-iOS (~> 0.9.13)
-  - MatrixSDK (= 0.24.7)
-  - MatrixSDK/JingleCallStack (= 0.24.7)
+  - MatrixSDK (= 0.24.8)
+  - MatrixSDK/JingleCallStack (= 0.24.8)
   - OLMKit
   - PostHog (~> 1.4.4)
   - ReadMoreTextView (~> 3.0.1)
@@ -197,7 +197,7 @@ CHECKOUT OPTIONS:
     :git: https://github.com/matrix-org/matrix-analytics-events.git
 
 SPEC CHECKSUMS:
-  AFNetworking: 7864c38297c79aaca1500c33288e429c3451fdce
+  AFNetworking: 3bd23d814e976cd148d7d44c3ab78017b744cd58
   AnalyticsEvents: 0cc8cf52da2fd464a2f39b788a295988151116ce
   BlueCryptor: b0aee3d9b8f367b49b30de11cda90e1735571c24
   BlueECC: 0d18e93347d3ec6d41416de21c1ffa4d4cd3c2cc
@@ -220,8 +220,8 @@ SPEC CHECKSUMS:
   libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75
   LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d
   Logging: beeb016c9c80cf77042d62e83495816847ef108b
-  MatrixSDK: 895929fad10b7ec9aa96d557403b44c5e3522211
-  MatrixSDKCrypto: 2bd9ca41b2c644839f4e680a64897d56b3f95392
+  MatrixSDK: cf1c1b2a9742f7f4fad21e94bd94cd8f13c47369
+  MatrixSDKCrypto: 862d9b4dbb6861da030943f5a18c39258ed7345b
   OLMKit: da115f16582e47626616874e20f7bb92222c7a51
   PostHog: 4b6321b521569092d4ef3a02238d9435dbaeb99f
   ReadMoreTextView: 19147adf93abce6d7271e14031a00303fe28720d
@@ -241,6 +241,6 @@ SPEC CHECKSUMS:
   zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
   ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb
 
-PODFILE CHECKSUM: 56782e2abd382278b3c5b23824ca74994fd0a97e
+PODFILE CHECKSUM: 079b57b800c666ad864e1f059ae69e150a98a4f0
 
 COCOAPODS: 1.11.3

Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -23,7 +23,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/matrix-org/matrix-wysiwyg-composer-swift",
       "state" : {
-        "revision" : "534ee5bae5e8de69ed398937b5edb7b5f21551d2"
+        "revision" : "6927cb878376136c4a03d919b689af8dfbdad080",
+        "version" : "0.19.0"
       }
     },
     {

Riot/Assets/Images.xcassets/Composer/code_block.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "code_block.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/Room/pollHistory.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "pollHistory.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Riot/Assets/ar.lproj/Vector.strings

@@ -455,7 +455,7 @@
 "sign_up" = "الاِشتِراك";
 "dismiss" = "إبعَاد";
 "discard" = "اِستِبعاد";
-"abort" = "إِجهَاض";
+"abort" = "إنهاء";
 "yes" = "نَعَم";
 
 // Action
@@ -1078,3 +1078,8 @@
 /* The placeholder will show the email address that was entered. */
 "authentication_verify_email_waiting_message" = "اتبع التعليمات المرسلة إلى %@";
 "invite_to" = "الدعوة إلى %@";
+"password_policy_pwd_in_dict_error" = "تم العثور على كلمة المرور هذه في القاموس لدينا، وهي كلمة مرور غير مسموح في استخدامها.";
+
+// Others
+"or" = "أو";
+"accessibility_selected" = "تم تحديده";

Riot/Assets/de.lproj/Vector.strings

@@ -2700,5 +2700,34 @@
 "notice_voice_broadcast_live" = "Echtzeitübertragung";
 "user_other_session_security_recommendation_title" = "Andere Sitzungen";
 "voice_message_broadcast_in_progress_title" = "Kann Sprachnachricht nicht beginnen";
-"poll_timeline_decryption_error" = "Aufgrund von Entschlüsselungsfehlern könnten einige Stimmen nicht gezählt werden";
-"voice_message_broadcast_in_progress_message" = "Du kannst kein Gespräch beginnen, da du im Moment eine Sprachübertragung aufzeichnest. Bitte beende deine Sprachübertragung, um ein Gespräch zu beginnen";
+"poll_timeline_decryption_error" = "Evtl. werden infolge von Entschlüsselungsfehlern einige Stimmen nicht gezählt";
+"voice_message_broadcast_in_progress_message" = "Du kannst keine Sprachnachricht beginnen, da du im Moment eine Echtzeitübertragung aufzeichnest. Bitte beende deine Sprachübertragung, um ein Gespräch zu beginnen";
+"poll_timeline_ended_text" = "Umfrage beendet";
+"voice_broadcast_voip_cannot_start_description" = "Du kannst keinen Anruf beginnen, da du im Moment eine Sprachübertragung aufzeichnest. Bitte beende deine Sprachübertragung, um ein Gespräch zu beginnen.";
+"voice_broadcast_voip_cannot_start_title" = "Kann keinen Anruf beginnen";
+"poll_history_no_past_poll_text" = "In diesem Raum gibt es keine abgeschlossenen Umfragen";
+"poll_history_no_active_poll_text" = "In diesem Raum gibt es keine aktiven Umfragen";
+"poll_history_past_segment_title" = "Vergangene Umfragen";
+"poll_history_active_segment_title" = "Aktive Umfragen";
+
+// MARK: - Polls history
+
+"poll_history_title" = "Umfrageverlauf";
+"room_details_polls" = "Umfrageverlauf";
+"accessibility_selected" = "ausgewählt";
+"voice_broadcast_playback_lock_screen_placeholder" = "Sprachübertragung";
+"voice_broadcast_connection_error_message" = "Leider ist es aktuell nicht möglich, eine Aufnahme zu beginnen. Bitte versuche es später erneut.";
+"voice_broadcast_connection_error_title" = "Verbindungsfehler";
+"wysiwyg_composer_format_action_code_block" = "Quelltextblock umschalten";
+"wysiwyg_composer_format_action_quote" = "Zitat umschalten";
+"wysiwyg_composer_format_action_ordered_list" = "Nummerierte Liste umschalten";
+"wysiwyg_composer_format_action_unordered_list" = "Unsortierte Liste umschalten";
+"voice_broadcast_recorder_connection_error" = "Verbindungsfehler – Aufzeichnung pausiert";
+"poll_timeline_reply_ended_poll" = "Beendete Umfrage";
+
+// MARK: - Launch loading
+
+"launch_loading_migrating_data" = "Migriere Daten\n%@ %%";
+"settings_labs_disable_crypto_sdk" = "Krypto-SDK ist aktiviert. Zum Deaktivieren, bitte die App neu installieren";
+"settings_labs_confirm_crypto_sdk" = "Dies kann nicht rückgängig gemacht werden";
+"settings_labs_enable_crypto_sdk" = "Rust-basiertes Krypto-SDK aktivieren";