Merge branch 'release/1.6.4/master'

element-hq · Oct 12, 2021 · 57f7049 · 57f7049
2 parents 588c2d9 + 7b97511
commit 57f7049
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 17 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,14 @@
+## Changes in 1.6.4 (2021-10-12)
+
+🙌 Improvements
+
+- Upgrade MatrixKit version ([v0.16.6](https://github.com/matrix-org/matrix-ios-kit/releases/tag/v0.16.6)).
+
+🐛 Bugfixes
+
+- RoomVC: Fix a crash when previewing a room. ([#4982](https://github.com/vector-im/element-ios/issues/4982))
+
+
 ## Changes in 1.6.2 (2021-10-08)
 
 🙌 Improvements

diff --git a/Config/AppVersion.xcconfig b/Config/AppVersion.xcconfig
@@ -15,5 +15,5 @@
 //
 
 // Version
-MARKETING_VERSION = 1.6.2
-CURRENT_PROJECT_VERSION = 1.6.2
+MARKETING_VERSION = 1.6.4
+CURRENT_PROJECT_VERSION = 1.6.4
diff --git a/Podfile b/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.5'
+$matrixKitVersion = '= 0.16.6'
 # $matrixKitVersion = :local
 # $matrixKitVersion = {'develop' => 'develop'}
 

diff --git a/Podfile.lock b/Podfile.lock
@@ -58,29 +58,29 @@ PODS:
   - MatomoTracker (7.4.1):
     - MatomoTracker/Core (= 7.4.1)
   - MatomoTracker/Core (7.4.1)
-  - MatrixKit (0.16.5):
+  - MatrixKit (0.16.6):
     - Down (~> 0.11.0)
     - DTCoreText (~> 1.6.25)
     - HPGrowingTextView (~> 1.1)
     - libPhoneNumber-iOS (~> 0.9.13)
-    - MatrixKit/Core (= 0.16.5)
-    - MatrixSDK (= 0.20.5)
-  - MatrixKit/Core (0.16.5):
+    - MatrixKit/Core (= 0.16.6)
+    - MatrixSDK (= 0.20.6)
+  - MatrixKit/Core (0.16.6):
     - Down (~> 0.11.0)
     - DTCoreText (~> 1.6.25)
     - HPGrowingTextView (~> 1.1)
     - libPhoneNumber-iOS (~> 0.9.13)
-    - MatrixSDK (= 0.20.5)
-  - MatrixSDK (0.20.5):
-    - MatrixSDK/Core (= 0.20.5)
-  - MatrixSDK/Core (0.20.5):
+    - MatrixSDK (= 0.20.6)
+  - MatrixSDK (0.20.6):
+    - MatrixSDK/Core (= 0.20.6)
+  - MatrixSDK/Core (0.20.6):
     - 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.5):
+  - MatrixSDK/JingleCallStack (0.20.6):
     - JitsiMeetSDK (= 3.10.2)
     - MatrixSDK/Core
   - OLMKit (3.2.5):
@@ -124,7 +124,7 @@ DEPENDENCIES:
   - KeychainAccess (~> 4.2.2)
   - KTCenterFlowLayout (~> 1.3.1)
   - MatomoTracker (~> 7.4.1)
-  - MatrixKit (= 0.16.5)
+  - MatrixKit (= 0.16.6)
   - MatrixSDK
   - MatrixSDK/JingleCallStack
   - OLMKit
@@ -204,8 +204,8 @@ SPEC CHECKSUMS:
   LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d
   Logging: beeb016c9c80cf77042d62e83495816847ef108b
   MatomoTracker: 24a846c9d3aa76933183fe9d47fd62c9efa863fb
-  MatrixKit: a37efb94bb7c53b5dc912f0fd35971861b6c28bf
-  MatrixSDK: 417fac309f510b5f8ac121ba8abe3b897953e1ce
+  MatrixKit: 38f18f930af238abe44189909b16953e657d0ffc
+  MatrixSDK: 37d6bc484fa90c39db46ed25fd3a4c707bb70452
   OLMKit: 9fb4799c4a044dd2c06bda31ec31a12191ad30b5
   ReadMoreTextView: 19147adf93abce6d7271e14031a00303fe28720d
   Realm: b6027801398f3743fc222f096faa85281b506e6c
@@ -219,6 +219,6 @@ SPEC CHECKSUMS:
   zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
   ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb
 
-PODFILE CHECKSUM: e189a08f2a6f081d6eb0f57aaa898833f27a9adb
+PODFILE CHECKSUM: c05591899cb3d6d02e404d4b48a02a1e6187d6bd
 
 COCOAPODS: 1.11.2
diff --git a/Riot/Modules/Room/Views/Title/Preview/PreviewRoomTitleView.m b/Riot/Modules/Room/Views/Title/Preview/PreviewRoomTitleView.m
@@ -121,7 +121,8 @@ - (void)refreshDisplay
         // Joined members count
         if (self.roomPreviewData.numJoinedMembers > 1)
         {
-            self.roomMembers.text = [VectorL10n roomTitleMembers:@(self.roomPreviewData.numJoinedMembers)];
+            NSString *numJoinedMembers = [@(self.roomPreviewData.numJoinedMembers) description];
+            self.roomMembers.text = [VectorL10n roomTitleMembers:numJoinedMembers];
         }
         else if (self.roomPreviewData.numJoinedMembers == 1)
         {