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 pull request #4548 from vector-im/gil/element_4546

Browse source 
Show / hide reset button in secrets recovery screen (#4546).
This commit is contained in:
Gil Eluard 2021-07-13 10:43:33 +02:00 committed by GitHub
commit ab60c2a203
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGES.rst
View file

@ -16,6 +16,7 @@ Changes to be released in next version
* Directory List (pop-up one): Fix duplicate rooms being shown (#4537).
* Use different title for scan button for self verification (#4525).
* it's easy for the back button to trigger a leftpanel reveal (#4438).
* Show / hide reset button in secrets recovery screen (#4546).
⚠️ API Changes
*

5
Config/BuildSettings.swift
View file

@ -321,6 +321,9 @@ final class BuildSettings: NSObject {
static let authScreenShowForgotPassword = true
static let authScreenShowCustomServerOptions = true
// Mark: - Unified Search
// MARK: - Unified Search
static let unifiedSearchScreenShowPublicDirectory = true
// MARK: - Secrets Recovery
static let secretsRecoveryAllowReset = true
}

16
Riot/Managers/Settings/RiotSettings.swift
View file

@ -80,6 +80,7 @@ final class RiotSettings: NSObject {
static let roomMemberScreenShowIgnore = "roomMemberScreenShowIgnore"
static let unifiedSearchScreenShowPublicDirectory = "unifiedSearchScreenShowPublicDirectory"
static let hideSpaceBetaAnnounce = "hideSpaceBetaAnnounce"
static let secretsRecoveryAllowReset = "secretsRecoveryAllowReset"
}
static let shared = RiotSettings()
@ -695,7 +696,7 @@ final class RiotSettings: NSObject {
}
}
// Mark: - Unified Search
// MARK: - Unified Search
var unifiedSearchScreenShowPublicDirectory: Bool {
get {
@ -708,6 +709,19 @@ final class RiotSettings: NSObject {
}
}
// MARK: - Secrets Recovery
var secretsRecoveryAllowReset: Bool {
get {
guard defaults.object(forKey: UserDefaultsKeys.secretsRecoveryAllowReset) != nil else {
return BuildSettings.secretsRecoveryAllowReset
}
return defaults.bool(forKey: UserDefaultsKeys.secretsRecoveryAllowReset)
} set {
defaults.set(newValue, forKey: UserDefaultsKeys.secretsRecoveryAllowReset)
}
}
// MARK: - Beta
var hideSpaceBetaAnnounce: Bool {

2
Riot/Modules/Secrets/Recover/RecoverWithKey/SecretsRecoveryWithKeyViewController.swift
View file

@ -123,6 +123,8 @@ final class SecretsRecoveryWithKeyViewController: UIViewController {
self.updateRecoverButton()
self.resetSecretsButton.vc_enableMultiLinesTitle()
self.resetSecretsButton.isHidden = !RiotSettings.shared.secretsRecoveryAllowReset
}
private func update(theme: Theme) {

2
Riot/Modules/Secrets/Recover/RecoverWithPassphrase/SecretsRecoveryWithPassphraseViewController.swift
View file

@ -125,6 +125,8 @@ final class SecretsRecoveryWithPassphraseViewController: UIViewController {
self.updateRecoverButton()
self.resetSecretsButton.vc_enableMultiLinesTitle()
self.resetSecretsButton.isHidden = !RiotSettings.shared.secretsRecoveryAllowReset
}
private func update(theme: Theme) {