Display notification when trying to stream

3 files changed, 3 insertions, 24 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/MobileDownloadHelper.java b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/MobileDownloadHelper.java
index 0d2498b60..f8d2a139e 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/MobileDownloadHelper.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/MobileDownloadHelper.java
@@ -13,7 +13,7 @@ import de.danoeh.antennapod.core.storage.DBTasks;
 import de.danoeh.antennapod.core.storage.DBWriter;
 import de.danoeh.antennapod.core.storage.DownloadRequestException;
 
-public class MobileDownloadHelper {
+class MobileDownloadHelper {
     private static long addToQueueTimestamp;
     private static long allowMobileDownloadTimestamp;
     private static final int TEN_MINUTES_IN_MILLIS = 10 * 60 * 1000;
@@ -41,16 +41,6 @@ public class MobileDownloadHelper {
         builder.show();
     }
 
-    public static void confirmMobileStreaming(final Context context, MaterialDialog.SingleButtonCallback onAllowed) {
-        MaterialDialog.Builder builder = new MaterialDialog.Builder(context)
-                .title(R.string.confirm_mobile_streaming_dialog_title)
-                .content(R.string.confirm_mobile_streaming_dialog_message)
-                .positiveText(R.string.yes)
-                .onPositive(onAllowed)
-                .negativeText(R.string.no);
-        builder.show();
-    }
-
     private static void addToQueue(Context context, FeedItem item) {
         addToQueueTimestamp = System.currentTimeMillis();
         DBWriter.addQueueItem(context, item);
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
index e43d78ecc..1196401f2 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
@@ -35,7 +35,6 @@ import com.bumptech.glide.request.RequestOptions;
 import com.joanzapata.iconify.Iconify;
 import com.joanzapata.iconify.widget.IconButton;
 
-import de.danoeh.antennapod.adapter.actionbutton.MobileDownloadHelper;
 import org.apache.commons.lang3.ArrayUtils;
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -250,15 +249,8 @@ public class ItemFragment extends Fragment implements OnSwipeGesture {
             if (item.hasMedia()) {
                 FeedMedia media = item.getMedia();
                 if (!media.isDownloaded()) { // Stream
-                    if (NetworkUtils.isStreamingAllowed()) {
-                        DBTasks.playMedia(getActivity(), media, true, true, true);
-                        ((MainActivity) getActivity()).dismissChildFragment();
-                    } else {
-                        MobileDownloadHelper.confirmMobileStreaming(getContext(), (dialog, which) -> {
-                            DBTasks.playMedia(getActivity(), media, true, true, true);
-                            ((MainActivity) getActivity()).dismissChildFragment();
-                        });
-                    }
+                    DBTasks.playMedia(getActivity(), media, true, true, true);
+                    ((MainActivity) getActivity()).dismissChildFragment();
                 } else {
                     DBWriter.deleteFeedMediaOfItem(getActivity(), media.getId());
                 }
diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceUpgrader.java b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceUpgrader.java
index 751b6789a..e56703598 100644
--- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceUpgrader.java
+++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceUpgrader.java
@@ -2,14 +2,11 @@ package de.danoeh.antennapod.preferences;
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.preference.MultiSelectListPreference;
 import android.preference.PreferenceManager;
 import de.danoeh.antennapod.BuildConfig;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.core.util.gui.NotificationUtils;
 
-import java.util.HashSet;
-
 public class PreferenceUpgrader {
     private static final String PREF_CONFIGURED_VERSION = "configuredVersion";
     private static final String PREF_NAME = "PreferenceUpgrader";