From 1a6a5331895328fa2c4ab20b24ff8bcc28bc8b3d Mon Sep 17 00:00:00 2001 From: SBiOSoftWhare Date: Tue, 18 May 2021 11:05:19 +0200 Subject: [PATCH 1/2] 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 2/2] 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 *