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.

3 files changed, 7 insertions, 15 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/PodcastApp.java b/app/src/main/java/de/danoeh/antennapod/PodcastApp.java
index 99e10b0d1..f47fe3944 100644
--- a/app/src/main/java/de/danoeh/antennapod/PodcastApp.java
+++ b/app/src/main/java/de/danoeh/antennapod/PodcastApp.java
@@ -8,6 +8,7 @@ import de.danoeh.antennapod.core.feed.EventDistributor;
 import de.danoeh.antennapod.core.preferences.PlaybackPreferences;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.core.service.FeedMediaSizeService;
+import de.danoeh.antennapod.core.util.NetworkUtils;
 import de.danoeh.antennapod.spa.SPAUtil;
 
 /** Main application class. */
@@ -41,6 +42,7 @@ public class PodcastApp extends Application {
 		UpdateManager.init(this);
 		UserPreferences.init(this);
 		PlaybackPreferences.init(this);
+		NetworkUtils.init(this);
 		EventDistributor.getInstance();
 
         SPAUtil.sendSPAppsQueryFeedsIntent(this);
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/DefaultActionButtonCallback.java b/app/src/main/java/de/danoeh/antennapod/adapter/DefaultActionButtonCallback.java
index c34d90a30..c3486f2f2 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/DefaultActionButtonCallback.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/DefaultActionButtonCallback.java
@@ -12,11 +12,8 @@ import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.core.dialog.DownloadRequestErrorDialogCreator;
 import de.danoeh.antennapod.core.feed.FeedItem;
 import de.danoeh.antennapod.core.feed.FeedMedia;
-
 import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.core.service.playback.PlaybackService;
-import de.danoeh.antennapod.core.gpoddernet.model.GpodnetEpisodeAction;
-import de.danoeh.antennapod.core.preferences.GpodnetPreferences;
 import de.danoeh.antennapod.core.storage.DBReader;
 import de.danoeh.antennapod.core.storage.DBTasks;
 import de.danoeh.antennapod.core.storage.DBWriter;
@@ -61,7 +58,7 @@ public class DefaultActionButtonCallback implements ActionButtonCallback {
             boolean isDownloading = DownloadRequester.getInstance().isDownloadingFile(media);
             if (!isDownloading && !media.isDownloaded()) {
                 LongList queueIds = DBReader.getQueueIDList(context);
-                if (NetworkUtils.isDownloadAllowed(context) || userAllowedMobileDownloads()) {
+                if (NetworkUtils.isDownloadAllowed() || userAllowedMobileDownloads()) {
                     try {
                         DBTasks.downloadFeedItems(context, item);
                         Toast.makeText(context, R.string.status_downloading_label, Toast.LENGTH_SHORT).show();
diff --git a/app/src/main/java/de/danoeh/antennapod/receiver/ConnectivityActionReceiver.java b/app/src/main/java/de/danoeh/antennapod/receiver/ConnectivityActionReceiver.java
index a3a200058..2615ec5c8 100644
--- a/app/src/main/java/de/danoeh/antennapod/receiver/ConnectivityActionReceiver.java
+++ b/app/src/main/java/de/danoeh/antennapod/receiver/ConnectivityActionReceiver.java
@@ -9,7 +9,6 @@ import android.util.Log;
 
 import org.apache.commons.lang3.StringUtils;
 
-import de.danoeh.antennapod.core.BuildConfig;
 import de.danoeh.antennapod.core.storage.DBTasks;
 import de.danoeh.antennapod.core.storage.DownloadRequester;
 import de.danoeh.antennapod.core.util.NetworkUtils;
@@ -20,13 +19,10 @@ public class ConnectivityActionReceiver extends BroadcastReceiver {
 	@Override
 	public void onReceive(final Context context, Intent intent) {
 		if (StringUtils.equals(intent.getAction(), ConnectivityManager.CONNECTIVITY_ACTION)) {
-			if (BuildConfig.DEBUG)
-				Log.d(TAG, "Received intent");
+			Log.d(TAG, "Received intent");
 
-			if (NetworkUtils.autodownloadNetworkAvailable(context)) {
-				if (BuildConfig.DEBUG)
-					Log.d(TAG,
-							"auto-dl network available, starting auto-download");
+			if (NetworkUtils.autodownloadNetworkAvailable()) {
+				Log.d(TAG, "auto-dl network available, starting auto-download");
 					DBTasks.autodownloadUndownloadedItems(context);
 			} else { // if new network is Wi-Fi, finish ongoing downloads,
 						// otherwise cancel all downloads
@@ -34,12 +30,9 @@ public class ConnectivityActionReceiver extends BroadcastReceiver {
 						.getSystemService(Context.CONNECTIVITY_SERVICE);
 				NetworkInfo ni = cm.getActiveNetworkInfo();
 				if (ni == null || ni.getType() != ConnectivityManager.TYPE_WIFI) {
-					if (BuildConfig.DEBUG)
-						Log.i(TAG,
-								"Device is no longer connected to Wi-Fi. Cancelling ongoing downloads");
+					Log.i(TAG, "Device is no longer connected to Wi-Fi. Cancelling ongoing downloads");
 					DownloadRequester.getInstance().cancelAllDownloads(context);
 				}
-
 			}
 		}
 	}