mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-20 03:31:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1545 from cryptomator/feature/save-password-clarification

Browse Source 
"Save Password" Clarification
This commit is contained in:
Tobias Hagemann
2021-02-18 13:07:04 +01:00
committed by GitHub
parent 80cbc6699a 25dba028f8
commit 74e1d6f991
8 changed files with 111 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailLockedController.java
View File

@@ -5,6 +5,7 @@ import org.cryptomator.common.keychain.KeychainManager;
import org.cryptomator.common.vaults.Vault;
import org.cryptomator.ui.common.FxController;
import org.cryptomator.ui.fxapp.FxApplication;
import org.cryptomator.ui.vaultoptions.SelectedVaultOptionsTab;
import org.cryptomator.ui.vaultoptions.VaultOptionsComponent;
import javax.inject.Inject;
@@ -47,7 +48,12 @@ public class VaultDetailLockedController implements FxController {
@FXML
public void showVaultOptions() {
vaultOptionsWindow.vault(vault.get()).build().showVaultOptionsWindow();
vaultOptionsWindow.vault(vault.get()).build().showVaultOptionsWindow(SelectedVaultOptionsTab.ANY);
}
@FXML
public void showKeyVaultOptions() {
vaultOptionsWindow.vault(vault.get()).build().showVaultOptionsWindow(SelectedVaultOptionsTab.KEY);
}
/* Getter/Setter */

23
main/ui/src/main/java/org/cryptomator/ui/vaultoptions/SelectedVaultOptionsTab.java Normal file
View File

@@ -0,0 +1,23 @@
package org.cryptomator.ui.vaultoptions;
public enum SelectedVaultOptionsTab {
/**
* Let the controller decide which tab to show.
*/
ANY,
/**
* Show general tab
*/
GENERAL,
/**
* Show mounting tab
*/
MOUNT,
/**
* Show password tab
*/
KEY,
}

6
main/ui/src/main/java/org/cryptomator/ui/vaultoptions/VaultOptionsComponent.java
View File

@@ -12,6 +12,7 @@ import org.cryptomator.common.vaults.Vault;
import org.cryptomator.ui.common.FxmlFile;
import org.cryptomator.ui.common.FxmlScene;
import javafx.beans.property.ObjectProperty;
import javafx.scene.Scene;
import javafx.stage.Stage;
@@ -25,7 +26,10 @@ public interface VaultOptionsComponent {
@FxmlScene(FxmlFile.VAULT_OPTIONS)
Lazy<Scene> scene();
default void showVaultOptionsWindow() {
ObjectProperty<SelectedVaultOptionsTab> selectedTabProperty();
default void showVaultOptionsWindow(SelectedVaultOptionsTab selectedTab) {
selectedTabProperty().set(selectedTab);
Stage stage = window();
stage.setScene(scene().get());
stage.show();

56
main/ui/src/main/java/org/cryptomator/ui/vaultoptions/VaultOptionsController.java
View File

@@ -1,13 +1,67 @@
package org.cryptomator.ui.vaultoptions;
import org.cryptomator.ui.common.FxController;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.inject.Inject;
import javafx.beans.property.ObjectProperty;
import javafx.fxml.FXML;
import javafx.scene.control.Tab;
import javafx.scene.control.TabPane;
import javafx.stage.Stage;
import javafx.stage.WindowEvent;
@VaultOptionsScoped
public class VaultOptionsController implements FxController {
private static final Logger LOG = LoggerFactory.getLogger(VaultOptionsController.class);
private final Stage window;
private final ObjectProperty<SelectedVaultOptionsTab> selectedTabProperty;
public TabPane tabPane;
public Tab generalTab;
public Tab mountTab;
public Tab keyTab;
@Inject
VaultOptionsController() {}
VaultOptionsController(@VaultOptionsWindow Stage window, ObjectProperty<SelectedVaultOptionsTab> selectedTabProperty) {
this.window = window;
this.selectedTabProperty = selectedTabProperty;
}
@FXML
public void initialize() {
window.setOnShowing(this::windowWillAppear);
selectedTabProperty.addListener(observable -> this.selectChosenTab());
tabPane.getSelectionModel().selectedItemProperty().addListener(observable -> this.selectedTabChanged());
}
private void selectChosenTab() {
Tab toBeSelected = getTabToSelect(selectedTabProperty.get());
tabPane.getSelectionModel().select(toBeSelected);
}
private Tab getTabToSelect(SelectedVaultOptionsTab selectedTab) {
return switch (selectedTab) {
case ANY, GENERAL -> generalTab;
case MOUNT -> mountTab;
case KEY -> keyTab;
};
}
private void selectedTabChanged() {
Tab selectedTab = tabPane.getSelectionModel().getSelectedItem();
try {
SelectedVaultOptionsTab selectedVaultOptionsTab = SelectedVaultOptionsTab.valueOf(selectedTab.getId());
selectedTabProperty.set(selectedVaultOptionsTab);
} catch (IllegalArgumentException e) {
LOG.error("Unknown vault options tab id: {}", selectedTab.getId());
}
}
private void windowWillAppear(@SuppressWarnings("unused") WindowEvent windowEvent) {
selectChosenTab();
}
}

10
main/ui/src/main/java/org/cryptomator/ui/vaultoptions/VaultOptionsModule.java
View File

@@ -7,16 +7,18 @@ import dagger.multibindings.IntoMap;
import org.cryptomator.common.vaults.Vault;
import org.cryptomator.ui.changepassword.ChangePasswordComponent;
import org.cryptomator.ui.common.DefaultSceneFactory;
import org.cryptomator.ui.common.FxmlLoaderFactory;
import org.cryptomator.ui.common.FxController;
import org.cryptomator.ui.common.FxControllerKey;
import org.cryptomator.ui.common.FxmlFile;
import org.cryptomator.ui.common.FxmlLoaderFactory;
import org.cryptomator.ui.common.FxmlScene;
import org.cryptomator.ui.common.StageFactory;
import org.cryptomator.ui.mainwindow.MainWindow;
import org.cryptomator.ui.recoverykey.RecoveryKeyComponent;
import javax.inject.Provider;
import javafx.beans.property.ObjectProperty;
import javafx.beans.property.SimpleObjectProperty;
import javafx.scene.Scene;
import javafx.stage.Modality;
import javafx.stage.Stage;
@@ -26,6 +28,12 @@ import java.util.ResourceBundle;
@Module(subcomponents = {ChangePasswordComponent.class, RecoveryKeyComponent.class})
abstract class VaultOptionsModule {
@Provides
@VaultOptionsScoped
static ObjectProperty<SelectedVaultOptionsTab> provideSelectedTabProperty() {
return new SimpleObjectProperty<>(SelectedVaultOptionsTab.ANY);
}
@Provides
@VaultOptionsWindow
@VaultOptionsScoped

15
main/ui/src/main/resources/fxml/vault_detail_locked.fxml
View File

@@ -3,7 +3,6 @@
<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
<?import javafx.scene.control.Button?>
<?import javafx.scene.control.Hyperlink?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.Region?>
<?import javafx.scene.layout.VBox?>
@@ -25,18 +24,20 @@
<FontAwesome5IconView glyph="KEY" glyphSize="15"/>
</graphic>
</Button>
<Hyperlink text="%main.vaultDetail.optionsBtn" onAction="#showVaultOptions">
<Hyperlink text="%main.vaultDetail.passwordSavedInKeychain" visible="${controller.passwordSaved}" onAction="#showKeyVaultOptions">
<graphic>
<FontAwesome5IconView glyph="COG"/>
<FontAwesome5IconView glyph="LOCK"/>
</graphic>
</Hyperlink>
<Region VBox.vgrow="ALWAYS"/>
<HBox alignment="CENTER_RIGHT" spacing="6">
<Label styleClass="label-small,label-muted" text="%main.vaultDetail.passwordSavedInKeychain" visible="${controller.passwordSaved}">
<HBox alignment="BOTTOM_RIGHT">
<Button text="%main.vaultDetail.optionsBtn" minWidth="120" onAction="#showVaultOptions">
<graphic>
<FontAwesome5IconView styleClass="glyph-icon-muted" glyph="LOCK"/>
<FontAwesome5IconView glyph="COG"/>
</graphic>
</Label>
</Button>
</HBox>
</children>
</VBox>

6
main/ui/src/main/resources/fxml/vault_options.fxml
View File

@@ -12,7 +12,7 @@
tabClosingPolicy="UNAVAILABLE"
tabDragPolicy="FIXED">
<tabs>
<Tab fx:id="generalTab" text="%vaultOptions.general">
<Tab fx:id="generalTab" id="GENERAL" text="%vaultOptions.general">
<graphic>
<FontAwesome5IconView glyph="WRENCH"/>
</graphic>
@@ -20,7 +20,7 @@
<fx:include source="/fxml/vault_options_general.fxml"/>
</content>
</Tab>
<Tab fx:id="mountTab" text="%vaultOptions.mount">
<Tab fx:id="mountTab" id="MOUNT" text="%vaultOptions.mount">
<graphic>
<FontAwesome5IconView glyph="HDD"/>
</graphic>
@@ -28,7 +28,7 @@
<fx:include source="/fxml/vault_options_mount.fxml"/>
</content>
</Tab>
<Tab fx:id="keyTab" text="%vaultOptions.masterkey">
<Tab fx:id="keyTab" id="KEY" text="%vaultOptions.masterkey">
<graphic>
<FontAwesome5IconView glyph="KEY"/>
</graphic>

2
main/ui/src/main/resources/i18n/strings.properties
View File

@@ -96,7 +96,7 @@ forgetPassword.confirmBtn=Forget Password
# Unlock
unlock.title=Unlock Vault
unlock.passwordPrompt=Enter password for "%s":
unlock.savePassword=Save Password
unlock.savePassword=Remember Password
unlock.unlockBtn=Unlock
## Success
unlock.success.message=Unlocked "%s" successfully! Your vault is now accessible.