[desktop] changes after review by ivk

don't show credential encryption options if there are no options #3733
tutao · Jan 27, 2022 · 86e3970 · charlag · Feb 1, 2022 · 86e3970
1 parent f1cda03
commit 86e3970
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/misc/credentials/CredentialsProviderFactory.ts b/src/misc/credentials/CredentialsProviderFactory.ts
@@ -14,6 +14,10 @@ export function usingKeychainAuthentication(): boolean {
 	return isApp() || isDesktop()
 }
 
+export function hasKeychainAuthenticationOptions(): boolean {
+	return isApp()
+}
+
 /**
  * Factory method for credentials provider that will return an instance injected with the implementations appropriate for the platform.
  * @param deviceEncryptionFacade

diff --git a/src/settings/LoginSettingsViewer.ts b/src/settings/LoginSettingsViewer.ts
@@ -25,7 +25,7 @@ import {ifAllowedTutanotaLinks} from "../gui/base/GuiUtils"
 import type {UpdatableSettingsViewer} from "./SettingsView"
 import {CredentialEncryptionMode} from "../misc/credentials/CredentialEncryptionMode"
 import type {ICredentialsProvider} from "../misc/credentials/CredentialsProvider"
-import {usingKeychainAuthentication} from "../misc/credentials/CredentialsProviderFactory"
+import {hasKeychainAuthenticationOptions} from "../misc/credentials/CredentialsProviderFactory"
 import {showCredentialsEncryptionModeDialog} from "../gui/dialogs/SelectCredentialsEncryptionModeDialog"
 import {assertMainOrNode} from "../api/common/Env"
 import {locator} from "../api/main/MainLocator"
@@ -140,7 +140,7 @@ export class LoginSettingsViewer implements UpdatableSettingsViewer {
 	}
 
 	private _renderEncryptionModeField(): Children {
-		if (!usingKeychainAuthentication()) {
+		if (!hasKeychainAuthenticationOptions()) {
 			return null
 		}