From 04002f356ff836c22dfc2767b84d0fd615ff19e2 Mon Sep 17 00:00:00 2001 From: amddg44 Date: Mon, 11 Sep 2023 12:30:24 +0200 Subject: [PATCH 1/2] Add authentication state check when enabling grace period --- DuckDuckGo/AutofillLoginDetailsViewController.swift | 2 +- DuckDuckGo/AutofillLoginSettingsListViewController.swift | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DuckDuckGo/AutofillLoginDetailsViewController.swift b/DuckDuckGo/AutofillLoginDetailsViewController.swift index 4a2328481f..58f614a72d 100644 --- a/DuckDuckGo/AutofillLoginDetailsViewController.swift +++ b/DuckDuckGo/AutofillLoginDetailsViewController.swift @@ -109,7 +109,7 @@ class AutofillLoginDetailsViewController: UIViewController { override func viewDidAppear(_ animated: Bool) { super.viewDidAppear(animated) - if !authenticationNotRequired { + if !authenticationNotRequired && authenticator.state == .loggedIn { authenticator.authenticate() } } diff --git a/DuckDuckGo/AutofillLoginSettingsListViewController.swift b/DuckDuckGo/AutofillLoginSettingsListViewController.swift index b7d1664b4d..92a59444ca 100644 --- a/DuckDuckGo/AutofillLoginSettingsListViewController.swift +++ b/DuckDuckGo/AutofillLoginSettingsListViewController.swift @@ -149,7 +149,7 @@ final class AutofillLoginSettingsListViewController: UIViewController { override func viewWillDisappear(_ animated: Bool) { super.viewWillDisappear(animated) - if viewModel.authenticator.canAuthenticate() { + if viewModel.authenticator.canAuthenticate() && viewModel.authenticator.state == .loggedIn { AppDependencyProvider.shared.autofillLoginSession.startSession() } } From 40402c4540256f402e5d0361ada1abb4d6fa21a1 Mon Sep 17 00:00:00 2001 From: amddg44 Date: Mon, 11 Sep 2023 12:52:09 +0200 Subject: [PATCH 2/2] Update version number --- Configuration/Version.xcconfig | 2 +- DuckDuckGo/Settings.bundle/Root.plist | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Configuration/Version.xcconfig b/Configuration/Version.xcconfig index a954f8ae98..8fe946836e 100644 --- a/Configuration/Version.xcconfig +++ b/Configuration/Version.xcconfig @@ -1 +1 @@ -MARKETING_VERSION = 7.88.0 +MARKETING_VERSION = 7.88.1 diff --git a/DuckDuckGo/Settings.bundle/Root.plist b/DuckDuckGo/Settings.bundle/Root.plist index da3e299a75..3c22c85ce3 100644 --- a/DuckDuckGo/Settings.bundle/Root.plist +++ b/DuckDuckGo/Settings.bundle/Root.plist @@ -6,7 +6,7 @@ DefaultValue - 7.88.0 + 7.88.1 Key version Title