Fixed bug #36 reported by @Kubis10

Author: xEdziu

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>me.goral</groupId>
     <artifactId>KeepMyPassword-Desktop</artifactId>
-    <version>2.3.2</version>
+    <version>2.3.3</version>
     <name>KeepMyPassword Desktop</name>
     <packaging>jar</packaging>
 

src/main/java/me/goral/keepmypassworddesktop/controllers/MainAppController.java

@@ -126,6 +126,7 @@ protected void onLoginButtonClick() {
                 //login
                 try {
                     String config = ConfUtil.readConfigFile();
+                    if (config == null) return;
                     String[] configArr = config.split(":");
                     String unameFromString = configArr[0];
                     String encryptedInitial = configArr[1];
@@ -266,6 +267,7 @@ protected void onLoginButtonClick(String unameString, String passwordString) {
                 //login
                 try {
                     String config = ConfUtil.readConfigFile();
+                    if (config == null) return;
                     String[] configArr = config.split(":");
                     String unameFromString = configArr[0];
                     String encryptedInitial = configArr[1];

src/main/java/me/goral/keepmypassworddesktop/util/ConfUtil.java

@@ -7,8 +7,6 @@
 import java.nio.file.Paths;
 import java.util.Locale;
 
-import static me.goral.keepmypassworddesktop.util.AlertsUtil.showErrorDialog;
-import static me.goral.keepmypassworddesktop.util.AlertsUtil.showInformationDialog;
 
 public class ConfUtil {
 
@@ -108,8 +106,14 @@ public static void writeConfFile(String s) {
      */
     public static String readConfigFile() {
         try {
-            return Files.readString(Paths.get(workingDirectory + confFileName));
-        } catch (IOException e){
+            String confString = Files.readString(Paths.get(workingDirectory + confFileName));
+            if (confString.isEmpty() ){
+                deleteConfFiles();
+                AlertsUtil.showErrorDialog("Error", "Configuration file is empty.", "Deleting account. Please restart program.");
+            } else {
+                return confString;
+            }
+        } catch (Exception e){
             AlertsUtil.showExceptionStackTraceDialog(e);
         }
         return null;
@@ -121,13 +125,14 @@ public static String readConfigFile() {
     public static void deleteConfFiles() {
         try {
             File f = new File(workingDirectory + confFileName);
-            if (f.delete()){
-                File db = new File(workingDirectory + databaseFileName);
-                if (!db.delete()){
-                    throw new Exception("Database could not be deleted");
-                }
-            } else showErrorDialog("Something went wrong", "Whoops!", "Sorry, but something went wrong. " +
-                    "Please, raise an issue on github and describe what happened.");
+            File db = new File(workingDirectory + databaseFileName);
+            if (f.exists()){
+                if (!f.delete()) throw new Exception("Configuration file could not be deleted");
+            }
+            if (db.exists()){
+                if (!db.delete()) throw new Exception("Database could not be deleted");
+            }
+
         } catch (Exception e){
             AlertsUtil.showExceptionStackTraceDialog(e);
         }

src/main/resources/me/goral/keepmypassworddesktop/layouts/logged.fxml

@@ -22,6 +22,6 @@
       <Button fx:id="genPwd" layoutX="509.0" layoutY="175.0" mnemonicParsing="false" onAction="#onGenPwdClick" prefHeight="25.0" prefWidth="195.0" text="Generate Password" wrapText="true" />
       <Button fx:id="showBtn" layoutX="442.0" layoutY="109.0" maxWidth="16" mnemonicParsing="false" onAction="#onShowBtnClick" prefHeight="16" prefWidth="16" />
       <Button fx:id="settingsButton" layoutX="625.0" layoutY="5.0" maxHeight="128" maxWidth="128" mnemonicParsing="false" onAction="#onSettingsButtonClick" prefHeight="64" prefWidth="64" />
-      <Label layoutY="75.0" prefHeight="17.0" prefWidth="750.0" text="v2.3.2" textAlignment="CENTER" />
+      <Label layoutY="75.0" prefHeight="17.0" prefWidth="750.0" text="v2.3.3" textAlignment="CENTER" />
    </children>
 </AnchorPane>