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

code quality [ci skip]

Browse Source
This commit is contained in:
Sebastian Stenzel
2019-03-27 08:50:20 +01:00
parent 44fc6761e3
commit 29a0336bf4
5 changed files with 21 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
main/commons/src/main/java/org/cryptomator/common/settings/SettingsJsonAdapter.java
View File

@@ -80,6 +80,7 @@ public class SettingsJsonAdapter extends TypeAdapter<Settings> {
default:
LOG.warn("Unsupported vault setting found in JSON: " + name);
in.skipValue();
break;
}
}
in.endObject();

26
main/commons/src/main/java/org/cryptomator/common/settings/SettingsProvider.java
View File

@@ -8,6 +8,16 @@
*******************************************************************************/
package org.cryptomator.common.settings;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import org.cryptomator.common.Environment;
import org.cryptomator.common.LazyInitializer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.inject.Inject;
import javax.inject.Provider;
import javax.inject.Singleton;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
@@ -16,8 +26,6 @@ import java.io.OutputStreamWriter;
import java.io.Reader;
import java.io.Writer;
import java.nio.charset.StandardCharsets;
import java.nio.file.FileSystem;
import java.nio.file.FileSystems;
import java.nio.file.Files;
import java.nio.file.NoSuchFileException;
import java.nio.file.Path;
@@ -30,20 +38,6 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Stream;
import javax.inject.Inject;
import javax.inject.Provider;
import javax.inject.Singleton;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.SystemUtils;
import org.cryptomator.common.Environment;
import org.cryptomator.common.LazyInitializer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
@Singleton
public class SettingsProvider implements Provider<Settings> {

1
main/commons/src/main/java/org/cryptomator/common/settings/VaultSettingsJsonAdapter.java
View File

@@ -76,6 +76,7 @@ class VaultSettingsJsonAdapter {
default:
LOG.warn("Unsupported vault setting found in JSON: " + name);
in.skipValue();
break;
}
}
in.endObject();

12
main/ui/src/main/java/org/cryptomator/ui/controllers/MainController.java
View File

@@ -275,7 +275,7 @@ public class MainController implements ViewController {
// ****************************************
@FXML
private void didClickAddVault(ActionEvent event) {
private void didClickAddVault() {
if (addVaultContextMenu.isShowing()) {
addVaultContextMenu.hide();
} else {
@@ -284,7 +284,7 @@ public class MainController implements ViewController {
}
@FXML
private void didClickCreateNewVault(ActionEvent event) {
private void didClickCreateNewVault() {
final FileChooser fileChooser = new FileChooser();
final File file = fileChooser.showSaveDialog(mainWindow);
if (file == null) {
@@ -317,7 +317,7 @@ public class MainController implements ViewController {
}
@FXML
private void didClickAddExistingVaults(ActionEvent event) {
private void didClickAddExistingVaults() {
final FileChooser fileChooser = new FileChooser();
fileChooser.getExtensionFilters().add(new FileChooser.ExtensionFilter("Cryptomator Masterkey", "*.cryptomator"));
final List<File> files = fileChooser.showOpenMultipleDialog(mainWindow);
@@ -360,7 +360,7 @@ public class MainController implements ViewController {
}
@FXML
private void didClickRemoveSelectedEntry(ActionEvent e) {
private void didClickRemoveSelectedEntry() {
Alert confirmDialog = DialogBuilderUtil.buildConfirmationDialog( //
localization.getString("main.directoryList.remove.confirmation.title"), //
localization.getString("main.directoryList.remove.confirmation.header"), //
@@ -379,12 +379,12 @@ public class MainController implements ViewController {
}
@FXML
private void didClickChangePassword(ActionEvent e) {
private void didClickChangePassword() {
showChangePasswordView();
}
@FXML
private void didClickShowSettings(ActionEvent e) {
private void didClickShowSettings() {
toggleShowSettings();
}

9
main/ui/src/main/java/org/cryptomator/ui/controllers/SettingsController.java
View File

@@ -130,7 +130,7 @@ public class SettingsController implements ViewController {
}
@FXML
private void changePort(ActionEvent evt) {
private void changePort() {
assert isPortValid() : "Button must be disabled, if port is invalid.";
try {
int port = Integer.parseInt(portField.getText());
@@ -143,11 +143,8 @@ public class SettingsController implements ViewController {
private boolean isPortValid() {
try {
int port = Integer.parseInt(portField.getText());
if (port == 0 || port >= Settings.MIN_PORT && port <= Settings.MAX_PORT) {
return true;
} else {
return false;
}
return port == 0 // choose port automatically
|| port >= Settings.MIN_PORT && port <= Settings.MAX_PORT; // port within range
} catch (NumberFormatException e) {
return false;
}