From a73bcfadc35b852af41a799f1f34e1d914ac99d6 Mon Sep 17 00:00:00 2001 From: ismailgulek Date: Fri, 16 Oct 2020 11:19:45 +0300 Subject: [PATCH 1/6] Do not call tableView dataSource method explicitly, instead dequeue with identifier --- MatrixKit/Controllers/MXKRoomViewController.m | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/MatrixKit/Controllers/MXKRoomViewController.m b/MatrixKit/Controllers/MXKRoomViewController.m index 153381f7f..54b9d4bc9 100644 --- a/MatrixKit/Controllers/MXKRoomViewController.m +++ b/MatrixKit/Controllers/MXKRoomViewController.m @@ -2307,8 +2307,9 @@ - (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]; cell = cellTmp; } From df70ec2e909d7f431f4865830bfd4e6e74fe7d84 Mon Sep 17 00:00:00 2001 From: ismailgulek Date: Wed, 16 Dec 2020 18:13:34 +0300 Subject: [PATCH 2/6] Prepare for new sprint --- CHANGES.rst | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index e3d162253..0a57e2177 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,3 +1,27 @@ +Changes to be released in next version +================================================= + +✨ Features + * + +🙌 Improvements + * + +🐛 Bugfix + * + +⚠️ API Changes + * + +🗣 Translations + * + +🧱 Build + * + +Others + * + Changes in 0.13.3 (2020-12-16) ================================================= From 2a273c3f29a865e5b328ab7ecc903066ef87da8c Mon Sep 17 00:00:00 2001 From: ismailgulek Date: Fri, 18 Dec 2020 00:03:51 +0300 Subject: [PATCH 3/6] Ensure cell is dequeued --- MatrixKit/Controllers/MXKRoomViewController.m | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/MatrixKit/Controllers/MXKRoomViewController.m b/MatrixKit/Controllers/MXKRoomViewController.m index 5940b7082..cba0da003 100644 --- a/MatrixKit/Controllers/MXKRoomViewController.m +++ b/MatrixKit/Controllers/MXKRoomViewController.m @@ -2316,7 +2316,8 @@ - (BOOL)reloadBubblesTable:(BOOL)useBottomAnchor invalidateBubblesCellDataCache: { NSString *reuseIdentifier = [self cellReuseIdentifierForCellData:[roomDataSource cellDataAtIndex:rowIndex]]; // Create temporarily the cell (this cell will released at the end, to be reusable) - cellTmp = [_bubblesTableView dequeueReusableCellWithIdentifier:reuseIdentifier]; + cellTmp = [_bubblesTableView dequeueReusableCellWithIdentifier:reuseIdentifier + forIndexPath:[NSIndexPath indexPathForRow:rowIndex inSection:0]]; cell = cellTmp; } From 5b681238c0b9feeed244e5394cf33694a86aed51 Mon Sep 17 00:00:00 2001 From: ismailgulek Date: Fri, 18 Dec 2020 00:08:47 +0300 Subject: [PATCH 4/6] Update CHANGES.rst --- CHANGES.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index 0a57e2177..4a160f044 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -8,7 +8,7 @@ Changes to be released in next version * 🐛 Bugfix - * + * MXKRoomViewController: Fix a crash by not calling UITableViewDataSource method, but dequeuing the cell. ⚠️ API Changes * From b54d9e6752fc3f53df2f984bdb8766d582da360d Mon Sep 17 00:00:00 2001 From: ismailgulek Date: Fri, 18 Dec 2020 14:27:17 +0300 Subject: [PATCH 5/6] version++ --- CHANGES.rst | 5 ++++- MatrixKit.podspec | 4 ++-- MatrixKit/MatrixKitVersion.m | 2 +- Podfile | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 4a160f044..01209edb1 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,4 +1,4 @@ -Changes to be released in next version +Changes in 0.13.4 (2020-12-18) ================================================= ✨ Features @@ -22,6 +22,9 @@ Changes to be released in next version 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 index 3f7f6bad6..c43b1298c 100644 --- 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/MatrixKitVersion.m b/MatrixKit/MatrixKitVersion.m index 4414be397..fdef93722 100644 --- a/MatrixKit/MatrixKitVersion.m +++ b/MatrixKit/MatrixKitVersion.m @@ -16,4 +16,4 @@ #import -NSString *const MatrixKitVersion = @"0.13.3"; +NSString *const MatrixKitVersion = @"0.13.4"; diff --git a/Podfile b/Podfile index cdad7a030..0a5e89a05 100644 --- 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' From 56d5478aab80a8a37868a57ab76b0e343e9a63eb Mon Sep 17 00:00:00 2001 From: ismailgulek Date: Fri, 18 Dec 2020 15:05:31 +0300 Subject: [PATCH 6/6] finish version++ --- Podfile.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Podfile.lock b/Podfile.lock index 291968db6..9d1ad1208 100644 --- 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