Merge branch 'release/0.13.4/master'

matrix-org · Dec 18, 2020 · 5005d4a · 5005d4a
2 parents c828b1f + 56d5478
commit 5005d4a
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 11 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,3 +1,30 @@
+Changes in 0.13.4 (2020-12-18)
+=================================================
+
+✨ Features
+ * 
+
+🙌 Improvements
+ * 
+
+🐛 Bugfix
+ * MXKRoomViewController: Fix a crash by not calling UITableViewDataSource method, but dequeuing the cell.
+
+⚠️ API Changes
+ * 
+
+🗣 Translations
+ * 
+
+🧱 Build
+ * 
+
+Others
+ * 
+
+Improvements:
+ * Upgrade MatrixSDK version ([v0.17.6](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.17.6)).
+
 Changes in 0.13.3 (2020-12-16)
 =================================================
 

diff --git a/MatrixKit.podspec b/MatrixKit.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "MatrixKit"
-  s.version      = "0.13.3"
+  s.version      = "0.13.4"
   s.summary      = "The Matrix reusable UI library for iOS based on MatrixSDK."
 
   s.description  = <<-DESC
@@ -23,7 +23,7 @@ Pod::Spec.new do |s|
 
   s.swift_version = '5.0'
 
-  s.dependency 'MatrixSDK', "= 0.17.5"
+  s.dependency 'MatrixSDK', "= 0.17.6"
   s.dependency 'HPGrowingTextView', '~> 1.1'
   s.dependency 'libPhoneNumber-iOS', '~> 0.9.13'
   s.dependency 'DTCoreText', '~> 1.6.23'

diff --git a/MatrixKit/Controllers/MXKRoomViewController.m b/MatrixKit/Controllers/MXKRoomViewController.m
@@ -2314,8 +2314,10 @@ - (BOOL)reloadBubblesTable:(BOOL)useBottomAnchor invalidateBubblesCellDataCache:
             UITableViewCell *cellTmp;
             if (!cell)
             {
+                NSString *reuseIdentifier = [self cellReuseIdentifierForCellData:[roomDataSource cellDataAtIndex:rowIndex]];
                 // Create temporarily the cell (this cell will released at the end, to be reusable)
-                cellTmp = [roomDataSource tableView:_bubblesTableView cellForRowAtIndexPath:[NSIndexPath indexPathForRow:rowIndex inSection:0]];
+                cellTmp = [_bubblesTableView dequeueReusableCellWithIdentifier:reuseIdentifier
+                                                                  forIndexPath:[NSIndexPath indexPathForRow:rowIndex inSection:0]];
                 cell = cellTmp;
             }
 

diff --git a/MatrixKit/MatrixKitVersion.m b/MatrixKit/MatrixKitVersion.m
@@ -16,4 +16,4 @@
 
 #import <Foundation/Foundation.h>
 
-NSString *const MatrixKitVersion = @"0.13.3";
+NSString *const MatrixKitVersion = @"0.13.4";
diff --git a/Podfile b/Podfile
@@ -8,7 +8,7 @@ abstract_target 'MatrixKitSamplePods' do
 
     # Different flavours of pods to Matrix SDK
     # The tagged version on which this version of MatrixKit has been built
-    pod 'MatrixSDK', '= 0.17.5'
+    pod 'MatrixSDK', '= 0.17.6'
 
     # The lastest release available on the CocoaPods repository
     #pod 'MatrixSDK'

diff --git a/Podfile.lock b/Podfile.lock
@@ -39,9 +39,9 @@ PODS:
   - JSQSystemSoundPlayer (2.0.1)
   - libbase58 (0.1.4)
   - libPhoneNumber-iOS (0.9.15)
-  - MatrixSDK (0.17.5):
-    - MatrixSDK/Core (= 0.17.5)
-  - MatrixSDK/Core (0.17.5):
+  - MatrixSDK (0.17.6):
+    - MatrixSDK/Core (= 0.17.6)
+  - MatrixSDK/Core (0.17.6):
     - AFNetworking (~> 4.0.0)
     - GZIP (~> 1.3.0)
     - libbase58 (~> 0.1.4)
@@ -62,7 +62,7 @@ DEPENDENCIES:
   - HPGrowingTextView (~> 1.1)
   - JSQMessagesViewController (~> 7.2.0)
   - libPhoneNumber-iOS (~> 0.9.13)
-  - MatrixSDK (= 0.17.5)
+  - MatrixSDK (= 0.17.6)
 
 SPEC REPOS:
   trunk:
@@ -91,10 +91,10 @@ SPEC CHECKSUMS:
   JSQSystemSoundPlayer: c5850e77a4363ffd374cd851154b9af93264ed8d
   libbase58: 7c040313537b8c44b6e2d15586af8e21f7354efd
   libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75
-  MatrixSDK: aadf483438804d9e93d5d46ad3e5e832b7bb8848
+  MatrixSDK: 43d329b4070301f714808f02872ec1747c2f9b7d
   OLMKit: 4ee0159d63feeb86d836fdcfefe418e163511639
   Realm: 80f4fb2971ccb9adc27a47d0955ae8e533a7030b
 
-PODFILE CHECKSUM: a8e85ba11c7aba281c4d6d6f4e472095ca06d31e
+PODFILE CHECKSUM: 24f52ac6ca04e58e47cbf6171888687bef5842cf
 
 COCOAPODS: 1.10.0
Original file line number	Diff line number	Diff line change
Expand Up		@@ -16,4 +16,4 @@

		#import <Foundation/Foundation.h>

		NSString *const MatrixKitVersion = @"0.13.3";
		NSString *const MatrixKitVersion = @"0.13.4";