Sync Notifications checkbox saves to config.

SCCapstone · Feb 27, 2023 · 555880e · 555880e
1 parent d1849b1
commit 555880e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/Client/Android/app/src/main/java/com/neptune/app/Backend/ServerConfig.java b/Client/Android/app/src/main/java/com/neptune/app/Backend/ServerConfig.java
@@ -53,7 +53,7 @@ public class ServerConfig extends ConfigItem {
 
     // Settings
     public boolean syncNotifications = true;
-    public boolean syncClipboard = true;
+    public boolean syncClipboard = false;
     // Allow server to push data to us (receive)
     public boolean fileSharingAllowPushing = false;
     // Allow server to pull data from us (request)
@@ -121,6 +121,10 @@ public void fromJson(JsonObject jsonObject) {
             //this.notificationBlacklistApps = new String[0];
             this.notificationBlacklistApps = new ArrayList<String>();
         }
+
+        if(jsonObject.has("syncNotifications")) {
+            this.syncNotifications = jsonObject.get("syncNotifications").getAsBoolean();
+        }
     }
 
     /**
@@ -155,6 +159,8 @@ public JsonObject toJson() {
             jsonObject.add("notificationBlacklistApps", notificationBlacklistApps);
         }
 
+        jsonObject.addProperty("syncNotifications", this.syncNotifications);
+
         return jsonObject;
     }
 

diff --git a/Client/Android/app/src/main/java/com/neptune/app/DeviceActivity.java b/Client/Android/app/src/main/java/com/neptune/app/DeviceActivity.java
@@ -68,9 +68,11 @@ protected void onCreate(Bundle savedInstanceState) {
             @Override
             public void onClick(View view) {
                 if(server.syncNotifications) {
+                    notificationsCheckbox.setChecked(false);
                     server.syncNotifications = false;
                 }
                 else {
+                    notificationsCheckbox.setChecked(true);
                     server.syncNotifications = true;
                 }