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

Merge branch 'release/1.3.1'

Browse Source
This commit is contained in:
Sebastian Stenzel
2017-07-04 15:41:20 +02:00
parent 020f12a2a9 0a7d102981
commit 6d37cd24b6
11 changed files with 17 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
main/ant-kit/pom.xml
View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.cryptomator</groupId>
<artifactId>main</artifactId>
<version>1.3.0</version>
<version>1.3.1</version>
</parent>
<artifactId>ant-kit</artifactId>
<packaging>pom</packaging>

9
main/commons/pom.xml
View File

@@ -1,11 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.cryptomator</groupId>
<artifactId>main</artifactId>
<version>1.3.0</version>
<version>1.3.1</version>
</parent>
<artifactId>commons</artifactId>
<name>Cryptomator Commons</name>
@@ -29,13 +28,13 @@
<groupId>org.fxmisc.easybind</groupId>
<artifactId>easybind</artifactId>
</dependency>
<!-- DI -->
<dependency>
<groupId>com.google.dagger</groupId>
<artifactId>dagger</artifactId>
</dependency>
<!-- Logging -->
<dependency>
<groupId>org.slf4j</groupId>

4
main/jacoco-report/pom.xml
View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.cryptomator</groupId>
<artifactId>main</artifactId>
<version>1.3.0</version>
<version>1.3.1</version>
</parent>
<artifactId>jacoco-report</artifactId>
<name>Cryptomator Code Coverage Report</name>
@@ -35,7 +35,7 @@
</exclusion>
</exclusions>
</dependency>
<!-- binary dependency used during build -->
<dependency>
<groupId>com.codacy</groupId>

3
main/keychain/pom.xml
View File

@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.cryptomator</groupId>
<artifactId>main</artifactId>
<version>1.3.0</version>
<version>1.3.1</version>
</parent>
<artifactId>keychain</artifactId>
<name>System Keychain Access</name>

2
main/launcher/pom.xml
View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.cryptomator</groupId>
<artifactId>main</artifactId>
<version>1.3.0</version>
<version>1.3.1</version>
</parent>
<artifactId>launcher</artifactId>
<name>Cryptomator Launcher</name>

4
main/pom.xml
View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.cryptomator</groupId>
<artifactId>main</artifactId>
<version>1.3.0</version>
<version>1.3.1</version>
<packaging>pom</packaging>
<name>Cryptomator</name>
@@ -25,7 +25,7 @@
<!-- dependency versions -->
<cryptomator.cryptolib.version>1.1.5</cryptomator.cryptolib.version>
<cryptomator.cryptofs.version>1.4.0</cryptomator.cryptofs.version>
<cryptomator.cryptofs.version>1.4.1</cryptomator.cryptofs.version>
<cryptomator.webdav.version>0.6.2</cryptomator.webdav.version>
<cryptomator.jni.version>1.0.2</cryptomator.jni.version>

2
main/uber-jar/pom.xml
View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.cryptomator</groupId>
<artifactId>main</artifactId>
<version>1.3.0</version>
<version>1.3.1</version>
</parent>
<artifactId>uber-jar</artifactId>
<name>Single über jar with all dependencies</name>

2
main/ui/pom.xml
View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.cryptomator</groupId>
<artifactId>main</artifactId>
<version>1.3.0</version>
<version>1.3.1</version>
</parent>
<artifactId>ui</artifactId>
<name>Cryptomator GUI</name>

5
main/ui/src/main/java/org/cryptomator/ui/controllers/ChangePasswordController.java
View File

@@ -15,7 +15,6 @@ import java.util.Objects;
import java.util.Optional;
import javax.inject.Inject;
import javax.inject.Singleton;
import org.cryptomator.cryptolib.api.InvalidPassphraseException;
import org.cryptomator.cryptolib.api.UnsupportedVaultFormatException;
@@ -42,7 +41,6 @@ import javafx.scene.layout.GridPane;
import javafx.scene.layout.Region;
import javafx.scene.text.Text;
@Singleton
public class ChangePasswordController implements ViewController {
private static final Logger LOG = LoggerFactory.getLogger(ChangePasswordController.class);
@@ -123,9 +121,6 @@ public class ChangePasswordController implements ViewController {
void setVault(Vault vault) {
this.vault = Objects.requireNonNull(vault);
oldPasswordField.swipe();
newPasswordField.swipe();
retypePasswordField.swipe();
// trigger "default" change to refresh key bindings:
changePasswordButton.setDefaultButton(false);
changePasswordButton.setDefaultButton(true);

10
main/ui/src/main/java/org/cryptomator/ui/controllers/InitializeController.java
View File

@@ -16,7 +16,6 @@ import java.util.Objects;
import java.util.Optional;
import javax.inject.Inject;
import javax.inject.Singleton;
import org.cryptomator.ui.controls.SecPasswordField;
import org.cryptomator.ui.l10n.Localization;
@@ -28,8 +27,8 @@ import org.slf4j.LoggerFactory;
import javafx.application.Platform;
import javafx.beans.binding.BooleanBinding;
import javafx.beans.property.IntegerProperty;
import javafx.beans.property.SimpleIntegerProperty;
import javafx.beans.value.ObservableValue;
import javafx.event.ActionEvent;
import javafx.fxml.FXML;
import javafx.scene.Parent;
@@ -38,14 +37,13 @@ import javafx.scene.control.Label;
import javafx.scene.layout.GridPane;
import javafx.scene.layout.Region;
@Singleton
public class InitializeController implements ViewController {
private static final Logger LOG = LoggerFactory.getLogger(InitializeController.class);
private final Localization localization;
private final PasswordStrengthUtil strengthRater;
private final IntegerProperty passwordStrength = new SimpleIntegerProperty(); // 0-4
private ObservableValue<Integer> passwordStrength; // 0-4
private Optional<InitializationListener> listener = Optional.empty();
private Vault vault;
@@ -93,7 +91,7 @@ public class InitializeController implements ViewController {
BooleanBinding passwordIsEmpty = passwordField.textProperty().isEmpty();
BooleanBinding passwordsDiffer = passwordField.textProperty().isNotEqualTo(retypePasswordField.textProperty());
okButton.disableProperty().bind(passwordIsEmpty.or(passwordsDiffer));
passwordStrength.bind(EasyBind.map(passwordField.textProperty(), strengthRater::computeRate));
passwordStrength = EasyBind.map(passwordField.textProperty(), strengthRater::computeRate);
passwordStrengthLevel0.backgroundProperty().bind(EasyBind.combine(passwordStrength, new SimpleIntegerProperty(0), strengthRater::getBackgroundWithStrengthColor));
passwordStrengthLevel1.backgroundProperty().bind(EasyBind.combine(passwordStrength, new SimpleIntegerProperty(1), strengthRater::getBackgroundWithStrengthColor));
@@ -110,8 +108,6 @@ public class InitializeController implements ViewController {
void setVault(Vault vault) {
this.vault = Objects.requireNonNull(vault);
passwordField.swipe();
retypePasswordField.swipe();
// trigger "default" change to refresh key bindings:
okButton.setDefaultButton(false);
okButton.setDefaultButton(true);

1
main/ui/src/main/java/org/cryptomator/ui/controllers/UnlockController.java
View File

@@ -167,7 +167,6 @@ public class UnlockController implements ViewController {
}
assert vault != null;
this.vault = vault;
passwordField.swipe();
advancedOptions.setVisible(false);
advancedOptionsButton.setText(localization.getString("unlock.button.advancedOptions.show"));
progressIndicator.setVisible(false);