mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-08-01 21:06:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

converted lock after "time" to "idle time"

Browse Source
This commit is contained in:
Sebastian Stenzel
2021-06-02 15:53:57 +02:00
parent cd7acea54e
commit 8f8fa0248c
7 changed files with 109 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main/ui/src/main/java/org/cryptomator/ui/fxapp/FxApplication.java
+1 -16
View File
@@ -59,11 +59,9 @@ public class FxApplication extends Application {
private final ObservableList<Window> visibleWindows;
private final BooleanBinding hasVisibleWindows;
private final UiAppearanceListener systemInterfaceThemeListener = this::systemInterfaceThemeChanged;
private final VaultListManager vaultListManager;
private final ScheduledExecutorService scheduledExecutorService;
@Inject
FxApplication(Settings settings, Lazy<MainWindowComponent> mainWindow, Lazy<PreferencesComponent> preferencesWindow, Provider<UnlockComponent.Builder> unlockWorkflowBuilderProvider, Provider<LockComponent.Builder> lockWorkflowBuilderProvider, Lazy<QuitComponent> quitWindow, ErrorComponent.Builder errorWindowBuilder, Optional<TrayIntegrationProvider> trayIntegration, Optional<UiAppearanceProvider> appearanceProvider, VaultService vaultService, LicenseHolder licenseHolder, VaultListManager vaultListManager, ScheduledExecutorService scheduledExecutorService) {
FxApplication(Settings settings, Lazy<MainWindowComponent> mainWindow, Lazy<PreferencesComponent> preferencesWindow, Provider<UnlockComponent.Builder> unlockWorkflowBuilderProvider, Provider<LockComponent.Builder> lockWorkflowBuilderProvider, Lazy<QuitComponent> quitWindow, ErrorComponent.Builder errorWindowBuilder, Optional<TrayIntegrationProvider> trayIntegration, Optional<UiAppearanceProvider> appearanceProvider, VaultService vaultService, LicenseHolder licenseHolder) {
this.settings = settings;
this.mainWindow = mainWindow;
this.preferencesWindow = preferencesWindow;
@@ -77,8 +75,6 @@ public class FxApplication extends Application {
this.licenseHolder = licenseHolder;
this.visibleWindows = Stage.getWindows().filtered(Window::isShowing);
this.hasVisibleWindows = Bindings.isNotEmpty(visibleWindows);
this.vaultListManager = vaultListManager;
this.scheduledExecutorService = scheduledExecutorService;
}
public void start() {
@@ -131,7 +127,6 @@ public class FxApplication extends Application {
showMainWindow().thenAccept(mainWindow -> errorWindowBuilder.window(mainWindow).cause(new IllegalStateException("Unable to unlock vault in non-locked state.")));
}
});
checkAutolock(vault, owner);
}
public void startLockWorkflow(Vault vault, Optional<Stage> owner) {
@@ -212,14 +207,4 @@ public class FxApplication extends Application {
});
}
private void checkAutolock(Vault vault, Optional<Stage> owner) {
if (vault.getVaultSettings().lockAfterTime().get()) {
LOG.info("Locking after {} minutes.", vault.getVaultSettings().lockTimeInMinutes().get());
scheduledExecutorService.schedule(() -> {
startLockWorkflow(vault, owner);
}, (long) (vault.getVaultSettings().lockTimeInMinutes().get()), TimeUnit.MINUTES);
}
}
}
main/ui/src/main/resources/i18n/strings.properties
+2 -2
View File
@@ -331,8 +331,8 @@ vaultOptions.masterkey.showRecoveryKeyBtn=Display Recovery Key
vaultOptions.masterkey.recoverPasswordBtn=Recover Password
## Auto Lock
vaultOptions.autoLock=Auto-Lock
vaultOptions.autoLock.lockAfterTimePart1=Lock after
vaultOptions.autoLock.lockAfterTimePart2=minutes.
vaultOptions.autoLock.lockAfterTimePart1=Lock when idle for
vaultOptions.autoLock.lockAfterTimePart2=minutes
# Recovery Key
recoveryKey.title=Recovery Key