Merge branch 'release/1.4.6/master'

.swiftlint.yml

@@ -2,7 +2,6 @@
 disabled_rules:
   - trailing_whitespace
   - todo
-  - conditional_binding_cascade
   - mark
   - vertical_whitespace
   - syntactic_sugar

CHANGES.rst

@@ -1,3 +1,40 @@
+Changes in 1.4.6 (2021-07-16)
+=================================================
+
+✨ Features
+ * 
+
+🙌 Improvements
+ * Room Notification Settings: Ability to change between "All Messages", "Mentions and Keywords" and "None". Not yet exposed in Element UI. (#4458).
+ * Add support for sending slow motion videos (#4483).
+
+🐛 Bugfix
+ * VoIP: Do not present ended calls.
+ * More fixes to Main.storyboard layout on iPhone 12 Pro Max (#4527)
+ * Fix crash on Apple Silicon Macs.
+ * Media Picker: Generate video thumbnails with the correct orientation (#4515).
+ * Directory List (pop-up one): Fix duplicate rooms being shown (#4537).
+ * Use different title for scan button for self verification (#4525).
+ * it's easy for the back button to trigger a leftpanel reveal (#4438).
+ * Show / hide reset button in secrets recovery screen (#4546).
+ * Share Extension: Fix layout when searching (#4258).
+ * Timeline: Fix incorrect crop of media thumbnails (#4552).
+
+⚠️ API Changes
+ * 
+
+🗣 Translations
+ * 
+
+🧱 Build
+ * 
+
+Others
+ * Silenced some documentation, deprecations and SwiftLint warnings.
+
+Improvements:
+ * Upgrade MatrixKit version ([v0.15.4](https://github.com/matrix-org/matrix-ios-kit/releases/tag/v0.15.4)).
+
 Changes in 1.4.5 (2021-07-07)
 =================================================
 
@@ -15,10 +52,13 @@ Changes in 1.4.5 (2021-07-07)
 
 🗣 Translations
  *
-    
+
 🧱 Build
  *
 
+Others
+ *
+
 Changes in 1.4.4 (2021-06-30)
 =================================================
 

Config/AppIdentifiers.xcconfig

@@ -22,8 +22,8 @@ APPLICATION_GROUP_IDENTIFIER = group.im.vector
 APPLICATION_SCHEME = element
 
 // Version
-MARKETING_VERSION = 1.4.5
-CURRENT_PROJECT_VERSION = 1.4.5
+MARKETING_VERSION = 1.4.6
+CURRENT_PROJECT_VERSION = 1.4.6
 
 
 // Team

Config/BuildSettings.swift

@@ -295,6 +295,7 @@ final class BuildSettings: NSObject {
     static let roomSettingsScreenShowFlairSettings: Bool = true
     static let roomSettingsScreenShowAdvancedSettings: Bool = true
     static let roomSettingsScreenAdvancedShowEncryptToVerifiedOption: Bool = true
+    static let roomSettingsScreenShowNotificationsV2: Bool = false
 
     // MARK: - Room Member Screen
 
@@ -320,6 +321,9 @@ final class BuildSettings: NSObject {
     static let authScreenShowForgotPassword = true
     static let authScreenShowCustomServerOptions = true
 
-    // Mark: - Unified Search
+    // MARK: - Unified Search
     static let unifiedSearchScreenShowPublicDirectory = true
+
+    // MARK: - Secrets Recovery
+    static let secretsRecoveryAllowReset = true
 }

Podfile

@@ -11,7 +11,7 @@ use_frameworks!
 # - `{ {kit spec hash} => {sdk spec hash}` to depend on specific pod options (:git => …, :podspec => …) for each 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
-$matrixKitVersion = '= 0.15.3'
+$matrixKitVersion = '= 0.15.4'
 # $matrixKitVersion = :local
 # $matrixKitVersion = {'develop' => 'develop'}
 

Podfile.lock

@@ -56,29 +56,29 @@ PODS:
   - MatomoTracker (7.4.1):
     - MatomoTracker/Core (= 7.4.1)
   - MatomoTracker/Core (7.4.1)
-  - MatrixKit (0.15.3):
+  - MatrixKit (0.15.4):
     - Down (~> 0.11.0)
     - DTCoreText (~> 1.6.25)
     - HPGrowingTextView (~> 1.1)
     - libPhoneNumber-iOS (~> 0.9.13)
-    - MatrixKit/Core (= 0.15.3)
-    - MatrixSDK (= 0.19.3)
-  - MatrixKit/Core (0.15.3):
+    - MatrixKit/Core (= 0.15.4)
+    - MatrixSDK (= 0.19.4)
+  - MatrixKit/Core (0.15.4):
     - Down (~> 0.11.0)
     - DTCoreText (~> 1.6.25)
     - HPGrowingTextView (~> 1.1)
     - libPhoneNumber-iOS (~> 0.9.13)
-    - MatrixSDK (= 0.19.3)
-  - MatrixSDK (0.19.3):
-    - MatrixSDK/Core (= 0.19.3)
-  - MatrixSDK/Core (0.19.3):
+    - MatrixSDK (= 0.19.4)
+  - MatrixSDK (0.19.4):
+    - MatrixSDK/Core (= 0.19.4)
+  - MatrixSDK/Core (0.19.4):
     - AFNetworking (~> 4.0.0)
     - GZIP (~> 1.3.0)
     - libbase58 (~> 0.1.4)
     - OLMKit (~> 3.2.4)
     - Realm (= 10.7.6)
     - SwiftyBeaver (= 1.9.5)
-  - MatrixSDK/JingleCallStack (0.19.3):
+  - MatrixSDK/JingleCallStack (0.19.4):
     - JitsiMeetSDK (= 3.5.0)
     - MatrixSDK/Core
   - OLMKit (3.2.4):
@@ -120,7 +120,7 @@ DEPENDENCIES:
   - KeychainAccess (~> 4.2.2)
   - KTCenterFlowLayout (~> 1.3.1)
   - MatomoTracker (~> 7.4.1)
-  - MatrixKit (= 0.15.3)
+  - MatrixKit (= 0.15.4)
   - MatrixSDK
   - MatrixSDK/JingleCallStack
   - OLMKit
@@ -196,8 +196,8 @@ SPEC CHECKSUMS:
   LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d
   Logging: beeb016c9c80cf77042d62e83495816847ef108b
   MatomoTracker: 24a846c9d3aa76933183fe9d47fd62c9efa863fb
-  MatrixKit: 6cbe65db11a5450ec8cc02d51660f43b5e95a141
-  MatrixSDK: c15663c67bfd2991d897d973c1551ba4de900e25
+  MatrixKit: 477690d6dd38b1526042f8e83ff34e3db87e3a00
+  MatrixSDK: 0c9d1845a45d71abcfcabe82b706cadbda1297ae
   OLMKit: 2d73cd67d149b5c3e3a8eb8ecae93d0b429d8a02
   ReadMoreTextView: 19147adf93abce6d7271e14031a00303fe28720d
   Realm: ed860452717c8db8f4bf832b6807f7f2ce708839
@@ -211,6 +211,6 @@ SPEC CHECKSUMS:
   zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
   ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb
 
-PODFILE CHECKSUM: c39d88adc5ec2df412af32b64ceb99a9a1ee92a8
+PODFILE CHECKSUM: 2b61b852a5b62fbb75643a30281e362fd4566f12
 
 COCOAPODS: 1.10.1

Riot/Assets/Base.lproj/Main.storyboard

@@ -151,7 +151,7 @@
         <!--People View Controller-->
         <scene sceneID="Qba-PP-lco">
             <objects>
-                <viewController storyboardIdentifier="PeopleViewController" id="IGB-jr-yFz" customClass="PeopleViewController" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="PeopleViewController" extendedLayoutIncludesOpaqueBars="YES" id="IGB-jr-yFz" customClass="PeopleViewController" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="Mhy-d3-Jh6"/>
                         <viewControllerLayoutGuide type="bottom" id="Hkk-qB-8tq"/>
@@ -177,7 +177,7 @@
         <!--Favourites View Controller-->
         <scene sceneID="z6B-k5-ano">
             <objects>
-                <viewController storyboardIdentifier="FavouritesViewController" id="HnD-LA-psC" customClass="FavouritesViewController" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="FavouritesViewController" extendedLayoutIncludesOpaqueBars="YES" id="HnD-LA-psC" customClass="FavouritesViewController" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="pOc-AC-QkD"/>
                         <viewControllerLayoutGuide type="bottom" id="W6L-Au-CaZ"/>
@@ -463,7 +463,7 @@
         <!--Rooms View Controller-->
         <scene sceneID="SDg-Pp-8Uj">
             <objects>
-                <viewController storyboardIdentifier="RoomsViewController" id="HPQ-zg-lZR" customClass="RoomsViewController" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="RoomsViewController" extendedLayoutIncludesOpaqueBars="YES" id="HPQ-zg-lZR" customClass="RoomsViewController" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="Hkg-kw-ioH"/>
                         <viewControllerLayoutGuide type="bottom" id="UI8-oQ-9M9"/>
@@ -581,7 +581,7 @@
         </scene>
     </scenes>
     <inferredMetricsTieBreakers>
-        <segue reference="mhb-l9-pM3"/>
+        <segue reference="Tfl-tq-LQp"/>
         <segue reference="f5u-Y1-7nt"/>
     </inferredMetricsTieBreakers>
     <resources>

Riot/Assets/Images.xcassets/Home/RoomContextualMenu/room_action_notification_muted.imageset/Contents.json

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

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "notifications.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/en.lproj/Vector.strings

@@ -710,6 +710,7 @@ Tap the + to start adding people.";
 "room_details_topic" = "Topic";
 "room_details_favourite_tag" = "Favourite";
 "room_details_low_priority_tag" = "Low priority";
+"room_details_notifs" = "Notifications";
 "room_details_mute_notifs" = "Mute notifications";
 "room_details_direct_chat" = "Direct Chat";
 "room_details_access_section"="Who can access this room?";
@@ -772,6 +773,17 @@ Tap the + to start adding people.";
 "room_details_copy_room_address" = "Copy Room Address";
 "room_details_copy_room_url" = "Copy Room URL";
 
+// Room Notification Settings
+"room_notifs_settings_notify_me_for" = "Notify me for";
+"room_notifs_settings_all_messages" = "All Messages";
+"room_notifs_settings_mentions_and_keywords" = "Mentions and Keywords only";
+"room_notifs_settings_none" = "None";
+"room_notifs_settings_done_action" = "Done";
+"room_notifs_settings_cancel_action" = "Cancel";
+"room_notifs_settings_manage_notifications" = "You can manage notifications in %@";
+"room_notifs_settings_account_settings" = "Account settings";
+"room_notifs_settings_encrypted_room_notice" = "Please note that mentions & keyword notifications are not available in encrypted rooms on mobile.";
+
 // Group Details
 "group_details_title" = "Community Details";
 "group_details_home" = "Home";
@@ -1375,6 +1387,7 @@ Tap the + to start adding people.";
 "key_verification_verify_qr_code_information_other_device" = "Scan the code below to verify:";
 "key_verification_verify_qr_code_emoji_information" = "Verify by comparing unique emoji.";
 "key_verification_verify_qr_code_scan_code_action" = "Scan their code";
+"key_verification_verify_qr_code_scan_code_other_device_action" = "Scan with this device";
 "key_verification_verify_qr_code_cannot_scan_action" = "Can't scan?";
 "key_verification_verify_qr_code_start_emoji_action" = "Verify by emoji";
 

Riot/Assets/ja.lproj/Localizable.strings

@@ -50,3 +50,27 @@
 "SINGLE_UNREAD_IN_ROOM" = "%@にメッセージを受け取りました";
 /* A single unread message */
 "SINGLE_UNREAD" = "あなたはメッセージを受け取りました";
+
+/** Key verification **/
+
+"KEY_VERIFICATION_REQUEST_FROM_USER" = "%@は検証したい";
+
+/* New message indicator on a room */
+"MESSAGE_IN_X" = "%@ 内のメッセージ";
+
+/* Sticker from a specific person, not referencing a room. */
+"STICKER_FROM_USER" = "%@ さんからのスタンプ";
+/* Message title for a specific person in a named room */
+"MSG_FROM_USER_IN_ROOM_TITLE" = "%@（%@ から）";
+
+/* Group call from user, CallKit caller name */
+"GROUP_CALL_FROM_USER" = "%@ (グループ通話)";
+"MESSAGE_PROTECTED" = "新しいメッセージ";
+
+/* New message indicator from a DM */
+"MESSAGE_FROM_X" = "%@ からのメッセージ";
+
+/** Notification messages **/
+
+/* New message indicator on unknown room */
+"MESSAGE" = "メッセージ";

Riot/Assets/nb-NO.lproj/Localizable.strings

@@ -111,3 +111,9 @@
 "MSG_FROM_USER" = "%@ sendte en melding";
 /* Message title for a specific person in a named room */
 "MSG_FROM_USER_IN_ROOM_TITLE" = "%@ i %@";
+
+/* Group call from user, CallKit caller name */
+"GROUP_CALL_FROM_USER" = "%@ (Gruppeanrop)";
+
+/* A user added a Jitsi call to a room */
+"GROUP_CALL_STARTED" = "Gruppeanrop startet";