Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-29 07:42:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into element_3679

Browse source
This commit is contained in:
ismailgulek 2020-10-01 19:06:33 +03:00 committed by GitHub
commit 376e5b306c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGES.rst
View file

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

6
Riot/Categories/MXSession+Riot.m
View file

@ -88,12 +88,6 @@
return NO; 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 // Accept to create a setup only if we have the 3 cross-signing keys
// This is the path to have a sane state // This is the path to have a sane state
// TODO: What about missing MSK that was not gossiped before? // TODO: What about missing MSK that was not gossiped before?

5
Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m
View file

@ -189,7 +189,10 @@ NSString *const kRecentsDataSourceTapOnDirectoryServerChange = @"kRecentsDataSou
{ {
SecureBackupBannerPreferences *secureBackupBannersPreferences = SecureBackupBannerPreferences.shared; 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; secureBackupBanner = SecureBackupBannerDisplaySetup;
} }

2
Riot/Modules/SetPinCode/SetupBiometrics/SetupBiometricsViewModel.swift
View file

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