From 9ade0261f46c1183b5b910e55c8efc327e62a64c Mon Sep 17 00:00:00 2001 From: SBiOSoftWhare Date: Mon, 17 May 2021 15:44:29 +0200 Subject: [PATCH 1/2] 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 2/2] 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 *