Initialize NetworkUtils, set context once

Had some issues with the new NetworkAllowanceInterceptor. When I gave
it a constructor that would hold the context (to use it with
NetworkUtils), the whole Glide image loading process would not work.

6 files changed, 20 insertions, 23 deletions

diff --git a/core/src/main/java/de/danoeh/antennapod/core/asynctask/FlattrClickWorker.java b/core/src/main/java/de/danoeh/antennapod/core/asynctask/FlattrClickWorker.java
index 5d2d5d441..f91d4557e 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/asynctask/FlattrClickWorker.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/asynctask/FlattrClickWorker.java
@@ -90,7 +90,7 @@ public class FlattrClickWorker extends AsyncTask<Void, Integer, FlattrClickWorke
             return ExitCode.NO_TOKEN;
         }
 
-        if (!NetworkUtils.networkAvailable(context)) {
+        if (!NetworkUtils.networkAvailable()) {
             return ExitCode.NO_NETWORK;
         }
 
diff --git a/core/src/main/java/de/danoeh/antennapod/core/receiver/FeedUpdateReceiver.java b/core/src/main/java/de/danoeh/antennapod/core/receiver/FeedUpdateReceiver.java
index 0045f1eb0..b959c7301 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/receiver/FeedUpdateReceiver.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/receiver/FeedUpdateReceiver.java
@@ -19,7 +19,7 @@ public class FeedUpdateReceiver extends BroadcastReceiver {
     @Override
     public void onReceive(Context context, Intent intent) {
         Log.d(TAG, "Received intent");
-        if (NetworkUtils.isDownloadAllowed(context)) {
+        if (NetworkUtils.isDownloadAllowed()) {
             DBTasks.refreshAllFeeds(context, null);
         } else {
             Log.d(TAG, "Blocking automatic update: no wifi available / no mobile updates allowed");
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/FeedMediaSizeService.java b/core/src/main/java/de/danoeh/antennapod/core/service/FeedMediaSizeService.java
index 44fb14f0c..2f6e67a28 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/FeedMediaSizeService.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/FeedMediaSizeService.java
@@ -28,13 +28,13 @@ public class FeedMediaSizeService extends IntentService {
     @Override
     protected void onHandleIntent(Intent intent) {
         Log.d(TAG, "onHandleIntent()");
-        if(false == NetworkUtils.isDownloadAllowed(this)) {
+        if(false == NetworkUtils.isDownloadAllowed()) {
             return;
         }
         List<FeedMedia> list = DBReader.getFeedMediaUnknownSize(this);
         for (FeedMedia media : list) {
             Log.d(TAG, "Getting size currently " + media.getSize() + " for " + media.getDownload_url());
-            if(false == NetworkUtils.isDownloadAllowed(this)) {
+            if(false == NetworkUtils.isDownloadAllowed()) {
                 return;
             }
             long size = Integer.MIN_VALUE;
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/GpodnetSyncService.java b/core/src/main/java/de/danoeh/antennapod/core/service/GpodnetSyncService.java
index 3f2222f42..b80b4303f 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/GpodnetSyncService.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/GpodnetSyncService.java
@@ -108,7 +108,7 @@ public class GpodnetSyncService extends Service {
 
 
     private synchronized void sync() {
-        if (GpodnetPreferences.loggedIn() == false || NetworkUtils.networkAvailable(this) == false) {
+        if (GpodnetPreferences.loggedIn() == false || NetworkUtils.networkAvailable() == false) {
             stopSelf();
             return;
         }
diff --git a/core/src/main/java/de/danoeh/antennapod/core/storage/APDownloadAlgorithm.java b/core/src/main/java/de/danoeh/antennapod/core/storage/APDownloadAlgorithm.java
index 92de1eee7..0e6b23696 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/storage/APDownloadAlgorithm.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/storage/APDownloadAlgorithm.java
@@ -40,7 +40,7 @@ public class APDownloadAlgorithm implements AutomaticDownloadAlgorithm {
             public void run() {
 
                 // true if we should auto download based on network status
-                boolean networkShouldAutoDl = NetworkUtils.autodownloadNetworkAvailable(context)
+                boolean networkShouldAutoDl = NetworkUtils.autodownloadNetworkAvailable()
                         && UserPreferences.isEnableAutodownload();
 
                 // true if we should auto download based on power status
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/NetworkUtils.java b/core/src/main/java/de/danoeh/antennapod/core/util/NetworkUtils.java
index 3a349e221..9296039f0 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/NetworkUtils.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/NetworkUtils.java
@@ -10,14 +10,16 @@ import android.util.Log;
 import java.util.Arrays;
 import java.util.List;
 
-import de.danoeh.antennapod.core.BuildConfig;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
 
 public class NetworkUtils {
-	private static final String TAG = "NetworkUtils";
 
-	private NetworkUtils() {
+	private static final String TAG = NetworkUtils.class.getSimpleName();
 
+	private static Context context;
+
+	public static void init(Context context) {
+		NetworkUtils.context = context;
 	}
 
 	/**
@@ -26,18 +28,16 @@ public class NetworkUtils {
 	 * network that is on the 'selected networks' list of the Wi-Fi filter for
 	 * automatic downloads and false otherwise.
 	 * */
-	public static boolean autodownloadNetworkAvailable(Context context) {
+	public static boolean autodownloadNetworkAvailable() {
 		ConnectivityManager cm = (ConnectivityManager) context
 				.getSystemService(Context.CONNECTIVITY_SERVICE);
 		NetworkInfo networkInfo = cm.getActiveNetworkInfo();
 		if (networkInfo != null) {
 			if (networkInfo.getType() == ConnectivityManager.TYPE_WIFI) {
-				if (BuildConfig.DEBUG)
-					Log.d(TAG, "Device is connected to Wi-Fi");
+				Log.d(TAG, "Device is connected to Wi-Fi");
 				if (networkInfo.isConnected()) {
 					if (!UserPreferences.isEnableAutodownloadWifiFilter()) {
-						if (BuildConfig.DEBUG)
-							Log.d(TAG, "Auto-dl filter is disabled");
+						Log.d(TAG, "Auto-dl filter is disabled");
 						return true;
 					} else {
 						WifiManager wm = (WifiManager) context
@@ -48,31 +48,28 @@ public class NetworkUtils {
 										.getAutodownloadSelectedNetworks());
 						if (selectedNetworks.contains(Integer.toString(wifiInfo
 								.getNetworkId()))) {
-							if (BuildConfig.DEBUG)
-								Log.d(TAG,
-										"Current network is on the selected networks list");
+							Log.d(TAG, "Current network is on the selected networks list");
 							return true;
 						}
 					}
 				}
 			}
 		}
-		if (BuildConfig.DEBUG)
-			Log.d(TAG, "Network for auto-dl is not available");
+		Log.d(TAG, "Network for auto-dl is not available");
 		return false;
 	}
 
-    public static boolean networkAvailable(Context context) {
+    public static boolean networkAvailable() {
         ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
         NetworkInfo info = cm.getActiveNetworkInfo();
         return info != null && info.isConnected();
     }
 
-	public static boolean isDownloadAllowed(Context context) {
-		return UserPreferences.isAllowMobileUpdate() || NetworkUtils.connectedToWifi(context);
+	public static boolean isDownloadAllowed() {
+		return UserPreferences.isAllowMobileUpdate() || NetworkUtils.connectedToWifi();
 	}
 
-	public static boolean connectedToWifi(Context context) {
+	public static boolean connectedToWifi() {
 		ConnectivityManager connManager = (ConnectivityManager) context
 				.getSystemService(Context.CONNECTIVITY_SERVICE);
 		NetworkInfo mWifi = connManager