Merge branch 'release/1.3.9/master'

CHANGES.rst

@@ -1,3 +1,30 @@
+Changes in 1.3.9 (2021-05-18)
+=================================================
+
+✨ Features
+ * 
+
+🙌 Improvements
+ * 
+
+🐛 Bugfix
+ * RecentsDataSource: Present the secure backup banner only if key backup is disabled.
+
+⚠️ API Changes
+ * 
+
+🗣 Translations
+ * 
+    
+🧱 Build
+ * 
+
+Others
+ * 
+
+Improvements:
+
+
 Changes in 1.3.8 (2021-05-17)
 =================================================
 

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

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;