From 87025b855a226efebcb44922453b48aae20ee8ab Mon Sep 17 00:00:00 2001 From: SBiOSoftWhare Date: Wed, 12 May 2021 17:59:02 +0200 Subject: [PATCH 1/5] Prepare for new sprint --- CHANGES.rst | 24 ++++++++++++++++++++++++ Config/AppIdentifiers.xcconfig | 4 ++-- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index ccb521a38..34ed7325a 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 1.3.7 (2021-05-12) ================================================= diff --git a/Config/AppIdentifiers.xcconfig b/Config/AppIdentifiers.xcconfig index 83f452d96..9a00546b6 100644 --- a/Config/AppIdentifiers.xcconfig +++ b/Config/AppIdentifiers.xcconfig @@ -22,8 +22,8 @@ APPLICATION_GROUP_IDENTIFIER = group.im.vector APPLICATION_SCHEME = element // Version -MARKETING_VERSION = 1.3.7 -CURRENT_PROJECT_VERSION = 1.3.7 +MARKETING_VERSION = 1.3.8 +CURRENT_PROJECT_VERSION = 1.3.8 // Team From 9ade0261f46c1183b5b910e55c8efc327e62a64c Mon Sep 17 00:00:00 2001 From: SBiOSoftWhare Date: Mon, 17 May 2021 15:44:29 +0200 Subject: [PATCH 2/5] RecentsDataSource: Do not display secure backup banner when keys upload is in process. --- Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m b/Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m index 57474d9c8..15fc71279 100644 --- a/Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m +++ b/Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m @@ -190,10 +190,13 @@ NSString *const kRecentsDataSourceTapOnDirectoryServerChange = @"kRecentsDataSou SecureBackupBannerPreferences *secureBackupBannersPreferences = SecureBackupBannerPreferences.shared; // Display the banner if only we can set up 4S and if there are messages keys to backup + // and if there is no plan to upload keys yet if (!secureBackupBannersPreferences.hideSetupBanner && [self.mxSession vc_canSetupSecureBackup] - && self.mxSession.crypto.backup.hasKeysToBackup) + && self.mxSession.crypto.backup.hasKeysToBackup + && !self.mxSession.crypto.backup.enabled) { + NSLog(@"[RecentsDataSource] updateSecureBackupBanner: Secure backup should be shown (crypto.backup.state = %lu)", (unsigned long)self.mxSession.crypto.backup.state); secureBackupBanner = SecureBackupBannerDisplaySetup; } } From 76f900f921d8f1bc898cc8fa67b5b7bbec86cf40 Mon Sep 17 00:00:00 2001 From: SBiOSoftWhare Date: Mon, 17 May 2021 15:47:07 +0200 Subject: [PATCH 3/5] Update changes --- CHANGES.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index 34ed7325a..3d4b519fe 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -8,7 +8,7 @@ Changes to be released in next version * 🐛 Bugfix - * + * RecentsDataSource: Do not display secure backup banner when keys upload is in process. ⚠️ API Changes * From be53adabd173f73bbc0a298239e6dd3f3ad4f9d7 Mon Sep 17 00:00:00 2001 From: SBiOSoftWhare Date: Mon, 17 May 2021 16:45:44 +0200 Subject: [PATCH 4/5] version++ --- CHANGES.rst | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index 3d4b519fe..03749ffe5 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,4 +1,4 @@ -Changes to be released in next version +Changes in 1.3.8 (2021-05-17) ================================================= ✨ Features @@ -22,6 +22,9 @@ Changes to be released in next version Others * +Improvements: + + Changes in 1.3.7 (2021-05-12) ================================================= From fa8a78d0d4983b83bdc64c2737fdcd570e10bb1a Mon Sep 17 00:00:00 2001 From: SBiOSoftWhare Date: Mon, 17 May 2021 17:50:56 +0200 Subject: [PATCH 5/5] finish version++