Merge branch 'release/1.6.8/master'

.github/ISSUE_TEMPLATE/bug.yml

@@ -64,9 +64,9 @@ body:
   - type: dropdown
     id: rageshake
     attributes:
-      label: Have you submitted a rageshake?
+      label: Will you send logs?
       description:  |
-        Did you know that you can shake your phone to submit logs for this issue? Trigger the defect, then shake your phone and you will see a popup asking if you would like to open the bug report screen. Click YES, and describe the issue, mentioning that you have also filed a bug. Submit the report to send anonymous logs to the developers.
+        Did you know that you can shake your phone to submit logs for this issue? Trigger the defect, then shake your phone and you will see a popup asking if you would like to open the bug report screen. Click YES, and describe the issue, mentioning that you have also filed a bug (it's helpful if you can include a link to the bug). Send the report to submit anonymous logs to the developers.
       options:
         - 'Yes'
         - 'No'

CHANGES.md

@@ -1,3 +1,35 @@
+## Changes in 1.6.8 (2021-11-17)
+
+🙌 Improvements
+
+- Upgrade MatrixKit version ([v0.16.10](https://github.com/matrix-org/matrix-ios-kit/releases/tag/v0.16.10)).
+- Using mutable room list fetch sort options after chaning them to be a structure. ([#4384](https://github.com/vector-im/element-ios/issues/4384))
+- Share Extension: Remove the image compression prompt when the showMediaSizeSelection setting is disabled. ([#4815](https://github.com/vector-im/element-ios/issues/4815))
+- Replaced GrowingTextView with simpler, custom implementation.  Cleaned up the RoomInputToolbar header. ([#4976](https://github.com/vector-im/element-ios/issues/4976))
+- Settings: Update about section footer text. ([#5090](https://github.com/vector-im/element-ios/issues/5090))
+- MXSession: Add logs to track if E2EE is enabled by default on the current HS. ([#5129](https://github.com/vector-im/element-ios/issues/5129))
+
+🐛 Bugfixes
+
+- Fixed share extension and message forwarding room list accessory view icon. ([#5041](https://github.com/vector-im/element-ios/issues/5041))
+- Fixed message composer not following keyboard when swiping to dismiss. ([#5042](https://github.com/vector-im/element-ios/issues/5042))
+- RoomVC: Fix retain cycles that prevents `RoomViewController` to be deallocated. ([#5055](https://github.com/vector-im/element-ios/issues/5055))
+- Share Extension: Fix missing avatars and don't list spaces as rooms. ([#5057](https://github.com/vector-im/element-ios/issues/5057))
+- Fix retain cycles that prevents deallocation in several classes. ([#5058](https://github.com/vector-im/element-ios/issues/5058))
+- Fixed retain cycles between the user suggestion coordinator and the suggestion service, and in the suggestion service currentTextTrigger subject sink. ([#5063](https://github.com/vector-im/element-ios/issues/5063))
+- Ensure alerts with weak references are retained until they've been presented. ([#5071](https://github.com/vector-im/element-ios/issues/5071))
+- Message Composer: Ensure there is no text view when the user isn't allowed to send messages. ([#5079](https://github.com/vector-im/element-ios/issues/5079))
+- Home: Fix bug where favourited DM would be shown in both Favourites and People section. ([#5081](https://github.com/vector-im/element-ios/issues/5081))
+- Fix a crash when selected space is not home and a clear cache or logout is performed. ([#5082](https://github.com/vector-im/element-ios/issues/5082))
+- Room Previews: Fix room previews not loading. ([#5083](https://github.com/vector-im/element-ios/issues/5083))
+- Do not make the placeholder appearing when leaving a room on iPhone. ([#5084](https://github.com/vector-im/element-ios/issues/5084))
+- Fix room ordering when switching between Home and People/Rooms/Favourites. ([#5105](https://github.com/vector-im/element-ios/issues/5105))
+
+Others
+
+- Improve wording around rageshakes in the defect issue template. ([#4987](https://github.com/vector-im/element-ios/issues/4987))
+
+
 ## Changes in 1.6.6 (2021-10-21)
 
 ✨ Features

Config/AppVersion.xcconfig

@@ -15,5 +15,5 @@
 //
 
 // Version
-MARKETING_VERSION = 1.6.6
-CURRENT_PROJECT_VERSION = 1.6.6
+MARKETING_VERSION = 1.6.8
+CURRENT_PROJECT_VERSION = 1.6.8

Podfile

@@ -13,7 +13,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.16.9'
+$matrixKitVersion = '= 0.16.10'
 # $matrixKitVersion = :local
 # $matrixKitVersion = {'develop' => 'develop'}
 
@@ -73,7 +73,6 @@ abstract_target 'RiotPods' do
     pod 'SideMenu', '~> 6.5'
     pod 'DSWaveformImage', '~> 6.1.1'
     pod 'ffmpeg-kit-ios-audio', '~> 4.5'
-    pod 'GrowingTextView', '~> 0.7.2'
 
     pod 'FLEX', '~> 4.5.0', :configurations => ['Debug']
 

Podfile.lock

@@ -43,7 +43,6 @@ PODS:
   - GBDeviceInfo (6.6.0):
     - GBDeviceInfo/Core (= 6.6.0)
   - GBDeviceInfo/Core (6.6.0)
-  - GrowingTextView (0.7.2)
   - GZIP (1.3.0)
   - HPGrowingTextView (1.1)
   - JitsiMeetSDK (3.10.2)
@@ -59,29 +58,29 @@ PODS:
   - MatomoTracker (7.4.1):
     - MatomoTracker/Core (= 7.4.1)
   - MatomoTracker/Core (7.4.1)
-  - MatrixKit (0.16.9):
+  - MatrixKit (0.16.10):
     - Down (~> 0.11.0)
     - DTCoreText (~> 1.6.25)
     - HPGrowingTextView (~> 1.1)
     - libPhoneNumber-iOS (~> 0.9.13)
-    - MatrixKit/Core (= 0.16.9)
-    - MatrixSDK (= 0.20.9)
-  - MatrixKit/Core (0.16.9):
+    - MatrixKit/Core (= 0.16.10)
+    - MatrixSDK (= 0.20.10)
+  - MatrixKit/Core (0.16.10):
     - Down (~> 0.11.0)
     - DTCoreText (~> 1.6.25)
     - HPGrowingTextView (~> 1.1)
     - libPhoneNumber-iOS (~> 0.9.13)
-    - MatrixSDK (= 0.20.9)
-  - MatrixSDK (0.20.9):
-    - MatrixSDK/Core (= 0.20.9)
-  - MatrixSDK/Core (0.20.9):
+    - MatrixSDK (= 0.20.10)
+  - MatrixSDK (0.20.10):
+    - MatrixSDK/Core (= 0.20.10)
+  - MatrixSDK/Core (0.20.10):
     - AFNetworking (~> 4.0.0)
     - GZIP (~> 1.3.0)
     - libbase58 (~> 0.1.4)
     - OLMKit (~> 3.2.5)
     - Realm (= 10.16.0)
     - SwiftyBeaver (= 1.9.5)
-  - MatrixSDK/JingleCallStack (0.20.9):
+  - MatrixSDK/JingleCallStack (0.20.10):
     - JitsiMeetSDK (= 3.10.2)
     - MatrixSDK/Core
   - OLMKit (3.2.5):
@@ -122,11 +121,10 @@ DEPENDENCIES:
   - FLEX (~> 4.5.0)
   - FlowCommoniOS (~> 1.12.0)
   - GBDeviceInfo (~> 6.6.0)
-  - GrowingTextView (~> 0.7.2)
   - KeychainAccess (~> 4.2.2)
   - KTCenterFlowLayout (~> 1.3.1)
   - MatomoTracker (~> 7.4.1)
-  - MatrixKit (= 0.16.9)
+  - MatrixKit (= 0.16.10)
   - MatrixSDK
   - MatrixSDK/JingleCallStack
   - OLMKit
@@ -156,7 +154,6 @@ SPEC REPOS:
     - FLEX
     - FlowCommoniOS
     - GBDeviceInfo
-    - GrowingTextView
     - GZIP
     - HPGrowingTextView
     - JitsiMeetSDK
@@ -198,7 +195,6 @@ SPEC CHECKSUMS:
   FLEX: e51461dd6f0bfb00643c262acdfea5d5d12c596b
   FlowCommoniOS: e9ecbc97fb9ce5c593fb3da0e1073b65a3902026
   GBDeviceInfo: ed0db16230d2fa280e1cbb39a5a7f60f6946aaec
-  GrowingTextView: 876bf42005b5e4a4fd740597db12caaf41f0fe6c
   GZIP: 416858efbe66b41b206895ac6dfd5493200d95b3
   HPGrowingTextView: 88a716d97fb853bcb08a4a08e4727da17efc9b19
   JitsiMeetSDK: 2f118fa770f23e518f3560fc224fae3ac7062223
@@ -210,8 +206,8 @@ SPEC CHECKSUMS:
   LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d
   Logging: beeb016c9c80cf77042d62e83495816847ef108b
   MatomoTracker: 24a846c9d3aa76933183fe9d47fd62c9efa863fb
-  MatrixKit: ed209774b5c3408974c52cfe2aaba4d2e8b4b05b
-  MatrixSDK: 9e312e3874027bf9eab61be7d0779102f8bd323a
+  MatrixKit: c3f0bb056ceeb015e2f1688543ac4dbcf88bef2f
+  MatrixSDK: 0e2ed8fc6f004cac4b4ab46f038a86fe49ce4007
   OLMKit: 9fb4799c4a044dd2c06bda31ec31a12191ad30b5
   ReadMoreTextView: 19147adf93abce6d7271e14031a00303fe28720d
   Realm: b6027801398f3743fc222f096faa85281b506e6c
@@ -226,6 +222,6 @@ SPEC CHECKSUMS:
   zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
   ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb
 
-PODFILE CHECKSUM: 2740772a9b2d32e17876526875dfc58f67240ba0
+PODFILE CHECKSUM: 675c24e5fcaf580998f32fde709fc3be1b2bde22
 
 COCOAPODS: 1.11.2

Riot.xcodeproj/xcshareddata/xcschemes/Riot.xcscheme

@@ -4,7 +4,8 @@
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
+      buildImplicitDependencies = "YES"
+      runPostActionsOnFailure = "NO">
       <BuildActionEntries>
          <BuildActionEntry
             buildForTesting = "YES"

Riot/Assets/SharedImages.xcassets/radio-button-default.imageset/Contents.json

@@ -19,5 +19,8 @@
   "info" : {
     "author" : "xcode",
     "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
   }
 }

Riot/Assets/SharedImages.xcassets/radio-button-selected.imageset/Contents.json

@@ -19,5 +19,8 @@
   "info" : {
     "author" : "xcode",
     "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
   }
 }

Riot/Assets/en.lproj/Vector.strings

@@ -1016,6 +1016,9 @@ Tap the + to start adding people.";
 // Share extension
 "share_extension_auth_prompt" = "Login in the main app to share content";
 "share_extension_failed_to_encrypt" = "Failed to send. Check in the main app the encryption settings for this room";
+"share_extension_low_quality_video_title" = "Video will be sent in low quality";
+"share_extension_low_quality_video_message" = "Send in %@ for better quality, or send in low quality below.";
+"share_extension_send_now" = "Send now";
 
 // Room key request dialog
 "e2e_room_key_request_title" = "Encryption key request";

Riot/Categories/MXSession+Riot.m

@@ -65,6 +65,7 @@ - (MXHTTPOperation*)vc_canEnableE2EByDefaultInNewRoomWithUsers:(NSArray<NSString
     }
     else
     {
+        MXLogWarning(@"[MXSession] E2EE is disabled by default on this homeserver.\nWellknown content: %@", self.homeserverWellknown.JSONDictionary);
         success(NO);
         return [MXHTTPOperation new];
     }

Riot/Generated/Strings.swift

@@ -4775,6 +4775,18 @@ public class VectorL10n: NSObject {
   public static var shareExtensionFailedToEncrypt: String { 
     return VectorL10n.tr("Vector", "share_extension_failed_to_encrypt") 
   }
+  /// Send in %@ for better quality, or send in low quality below.
+  public static func shareExtensionLowQualityVideoMessage(_ p1: String) -> String {
+    return VectorL10n.tr("Vector", "share_extension_low_quality_video_message", p1)
+  }
+  /// Video will be sent in low quality
+  public static var shareExtensionLowQualityVideoTitle: String { 
+    return VectorL10n.tr("Vector", "share_extension_low_quality_video_title") 
+  }
+  /// Send now
+  public static var shareExtensionSendNow: String { 
+    return VectorL10n.tr("Vector", "share_extension_send_now") 
+  }
   /// Feedback
   public static var sideMenuActionFeedback: String { 
     return VectorL10n.tr("Vector", "side_menu_action_feedback") 

Riot/Managers/Analytics/DecryptionFailureTracker.h

@@ -32,7 +32,7 @@
 /**
  The delegate object to receive analytics events.
  */
-@property (nonatomic) id<MXAnalyticsDelegate> delegate;
+@property (nonatomic, weak) id<MXAnalyticsDelegate> delegate;
 
 /**
  Report an event unable to decrypt.

Riot/Managers/Settings/RiotSettings.swift

@@ -143,7 +143,7 @@ final class RiotSettings: NSObject {
     @UserDefault(key: "roomsAllowToJoinPublicRooms", defaultValue: BuildSettings.roomsAllowToJoinPublicRooms, storage: defaults)
     var roomsAllowToJoinPublicRooms
 
-    @UserDefault(key: UserDefaultsKeys.showAllRoomsInHomeSpace, defaultValue: false, storage: defaults)
+    @UserDefault(key: UserDefaultsKeys.showAllRoomsInHomeSpace, defaultValue: true, storage: defaults)
     var showAllRoomsInHomeSpace
 
     // MARK: - Room Screen

Riot/Modules/Application/AppCoordinator.swift

@@ -228,7 +228,7 @@ extension AppCoordinator: LegacyAppDelegateDelegate {
     }
 
     func legacyAppDelegateRestoreEmptyDetailsViewController(_ legacyAppDelegate: LegacyAppDelegate!) {
-        self.splitViewCoordinator?.restorePlaceholderDetails()
+        self.splitViewCoordinator?.resetDetails(animated: false)
     }
 
     func legacyAppDelegate(_ legacyAppDelegate: LegacyAppDelegate!, didAddMatrixSession session: MXSession!) {

Riot/Modules/Common/Recents/RecentsViewController.h

@@ -40,7 +40,7 @@ FOUNDATION_EXPORT NSString *const RecentsViewControllerDataReadyNotification;
     /**
      Current alert (if any).
      */
-    UIAlertController *currentAlert;
+    __weak UIAlertController *currentAlert;
 
     /**
      The list of the section headers currently displayed in the recents table.