From dcd800dc9ec2c6e0824b02e90c79f091b5549d1a Mon Sep 17 00:00:00 2001
From: Felix Ableitner <me@nutomic.com>
Date: Mon, 31 Oct 2016 03:36:51 +0900
Subject: [PATCH] Fixed changing Syncthing settings

---
 .../fragments/SettingsFragment.java           | 50 +++++++++++--------
 1 file changed, 29 insertions(+), 21 deletions(-)

diff --git a/src/main/java/com/nutomic/syncthingandroid/fragments/SettingsFragment.java b/src/main/java/com/nutomic/syncthingandroid/fragments/SettingsFragment.java
index 84b8388d..dfdd5fa4 100644
--- a/src/main/java/com/nutomic/syncthingandroid/fragments/SettingsFragment.java
+++ b/src/main/java/com/nutomic/syncthingandroid/fragments/SettingsFragment.java
@@ -26,6 +26,7 @@ import com.nutomic.syncthingandroid.views.WifiSsidPreference;
 import com.nutomic.syncthingandroid.syncthing.RestApi;
 import com.nutomic.syncthingandroid.syncthing.SyncthingService;
 
+import java.security.InvalidParameterException;
 import java.util.List;
 
 import eu.chainfire.libsuperuser.Shell;
@@ -196,28 +197,35 @@ public class SettingsFragment extends PreferenceFragment
     }
 
     public boolean onSyncthingPreferenceChange(Preference preference, Object o) {
-        Device localDevice = mApi.getLocalDevice();
-        localDevice.name = mDeviceName.getText();
-        mApi.editDevice(localDevice);
-
         Splitter splitter = Splitter.on(",").trimResults().omitEmptyStrings();
-
-        mOptions.listenAddresses       = Iterables.toArray(
-                                            splitter.split(mListenAddresses.getText()), String.class);
-        mOptions.maxRecvKbps           = Integer.valueOf(mMaxRecvKbps.getText());
-        mOptions.maxRecvKbps           = Integer.valueOf(mMaxSendKbps.getText());
-        mOptions.natEnabled            = mNatEnabled.isChecked();
-        mOptions.localAnnounceEnabled  = mLocalAnnounceEnabled.isChecked();
-        mOptions.globalAnnounceEnabled = mGlobalAnnounceEnabled.isChecked();
-        mOptions.relaysEnabled         = mRelaysEnabled.isChecked();
-        mOptions.globalAnnounceServers = Iterables.toArray(
-                                            splitter.split(mGlobalAnnounceServers.getText()), String.class);
-        mGui.address                   = mAddress.getText();
-        mGui.user                      = mUser.getText();
-        mGui.password                  = mPassword.getText();
-        mOptions.urAccepted            = (mUrAccepted.isChecked())
-                                            ? Options.USAGE_REPORTING_ACCEPTED
-                                            : Options.USAGE_REPORTING_DENIED;
+        switch (preference.getKey()) {
+            case "deviceName":
+                Device localDevice = mApi.getLocalDevice();
+                localDevice.name = (String) o;
+                mApi.editDevice(localDevice);
+                break;
+            case "listenAddresses":
+                mOptions.listenAddresses = Iterables.toArray(splitter.split((String) o), String.class);
+                break;
+            case "maxRecvKbps":           mOptions.maxRecvKbps = (int) o;               break;
+            case "maxSendKbps":           mOptions.maxRecvKbps = (int) o;               break;
+            case "natEnabled":            mOptions.natEnabled = (boolean) o;            break;
+            case "localAnnounceEnabled":  mOptions.localAnnounceEnabled = (boolean) o;  break;
+            case "globalAnnounceEnabled": mOptions.globalAnnounceEnabled = (boolean) o; break;
+            case "relaysEnabled":         mOptions.relaysEnabled = (boolean) o;         break;
+            case "globalAnnounceServers":
+                mOptions.globalAnnounceServers = Iterables.toArray(splitter.split((String) o), String.class);
+                break;
+            case "address":               mGui.address = (String) o;                    break;
+            case "user":                  mGui.user = (String) o;                       break;
+            case "password":              mGui.password = (String) o;                   break;
+            case "urAccepted":
+                mOptions.urAccepted = ((boolean) o)
+                        ? Options.USAGE_REPORTING_ACCEPTED
+                        : Options.USAGE_REPORTING_DENIED;
+                break;
+            default: throw new InvalidParameterException();
+        }
 
         mApi.editSettings(mGui, mOptions, getActivity());
         return true;