Merge branch 'develop' into element_3679

CHANGES.rst

@@ -6,11 +6,13 @@ Changes to be released in next version
 
 🙌 Improvements
  * i18n: Add Estonian (et).
+ * MXSession: Make vc_canSetupSecureBackup reusable.
 
 🐛 Bugfix
  * Settings: New phone number is invisible in dark theme (#3218).
  * Handle call actions on other devices on VoIP pushes (#3677).
  * Fix "Unable to open the link" error when using non-Safari browsers (#3673).
+ * Biometrics: Handle retry case.
  * Room: Remove membership events from room creation modal (#3679).
 
 ⚠️ API Changes

Riot/Categories/MXSession+Riot.m

@@ -88,12 +88,6 @@
         return NO;
     }
     
-    if (!self.crypto.backup.hasKeysToBackup)
-    {
-        // Do not create secure key backup if they are no keys to backup.
-        return NO;
-    }
-    
     // Accept to create a setup only if we have the 3 cross-signing keys
     // This is the path to have a sane state
     // TODO: What about missing MSK that was not gossiped before?

Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m

@@ -189,7 +189,10 @@ NSString *const kRecentsDataSourceTapOnDirectoryServerChange = @"kRecentsDataSou
     {
         SecureBackupBannerPreferences *secureBackupBannersPreferences = SecureBackupBannerPreferences.shared;
         
-        if (!secureBackupBannersPreferences.hideSetupBanner && [self.mxSession vc_canSetupSecureBackup])
+        // Display the banner if only we can set up 4S and if there are messages keys to backup
+        if (!secureBackupBannersPreferences.hideSetupBanner
+            && [self.mxSession vc_canSetupSecureBackup]
+            && self.mxSession.crypto.backup.hasKeysToBackup)
         {
             secureBackupBanner = SecureBackupBannerDisplaySetup;
         }

Riot/Modules/SetPinCode/SetupBiometrics/SetupBiometricsViewModel.swift

@@ -106,6 +106,8 @@ final class SetupBiometricsViewModel: SetupBiometricsViewModelType {
                     self.coordinatorDelegate?.setupBiometricsViewModelDidCompleteWithReset(self, dueToTooManyErrors: true)
                 } else if nsError.code == LAError.Code.userCancel.rawValue || nsError.code == LAError.Code.userFallback.rawValue {
                     self.userCancelledUnlockWithBiometrics()
+                } else {
+                    self.update(viewState: .cantUnlocked)
                 }
             }
         }