From 2aa39311c2bb3e0e4b5c4d9b58eef1db14758b7d Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 6 May 2014 20:05:28 -0400 Subject: [PATCH] no need for ipAddress int to be global, so make local This will prevent ipAddressString and ipAddress from getting out of sync. --- src/org/fdroid/fdroid/FDroidApp.java | 1 - .../fdroid/net/WifiStateChangeService.java | 16 ++++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/org/fdroid/fdroid/FDroidApp.java b/src/org/fdroid/fdroid/FDroidApp.java index 24a572b8b..899162b20 100644 --- a/src/org/fdroid/fdroid/FDroidApp.java +++ b/src/org/fdroid/fdroid/FDroidApp.java @@ -77,7 +77,6 @@ import javax.net.ssl.X509TrustManager; public class FDroidApp extends Application { // for the local repo on this device, all static since there is only one - public static int ipAddress = 0; public static int port = 8888; public static String ipAddressString = null; public static String ssid = ""; diff --git a/src/org/fdroid/fdroid/net/WifiStateChangeService.java b/src/org/fdroid/fdroid/net/WifiStateChangeService.java index 577314167..38d05740c 100644 --- a/src/org/fdroid/fdroid/net/WifiStateChangeService.java +++ b/src/org/fdroid/fdroid/net/WifiStateChangeService.java @@ -39,19 +39,19 @@ public class WifiStateChangeService extends Service { Log.i(TAG, "waiting for the wifi to be enabled..."); Thread.sleep(3000); } - FDroidApp.ipAddress = wifiManager.getConnectionInfo().getIpAddress(); - while (FDroidApp.ipAddress == 0) { + int ipAddress = wifiManager.getConnectionInfo().getIpAddress(); + while (ipAddress == 0) { Log.i(TAG, "waiting for an IP address..."); Thread.sleep(3000); - FDroidApp.ipAddress = wifiManager.getConnectionInfo().getIpAddress(); + ipAddress = wifiManager.getConnectionInfo().getIpAddress(); } WifiInfo wifiInfo = wifiManager.getConnectionInfo(); - FDroidApp.ipAddress = wifiInfo.getIpAddress(); + ipAddress = wifiInfo.getIpAddress(); FDroidApp.ipAddressString = String.format(Locale.ENGLISH, "%d.%d.%d.%d", - (FDroidApp.ipAddress & 0xff), - (FDroidApp.ipAddress >> 8 & 0xff), - (FDroidApp.ipAddress >> 16 & 0xff), - (FDroidApp.ipAddress >> 24 & 0xff)); + (ipAddress & 0xff), + (ipAddress >> 8 & 0xff), + (ipAddress >> 16 & 0xff), + (ipAddress >> 24 & 0xff)); FDroidApp.ssid = wifiInfo.getSSID().replaceAll("^\"(.*)\"$", "$1"); FDroidApp.bssid = wifiInfo.getBSSID();