From b6840a99ce5247f5ecf9eb64fbe1db959a974fd0 Mon Sep 17 00:00:00 2001 From: kske Date: Thu, 9 Jul 2020 09:13:26 +0200 Subject: [PATCH] Adjust to new LoginCredentials API --- pom.xml | 2 +- .../java/envoy/client/data/ClientConfig.java | 11 ++++--- .../client/ui/controller/LoginScene.java | 31 +++++++++---------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/pom.xml b/pom.xml index 92cf7df..2b7c323 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ com.github.informatik-ag-ngl envoy-common - develop-SNAPSHOT + f~password_in_login_credentials-SNAPSHOT org.openjfx diff --git a/src/main/java/envoy/client/data/ClientConfig.java b/src/main/java/envoy/client/data/ClientConfig.java index a30dffb..49e7892 100644 --- a/src/main/java/envoy/client/data/ClientConfig.java +++ b/src/main/java/envoy/client/data/ClientConfig.java @@ -1,7 +1,8 @@ package envoy.client.data; +import static java.util.function.Function.identity; + import java.io.File; -import java.util.function.Function; import java.util.logging.Level; import envoy.client.ui.Startup; @@ -34,15 +35,15 @@ public class ClientConfig extends Config { } private ClientConfig() { - items.put("server", new ConfigItem<>("server", "s", Function.identity(), null, true)); + items.put("server", new ConfigItem<>("server", "s", identity(), null, true)); items.put("port", new ConfigItem<>("port", "p", Integer::parseInt, null, true)); items.put("localDB", new ConfigItem<>("localDB", "db", File::new, new File("localDB"), true)); items.put("ignoreLocalDB", new ConfigItem<>("ignoreLocalDB", "nodb", Boolean::parseBoolean, false, false)); items.put("homeDirectory", new ConfigItem<>("homeDirectory", "h", File::new, new File(System.getProperty("user.home"), ".envoy"), true)); items.put("fileLevelBarrier", new ConfigItem<>("fileLevelBarrier", "fb", Level::parse, Level.CONFIG, true)); items.put("consoleLevelBarrier", new ConfigItem<>("consoleLevelBarrier", "cb", Level::parse, Level.FINEST, true)); - items.put("user", new ConfigItem<>("user", "u", Function.identity())); - items.put("password", new ConfigItem<>("password", "pw", String::toCharArray)); + items.put("user", new ConfigItem<>("user", "u", identity())); + items.put("password", new ConfigItem<>("password", "pw", identity())); } /** @@ -97,7 +98,7 @@ public class ClientConfig extends Config { * @return the password * @since Envoy Client v0.3-alpha */ - public char[] getPassword() { return (char[]) items.get("password").get(); } + public String getPassword() { return (String) items.get("password").get(); } /** * @return {@code true} if user name and password are set diff --git a/src/main/java/envoy/client/ui/controller/LoginScene.java b/src/main/java/envoy/client/ui/controller/LoginScene.java index 897cd08..cb60d02 100644 --- a/src/main/java/envoy/client/ui/controller/LoginScene.java +++ b/src/main/java/envoy/client/ui/controller/LoginScene.java @@ -52,13 +52,13 @@ public final class LoginScene { @FXML private Label connectionLabel; - private Client client; - private LocalDB localDB; - private Cache receivedMessageCache; - private Cache receivedGroupMessageCache; - private Cache receivedMessageStatusChangeCache; + private Client client; + private LocalDB localDB; + private Cache receivedMessageCache; + private Cache receivedGroupMessageCache; + private Cache receivedMessageStatusChangeCache; private Cache receivedGroupMessageStatusChangeCache; - private SceneContext sceneContext; + private SceneContext sceneContext; private static final Logger logger = EnvoyLog.getLogger(LoginScene.class); private static final EventBus eventBus = EventBus.getInstance(); @@ -103,13 +103,13 @@ public final class LoginScene { public void initializeData(Client client, LocalDB localDB, Cache receivedMessageCache, Cache receivedGroupMessageCache, Cache receivedMessageStatusChangeCache, Cache receivedGroupMessageStatusChangeCache, SceneContext sceneContext) { - this.client = client; - this.localDB = localDB; - this.receivedMessageCache = receivedMessageCache; - this.receivedGroupMessageCache = receivedGroupMessageCache; - this.receivedMessageStatusChangeCache = receivedMessageStatusChangeCache; + this.client = client; + this.localDB = localDB; + this.receivedMessageCache = receivedMessageCache; + this.receivedGroupMessageCache = receivedGroupMessageCache; + this.receivedMessageStatusChangeCache = receivedMessageStatusChangeCache; this.receivedGroupMessageStatusChangeCache = receivedGroupMessageStatusChangeCache; - this.sceneContext = sceneContext; + this.sceneContext = sceneContext; // Prepare handshake localDB.loadIDGenerator(); @@ -131,14 +131,13 @@ public final class LoginScene { } else if (!Bounds.isValidContactName(userTextField.getTextField().getText())) { new Alert(AlertType.ERROR, "The entered user name is not valid (" + Bounds.CONTACT_NAME_PATTERN + ")").showAndWait(); userTextField.getTextField().clear(); - } else performHandshake(new LoginCredentials(userTextField.getTextField().getText(), passwordField.getText().toCharArray(), - registerCheckBox.isSelected(), Startup.VERSION)); + } else performHandshake(new LoginCredentials(userTextField.getTextField().getText(), passwordField.getText(), registerCheckBox.isSelected(), + Startup.VERSION)); } @FXML private void offlineModeButtonPressed() { - attemptOfflineMode( - new LoginCredentials(userTextField.getTextField().getText(), passwordField.getText().toCharArray(), false, Startup.VERSION)); + attemptOfflineMode(new LoginCredentials(userTextField.getTextField().getText(), passwordField.getText(), false, Startup.VERSION)); } @FXML