From d965fc7980081402aae7d8a09c8e98b5f2ea97ed Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Mon, 24 Apr 2017 20:24:51 +0200
Subject: [PATCH] Fixed #83, Fixed #84
#83 - replace server secret textfield input with dots after saving
#84 - connection alert is not showing again if closed with "OK"-button
---
src/de/deadlocker8/budgetmaster/ui/Controller.java | 6 ++----
src/de/deadlocker8/budgetmaster/ui/SettingsController.java | 5 ++++-
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/de/deadlocker8/budgetmaster/ui/Controller.java b/src/de/deadlocker8/budgetmaster/ui/Controller.java
index 07109ba91..4b8239dec 100644
--- a/src/de/deadlocker8/budgetmaster/ui/Controller.java
+++ b/src/de/deadlocker8/budgetmaster/ui/Controller.java
@@ -229,7 +229,7 @@ public class Controller
}
public void showConnectionErrorAlert(String errorMessage)
- {
+ {
if(!alertIsShowing)
{
Platform.runLater(() -> {
@@ -250,10 +250,8 @@ public class Controller
Stage dialogStage = (Stage)alert.getDialogPane().getScene().getWindow();
dialogStage.getIcons().add(icon);
dialogStage.initOwner(stage);
- dialogStage.setOnCloseRequest((event) -> {
- alertIsShowing = false;
- });
alert.showAndWait();
+ alertIsShowing = false;
});
}
}
diff --git a/src/de/deadlocker8/budgetmaster/ui/SettingsController.java b/src/de/deadlocker8/budgetmaster/ui/SettingsController.java
index a90283827..c477c8574 100644
--- a/src/de/deadlocker8/budgetmaster/ui/SettingsController.java
+++ b/src/de/deadlocker8/budgetmaster/ui/SettingsController.java
@@ -54,7 +54,7 @@ public class SettingsController
if(controller.getSettings() != null)
{
textFieldURL.setText(controller.getSettings().getUrl());
- textFieldSecret.setText(controller.getSettings().getSecret());
+ textFieldSecret.setText("******");
textFieldCurrency.setText(controller.getSettings().getCurrency());
if(controller.getSettings().isRestActivated())
{
@@ -153,6 +153,9 @@ public class SettingsController
Logger.error(e);
AlertGenerator.showAlert(AlertType.ERROR, "Fehler", "", "Beim Speichern der Einstellungen ist ein Fehler aufgetreten", controller.getIcon(), controller.getStage(), null, false);
}
+
+ textFieldSecret.setText("******");
+
controller.refresh(controller.getFilterSettings());
controller.showNotification("Erfolgreich gespeichert");
}
--
GitLab