From e422e88e1cf23e18587202c334b4d290fed07de5 Mon Sep 17 00:00:00 2001 From: ismailgulek Date: Wed, 19 Aug 2020 23:20:36 +0300 Subject: [PATCH 1/7] Prepare for new sprint --- CHANGES.rst | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index e7cc5d4288..45732e4fb1 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,3 +1,30 @@ +Changes to be released in next version +================================================= + +Features: + * + +Improvements: + * + +Bugfix: + * + +API Change: + * + +Translations: + * + +Others: + * + +Build: + * + +Test: + * + Changes in 0.16.12 (2020-08-19) ================================================= From d482bc606a55364b52010e84f5536a4f7ab2a9a9 Mon Sep 17 00:00:00 2001 From: Giom Foret Date: Fri, 21 Aug 2020 00:36:27 +0200 Subject: [PATCH 2/7] Bug Fix : Some room members count are wrong after clearing the cache The bug was located in [MXRoomState copyWithZone:]. Indeed the item `membersCount` was not copied correctly whereas this is an instance of MXRoomMembersCount class. The "back state" created thanks to the copy here: https://github.com/matrix-org/matrix-ios-sdk/blob/6027fd5b2b644f2ebeb1049cdb80a318d7db2273/MatrixSDK/Data/MXRoomState.m#L126 was using the same membersCount instance as the provided "live state". The content of this membersCount was updated in case of membership events in the back pagination. The live state was then corrupted. According to my investigation, the corrupted state was not pushed to the store, except perhaps if new membership events were received in the live stream. --- CHANGES.rst | 2 +- MatrixSDK/Data/MXRoomState.m | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 45732e4fb1..c568ffef2c 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -8,7 +8,7 @@ Improvements: * Bugfix: - * + * Some room members count are wrong after clearing the cache API Change: * diff --git a/MatrixSDK/Data/MXRoomState.m b/MatrixSDK/Data/MXRoomState.m index a18772e53f..c9f5a41fa7 100644 --- a/MatrixSDK/Data/MXRoomState.m +++ b/MatrixSDK/Data/MXRoomState.m @@ -592,7 +592,7 @@ - (id)copyWithZone:(NSZone *)zone stateCopy->_members = [_members copyWithZone:zone]; - stateCopy->_membersCount = _membersCount; + stateCopy->_membersCount = [_membersCount copyWithZone:zone]; stateCopy->roomAliases = [[NSMutableDictionary allocWithZone:zone] initWithDictionary:roomAliases]; From cfc7f7b42e2a0e5158ccc1ee9b1589c5aad395f5 Mon Sep 17 00:00:00 2001 From: Giom Foret Date: Mon, 24 Aug 2020 13:55:59 +0200 Subject: [PATCH 3/7] Increase kMXFileVersion to force a clear cache on SDK update --- MatrixSDK/Data/Store/MXFileStore/MXFileStore.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MatrixSDK/Data/Store/MXFileStore/MXFileStore.m b/MatrixSDK/Data/Store/MXFileStore/MXFileStore.m index 73ec69c859..4024dcfcaf 100644 --- a/MatrixSDK/Data/Store/MXFileStore/MXFileStore.m +++ b/MatrixSDK/Data/Store/MXFileStore/MXFileStore.m @@ -25,7 +25,7 @@ #import "MXSDKOptions.h" #import "MXTools.h" -static NSUInteger const kMXFileVersion = 66; +static NSUInteger const kMXFileVersion = 67; static NSString *const kMXFileStoreFolder = @"MXFileStore"; static NSString *const kMXFileStoreMedaDataFile = @"MXFileStore"; From dca8406dc1d2161f6e40c4a63070840b41f1d048 Mon Sep 17 00:00:00 2001 From: ismailgulek Date: Tue, 25 Aug 2020 13:58:52 +0300 Subject: [PATCH 4/7] Introduce handleCallEvent --- MatrixSDK/VoIP/MXCallManager.h | 8 +++++++ MatrixSDK/VoIP/MXCallManager.m | 41 +++++++++++++++++----------------- 2 files changed, 29 insertions(+), 20 deletions(-) diff --git a/MatrixSDK/VoIP/MXCallManager.h b/MatrixSDK/VoIP/MXCallManager.h index d96abeaf25..e80bc82539 100644 --- a/MatrixSDK/VoIP/MXCallManager.h +++ b/MatrixSDK/VoIP/MXCallManager.h @@ -25,6 +25,7 @@ NS_ASSUME_NONNULL_BEGIN @class MXRoomMember; @class MXSession; @class MXTurnServerResponse; +@class MXEvent; @protocol MXCallStack; @@ -106,6 +107,13 @@ extern NSString *const kMXCallManagerConferenceFinished; */ - (void)removeCall:(MXCall *)call; +/** + Handle a call event. Ignores other types of events. + + @param event The call event. + */ +- (void)handleCallEvent:(MXEvent *)event; + /** The related matrix session. */ diff --git a/MatrixSDK/VoIP/MXCallManager.m b/MatrixSDK/VoIP/MXCallManager.m index a44c862b44..4ed506ef68 100644 --- a/MatrixSDK/VoIP/MXCallManager.m +++ b/MatrixSDK/VoIP/MXCallManager.m @@ -80,26 +80,7 @@ - (instancetype)initWithMatrixSession:(MXSession *)mxSession andCallStack:(id Date: Tue, 25 Aug 2020 13:59:43 +0300 Subject: [PATCH 5/7] Update CHANGES.rst --- CHANGES.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index c568ffef2c..a7771cabec 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,7 +5,7 @@ Features: * Improvements: - * + * Introduce handleCallEvent on MXCallManager. Bugfix: * Some room members count are wrong after clearing the cache From 505ccaea854492697a06411ff746ef89c752606d Mon Sep 17 00:00:00 2001 From: ismailgulek Date: Tue, 25 Aug 2020 14:30:42 +0300 Subject: [PATCH 6/7] version++ --- CHANGES.rst | 2 +- MatrixSDK.podspec | 2 +- MatrixSDK/MatrixSDKVersion.m | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index a7771cabec..2a27718669 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,4 +1,4 @@ -Changes to be released in next version +Changes in 0.16.13 (2020-08-25) ================================================= Features: diff --git a/MatrixSDK.podspec b/MatrixSDK.podspec index 574c1fbd0e..93d1b6cd55 100644 --- a/MatrixSDK.podspec +++ b/MatrixSDK.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |s| s.name = "MatrixSDK" - s.version = "0.16.12" + s.version = "0.16.13" s.summary = "The iOS SDK to build apps compatible with Matrix (https://www.matrix.org)" s.description = <<-DESC diff --git a/MatrixSDK/MatrixSDKVersion.m b/MatrixSDK/MatrixSDKVersion.m index 2b39dae5b3..1aaff39a3c 100644 --- a/MatrixSDK/MatrixSDKVersion.m +++ b/MatrixSDK/MatrixSDKVersion.m @@ -16,4 +16,4 @@ #import -NSString *const MatrixSDKVersion = @"0.16.12"; +NSString *const MatrixSDKVersion = @"0.16.13"; From 10d4eeedb87de3521379a4d26a9fa36d8e67dce5 Mon Sep 17 00:00:00 2001 From: ismailgulek Date: Wed, 26 Aug 2020 11:28:45 +0300 Subject: [PATCH 7/7] finish version++