From c489987b1a09915dc009ac25907edcc48c85096d Mon Sep 17 00:00:00 2001 From: SBiOSoftWhare Date: Mon, 17 May 2021 17:51:00 +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 03749ffe5..dd08a4cdc 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.8 (2021-05-17) ================================================= diff --git a/Config/AppIdentifiers.xcconfig b/Config/AppIdentifiers.xcconfig index 9a00546b6..e3bfb031b 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.8 -CURRENT_PROJECT_VERSION = 1.3.8 +MARKETING_VERSION = 1.3.9 +CURRENT_PROJECT_VERSION = 1.3.9 // Team From 1a6a5331895328fa2c4ab20b24ff8bcc28bc8b3d Mon Sep 17 00:00:00 2001 From: SBiOSoftWhare Date: Tue, 18 May 2021 11:05:19 +0200 Subject: [PATCH 2/5] RecentsDataSource: Present the secure backup banner only if key backup is disabled. --- Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m b/Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m index 15fc71279..bc879a7eb 100644 --- a/Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m +++ b/Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m @@ -189,12 +189,11 @@ 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 + // Display the banner only if we can set up 4S, if there are messages keys to backup and key backup is disabled if (!secureBackupBannersPreferences.hideSetupBanner && [self.mxSession vc_canSetupSecureBackup] && self.mxSession.crypto.backup.hasKeysToBackup - && !self.mxSession.crypto.backup.enabled) + && self.mxSession.crypto.backup.state == MXKeyBackupStateDisabled) { NSLog(@"[RecentsDataSource] updateSecureBackupBanner: Secure backup should be shown (crypto.backup.state = %lu)", (unsigned long)self.mxSession.crypto.backup.state); secureBackupBanner = SecureBackupBannerDisplaySetup; From 22ce1334f9b936e05dc32d184609b1f165c130b0 Mon Sep 17 00:00:00 2001 From: SBiOSoftWhare Date: Tue, 18 May 2021 11:06:03 +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 dd08a4cdc..d6f0bd7f8 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -8,7 +8,7 @@ Changes to be released in next version * 🐛 Bugfix - * + * RecentsDataSource: Present the secure backup banner only if key backup is disabled. ⚠️ API Changes * From 687ee40f44bc02fde95aedaa184fb97fc2100e11 Mon Sep 17 00:00:00 2001 From: SBiOSoftWhare Date: Tue, 18 May 2021 11:48:23 +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 d6f0bd7f8..0b40cd922 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,4 +1,4 @@ -Changes to be released in next version +Changes in 1.3.9 (2021-05-18) ================================================= ✨ Features @@ -22,6 +22,9 @@ Changes to be released in next version Others * +Improvements: + + Changes in 1.3.8 (2021-05-17) ================================================= From dd8dcf6d0576477685cc30c30bf5a132a1f314ed Mon Sep 17 00:00:00 2001 From: SBiOSoftWhare Date: Tue, 18 May 2021 13:57:41 +0200 Subject: [PATCH 5/5] finish version++