Moved functions

Author: Flameish

src/gui/GUI.java

@@ -808,15 +808,15 @@ else if (manSaveLocation.getText().isEmpty()) {
             );
         });
         sendNewChapterNotificationsCheckBox.addActionListener(actionEvent -> {
-            EmailConfig.setNotifications(sendNewChapterNotificationsCheckBox.isSelected());
+            Library.setNotifications(sendNewChapterNotificationsCheckBox.isSelected());
             sendEPUBAsAttachmentCheckBox.setSelected(false);
-            EmailConfig.setUseAttachment(sendEPUBAsAttachmentCheckBox.isSelected());
+            Library.setUseAttachment(sendEPUBAsAttachmentCheckBox.isSelected());
 
         });
         sendEPUBAsAttachmentCheckBox.addActionListener(actionEvent -> {
-            EmailConfig.setUseAttachment(sendEPUBAsAttachmentCheckBox.isSelected());
+            Library.setUseAttachment(sendEPUBAsAttachmentCheckBox.isSelected());
             sendNewChapterNotificationsCheckBox.setSelected(false);
-            EmailConfig.setNotifications(sendNewChapterNotificationsCheckBox.isSelected());
+            Library.setNotifications(sendNewChapterNotificationsCheckBox.isSelected());
             updateLastChapterNumberCheckBox.setSelected(false);
             Library.setUpdateLast(updateLastChapterNumberCheckBox.isSelected());
 
@@ -1408,9 +1408,9 @@ void change() {
         emailSLLComboBox = new JComboBox(sslList);
         emailSLLComboBox.setSelectedIndex(EmailConfig.getSSL());
         sendNewChapterNotificationsCheckBox = new JCheckBox();
-        sendNewChapterNotificationsCheckBox.setSelected(EmailConfig.useNotifications());
+        sendNewChapterNotificationsCheckBox.setSelected(Library.useNotifications());
         sendEPUBAsAttachmentCheckBox = new JCheckBox();
-        sendEPUBAsAttachmentCheckBox.setSelected(EmailConfig.useAttachment());
+        sendEPUBAsAttachmentCheckBox.setSelected(Library.useAttachment());
 
         // Library
         enableCheckingCheckBox = new JCheckBox();

src/library/LibrarySystem.java

@@ -45,14 +45,14 @@ private static void pollLibrary() {
                         String[] cliParams = cliString.split(" ");
                         autoNovel = init.processParams(init.getParamsFromString(cliParams));
                         Library.setLastChapter(novelUrl, Library.getNewestChapter(novelUrl));
-                        if(EmailConfig.useAttachment() && !EmailConfig.getHost().isEmpty()) {
+                        if(Library.useAttachment() && !EmailConfig.getHost().isEmpty()) {
                             mailer.sendAttachment(autoNovel);
                             System.out.println("[INFO]Email with attachment send.");
                         }
                     }
                 }
                 // Notification
-                if(EmailConfig.useNotifications() && chapterDifference > 0 && !EmailConfig.getHost().isEmpty()) {
+                if(Library.useNotifications() && chapterDifference > 0 && !EmailConfig.getHost().isEmpty()) {
                     mailer.sendNotification(autoNovel);
                     System.out.println("[INFO]Notification send.");
                     // Adjust last downloaded chapter to newest

src/system/persistent/EmailConfig.java

@@ -37,40 +37,12 @@ public static int getSSL() {
         return Integer.parseInt(String.valueOf(email.get("ssl")));
     }
 
-    public static boolean useNotifications() {
-        JSONObject email = (JSONObject) Config.data.get("email");
-        if(email == null || !email.containsKey("useNotifications")) return false;
-        return (boolean) email.get("useNotifications");
-    }
-
-    public static boolean useAttachment() {
-        JSONObject email = (JSONObject) Config.data.get("email");
-        if(email == null || !email.containsKey("useAttachment")) return false;
-        return (boolean) email.get("useAttachment");
-    }
-
     public static String getReceiverEmail() {
         JSONObject email = (JSONObject) Config.data.get("email");
         if(email == null || !email.containsKey("receiverEmail")) return "";
         return (String) email.get("receiverEmail");
     }
 
-    public static void setNotifications(boolean useNotifications) {
-        JSONObject email = (JSONObject) Config.data.get("email");
-        if(email == null) email = new JSONObject();
-        email.put("useNotifications", useNotifications);
-        Config.data.put("email", email);
-        Config.saveConfig();
-    }
-
-    public static void setUseAttachment(boolean useAttachment) {
-        JSONObject email = (JSONObject) Config.data.get("email");
-        if(email == null) email = new JSONObject();
-        email.put("useAttachment", useAttachment);
-        Config.data.put("email", email);
-        Config.saveConfig();
-    }
-
     public static void saveEmailSettings(String host, String username, String password, String receiverEmail, int port, int SSL) {
         JSONObject email = (JSONObject) Config.data.get("email");
         if(email == null) email = new JSONObject();

src/system/persistent/Library.java

@@ -157,6 +157,34 @@ public static void setAutoDownload(String novelUrl, boolean useAuto) {
         Config.saveConfig();
     }
 
+    public static void setNotifications(boolean useNotifications) {
+        JSONObject email = (JSONObject) Config.data.get("librarySettings");
+        if(email == null) email = new JSONObject();
+        email.put("useNotifications", useNotifications);
+        Config.data.put("librarySettings", email);
+        Config.saveConfig();
+    }
+
+    public static boolean useAttachment() {
+        JSONObject email = (JSONObject) Config.data.get("librarySettings");
+        if(email == null || !email.containsKey("useAttachment")) return false;
+        return (boolean) email.get("useAttachment");
+    }
+
+    public static void setUseAttachment(boolean useAttachment) {
+        JSONObject email = (JSONObject) Config.data.get("librarySettings");
+        if(email == null) email = new JSONObject();
+        email.put("useAttachment", useAttachment);
+        Config.data.put("librarySettings", email);
+        Config.saveConfig();
+    }
+
+    public static boolean useNotifications() {
+        JSONObject email = (JSONObject) Config.data.get("librarySettings");
+        if(email == null || !email.containsKey("useNotifications")) return false;
+        return (boolean) email.get("useNotifications");
+    }
+
     public static void setPolling(boolean pollingEnabled) {
         JSONObject librarySettings = (JSONObject) Config.data.get("librarySettings");
         if(librarySettings == null) librarySettings = new JSONObject();