felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-05-13 03:09:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4339 from vector-im/fix_secure_backup_banner_2

Browse Source 
RecentsDataSource: Present the secure backup banner only if key backup is disabled
This commit is contained in:
SBiOSoftWhare
2021-05-18 11:36:38 +02:00
committed by GitHub
parent c489987b1a 22ce1334f9
commit 764343337a
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGES.rst
+1 -1
View File
@@ -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
*
Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m
+2 -3
View File
@@ -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;