From dca4c3272357a8c6996c244961e564aae672b1ce Mon Sep 17 00:00:00 2001
From: Felix Ableitner <me@nutomic.com>
Date: Wed, 27 Sep 2017 08:53:21 +0900
Subject: [PATCH] Simplify DeviceStateHolder code

---
 .../service/DeviceStateHolder.java            | 29 +++++--------------
 1 file changed, 7 insertions(+), 22 deletions(-)

diff --git a/src/main/java/com/nutomic/syncthingandroid/service/DeviceStateHolder.java b/src/main/java/com/nutomic/syncthingandroid/service/DeviceStateHolder.java
index d2608fc5..4c4322f8 100644
--- a/src/main/java/com/nutomic/syncthingandroid/service/DeviceStateHolder.java
+++ b/src/main/java/com/nutomic/syncthingandroid/service/DeviceStateHolder.java
@@ -2,7 +2,6 @@ package com.nutomic.syncthingandroid.service;
 
 import android.content.Context;
 import android.content.Intent;
-import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
@@ -70,11 +69,7 @@ public class DeviceStateHolder {
         Log.i(TAG, "State updated, allowed network connection: " + mIsAllowedNetworkConnection +
                 ", charging: " + mIsCharging);
 
-        if (mIsAllowedNetworkConnection) {
-            updateWifiSsid();
-        } else {
-            mWifiSsid = null;
-        }
+        updateWifiSsid();
     }
 
     private void updateWifiSsid() {
@@ -88,10 +83,6 @@ public class DeviceStateHolder {
         }
     }
 
-    private String getWifiSsid() {
-        return mWifiSsid;
-    }
-
     /**
      * Determines if Syncthing should currently run.
      */
@@ -108,14 +99,14 @@ public class DeviceStateHolder {
             boolean prefStopNotCharging = mPreferences.getBoolean(SyncthingService.PREF_SYNC_ONLY_CHARGING, false);
 
             return (isCharging() || !prefStopNotCharging) &&
-                    (!prefStopMobileData || isAllowedWifiConnected());
+                    (!prefStopMobileData || isWhitelistedNetworkConnection());
         }
         else {
             return true;
         }
     }
 
-    private boolean isAllowedWifiConnected() {
+    private boolean isWhitelistedNetworkConnection() {
         boolean wifiConnected = isAllowedNetworkConnection();
         if (wifiConnected) {
             Set<String> ssids = mPreferences.getStringSet(SyncthingService.PREF_SYNC_ONLY_WIFI_SSIDS, new HashSet<>());
@@ -123,17 +114,11 @@ public class DeviceStateHolder {
                 Log.d(TAG, "All SSIDs allowed for syncing");
                 return true;
             } else {
-                String ssid = getWifiSsid();
-                if (ssid != null) {
-                    if (ssids.contains(ssid)) {
-                        Log.d(TAG, "SSID [" + ssid + "] found in whitelist: " + ssids);
-                        return true;
-                    }
-                    Log.i(TAG, "SSID [" + ssid + "] not whitelisted: " + ssids);
-                    return false;
+                if (mWifiSsid != null && ssids.contains(mWifiSsid)) {
+                    Log.d(TAG, "SSID [" + mWifiSsid + "] found in whitelist: " + ssids);
+                    return true;
                 } else {
-                    // Don't know the SSID (yet) (should not happen?!), so not allowing
-                    Log.w(TAG, "SSID unknown (yet), cannot check SSID whitelist. Disallowing sync.");
+                    Log.w(TAG, "SSID [" + mWifiSsid + "] unknown or not whitelisted, disallowing sync.");
                     return false;
                 }
             }