diff --git a/pom.xml b/pom.xml
index 78e6307b..737c99be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
com.dropsnorz
owlplug
- 0.4.2-beta
+ 0.5.0-beta
jar
owlplug
@@ -62,7 +62,7 @@
com.jfoenix
jfoenix
- 9.0.4
+ 9.0.8
diff --git a/src/main/java/com/dropsnorz/owlplug/auth/services/AuthenticationService.java b/src/main/java/com/dropsnorz/owlplug/auth/services/AuthenticationService.java
index 7c004903..499c5ca4 100644
--- a/src/main/java/com/dropsnorz/owlplug/auth/services/AuthenticationService.java
+++ b/src/main/java/com/dropsnorz/owlplug/auth/services/AuthenticationService.java
@@ -105,9 +105,11 @@ public void createAccountAndAuth() throws AuthentificationException {
prefs.putLong(ApplicationDefaults.SELECTED_ACCOUNT_KEY, userAccount.getId());
} catch (GeneralSecurityException | IOException e) {
-
log.error("Error during authentification", e);
throw new AuthentificationException(e);
+ } finally {
+ //Delete accounts without complete setup
+ userAccountDAO.deleteInvalidAccounts();
}
}
diff --git a/src/main/java/com/dropsnorz/owlplug/store/controllers/StoreController.java b/src/main/java/com/dropsnorz/owlplug/store/controllers/StoreController.java
index 0902a60d..ec924a99 100644
--- a/src/main/java/com/dropsnorz/owlplug/store/controllers/StoreController.java
+++ b/src/main/java/com/dropsnorz/owlplug/store/controllers/StoreController.java
@@ -161,9 +161,6 @@ public synchronized void refreshView(Iterable newProducts) {
if (shouldRefreshProducts(newProducts)) {
this.masonryPane.getChildren().clear();
this.masonryPane.requestLayout();
-
- //Tempoprary fix for issue #2 Memory leaks in StoreView MasonryPane
- clearMasonryPaneAnimationMap(masonryPane);
loadedStoreProducts = newProducts;
loadedProductPartitions = Iterables.partition(loadedStoreProducts, PARTITION_SIZE);
@@ -258,24 +255,5 @@ public void requestLayout() {
masonryPane.requestLayout();
scrollPane.requestLayout();
}
-
- /**
- * Clear the masonryPane animation map.
- * Temporary fix for issue #2 Memory leaks in StoreView MasonryPane.
- */
- private void clearMasonryPaneAnimationMap(JFXMasonryPane masonryPane) {
-
- try {
- Field f = masonryPane.getClass().getDeclaredField("animationMap");
- f.setAccessible(true);
- HashMap animationMap = (HashMap) f.get(masonryPane);
- if (animationMap != null) {
- animationMap.clear();
- }
- } catch (Exception e) {
- log.error("An error occured while clearing the masonryPane animation map", e);
- }
-
- }
}
diff --git a/src/main/resources/fxml/dialogs/WelcomeView.fxml b/src/main/resources/fxml/dialogs/WelcomeView.fxml
index 3032664d..16fc9bd3 100644
--- a/src/main/resources/fxml/dialogs/WelcomeView.fxml
+++ b/src/main/resources/fxml/dialogs/WelcomeView.fxml
@@ -10,12 +10,12 @@
-
+
-
+
diff --git a/src/main/resources/owlplug.css b/src/main/resources/owlplug.css
index 9c2b2646..5e5800c6 100644
--- a/src/main/resources/owlplug.css
+++ b/src/main/resources/owlplug.css
@@ -125,6 +125,10 @@ JFXComboBox{
-fx-text-fill: white ;
}
+#accountComboBox {
+ -fx-prompt-text-fill: transparent;
+}
+
JFXCheckBox {
-fx-text-fill: white;
}