From b5ee07e3895e05d01faebf2582895185453b38ce Mon Sep 17 00:00:00 2001
From: Tom Tom <Tom Tom>
Date: Wed, 22 Jun 2016 14:06:16 +0400
Subject: Fixed rule 'Utility classes should not have public constructors'

---
 app/src/main/java/de/danoeh/antennapod/activity/OpmlImportHolder.java  | 2 ++
 app/src/main/java/de/danoeh/antennapod/config/ClientConfigurator.java  | 2 ++
 .../java/de/danoeh/antennapod/dialog/GpodnetSetHostnameDialog.java     | 3 +++
 app/src/main/java/de/danoeh/antennapod/dialog/RatingDialog.java        | 2 ++
 .../main/java/de/danoeh/antennapod/menuhandler/FeedMenuHandler.java    | 3 +++
 5 files changed, 12 insertions(+)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportHolder.java b/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportHolder.java
index 7afa270cc..3a1a7be05 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportHolder.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportHolder.java
@@ -14,6 +14,8 @@ import java.util.ArrayList;
  */
 public class OpmlImportHolder {
 
+    private OpmlImportHolder(){}
+
     private static ArrayList<OpmlElement> readElements;
 
     public static ArrayList<OpmlElement> getReadElements() {
diff --git a/app/src/main/java/de/danoeh/antennapod/config/ClientConfigurator.java b/app/src/main/java/de/danoeh/antennapod/config/ClientConfigurator.java
index 932b9d22f..691eccdd9 100644
--- a/app/src/main/java/de/danoeh/antennapod/config/ClientConfigurator.java
+++ b/app/src/main/java/de/danoeh/antennapod/config/ClientConfigurator.java
@@ -8,6 +8,8 @@ import de.danoeh.antennapod.core.ClientConfig;
  */
 public class ClientConfigurator {
 
+    private ClientConfigurator(){}
+
     static {
         ClientConfig.USER_AGENT = "AntennaPod/" + BuildConfig.VERSION_NAME;
         ClientConfig.applicationCallbacks = new ApplicationCallbacksImpl();
diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/GpodnetSetHostnameDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/GpodnetSetHostnameDialog.java
index b50e21d15..b875eaf62 100644
--- a/app/src/main/java/de/danoeh/antennapod/dialog/GpodnetSetHostnameDialog.java
+++ b/app/src/main/java/de/danoeh/antennapod/dialog/GpodnetSetHostnameDialog.java
@@ -16,6 +16,9 @@ import de.danoeh.antennapod.core.preferences.GpodnetPreferences;
  * Creates a dialog that lets the user change the hostname for the gpodder.net service.
  */
 public class GpodnetSetHostnameDialog {
+
+    private GpodnetSetHostnameDialog(){}
+
     private static final String TAG = "GpodnetSetHostnameDialog";
 
     public static AlertDialog createDialog(final Context context) {
diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/RatingDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/RatingDialog.java
index 64fc1fda4..6b38ecb2e 100644
--- a/app/src/main/java/de/danoeh/antennapod/dialog/RatingDialog.java
+++ b/app/src/main/java/de/danoeh/antennapod/dialog/RatingDialog.java
@@ -17,6 +17,8 @@ import de.danoeh.antennapod.R;
 
 public class RatingDialog {
 
+    private RatingDialog(){}
+
     private static final String TAG = RatingDialog.class.getSimpleName();
     private static final int AFTER_DAYS = 7;
 
diff --git a/app/src/main/java/de/danoeh/antennapod/menuhandler/FeedMenuHandler.java b/app/src/main/java/de/danoeh/antennapod/menuhandler/FeedMenuHandler.java
index ab7d0e7c6..bd4fe9bcf 100644
--- a/app/src/main/java/de/danoeh/antennapod/menuhandler/FeedMenuHandler.java
+++ b/app/src/main/java/de/danoeh/antennapod/menuhandler/FeedMenuHandler.java
@@ -30,6 +30,9 @@ import de.danoeh.antennapod.core.util.ShareUtils;
  * Handles interactions with the FeedItemMenu.
  */
 public class FeedMenuHandler {
+
+    private FeedMenuHandler(){ }
+
     private static final String TAG = "FeedMenuHandler";
 
     public static boolean onCreateOptionsMenu(MenuInflater inflater, Menu menu) {
-- 
cgit v1.2.3


From e48cc22252a540b6014788a662f1f885c7a17639 Mon Sep 17 00:00:00 2001
From: Tom Tom <Tom Tom>
Date: Wed, 22 Jun 2016 21:28:10 +0400
Subject: Fixed rule 'The diamond operator ("<>") should be used'.

---
 .../java/de/danoeh/antennapod/activity/OpmlFeedChooserActivity.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/OpmlFeedChooserActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/OpmlFeedChooserActivity.java
index bc1a40b11..fce50bd1c 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/OpmlFeedChooserActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/OpmlFeedChooserActivity.java
@@ -99,7 +99,7 @@ public class OpmlFeedChooserActivity extends AppCompatActivity {
     }
 
     private List<String> getTitleList() {
-        List<String> result = new ArrayList<String>();
+        List<String> result = new ArrayList<>();
         if (OpmlImportHolder.getReadElements() != null) {
             for (OpmlElement element : OpmlImportHolder.getReadElements()) {
                 result.add(element.getText());
-- 
cgit v1.2.3


From 721c3e4d2c3838f9a88c30d8002415254cfe87ee Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Fri, 19 May 2017 19:51:15 +0200
Subject: Changed visibility from gone to invisible

---
 .../java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java  | 4 ++--
 .../main/java/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java   | 4 ++--
 .../main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java
index 3e8bbc488..f12c8285a 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java
@@ -174,7 +174,7 @@ public class AllEpisodesRecycleAdapter extends RecyclerView.Adapter<AllEpisodesR
                     holder.progress.setVisibility(View.VISIBLE);
                 }
             } else {
-                holder.progress.setVisibility(View.GONE);
+                holder.progress.setVisibility(View.INVISIBLE);
             }
 
             if(media.isCurrentlyPlaying()) {
@@ -183,7 +183,7 @@ public class AllEpisodesRecycleAdapter extends RecyclerView.Adapter<AllEpisodesR
                 holder.container.setBackgroundColor(normalBackGroundColor);
             }
         } else {
-            holder.progress.setVisibility(View.GONE);
+            holder.progress.setVisibility(View.INVISIBLE);
             holder.txtvDuration.setVisibility(View.GONE);
         }
 
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java
index 35c42725c..f843ddb94 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java
@@ -157,7 +157,7 @@ public class FeedItemlistAdapter extends BaseAdapter {
 
             FeedMedia media = item.getMedia();
             if (media == null) {
-                holder.episodeProgress.setVisibility(View.GONE);
+                holder.episodeProgress.setVisibility(View.INVISIBLE);
                 holder.inPlaylist.setVisibility(View.INVISIBLE);
                 holder.type.setVisibility(View.INVISIBLE);
                 holder.lenSize.setVisibility(View.INVISIBLE);
@@ -176,7 +176,7 @@ public class FeedItemlistAdapter extends BaseAdapter {
                     holder.episodeProgress.setProgress(itemAccess.getItemDownloadProgressPercent(item));
                 } else {
                     if(media.getPosition() == 0) {
-                        holder.episodeProgress.setVisibility(View.GONE);
+                        holder.episodeProgress.setVisibility(View.INVISIBLE);
                     }
                 }
 
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java
index c6ddc6c86..2684dcccd 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java
@@ -280,7 +280,7 @@ public class QueueRecyclerAdapter extends RecyclerView.Adapter<QueueRecyclerAdap
                         progressLeft.setText("");
                     }
                     progressRight.setText(Converter.getDurationStringLong(media.getDuration()));
-                    progressBar.setVisibility(View.GONE);
+                    progressBar.setVisibility(View.INVISIBLE);
                 }
 
                 if(media.isCurrentlyPlaying()) {
-- 
cgit v1.2.3


From ee50bca545da30d825c995649e9a6d7580921b77 Mon Sep 17 00:00:00 2001
From: Martin Fietz <martin.fietz@gmail.com>
Date: Sat, 21 Oct 2017 18:01:49 +0200
Subject: Refactor

---
 .../antennapod/adapter/ChaptersListAdapter.java    | 32 ++++++++++------------
 1 file changed, 14 insertions(+), 18 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/ChaptersListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/ChaptersListAdapter.java
index d7bebb672..75514abb1 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/ChaptersListAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/ChaptersListAdapter.java
@@ -1,6 +1,7 @@
 package de.danoeh.antennapod.adapter;
 
 import android.content.Context;
+import android.support.annotation.NonNull;
 import android.support.v4.content.ContextCompat;
 import android.text.Layout;
 import android.text.Selection;
@@ -42,8 +43,9 @@ public class ChaptersListAdapter extends ArrayAdapter<Chapter> {
         this.media = media;
     }
 
+    @NonNull
     @Override
-    public View getView(final int position, View convertView, ViewGroup parent) {
+    public View getView(final int position, View convertView, @NonNull ViewGroup parent) {
         Holder holder;
 
         Chapter sc = getItem(position);
@@ -120,7 +122,7 @@ public class ChaptersListAdapter extends ArrayAdapter<Chapter> {
                     if (link.length != 0) {
                         if (action == MotionEvent.ACTION_UP) {
                             link[0].onClick(widget);
-                        } else if (action == MotionEvent.ACTION_DOWN){
+                        } else if (action == MotionEvent.ACTION_DOWN) {
                             Selection.setSelection(buffer,
                                     buffer.getSpanStart(link[0]),
                                     buffer.getSpanEnd(link[0]));
@@ -139,23 +141,17 @@ public class ChaptersListAdapter extends ArrayAdapter<Chapter> {
                 callback.onPlayChapterButtonClicked(position);
             }
         });
+
         Chapter current = ChapterUtils.getCurrentChapter(media);
-        if (current != null) {
-            if (current == sc) {
-                int playingBackGroundColor;
-                if(UserPreferences.getTheme() == R.style.Theme_AntennaPod_Dark) {
-                    playingBackGroundColor = ContextCompat.getColor(getContext(), R.color.highlight_dark);
-                } else {
-                    playingBackGroundColor = ContextCompat.getColor(getContext(), R.color.highlight_light);
-                }
-                holder.view.setBackgroundColor(playingBackGroundColor);
-            } else {
-                holder.view.setBackgroundColor(ContextCompat.getColor(getContext(), android.R.color.transparent));
-                holder.title.setTextColor(defaultTextColor);
-                holder.start.setTextColor(defaultTextColor);
-            }
+        if (current == sc) {
+            boolean darkTheme = UserPreferences.getTheme() == R.style.Theme_AntennaPod_Dark;
+            int highlight = darkTheme ? R.color.highlight_dark : R.color.highlight_light;
+            int playingBackGroundColor = ContextCompat.getColor(getContext(), highlight);
+            holder.view.setBackgroundColor(playingBackGroundColor);
         } else {
-            Log.w(TAG, "Could not find out what the current chapter is.");
+            holder.view.setBackgroundColor(ContextCompat.getColor(getContext(), android.R.color.transparent));
+            holder.title.setTextColor(defaultTextColor);
+            holder.start.setTextColor(defaultTextColor);
         }
 
         return convertView;
@@ -172,7 +168,7 @@ public class ChaptersListAdapter extends ArrayAdapter<Chapter> {
 
     @Override
     public int getCount() {
-        if(media == null || media.getChapters() == null) {
+        if (media == null || media.getChapters() == null) {
             return 0;
         }
         // ignore invalid chapters
-- 
cgit v1.2.3


From 30c7ca5437cf65dc74ebfdd60a44d89da2bfaf79 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Sat, 21 Oct 2017 20:52:29 +0200
Subject: Shared element transition of cover

---
 .../de/danoeh/antennapod/activity/MediaplayerActivity.java | 12 +++++++++++-
 .../antennapod/activity/MediaplayerInfoActivity.java       |  9 +++++++++
 .../danoeh/antennapod/fragment/ExternalPlayerFragment.java | 14 ++++++++++++--
 3 files changed, 32 insertions(+), 3 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
index 21a0fa66f..b0cbd355b 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
@@ -11,6 +11,7 @@ import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
+import android.support.v4.app.ActivityOptionsCompat;
 import android.support.v7.app.AlertDialog;
 import android.util.Log;
 import android.view.Menu;
@@ -368,7 +369,16 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements
                     MainActivity.class);
             intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP
                     | Intent.FLAG_ACTIVITY_NEW_TASK);
-            startActivity(intent);
+
+            View cover = findViewById(R.id.imgvCover);
+            if (cover != null && Build.VERSION.SDK_INT >= 16) {
+                ActivityOptionsCompat options = ActivityOptionsCompat.
+                        makeSceneTransitionAnimation(MediaplayerActivity.this,
+                        cover, "coverTransition");
+                startActivity(intent, options.toBundle());
+            } else {
+                startActivity(intent);
+            }
             return true;
         } else {
             if (media != null) {
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerInfoActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerInfoActivity.java
index b3cda69d3..cc7d83e0c 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerInfoActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerInfoActivity.java
@@ -6,6 +6,7 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
 import android.os.Build;
+import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.design.widget.AppBarLayout;
 import android.support.design.widget.Snackbar;
@@ -112,6 +113,12 @@ public abstract class MediaplayerInfoActivity extends MediaplayerActivity implem
         EventBus.getDefault().unregister(this);
     }
 
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        supportPostponeEnterTransition();
+    }
+
     @Override
     protected void onStop() {
         super.onStop();
@@ -277,6 +284,8 @@ public abstract class MediaplayerInfoActivity extends MediaplayerActivity implem
         pageIndicator.setViewPager(pager);
         loadLastFragment();
         pager.onSaveInstanceState();
+
+        navList.post(this::supportStartPostponedEnterTransition);
     }
 
     @Override
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
index 1e385728a..ebdb658d5 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
@@ -1,6 +1,9 @@
 package de.danoeh.antennapod.fragment;
 
+import android.content.Intent;
+import android.os.Build;
 import android.os.Bundle;
+import android.support.v4.app.ActivityOptionsCompat;
 import android.support.v4.app.Fragment;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -56,8 +59,15 @@ public class ExternalPlayerFragment extends Fragment {
             Log.d(TAG, "layoutInfo was clicked");
 
             if (controller != null && controller.getMedia() != null) {
-                startActivity(PlaybackService.getPlayerActivityIntent(
-                        getActivity(), controller.getMedia()));
+                Intent intent = PlaybackService.getPlayerActivityIntent(getActivity(), controller.getMedia());
+
+                if (Build.VERSION.SDK_INT >= 16) {
+                    ActivityOptionsCompat options = ActivityOptionsCompat.
+                            makeSceneTransitionAnimation(getActivity(), imgvCover, "coverTransition");
+                    startActivity(intent, options.toBundle());
+                } else {
+                    startActivity(intent);
+                }
             }
         });
         return root;
-- 
cgit v1.2.3


From 2f5e7a28037563982e818445b7882adadfdaa318 Mon Sep 17 00:00:00 2001
From: Martin Fietz <martin.fietz@gmail.com>
Date: Sat, 21 Oct 2017 23:43:28 +0200
Subject: Avoid FileUriExposedException

---
 .../java/de/danoeh/antennapod/activity/OpmlImportFromPathActivity.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportFromPathActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportFromPathActivity.java
index eb6b473d2..ed7ab5d34 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportFromPathActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportFromPathActivity.java
@@ -51,11 +51,10 @@ public class OpmlImportFromPathActivity extends OpmlImportBaseActivity {
         int nextOption = 1;
         String optionLabel = getString(R.string.opml_import_option);
         intentPickAction = new Intent(Intent.ACTION_PICK);
-        intentPickAction.setData(Uri.parse("file://"));
 
         if(!IntentUtils.isCallable(getApplicationContext(), intentPickAction)) {
             intentPickAction.setData(null);
-            if(false == IntentUtils.isCallable(getApplicationContext(), intentPickAction)) {
+            if(!IntentUtils.isCallable(getApplicationContext(), intentPickAction)) {
                 txtvHeaderExplanation1.setVisibility(View.GONE);
                 txtvExplanation1.setVisibility(View.GONE);
                 findViewById(R.id.divider1).setVisibility(View.GONE);
-- 
cgit v1.2.3


From af33e4c37bdad3151013553dbeafc3bc1e8043b0 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Sun, 28 May 2017 12:17:53 +0200
Subject: Import/Export activity

---
 .../antennapod/activity/ImportExportActivity.java  | 183 +++++++++++++++++++++
 .../preferences/PreferenceController.java          |   8 +
 2 files changed, 191 insertions(+)
 create mode 100644 app/src/main/java/de/danoeh/antennapod/activity/ImportExportActivity.java

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/ImportExportActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/ImportExportActivity.java
new file mode 100644
index 000000000..5cd562d45
--- /dev/null
+++ b/app/src/main/java/de/danoeh/antennapod/activity/ImportExportActivity.java
@@ -0,0 +1,183 @@
+package de.danoeh.antennapod.activity;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Environment;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.app.AppCompatActivity;
+import android.util.Log;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.ListView;
+import android.widget.ProgressBar;
+import android.widget.RadioButton;
+import android.widget.TextView;
+import de.danoeh.antennapod.R;
+import de.danoeh.antennapod.adapter.StatisticsListAdapter;
+import de.danoeh.antennapod.core.preferences.UserPreferences;
+import de.danoeh.antennapod.core.storage.DBReader;
+import de.danoeh.antennapod.core.storage.PodDBAdapter;
+import de.danoeh.antennapod.core.util.Converter;
+import rx.Observable;
+import rx.Subscription;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.channels.FileChannel;
+
+/**
+ * Displays the 'statistics' screen
+ */
+public class ImportExportActivity extends AppCompatActivity {
+    private static final int READ_REQUEST_CODE = 41;
+    private static final int READ_REQUEST_CODE_DOCUMENT = 42;
+
+    private static final String TAG = ImportExportActivity.class.getSimpleName();
+
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        setTheme(UserPreferences.getTheme());
+        super.onCreate(savedInstanceState);
+        getSupportActionBar().setDisplayShowHomeEnabled(true);
+        setContentView(R.layout.import_export_activity);
+
+
+        //backup();
+        //restore();
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == android.R.id.home) {
+            finish();
+            return true;
+        } else {
+            return super.onOptionsItemSelected(item);
+        }
+    }
+
+    private void restore() {
+        if(Build.VERSION.SDK_INT >= 19) {
+            Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT);
+            intent.setType("*/*");
+            startActivityForResult(intent, READ_REQUEST_CODE_DOCUMENT);
+        } else {
+            Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
+            intent.setType("*/*");
+            startActivityForResult(Intent.createChooser(intent, "Select a File to import"), READ_REQUEST_CODE);
+        }
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent resultData) {
+        File currentDB = getDatabasePath(PodDBAdapter.DATABASE_NAME);
+
+        if (requestCode == READ_REQUEST_CODE_DOCUMENT && resultCode == RESULT_OK) {
+            if (resultData != null) {
+                Uri uri = resultData.getData();
+
+                try {
+                    InputStream inputStream = getContentResolver().openInputStream(uri);
+                    copyInputStreamToFile(inputStream, currentDB);
+                    inputStream.close();
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+
+            }
+        } else if(requestCode == READ_REQUEST_CODE && resultCode == RESULT_OK) {
+            if (resultData != null) {
+                Uri uri = resultData.getData();
+                try {
+                    File backupDB = new File(getPath(getBaseContext(), uri));
+
+                    if (backupDB.exists()) {
+                        FileChannel src = new FileInputStream(currentDB).getChannel();
+                        FileChannel dst = new FileOutputStream(backupDB).getChannel();
+                        dst.transferFrom(src, 0, src.size());
+                        src.close();
+                        dst.close();
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+
+    private void copyInputStreamToFile(InputStream in, File file) {
+        try {
+            OutputStream out = new FileOutputStream(file);
+            byte[] buf = new byte[1024];
+            int len;
+            while((len=in.read(buf))>0){
+                out.write(buf,0,len);
+            }
+            out.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    private static String getPath(Context context, Uri uri) {
+        if ("content".equalsIgnoreCase(uri.getScheme())) {
+            String[] projection = { "_data" };
+            Cursor cursor = null;
+
+            try {
+                cursor = context.getContentResolver().query(uri, projection, null, null, null);
+                int column_index = cursor.getColumnIndexOrThrow("_data");
+                if (cursor.moveToFirst()) {
+                    return cursor.getString(column_index);
+                }
+            } catch (Exception e) {
+                // Eat it
+            }
+        }
+        else if ("file".equalsIgnoreCase(uri.getScheme())) {
+            return uri.getPath();
+        }
+
+        return null;
+    }
+
+    private void backup() {
+        try {
+            File sd = Environment.getExternalStorageDirectory();
+
+            if (sd.canWrite()) {
+                File currentDB = getDatabasePath(PodDBAdapter.DATABASE_NAME);
+                File backupDB = new File(sd, "AntennaPodBackup.db");
+
+                if (currentDB.exists()) {
+                    FileChannel src = new FileInputStream(currentDB).getChannel();
+                    FileChannel dst = new FileOutputStream(backupDB).getChannel();
+                    dst.transferFrom(src, 0, src.size());
+                    src.close();
+                    dst.close();
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}
diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
index 1ca0d0109..e8c35b9a7 100644
--- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
+++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
@@ -39,6 +39,7 @@ import android.widget.Toast;
 
 import com.afollestad.materialdialogs.MaterialDialog;
 
+import de.danoeh.antennapod.activity.ImportExportActivity;
 import org.apache.commons.lang3.ArrayUtils;
 
 import java.io.File;
@@ -95,6 +96,7 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
     private static final String PREF_OPML_EXPORT = "prefOpmlExport";
     private static final String PREF_HTML_EXPORT = "prefHtmlExport";
     private static final String STATISTICS = "statistics";
+    private static final String IMPORT_EXPORT = "importExport";
     private static final String PREF_ABOUT = "prefAbout";
     private static final String PREF_CHOOSE_DATA_DIR = "prefChooseDataDir";
     private static final String AUTO_DL_PREF_SCREEN = "prefAutoDownloadSettings";
@@ -191,6 +193,12 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
                     return true;
                 }
         );
+        ui.findPreference(PreferenceController.IMPORT_EXPORT).setOnPreferenceClickListener(
+                preference -> {
+                    activity.startActivity(new Intent(activity, ImportExportActivity.class));
+                    return true;
+                }
+        );
         ui.findPreference(PreferenceController.PREF_OPML_EXPORT).setOnPreferenceClickListener(
                 preference -> export(new OpmlWriter()));
         ui.findPreference(PreferenceController.PREF_HTML_EXPORT).setOnPreferenceClickListener(
-- 
cgit v1.2.3


From 4cb4a0a0cbb65bc0db58ce24cc665f38a06ee208 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Mon, 16 Oct 2017 00:06:17 +0200
Subject: Supporting export using documents store API

---
 .../antennapod/activity/ImportExportActivity.java  | 117 ++++++++++++++-------
 1 file changed, 79 insertions(+), 38 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/ImportExportActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/ImportExportActivity.java
index 5cd562d45..adaf5fe50 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/ImportExportActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/ImportExportActivity.java
@@ -2,48 +2,34 @@ package de.danoeh.antennapod.activity;
 
 import android.content.Context;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Environment;
-import android.support.v7.app.AlertDialog;
+import android.os.ParcelFileDescriptor;
+import android.support.design.widget.Snackbar;
 import android.support.v7.app.AppCompatActivity;
-import android.util.Log;
-import android.view.Menu;
-import android.view.MenuInflater;
 import android.view.MenuItem;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.ListView;
-import android.widget.ProgressBar;
-import android.widget.RadioButton;
-import android.widget.TextView;
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.adapter.StatisticsListAdapter;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
-import de.danoeh.antennapod.core.storage.DBReader;
 import de.danoeh.antennapod.core.storage.PodDBAdapter;
-import de.danoeh.antennapod.core.util.Converter;
-import rx.Observable;
-import rx.Subscription;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
 
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.nio.channels.FileChannel;
 
 /**
- * Displays the 'statistics' screen
+ * Displays the 'import/export' screen
  */
 public class ImportExportActivity extends AppCompatActivity {
-    private static final int READ_REQUEST_CODE = 41;
-    private static final int READ_REQUEST_CODE_DOCUMENT = 42;
+    private static final int READ_REQUEST_CODE = 42;
+    private static final int READ_REQUEST_CODE_DOCUMENT = 43;
+    private static final int WRITE_REQUEST_CODE_DOCUMENT = 44;
 
     private static final String TAG = ImportExportActivity.class.getSimpleName();
 
@@ -55,9 +41,8 @@ public class ImportExportActivity extends AppCompatActivity {
         getSupportActionBar().setDisplayShowHomeEnabled(true);
         setContentView(R.layout.import_export_activity);
 
-
-        //backup();
-        //restore();
+        findViewById(R.id.button_export).setOnClickListener(view -> backup());
+        findViewById(R.id.button_import).setOnClickListener(view -> restore());
     }
 
     @Override
@@ -83,7 +68,7 @@ public class ImportExportActivity extends AppCompatActivity {
         } else {
             Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
             intent.setType("*/*");
-            startActivityForResult(Intent.createChooser(intent, "Select a File to import"), READ_REQUEST_CODE);
+            startActivityForResult(Intent.createChooser(intent, getString(R.string.import_select_file)), READ_REQUEST_CODE);
         }
     }
 
@@ -104,6 +89,11 @@ public class ImportExportActivity extends AppCompatActivity {
                 }
 
             }
+        } else if (requestCode == WRITE_REQUEST_CODE_DOCUMENT && resultCode == RESULT_OK) {
+            if (resultData != null) {
+                Uri uri = resultData.getData();
+                writeBackupDocument(uri);
+            }
         } else if(requestCode == READ_REQUEST_CODE && resultCode == RESULT_OK) {
             if (resultData != null) {
                 Uri uri = resultData.getData();
@@ -151,6 +141,8 @@ public class ImportExportActivity extends AppCompatActivity {
                 }
             } catch (Exception e) {
                 // Eat it
+            } finally {
+                cursor.close();
             }
         }
         else if ("file".equalsIgnoreCase(uri.getScheme())) {
@@ -161,23 +153,72 @@ public class ImportExportActivity extends AppCompatActivity {
     }
 
     private void backup() {
-        try {
-            File sd = Environment.getExternalStorageDirectory();
-
-            if (sd.canWrite()) {
-                File currentDB = getDatabasePath(PodDBAdapter.DATABASE_NAME);
-                File backupDB = new File(sd, "AntennaPodBackup.db");
-
-                if (currentDB.exists()) {
-                    FileChannel src = new FileInputStream(currentDB).getChannel();
-                    FileChannel dst = new FileOutputStream(backupDB).getChannel();
-                    dst.transferFrom(src, 0, src.size());
-                    src.close();
-                    dst.close();
+        if (Build.VERSION.SDK_INT >= 19) {
+            Intent intent = new Intent(Intent.ACTION_CREATE_DOCUMENT)
+                    .addCategory(Intent.CATEGORY_OPENABLE)
+                    .setType("application/x-sqlite3")
+                    .putExtra(Intent.EXTRA_TITLE, "AntennaPodBackup.db");
+
+            startActivityForResult(intent, WRITE_REQUEST_CODE_DOCUMENT);
+        } else {
+            try {
+                File sd = Environment.getExternalStorageDirectory();
+
+                if (sd.canWrite()) {
+                    File backupDB = new File(sd, "AntennaPodBackup.db");
+                    writeBackup(new FileOutputStream(backupDB));
+                } else {
+                    Snackbar.make(findViewById(R.id.import_export_layout),
+                            "Can not write SD", Snackbar.LENGTH_SHORT).show();
                 }
+            } catch (Exception e) {
+                e.printStackTrace();
+
+                Snackbar.make(findViewById(R.id.import_export_layout), e.getMessage(), Snackbar.LENGTH_SHORT).show();
+            }
+        }
+    }
+
+    void writeBackup(FileOutputStream outFileStream) {
+        try {
+            File currentDB = getDatabasePath(PodDBAdapter.DATABASE_NAME);
+
+            if (currentDB.exists()) {
+                FileChannel src = new FileInputStream(currentDB).getChannel();
+                FileChannel dst = outFileStream.getChannel();
+                dst.transferFrom(src, 0, src.size());
+                src.close();
+                dst.close();
+
+                Snackbar.make(findViewById(R.id.import_export_layout),
+                        R.string.export_ok, Snackbar.LENGTH_SHORT).show();
+            } else {
+                Snackbar.make(findViewById(R.id.import_export_layout),
+                        "Can not access current database", Snackbar.LENGTH_SHORT).show();
             }
         } catch (Exception e) {
             e.printStackTrace();
+
+            Snackbar.make(findViewById(R.id.import_export_layout), e.getMessage(), Snackbar.LENGTH_SHORT).show();
         }
     }
+
+    private void writeBackupDocument(Uri uri) {
+        try {
+            ParcelFileDescriptor pfd = getContentResolver().openFileDescriptor(uri, "w");
+            FileOutputStream fileOutputStream = new FileOutputStream(pfd.getFileDescriptor());
+            writeBackup(fileOutputStream);
+            fileOutputStream.close();
+            pfd.close();
+
+            Snackbar.make(findViewById(R.id.import_export_layout),
+                    R.string.export_ok, Snackbar.LENGTH_SHORT).show();
+        } catch (IOException e) {
+            e.printStackTrace();
+
+            Snackbar.make(findViewById(R.id.import_export_layout),
+                    "Can not write SD", Snackbar.LENGTH_SHORT).show();
+        }
+    }
+
 }
-- 
cgit v1.2.3


From 2e5407370fd9bdcf4646140d6dd9563cbb8cca72 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Sat, 21 Oct 2017 20:08:11 +0200
Subject: Showing dialog when import succeeds

---
 .../antennapod/activity/ImportExportActivity.java  | 54 ++++++++++++----------
 1 file changed, 29 insertions(+), 25 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/ImportExportActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/ImportExportActivity.java
index adaf5fe50..a0388cb03 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/ImportExportActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/ImportExportActivity.java
@@ -1,5 +1,6 @@
 package de.danoeh.antennapod.activity;
 
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.database.Cursor;
@@ -9,6 +10,8 @@ import android.os.Bundle;
 import android.os.Environment;
 import android.os.ParcelFileDescriptor;
 import android.support.design.widget.Snackbar;
+import android.support.v4.content.IntentCompat;
+import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AppCompatActivity;
 import android.view.MenuItem;
 import de.danoeh.antennapod.R;
@@ -74,20 +77,10 @@ public class ImportExportActivity extends AppCompatActivity {
 
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent resultData) {
-        File currentDB = getDatabasePath(PodDBAdapter.DATABASE_NAME);
-
         if (requestCode == READ_REQUEST_CODE_DOCUMENT && resultCode == RESULT_OK) {
             if (resultData != null) {
                 Uri uri = resultData.getData();
-
-                try {
-                    InputStream inputStream = getContentResolver().openInputStream(uri);
-                    copyInputStreamToFile(inputStream, currentDB);
-                    inputStream.close();
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-
+                writeDatabase(uri);
             }
         } else if (requestCode == WRITE_REQUEST_CODE_DOCUMENT && resultCode == RESULT_OK) {
             if (resultData != null) {
@@ -97,23 +90,34 @@ public class ImportExportActivity extends AppCompatActivity {
         } else if(requestCode == READ_REQUEST_CODE && resultCode == RESULT_OK) {
             if (resultData != null) {
                 Uri uri = resultData.getData();
-                try {
-                    File backupDB = new File(getPath(getBaseContext(), uri));
-
-                    if (backupDB.exists()) {
-                        FileChannel src = new FileInputStream(currentDB).getChannel();
-                        FileChannel dst = new FileOutputStream(backupDB).getChannel();
-                        dst.transferFrom(src, 0, src.size());
-                        src.close();
-                        dst.close();
-                    }
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
+                writeDatabase(uri);
             }
         }
     }
 
+    private void writeDatabase(Uri inputUri) {
+        File currentDB = getDatabasePath(PodDBAdapter.DATABASE_NAME);
+        try {
+            InputStream inputStream = getContentResolver().openInputStream(inputUri);
+            copyInputStreamToFile(inputStream, currentDB);
+            inputStream.close();
+
+            AlertDialog.Builder d = new AlertDialog.Builder(ImportExportActivity.this);
+            d.setMessage(R.string.import_ok);
+            d.setCancelable(false);
+            d.setPositiveButton(android.R.string.ok, (dialogInterface, i) -> {
+                Intent intent = new Intent(getApplicationContext(), SplashActivity.class);
+                ComponentName cn = intent.getComponent();
+                Intent mainIntent = IntentCompat.makeRestartActivityTask(cn);
+                startActivity(mainIntent);
+            });
+            d.show();
+        } catch (Exception e) {
+            e.printStackTrace();
+            Snackbar.make(findViewById(R.id.import_export_layout), e.getMessage(), Snackbar.LENGTH_SHORT).show();
+        }
+    }
+
     private void copyInputStreamToFile(InputStream in, File file) {
         try {
             OutputStream out = new FileOutputStream(file);
@@ -179,7 +183,7 @@ public class ImportExportActivity extends AppCompatActivity {
         }
     }
 
-    void writeBackup(FileOutputStream outFileStream) {
+    private void writeBackup(FileOutputStream outFileStream) {
         try {
             File currentDB = getDatabasePath(PodDBAdapter.DATABASE_NAME);
 
-- 
cgit v1.2.3


From b665792d2920a1f6116289492d92c739c3706c7b Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Sun, 24 Dec 2017 13:11:41 +0100
Subject: Cleanup import/export

---
 .../antennapod/activity/ImportExportActivity.java  | 166 ++++++++-------------
 1 file changed, 62 insertions(+), 104 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/ImportExportActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/ImportExportActivity.java
index a0388cb03..862420325 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/ImportExportActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/ImportExportActivity.java
@@ -1,9 +1,7 @@
 package de.danoeh.antennapod.activity;
 
 import android.content.ComponentName;
-import android.content.Context;
 import android.content.Intent;
-import android.database.Cursor;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
@@ -30,12 +28,8 @@ import java.nio.channels.FileChannel;
  * Displays the 'import/export' screen
  */
 public class ImportExportActivity extends AppCompatActivity {
-    private static final int READ_REQUEST_CODE = 42;
-    private static final int READ_REQUEST_CODE_DOCUMENT = 43;
-    private static final int WRITE_REQUEST_CODE_DOCUMENT = 44;
-
-    private static final String TAG = ImportExportActivity.class.getSimpleName();
-
+    private static final int REQUEST_CODE_RESTORE = 43;
+    private static final int REQUEST_CODE_BACKUP_DOCUMENT = 44;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -63,68 +57,83 @@ public class ImportExportActivity extends AppCompatActivity {
         }
     }
 
+    private void backup() {
+        if (Build.VERSION.SDK_INT >= 19) {
+            Intent intent = new Intent(Intent.ACTION_CREATE_DOCUMENT)
+                    .addCategory(Intent.CATEGORY_OPENABLE)
+                    .setType("application/x-sqlite3")
+                    .putExtra(Intent.EXTRA_TITLE, "AntennaPodBackup.db");
+
+            startActivityForResult(intent, REQUEST_CODE_BACKUP_DOCUMENT);
+        } else {
+            try {
+                File sd = Environment.getExternalStorageDirectory();
+                File backupDB = new File(sd, "AntennaPodBackup.db");
+                writeBackupTo(new FileOutputStream(backupDB));
+            } catch (Exception e) {
+                e.printStackTrace();
+                Snackbar.make(findViewById(R.id.import_export_layout), e.getMessage(), Snackbar.LENGTH_SHORT).show();
+            }
+        }
+    }
+
     private void restore() {
         if(Build.VERSION.SDK_INT >= 19) {
             Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT);
             intent.setType("*/*");
-            startActivityForResult(intent, READ_REQUEST_CODE_DOCUMENT);
+            startActivityForResult(intent, REQUEST_CODE_RESTORE);
         } else {
             Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
             intent.setType("*/*");
-            startActivityForResult(Intent.createChooser(intent, getString(R.string.import_select_file)), READ_REQUEST_CODE);
+            startActivityForResult(Intent.createChooser(intent,
+                    getString(R.string.import_select_file)), REQUEST_CODE_RESTORE);
         }
     }
 
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent resultData) {
-        if (requestCode == READ_REQUEST_CODE_DOCUMENT && resultCode == RESULT_OK) {
-            if (resultData != null) {
-                Uri uri = resultData.getData();
-                writeDatabase(uri);
-            }
-        } else if (requestCode == WRITE_REQUEST_CODE_DOCUMENT && resultCode == RESULT_OK) {
-            if (resultData != null) {
-                Uri uri = resultData.getData();
-                writeBackupDocument(uri);
-            }
-        } else if(requestCode == READ_REQUEST_CODE && resultCode == RESULT_OK) {
-            if (resultData != null) {
-                Uri uri = resultData.getData();
-                writeDatabase(uri);
-            }
+        if (requestCode == REQUEST_CODE_RESTORE && resultCode == RESULT_OK && resultData != null) {
+            Uri uri = resultData.getData();
+            restoreFrom(uri);
+        } else if (requestCode == REQUEST_CODE_BACKUP_DOCUMENT && resultCode == RESULT_OK && resultData != null) {
+            Uri uri = resultData.getData();
+            backupToDocument(uri);
         }
     }
 
-    private void writeDatabase(Uri inputUri) {
+    private void restoreFrom(Uri inputUri) {
         File currentDB = getDatabasePath(PodDBAdapter.DATABASE_NAME);
         try {
             InputStream inputStream = getContentResolver().openInputStream(inputUri);
             copyInputStreamToFile(inputStream, currentDB);
             inputStream.close();
-
-            AlertDialog.Builder d = new AlertDialog.Builder(ImportExportActivity.this);
-            d.setMessage(R.string.import_ok);
-            d.setCancelable(false);
-            d.setPositiveButton(android.R.string.ok, (dialogInterface, i) -> {
-                Intent intent = new Intent(getApplicationContext(), SplashActivity.class);
-                ComponentName cn = intent.getComponent();
-                Intent mainIntent = IntentCompat.makeRestartActivityTask(cn);
-                startActivity(mainIntent);
-            });
-            d.show();
+            displayImportSuccessDialog();
         } catch (Exception e) {
             e.printStackTrace();
             Snackbar.make(findViewById(R.id.import_export_layout), e.getMessage(), Snackbar.LENGTH_SHORT).show();
         }
     }
 
+    private void displayImportSuccessDialog() {
+        AlertDialog.Builder d = new AlertDialog.Builder(ImportExportActivity.this);
+        d.setMessage(R.string.import_ok);
+        d.setCancelable(false);
+        d.setPositiveButton(android.R.string.ok, (dialogInterface, i) -> {
+            Intent intent = new Intent(getApplicationContext(), SplashActivity.class);
+            ComponentName cn = intent.getComponent();
+            Intent mainIntent = IntentCompat.makeRestartActivityTask(cn);
+            startActivity(mainIntent);
+        });
+        d.show();
+    }
+
     private void copyInputStreamToFile(InputStream in, File file) {
         try {
             OutputStream out = new FileOutputStream(file);
             byte[] buf = new byte[1024];
             int len;
-            while((len=in.read(buf))>0){
-                out.write(buf,0,len);
+            while ((len = in.read(buf)) > 0){
+                out.write(buf, 0, len);
             }
             out.close();
         } catch (Exception e) {
@@ -132,58 +141,25 @@ public class ImportExportActivity extends AppCompatActivity {
         }
     }
 
-    private static String getPath(Context context, Uri uri) {
-        if ("content".equalsIgnoreCase(uri.getScheme())) {
-            String[] projection = { "_data" };
-            Cursor cursor = null;
-
-            try {
-                cursor = context.getContentResolver().query(uri, projection, null, null, null);
-                int column_index = cursor.getColumnIndexOrThrow("_data");
-                if (cursor.moveToFirst()) {
-                    return cursor.getString(column_index);
-                }
-            } catch (Exception e) {
-                // Eat it
-            } finally {
-                cursor.close();
-            }
-        }
-        else if ("file".equalsIgnoreCase(uri.getScheme())) {
-            return uri.getPath();
-        }
-
-        return null;
-    }
-
-    private void backup() {
-        if (Build.VERSION.SDK_INT >= 19) {
-            Intent intent = new Intent(Intent.ACTION_CREATE_DOCUMENT)
-                    .addCategory(Intent.CATEGORY_OPENABLE)
-                    .setType("application/x-sqlite3")
-                    .putExtra(Intent.EXTRA_TITLE, "AntennaPodBackup.db");
-
-            startActivityForResult(intent, WRITE_REQUEST_CODE_DOCUMENT);
-        } else {
-            try {
-                File sd = Environment.getExternalStorageDirectory();
+    private void backupToDocument(Uri uri) {
+        try {
+            ParcelFileDescriptor pfd = getContentResolver().openFileDescriptor(uri, "w");
+            FileOutputStream fileOutputStream = new FileOutputStream(pfd.getFileDescriptor());
+            writeBackupTo(fileOutputStream);
+            fileOutputStream.close();
+            pfd.close();
 
-                if (sd.canWrite()) {
-                    File backupDB = new File(sd, "AntennaPodBackup.db");
-                    writeBackup(new FileOutputStream(backupDB));
-                } else {
-                    Snackbar.make(findViewById(R.id.import_export_layout),
-                            "Can not write SD", Snackbar.LENGTH_SHORT).show();
-                }
-            } catch (Exception e) {
-                e.printStackTrace();
+            Snackbar.make(findViewById(R.id.import_export_layout),
+                    R.string.export_ok, Snackbar.LENGTH_SHORT).show();
+        } catch (IOException e) {
+            e.printStackTrace();
 
-                Snackbar.make(findViewById(R.id.import_export_layout), e.getMessage(), Snackbar.LENGTH_SHORT).show();
-            }
+            Snackbar.make(findViewById(R.id.import_export_layout),
+                    "Can not write SD", Snackbar.LENGTH_SHORT).show();
         }
     }
 
-    private void writeBackup(FileOutputStream outFileStream) {
+    private void writeBackupTo(FileOutputStream outFileStream) {
         try {
             File currentDB = getDatabasePath(PodDBAdapter.DATABASE_NAME);
 
@@ -207,22 +183,4 @@ public class ImportExportActivity extends AppCompatActivity {
         }
     }
 
-    private void writeBackupDocument(Uri uri) {
-        try {
-            ParcelFileDescriptor pfd = getContentResolver().openFileDescriptor(uri, "w");
-            FileOutputStream fileOutputStream = new FileOutputStream(pfd.getFileDescriptor());
-            writeBackup(fileOutputStream);
-            fileOutputStream.close();
-            pfd.close();
-
-            Snackbar.make(findViewById(R.id.import_export_layout),
-                    R.string.export_ok, Snackbar.LENGTH_SHORT).show();
-        } catch (IOException e) {
-            e.printStackTrace();
-
-            Snackbar.make(findViewById(R.id.import_export_layout),
-                    "Can not write SD", Snackbar.LENGTH_SHORT).show();
-        }
-    }
-
 }
-- 
cgit v1.2.3


From 3fd3db6c579c0ab4d5388f4796e552e02443c784 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Mon, 25 Dec 2017 22:42:41 +0100
Subject: Review changes

---
 .../java/de/danoeh/antennapod/activity/ImportExportActivity.java   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/ImportExportActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/ImportExportActivity.java
index 862420325..4d36e86de 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/ImportExportActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/ImportExportActivity.java
@@ -30,6 +30,7 @@ import java.nio.channels.FileChannel;
 public class ImportExportActivity extends AppCompatActivity {
     private static final int REQUEST_CODE_RESTORE = 43;
     private static final int REQUEST_CODE_BACKUP_DOCUMENT = 44;
+    private static final String EXPORT_FILENAME = "AntennaPodBackup.db";
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -62,13 +63,13 @@ public class ImportExportActivity extends AppCompatActivity {
             Intent intent = new Intent(Intent.ACTION_CREATE_DOCUMENT)
                     .addCategory(Intent.CATEGORY_OPENABLE)
                     .setType("application/x-sqlite3")
-                    .putExtra(Intent.EXTRA_TITLE, "AntennaPodBackup.db");
+                    .putExtra(Intent.EXTRA_TITLE, EXPORT_FILENAME);
 
             startActivityForResult(intent, REQUEST_CODE_BACKUP_DOCUMENT);
         } else {
             try {
                 File sd = Environment.getExternalStorageDirectory();
-                File backupDB = new File(sd, "AntennaPodBackup.db");
+                File backupDB = new File(sd, EXPORT_FILENAME);
                 writeBackupTo(new FileOutputStream(backupDB));
             } catch (Exception e) {
                 e.printStackTrace();
@@ -78,7 +79,7 @@ public class ImportExportActivity extends AppCompatActivity {
     }
 
     private void restore() {
-        if(Build.VERSION.SDK_INT >= 19) {
+        if (Build.VERSION.SDK_INT >= 19) {
             Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT);
             intent.setType("*/*");
             startActivityForResult(intent, REQUEST_CODE_RESTORE);
-- 
cgit v1.2.3


From 2e98119d47dffaadd7bee82e082c80d0f3914841 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Sat, 6 Jan 2018 12:33:33 +0100
Subject: Fixed video view

Bug was introduced in #2457, shared element does not exist in video view
---
 .../java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
index ebdb658d5..5bb8e0a2d 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
@@ -17,6 +17,7 @@ import android.widget.TextView;
 import com.bumptech.glide.Glide;
 
 import de.danoeh.antennapod.R;
+import de.danoeh.antennapod.core.feed.MediaType;
 import de.danoeh.antennapod.core.glide.ApGlideSettings;
 import de.danoeh.antennapod.core.service.playback.PlaybackService;
 import de.danoeh.antennapod.core.util.Converter;
@@ -61,7 +62,7 @@ public class ExternalPlayerFragment extends Fragment {
             if (controller != null && controller.getMedia() != null) {
                 Intent intent = PlaybackService.getPlayerActivityIntent(getActivity(), controller.getMedia());
 
-                if (Build.VERSION.SDK_INT >= 16) {
+                if (Build.VERSION.SDK_INT >= 16 && controller.getMedia().getMediaType() == MediaType.AUDIO) {
                     ActivityOptionsCompat options = ActivityOptionsCompat.
                             makeSceneTransitionAnimation(getActivity(), imgvCover, "coverTransition");
                     startActivity(intent, options.toBundle());
-- 
cgit v1.2.3


From bbbff0bc731c9fd2a92611b889335200dc0f8bc2 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dirk@dmllr.de>
Date: Sun, 7 Jan 2018 19:25:19 +0100
Subject: Cleanup order/remove unused includes

This is the result of Android Studio's include cleanup
Macro. This removes some no longer used includes, simplifying
the code a bit. The rest is grouping and resorting alphabetically.
---
 .../main/java/de/danoeh/antennapod/adapter/ChaptersListAdapter.java   | 1 -
 app/src/main/java/de/danoeh/antennapod/adapter/CoverTarget.java       | 1 -
 .../java/de/danoeh/antennapod/dialog/GpodnetSetHostnameDialog.java    | 1 +
 app/src/main/java/de/danoeh/antennapod/dialog/SleepTimerDialog.java   | 2 --
 .../main/java/de/danoeh/antennapod/fragment/NewEpisodesFragment.java  | 2 --
 .../de/danoeh/antennapod/fragment/gpodnet/PodcastTopListFragment.java | 4 ++--
 .../java/de/danoeh/antennapod/preferences/PreferenceController.java   | 2 --
 app/src/main/java/de/danoeh/antennapod/receiver/PlayerWidget.java     | 4 ++--
 8 files changed, 5 insertions(+), 12 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/ChaptersListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/ChaptersListAdapter.java
index 75514abb1..f55fe72b4 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/ChaptersListAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/ChaptersListAdapter.java
@@ -9,7 +9,6 @@ import android.text.Spannable;
 import android.text.Spanned;
 import android.text.style.ClickableSpan;
 import android.text.util.Linkify;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/CoverTarget.java b/app/src/main/java/de/danoeh/antennapod/adapter/CoverTarget.java
index 538af8c79..ba6e7b25d 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/CoverTarget.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/CoverTarget.java
@@ -1,7 +1,6 @@
 package de.danoeh.antennapod.adapter;
 
 import android.graphics.drawable.Drawable;
-import android.net.Uri;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/GpodnetSetHostnameDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/GpodnetSetHostnameDialog.java
index db6b48735..e64f1e08b 100644
--- a/app/src/main/java/de/danoeh/antennapod/dialog/GpodnetSetHostnameDialog.java
+++ b/app/src/main/java/de/danoeh/antennapod/dialog/GpodnetSetHostnameDialog.java
@@ -8,6 +8,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.EditText;
 import android.widget.LinearLayout;
+
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.core.gpoddernet.GpodnetService;
 import de.danoeh.antennapod.core.preferences.GpodnetPreferences;
diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/SleepTimerDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/SleepTimerDialog.java
index 7d6a66a54..5bb3f09c3 100644
--- a/app/src/main/java/de/danoeh/antennapod/dialog/SleepTimerDialog.java
+++ b/app/src/main/java/de/danoeh/antennapod/dialog/SleepTimerDialog.java
@@ -1,7 +1,6 @@
 package de.danoeh.antennapod.dialog;
 
 import android.content.Context;
-import android.support.design.widget.Snackbar;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.util.Log;
@@ -9,7 +8,6 @@ import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.ArrayAdapter;
 import android.widget.CheckBox;
-import android.widget.CompoundButton;
 import android.widget.EditText;
 import android.widget.Spinner;
 import android.widget.Toast;
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/NewEpisodesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/NewEpisodesFragment.java
index 183c10f3d..c136eb6ae 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/NewEpisodesFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/NewEpisodesFragment.java
@@ -7,8 +7,6 @@ import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.helper.ItemTouchHelper;
 import android.util.Log;
 import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/PodcastTopListFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/PodcastTopListFragment.java
index 33a35fa90..4f963756c 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/PodcastTopListFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/PodcastTopListFragment.java
@@ -1,11 +1,11 @@
 package de.danoeh.antennapod.fragment.gpodnet;
 
+import java.util.List;
+
 import de.danoeh.antennapod.core.gpoddernet.GpodnetService;
 import de.danoeh.antennapod.core.gpoddernet.GpodnetServiceException;
 import de.danoeh.antennapod.core.gpoddernet.model.GpodnetPodcast;
 
-import java.util.List;
-
 /**
  *
  */
diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
index 1ca0d0109..3b5a68f7f 100644
--- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
+++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
@@ -24,7 +24,6 @@ import android.preference.PreferenceManager;
 import android.preference.PreferenceScreen;
 import android.support.design.widget.Snackbar;
 import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
 import android.support.v4.content.FileProvider;
 import android.support.v7.app.AlertDialog;
 import android.text.Editable;
@@ -61,7 +60,6 @@ import de.danoeh.antennapod.activity.PreferenceActivity;
 import de.danoeh.antennapod.activity.PreferenceActivityGingerbread;
 import de.danoeh.antennapod.activity.StatisticsActivity;
 import de.danoeh.antennapod.asynctask.ExportWorker;
-import de.danoeh.antennapod.core.BuildConfig;
 import de.danoeh.antennapod.core.export.ExportWriter;
 import de.danoeh.antennapod.core.export.html.HtmlWriter;
 import de.danoeh.antennapod.core.export.opml.OpmlWriter;
diff --git a/app/src/main/java/de/danoeh/antennapod/receiver/PlayerWidget.java b/app/src/main/java/de/danoeh/antennapod/receiver/PlayerWidget.java
index f0d4014ed..a90f0f706 100644
--- a/app/src/main/java/de/danoeh/antennapod/receiver/PlayerWidget.java
+++ b/app/src/main/java/de/danoeh/antennapod/receiver/PlayerWidget.java
@@ -1,7 +1,5 @@
 package de.danoeh.antennapod.receiver;
 
-import java.util.Arrays;
-
 import android.appwidget.AppWidgetManager;
 import android.appwidget.AppWidgetProvider;
 import android.content.Context;
@@ -10,6 +8,8 @@ import android.content.SharedPreferences;
 import android.text.TextUtils;
 import android.util.Log;
 
+import java.util.Arrays;
+
 import de.danoeh.antennapod.core.service.playback.PlaybackService;
 import de.danoeh.antennapod.service.PlayerWidgetService;
 
-- 
cgit v1.2.3


From bc9bd0bfcf1678655b22239cebadf365b453c72c Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Sun, 7 Jan 2018 20:09:28 +0100
Subject: Style changes and logging

---
 .../antennapod/activity/ImportExportActivity.java  | 46 +++++++++++-----------
 1 file changed, 22 insertions(+), 24 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/ImportExportActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/ImportExportActivity.java
index 4d36e86de..fdf8b73b2 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/ImportExportActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/ImportExportActivity.java
@@ -11,6 +11,7 @@ import android.support.design.widget.Snackbar;
 import android.support.v4.content.IntentCompat;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AppCompatActivity;
+import android.util.Log;
 import android.view.MenuItem;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
@@ -31,6 +32,7 @@ public class ImportExportActivity extends AppCompatActivity {
     private static final int REQUEST_CODE_RESTORE = 43;
     private static final int REQUEST_CODE_BACKUP_DOCUMENT = 44;
     private static final String EXPORT_FILENAME = "AntennaPodBackup.db";
+    private static final String TAG = ImportExportActivity.class.getSimpleName();
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -43,11 +45,6 @@ public class ImportExportActivity extends AppCompatActivity {
         findViewById(R.id.button_import).setOnClickListener(view -> restore());
     }
 
-    @Override
-    public void onResume() {
-        super.onResume();
-    }
-
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == android.R.id.home) {
@@ -71,9 +68,9 @@ public class ImportExportActivity extends AppCompatActivity {
                 File sd = Environment.getExternalStorageDirectory();
                 File backupDB = new File(sd, EXPORT_FILENAME);
                 writeBackupTo(new FileOutputStream(backupDB));
-            } catch (Exception e) {
-                e.printStackTrace();
-                Snackbar.make(findViewById(R.id.import_export_layout), e.getMessage(), Snackbar.LENGTH_SHORT).show();
+            } catch (IOException e) {
+                Log.e(TAG, Log.getStackTraceString(e));
+                Snackbar.make(findViewById(R.id.import_export_layout), e.getLocalizedMessage(), Snackbar.LENGTH_SHORT).show();
             }
         }
     }
@@ -93,10 +90,14 @@ public class ImportExportActivity extends AppCompatActivity {
 
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent resultData) {
-        if (requestCode == REQUEST_CODE_RESTORE && resultCode == RESULT_OK && resultData != null) {
+        if (resultCode != RESULT_OK || resultData == null) {
+            return;
+        }
+
+        if (requestCode == REQUEST_CODE_RESTORE) {
             Uri uri = resultData.getData();
             restoreFrom(uri);
-        } else if (requestCode == REQUEST_CODE_BACKUP_DOCUMENT && resultCode == RESULT_OK && resultData != null) {
+        } else if (requestCode == REQUEST_CODE_BACKUP_DOCUMENT) {
             Uri uri = resultData.getData();
             backupToDocument(uri);
         }
@@ -109,9 +110,9 @@ public class ImportExportActivity extends AppCompatActivity {
             copyInputStreamToFile(inputStream, currentDB);
             inputStream.close();
             displayImportSuccessDialog();
-        } catch (Exception e) {
-            e.printStackTrace();
-            Snackbar.make(findViewById(R.id.import_export_layout), e.getMessage(), Snackbar.LENGTH_SHORT).show();
+        } catch (IOException e) {
+            Log.e(TAG, Log.getStackTraceString(e));
+            Snackbar.make(findViewById(R.id.import_export_layout), e.getLocalizedMessage(), Snackbar.LENGTH_SHORT).show();
         }
     }
 
@@ -137,8 +138,9 @@ public class ImportExportActivity extends AppCompatActivity {
                 out.write(buf, 0, len);
             }
             out.close();
-        } catch (Exception e) {
-            e.printStackTrace();
+        } catch (IOException e) {
+            Log.e(TAG, Log.getStackTraceString(e));
+            Snackbar.make(findViewById(R.id.import_export_layout), e.getLocalizedMessage(), Snackbar.LENGTH_SHORT).show();
         }
     }
 
@@ -153,10 +155,8 @@ public class ImportExportActivity extends AppCompatActivity {
             Snackbar.make(findViewById(R.id.import_export_layout),
                     R.string.export_ok, Snackbar.LENGTH_SHORT).show();
         } catch (IOException e) {
-            e.printStackTrace();
-
-            Snackbar.make(findViewById(R.id.import_export_layout),
-                    "Can not write SD", Snackbar.LENGTH_SHORT).show();
+            Log.e(TAG, Log.getStackTraceString(e));
+            Snackbar.make(findViewById(R.id.import_export_layout), e.getLocalizedMessage(), Snackbar.LENGTH_SHORT).show();
         }
     }
 
@@ -177,11 +177,9 @@ public class ImportExportActivity extends AppCompatActivity {
                 Snackbar.make(findViewById(R.id.import_export_layout),
                         "Can not access current database", Snackbar.LENGTH_SHORT).show();
             }
-        } catch (Exception e) {
-            e.printStackTrace();
-
-            Snackbar.make(findViewById(R.id.import_export_layout), e.getMessage(), Snackbar.LENGTH_SHORT).show();
+        } catch (IOException e) {
+            Log.e(TAG, Log.getStackTraceString(e));
+            Snackbar.make(findViewById(R.id.import_export_layout), e.getLocalizedMessage(), Snackbar.LENGTH_SHORT).show();
         }
     }
-
 }
-- 
cgit v1.2.3


From 4c00f764943580e928feb4851d3fdc68594613dc Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Sun, 7 Jan 2018 20:14:49 +0100
Subject: Closing correctly

---
 .../antennapod/activity/ImportExportActivity.java  | 42 +++++++++++++++-------
 1 file changed, 30 insertions(+), 12 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/ImportExportActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/ImportExportActivity.java
index fdf8b73b2..7e63ae1a6 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/ImportExportActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/ImportExportActivity.java
@@ -16,6 +16,7 @@ import android.view.MenuItem;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.core.storage.PodDBAdapter;
+import org.apache.commons.io.IOUtils;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -105,14 +106,16 @@ public class ImportExportActivity extends AppCompatActivity {
 
     private void restoreFrom(Uri inputUri) {
         File currentDB = getDatabasePath(PodDBAdapter.DATABASE_NAME);
+        InputStream inputStream = null;
         try {
-            InputStream inputStream = getContentResolver().openInputStream(inputUri);
+            inputStream = getContentResolver().openInputStream(inputUri);
             copyInputStreamToFile(inputStream, currentDB);
-            inputStream.close();
             displayImportSuccessDialog();
         } catch (IOException e) {
             Log.e(TAG, Log.getStackTraceString(e));
             Snackbar.make(findViewById(R.id.import_export_layout), e.getLocalizedMessage(), Snackbar.LENGTH_SHORT).show();
+        } finally {
+            IOUtils.closeQuietly(inputStream);
         }
     }
 
@@ -130,46 +133,58 @@ public class ImportExportActivity extends AppCompatActivity {
     }
 
     private void copyInputStreamToFile(InputStream in, File file) {
+        OutputStream out = null;
         try {
-            OutputStream out = new FileOutputStream(file);
+            out = new FileOutputStream(file);
             byte[] buf = new byte[1024];
             int len;
             while ((len = in.read(buf)) > 0){
                 out.write(buf, 0, len);
             }
-            out.close();
         } catch (IOException e) {
             Log.e(TAG, Log.getStackTraceString(e));
             Snackbar.make(findViewById(R.id.import_export_layout), e.getLocalizedMessage(), Snackbar.LENGTH_SHORT).show();
+        } finally {
+            IOUtils.closeQuietly(out);
         }
     }
 
     private void backupToDocument(Uri uri) {
+        ParcelFileDescriptor pfd = null;
+        FileOutputStream fileOutputStream = null;
         try {
-            ParcelFileDescriptor pfd = getContentResolver().openFileDescriptor(uri, "w");
-            FileOutputStream fileOutputStream = new FileOutputStream(pfd.getFileDescriptor());
+            pfd = getContentResolver().openFileDescriptor(uri, "w");
+            fileOutputStream = new FileOutputStream(pfd.getFileDescriptor());
             writeBackupTo(fileOutputStream);
-            fileOutputStream.close();
-            pfd.close();
 
             Snackbar.make(findViewById(R.id.import_export_layout),
                     R.string.export_ok, Snackbar.LENGTH_SHORT).show();
         } catch (IOException e) {
             Log.e(TAG, Log.getStackTraceString(e));
             Snackbar.make(findViewById(R.id.import_export_layout), e.getLocalizedMessage(), Snackbar.LENGTH_SHORT).show();
+        } finally {
+            IOUtils.closeQuietly(fileOutputStream);
+
+            if (pfd != null) {
+                try {
+                    pfd.close();
+                } catch (IOException e) {
+                    Log.d(TAG, "Unable to close ParcelFileDescriptor");
+                }
+            }
         }
     }
 
     private void writeBackupTo(FileOutputStream outFileStream) {
+        FileChannel src = null;
+        FileChannel dst = null;
         try {
             File currentDB = getDatabasePath(PodDBAdapter.DATABASE_NAME);
 
             if (currentDB.exists()) {
-                FileChannel src = new FileInputStream(currentDB).getChannel();
-                FileChannel dst = outFileStream.getChannel();
+                src = new FileInputStream(currentDB).getChannel();
+                dst = outFileStream.getChannel();
                 dst.transferFrom(src, 0, src.size());
-                src.close();
-                dst.close();
 
                 Snackbar.make(findViewById(R.id.import_export_layout),
                         R.string.export_ok, Snackbar.LENGTH_SHORT).show();
@@ -180,6 +195,9 @@ public class ImportExportActivity extends AppCompatActivity {
         } catch (IOException e) {
             Log.e(TAG, Log.getStackTraceString(e));
             Snackbar.make(findViewById(R.id.import_export_layout), e.getLocalizedMessage(), Snackbar.LENGTH_SHORT).show();
+        } finally {
+            IOUtils.closeQuietly(src);
+            IOUtils.closeQuietly(dst);
         }
     }
 }
-- 
cgit v1.2.3


From 12456b52def840fcfdf35e50cf376f2d79d7c8ba Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Sun, 7 Jan 2018 20:17:18 +0100
Subject: Using FileUtils.copyInputStreamToFile

---
 .../antennapod/activity/ImportExportActivity.java   | 21 ++-------------------
 1 file changed, 2 insertions(+), 19 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/ImportExportActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/ImportExportActivity.java
index 7e63ae1a6..01fcfe83d 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/ImportExportActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/ImportExportActivity.java
@@ -16,6 +16,7 @@ import android.view.MenuItem;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.core.storage.PodDBAdapter;
+import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 
 import java.io.File;
@@ -23,7 +24,6 @@ import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.OutputStream;
 import java.nio.channels.FileChannel;
 
 /**
@@ -109,7 +109,7 @@ public class ImportExportActivity extends AppCompatActivity {
         InputStream inputStream = null;
         try {
             inputStream = getContentResolver().openInputStream(inputUri);
-            copyInputStreamToFile(inputStream, currentDB);
+            FileUtils.copyInputStreamToFile(inputStream, currentDB);
             displayImportSuccessDialog();
         } catch (IOException e) {
             Log.e(TAG, Log.getStackTraceString(e));
@@ -132,23 +132,6 @@ public class ImportExportActivity extends AppCompatActivity {
         d.show();
     }
 
-    private void copyInputStreamToFile(InputStream in, File file) {
-        OutputStream out = null;
-        try {
-            out = new FileOutputStream(file);
-            byte[] buf = new byte[1024];
-            int len;
-            while ((len = in.read(buf)) > 0){
-                out.write(buf, 0, len);
-            }
-        } catch (IOException e) {
-            Log.e(TAG, Log.getStackTraceString(e));
-            Snackbar.make(findViewById(R.id.import_export_layout), e.getLocalizedMessage(), Snackbar.LENGTH_SHORT).show();
-        } finally {
-            IOUtils.closeQuietly(out);
-        }
-    }
-
     private void backupToDocument(Uri uri) {
         ParcelFileDescriptor pfd = null;
         FileOutputStream fileOutputStream = null;
-- 
cgit v1.2.3


From dc316074e8b5c408c7dc7eff7b16f9ffd8978ac7 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Sun, 7 Jan 2018 20:19:29 +0100
Subject: Simplified onActivityResult

---
 .../main/java/de/danoeh/antennapod/activity/ImportExportActivity.java  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/ImportExportActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/ImportExportActivity.java
index 01fcfe83d..6a97adcc3 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/ImportExportActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/ImportExportActivity.java
@@ -94,12 +94,11 @@ public class ImportExportActivity extends AppCompatActivity {
         if (resultCode != RESULT_OK || resultData == null) {
             return;
         }
+        Uri uri = resultData.getData();
 
         if (requestCode == REQUEST_CODE_RESTORE) {
-            Uri uri = resultData.getData();
             restoreFrom(uri);
         } else if (requestCode == REQUEST_CODE_BACKUP_DOCUMENT) {
-            Uri uri = resultData.getData();
             backupToDocument(uri);
         }
     }
-- 
cgit v1.2.3


From 32215ffc2890d8b392838e4ab5c04271390144e4 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dirk@dmllr.de>
Date: Mon, 8 Jan 2018 11:08:56 +0100
Subject: Set video aspect on initial creation

Previously on first start of a video the aspect ratio
was not correct (annoying on a 18:9 phone as
it doesn't match the usual 16:9 aspect ratio). So extract
the code into a setupVideoAspectRatio() helper
and call it from surfaceCreated as well.
---
 .../antennapod/activity/VideoplayerActivity.java   | 23 +++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
index 8531a7356..fb5c4d273 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
@@ -152,16 +152,9 @@ public class VideoplayerActivity extends MediaplayerActivity {
 
     @Override
     protected void onAwaitingVideoSurface() {
+        setupVideoAspectRatio();
         if (videoSurfaceCreated && controller != null) {
             Log.d(TAG, "Videosurface already created, setting videosurface now");
-
-            Pair<Integer, Integer> videoSize = controller.getVideoSize();
-            if (videoSize != null && videoSize.first > 0 && videoSize.second > 0) {
-                Log.d(TAG, "Width,height of video: " + videoSize.first + ", " + videoSize.second);
-                videoview.setVideoSize(videoSize.first, videoSize.second);
-            } else {
-                Log.e(TAG, "Could not determine video size");
-            }
             controller.setVideoSurface(videoview.getHolder());
         }
     }
@@ -199,6 +192,18 @@ public class VideoplayerActivity extends MediaplayerActivity {
         videoControlsHider.start();
     }
 
+    private void setupVideoAspectRatio() {
+        if (videoSurfaceCreated && controller != null) {
+            Pair<Integer, Integer> videoSize = controller.getVideoSize();
+            if (videoSize != null && videoSize.first > 0 && videoSize.second > 0) {
+                Log.d(TAG, "Width,height of video: " + videoSize.first + ", " + videoSize.second);
+                videoview.setVideoSize(videoSize.first, videoSize.second);
+            } else {
+                Log.e(TAG, "Could not determine video size");
+            }
+        }
+    }
+
     private void toggleVideoControlsVisibility() {
         if (videoControlsShowing) {
             getSupportActionBar().hide();
@@ -247,7 +252,7 @@ public class VideoplayerActivity extends MediaplayerActivity {
                     Log.e(TAG, "Couldn't attach surface to mediaplayer - reference to service was null");
                 }
             }
-
+            setupVideoAspectRatio();
         }
 
         @Override
-- 
cgit v1.2.3


From c5d1d5408b1a2f31ad697fb0940148801ee0ee1a Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Sun, 24 Dec 2017 11:46:59 +0100
Subject: Added Picure in picture

---
 .../antennapod/activity/MediaplayerActivity.java   |  9 ++++--
 .../antennapod/activity/VideoplayerActivity.java   | 35 ++++++++++++++++++++--
 2 files changed, 38 insertions(+), 6 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
index b0cbd355b..585b6cd85 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
@@ -38,6 +38,7 @@ 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.service.playback.PlayerStatus;
 import de.danoeh.antennapod.core.storage.DBReader;
 import de.danoeh.antennapod.core.storage.DBTasks;
 import de.danoeh.antennapod.core.storage.DBWriter;
@@ -225,9 +226,11 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements
 
     @Override
     protected void onPause() {
-        if(controller != null) {
-            controller.reinitServiceIfPaused();
-            controller.pause();
+        if (Build.VERSION.SDK_INT < 26 || !isInPictureInPictureMode()) {
+            if (controller != null) {
+                controller.reinitServiceIfPaused();
+                controller.pause();
+            }
         }
         super.onPause();
     }
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
index fb5c4d273..c7dd6285f 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
@@ -9,6 +9,8 @@ import android.os.Handler;
 import android.support.v4.view.WindowCompat;
 import android.util.Log;
 import android.util.Pair;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.SurfaceHolder;
 import android.view.View;
@@ -96,9 +98,12 @@ public class VideoplayerActivity extends MediaplayerActivity {
 
     @Override
     protected void onPause() {
-        videoControlsHider.stop();
-        if (controller != null && controller.getStatus() == PlayerStatus.PLAYING) {
-            controller.pause();
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N
+                || !isInPictureInPictureMode()) {
+            videoControlsHider.stop();
+            if (controller != null && controller.getStatus() == PlayerStatus.PLAYING) {
+                controller.pause();
+            }
         }
         super.onPause();
     }
@@ -175,6 +180,10 @@ public class VideoplayerActivity extends MediaplayerActivity {
 
     View.OnTouchListener onVideoviewTouched = (v, event) -> {
         if (event.getAction() == MotionEvent.ACTION_DOWN) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N
+                    && isInPictureInPictureMode()) {
+                return true;
+            }
             videoControlsHider.stop();
             toggleVideoControlsVisibility();
             if (videoControlsShowing) {
@@ -349,6 +358,26 @@ public class VideoplayerActivity extends MediaplayerActivity {
         }
     }
 
+    @Override
+    public boolean onPrepareOptionsMenu(Menu menu) {
+        super.onPrepareOptionsMenu(menu);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            menu.findItem(R.id.player_go_to_picture_in_picture).setVisible(true);
+        }
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == R.id.player_go_to_picture_in_picture) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                enterPictureInPictureMode();
+            }
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
     private static class VideoControlsHider extends Handler {
 
         private static final int DELAY = 2500;
-- 
cgit v1.2.3


From bad964508adf6145cc1c788b6540cd114dc5eef1 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Sun, 24 Dec 2017 12:53:04 +0100
Subject: Added configChanges

---
 .../java/de/danoeh/antennapod/activity/VideoplayerActivity.java    | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
index c7dd6285f..80288af24 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
@@ -2,6 +2,7 @@ package de.danoeh.antennapod.activity;
 
 import android.annotation.SuppressLint;
 import android.content.Intent;
+import android.content.res.Configuration;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Build;
 import android.os.Bundle;
@@ -378,6 +379,12 @@ public class VideoplayerActivity extends MediaplayerActivity {
         return super.onOptionsItemSelected(item);
     }
 
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+        //TODO
+    }
+
     private static class VideoControlsHider extends Handler {
 
         private static final int DELAY = 2500;
-- 
cgit v1.2.3


From 7e72ff0b0e96cfb009146892c5db20dfa60d63c7 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Sat, 6 Jan 2018 13:20:02 +0100
Subject: Fixed scaling of video

---
 .../antennapod/activity/VideoplayerActivity.java   | 11 ++++++++++-
 .../antennapod/view/AspectRatioVideoView.java      | 23 ++++++++++++++++++++--
 2 files changed, 31 insertions(+), 3 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
index 80288af24..bf1cc5b7e 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
@@ -8,8 +8,10 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.support.v4.view.WindowCompat;
+import android.util.DisplayMetrics;
 import android.util.Log;
 import android.util.Pair;
+import android.util.TypedValue;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.MotionEvent;
@@ -382,7 +384,14 @@ public class VideoplayerActivity extends MediaplayerActivity {
     @Override
     public void onConfigurationChanged(Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
-        //TODO
+
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.HONEYCOMB_MR2) {
+            // This is only relevant for picture in picture
+            DisplayMetrics dm = getResources().getDisplayMetrics();
+            float px = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, newConfig.screenWidthDp, dm);
+            float py = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, newConfig.screenHeightDp, dm);
+            videoview.setAvailableSize(px, py);
+        }
     }
 
     private static class VideoControlsHider extends Handler {
diff --git a/app/src/main/java/de/danoeh/antennapod/view/AspectRatioVideoView.java b/app/src/main/java/de/danoeh/antennapod/view/AspectRatioVideoView.java
index f930c912a..138fbff00 100644
--- a/app/src/main/java/de/danoeh/antennapod/view/AspectRatioVideoView.java
+++ b/app/src/main/java/de/danoeh/antennapod/view/AspectRatioVideoView.java
@@ -25,6 +25,8 @@ public class AspectRatioVideoView extends VideoView {
 
     private int mVideoWidth;
     private int mVideoHeight;
+    private float mAvailableWidth = -1;
+    private float mAvailableHeight = -1;
 
     public AspectRatioVideoView(Context context) {
         this(context, null);
@@ -48,8 +50,13 @@ public class AspectRatioVideoView extends VideoView {
             return;
         }
 
-        float heightRatio = (float) mVideoHeight / (float) getHeight();
-        float widthRatio = (float) mVideoWidth / (float) getWidth();
+        if (mAvailableWidth < 0 || mAvailableHeight < 0) {
+            mAvailableWidth = getWidth();
+            mAvailableHeight = getHeight();
+        }
+
+        float heightRatio = (float) mVideoHeight / mAvailableHeight;
+        float widthRatio = (float) mVideoWidth / mAvailableWidth;
 
         int scaledHeight;
         int scaledWidth;
@@ -94,4 +101,16 @@ public class AspectRatioVideoView extends VideoView {
         invalidate();
     }
 
+    /**
+     * Sets the maximum size that the view might expand to
+     * @param width
+     * @param height
+     */
+    public void setAvailableSize(float width, float height) {
+        mAvailableWidth = width;
+        mAvailableHeight = height;
+        requestLayout();
+        invalidate();
+    }
+
 }
-- 
cgit v1.2.3


From fbb5f28737804d93955771b29d10f76b4fb4128e Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Sat, 6 Jan 2018 13:31:26 +0100
Subject: Allow to touch space next to video player

---
 .../main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
index bf1cc5b7e..f01a63e37 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
@@ -144,7 +144,8 @@ public class VideoplayerActivity extends MediaplayerActivity {
         videoview = (AspectRatioVideoView) findViewById(R.id.videoview);
         progressIndicator = (ProgressBar) findViewById(R.id.progressIndicator);
         videoview.getHolder().addCallback(surfaceHolderCallback);
-        videoview.setOnTouchListener(onVideoviewTouched);
+        findViewById(R.id.videoframe).setOnTouchListener(onVideoviewTouched);
+        videoOverlay.setOnTouchListener((view, motionEvent) -> true); // To suppress touches directly below the slider
 
         if (Build.VERSION.SDK_INT >= 16) {
             videoview.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION);
@@ -181,7 +182,7 @@ public class VideoplayerActivity extends MediaplayerActivity {
         progressIndicator.setVisibility(View.INVISIBLE);
     }
 
-    View.OnTouchListener onVideoviewTouched = (v, event) -> {
+    private View.OnTouchListener onVideoviewTouched = (v, event) -> {
         if (event.getAction() == MotionEvent.ACTION_DOWN) {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N
                     && isInPictureInPictureMode()) {
-- 
cgit v1.2.3


From d42330bc7e5a5ac8d6087b0306f91718777ed6bc Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Sat, 6 Jan 2018 13:35:56 +0100
Subject: Fixed flickering when resizing

---
 app/src/main/java/de/danoeh/antennapod/view/AspectRatioVideoView.java | 2 --
 1 file changed, 2 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/view/AspectRatioVideoView.java b/app/src/main/java/de/danoeh/antennapod/view/AspectRatioVideoView.java
index 138fbff00..e9ec5491c 100644
--- a/app/src/main/java/de/danoeh/antennapod/view/AspectRatioVideoView.java
+++ b/app/src/main/java/de/danoeh/antennapod/view/AspectRatioVideoView.java
@@ -109,8 +109,6 @@ public class AspectRatioVideoView extends VideoView {
     public void setAvailableSize(float width, float height) {
         mAvailableWidth = width;
         mAvailableHeight = height;
-        requestLayout();
-        invalidate();
     }
 
 }
-- 
cgit v1.2.3


From 8ab64d516a3e33a8709c9f9e995691feac80282e Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Tue, 9 Jan 2018 08:57:40 +0100
Subject: Hide controls when entering PiP

---
 .../antennapod/activity/VideoplayerActivity.java       | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
index f01a63e37..4f28a789d 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
@@ -331,11 +331,13 @@ public class VideoplayerActivity extends MediaplayerActivity {
     }
 
     @SuppressLint("NewApi")
-    private void hideVideoControls() {
-        final Animation animation = AnimationUtils.loadAnimation(this, R.anim.fade_out);
-        if (animation != null) {
-            videoOverlay.startAnimation(animation);
-            controls.startAnimation(animation);
+    private void hideVideoControls(boolean showAnimation) {
+        if (showAnimation) {
+            final Animation animation = AnimationUtils.loadAnimation(this, R.anim.fade_out);
+            if (animation != null) {
+                videoOverlay.startAnimation(animation);
+                controls.startAnimation(animation);
+            }
         }
         if (Build.VERSION.SDK_INT >= 14) {
             int videoviewFlag = (Build.VERSION.SDK_INT >= 16) ? View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION : 0;
@@ -347,6 +349,10 @@ public class VideoplayerActivity extends MediaplayerActivity {
         controls.setVisibility(View.GONE);
     }
 
+    private void hideVideoControls() {
+        hideVideoControls(true);
+    }
+
     @Override
     protected int getContentViewResourceId() {
         return R.layout.videoplayer_activity;
@@ -375,6 +381,8 @@ public class VideoplayerActivity extends MediaplayerActivity {
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == R.id.player_go_to_picture_in_picture) {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                getSupportActionBar().hide();
+                hideVideoControls(false);
                 enterPictureInPictureMode();
             }
             return true;
-- 
cgit v1.2.3


From fa93fbc16d856bbfce827b3519e3dba5f20352a4 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Tue, 9 Jan 2018 09:00:25 +0100
Subject: Removed v14 compatibility code

---
 .../antennapod/activity/VideoplayerActivity.java   | 30 ++++++++--------------
 1 file changed, 11 insertions(+), 19 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
index 4f28a789d..a755a4c2b 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
@@ -150,9 +150,7 @@ public class VideoplayerActivity extends MediaplayerActivity {
         if (Build.VERSION.SDK_INT >= 16) {
             videoview.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION);
         }
-        if (Build.VERSION.SDK_INT >= 14) {
-            videoOverlay.setFitsSystemWindows(true);
-        }
+        videoOverlay.setFitsSystemWindows(true);
 
         setupVideoControlsToggler();
         getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
@@ -325,9 +323,7 @@ public class VideoplayerActivity extends MediaplayerActivity {
             videoOverlay.startAnimation(animation);
             controls.startAnimation(animation);
         }
-        if (Build.VERSION.SDK_INT >= 14) {
-            videoview.setSystemUiVisibility(View.SYSTEM_UI_FLAG_VISIBLE);
-        }
+        videoview.setSystemUiVisibility(View.SYSTEM_UI_FLAG_VISIBLE);
     }
 
     @SuppressLint("NewApi")
@@ -339,12 +335,11 @@ public class VideoplayerActivity extends MediaplayerActivity {
                 controls.startAnimation(animation);
             }
         }
-        if (Build.VERSION.SDK_INT >= 14) {
-            int videoviewFlag = (Build.VERSION.SDK_INT >= 16) ? View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION : 0;
-            getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LOW_PROFILE | View.SYSTEM_UI_FLAG_FULLSCREEN
-                    | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION | videoviewFlag);
-            videoOverlay.setFitsSystemWindows(true);
-        }
+        int videoviewFlag = (Build.VERSION.SDK_INT >= 16) ? View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION : 0;
+        getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LOW_PROFILE | View.SYSTEM_UI_FLAG_FULLSCREEN
+                | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION | videoviewFlag);
+        videoOverlay.setFitsSystemWindows(true);
+
         videoOverlay.setVisibility(View.GONE);
         controls.setVisibility(View.GONE);
     }
@@ -394,13 +389,10 @@ public class VideoplayerActivity extends MediaplayerActivity {
     public void onConfigurationChanged(Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
 
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.HONEYCOMB_MR2) {
-            // This is only relevant for picture in picture
-            DisplayMetrics dm = getResources().getDisplayMetrics();
-            float px = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, newConfig.screenWidthDp, dm);
-            float py = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, newConfig.screenHeightDp, dm);
-            videoview.setAvailableSize(px, py);
-        }
+        DisplayMetrics dm = getResources().getDisplayMetrics();
+        float px = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, newConfig.screenWidthDp, dm);
+        float py = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, newConfig.screenHeightDp, dm);
+        videoview.setAvailableSize(px, py);
     }
 
     private static class VideoControlsHider extends Handler {
-- 
cgit v1.2.3


From 629ad7e8506c8b36fd8ad27c44ecf9a621d6a5c0 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Tue, 9 Jan 2018 09:18:17 +0100
Subject: Fixed black padding when returning from pip

onConfigurationChanged returned slightly wrong size
---
 .../danoeh/antennapod/activity/VideoplayerActivity.java   | 15 +++++++++------
 .../de/danoeh/antennapod/view/AspectRatioVideoView.java   |  1 +
 2 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
index a755a4c2b..9a0843f9e 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
@@ -17,9 +17,11 @@ import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.SurfaceHolder;
 import android.view.View;
+import android.view.ViewTreeObserver;
 import android.view.WindowManager;
 import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
+import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.SeekBar;
@@ -56,6 +58,7 @@ public class VideoplayerActivity extends MediaplayerActivity {
     private LinearLayout videoOverlay;
     private AspectRatioVideoView videoview;
     private ProgressBar progressIndicator;
+    private FrameLayout videoframe;
 
     @Override
     protected void chooseTheme() {
@@ -142,9 +145,10 @@ public class VideoplayerActivity extends MediaplayerActivity {
         controls = (LinearLayout) findViewById(R.id.controls);
         videoOverlay = (LinearLayout) findViewById(R.id.overlay);
         videoview = (AspectRatioVideoView) findViewById(R.id.videoview);
+        videoframe = (FrameLayout) findViewById(R.id.videoframe);
         progressIndicator = (ProgressBar) findViewById(R.id.progressIndicator);
         videoview.getHolder().addCallback(surfaceHolderCallback);
-        findViewById(R.id.videoframe).setOnTouchListener(onVideoviewTouched);
+        videoframe.setOnTouchListener(onVideoviewTouched);
         videoOverlay.setOnTouchListener((view, motionEvent) -> true); // To suppress touches directly below the slider
 
         if (Build.VERSION.SDK_INT >= 16) {
@@ -155,6 +159,9 @@ public class VideoplayerActivity extends MediaplayerActivity {
         setupVideoControlsToggler();
         getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
                 WindowManager.LayoutParams.FLAG_FULLSCREEN);
+
+        videoframe.getViewTreeObserver().addOnGlobalLayoutListener(() ->
+                videoview.setAvailableSize(videoframe.getWidth(), videoframe.getHeight()));
     }
 
     @Override
@@ -388,11 +395,7 @@ public class VideoplayerActivity extends MediaplayerActivity {
     @Override
     public void onConfigurationChanged(Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
-
-        DisplayMetrics dm = getResources().getDisplayMetrics();
-        float px = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, newConfig.screenWidthDp, dm);
-        float py = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, newConfig.screenHeightDp, dm);
-        videoview.setAvailableSize(px, py);
+        videoframe.requestLayout();
     }
 
     private static class VideoControlsHider extends Handler {
diff --git a/app/src/main/java/de/danoeh/antennapod/view/AspectRatioVideoView.java b/app/src/main/java/de/danoeh/antennapod/view/AspectRatioVideoView.java
index e9ec5491c..e79389fb3 100644
--- a/app/src/main/java/de/danoeh/antennapod/view/AspectRatioVideoView.java
+++ b/app/src/main/java/de/danoeh/antennapod/view/AspectRatioVideoView.java
@@ -109,6 +109,7 @@ public class AspectRatioVideoView extends VideoView {
     public void setAvailableSize(float width, float height) {
         mAvailableWidth = width;
         mAvailableHeight = height;
+        requestLayout();
     }
 
 }
-- 
cgit v1.2.3


From 12c0939792160a534b28b9f4fdf0ee7615c90edc Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Tue, 9 Jan 2018 17:33:56 +0100
Subject: Do not open full activity from PiP mode

---
 .../java/de/danoeh/antennapod/activity/VideoplayerActivity.java    | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
index 9a0843f9e..203c11e33 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
@@ -286,6 +286,13 @@ public class VideoplayerActivity extends MediaplayerActivity {
 
     @Override
     protected void onReloadNotification(int notificationCode) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && isInPictureInPictureMode()) {
+            if (notificationCode == PlaybackService.EXTRA_CODE_AUDIO
+                    || notificationCode == PlaybackService.EXTRA_CODE_CAST) {
+                finish();
+            }
+            return;
+        }
         if (notificationCode == PlaybackService.EXTRA_CODE_AUDIO) {
             Log.d(TAG, "ReloadNotification received, switching to Audioplayer now");
             destroyingDueToReload = true;
-- 
cgit v1.2.3


From 10f50ab264ae81862356b881a761c61562a69250 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Tue, 9 Jan 2018 18:16:30 +0100
Subject: Cleanup

---
 .../antennapod/activity/VideoplayerActivity.java    | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
index 203c11e33..90b4c72ea 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
@@ -2,22 +2,18 @@ package de.danoeh.antennapod.activity;
 
 import android.annotation.SuppressLint;
 import android.content.Intent;
-import android.content.res.Configuration;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.support.v4.view.WindowCompat;
-import android.util.DisplayMetrics;
 import android.util.Log;
 import android.util.Pair;
-import android.util.TypedValue;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.SurfaceHolder;
 import android.view.View;
-import android.view.ViewTreeObserver;
 import android.view.WindowManager;
 import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
@@ -25,10 +21,6 @@ import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.SeekBar;
-
-import java.lang.ref.WeakReference;
-import java.util.concurrent.atomic.AtomicBoolean;
-
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.core.feed.MediaType;
 import de.danoeh.antennapod.core.service.playback.PlaybackService;
@@ -37,6 +29,9 @@ import de.danoeh.antennapod.core.util.playback.ExternalMedia;
 import de.danoeh.antennapod.core.util.playback.Playable;
 import de.danoeh.antennapod.view.AspectRatioVideoView;
 
+import java.lang.ref.WeakReference;
+import java.util.concurrent.atomic.AtomicBoolean;
+
 /**
  * Activity for playing video files.
  */
@@ -137,7 +132,7 @@ public class VideoplayerActivity extends MediaplayerActivity {
 
     @Override
     protected void setupGUI() {
-        if(isSetup.getAndSet(true)) {
+        if (isSetup.getAndSet(true)) {
             return;
         }
         super.setupGUI();
@@ -399,12 +394,6 @@ public class VideoplayerActivity extends MediaplayerActivity {
         return super.onOptionsItemSelected(item);
     }
 
-    @Override
-    public void onConfigurationChanged(Configuration newConfig) {
-        super.onConfigurationChanged(newConfig);
-        videoframe.requestLayout();
-    }
-
     private static class VideoControlsHider extends Handler {
 
         private static final int DELAY = 2500;
@@ -417,7 +406,7 @@ public class VideoplayerActivity extends MediaplayerActivity {
 
         private final Runnable hideVideoControls = () -> {
             VideoplayerActivity vpa = activity.get();
-            if(vpa == null) {
+            if (vpa == null) {
                 return;
             }
             if (vpa.videoControlsShowing) {
-- 
cgit v1.2.3


From eaf007ecac75445bc501eb4d9c799ddf9ccf6036 Mon Sep 17 00:00:00 2001
From: Martin Fietz <martin.fietz@gmail.com>
Date: Tue, 9 Jan 2018 19:59:51 +0100
Subject: Replace ViewHelper

---
 .../de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java  | 9 ++++-----
 .../danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java | 5 ++---
 .../java/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java   | 8 +++-----
 .../java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java  | 5 ++---
 .../java/de/danoeh/antennapod/adapter/SearchlistAdapter.java     | 3 +--
 5 files changed, 12 insertions(+), 18 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java
index f12c8285a..6611cd35a 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java
@@ -21,7 +21,6 @@ import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
 import com.joanzapata.iconify.Iconify;
-import com.nineoldandroids.view.ViewHelper;
 
 import java.lang.ref.WeakReference;
 
@@ -129,9 +128,9 @@ public class AllEpisodesRecycleAdapter extends RecyclerView.Adapter<AllEpisodesR
             holder.statusUnread.setVisibility(View.VISIBLE);
         }
         if(item.isPlayed()) {
-            ViewHelper.setAlpha(holder.content, 0.5f);
+            holder.content.setAlpha(0.5f);
         } else {
-            ViewHelper.setAlpha(holder.content, 1.0f);
+            holder.content.setAlpha(1.0f);
         }
 
         FeedMedia media = item.getMedia();
@@ -272,12 +271,12 @@ public class AllEpisodesRecycleAdapter extends RecyclerView.Adapter<AllEpisodesR
 
         @Override
         public void onItemSelected() {
-            ViewHelper.setAlpha(itemView, 0.5f);
+            itemView.setAlpha(0.5f);
         }
 
         @Override
         public void onItemClear() {
-            ViewHelper.setAlpha(itemView, 1.0f);
+            itemView.setAlpha(1.0f);
         }
 
         public FeedItem getFeedItem() { return item; }
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java
index 6907e467b..807a32d8a 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java
@@ -12,7 +12,6 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
-import com.nineoldandroids.view.ViewHelper;
 
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.core.feed.FeedItem;
@@ -87,9 +86,9 @@ public class DownloadedEpisodesListAdapter extends BaseAdapter {
                 .into(holder.imageView);
 
         if(item.isPlayed()) {
-            ViewHelper.setAlpha(convertView, 0.5f);
+            convertView.setAlpha(0.5f);
         } else {
-            ViewHelper.setAlpha(convertView, 1.0f);
+            convertView.setAlpha(1.0f);
         }
 
         holder.title.setText(item.getTitle());
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java
index f843ddb94..71d162645 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java
@@ -17,8 +17,6 @@ import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
-import com.nineoldandroids.view.ViewHelper;
-
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.core.feed.FeedItem;
 import de.danoeh.antennapod.core.feed.FeedMedia;
@@ -43,7 +41,7 @@ public class FeedItemlistAdapter extends BaseAdapter {
     private boolean makePlayedItemsTransparent;
     private final ActionButtonUtils actionButtonUtils;
 
-    public static final int SELECTION_NONE = -1;
+    private static final int SELECTION_NONE = -1;
 
     private final int playingBackGroundColor;
     private final int normalBackGroundColor;
@@ -145,9 +143,9 @@ public class FeedItemlistAdapter extends BaseAdapter {
                 holder.statusUnread.setVisibility(View.INVISIBLE);
             }
             if(item.isPlayed() && makePlayedItemsTransparent) {
-                ViewHelper.setAlpha(convertView, 0.5f);
+                convertView.setAlpha(0.5f);
             } else {
-                ViewHelper.setAlpha(convertView, 1.0f);
+                convertView.setAlpha(1.0f);
             }
 
             String pubDateStr = DateUtils.formatAbbrev(context, item.getPubDate());
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java
index 2684dcccd..8eebc919a 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java
@@ -24,7 +24,6 @@ import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
 import com.joanzapata.iconify.Iconify;
-import com.nineoldandroids.view.ViewHelper;
 
 import org.apache.commons.lang3.ArrayUtils;
 
@@ -198,12 +197,12 @@ public class QueueRecyclerAdapter extends RecyclerView.Adapter<QueueRecyclerAdap
 
         @Override
         public void onItemSelected() {
-            ViewHelper.setAlpha(itemView, 0.5f);
+            itemView.setAlpha(0.5f);
         }
 
         @Override
         public void onItemClear() {
-            ViewHelper.setAlpha(itemView, 1.0f);
+            itemView.setAlpha(1.0f);
         }
 
         public void bind(FeedItem item) {
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/SearchlistAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/SearchlistAdapter.java
index 8e1aa24e0..beb62b3bb 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/SearchlistAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/SearchlistAdapter.java
@@ -11,7 +11,6 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
-import com.nineoldandroids.view.ViewHelper;
 
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.core.feed.Feed;
@@ -97,7 +96,7 @@ public class SearchlistAdapter extends BaseAdapter {
                 holder.subtitle.setText(result.getSubtitle());
             }
 
-            ViewHelper.setAlpha(convertView, item.isPlayed() ? 0.5f : 1.0f);
+            convertView.setAlpha(item.isPlayed() ? 0.5f : 1.0f);
 
             Glide.with(context)
                     .load(item.getFeed().getImageLocation())
-- 
cgit v1.2.3


From 59a1b4a2bb72e747cb86fc5fb6bb3c9a9811bb0b Mon Sep 17 00:00:00 2001
From: Martin Fietz <martin.fietz@gmail.com>
Date: Tue, 9 Jan 2018 20:13:14 +0100
Subject: Cleanup executeAsync

---
 .../activity/gpoddernet/GpodnetAuthenticationActivity.java         | 6 +-----
 .../main/java/de/danoeh/antennapod/asynctask/OpmlFeedQueuer.java   | 7 +------
 .../main/java/de/danoeh/antennapod/asynctask/OpmlImportWorker.java | 7 +------
 .../de/danoeh/antennapod/fragment/gpodnet/PodcastListFragment.java | 6 +-----
 .../de/danoeh/antennapod/fragment/gpodnet/TagListFragment.java     | 6 +-----
 5 files changed, 5 insertions(+), 27 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/gpoddernet/GpodnetAuthenticationActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/gpoddernet/GpodnetAuthenticationActivity.java
index 8ede947c5..31d0fb1a3 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/gpoddernet/GpodnetAuthenticationActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/gpoddernet/GpodnetAuthenticationActivity.java
@@ -171,11 +171,7 @@ public class GpodnetAuthenticationActivity extends AppCompatActivity {
                         return null;
                     }
                 };
-                if (android.os.Build.VERSION.SDK_INT > android.os.Build.VERSION_CODES.GINGERBREAD_MR1) {
-                    authTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, service);
-                } else {
-                    authTask.execute();
-                }
+                authTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, service);
             }
         });
     }
diff --git a/app/src/main/java/de/danoeh/antennapod/asynctask/OpmlFeedQueuer.java b/app/src/main/java/de/danoeh/antennapod/asynctask/OpmlFeedQueuer.java
index 4449d82c2..fcd5cff00 100644
--- a/app/src/main/java/de/danoeh/antennapod/asynctask/OpmlFeedQueuer.java
+++ b/app/src/main/java/de/danoeh/antennapod/asynctask/OpmlFeedQueuer.java
@@ -56,13 +56,8 @@ public class OpmlFeedQueuer extends AsyncTask<Void, Void, Void> {
 		return null;
 	}
 
-	@SuppressLint("NewApi")
 	public void executeAsync() {
-		if (android.os.Build.VERSION.SDK_INT > android.os.Build.VERSION_CODES.GINGERBREAD_MR1) {
-			executeOnExecutor(THREAD_POOL_EXECUTOR);
-		} else {
-			execute();
-		}
+		executeOnExecutor(THREAD_POOL_EXECUTOR);
 	}
 
 }
diff --git a/app/src/main/java/de/danoeh/antennapod/asynctask/OpmlImportWorker.java b/app/src/main/java/de/danoeh/antennapod/asynctask/OpmlImportWorker.java
index 62ea85811..88bd35b7c 100644
--- a/app/src/main/java/de/danoeh/antennapod/asynctask/OpmlImportWorker.java
+++ b/app/src/main/java/de/danoeh/antennapod/asynctask/OpmlImportWorker.java
@@ -93,13 +93,8 @@ public class OpmlImportWorker extends
 		return exception != null;
 	}
 	
-	@SuppressLint("NewApi")
 	public void executeAsync() {
-		if (android.os.Build.VERSION.SDK_INT > android.os.Build.VERSION_CODES.GINGERBREAD_MR1) {
-			executeOnExecutor(THREAD_POOL_EXECUTOR);
-		} else {
-			execute();
-		}
+		executeOnExecutor(THREAD_POOL_EXECUTOR);
 	}
 
 }
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/PodcastListFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/PodcastListFragment.java
index 15e9c9943..a54c90862 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/PodcastListFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/PodcastListFragment.java
@@ -160,10 +160,6 @@ public abstract class PodcastListFragment extends Fragment {
             }
         };
 
-        if (android.os.Build.VERSION.SDK_INT > android.os.Build.VERSION_CODES.GINGERBREAD_MR1) {
-            loaderTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
-        } else {
-            loaderTask.execute();
-        }
+        loaderTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
     }
 }
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/TagListFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/TagListFragment.java
index d2c7f32dd..1e46b1ac5 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/TagListFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/TagListFragment.java
@@ -135,11 +135,7 @@ public class TagListFragment extends ListFragment {
                 }
             }
         };
-        if (android.os.Build.VERSION.SDK_INT > android.os.Build.VERSION_CODES.GINGERBREAD_MR1) {
-            loadTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
-        } else {
-            loadTask.execute();
-        }
+        loadTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
     }
 }
 
-- 
cgit v1.2.3


From 1694432560a7cd24201257461eda1adf3fb0873f Mon Sep 17 00:00:00 2001
From: Martin Fietz <martin.fietz@gmail.com>
Date: Tue, 9 Jan 2018 20:19:38 +0100
Subject: Delete PreferenceActivityGingerbread

---
 .../antennapod/activity/FlattrAuthActivity.java    |  3 +-
 .../danoeh/antennapod/activity/MainActivity.java   |  3 +-
 .../activity/MediaplayerInfoActivity.java          |  3 +-
 .../activity/PreferenceActivityGingerbread.java    | 97 ----------------------
 .../preferences/PreferenceController.java          | 27 +-----
 5 files changed, 7 insertions(+), 126 deletions(-)
 delete mode 100644 app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivityGingerbread.java

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/FlattrAuthActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/FlattrAuthActivity.java
index be1c9f9e6..d9c250b38 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/FlattrAuthActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/FlattrAuthActivity.java
@@ -18,7 +18,6 @@ import de.danoeh.antennapod.BuildConfig;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.core.util.flattr.FlattrUtils;
-import de.danoeh.antennapod.preferences.PreferenceController;
 
 /** Guides the user through the authentication process */
 
@@ -104,7 +103,7 @@ public class FlattrAuthActivity extends ActionBarActivity {
 		switch (item.getItemId()) {
 		case android.R.id.home:
 			if (authSuccessful) {
-				Intent intent = new Intent(this, PreferenceController.getPreferenceActivity());
+				Intent intent = new Intent(this, PreferenceActivity.class);
 				intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
 				startActivity(intent);
 			} else {
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
index f0fcdca90..9949c01a0 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
@@ -64,7 +64,6 @@ import de.danoeh.antennapod.fragment.PlaybackHistoryFragment;
 import de.danoeh.antennapod.fragment.QueueFragment;
 import de.danoeh.antennapod.fragment.SubscriptionFragment;
 import de.danoeh.antennapod.menuhandler.NavDrawerActivity;
-import de.danoeh.antennapod.preferences.PreferenceController;
 import de.greenrobot.event.EventBus;
 import rx.Observable;
 import rx.Subscription;
@@ -173,7 +172,7 @@ public class MainActivity extends CastEnabledActivity implements NavDrawerActivi
 
         findViewById(R.id.nav_settings).setOnClickListener(v -> {
             drawerLayout.closeDrawer(navDrawer);
-            startActivity(new Intent(MainActivity.this, PreferenceController.getPreferenceActivity()));
+            startActivity(new Intent(MainActivity.this, PreferenceActivity.class));
         });
 
         FragmentTransaction transaction = fm.beginTransaction();
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerInfoActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerInfoActivity.java
index cc7d83e0c..3b1427f1b 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerInfoActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerInfoActivity.java
@@ -61,7 +61,6 @@ import de.danoeh.antennapod.fragment.PlaybackHistoryFragment;
 import de.danoeh.antennapod.fragment.QueueFragment;
 import de.danoeh.antennapod.fragment.SubscriptionFragment;
 import de.danoeh.antennapod.menuhandler.NavDrawerActivity;
-import de.danoeh.antennapod.preferences.PreferenceController;
 import de.greenrobot.event.EventBus;
 import rx.Observable;
 import rx.Subscription;
@@ -270,7 +269,7 @@ public abstract class MediaplayerInfoActivity extends MediaplayerActivity implem
 
         findViewById(R.id.nav_settings).setOnClickListener(v -> {
             drawerLayout.closeDrawer(navDrawer);
-            startActivity(new Intent(MediaplayerInfoActivity.this, PreferenceController.getPreferenceActivity()));
+            startActivity(new Intent(MediaplayerInfoActivity.this, PreferenceActivity.class));
         });
 
         butPlaybackSpeed = (Button) findViewById(R.id.butPlaybackSpeed);
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivityGingerbread.java b/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivityGingerbread.java
deleted file mode 100644
index 390bec15c..000000000
--- a/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivityGingerbread.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package de.danoeh.antennapod.activity;
-
-import android.annotation.SuppressLint;
-import android.app.Activity;
-import android.content.Intent;
-import android.content.res.Resources.Theme;
-import android.os.Bundle;
-import android.preference.Preference;
-import android.preference.PreferenceScreen;
-
-import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.core.preferences.UserPreferences;
-import de.danoeh.antennapod.preferences.PreferenceController;
-
-/**
- * PreferenceActivity for API 10. In order to change the behavior of the preference UI, see
- * PreferenceController.
- */
-public class PreferenceActivityGingerbread extends android.preference.PreferenceActivity {
-    private static final String TAG = "PreferenceActivity";
-    private final PreferenceController.PreferenceUI preferenceUI = new PreferenceController.PreferenceUI() {
-
-        @SuppressWarnings("deprecation")
-        @Override
-        public Preference findPreference(CharSequence key) {
-            return PreferenceActivityGingerbread.this.findPreference(key);
-        }
-
-        @Override
-        public Activity getActivity() {
-            return PreferenceActivityGingerbread.this;
-        }
-    };
-    private PreferenceController preferenceController;
-
-    @SuppressLint("NewApi")
-    @SuppressWarnings("deprecation")
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        setTheme(UserPreferences.getTheme());
-        super.onCreate(savedInstanceState);
-
-        addPreferencesFromResource(R.xml.preferences);
-        preferenceController = new PreferenceController(preferenceUI);
-        preferenceController.onCreate();
-    }
-
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        preferenceController.onResume();
-    }
-
-    @Override
-    protected void onPause() {
-        preferenceController.onPause();
-        super.onPause();
-    }
-
-    @Override
-    protected void onStop() {
-        preferenceController.onStop();
-        super.onStop();
-    }
-
-    @Override
-    protected void onApplyThemeResource(Theme theme, int resid, boolean first) {
-        theme.applyStyle(UserPreferences.getTheme(), true);
-    }
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        preferenceController.onActivityResult(requestCode, resultCode, data);
-    }
-
-    @SuppressWarnings("deprecation")
-    @Override
-    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen,
-                                         Preference preference) {
-        super.onPreferenceTreeClick(preferenceScreen, preference);
-        if (preference != null)
-            if (preference instanceof PreferenceScreen)
-                if (((PreferenceScreen) preference).getDialog() != null)
-                    ((PreferenceScreen) preference)
-                            .getDialog()
-                            .getWindow()
-                            .getDecorView()
-                            .setBackgroundDrawable(
-                                    this.getWindow().getDecorView()
-                                            .getBackground().getConstantState()
-                                            .newDrawable()
-                            );
-        return false;
-    }
-}
diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
index 3b5a68f7f..c4e58f652 100644
--- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
+++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
@@ -56,8 +56,6 @@ import de.danoeh.antennapod.activity.AboutActivity;
 import de.danoeh.antennapod.activity.DirectoryChooserActivity;
 import de.danoeh.antennapod.activity.MainActivity;
 import de.danoeh.antennapod.activity.MediaplayerActivity;
-import de.danoeh.antennapod.activity.PreferenceActivity;
-import de.danoeh.antennapod.activity.PreferenceActivityGingerbread;
 import de.danoeh.antennapod.activity.StatisticsActivity;
 import de.danoeh.antennapod.asynctask.ExportWorker;
 import de.danoeh.antennapod.core.export.ExportWriter;
@@ -97,8 +95,8 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
     private static final String PREF_CHOOSE_DATA_DIR = "prefChooseDataDir";
     private static final String AUTO_DL_PREF_SCREEN = "prefAutoDownloadSettings";
     private static final String PREF_PLAYBACK_SPEED_LAUNCHER = "prefPlaybackSpeedLauncher";
-    public static final String PREF_PLAYBACK_REWIND_DELTA_LAUNCHER = "prefPlaybackRewindDeltaLauncher";
-    public static final String PREF_PLAYBACK_FAST_FORWARD_DELTA_LAUNCHER = "prefPlaybackFastForwardDeltaLauncher";
+    private static final String PREF_PLAYBACK_REWIND_DELTA_LAUNCHER = "prefPlaybackRewindDeltaLauncher";
+    private static final String PREF_PLAYBACK_FAST_FORWARD_DELTA_LAUNCHER = "prefPlaybackFastForwardDeltaLauncher";
     private static final String PREF_GPODNET_LOGIN = "pref_gpodnet_authenticate";
     private static final String PREF_GPODNET_SETLOGIN_INFORMATION = "pref_gpodnet_setlogin_information";
     private static final String PREF_GPODNET_SYNC = "pref_gpodnet_sync";
@@ -132,19 +130,6 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
             .registerOnSharedPreferenceChangeListener(this);
     }
 
-    /**
-     * Returns the preference activity that should be used on this device.
-     *
-     * @return PreferenceActivity if the API level is greater than 10, PreferenceActivityGingerbread otherwise.
-     */
-    public static Class<? extends Activity> getPreferenceActivity() {
-        if (Build.VERSION.SDK_INT > 10) {
-            return PreferenceActivity.class;
-        } else {
-            return PreferenceActivityGingerbread.class;
-        }
-    }
-
     @Override
     public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
         if(key.equals(UserPreferences.PREF_SONIC)) {
@@ -230,12 +215,8 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
                 .setOnPreferenceChangeListener(
                         (preference, newValue) -> {
                             Intent i = new Intent(activity, MainActivity.class);
-                            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
-                                i.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK
-                                        | Intent.FLAG_ACTIVITY_NEW_TASK);
-                            } else {
-                                i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                            }
+                            i.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK
+                                    | Intent.FLAG_ACTIVITY_NEW_TASK);
                             activity.finish();
                             activity.startActivity(i);
                             return true;
-- 
cgit v1.2.3


From 7e0a958f8aa762d86b3dac33d1994898358481ad Mon Sep 17 00:00:00 2001
From: Martin Fietz <martin.fietz@gmail.com>
Date: Tue, 9 Jan 2018 20:20:18 +0100
Subject: Use guard clause

---
 .../preferences/PreferenceController.java          | 104 ++++++++++-----------
 1 file changed, 52 insertions(+), 52 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
index c4e58f652..1ac9de989 100644
--- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
+++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
@@ -767,61 +767,61 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
         WifiManager wifiservice = (WifiManager) activity.getApplicationContext().getSystemService(Context.WIFI_SERVICE);
         List<WifiConfiguration> networks = wifiservice.getConfiguredNetworks();
 
-        if (networks != null) {
-            Collections.sort(networks, new Comparator<WifiConfiguration>() {
-                @Override
-                public int compare(WifiConfiguration x, WifiConfiguration y) {
-                    return x.SSID.compareTo(y.SSID);
+        if (networks == null) {
+            Log.e(TAG, "Couldn't get list of configure Wi-Fi networks");
+            return;
+        }
+        Collections.sort(networks, new Comparator<WifiConfiguration>() {
+            @Override
+            public int compare(WifiConfiguration x, WifiConfiguration y) {
+                return x.SSID.compareTo(y.SSID);
+            }
+        });
+        selectedNetworks = new CheckBoxPreference[networks.size()];
+        List<String> prefValues = Arrays.asList(UserPreferences
+                .getAutodownloadSelectedNetworks());
+        PreferenceScreen prefScreen = (PreferenceScreen) ui.findPreference(PreferenceController.AUTO_DL_PREF_SCREEN);
+        Preference.OnPreferenceClickListener clickListener = preference -> {
+            if (preference instanceof CheckBoxPreference) {
+                String key = preference.getKey();
+                List<String> prefValuesList = new ArrayList<>(
+                        Arrays.asList(UserPreferences
+                                .getAutodownloadSelectedNetworks())
+                );
+                boolean newValue = ((CheckBoxPreference) preference)
+                        .isChecked();
+                Log.d(TAG, "Selected network " + key + ". New state: " + newValue);
+
+                int index = prefValuesList.indexOf(key);
+                if (index >= 0 && !newValue) {
+                    // remove network
+                    prefValuesList.remove(index);
+                } else if (index < 0 && newValue) {
+                    prefValuesList.add(key);
                 }
-            });
-            selectedNetworks = new CheckBoxPreference[networks.size()];
-            List<String> prefValues = Arrays.asList(UserPreferences
-                    .getAutodownloadSelectedNetworks());
-            PreferenceScreen prefScreen = (PreferenceScreen) ui.findPreference(PreferenceController.AUTO_DL_PREF_SCREEN);
-            Preference.OnPreferenceClickListener clickListener = preference -> {
-                if (preference instanceof CheckBoxPreference) {
-                    String key = preference.getKey();
-                    List<String> prefValuesList = new ArrayList<>(
-                            Arrays.asList(UserPreferences
-                                    .getAutodownloadSelectedNetworks())
-                    );
-                    boolean newValue = ((CheckBoxPreference) preference)
-                            .isChecked();
-                    Log.d(TAG, "Selected network " + key + ". New state: " + newValue);
-
-                    int index = prefValuesList.indexOf(key);
-                    if (index >= 0 && !newValue) {
-                        // remove network
-                        prefValuesList.remove(index);
-                    } else if (index < 0 && newValue) {
-                        prefValuesList.add(key);
-                    }
 
-                    UserPreferences.setAutodownloadSelectedNetworks(
-                            prefValuesList.toArray(new String[prefValuesList.size()])
-                    );
-                    return true;
-                } else {
-                    return false;
-                }
-            };
-            // create preference for each known network. attach listener and set
-            // value
-            for (int i = 0; i < networks.size(); i++) {
-                WifiConfiguration config = networks.get(i);
-
-                CheckBoxPreference pref = new CheckBoxPreference(activity);
-                String key = Integer.toString(config.networkId);
-                pref.setTitle(config.SSID);
-                pref.setKey(key);
-                pref.setOnPreferenceClickListener(clickListener);
-                pref.setPersistent(false);
-                pref.setChecked(prefValues.contains(key));
-                selectedNetworks[i] = pref;
-                prefScreen.addPreference(pref);
+                UserPreferences.setAutodownloadSelectedNetworks(
+                        prefValuesList.toArray(new String[prefValuesList.size()])
+                );
+                return true;
+            } else {
+                return false;
             }
-        } else {
-            Log.e(TAG, "Couldn't get list of configure Wi-Fi networks");
+        };
+        // create preference for each known network. attach listener and set
+        // value
+        for (int i = 0; i < networks.size(); i++) {
+            WifiConfiguration config = networks.get(i);
+
+            CheckBoxPreference pref = new CheckBoxPreference(activity);
+            String key = Integer.toString(config.networkId);
+            pref.setTitle(config.SSID);
+            pref.setKey(key);
+            pref.setOnPreferenceClickListener(clickListener);
+            pref.setPersistent(false);
+            pref.setChecked(prefValues.contains(key));
+            selectedNetworks[i] = pref;
+            prefScreen.addPreference(pref);
         }
     }
 
-- 
cgit v1.2.3


From df131cdd0d3688766298554cffdb6890777c60d5 Mon Sep 17 00:00:00 2001
From: Martin Fietz <martin.fietz@gmail.com>
Date: Tue, 9 Jan 2018 20:20:32 +0100
Subject: Replace with lambda

---
 .../de/danoeh/antennapod/preferences/PreferenceController.java     | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
index 1ac9de989..a7e7e8714 100644
--- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
+++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
@@ -771,12 +771,7 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
             Log.e(TAG, "Couldn't get list of configure Wi-Fi networks");
             return;
         }
-        Collections.sort(networks, new Comparator<WifiConfiguration>() {
-            @Override
-            public int compare(WifiConfiguration x, WifiConfiguration y) {
-                return x.SSID.compareTo(y.SSID);
-            }
-        });
+        Collections.sort(networks, (x, y) -> x.SSID.compareTo(y.SSID));
         selectedNetworks = new CheckBoxPreference[networks.size()];
         List<String> prefValues = Arrays.asList(UserPreferences
                 .getAutodownloadSelectedNetworks());
-- 
cgit v1.2.3


From fe8993803d174e03df72bd44e8aef20d49828286 Mon Sep 17 00:00:00 2001
From: Martin Fietz <martin.fietz@gmail.com>
Date: Tue, 9 Jan 2018 20:21:57 +0100
Subject: Replace lambda with method reference

---
 .../java/de/danoeh/antennapod/preferences/PreferenceController.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
index a7e7e8714..58c7f39a1 100644
--- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
+++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
@@ -494,7 +494,7 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
                     alert.setTitle(R.string.export_error_label);
                     alert.setMessage(error.getMessage());
                     alert.show();
-                }, () -> progressDialog.dismiss());
+                }, progressDialog::dismiss);
         return true;
     }
 
-- 
cgit v1.2.3


From 89366d97d18ac1132fabb6909cd46bcfa7a6e5ae Mon Sep 17 00:00:00 2001
From: Martin Fietz <martin.fietz@gmail.com>
Date: Tue, 9 Jan 2018 21:03:30 +0100
Subject: Replace code for SDK version lower than 14

---
 .../main/java/de/danoeh/antennapod/PodcastApp.java   |  6 ++----
 .../danoeh/antennapod/activity/FeedInfoActivity.java | 14 ++++----------
 .../antennapod/fragment/ItemDescriptionFragment.java | 20 ++++++--------------
 .../de/danoeh/antennapod/fragment/ItemFragment.java  | 19 ++++++-------------
 .../danoeh/antennapod/fragment/ItemlistFragment.java | 10 ----------
 .../antennapod/preferences/PreferenceController.java |  8 ++------
 6 files changed, 20 insertions(+), 57 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/PodcastApp.java b/app/src/main/java/de/danoeh/antennapod/PodcastApp.java
index f6a8db5fb..3abf7557a 100644
--- a/app/src/main/java/de/danoeh/antennapod/PodcastApp.java
+++ b/app/src/main/java/de/danoeh/antennapod/PodcastApp.java
@@ -41,10 +41,8 @@ public class PodcastApp extends Application {
 				.detectLeakedSqlLiteObjects()
 				.penaltyLog()
 				.penaltyDropBox();
-			if (Build.VERSION.SDK_INT >= 11) {
-				builder.detectActivityLeaks();
-				builder.detectLeakedClosableObjects();
-			}
+			builder.detectActivityLeaks();
+			builder.detectLeakedClosableObjects();
 			if(Build.VERSION.SDK_INT >= 16) {
 				builder.detectLeakedRegistrationObjects();
 			}
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/FeedInfoActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/FeedInfoActivity.java
index 2a58d5104..21951dc0e 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/FeedInfoActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/FeedInfoActivity.java
@@ -88,16 +88,10 @@ public class FeedInfoActivity extends AppCompatActivity {
         public void onClick(View v) {
             if(feed != null && feed.getDownload_url() != null) {
                 String url = feed.getDownload_url();
-                if (android.os.Build.VERSION.SDK_INT >= 11) {
-                    ClipData clipData = ClipData.newPlainText(url, url);
-                    android.content.ClipboardManager cm = (android.content.ClipboardManager) FeedInfoActivity.this
-                            .getSystemService(Context.CLIPBOARD_SERVICE);
-                    cm.setPrimaryClip(clipData);
-                } else {
-                    android.text.ClipboardManager cm = (android.text.ClipboardManager) FeedInfoActivity.this
-                            .getSystemService(Context.CLIPBOARD_SERVICE);
-                    cm.setText(url);
-                }
+                ClipData clipData = ClipData.newPlainText(url, url);
+                android.content.ClipboardManager cm = (android.content.ClipboardManager) FeedInfoActivity.this
+                        .getSystemService(Context.CLIPBOARD_SERVICE);
+                cm.setPrimaryClip(clipData);
                 Toast t = Toast.makeText(FeedInfoActivity.this, R.string.copied_url_msg, Toast.LENGTH_SHORT);
                 t.show();
             }
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java
index a0586fe16..f6bdfddda 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java
@@ -112,9 +112,7 @@ public class ItemDescriptionFragment extends Fragment implements MediaplayerInfo
                              Bundle savedInstanceState) {
         Log.d(TAG, "Creating view");
         webvDescription = new WebView(getActivity().getApplicationContext());
-        if (Build.VERSION.SDK_INT >= 11) {
-            webvDescription.setLayerType(View.LAYER_TYPE_SOFTWARE, null);
-        }
+        webvDescription.setLayerType(View.LAYER_TYPE_SOFTWARE, null);
         TypedArray ta = getActivity().getTheme().obtainStyledAttributes(new int[]
                 {android.R.attr.colorBackground});
         int backgroundColor = ta.getColor(0, UserPreferences.getTheme() ==
@@ -238,17 +236,11 @@ public class ItemDescriptionFragment extends Fragment implements MediaplayerInfo
                     ShareUtils.shareLink(getActivity(), selectedURL);
                     break;
                 case R.id.copy_url_item:
-                    if (android.os.Build.VERSION.SDK_INT >= 11) {
-                        ClipData clipData = ClipData.newPlainText(selectedURL,
-                                selectedURL);
-                        android.content.ClipboardManager cm = (android.content.ClipboardManager) getActivity()
-                                .getSystemService(Context.CLIPBOARD_SERVICE);
-                        cm.setPrimaryClip(clipData);
-                    } else {
-                        android.text.ClipboardManager cm = (android.text.ClipboardManager) getActivity()
-                                .getSystemService(Context.CLIPBOARD_SERVICE);
-                        cm.setText(selectedURL);
-                    }
+                    ClipData clipData = ClipData.newPlainText(selectedURL,
+                            selectedURL);
+                    android.content.ClipboardManager cm = (android.content.ClipboardManager) getActivity()
+                            .getSystemService(Context.CLIPBOARD_SERVICE);
+                    cm.setPrimaryClip(clipData);
                     Toast t = Toast.makeText(getActivity(),
                             R.string.copied_url_msg, Toast.LENGTH_SHORT);
                     t.show();
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 7939dcb23..da7fc5299 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
@@ -184,8 +184,7 @@ public class ItemFragment extends Fragment implements OnSwipeGesture {
         }
         webvDescription = (WebView) layout.findViewById(R.id.webvDescription);
         if (UserPreferences.getTheme() == R.style.Theme_AntennaPod_Dark) {
-            if (Build.VERSION.SDK_INT >= 11
-                && Build.VERSION.SDK_INT <= Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1) {
+            if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1) {
                 webvDescription.setLayerType(View.LAYER_TYPE_SOFTWARE, null);
             }
             webvDescription.setBackgroundColor(ContextCompat.getColor(getContext(), R.color.black));
@@ -483,17 +482,11 @@ public class ItemFragment extends Fragment implements OnSwipeGesture {
                     ShareUtils.shareLink(getActivity(), selectedURL);
                     break;
                 case R.id.copy_url_item:
-                    if (android.os.Build.VERSION.SDK_INT >= 11) {
-                        ClipData clipData = ClipData.newPlainText(selectedURL,
-                                selectedURL);
-                        android.content.ClipboardManager cm = (android.content.ClipboardManager) getActivity()
-                                .getSystemService(Context.CLIPBOARD_SERVICE);
-                        cm.setPrimaryClip(clipData);
-                    } else {
-                        android.text.ClipboardManager cm = (android.text.ClipboardManager) getActivity()
-                                .getSystemService(Context.CLIPBOARD_SERVICE);
-                        cm.setText(selectedURL);
-                    }
+                    ClipData clipData = ClipData.newPlainText(selectedURL,
+                            selectedURL);
+                    android.content.ClipboardManager cm = (android.content.ClipboardManager) getActivity()
+                            .getSystemService(Context.CLIPBOARD_SERVICE);
+                    cm.setPrimaryClip(clipData);
                     Toast t = Toast.makeText(getActivity(),
                             R.string.copied_url_msg, Toast.LENGTH_SHORT);
                     t.show();
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java
index a118673a6..d819e68d2 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java
@@ -350,16 +350,6 @@ public class ItemlistFragment extends ListFragment {
         }
     }
 
-
-    @Override
-    public void setListAdapter(ListAdapter adapter) {
-        // This workaround prevents the ListFragment from setting a list adapter when its state is restored.
-        // This is only necessary on API 10 because addFooterView throws an internal exception in this case.
-        if (Build.VERSION.SDK_INT > 10 || insideOnFragmentLoaded) {
-            super.setListAdapter(adapter);
-        }
-    }
-
     @Override
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
index 3b5a68f7f..4f47ff137 100644
--- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
+++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
@@ -230,12 +230,8 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
                 .setOnPreferenceChangeListener(
                         (preference, newValue) -> {
                             Intent i = new Intent(activity, MainActivity.class);
-                            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
-                                i.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK
-                                        | Intent.FLAG_ACTIVITY_NEW_TASK);
-                            } else {
-                                i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                            }
+                            i.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK
+                                    | Intent.FLAG_ACTIVITY_NEW_TASK);
                             activity.finish();
                             activity.startActivity(i);
                             return true;
-- 
cgit v1.2.3


From f756cd84d11b0c83e3393a7bba5b3d8fc05e3ef5 Mon Sep 17 00:00:00 2001
From: Martin Fietz <martin.fietz@gmail.com>
Date: Tue, 9 Jan 2018 21:06:13 +0100
Subject: Remove unnecessary annotations

---
 .../main/java/de/danoeh/antennapod/activity/PreferenceActivity.java  | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java
index dd932814f..12d918a76 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java
@@ -1,9 +1,7 @@
 package de.danoeh.antennapod.activity;
 
-import android.annotation.TargetApi;
 import android.app.Activity;
 import android.content.Intent;
-import android.os.Build;
 import android.os.Bundle;
 import android.preference.Preference;
 import android.preference.PreferenceFragment;
@@ -30,7 +28,6 @@ public class PreferenceActivity extends AppCompatActivity {
     private PreferenceController preferenceController;
     private MainFragment prefFragment;
     private final PreferenceController.PreferenceUI preferenceUI = new PreferenceController.PreferenceUI() {
-        @TargetApi(Build.VERSION_CODES.HONEYCOMB)
         @Override
         public Preference findPreference(CharSequence key) {
             return prefFragment.findPreference(key);
@@ -42,7 +39,6 @@ public class PreferenceActivity extends AppCompatActivity {
         }
     };
 
-    @TargetApi(Build.VERSION_CODES.HONEYCOMB)
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         // This must be the FIRST thing we do, otherwise other code may not have the
@@ -95,7 +91,6 @@ public class PreferenceActivity extends AppCompatActivity {
         }
     }
 
-    @TargetApi(Build.VERSION_CODES.HONEYCOMB)
     public static class MainFragment extends PreferenceFragment {
 
         @Override
-- 
cgit v1.2.3


From 2831ec69d900d9ef28e736f748c16f3aa3501c22 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Wed, 10 Jan 2018 21:02:40 +0100
Subject: Fixed strange behavior when re-launching from PiP

---
 .../de/danoeh/antennapod/config/PlaybackServiceCallbacksImpl.java  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/config/PlaybackServiceCallbacksImpl.java b/app/src/main/java/de/danoeh/antennapod/config/PlaybackServiceCallbacksImpl.java
index 1ab60ef61..83dd3fe9c 100644
--- a/app/src/main/java/de/danoeh/antennapod/config/PlaybackServiceCallbacksImpl.java
+++ b/app/src/main/java/de/danoeh/antennapod/config/PlaybackServiceCallbacksImpl.java
@@ -3,6 +3,7 @@ package de.danoeh.antennapod.config;
 import android.content.Context;
 import android.content.Intent;
 
+import android.os.Build;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.activity.AudioplayerActivity;
 import de.danoeh.antennapod.activity.CastplayerActivity;
@@ -18,7 +19,11 @@ public class PlaybackServiceCallbacksImpl implements PlaybackServiceCallbacks {
             return new Intent(context, CastplayerActivity.class);
         }
         if (mediaType == MediaType.VIDEO) {
-            return new Intent(context, VideoplayerActivity.class);
+            Intent i = new Intent(context, VideoplayerActivity.class);
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                i.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
+            }
+            return i;
         } else {
             return new Intent(context, AudioplayerActivity.class);
         }
-- 
cgit v1.2.3


From 14718a9f516d7fdb0944755e9a8a25e4a2ccecf6 Mon Sep 17 00:00:00 2001
From: Martin Fietz <martin.fietz@gmail.com>
Date: Wed, 10 Jan 2018 21:45:06 +0100
Subject: Custom views extend AppCompatImageView instead of ImageView

---
 app/src/main/java/de/danoeh/antennapod/view/SquareImageView.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/view/SquareImageView.java b/app/src/main/java/de/danoeh/antennapod/view/SquareImageView.java
index 27b6ee2bc..11b873fdb 100644
--- a/app/src/main/java/de/danoeh/antennapod/view/SquareImageView.java
+++ b/app/src/main/java/de/danoeh/antennapod/view/SquareImageView.java
@@ -1,13 +1,14 @@
 package de.danoeh.antennapod.view;
 
 import android.content.Context;
+import android.support.v7.widget.AppCompatImageView;
 import android.util.AttributeSet;
 import android.widget.ImageView;
 
 /**
  * From http://stackoverflow.com/a/19449488/6839
  */
-public class SquareImageView extends ImageView {
+public class SquareImageView extends AppCompatImageView {
 
     public SquareImageView(Context context) {
         super(context);
-- 
cgit v1.2.3


From 0c4a08ac5668d6dd48424b8805188308a2ee139e Mon Sep 17 00:00:00 2001
From: Martin Fietz <martin.fietz@gmail.com>
Date: Wed, 10 Jan 2018 21:45:49 +0100
Subject: Suppress inspection

---
 app/src/main/java/de/danoeh/antennapod/view/SquareImageView.java | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/view/SquareImageView.java b/app/src/main/java/de/danoeh/antennapod/view/SquareImageView.java
index 11b873fdb..185f07b6b 100644
--- a/app/src/main/java/de/danoeh/antennapod/view/SquareImageView.java
+++ b/app/src/main/java/de/danoeh/antennapod/view/SquareImageView.java
@@ -27,6 +27,7 @@ public class SquareImageView extends AppCompatImageView {
         super.onMeasure(widthMeasureSpec, heightMeasureSpec);
 
         int width = getMeasuredWidth();
+        //noinspection SuspiciousNameCombination
         setMeasuredDimension(width, width);
     }
 
-- 
cgit v1.2.3


From ba3eb5e784ac4f55ea28b60326200f1c2a8d0c5d Mon Sep 17 00:00:00 2001
From: Martin Fietz <martin.fietz@gmail.com>
Date: Wed, 10 Jan 2018 21:56:08 +0100
Subject: Remove assertions

---
 .../java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java     | 3 ++-
 .../main/java/de/danoeh/antennapod/adapter/SubscriptionsAdapter.java   | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
index f6bf11e66..604dcb960 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
@@ -6,6 +6,7 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Looper;
+import android.support.annotation.UiThread;
 import android.support.v4.app.NavUtils;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AppCompatActivity;
@@ -508,8 +509,8 @@ public class OnlineFeedViewActivity extends AppCompatActivity {
         return 0;
     }
 
+    @UiThread
     private void showErrorDialog(String errorMsg) {
-        assert(Looper.myLooper() == Looper.getMainLooper()); // run on UI thread
         if (!isFinishing() && !isPaused) {
             AlertDialog.Builder builder = new AlertDialog.Builder(this);
             builder.setTitle(R.string.error_label);
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/SubscriptionsAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/SubscriptionsAdapter.java
index 6d19bfa6c..bb76ab501 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/SubscriptionsAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/SubscriptionsAdapter.java
@@ -50,7 +50,6 @@ public class SubscriptionsAdapter extends BaseAdapter implements AdapterView.OnI
     }
 
     private int getAdjustedPosition(int origPosition) {
-        assert(origPosition != getAddTilePosition());
         return origPosition < getAddTilePosition() ? origPosition : origPosition - 1;
     }
 
-- 
cgit v1.2.3


From 21ac9d158f4d81b082b8cb1d6f65146ed5c4c4ca Mon Sep 17 00:00:00 2001
From: Martin Fietz <martin.fietz@gmail.com>
Date: Wed, 10 Jan 2018 21:59:13 +0100
Subject: Avoid NPE

---
 .../antennapod/activity/OnlineFeedViewActivity.java    | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
index 604dcb960..defceb09b 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
@@ -8,6 +8,7 @@ import android.os.Bundle;
 import android.os.Looper;
 import android.support.annotation.UiThread;
 import android.support.v4.app.NavUtils;
+import android.support.v7.app.ActionBar;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AppCompatActivity;
 import android.text.TextUtils;
@@ -113,9 +114,7 @@ public class OnlineFeedViewActivity extends AppCompatActivity {
                                 feeds -> {
                                     OnlineFeedViewActivity.this.feeds = feeds;
                                     setSubscribeButtonState(feed);
-                                }, error -> {
-                                    Log.e(TAG, Log.getStackTraceString(error));
-                                }
+                                }, error -> Log.e(TAG, Log.getStackTraceString(error))
                         );
             } else if ((arg & EVENTS) != 0) {
                 setSubscribeButtonState(feed);
@@ -132,10 +131,13 @@ public class OnlineFeedViewActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         setTheme(UserPreferences.getTheme());
         super.onCreate(savedInstanceState);
-        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        ActionBar actionBar = getSupportActionBar();
+        if(actionBar != null) {
+            actionBar.setDisplayHomeAsUpEnabled(true);
+        }
 
-        if (getIntent() != null && getIntent().hasExtra(ARG_TITLE)) {
-            getSupportActionBar().setTitle(getIntent().getStringExtra(ARG_TITLE));
+        if (actionBar != null && getIntent() != null && getIntent().hasExtra(ARG_TITLE)) {
+            actionBar.setTitle(getIntent().getStringExtra(ARG_TITLE));
         }
 
         StorageUtils.checkStorageAvailability(this);
@@ -147,7 +149,9 @@ public class OnlineFeedViewActivity extends AppCompatActivity {
                 || TextUtils.equals(getIntent().getAction(), Intent.ACTION_VIEW)) {
             feedUrl = (TextUtils.equals(getIntent().getAction(), Intent.ACTION_SEND))
                     ? getIntent().getStringExtra(Intent.EXTRA_TEXT) : getIntent().getDataString();
-            getSupportActionBar().setTitle(R.string.add_feed_label);
+            if(actionBar != null) {
+                actionBar.setTitle(R.string.add_feed_label);
+            }
         } else {
             throw new IllegalArgumentException("Activity must be started with feedurl argument!");
         }
-- 
cgit v1.2.3


From 0238d24216fe82060be58a99fd7d0d7c17c0c7f1 Mon Sep 17 00:00:00 2001
From: Martin Fietz <martin.fietz@gmail.com>
Date: Wed, 10 Jan 2018 22:02:59 +0100
Subject: Replace deprecated method

---
 .../de/danoeh/antennapod/activity/OnlineFeedViewActivity.java    | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
index defceb09b..0aa135478 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
@@ -270,16 +270,11 @@ public class OnlineFeedViewActivity extends AppCompatActivity {
                 feed.getDownload_url(), "OnlineFeed", 0, Feed.FEEDFILETYPE_FEED, username, password,
                 true, null);
 
-        download = Observable.create(new Observable.OnSubscribe<DownloadStatus>() {
-                    @Override
-                    public void call(Subscriber<? super DownloadStatus> subscriber) {
+        download = Observable.fromCallable(() -> {
                         feeds = DBReader.getFeedList();
                         downloader = new HttpDownloader(request);
                         downloader.call();
-                        Log.d(TAG, "Download was completed");
-                        subscriber.onNext(downloader.getResult());
-                        subscriber.onCompleted();
-                    }
+                        return downloader.getResult();
                 })
                 .subscribeOn(Schedulers.newThread())
                 .observeOn(AndroidSchedulers.mainThread())
-- 
cgit v1.2.3


From 5bacbff10b9c415e8e3ca1ba2c186cc2e1dd6231 Mon Sep 17 00:00:00 2001
From: Martin Fietz <martin.fietz@gmail.com>
Date: Wed, 10 Jan 2018 22:04:51 +0100
Subject: Simplify

---
 .../java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
index 0aa135478..1224cf38f 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
@@ -286,6 +286,7 @@ public class OnlineFeedViewActivity extends AppCompatActivity {
         if (status == null) {
             Log.wtf(TAG, "DownloadStatus returned by Downloader was null");
             finish();
+            return;
         }
         if (status.isCancelled()) {
             return;
@@ -300,7 +301,7 @@ public class OnlineFeedViewActivity extends AppCompatActivity {
             }
         } else {
             String errorMsg = status.getReason().getErrorString(OnlineFeedViewActivity.this);
-            if (errorMsg != null && status.getReasonDetailed() != null) {
+            if (status.getReasonDetailed() != null) {
                 errorMsg += " (" + status.getReasonDetailed() + ")";
             }
             showErrorDialog(errorMsg);
-- 
cgit v1.2.3


From 74b2d439c368ab878165d33f0c1bde2b26408db3 Mon Sep 17 00:00:00 2001
From: Martin Fietz <martin.fietz@gmail.com>
Date: Wed, 10 Jan 2018 22:15:47 +0100
Subject: Replace deprecated method

---
 .../activity/OnlineFeedViewActivity.java           | 52 +++++++++++-----------
 1 file changed, 25 insertions(+), 27 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
index 1224cf38f..b5dc4038b 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
@@ -271,10 +271,10 @@ public class OnlineFeedViewActivity extends AppCompatActivity {
                 true, null);
 
         download = Observable.fromCallable(() -> {
-                        feeds = DBReader.getFeedList();
-                        downloader = new HttpDownloader(request);
-                        downloader.call();
-                        return downloader.getResult();
+                    feeds = DBReader.getFeedList();
+                    downloader = new HttpDownloader(request);
+                    downloader.call();
+                    return downloader.getResult();
                 })
                 .subscribeOn(Schedulers.newThread())
                 .observeOn(AndroidSchedulers.mainThread())
@@ -314,35 +314,33 @@ public class OnlineFeedViewActivity extends AppCompatActivity {
         }
         Log.d(TAG, "Parsing feed");
 
-        parser = Observable.create(new Observable.OnSubscribe<FeedHandlerResult>() {
-            @Override
-            public void call(Subscriber<? super FeedHandlerResult> subscriber) {
-                        FeedHandler handler = new FeedHandler();
-                        try {
-                            FeedHandlerResult result = handler.parseFeed(feed);
-                            subscriber.onNext(result);
-                        } catch (UnsupportedFeedtypeException e) {
-                            Log.d(TAG, "Unsupported feed type detected");
-                            if (TextUtils.equals("html", e.getRootElement().toLowerCase())) {
-                                showFeedDiscoveryDialog(new File(feed.getFile_url()), feed.getDownload_url());
-                            } else {
-                                subscriber.onError(e);
-                            }
-                        } catch (Exception e) {
-                            Log.e(TAG, Log.getStackTraceString(e));
-                            subscriber.onError(e);
-                        } finally {
-                            boolean rc = new File(feed.getFile_url()).delete();
-                            Log.d(TAG, "Deleted feed source file. Result: " + rc);
-                            subscriber.onCompleted();
+        parser = Observable.fromCallable(() -> {
+                    FeedHandler handler = new FeedHandler();
+                    try {
+                        return handler.parseFeed(feed);
+                    } catch (UnsupportedFeedtypeException e) {
+                        Log.d(TAG, "Unsupported feed type detected");
+                        if (TextUtils.equals("html", e.getRootElement().toLowerCase())) {
+                            showFeedDiscoveryDialog(new File(feed.getFile_url()), feed.getDownload_url());
+                            return null;
+                        } else {
+                            throw e;
                         }
+                    } catch (Exception e) {
+                        Log.e(TAG, Log.getStackTraceString(e));
+                        throw e;
+                    } finally {
+                        boolean rc = new File(feed.getFile_url()).delete();
+                        Log.d(TAG, "Deleted feed source file. Result: " + rc);
                     }
                 })
                 .subscribeOn(Schedulers.newThread())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(result -> {
-                    beforeShowFeedInformation(result.feed);
-                    showFeedInformation(result.feed, result.alternateFeedUrls);
+                    if(result != null) {
+                        beforeShowFeedInformation(result.feed);
+                        showFeedInformation(result.feed, result.alternateFeedUrls);
+                    }
                 }, error -> {
                     String errorMsg = DownloadError.ERROR_PARSER_EXCEPTION.getErrorString(
                             OnlineFeedViewActivity.this) + " (" + error.getMessage() + ")";
-- 
cgit v1.2.3


From 36a7261f89b41160ed3fe7209d8388dcca98666f Mon Sep 17 00:00:00 2001
From: Martin Fietz <martin.fietz@gmail.com>
Date: Wed, 10 Jan 2018 22:16:51 +0100
Subject: Simplify

---
 .../main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
index b5dc4038b..07f09455a 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
@@ -413,7 +413,7 @@ public class OnlineFeedViewActivity extends AppCompatActivity {
         description.setText(feed.getDescription());
 
         subscribeButton.setOnClickListener(v -> {
-            if(feed != null && feedInFeedlist(feed)) {
+            if(feedInFeedlist(feed)) {
                 Intent intent = new Intent(OnlineFeedViewActivity.this, MainActivity.class);
                 // feed.getId() is always 0, we have to retrieve the id from the feed list from
                 // the database
-- 
cgit v1.2.3


From ab287fe028ada1ec51f73bc06eccc9023480f854 Mon Sep 17 00:00:00 2001
From: Martin Fietz <martin.fietz@gmail.com>
Date: Wed, 10 Jan 2018 22:20:31 +0100
Subject: Silence warning

---
 .../java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
index 07f09455a..d66f7484e 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
@@ -382,8 +382,7 @@ public class OnlineFeedViewActivity extends AppCompatActivity {
         this.selectedDownloadUrl = feed.getDownload_url();
         EventDistributor.getInstance().register(listener);
         ListView listView = (ListView) findViewById(R.id.listview);
-        LayoutInflater inflater = (LayoutInflater)
-                getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+        LayoutInflater inflater = LayoutInflater.from(this);
         View header = inflater.inflate(R.layout.onlinefeedview_header, listView, false);
         listView.addHeaderView(header);
 
-- 
cgit v1.2.3


From ce2aeb5e90e9d3b554804f47c9a13aa97d278ed5 Mon Sep 17 00:00:00 2001
From: Martin Fietz <martin.fietz@gmail.com>
Date: Wed, 10 Jan 2018 22:42:59 +0100
Subject: Use DecimalFormat

---
 .../main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java
index ca214de9e..f7cc6f942 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java
@@ -6,6 +6,7 @@ import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
 
+import java.text.DecimalFormat;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import de.danoeh.antennapod.core.feed.MediaType;
@@ -95,7 +96,7 @@ public class AudioplayerActivity extends MediaplayerInfoActivity {
                 UserPreferences.setPlaybackSpeed(String.valueOf(speed));
             }
         }
-        String speedStr = String.format("%.2fx", speed);
+        String speedStr = new DecimalFormat("0.00x").format(speed);
         butPlaybackSpeed.setText(speedStr);
     }
 
-- 
cgit v1.2.3


From c524791c3cded7c94abf98045825b73928bcf90e Mon Sep 17 00:00:00 2001
From: Martin Fietz <martin.fietz@gmail.com>
Date: Wed, 10 Jan 2018 22:44:52 +0100
Subject: Avoid NPEs

---
 .../java/de/danoeh/antennapod/activity/AudioplayerActivity.java     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java
index f7cc6f942..4f56d9770 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java
@@ -28,6 +28,9 @@ public class AudioplayerActivity extends MediaplayerInfoActivity {
         super.onResume();
         if (TextUtils.equals(getIntent().getAction(), Intent.ACTION_VIEW)) {
             Intent intent = getIntent();
+            if (intent.getData() == null) {
+                return;
+            }
             Log.d(TAG, "Received VIEW intent: " + intent.getData().getPath());
             ExternalMedia media = new ExternalMedia(intent.getData().getPath(),
                     MediaType.AUDIO);
@@ -41,7 +44,8 @@ public class AudioplayerActivity extends MediaplayerInfoActivity {
             startService(launchIntent);
         } else if (PlaybackService.isCasting()) {
             Intent intent = PlaybackService.getPlayerActivityIntent(this);
-            if (!intent.getComponent().getClassName().equals(AudioplayerActivity.class.getName())) {
+            if (intent.getComponent() != null &&
+                    !intent.getComponent().getClassName().equals(AudioplayerActivity.class.getName())) {
                 saveCurrentFragment();
                 finish();
                 startActivity(intent);
-- 
cgit v1.2.3


From 249bf9bc184b453eb962cdfa592f5ae15c8f612d Mon Sep 17 00:00:00 2001
From: Martin Fietz <martin.fietz@gmail.com>
Date: Wed, 10 Jan 2018 23:21:53 +0100
Subject: Do not treat position as fixed

---
 .../de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java    | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java
index 6611cd35a..172646211 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java
@@ -100,7 +100,6 @@ public class AllEpisodesRecycleAdapter extends RecyclerView.Adapter<AllEpisodesR
         holder.txtvDuration = (TextView) view.findViewById(R.id.txtvDuration);
         holder.item = null;
         holder.mainActivityRef = mainActivityRef;
-        holder.position = -1;
         // so we can grab this later
         view.setTag(holder);
 
@@ -112,11 +111,10 @@ public class AllEpisodesRecycleAdapter extends RecyclerView.Adapter<AllEpisodesR
         final FeedItem item = itemAccess.getItem(position);
         if (item == null) return;
         holder.itemView.setOnLongClickListener(v -> {
-            this.position = position;
+            this.position = holder.getAdapterPosition();
             return false;
         });
         holder.item = item;
-        holder.position = position;
         holder.placeholder.setVisibility(View.VISIBLE);
         holder.placeholder.setText(item.getFeed().getTitle());
         holder.title.setText(item.getTitle());
@@ -252,7 +250,6 @@ public class AllEpisodesRecycleAdapter extends RecyclerView.Adapter<AllEpisodesR
         ImageButton butSecondary;
         FeedItem item;
         WeakReference<MainActivity> mainActivityRef;
-        int position;
 
         public Holder(View itemView) {
             super(itemView);
@@ -265,7 +262,7 @@ public class AllEpisodesRecycleAdapter extends RecyclerView.Adapter<AllEpisodesR
             MainActivity mainActivity = mainActivityRef.get();
             if (mainActivity != null) {
                 long[] ids = itemAccess.getItemsIds().toArray();
-                mainActivity.loadChildFragment(ItemFragment.newInstance(ids, position));
+                mainActivity.loadChildFragment(ItemFragment.newInstance(ids, getAdapterPosition()));
             }
         }
 
-- 
cgit v1.2.3


From 648b6c9529398c7ef01c83c490e54a0d4de49a12 Mon Sep 17 00:00:00 2001
From: Martin Fietz <martin.fietz@gmail.com>
Date: Wed, 10 Jan 2018 23:26:58 +0100
Subject: Remove superfluous logging

---
 .../de/danoeh/antennapod/activity/DownloadAuthenticationActivity.java   | 2 --
 1 file changed, 2 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/DownloadAuthenticationActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/DownloadAuthenticationActivity.java
index 41b2debdc..166138af4 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/DownloadAuthenticationActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/DownloadAuthenticationActivity.java
@@ -24,7 +24,6 @@ import de.danoeh.antennapod.core.storage.DownloadRequester;
  * The activity's result will be the same DownloadRequest with the entered username and password.
  */
 public class DownloadAuthenticationActivity extends ActionBarActivity {
-    private static final String TAG = "DownloadAuthenticationActivity";
 
     /**
      * The download request object that contains information about the resource that requires a username and a password
@@ -87,7 +86,6 @@ public class DownloadAuthenticationActivity extends ActionBarActivity {
             setResult(Activity.RESULT_OK, result);
 
             if (sendToDownloadRequester) {
-               if (BuildConfig.DEBUG) Log.d(TAG, "Sending request to DownloadRequester");
                 DownloadRequester.getInstance().download(DownloadAuthenticationActivity.this, request);
             }
             finish();
-- 
cgit v1.2.3


From 39c47da07dfe0ebb8f5fafcb52bfec44d15c4b24 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Thu, 11 Jan 2018 14:07:15 +0100
Subject: Fixed backstack when pressing up arrow

---
 app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
index 585b6cd85..37afe21be 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
@@ -382,6 +382,7 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements
             } else {
                 startActivity(intent);
             }
+            finish();
             return true;
         } else {
             if (media != null) {
-- 
cgit v1.2.3


From 7257a6c76e002e39eef8d1f28c70b654e9954d4e Mon Sep 17 00:00:00 2001
From: Martin Fietz <martin.fietz@gmail.com>
Date: Wed, 10 Jan 2018 23:35:18 +0100
Subject: Refactor

---
 .../activity/DownloadAuthenticationActivity.java   | 47 ++++++++++------------
 1 file changed, 22 insertions(+), 25 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/DownloadAuthenticationActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/DownloadAuthenticationActivity.java
index 166138af4..0346cc717 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/DownloadAuthenticationActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/DownloadAuthenticationActivity.java
@@ -3,15 +3,14 @@ package de.danoeh.antennapod.activity;
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.ActionBarActivity;
-import android.util.Log;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.AppCompatActivity;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.TextView;
 
 import org.apache.commons.lang3.Validate;
 
-import de.danoeh.antennapod.BuildConfig;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.core.service.download.DownloadRequest;
@@ -23,7 +22,7 @@ import de.danoeh.antennapod.core.storage.DownloadRequester;
  * Other arguments are optional.
  * The activity's result will be the same DownloadRequest with the entered username and password.
  */
-public class DownloadAuthenticationActivity extends ActionBarActivity {
+public class DownloadAuthenticationActivity extends AppCompatActivity {
 
     /**
      * The download request object that contains information about the resource that requires a username and a password
@@ -35,47 +34,39 @@ public class DownloadAuthenticationActivity extends ActionBarActivity {
      */
     public static final String ARG_SEND_TO_DOWNLOAD_REQUESTER_BOOL = "send_to_downloadrequester";
 
-    public static final String RESULT_REQUEST = "request";
+    private static final String RESULT_REQUEST = "request";
 
     private EditText etxtUsername;
     private EditText etxtPassword;
-    private Button butConfirm;
-    private Button butCancel;
-    private TextView txtvDescription;
-
-    private DownloadRequest request;
-    private boolean sendToDownloadRequester;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         setTheme(UserPreferences.getTheme());
         super.onCreate(savedInstanceState);
-        getSupportActionBar().hide();
-        setContentView(R.layout.download_authentication_activity);
+        ActionBar actionBar = getSupportActionBar();
+        if(actionBar != null) {
+            actionBar.hide();
+        }
 
+        setContentView(R.layout.download_authentication_activity);
+        TextView txtvDescription = (TextView) findViewById(R.id.txtvDescription);
         etxtUsername = (EditText) findViewById(R.id.etxtUsername);
         etxtPassword = (EditText) findViewById(R.id.etxtPassword);
-        butConfirm = (Button) findViewById(R.id.butConfirm);
-        butCancel = (Button) findViewById(R.id.butCancel);
-        txtvDescription = (TextView) findViewById(R.id.txtvDescription);
+        Button butConfirm = (Button) findViewById(R.id.butConfirm);
+        Button butCancel = (Button) findViewById(R.id.butCancel);
 
         Validate.isTrue(getIntent().hasExtra(ARG_DOWNLOAD_REQUEST), "Download request missing");
+        DownloadRequest request = getIntent().getParcelableExtra(ARG_DOWNLOAD_REQUEST);
+        boolean sendToDownloadRequester = getIntent().getBooleanExtra(ARG_SEND_TO_DOWNLOAD_REQUESTER_BOOL, false);
 
-        request = getIntent().getParcelableExtra(ARG_DOWNLOAD_REQUEST);
-        sendToDownloadRequester = getIntent().getBooleanExtra(ARG_SEND_TO_DOWNLOAD_REQUESTER_BOOL, false);
+        String newDescription = txtvDescription.getText() + ":\n\n" + request.getTitle();
+        txtvDescription.setText(newDescription);
 
         if (savedInstanceState != null) {
             etxtUsername.setText(savedInstanceState.getString("username"));
             etxtPassword.setText(savedInstanceState.getString("password"));
         }
 
-        txtvDescription.setText(txtvDescription.getText() + ":\n\n" + request.getTitle());
-
-        butCancel.setOnClickListener(v -> {
-            setResult(Activity.RESULT_CANCELED);
-            finish();
-        });
-
         butConfirm.setOnClickListener(v -> {
             String username = etxtUsername.getText().toString();
             String password = etxtPassword.getText().toString();
@@ -90,6 +81,12 @@ public class DownloadAuthenticationActivity extends ActionBarActivity {
             }
             finish();
         });
+
+        butCancel.setOnClickListener(v -> {
+            setResult(Activity.RESULT_CANCELED);
+            finish();
+        });
+
     }
 
     @Override
-- 
cgit v1.2.3


From 332943effb89dcfb7aa05d85e7019abb70c965d6 Mon Sep 17 00:00:00 2001
From: Martin Fietz <martin.fietz@gmail.com>
Date: Sun, 14 Jan 2018 17:47:43 +0100
Subject: Replace anonymous type with lambda

---
 .../danoeh/antennapod/activity/AboutActivity.java  | 91 +++++++++++-----------
 .../de/danoeh/antennapod/dialog/ProxyDialog.java   | 79 +++++++++----------
 2 files changed, 82 insertions(+), 88 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java
index 1b42b274c..041053a25 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java
@@ -75,53 +75,50 @@ public class AboutActivity extends AppCompatActivity {
     }
 
     private void loadAsset(String filename) {
-        subscription = Observable.create(new Observable.OnSubscribe<String>() {
-                    @Override
-                    public void call(Subscriber<? super String> subscriber) {
-                        InputStream input = null;
-                        try {
-                            TypedArray res = AboutActivity.this.getTheme().obtainStyledAttributes(
-                                    new int[] { android.R.attr.textColorPrimary });
-                            int colorResource = res.getColor(0, 0);
-                            String colorString = String.format("#%06X", 0xFFFFFF & colorResource);
-                            res.recycle();
-                            input = getAssets().open(filename);
-                            String webViewData = IOUtils.toString(input, Charset.defaultCharset());
-                            if(!webViewData.startsWith("<!DOCTYPE html>")) {
-                                //webViewData = webViewData.replace("\n\n", "</p><p>");
-                                webViewData = webViewData.replace("%", "&#37;");
-                                webViewData =
-                                        "<!DOCTYPE html>" +
-                                        "<html>" +
-                                        "<head>" +
-                                        "    <meta http-equiv=\"Content-Type\" content=\"text/html;charset=UTF-8\">" +
-                                        "    <style type=\"text/css\">" +
-                                        "        @font-face {" +
-                                        "        font-family: 'Roboto-Light';" +
-                                        "           src: url('file:///android_asset/Roboto-Light.ttf');" +
-                                        "        }" +
-                                        "        * {" +
-                                        "           color: %s;" +
-                                        "           font-family: roboto-Light;" +
-                                        "           font-size: 8pt;" +
-                                        "        }" +
-                                        "    </style>" +
-                                        "</head><body><p>" + webViewData + "</p></body></html>";
-                                webViewData = webViewData.replace("\n", "<br/>");
-                                depth++;
-                            } else {
-                                depth = 0;
-                            }
-                            webViewData = String.format(webViewData, colorString);
-                            subscriber.onNext(webViewData);
-                        } catch (IOException e) {
-                            subscriber.onError(e);
-                        } finally {
-                            IOUtils.closeQuietly(input);
-                        }
-                        subscriber.onCompleted();
-                    }
-                })
+        subscription = Observable.create((Observable.OnSubscribe<String>) subscriber -> {
+            InputStream input = null;
+            try {
+                TypedArray res = AboutActivity.this.getTheme().obtainStyledAttributes(
+                        new int[] { android.R.attr.textColorPrimary });
+                int colorResource = res.getColor(0, 0);
+                String colorString = String.format("#%06X", 0xFFFFFF & colorResource);
+                res.recycle();
+                input = getAssets().open(filename);
+                String webViewData = IOUtils.toString(input, Charset.defaultCharset());
+                if(!webViewData.startsWith("<!DOCTYPE html>")) {
+                    //webViewData = webViewData.replace("\n\n", "</p><p>");
+                    webViewData = webViewData.replace("%", "&#37;");
+                    webViewData =
+                            "<!DOCTYPE html>" +
+                            "<html>" +
+                            "<head>" +
+                            "    <meta http-equiv=\"Content-Type\" content=\"text/html;charset=UTF-8\">" +
+                            "    <style type=\"text/css\">" +
+                            "        @font-face {" +
+                            "        font-family: 'Roboto-Light';" +
+                            "           src: url('file:///android_asset/Roboto-Light.ttf');" +
+                            "        }" +
+                            "        * {" +
+                            "           color: %s;" +
+                            "           font-family: roboto-Light;" +
+                            "           font-size: 8pt;" +
+                            "        }" +
+                            "    </style>" +
+                            "</head><body><p>" + webViewData + "</p></body></html>";
+                    webViewData = webViewData.replace("\n", "<br/>");
+                    depth++;
+                } else {
+                    depth = 0;
+                }
+                webViewData = String.format(webViewData, colorString);
+                subscriber.onNext(webViewData);
+            } catch (IOException e) {
+                subscriber.onError(e);
+            } finally {
+                IOUtils.closeQuietly(input);
+            }
+            subscriber.onCompleted();
+        })
                 .subscribeOn(Schedulers.newThread())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(
diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/ProxyDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/ProxyDialog.java
index 0bd75b5b0..53d200991 100644
--- a/app/src/main/java/de/danoeh/antennapod/dialog/ProxyDialog.java
+++ b/app/src/main/java/de/danoeh/antennapod/dialog/ProxyDialog.java
@@ -243,47 +243,44 @@ public class ProxyDialog {
         txtvMessage.setTextColor(textColorPrimary);
         txtvMessage.setText("{fa-circle-o-notch spin} " + checking);
         txtvMessage.setVisibility(View.VISIBLE);
-        subscription = Observable.create(new Observable.OnSubscribe<Response>() {
-                    @Override
-                    public void call(Subscriber<? super Response> subscriber) {
-                        String type = (String) spType.getSelectedItem();
-                        String host = etHost.getText().toString();
-                        String port = etPort.getText().toString();
-                        String username = etUsername.getText().toString();
-                        String password = etPassword.getText().toString();
-                        int portValue = 8080;
-                        if(!TextUtils.isEmpty(port)) {
-                            portValue = Integer.valueOf(port);
-                        }
-                        SocketAddress address = InetSocketAddress.createUnresolved(host, portValue);
-                        Proxy.Type proxyType = Proxy.Type.valueOf(type.toUpperCase());
-                        Proxy proxy = new Proxy(proxyType, address);
-                        OkHttpClient.Builder builder = AntennapodHttpClient.newBuilder()
-                                .connectTimeout(10, TimeUnit.SECONDS)
-                                .proxy(proxy);
-                        builder.interceptors().clear();
-                        OkHttpClient client = builder.build();
-                        if(!TextUtils.isEmpty(username)) {
-                            String credentials = Credentials.basic(username, password);
-                            client.interceptors().add(chain -> {
-                                Request request = chain.request().newBuilder()
-                                        .header("Proxy-Authorization", credentials).build();
-                                return chain.proceed(request);
-                            });
-                        }
-                        Request request = new Request.Builder()
-                                .url("http://www.google.com")
-                                .head()
-                                .build();
-                        try {
-                            Response response = client.newCall(request).execute();
-                            subscriber.onNext(response);
-                        } catch(IOException e) {
-                            subscriber.onError(e);
-                        }
-                        subscriber.onCompleted();
-                    }
-                })
+        subscription = Observable.create((Observable.OnSubscribe<Response>) subscriber -> {
+            String type = (String) spType.getSelectedItem();
+            String host = etHost.getText().toString();
+            String port = etPort.getText().toString();
+            String username = etUsername.getText().toString();
+            String password = etPassword.getText().toString();
+            int portValue = 8080;
+            if(!TextUtils.isEmpty(port)) {
+                portValue = Integer.valueOf(port);
+            }
+            SocketAddress address = InetSocketAddress.createUnresolved(host, portValue);
+            Proxy.Type proxyType = Proxy.Type.valueOf(type.toUpperCase());
+            Proxy proxy = new Proxy(proxyType, address);
+            OkHttpClient.Builder builder = AntennapodHttpClient.newBuilder()
+                    .connectTimeout(10, TimeUnit.SECONDS)
+                    .proxy(proxy);
+            builder.interceptors().clear();
+            OkHttpClient client = builder.build();
+            if(!TextUtils.isEmpty(username)) {
+                String credentials = Credentials.basic(username, password);
+                client.interceptors().add(chain -> {
+                    Request request = chain.request().newBuilder()
+                            .header("Proxy-Authorization", credentials).build();
+                    return chain.proceed(request);
+                });
+            }
+            Request request = new Request.Builder()
+                    .url("http://www.google.com")
+                    .head()
+                    .build();
+            try {
+                Response response = client.newCall(request).execute();
+                subscriber.onNext(response);
+            } catch(IOException e) {
+                subscriber.onError(e);
+            }
+            subscriber.onCompleted();
+        })
                 .subscribeOn(Schedulers.newThread())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(
-- 
cgit v1.2.3


From 26b938ce5bdafc06c474abbbebd6b459af5f6de1 Mon Sep 17 00:00:00 2001
From: Martin Fietz <martin.fietz@gmail.com>
Date: Sun, 14 Jan 2018 17:48:52 +0100
Subject: Replace statement lambda with expression lambda

---
 app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java     | 4 +---
 .../java/de/danoeh/antennapod/activity/MediaplayerInfoActivity.java   | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
index 9949c01a0..c33ffe55d 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
@@ -743,9 +743,7 @@ public class MainActivity extends CastEnabledActivity implements NavDrawerActivi
         View parentLayout = findViewById(R.id.drawer_layout);
         Snackbar snackbar = Snackbar.make(parentLayout, event.message, Snackbar.LENGTH_SHORT);
         if(event.action != null) {
-            snackbar.setAction(getString(R.string.undo), v -> {
-                event.action.run();
-            });
+            snackbar.setAction(getString(R.string.undo), v -> event.action.run());
         }
         snackbar.show();
     }
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerInfoActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerInfoActivity.java
index 3b1427f1b..d713f4b77 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerInfoActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerInfoActivity.java
@@ -491,9 +491,7 @@ public abstract class MediaplayerInfoActivity extends MediaplayerActivity implem
         View parentLayout = findViewById(R.id.drawer_layout);
         Snackbar snackbar = Snackbar.make(parentLayout, event.message, Snackbar.LENGTH_SHORT);
         if (event.action != null) {
-            snackbar.setAction(getString(R.string.undo), v -> {
-                event.action.run();
-            });
+            snackbar.setAction(getString(R.string.undo), v -> event.action.run());
         }
         snackbar.show();
     }
-- 
cgit v1.2.3


From cbc3b23753bb32a239ebfa9e6ef8791e57fd17ab Mon Sep 17 00:00:00 2001
From: Martin Fietz <martin.fietz@gmail.com>
Date: Sun, 14 Jan 2018 17:50:32 +0100
Subject: Replace explicit type with <>

---
 .../java/de/danoeh/antennapod/activity/OpmlFeedChooserActivity.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/OpmlFeedChooserActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/OpmlFeedChooserActivity.java
index 355e0f372..cd375a65a 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/OpmlFeedChooserActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/OpmlFeedChooserActivity.java
@@ -97,7 +97,7 @@ public class OpmlFeedChooserActivity extends AppCompatActivity {
     }
 
     private List<String> getTitleList() {
-        List<String> result = new ArrayList<String>();
+        List<String> result = new ArrayList<>();
         if (OpmlImportHolder.getReadElements() != null) {
             for (OpmlElement element : OpmlImportHolder.getReadElements()) {
                 result.add(element.getText());
-- 
cgit v1.2.3


From 53dc62ec0fde593edff47b002c50e57a5bd88353 Mon Sep 17 00:00:00 2001
From: Martin Fietz <martin.fietz@gmail.com>
Date: Sun, 14 Jan 2018 17:51:24 +0100
Subject: Remove unused imports

---
 .../java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java     | 3 ---
 app/src/main/java/de/danoeh/antennapod/asynctask/OpmlFeedQueuer.java   | 1 -
 app/src/main/java/de/danoeh/antennapod/asynctask/OpmlImportWorker.java | 1 -
 .../java/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java    | 1 -
 app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java  | 2 --
 .../java/de/danoeh/antennapod/preferences/PreferenceController.java    | 1 -
 app/src/main/java/de/danoeh/antennapod/view/SquareImageView.java       | 1 -
 7 files changed, 10 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
index d66f7484e..91c7c3f1b 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
@@ -5,7 +5,6 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
-import android.os.Looper;
 import android.support.annotation.UiThread;
 import android.support.v4.app.NavUtils;
 import android.support.v7.app.ActionBar;
@@ -57,7 +56,6 @@ import de.danoeh.antennapod.core.storage.DBReader;
 import de.danoeh.antennapod.core.storage.DownloadRequestException;
 import de.danoeh.antennapod.core.storage.DownloadRequester;
 import de.danoeh.antennapod.core.syndication.handler.FeedHandler;
-import de.danoeh.antennapod.core.syndication.handler.FeedHandlerResult;
 import de.danoeh.antennapod.core.syndication.handler.UnsupportedFeedtypeException;
 import de.danoeh.antennapod.core.util.DownloadError;
 import de.danoeh.antennapod.core.util.FileNameGenerator;
@@ -68,7 +66,6 @@ import de.danoeh.antennapod.core.util.syndication.HtmlToPlainText;
 import de.danoeh.antennapod.dialog.AuthenticationDialog;
 import de.greenrobot.event.EventBus;
 import rx.Observable;
-import rx.Subscriber;
 import rx.Subscription;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.schedulers.Schedulers;
diff --git a/app/src/main/java/de/danoeh/antennapod/asynctask/OpmlFeedQueuer.java b/app/src/main/java/de/danoeh/antennapod/asynctask/OpmlFeedQueuer.java
index fcd5cff00..5529e772f 100644
--- a/app/src/main/java/de/danoeh/antennapod/asynctask/OpmlFeedQueuer.java
+++ b/app/src/main/java/de/danoeh/antennapod/asynctask/OpmlFeedQueuer.java
@@ -1,6 +1,5 @@
 package de.danoeh.antennapod.asynctask;
 
-import android.annotation.SuppressLint;
 import android.app.ProgressDialog;
 import android.content.Context;
 import android.os.AsyncTask;
diff --git a/app/src/main/java/de/danoeh/antennapod/asynctask/OpmlImportWorker.java b/app/src/main/java/de/danoeh/antennapod/asynctask/OpmlImportWorker.java
index 88bd35b7c..445b74d85 100644
--- a/app/src/main/java/de/danoeh/antennapod/asynctask/OpmlImportWorker.java
+++ b/app/src/main/java/de/danoeh/antennapod/asynctask/OpmlImportWorker.java
@@ -1,6 +1,5 @@
 package de.danoeh.antennapod.asynctask;
 
-import android.annotation.SuppressLint;
 import android.app.ProgressDialog;
 import android.content.Context;
 import android.os.AsyncTask;
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java
index f6bdfddda..ffc0c4c8d 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java
@@ -10,7 +10,6 @@ import android.content.SharedPreferences;
 import android.content.res.TypedArray;
 import android.graphics.Color;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.util.Log;
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java
index d819e68d2..0d3f32c7f 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java
@@ -7,7 +7,6 @@ import android.content.Intent;
 import android.content.res.TypedArray;
 import android.graphics.Color;
 import android.graphics.LightingColorFilter;
-import android.os.Build;
 import android.os.Bundle;
 import android.support.v4.app.ListFragment;
 import android.support.v4.view.MenuItemCompat;
@@ -22,7 +21,6 @@ import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ImageButton;
 import android.widget.ImageView;
-import android.widget.ListAdapter;
 import android.widget.ListView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
index 58c7f39a1..8c2ece735 100644
--- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
+++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
@@ -45,7 +45,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.GregorianCalendar;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
diff --git a/app/src/main/java/de/danoeh/antennapod/view/SquareImageView.java b/app/src/main/java/de/danoeh/antennapod/view/SquareImageView.java
index 185f07b6b..7ce33e11f 100644
--- a/app/src/main/java/de/danoeh/antennapod/view/SquareImageView.java
+++ b/app/src/main/java/de/danoeh/antennapod/view/SquareImageView.java
@@ -3,7 +3,6 @@ package de.danoeh.antennapod.view;
 import android.content.Context;
 import android.support.v7.widget.AppCompatImageView;
 import android.util.AttributeSet;
-import android.widget.ImageView;
 
 /**
  * From http://stackoverflow.com/a/19449488/6839
-- 
cgit v1.2.3


From bf41f1713de55cc6db23a5e745de6a8040862988 Mon Sep 17 00:00:00 2001
From: Martin Fietz <martin.fietz@gmail.com>
Date: Sun, 14 Jan 2018 17:55:25 +0100
Subject: Synchronization field must be final

---
 .../main/java/de/danoeh/antennapod/service/PlayerWidgetService.java    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/service/PlayerWidgetService.java b/app/src/main/java/de/danoeh/antennapod/service/PlayerWidgetService.java
index b5bfb1ae4..53d4aba16 100644
--- a/app/src/main/java/de/danoeh/antennapod/service/PlayerWidgetService.java
+++ b/app/src/main/java/de/danoeh/antennapod/service/PlayerWidgetService.java
@@ -38,7 +38,7 @@ public class PlayerWidgetService extends Service {
     /**
      * Controls write access to playbackservice reference
      */
-    private Object psLock;
+    private final Object psLock = new Object();
 
     /**
      * True while service is updating the widget
@@ -53,7 +53,6 @@ public class PlayerWidgetService extends Service {
         super.onCreate();
         Log.d(TAG, "Service created");
         isUpdating = false;
-        psLock = new Object();
     }
 
     @Override
-- 
cgit v1.2.3


From e02baebf02d4571d2b0202f0956f1664ab3c0963 Mon Sep 17 00:00:00 2001
From: Martin Fietz <martin.fietz@gmail.com>
Date: Sun, 14 Jan 2018 18:02:56 +0100
Subject: Use bulk operation instead of iteration

---
 app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java
index 465497b55..cbbeabf0d 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java
@@ -86,9 +86,7 @@ public class NavListAdapter extends BaseAdapter
     private void loadItems() {
         List<String> newTags = new ArrayList<>(Arrays.asList(MainActivity.NAV_DRAWER_TAGS));
         List<String> hiddenFragments = UserPreferences.getHiddenDrawerItems();
-        for(String hidden : hiddenFragments) {
-            newTags.remove(hidden);
-        }
+        newTags.removeAll(hiddenFragments);
 
         if (newTags.contains(SUBSCRIPTION_LIST_TAG)) {
             // we never want SUBSCRIPTION_LIST_TAG to be in 'tags'
-- 
cgit v1.2.3


From b86b6caec80ce6d3e10093bfc2e7c540f1085c9c Mon Sep 17 00:00:00 2001
From: Martin Fietz <martin.fietz@gmail.com>
Date: Sun, 14 Jan 2018 18:04:53 +0100
Subject: Weaken declaration access

---
 .../antennapod/activity/AudioplayerActivity.java   |  2 +-
 .../antennapod/activity/CastplayerActivity.java    |  2 +-
 .../danoeh/antennapod/activity/MainActivity.java   | 10 ++--
 .../antennapod/activity/MediaplayerActivity.java   | 60 +++++++++++-----------
 .../activity/MediaplayerInfoActivity.java          | 14 ++---
 .../activity/OnlineFeedViewActivity.java           |  2 +-
 .../activity/OpmlImportBaseActivity.java           |  6 +--
 .../antennapod/activity/VideoplayerActivity.java   |  4 +-
 .../gpoddernet/GpodnetAuthenticationActivity.java  |  2 +-
 .../antennapod/adapter/ActionButtonCallback.java   |  2 +-
 .../antennapod/adapter/ActionButtonUtils.java      |  2 +-
 .../antennapod/adapter/DownloadlistAdapter.java    |  2 +-
 .../danoeh/antennapod/adapter/NavListAdapter.java  |  4 +-
 .../antennapod/adapter/StatisticsListAdapter.java  |  2 +-
 .../danoeh/antennapod/asynctask/ExportWorker.java  |  2 +-
 .../antennapod/config/ClientConfigurator.java      |  2 +-
 .../dialog/EpisodesApplyActionFragment.java        | 10 ++--
 .../de/danoeh/antennapod/dialog/RatingDialog.java  |  6 +--
 .../antennapod/fragment/AddFeedFragment.java       |  2 +-
 .../antennapod/fragment/AllEpisodesFragment.java   | 30 +++++------
 .../antennapod/fragment/DownloadsFragment.java     |  2 +-
 .../antennapod/fragment/EpisodesFragment.java      |  8 +--
 .../fragment/ExternalPlayerFragment.java           |  2 +-
 .../fragment/FavoriteEpisodesFragment.java         |  2 +-
 .../antennapod/fragment/FyydSearchFragment.java    |  2 +-
 .../antennapod/fragment/ItemlistFragment.java      |  4 +-
 .../antennapod/fragment/ItunesSearchFragment.java  |  2 +-
 .../fragment/gpodnet/GpodnetMainFragment.java      |  2 +-
 .../fragment/gpodnet/PodcastListFragment.java      |  4 +-
 .../fragment/gpodnet/SearchListFragment.java       |  2 +-
 .../de/danoeh/antennapod/receiver/SPAReceiver.java |  4 +-
 31 files changed, 100 insertions(+), 100 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java
index 4f56d9770..2b6cd8511 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java
@@ -19,7 +19,7 @@ import de.danoeh.antennapod.dialog.VariableSpeedDialog;
  * Activity for playing audio files.
  */
 public class AudioplayerActivity extends MediaplayerInfoActivity {
-    public static final String TAG = "AudioPlayerActivity";
+    private static final String TAG = "AudioPlayerActivity";
 
     private AtomicBoolean isSetup = new AtomicBoolean(false);
 
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/CastplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/CastplayerActivity.java
index a7e9b1e70..07eae3752 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/CastplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/CastplayerActivity.java
@@ -13,7 +13,7 @@ import de.danoeh.antennapod.core.service.playback.PlaybackService;
  * Activity for controlling the remote playback on a Cast device.
  */
 public class CastplayerActivity extends MediaplayerInfoActivity {
-    public static final String TAG = "CastPlayerActivity";
+    private static final String TAG = "CastPlayerActivity";
 
     private AtomicBoolean isSetup = new AtomicBoolean(false);
 
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
index c33ffe55d..16bd1217c 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
@@ -82,7 +82,7 @@ public class MainActivity extends CastEnabledActivity implements NavDrawerActivi
 
     public static final String PREF_NAME = "MainActivityPrefs";
     public static final String PREF_IS_FIRST_LAUNCH = "prefMainActivityIsFirstLaunch";
-    public static final String PREF_LAST_FRAGMENT_TAG = "prefMainActivityLastFragmentTag";
+    private static final String PREF_LAST_FRAGMENT_TAG = "prefMainActivityLastFragmentTag";
 
     public static final String EXTRA_NAV_TYPE = "nav_type";
     public static final String EXTRA_NAV_INDEX = "nav_index";
@@ -90,8 +90,8 @@ public class MainActivity extends CastEnabledActivity implements NavDrawerActivi
     public static final String EXTRA_FRAGMENT_ARGS = "fragment_args";
     public static final String EXTRA_FEED_ID = "fragment_feed_id";
 
-    public static final String SAVE_BACKSTACK_COUNT = "backstackCount";
-    public static final String SAVE_TITLE = "title";
+    private static final String SAVE_BACKSTACK_COUNT = "backstackCount";
+    private static final String SAVE_TITLE = "title";
 
     public static final String[] NAV_DRAWER_TAGS = {
             QueueFragment.TAG,
@@ -235,7 +235,7 @@ public class MainActivity extends CastEnabledActivity implements NavDrawerActivi
         }
     }
 
-    public void showDrawerPreferencesDialog() {
+    private void showDrawerPreferencesDialog() {
         final List<String> hiddenDrawerItems = UserPreferences.getHiddenDrawerItems();
         String[] navLabels = new String[NAV_DRAWER_TAGS.length];
         final boolean[] checked = new boolean[NAV_DRAWER_TAGS.length];
@@ -269,7 +269,7 @@ public class MainActivity extends CastEnabledActivity implements NavDrawerActivi
         return (navDrawerData != null) ? navDrawerData.feeds : null;
     }
 
-    public void loadFragment(int index, Bundle args) {
+    private void loadFragment(int index, Bundle args) {
         Log.d(TAG, "loadFragment(index: " + index + ", args: " + args + ")");
         if (index < navAdapter.getSubscriptionOffset()) {
             String tag = navAdapter.getTags().get(index);
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
index b0cbd355b..c74151111 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
@@ -67,19 +67,19 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements
     private static final String PREFS = "MediaPlayerActivityPreferences";
     private static final String PREF_SHOW_TIME_LEFT = "showTimeLeft";
 
-    protected PlaybackController controller;
+    PlaybackController controller;
 
-    protected TextView txtvPosition;
-    protected TextView txtvLength;
-    protected SeekBar sbPosition;
-    protected ImageButton butRev;
-    protected TextView txtvRev;
-    protected ImageButton butPlay;
-    protected ImageButton butFF;
-    protected TextView txtvFF;
-    protected ImageButton butSkip;
+    private TextView txtvPosition;
+    private TextView txtvLength;
+    SeekBar sbPosition;
+    private ImageButton butRev;
+    private TextView txtvRev;
+    private ImageButton butPlay;
+    private ImageButton butFF;
+    private TextView txtvFF;
+    private ImageButton butSkip;
 
-    protected boolean showTimeLeft = false;
+    private boolean showTimeLeft = false;
 
     private boolean isFavorite = false;
 
@@ -184,31 +184,31 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements
         };
     }
 
-    protected static TextView getTxtvFFFromActivity(MediaplayerActivity activity) {
+    private static TextView getTxtvFFFromActivity(MediaplayerActivity activity) {
         return activity.txtvFF;
     }
-    protected static TextView getTxtvRevFromActivity(MediaplayerActivity activity) {
+    private static TextView getTxtvRevFromActivity(MediaplayerActivity activity) {
         return activity.txtvRev;
     }
 
-    protected void onSetSpeedAbilityChanged() {
+    private void onSetSpeedAbilityChanged() {
         Log.d(TAG, "onSetSpeedAbilityChanged()");
         updatePlaybackSpeedButton();
     }
 
-    protected void onPlaybackSpeedChange() {
+    private void onPlaybackSpeedChange() {
         updatePlaybackSpeedButtonText();
     }
 
-    protected void onServiceQueried() {
+    private void onServiceQueried() {
         supportInvalidateOptionsMenu();
     }
 
-    protected void chooseTheme() {
+    void chooseTheme() {
         setTheme(UserPreferences.getTheme());
     }
 
-    protected void setScreenOn(boolean enable) {
+    void setScreenOn(boolean enable) {
     }
 
     @Override
@@ -249,7 +249,7 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements
      */
     protected abstract void onBufferEnd();
 
-    protected void onBufferUpdate(float progress) {
+    private void onBufferUpdate(float progress) {
         if (sbPosition != null) {
             sbPosition.setSecondaryProgress((int) progress * sbPosition.getMax());
         }
@@ -258,7 +258,7 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements
     /**
      * Current screen orientation.
      */
-    protected int orientation;
+    private int orientation;
 
     @Override
     protected void onStart() {
@@ -619,7 +619,7 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements
 
     protected abstract void clearStatusMsg();
 
-    protected void onPositionObserverUpdate() {
+    void onPositionObserverUpdate() {
         if (controller == null || txtvPosition == null || txtvLength == null) {
             return;
         }
@@ -655,7 +655,7 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements
      * to the PlaybackService to ensure that the activity has the right
      * FeedMedia object.
      */
-    protected boolean loadMediaInfo() {
+    boolean loadMediaInfo() {
         Log.d(TAG, "loadMediaInfo()");
         if(controller == null || controller.getMedia() == null) {
             return false;
@@ -669,11 +669,11 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements
         return true;
     }
 
-    protected void updatePlaybackSpeedButton() {
+    void updatePlaybackSpeedButton() {
         // Only meaningful on AudioplayerActivity, where it is overridden.
     }
 
-    protected void updatePlaybackSpeedButtonText() {
+    void updatePlaybackSpeedButtonText() {
         // Only meaningful on AudioplayerActivity, where it is overridden.
     }
 
@@ -763,7 +763,7 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements
         builder.create().show();
     }
 
-    protected void setupGUI() {
+    void setupGUI() {
         setContentView(getContentViewResourceId());
         sbPosition = (SeekBar) findViewById(R.id.sbPosition);
         txtvPosition = (TextView) findViewById(R.id.txtvPosition);
@@ -837,7 +837,7 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements
         }
     }
 
-    protected void onRewind() {
+    void onRewind() {
         if (controller == null) {
             return;
         }
@@ -845,14 +845,14 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements
         controller.seekTo(curr - UserPreferences.getRewindSecs() * 1000);
     }
 
-    protected void onPlayPause() {
+    void onPlayPause() {
         if(controller == null) {
             return;
         }
         controller.playPause();
     }
 
-    protected void onFastForward() {
+    void onFastForward() {
         if (controller == null) {
             return;
         }
@@ -862,7 +862,7 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements
 
     protected abstract int getContentViewResourceId();
 
-    void handleError(int errorCode) {
+    private void handleError(int errorCode) {
         final AlertDialog.Builder errorDialog = new AlertDialog.Builder(this);
         errorDialog.setTitle(R.string.error_label);
         errorDialog.setMessage(MediaPlayerError.getErrorString(this, errorCode));
@@ -875,7 +875,7 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements
         errorDialog.create().show();
     }
 
-    float prog;
+    private float prog;
 
     @Override
     public void onProgressChanged (SeekBar seekBar,int progress, boolean fromUser) {
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerInfoActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerInfoActivity.java
index d713f4b77..03b47e615 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerInfoActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerInfoActivity.java
@@ -77,11 +77,11 @@ public abstract class MediaplayerInfoActivity extends MediaplayerActivity implem
     private static final int POS_CHAPTERS = 2;
     private static final int NUM_CONTENT_FRAGMENTS = 3;
 
-    final String TAG = "MediaplayerInfoActivity";
+    private final String TAG = "MediaplayerInfoActivity";
     private static final String PREFS = "AudioPlayerActivityPreferences";
     private static final String PREF_KEY_SELECTED_FRAGMENT_POSITION = "selectedFragmentPosition";
 
-    public static final String[] NAV_DRAWER_TAGS = {
+    private static final String[] NAV_DRAWER_TAGS = {
             QueueFragment.TAG,
             EpisodesFragment.TAG,
             SubscriptionFragment.TAG,
@@ -91,8 +91,8 @@ public abstract class MediaplayerInfoActivity extends MediaplayerActivity implem
             NavListAdapter.SUBSCRIPTION_LIST_TAG
     };
 
-    protected Button butPlaybackSpeed;
-    protected ImageButton butCastDisconnect;
+    Button butPlaybackSpeed;
+    ImageButton butCastDisconnect;
     private DrawerLayout drawerLayout;
     private NavListAdapter navAdapter;
     private ListView navList;
@@ -151,7 +151,7 @@ public abstract class MediaplayerInfoActivity extends MediaplayerActivity implem
         setTheme(UserPreferences.getNoTitleTheme());
     }
 
-    protected void saveCurrentFragment() {
+    void saveCurrentFragment() {
         if(pager == null) {
             return;
         }
@@ -305,7 +305,7 @@ public abstract class MediaplayerInfoActivity extends MediaplayerActivity implem
         return true;
     }
 
-    public void notifyMediaPositionChanged() {
+    private void notifyMediaPositionChanged() {
         if(pagerAdapter == null) {
             return;
         }
@@ -446,7 +446,7 @@ public abstract class MediaplayerInfoActivity extends MediaplayerActivity implem
         }
     }
 
-    public void showDrawerPreferencesDialog() {
+    private void showDrawerPreferencesDialog() {
         final List<String> hiddenDrawerItems = UserPreferences.getHiddenDrawerItems();
         String[] navLabels = new String[NAV_DRAWER_TAGS.length];
         final boolean[] checked = new boolean[NAV_DRAWER_TAGS.length];
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
index 91c7c3f1b..d9fe1f6e7 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
@@ -83,7 +83,7 @@ public class OnlineFeedViewActivity extends AppCompatActivity {
     public static final String ARG_FEEDURL = "arg.feedurl";
     // Optional argument: specify a title for the actionbar.
     public static final String ARG_TITLE = "title";
-    public static final int RESULT_ERROR = 2;
+    private static final int RESULT_ERROR = 2;
     private static final String TAG = "OnlineFeedViewActivity";
     private static final int EVENTS = EventDistributor.FEED_LIST_UPDATE;
     private volatile List<Feed> feeds;
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportBaseActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportBaseActivity.java
index 07b0b3cdb..c04ae051e 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportBaseActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportBaseActivity.java
@@ -68,7 +68,7 @@ public class OpmlImportBaseActivity extends AppCompatActivity {
 		}
 	}
 
-	protected void importUri(@Nullable Uri uri) {
+	void importUri(@Nullable Uri uri) {
         if(uri == null) {
             new MaterialDialog.Builder(this)
                     .content(R.string.opml_import_error_no_file)
@@ -114,7 +114,7 @@ public class OpmlImportBaseActivity extends AppCompatActivity {
 	}
 
     /** Starts the import process. */
-    protected void startImport() {
+    private void startImport() {
         try {
             Reader mReader = new InputStreamReader(getContentResolver().openInputStream(uri), LangUtils.UTF_8);
             importWorker = new OpmlImportWorker(this, mReader) {
@@ -144,7 +144,7 @@ public class OpmlImportBaseActivity extends AppCompatActivity {
         }
     }
 
-    protected boolean finishWhenCanceled() {
+    boolean finishWhenCanceled() {
         return false;
     }
 
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
index fb5c4d273..08d4ac54c 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
@@ -173,7 +173,7 @@ public class VideoplayerActivity extends MediaplayerActivity {
         progressIndicator.setVisibility(View.INVISIBLE);
     }
 
-    View.OnTouchListener onVideoviewTouched = (v, event) -> {
+    private View.OnTouchListener onVideoviewTouched = (v, event) -> {
         if (event.getAction() == MotionEvent.ACTION_DOWN) {
             videoControlsHider.stop();
             toggleVideoControlsVisibility();
@@ -187,7 +187,7 @@ public class VideoplayerActivity extends MediaplayerActivity {
     };
 
     @SuppressLint("NewApi")
-    void setupVideoControlsToggler() {
+    private void setupVideoControlsToggler() {
         videoControlsHider.stop();
         videoControlsHider.start();
     }
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/gpoddernet/GpodnetAuthenticationActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/gpoddernet/GpodnetAuthenticationActivity.java
index 31d0fb1a3..8f447ac90 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/gpoddernet/GpodnetAuthenticationActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/gpoddernet/GpodnetAuthenticationActivity.java
@@ -61,7 +61,7 @@ public class GpodnetAuthenticationActivity extends AppCompatActivity {
     private volatile String password;
     private volatile GpodnetDevice selectedDevice;
 
-    View[] views;
+    private View[] views;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/ActionButtonCallback.java b/app/src/main/java/de/danoeh/antennapod/adapter/ActionButtonCallback.java
index c18564351..e6b42efcb 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/ActionButtonCallback.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/ActionButtonCallback.java
@@ -3,7 +3,7 @@ package de.danoeh.antennapod.adapter;
 import de.danoeh.antennapod.core.feed.FeedItem;
 import de.danoeh.antennapod.core.util.LongList;
 
-public interface ActionButtonCallback {
+interface ActionButtonCallback {
 	/** Is called when the action button of a list item has been pressed. */
 	void onActionButtonPressed(FeedItem item, LongList queueIds);
 }
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/ActionButtonUtils.java b/app/src/main/java/de/danoeh/antennapod/adapter/ActionButtonUtils.java
index f0210f983..a915692d1 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/ActionButtonUtils.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/ActionButtonUtils.java
@@ -16,7 +16,7 @@ import de.danoeh.antennapod.core.storage.DownloadRequester;
  * Utility methods for the action button that is displayed on the right hand side
  * of a listitem.
  */
-public class ActionButtonUtils {
+class ActionButtonUtils {
 
     private final int[] labels;
     private final TypedArray drawables;
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadlistAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadlistAdapter.java
index e1efdaa7b..f5865ba47 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadlistAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadlistAdapter.java
@@ -19,7 +19,7 @@ import de.danoeh.antennapod.core.util.ThemeUtils;
 
 public class DownloadlistAdapter extends BaseAdapter {
 
-    public static final int SELECTION_NONE = -1;
+    private static final int SELECTION_NONE = -1;
 
     private int selectedItemIndex;
     private ItemAccess itemAccess;
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java
index cbbeabf0d..963a24429 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java
@@ -48,10 +48,10 @@ import de.danoeh.antennapod.fragment.SubscriptionFragment;
 public class NavListAdapter extends BaseAdapter
         implements SharedPreferences.OnSharedPreferenceChangeListener {
 
-    public static final int VIEW_TYPE_COUNT = 3;
+    private static final int VIEW_TYPE_COUNT = 3;
     public static final int VIEW_TYPE_NAV = 0;
     public static final int VIEW_TYPE_SECTION_DIVIDER = 1;
-    public static final int VIEW_TYPE_SUBSCRIPTION = 2;
+    private static final int VIEW_TYPE_SUBSCRIPTION = 2;
 
     /**
      * a tag used as a placeholder to indicate if the subscription list should be displayed or not
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/StatisticsListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/StatisticsListAdapter.java
index c060083a6..8385ce2df 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/StatisticsListAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/StatisticsListAdapter.java
@@ -24,7 +24,7 @@ import de.danoeh.antennapod.core.util.Converter;
  */
 public class StatisticsListAdapter extends BaseAdapter {
     private Context context;
-    List<DBReader.StatisticsItem> feedTime = new ArrayList<>();
+    private List<DBReader.StatisticsItem> feedTime = new ArrayList<>();
     private boolean countAll = true;
 
     public StatisticsListAdapter(Context context) {
diff --git a/app/src/main/java/de/danoeh/antennapod/asynctask/ExportWorker.java b/app/src/main/java/de/danoeh/antennapod/asynctask/ExportWorker.java
index 192df8ca5..453a87b85 100644
--- a/app/src/main/java/de/danoeh/antennapod/asynctask/ExportWorker.java
+++ b/app/src/main/java/de/danoeh/antennapod/asynctask/ExportWorker.java
@@ -31,7 +31,7 @@ public class ExportWorker {
                 DEFAULT_OUTPUT_NAME + "." + exportWriter.fileExtension()));
     }
 
-    public ExportWorker(ExportWriter exportWriter, @NonNull File output) {
+    private ExportWorker(ExportWriter exportWriter, @NonNull File output) {
         this.exportWriter = exportWriter;
         this.output = output;
     }
diff --git a/app/src/main/java/de/danoeh/antennapod/config/ClientConfigurator.java b/app/src/main/java/de/danoeh/antennapod/config/ClientConfigurator.java
index f26f2ea76..d2498955c 100644
--- a/app/src/main/java/de/danoeh/antennapod/config/ClientConfigurator.java
+++ b/app/src/main/java/de/danoeh/antennapod/config/ClientConfigurator.java
@@ -6,7 +6,7 @@ import de.danoeh.antennapod.core.ClientConfig;
 /**
  * Configures the ClientConfig class of the core package.
  */
-public class ClientConfigurator {
+class ClientConfigurator {
 
     static {
         ClientConfig.USER_AGENT = "AntennaPod/" + BuildConfig.VERSION_NAME;
diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/EpisodesApplyActionFragment.java b/app/src/main/java/de/danoeh/antennapod/dialog/EpisodesApplyActionFragment.java
index ac073141d..04d4ae247 100644
--- a/app/src/main/java/de/danoeh/antennapod/dialog/EpisodesApplyActionFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/dialog/EpisodesApplyActionFragment.java
@@ -34,12 +34,12 @@ public class EpisodesApplyActionFragment extends Fragment {
 
     public String TAG = "EpisodeActionFragment";
 
-    public static final int ACTION_QUEUE = 1;
-    public static final int ACTION_MARK_PLAYED = 2;
-    public static final int ACTION_MARK_UNPLAYED = 4;
-    public static final int ACTION_DOWNLOAD = 8;
+    private static final int ACTION_QUEUE = 1;
+    private static final int ACTION_MARK_PLAYED = 2;
+    private static final int ACTION_MARK_UNPLAYED = 4;
+    private static final int ACTION_DOWNLOAD = 8;
     public static final int ACTION_REMOVE = 16;
-    public static final int ACTION_ALL = ACTION_QUEUE | ACTION_MARK_PLAYED | ACTION_MARK_UNPLAYED
+    private static final int ACTION_ALL = ACTION_QUEUE | ACTION_MARK_PLAYED | ACTION_MARK_UNPLAYED
             | ACTION_DOWNLOAD | ACTION_REMOVE;
 
     private ListView mListView;
diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/RatingDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/RatingDialog.java
index 64fc1fda4..72000170e 100644
--- a/app/src/main/java/de/danoeh/antennapod/dialog/RatingDialog.java
+++ b/app/src/main/java/de/danoeh/antennapod/dialog/RatingDialog.java
@@ -54,7 +54,7 @@ public class RatingDialog {
         }
     }
 
-    public static void rateNow() {
+    private static void rateNow() {
         Context context = mContext.get();
         if(context == null) {
             return;
@@ -67,11 +67,11 @@ public class RatingDialog {
         saveRated();
     }
 
-    public static boolean rated() {
+    private static boolean rated() {
         return mPreferences.getBoolean(KEY_RATED, false);
     }
 
-    public static void saveRated() {
+    private static void saveRated() {
         mPreferences
                 .edit()
                 .putBoolean(KEY_RATED, true)
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/AddFeedFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/AddFeedFragment.java
index f14ebbdaf..c050221e1 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/AddFeedFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/AddFeedFragment.java
@@ -25,7 +25,7 @@ public class AddFeedFragment extends Fragment {
     /**
      * Preset value for url text field.
      */
-    public static final String ARG_FEED_URL = "feedurl";
+    private static final String ARG_FEED_URL = "feedurl";
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java
index bbfd1688d..195b1558c 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java
@@ -69,24 +69,24 @@ public class AllEpisodesFragment extends Fragment {
     private static final String PREF_SCROLL_POSITION = "scroll_position";
     private static final String PREF_SCROLL_OFFSET = "scroll_offset";
 
-    protected RecyclerView recyclerView;
-    protected AllEpisodesRecycleAdapter listAdapter;
+    RecyclerView recyclerView;
+    AllEpisodesRecycleAdapter listAdapter;
     private ProgressBar progLoading;
 
-    protected List<FeedItem> episodes;
+    List<FeedItem> episodes;
     private List<Downloader> downloaderList;
 
     private boolean itemsLoaded = false;
     private boolean viewsCreated = false;
 
     private boolean isUpdatingFeeds;
-    protected boolean isMenuInvalidationAllowed = false;
+    boolean isMenuInvalidationAllowed = false;
 
-    protected Subscription subscription;
+    Subscription subscription;
     private LinearLayoutManager layoutManager;
 
-    protected boolean showOnlyNewEpisodes() { return false; }
-    protected String getPrefName() { return DEFAULT_PREF_NAME; }
+    boolean showOnlyNewEpisodes() { return false; }
+    String getPrefName() { return DEFAULT_PREF_NAME; }
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -165,7 +165,7 @@ public class AllEpisodesFragment extends Fragment {
         }
     }
 
-    protected void resetViewState() {
+    void resetViewState() {
         viewsCreated = false;
         listAdapter = null;
     }
@@ -299,10 +299,10 @@ public class AllEpisodesFragment extends Fragment {
                 R.layout.all_episodes_fragment);
     }
 
-    protected View onCreateViewHelper(LayoutInflater inflater,
-                                      ViewGroup container,
-                                      Bundle savedInstanceState,
-                                      int fragmentResource) {
+    View onCreateViewHelper(LayoutInflater inflater,
+                            ViewGroup container,
+                            Bundle savedInstanceState,
+                            int fragmentResource) {
         super.onCreateView(inflater, container, savedInstanceState);
 
         View root = inflater.inflate(fragmentResource, container, false);
@@ -346,7 +346,7 @@ public class AllEpisodesFragment extends Fragment {
         updateShowOnlyEpisodesListViewState();
     }
 
-    protected AllEpisodesRecycleAdapter.ItemAccess itemAccess = new AllEpisodesRecycleAdapter.ItemAccess() {
+    private AllEpisodesRecycleAdapter.ItemAccess itemAccess = new AllEpisodesRecycleAdapter.ItemAccess() {
 
         @Override
         public int getCount() {
@@ -459,7 +459,7 @@ public class AllEpisodesFragment extends Fragment {
     private void updateShowOnlyEpisodesListViewState() {
     }
 
-    protected void loadItems() {
+    void loadItems() {
         if(subscription != null) {
             subscription.unsubscribe();
         }
@@ -483,7 +483,7 @@ public class AllEpisodesFragment extends Fragment {
                 }, error -> Log.e(TAG, Log.getStackTraceString(error)));
     }
 
-    protected List<FeedItem> loadData() {
+    List<FeedItem> loadData() {
         return DBReader.getRecentlyPublishedEpisodes(RECENT_EPISODES_LIMIT);
     }
 
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/DownloadsFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/DownloadsFragment.java
index 52a38ccb9..6cc95c852 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/DownloadsFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/DownloadsFragment.java
@@ -25,7 +25,7 @@ public class DownloadsFragment extends Fragment {
     public static final String ARG_SELECTED_TAB = "selected_tab";
 
     public static final int POS_RUNNING = 0;
-    public static final int POS_COMPLETED = 1;
+    private static final int POS_COMPLETED = 1;
     public static final int POS_LOG = 2;
 
     private static final String PREF_LAST_TAB_POSITION = "tab_position";
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/EpisodesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/EpisodesFragment.java
index e2fbd91f3..6a7b40e28 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/EpisodesFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/EpisodesFragment.java
@@ -21,10 +21,10 @@ public class EpisodesFragment extends Fragment {
     public static final String TAG = "EpisodesFragment";
     private static final String PREF_LAST_TAB_POSITION = "tab_position";
 
-    public static final int POS_NEW_EPISODES = 0;
-    public static final int POS_ALL_EPISODES = 1;
-    public static final int POS_FAV_EPISODES = 2;
-    public static final int TOTAL_COUNT = 3;
+    private static final int POS_NEW_EPISODES = 0;
+    private static final int POS_ALL_EPISODES = 1;
+    private static final int POS_FAV_EPISODES = 2;
+    private static final int TOTAL_COUNT = 3;
 
 
     private TabLayout tabLayout;
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
index 5bb8e0a2d..a9bf39632 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
@@ -208,7 +208,7 @@ public class ExternalPlayerFragment extends Fragment {
         return controller;
     }
 
-    public void onPositionObserverUpdate() {
+    private void onPositionObserverUpdate() {
         mProgressBar.setProgress((int)
                 ((double) controller.getPosition() / controller.getDuration() * 100));
     }
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/FavoriteEpisodesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/FavoriteEpisodesFragment.java
index 234c8377d..76d19d61c 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/FavoriteEpisodesFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/FavoriteEpisodesFragment.java
@@ -26,7 +26,7 @@ import de.danoeh.antennapod.core.storage.DBWriter;
 
 public class FavoriteEpisodesFragment extends AllEpisodesFragment {
 
-    public static final String TAG = "FavoriteEpisodesFrag";
+    private static final String TAG = "FavoriteEpisodesFrag";
 
     private static final String PREF_NAME = "PrefFavoriteEpisodesFragment";
 
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/FyydSearchFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/FyydSearchFragment.java
index 7c1ec5ec1..0d1b1b7b6 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/FyydSearchFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/FyydSearchFragment.java
@@ -169,7 +169,7 @@ public class FyydSearchFragment extends Fragment {
         progressBar.setVisibility(View.VISIBLE);
     }
 
-    void processSearchResult(FyydResponse response) {
+    private void processSearchResult(FyydResponse response) {
         adapter.clear();
         if (!response.getData().isEmpty()) {
             adapter.clear();
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java
index 0d3f32c7f..e4bb0a28e 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java
@@ -87,9 +87,9 @@ public class ItemlistFragment extends ListFragment {
             | EventDistributor.PLAYER_STATUS_UPDATE;
 
     public static final String EXTRA_SELECTED_FEEDITEM = "extra.de.danoeh.antennapod.activity.selected_feeditem";
-    public static final String ARGUMENT_FEED_ID = "argument.de.danoeh.antennapod.feed_id";
+    private static final String ARGUMENT_FEED_ID = "argument.de.danoeh.antennapod.feed_id";
 
-    protected FeedItemlistAdapter adapter;
+    private FeedItemlistAdapter adapter;
     private ContextMenu contextMenu;
     private AdapterView.AdapterContextMenuInfo lastMenuInfo = null;
 
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ItunesSearchFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ItunesSearchFragment.java
index 43dedad25..08610c1f3 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ItunesSearchFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItunesSearchFragment.java
@@ -75,7 +75,7 @@ public class ItunesSearchFragment extends Fragment {
      * Replace adapter data with provided search results from SearchTask.
      * @param result List of Podcast objects containing search results
      */
-    void updateData(List<Podcast> result) {
+    private void updateData(List<Podcast> result) {
         this.searchResults = result;
         adapter.clear();
         if (result != null && result.size() > 0) {
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/GpodnetMainFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/GpodnetMainFragment.java
index aff5069c6..c5078eda0 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/GpodnetMainFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/GpodnetMainFragment.java
@@ -20,7 +20,7 @@ import de.danoeh.antennapod.R;
  */
 public class GpodnetMainFragment extends Fragment {
 
-    public static final String TAG = "GpodnetMainFragment";
+    private static final String TAG = "GpodnetMainFragment";
 
     private static final String PREF_LAST_TAB_POSITION = "tab_position";
     private TabLayout tabLayout;
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/PodcastListFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/PodcastListFragment.java
index a54c90862..055358c64 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/PodcastListFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/PodcastListFragment.java
@@ -91,7 +91,7 @@ public abstract class PodcastListFragment extends Fragment {
         return root;
     }
 
-    protected void onPodcastSelected(GpodnetPodcast selection) {
+    private void onPodcastSelected(GpodnetPodcast selection) {
         Log.d(TAG, "Selected podcast: " + selection.toString());
         Intent intent = new Intent(getActivity(), OnlineFeedViewActivity.class);
         intent.putExtra(OnlineFeedViewActivity.ARG_FEEDURL, selection.getUrl());
@@ -101,7 +101,7 @@ public abstract class PodcastListFragment extends Fragment {
 
     protected abstract List<GpodnetPodcast> loadPodcastData(GpodnetService service) throws GpodnetServiceException;
 
-    protected final void loadData() {
+    final void loadData() {
         AsyncTask<Void, Void, List<GpodnetPodcast>> loaderTask = new AsyncTask<Void, Void, List<GpodnetPodcast>>() {
             volatile Exception exception = null;
 
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/SearchListFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/SearchListFragment.java
index 613e06805..10bd636dd 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/SearchListFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/SearchListFragment.java
@@ -73,7 +73,7 @@ public class SearchListFragment extends PodcastListFragment {
         return service.searchPodcasts(query, 0);
     }
 
-    public void changeQuery(String query) {
+    private void changeQuery(String query) {
         Validate.notNull(query);
 
         this.query = query;
diff --git a/app/src/main/java/de/danoeh/antennapod/receiver/SPAReceiver.java b/app/src/main/java/de/danoeh/antennapod/receiver/SPAReceiver.java
index a373c5353..c9bd973cb 100644
--- a/app/src/main/java/de/danoeh/antennapod/receiver/SPAReceiver.java
+++ b/app/src/main/java/de/danoeh/antennapod/receiver/SPAReceiver.java
@@ -22,8 +22,8 @@ public class SPAReceiver extends BroadcastReceiver{
     private static final String TAG = "SPAReceiver";
 
     public static final String ACTION_SP_APPS_QUERY_FEEDS = "de.danoeh.antennapdsp.intent.SP_APPS_QUERY_FEEDS";
-    public static final String ACTION_SP_APPS_QUERY_FEEDS_REPSONSE = "de.danoeh.antennapdsp.intent.SP_APPS_QUERY_FEEDS_RESPONSE";
-    public static final String ACTION_SP_APPS_QUERY_FEEDS_REPSONSE_FEEDS_EXTRA = "feeds";
+    private static final String ACTION_SP_APPS_QUERY_FEEDS_REPSONSE = "de.danoeh.antennapdsp.intent.SP_APPS_QUERY_FEEDS_RESPONSE";
+    private static final String ACTION_SP_APPS_QUERY_FEEDS_REPSONSE_FEEDS_EXTRA = "feeds";
 
     @Override
     public void onReceive(Context context, Intent intent) {
-- 
cgit v1.2.3


From a49048c7f6b46551b7a4e6c09d45a51510475a95 Mon Sep 17 00:00:00 2001
From: Martin Fietz <martin.fietz@gmail.com>
Date: Sun, 14 Jan 2018 18:05:45 +0100
Subject: Add final modifiers

---
 .../java/de/danoeh/antennapod/activity/AudioplayerActivity.java   | 2 +-
 .../java/de/danoeh/antennapod/activity/CastplayerActivity.java    | 2 +-
 .../main/java/de/danoeh/antennapod/activity/FeedInfoActivity.java | 4 ++--
 app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java | 8 ++++----
 .../de/danoeh/antennapod/activity/MediaplayerInfoActivity.java    | 2 +-
 .../de/danoeh/antennapod/activity/OnlineFeedViewActivity.java     | 4 ++--
 .../java/de/danoeh/antennapod/activity/StorageErrorActivity.java  | 2 +-
 .../java/de/danoeh/antennapod/activity/VideoplayerActivity.java   | 6 +++---
 .../de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java   | 2 +-
 .../java/de/danoeh/antennapod/adapter/DownloadLogAdapter.java     | 4 ++--
 .../danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java  | 2 +-
 .../java/de/danoeh/antennapod/adapter/DownloadlistAdapter.java    | 6 +++---
 .../java/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java    | 8 ++++----
 .../main/java/de/danoeh/antennapod/adapter/NavListAdapter.java    | 4 ++--
 .../java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java   | 4 ++--
 .../java/de/danoeh/antennapod/adapter/StatisticsListAdapter.java  | 2 +-
 .../main/java/de/danoeh/antennapod/asynctask/ExportWorker.java    | 4 ++--
 .../main/java/de/danoeh/antennapod/asynctask/OpmlFeedQueuer.java  | 4 ++--
 .../java/de/danoeh/antennapod/asynctask/OpmlImportWorker.java     | 4 ++--
 app/src/main/java/de/danoeh/antennapod/dialog/ProxyDialog.java    | 2 +-
 .../main/java/de/danoeh/antennapod/dialog/SleepTimerDialog.java   | 2 +-
 .../java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java   | 4 ++--
 .../de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java | 4 ++--
 .../java/de/danoeh/antennapod/fragment/DownloadLogFragment.java   | 4 ++--
 .../java/de/danoeh/antennapod/fragment/DownloadsFragment.java     | 2 +-
 .../main/java/de/danoeh/antennapod/fragment/EpisodesFragment.java | 2 +-
 .../java/de/danoeh/antennapod/fragment/FyydSearchFragment.java    | 2 +-
 .../de/danoeh/antennapod/fragment/ItemDescriptionFragment.java    | 2 +-
 app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java | 4 ++--
 .../main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java | 4 ++--
 .../de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java    | 4 ++--
 .../main/java/de/danoeh/antennapod/fragment/QueueFragment.java    | 4 ++--
 .../de/danoeh/antennapod/fragment/RunningDownloadsFragment.java   | 2 +-
 .../java/de/danoeh/antennapod/fragment/SubscriptionFragment.java  | 4 ++--
 .../danoeh/antennapod/fragment/gpodnet/GpodnetMainFragment.java   | 2 +-
 .../java/de/danoeh/antennapod/service/PlayerWidgetService.java    | 4 ++--
 36 files changed, 63 insertions(+), 63 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java
index 2b6cd8511..123f66661 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java
@@ -21,7 +21,7 @@ import de.danoeh.antennapod.dialog.VariableSpeedDialog;
 public class AudioplayerActivity extends MediaplayerInfoActivity {
     private static final String TAG = "AudioPlayerActivity";
 
-    private AtomicBoolean isSetup = new AtomicBoolean(false);
+    private final AtomicBoolean isSetup = new AtomicBoolean(false);
 
     @Override
     protected void onResume() {
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/CastplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/CastplayerActivity.java
index 07eae3752..871e9c279 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/CastplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/CastplayerActivity.java
@@ -15,7 +15,7 @@ import de.danoeh.antennapod.core.service.playback.PlaybackService;
 public class CastplayerActivity extends MediaplayerInfoActivity {
     private static final String TAG = "CastPlayerActivity";
 
-    private AtomicBoolean isSetup = new AtomicBoolean(false);
+    private final AtomicBoolean isSetup = new AtomicBoolean(false);
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/FeedInfoActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/FeedInfoActivity.java
index 21951dc0e..7580becdc 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/FeedInfoActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/FeedInfoActivity.java
@@ -100,7 +100,7 @@ public class FeedInfoActivity extends AppCompatActivity {
 
     private boolean authInfoChanged = false;
 
-    private TextWatcher authTextWatcher = new TextWatcher() {
+    private final TextWatcher authTextWatcher = new TextWatcher() {
         @Override
         public void beforeTextChanged(CharSequence s, int start, int count, int after) {
         }
@@ -117,7 +117,7 @@ public class FeedInfoActivity extends AppCompatActivity {
 
     private boolean filterTextChanged = false;
 
-    private TextWatcher filterTextWatcher = new TextWatcher() {
+    private final TextWatcher filterTextWatcher = new TextWatcher() {
         @Override
         public void beforeTextChanged(CharSequence s, int start, int count, int after) {
         }
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
index 16bd1217c..f56dca173 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
@@ -398,7 +398,7 @@ public class MainActivity extends CastEnabledActivity implements NavDrawerActivi
         }
     }
 
-    private AdapterView.OnItemClickListener navListClickListener = new AdapterView.OnItemClickListener() {
+    private final AdapterView.OnItemClickListener navListClickListener = new AdapterView.OnItemClickListener() {
         @Override
         public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
             int viewType = parent.getAdapter().getItemViewType(position);
@@ -409,7 +409,7 @@ public class MainActivity extends CastEnabledActivity implements NavDrawerActivi
         }
     };
 
-    private AdapterView.OnItemLongClickListener newListLongClickListener = new AdapterView.OnItemLongClickListener() {
+    private final AdapterView.OnItemLongClickListener newListLongClickListener = new AdapterView.OnItemLongClickListener() {
         @Override
         public boolean onItemLongClick(AdapterView<?> parent, View view, int position, long id) {
             if(position < navAdapter.getTags().size()) {
@@ -630,7 +630,7 @@ public class MainActivity extends CastEnabledActivity implements NavDrawerActivi
     private DBReader.NavDrawerData navDrawerData;
     private int selectedNavListIndex = 0;
 
-    private NavListAdapter.ItemAccess itemAccess = new NavListAdapter.ItemAccess() {
+    private final NavListAdapter.ItemAccess itemAccess = new NavListAdapter.ItemAccess() {
         @Override
         public int getCount() {
             if (navDrawerData != null) {
@@ -748,7 +748,7 @@ public class MainActivity extends CastEnabledActivity implements NavDrawerActivi
         snackbar.show();
     }
 
-    private EventDistributor.EventListener contentUpdate = new EventDistributor.EventListener() {
+    private final EventDistributor.EventListener contentUpdate = new EventDistributor.EventListener() {
 
         @Override
         public void update(EventDistributor eventDistributor, Integer arg) {
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerInfoActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerInfoActivity.java
index 03b47e615..ae7040e0e 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerInfoActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerInfoActivity.java
@@ -496,7 +496,7 @@ public abstract class MediaplayerInfoActivity extends MediaplayerActivity implem
         snackbar.show();
     }
 
-    private EventDistributor.EventListener contentUpdate = new EventDistributor.EventListener() {
+    private final EventDistributor.EventListener contentUpdate = new EventDistributor.EventListener() {
 
         @Override
         public void update(EventDistributor eventDistributor, Integer arg) {
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
index d9fe1f6e7..2cec70ff6 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
@@ -100,7 +100,7 @@ public class OnlineFeedViewActivity extends AppCompatActivity {
     private Subscription download;
     private Subscription parser;
     private Subscription updater;
-    private EventDistributor.EventListener listener = new EventDistributor.EventListener() {
+    private final EventDistributor.EventListener listener = new EventDistributor.EventListener() {
         @Override
         public void update(EventDistributor eventDistributor, Integer arg) {
             if ((arg & EventDistributor.FEED_LIST_UPDATE) != 0) {
@@ -581,7 +581,7 @@ public class OnlineFeedViewActivity extends AppCompatActivity {
 
     private class FeedViewAuthenticationDialog extends AuthenticationDialog {
 
-        private String feedUrl;
+        private final String feedUrl;
 
         FeedViewAuthenticationDialog(Context context, int titleRes, String feedUrl) {
             super(context, titleRes, true, false, null, null);
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/StorageErrorActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/StorageErrorActivity.java
index d104a9e93..a2a49f54e 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/StorageErrorActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/StorageErrorActivity.java
@@ -164,7 +164,7 @@ public class StorageErrorActivity extends AppCompatActivity {
 		startActivity(new Intent(this, MainActivity.class));
 	}
 
-	private BroadcastReceiver mediaUpdate = new BroadcastReceiver() {
+	private final BroadcastReceiver mediaUpdate = new BroadcastReceiver() {
 
 		@Override
 		public void onReceive(Context context, Intent intent) {
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
index 08d4ac54c..921b6b6ce 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
@@ -45,7 +45,7 @@ public class VideoplayerActivity extends MediaplayerActivity {
 
     private VideoControlsHider videoControlsHider = new VideoControlsHider(this);
 
-    private AtomicBoolean isSetup = new AtomicBoolean(false);
+    private final AtomicBoolean isSetup = new AtomicBoolean(false);
 
     private LinearLayout controls;
     private LinearLayout videoOverlay;
@@ -173,7 +173,7 @@ public class VideoplayerActivity extends MediaplayerActivity {
         progressIndicator.setVisibility(View.INVISIBLE);
     }
 
-    private View.OnTouchListener onVideoviewTouched = (v, event) -> {
+    private final View.OnTouchListener onVideoviewTouched = (v, event) -> {
         if (event.getAction() == MotionEvent.ACTION_DOWN) {
             videoControlsHider.stop();
             toggleVideoControlsVisibility();
@@ -353,7 +353,7 @@ public class VideoplayerActivity extends MediaplayerActivity {
 
         private static final int DELAY = 2500;
 
-        private WeakReference<VideoplayerActivity> activity;
+        private final WeakReference<VideoplayerActivity> activity;
 
         public VideoControlsHider(VideoplayerActivity activity) {
             this.activity = new WeakReference<>(activity);
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java
index 172646211..715318db1 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java
@@ -225,7 +225,7 @@ public class AllEpisodesRecycleAdapter extends RecyclerView.Adapter<AllEpisodesR
         return pos;
     }
 
-    private View.OnClickListener secondaryActionListener = new View.OnClickListener() {
+    private final View.OnClickListener secondaryActionListener = new View.OnClickListener() {
         @Override
         public void onClick(View v) {
             FeedItem item = (FeedItem) v.getTag();
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadLogAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadLogAdapter.java
index e271b5eed..2c6aa8f72 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadLogAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadLogAdapter.java
@@ -31,9 +31,9 @@ public class DownloadLogAdapter extends BaseAdapter {
 
 	private final String TAG = "DownloadLogAdapter";
 
-	private Context context;
+	private final Context context;
 
-    private ItemAccess itemAccess;
+    private final ItemAccess itemAccess;
 
 	public DownloadLogAdapter(Context context, ItemAccess itemAccess) {
 		super();
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java
index 807a32d8a..c62c30c90 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java
@@ -110,7 +110,7 @@ public class DownloadedEpisodesListAdapter extends BaseAdapter {
         return convertView;
     }
 
-    private View.OnClickListener secondaryActionListener = new View.OnClickListener() {
+    private final View.OnClickListener secondaryActionListener = new View.OnClickListener() {
         @Override
         public void onClick(View v) {
             FeedItem item = (FeedItem) v.getTag();
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadlistAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadlistAdapter.java
index f5865ba47..5bc67a95a 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadlistAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadlistAdapter.java
@@ -22,8 +22,8 @@ public class DownloadlistAdapter extends BaseAdapter {
     private static final int SELECTION_NONE = -1;
 
     private int selectedItemIndex;
-    private ItemAccess itemAccess;
-    private Context context;
+    private final ItemAccess itemAccess;
+    private final Context context;
 
     public DownloadlistAdapter(Context context,
                                ItemAccess itemAccess) {
@@ -105,7 +105,7 @@ public class DownloadlistAdapter extends BaseAdapter {
         return convertView;
     }
 
-    private View.OnClickListener butSecondaryListener = new View.OnClickListener() {
+    private final View.OnClickListener butSecondaryListener = new View.OnClickListener() {
         @Override
         public void onClick(View v) {
             Downloader downloader = (Downloader) v.getTag();
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java
index 71d162645..e29781be1 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java
@@ -32,13 +32,13 @@ import de.danoeh.antennapod.core.util.ThemeUtils;
  */
 public class FeedItemlistAdapter extends BaseAdapter {
 
-    private ActionButtonCallback callback;
+    private final ActionButtonCallback callback;
     private final ItemAccess itemAccess;
     private final Context context;
-    private boolean showFeedtitle;
-    private int selectedItemIndex;
+    private final boolean showFeedtitle;
+    private final int selectedItemIndex;
     /** true if played items should be made partially transparent */
-    private boolean makePlayedItemsTransparent;
+    private final boolean makePlayedItemsTransparent;
     private final ActionButtonUtils actionButtonUtils;
 
     private static final int SELECTION_NONE = -1;
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java
index 963a24429..2daa5e70f 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java
@@ -62,8 +62,8 @@ public class NavListAdapter extends BaseAdapter
     private static List<String> tags;
     private static String[] titles;
 
-    private ItemAccess itemAccess;
-    private WeakReference<Activity> activity;
+    private final ItemAccess itemAccess;
+    private final WeakReference<Activity> activity;
     private boolean showSubscriptionList = true;
 
     public NavListAdapter(ItemAccess itemAccess, Activity context) {
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java
index 8eebc919a..01dd4c2de 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java
@@ -50,7 +50,7 @@ public class QueueRecyclerAdapter extends RecyclerView.Adapter<QueueRecyclerAdap
 
     private static final String TAG = QueueRecyclerAdapter.class.getSimpleName();
 
-    private WeakReference<MainActivity> mainActivity;
+    private final WeakReference<MainActivity> mainActivity;
     private final ItemAccess itemAccess;
     private final ActionButtonCallback actionButtonCallback;
     private final ActionButtonUtils actionButtonUtils;
@@ -304,7 +304,7 @@ public class QueueRecyclerAdapter extends RecyclerView.Adapter<QueueRecyclerAdap
 
     }
 
-    private View.OnClickListener secondaryActionListener = new View.OnClickListener() {
+    private final View.OnClickListener secondaryActionListener = new View.OnClickListener() {
         @Override
         public void onClick(View v) {
             FeedItem item = (FeedItem) v.getTag();
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/StatisticsListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/StatisticsListAdapter.java
index 8385ce2df..50255c11f 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/StatisticsListAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/StatisticsListAdapter.java
@@ -23,7 +23,7 @@ import de.danoeh.antennapod.core.util.Converter;
  * Adapter for the statistics list
  */
 public class StatisticsListAdapter extends BaseAdapter {
-    private Context context;
+    private final Context context;
     private List<DBReader.StatisticsItem> feedTime = new ArrayList<>();
     private boolean countAll = true;
 
diff --git a/app/src/main/java/de/danoeh/antennapod/asynctask/ExportWorker.java b/app/src/main/java/de/danoeh/antennapod/asynctask/ExportWorker.java
index 453a87b85..b6cf5cb84 100644
--- a/app/src/main/java/de/danoeh/antennapod/asynctask/ExportWorker.java
+++ b/app/src/main/java/de/danoeh/antennapod/asynctask/ExportWorker.java
@@ -23,8 +23,8 @@ public class ExportWorker {
     private static final String TAG = "ExportWorker";
     private static final String DEFAULT_OUTPUT_NAME = "antennapod-feeds";
 
-    private ExportWriter exportWriter;
-    private File output;
+    private final ExportWriter exportWriter;
+    private final File output;
 
     public ExportWorker(ExportWriter exportWriter) {
         this(exportWriter, new File(UserPreferences.getDataFolder(EXPORT_DIR),
diff --git a/app/src/main/java/de/danoeh/antennapod/asynctask/OpmlFeedQueuer.java b/app/src/main/java/de/danoeh/antennapod/asynctask/OpmlFeedQueuer.java
index 5529e772f..ea5128102 100644
--- a/app/src/main/java/de/danoeh/antennapod/asynctask/OpmlFeedQueuer.java
+++ b/app/src/main/java/de/danoeh/antennapod/asynctask/OpmlFeedQueuer.java
@@ -15,9 +15,9 @@ import de.danoeh.antennapod.core.storage.DownloadRequester;
 
 /** Queues items for download in the background. */
 public class OpmlFeedQueuer extends AsyncTask<Void, Void, Void> {
-	private Context context;
+	private final Context context;
 	private ProgressDialog progDialog;
-	private int[] selection;
+	private final int[] selection;
 
 	public OpmlFeedQueuer(Context context, int[] selection) {
 		super();
diff --git a/app/src/main/java/de/danoeh/antennapod/asynctask/OpmlImportWorker.java b/app/src/main/java/de/danoeh/antennapod/asynctask/OpmlImportWorker.java
index 445b74d85..13b95907f 100644
--- a/app/src/main/java/de/danoeh/antennapod/asynctask/OpmlImportWorker.java
+++ b/app/src/main/java/de/danoeh/antennapod/asynctask/OpmlImportWorker.java
@@ -20,12 +20,12 @@ public class OpmlImportWorker extends
 		AsyncTask<Void, Void, ArrayList<OpmlElement>> {
 	private static final String TAG = "OpmlImportWorker";
 
-	private Context context;
+	private final Context context;
 	private Exception exception;
 
 	private ProgressDialog progDialog;
 
-    private Reader mReader;
+    private final Reader mReader;
 
     public OpmlImportWorker(Context context, Reader reader) {
         super();
diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/ProxyDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/ProxyDialog.java
index 53d200991..b9276982a 100644
--- a/app/src/main/java/de/danoeh/antennapod/dialog/ProxyDialog.java
+++ b/app/src/main/java/de/danoeh/antennapod/dialog/ProxyDialog.java
@@ -43,7 +43,7 @@ public class ProxyDialog {
 
     private static final String TAG = "ProxyDialog";
 
-    private Context context;
+    private final Context context;
 
     private MaterialDialog dialog;
 
diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/SleepTimerDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/SleepTimerDialog.java
index 5bb3f09c3..be7850495 100644
--- a/app/src/main/java/de/danoeh/antennapod/dialog/SleepTimerDialog.java
+++ b/app/src/main/java/de/danoeh/antennapod/dialog/SleepTimerDialog.java
@@ -24,7 +24,7 @@ public abstract class SleepTimerDialog {
     
     private static final String TAG = SleepTimerDialog.class.getSimpleName();
 
-    private Context context;
+    private final Context context;
 
     private MaterialDialog dialog;
     private EditText etxtTime;
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java
index 195b1558c..d750f7fe3 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java
@@ -346,7 +346,7 @@ public class AllEpisodesFragment extends Fragment {
         updateShowOnlyEpisodesListViewState();
     }
 
-    private AllEpisodesRecycleAdapter.ItemAccess itemAccess = new AllEpisodesRecycleAdapter.ItemAccess() {
+    private final AllEpisodesRecycleAdapter.ItemAccess itemAccess = new AllEpisodesRecycleAdapter.ItemAccess() {
 
         @Override
         public int getCount() {
@@ -444,7 +444,7 @@ public class AllEpisodesFragment extends Fragment {
         }
     }
 
-    private EventDistributor.EventListener contentUpdate = new EventDistributor.EventListener() {
+    private final EventDistributor.EventListener contentUpdate = new EventDistributor.EventListener() {
         @Override
         public void update(EventDistributor eventDistributor, Integer arg) {
             if ((arg & EVENTS) != 0) {
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java
index 1ba7ed557..f37ecd5e7 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java
@@ -168,7 +168,7 @@ public class CompletedDownloadsFragment extends ListFragment {
         }
     }
 
-    private DownloadedEpisodesListAdapter.ItemAccess itemAccess = new DownloadedEpisodesListAdapter.ItemAccess() {
+    private final DownloadedEpisodesListAdapter.ItemAccess itemAccess = new DownloadedEpisodesListAdapter.ItemAccess() {
         @Override
         public int getCount() {
             return (items != null) ? items.size() : 0;
@@ -189,7 +189,7 @@ public class CompletedDownloadsFragment extends ListFragment {
         }
     };
 
-    private EventDistributor.EventListener contentUpdate = new EventDistributor.EventListener() {
+    private final EventDistributor.EventListener contentUpdate = new EventDistributor.EventListener() {
         @Override
         public void update(EventDistributor eventDistributor, Integer arg) {
             if ((arg & EVENTS) != 0) {
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/DownloadLogFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/DownloadLogFragment.java
index 0a710196a..9a4c9e030 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/DownloadLogFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/DownloadLogFragment.java
@@ -82,7 +82,7 @@ public class DownloadLogFragment extends ListFragment {
         getActivity().supportInvalidateOptionsMenu();
     }
 
-    private DownloadLogAdapter.ItemAccess itemAccess = new DownloadLogAdapter.ItemAccess() {
+    private final DownloadLogAdapter.ItemAccess itemAccess = new DownloadLogAdapter.ItemAccess() {
 
         @Override
         public int getCount() {
@@ -99,7 +99,7 @@ public class DownloadLogFragment extends ListFragment {
         }
     };
 
-    private EventDistributor.EventListener contentUpdate = new EventDistributor.EventListener() {
+    private final EventDistributor.EventListener contentUpdate = new EventDistributor.EventListener() {
 
         @Override
         public void update(EventDistributor eventDistributor, Integer arg) {
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/DownloadsFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/DownloadsFragment.java
index 6cc95c852..0e9e36df0 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/DownloadsFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/DownloadsFragment.java
@@ -80,7 +80,7 @@ public class DownloadsFragment extends Fragment {
 
     public class DownloadsPagerAdapter extends FragmentPagerAdapter {
 
-        Resources resources;
+        final Resources resources;
 
         public DownloadsPagerAdapter(FragmentManager fm, Resources resources) {
             super(fm);
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/EpisodesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/EpisodesFragment.java
index 6a7b40e28..8928d2bf3 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/EpisodesFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/EpisodesFragment.java
@@ -79,7 +79,7 @@ public class EpisodesFragment extends Fragment {
     public static class EpisodesPagerAdapter extends FragmentPagerAdapter {
 
         private final Resources resources;
-        private AllEpisodesFragment[] fragments = {
+        private final AllEpisodesFragment[] fragments = {
                 new NewEpisodesFragment(),
                 new AllEpisodesFragment(),
                 new FavoriteEpisodesFragment()
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/FyydSearchFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/FyydSearchFragment.java
index 0d1b1b7b6..6ee9ce467 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/FyydSearchFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/FyydSearchFragment.java
@@ -49,7 +49,7 @@ public class FyydSearchFragment extends Fragment {
     private Button butRetry;
     private TextView txtvEmpty;
 
-    private FyydClient client = new FyydClient(AntennapodHttpClient.getHttpClient());
+    private final FyydClient client = new FyydClient(AntennapodHttpClient.getHttpClient());
 
     /**
      * List of podcasts retreived from the search
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java
index ffc0c4c8d..935fd7898 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java
@@ -200,7 +200,7 @@ public class ItemDescriptionFragment extends Fragment implements MediaplayerInfo
     }
 
 
-    private View.OnLongClickListener webViewLongClickListener = new View.OnLongClickListener() {
+    private final View.OnLongClickListener webViewLongClickListener = new View.OnLongClickListener() {
 
         @Override
         public boolean onLongClick(View v) {
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 da7fc5299..66c01845c 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
@@ -449,7 +449,7 @@ public class ItemFragment extends Fragment implements OnSwipeGesture {
         }
     }
 
-    private View.OnLongClickListener webViewLongClickListener = new View.OnLongClickListener() {
+    private final View.OnLongClickListener webViewLongClickListener = new View.OnLongClickListener() {
 
         @Override
         public boolean onLongClick(View v) {
@@ -551,7 +551,7 @@ public class ItemFragment extends Fragment implements OnSwipeGesture {
     }
 
 
-    private EventDistributor.EventListener contentUpdate = new EventDistributor.EventListener() {
+    private final EventDistributor.EventListener contentUpdate = new EventDistributor.EventListener() {
         @Override
         public void update(EventDistributor eventDistributor, Integer arg) {
             if ((arg & EVENTS) != 0) {
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java
index e4bb0a28e..d9db41f82 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java
@@ -405,7 +405,7 @@ public class ItemlistFragment extends ListFragment {
         }
     }
 
-    private EventDistributor.EventListener contentUpdate = new EventDistributor.EventListener() {
+    private final EventDistributor.EventListener contentUpdate = new EventDistributor.EventListener() {
 
         @Override
         public void update(EventDistributor eventDistributor, Integer arg) {
@@ -571,7 +571,7 @@ public class ItemlistFragment extends ListFragment {
         }
     }
 
-    private FeedItemlistAdapter.ItemAccess itemAccess = new FeedItemlistAdapter.ItemAccess() {
+    private final FeedItemlistAdapter.ItemAccess itemAccess = new FeedItemlistAdapter.ItemAccess() {
 
         @Override
         public FeedItem getItem(int position) {
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java
index 441f0096c..fb6280021 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java
@@ -199,7 +199,7 @@ public class PlaybackHistoryFragment extends ListFragment {
         }
     }
 
-    private EventDistributor.EventListener contentUpdate = new EventDistributor.EventListener() {
+    private final EventDistributor.EventListener contentUpdate = new EventDistributor.EventListener() {
 
         @Override
         public void update(EventDistributor eventDistributor, Integer arg) {
@@ -224,7 +224,7 @@ public class PlaybackHistoryFragment extends ListFragment {
         getActivity().supportInvalidateOptionsMenu();
     }
 
-    private FeedItemlistAdapter.ItemAccess itemAccess = new FeedItemlistAdapter.ItemAccess() {
+    private final FeedItemlistAdapter.ItemAccess itemAccess = new FeedItemlistAdapter.ItemAccess() {
 
         @Override
         public int getItemDownloadProgressPercent(FeedItem item) {
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
index fccb86076..f7624a5e9 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
@@ -519,7 +519,7 @@ public class QueueFragment extends Fragment {
         infoBar.setText(info);
     }
 
-    private QueueRecyclerAdapter.ItemAccess itemAccess = new QueueRecyclerAdapter.ItemAccess() {
+    private final QueueRecyclerAdapter.ItemAccess itemAccess = new QueueRecyclerAdapter.ItemAccess() {
         @Override
         public int getCount() {
             return queue != null ? queue.size() : 0;
@@ -579,7 +579,7 @@ public class QueueFragment extends Fragment {
         }
     };
 
-    private EventDistributor.EventListener contentUpdate = new EventDistributor.EventListener() {
+    private final EventDistributor.EventListener contentUpdate = new EventDistributor.EventListener() {
         @Override
         public void update(EventDistributor eventDistributor, Integer arg) {
             if ((arg & EVENTS) != 0) {
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/RunningDownloadsFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/RunningDownloadsFragment.java
index ba526edb3..66c59b7f7 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/RunningDownloadsFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/RunningDownloadsFragment.java
@@ -75,7 +75,7 @@ public class RunningDownloadsFragment extends ListFragment {
     }
 
 
-    private DownloadlistAdapter.ItemAccess itemAccess = new DownloadlistAdapter.ItemAccess() {
+    private final DownloadlistAdapter.ItemAccess itemAccess = new DownloadlistAdapter.ItemAccess() {
         @Override
         public int getCount() {
             return (downloaderList != null) ? downloaderList.size() : 0;
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/SubscriptionFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/SubscriptionFragment.java
index 9626e6c2e..c834b7ea7 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/SubscriptionFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/SubscriptionFragment.java
@@ -210,7 +210,7 @@ public class SubscriptionFragment extends Fragment {
         loadSubscriptions();
     }
 
-    private EventDistributor.EventListener contentUpdate = new EventDistributor.EventListener() {
+    private final EventDistributor.EventListener contentUpdate = new EventDistributor.EventListener() {
         @Override
         public void update(EventDistributor eventDistributor, Integer arg) {
             if ((EVENTS & arg) != 0) {
@@ -220,7 +220,7 @@ public class SubscriptionFragment extends Fragment {
         }
     };
 
-    private SubscriptionsAdapter.ItemAccess itemAccess = new SubscriptionsAdapter.ItemAccess() {
+    private final SubscriptionsAdapter.ItemAccess itemAccess = new SubscriptionsAdapter.ItemAccess() {
         @Override
         public int getCount() {
             if (navDrawerData != null) {
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/GpodnetMainFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/GpodnetMainFragment.java
index c5078eda0..b48027668 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/GpodnetMainFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/GpodnetMainFragment.java
@@ -71,7 +71,7 @@ public class GpodnetMainFragment extends Fragment {
         private static final int POS_TAGS = 1;
         private static final int POS_SUGGESTIONS = 2;
 
-        Resources resources;
+        final Resources resources;
 
         public GpodnetPagerAdapter(FragmentManager fm, Resources resources) {
             super(fm);
diff --git a/app/src/main/java/de/danoeh/antennapod/service/PlayerWidgetService.java b/app/src/main/java/de/danoeh/antennapod/service/PlayerWidgetService.java
index 53d4aba16..d5141bd37 100644
--- a/app/src/main/java/de/danoeh/antennapod/service/PlayerWidgetService.java
+++ b/app/src/main/java/de/danoeh/antennapod/service/PlayerWidgetService.java
@@ -193,7 +193,7 @@ public class PlayerWidgetService extends Service {
         }
     }
 
-    private ServiceConnection mConnection = new ServiceConnection() {
+    private final ServiceConnection mConnection = new ServiceConnection() {
         public void onServiceConnected(ComponentName className, IBinder service) {
             Log.d(TAG, "Connection to service established");
             synchronized (psLock) {
@@ -223,7 +223,7 @@ public class PlayerWidgetService extends Service {
 
     class ViewUpdater extends Thread {
         private static final String THREAD_NAME = "ViewUpdater";
-        private PlayerWidgetService service;
+        private final PlayerWidgetService service;
 
         public ViewUpdater(PlayerWidgetService service) {
             super();
-- 
cgit v1.2.3


From b80d6a7914d82b1bd2525fa1d3d1178c0a5e3269 Mon Sep 17 00:00:00 2001
From: Martin Fietz <martin.fietz@gmail.com>
Date: Sun, 14 Jan 2018 18:06:24 +0100
Subject: Remove redundant throws clauses

---
 .../main/java/de/danoeh/antennapod/adapter/itunes/ItunesAdapter.java    | 2 +-
 .../main/java/de/danoeh/antennapod/menuhandler/FeedItemMenuHandler.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/itunes/ItunesAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/itunes/ItunesAdapter.java
index f1f8be559..10b5330c1 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/itunes/ItunesAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/itunes/ItunesAdapter.java
@@ -124,7 +124,7 @@ public class ItunesAdapter extends ArrayAdapter<ItunesAdapter.Podcast> {
          * @param json object holding the podcast information
          * @throws JSONException
          */
-        public static Podcast fromSearch(JSONObject json) throws JSONException {
+        public static Podcast fromSearch(JSONObject json) {
             String title = json.optString("collectionName", "");
             String imageUrl = json.optString("artworkUrl100", null);
             String feedUrl = json.optString("feedUrl", null);
diff --git a/app/src/main/java/de/danoeh/antennapod/menuhandler/FeedItemMenuHandler.java b/app/src/main/java/de/danoeh/antennapod/menuhandler/FeedItemMenuHandler.java
index 57b7c359c..895829a49 100644
--- a/app/src/main/java/de/danoeh/antennapod/menuhandler/FeedItemMenuHandler.java
+++ b/app/src/main/java/de/danoeh/antennapod/menuhandler/FeedItemMenuHandler.java
@@ -155,7 +155,7 @@ public class FeedItemMenuHandler {
     }
 
     public static boolean onMenuItemClicked(Context context, int menuItemId,
-                                            FeedItem selectedItem) throws DownloadRequestException {
+                                            FeedItem selectedItem) {
         switch (menuItemId) {
             case R.id.skip_episode_item:
                 context.sendBroadcast(new Intent(PlaybackService.ACTION_SKIP_CURRENT_EPISODE));
-- 
cgit v1.2.3


From 44f80a9831f51283b757016e41afb89a9610494e Mon Sep 17 00:00:00 2001
From: Martin Fietz <martin.fietz@gmail.com>
Date: Sun, 14 Jan 2018 18:08:48 +0100
Subject: static modifier is redundant for inner enums

---
 .../main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
index c74151111..232ff4311 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
@@ -680,7 +680,7 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements
     /**
      * Abstract directions to skip forward or back (rewind) and encapsulates behavior to get or set preference (including update of UI on the skip buttons).
      */
-    static public enum SkipDirection {
+    public enum SkipDirection {
         SKIP_FORWARD(
                 UserPreferences::getFastForwardSecs,
                 MediaplayerActivity::getTxtvFFFromActivity,
-- 
cgit v1.2.3


From b38d016ec3ff1123de02fbd5556418c1e5a8c5b8 Mon Sep 17 00:00:00 2001
From: Martin Fietz <martin.fietz@gmail.com>
Date: Sun, 14 Jan 2018 18:41:26 +0100
Subject: Remove catch for exception that is never thrown

---
 .../java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java   | 8 +-------
 app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java | 8 +-------
 .../main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java | 7 +------
 .../main/java/de/danoeh/antennapod/fragment/QueueFragment.java    | 8 +-------
 .../de/danoeh/antennapod/menuhandler/FeedItemMenuHandler.java     | 1 -
 5 files changed, 4 insertions(+), 28 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java
index d750f7fe3..f3846c8a4 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java
@@ -284,13 +284,7 @@ public class AllEpisodesFragment extends Fragment {
             return super.onContextItemSelected(item);
         }
 
-        try {
-            return FeedItemMenuHandler.onMenuItemClicked(getActivity(), item.getItemId(), selectedItem);
-        } catch (DownloadRequestException e) {
-            e.printStackTrace();
-            Toast.makeText(getActivity(), e.getMessage(), Toast.LENGTH_LONG).show();
-            return true;
-        }
+        return FeedItemMenuHandler.onMenuItemClicked(getActivity(), item.getItemId(), selectedItem);
     }
 
     @Override
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 66c01845c..4ae6b97ee 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
@@ -334,13 +334,7 @@ public class ItemFragment extends Fragment implements OnSwipeGesture {
                 openPodcast();
                 return true;
             default:
-                try {
-                    return FeedItemMenuHandler.onMenuItemClicked(getActivity(), menuItem.getItemId(), item);
-                } catch (DownloadRequestException e) {
-                    e.printStackTrace();
-                    Toast.makeText(getActivity(), e.getMessage(), Toast.LENGTH_LONG).show();
-                    return true;
-                }
+                return FeedItemMenuHandler.onMenuItemClicked(getActivity(), menuItem.getItemId(), item);
         }
     }
 
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java
index d9db41f82..890f31f57 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java
@@ -340,12 +340,7 @@ public class ItemlistFragment extends ListFragment {
             return super.onContextItemSelected(item);
         }
 
-        try {
-            return FeedItemMenuHandler.onMenuItemClicked(getActivity(), item.getItemId(), selectedItem);
-        } catch (DownloadRequestException e) {
-            // context menu doesn't contain download functionality
-            return true;
-        }
+        return FeedItemMenuHandler.onMenuItemClicked(getActivity(), item.getItemId(), selectedItem);
     }
 
     @Override
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
index f7624a5e9..bf22e71f5 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
@@ -363,13 +363,7 @@ public class QueueFragment extends Fragment {
                 DBWriter.moveQueueItemToBottom(selectedItem.getId(), true);
                 return true;
             default:
-                try {
-                    return FeedItemMenuHandler.onMenuItemClicked(getActivity(), item.getItemId(), selectedItem);
-                } catch (DownloadRequestException e) {
-                    e.printStackTrace();
-                    Toast.makeText(getActivity(), e.getMessage(), Toast.LENGTH_LONG).show();
-                    return true;
-                }
+                return FeedItemMenuHandler.onMenuItemClicked(getActivity(), item.getItemId(), selectedItem);
         }
     }
 
diff --git a/app/src/main/java/de/danoeh/antennapod/menuhandler/FeedItemMenuHandler.java b/app/src/main/java/de/danoeh/antennapod/menuhandler/FeedItemMenuHandler.java
index 895829a49..f6f73e017 100644
--- a/app/src/main/java/de/danoeh/antennapod/menuhandler/FeedItemMenuHandler.java
+++ b/app/src/main/java/de/danoeh/antennapod/menuhandler/FeedItemMenuHandler.java
@@ -17,7 +17,6 @@ import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.core.service.playback.PlaybackService;
 import de.danoeh.antennapod.core.storage.DBTasks;
 import de.danoeh.antennapod.core.storage.DBWriter;
-import de.danoeh.antennapod.core.storage.DownloadRequestException;
 import de.danoeh.antennapod.core.util.IntentUtils;
 import de.danoeh.antennapod.core.util.LongList;
 import de.danoeh.antennapod.core.util.ShareUtils;
-- 
cgit v1.2.3


From e56e3868da4d4440adf6181c5cef0bf1bcf1906e Mon Sep 17 00:00:00 2001
From: Martin Fietz <martin.fietz@gmail.com>
Date: Sun, 14 Jan 2018 18:42:26 +0100
Subject: Variable cannot be final

---
 .../de/danoeh/antennapod/activity/VideoplayerActivity.java | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
index 921b6b6ce..e8821c2e2 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
@@ -7,6 +7,7 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.support.v4.view.WindowCompat;
+import android.support.v7.app.ActionBar;
 import android.util.Log;
 import android.util.Pair;
 import android.view.MotionEvent;
@@ -353,20 +354,23 @@ public class VideoplayerActivity extends MediaplayerActivity {
 
         private static final int DELAY = 2500;
 
-        private final WeakReference<VideoplayerActivity> activity;
+        private WeakReference<VideoplayerActivity> activity;
 
-        public VideoControlsHider(VideoplayerActivity activity) {
+        VideoControlsHider(VideoplayerActivity activity) {
             this.activity = new WeakReference<>(activity);
         }
 
         private final Runnable hideVideoControls = () -> {
-            VideoplayerActivity vpa = activity.get();
+            VideoplayerActivity vpa = activity != null ? activity.get() : null;
             if(vpa == null) {
                 return;
             }
             if (vpa.videoControlsShowing) {
                 Log.d(TAG, "Hiding video controls");
-                vpa.getSupportActionBar().hide();
+                ActionBar actionBar = vpa.getSupportActionBar();
+                if(actionBar != null) {
+                    actionBar.hide();
+                }
                 vpa.hideVideoControls();
                 vpa.videoControlsShowing = false;
             }
@@ -376,7 +380,7 @@ public class VideoplayerActivity extends MediaplayerActivity {
             this.postDelayed(hideVideoControls, DELAY);
         }
 
-        public void stop() {
+        void stop() {
             this.removeCallbacks(hideVideoControls);
         }
 
-- 
cgit v1.2.3


From 118d9103c124700d82f5f50e2b8a7b2b8a5cb4ad Mon Sep 17 00:00:00 2001
From: Andrew Gaul <andrew@gaul.org>
Date: Sat, 20 Jan 2018 18:26:08 -0800
Subject: Make some inner classes static

This avoids an implicit this field and can help GC.  Found via
error-prone.
---
 app/src/main/java/de/danoeh/antennapod/activity/FeedInfoActivity.java   | 2 +-
 .../main/java/de/danoeh/antennapod/adapter/itunes/ItunesAdapter.java    | 2 +-
 app/src/main/java/de/danoeh/antennapod/fragment/DownloadsFragment.java  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/FeedInfoActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/FeedInfoActivity.java
index 21951dc0e..cc9db5e6e 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/FeedInfoActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/FeedInfoActivity.java
@@ -379,7 +379,7 @@ public class FeedInfoActivity extends AppCompatActivity {
         }
     }
 
-    private class ApplyToEpisodesDialog extends ConfirmationDialog {
+    private static class ApplyToEpisodesDialog extends ConfirmationDialog {
 
         private final Feed feed;
         private final boolean autoDownload;
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/itunes/ItunesAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/itunes/ItunesAdapter.java
index f1f8be559..64912ba9b 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/itunes/ItunesAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/itunes/ItunesAdapter.java
@@ -162,7 +162,7 @@ public class ItunesAdapter extends ArrayAdapter<ItunesAdapter.Podcast> {
     /**
      * View holder object for the GridView
      */
-    class PodcastViewHolder {
+    static class PodcastViewHolder {
 
         /**
          * ImageView holding the Podcast image
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/DownloadsFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/DownloadsFragment.java
index 52a38ccb9..5d29f4bde 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/DownloadsFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/DownloadsFragment.java
@@ -78,7 +78,7 @@ public class DownloadsFragment extends Fragment {
         viewPager.setCurrentItem(lastPosition);
     }
 
-    public class DownloadsPagerAdapter extends FragmentPagerAdapter {
+    public static class DownloadsPagerAdapter extends FragmentPagerAdapter {
 
         Resources resources;
 
-- 
cgit v1.2.3


From 404f241891891b71adcf2364446302886b5d3252 Mon Sep 17 00:00:00 2001
From: Andrew Gaul <andrew@gaul.org>
Date: Sat, 20 Jan 2018 18:27:44 -0800
Subject: Make some static fields final

Adding final prohibits modification and allows initialization of
primitive and String fields at compile time instead of runtime in
clinit:

https://developer.android.com/training/articles/perf-tips.html#UseFinal

Found via error-prone.
---
 .../java/de/danoeh/antennapod/activity/MediaplayerInfoActivity.java     | 2 +-
 app/src/main/java/de/danoeh/antennapod/adapter/DownloadLogAdapter.java  | 2 +-
 .../java/de/danoeh/antennapod/dialog/EpisodesApplyActionFragment.java   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerInfoActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerInfoActivity.java
index 3b1427f1b..d85c2fe8f 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerInfoActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerInfoActivity.java
@@ -77,7 +77,7 @@ public abstract class MediaplayerInfoActivity extends MediaplayerActivity implem
     private static final int POS_CHAPTERS = 2;
     private static final int NUM_CONTENT_FRAGMENTS = 3;
 
-    final String TAG = "MediaplayerInfoActivity";
+    final static String TAG = "MediaplayerInfoActivity";
     private static final String PREFS = "AudioPlayerActivityPreferences";
     private static final String PREF_KEY_SELECTED_FRAGMENT_POSITION = "selectedFragmentPosition";
 
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadLogAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadLogAdapter.java
index e271b5eed..679aca989 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadLogAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadLogAdapter.java
@@ -29,7 +29,7 @@ import de.danoeh.antennapod.core.storage.DownloadRequestException;
 /** Displays a list of DownloadStatus entries. */
 public class DownloadLogAdapter extends BaseAdapter {
 
-	private final String TAG = "DownloadLogAdapter";
+	private static final String TAG = "DownloadLogAdapter";
 
 	private Context context;
 
diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/EpisodesApplyActionFragment.java b/app/src/main/java/de/danoeh/antennapod/dialog/EpisodesApplyActionFragment.java
index ac073141d..3d577553c 100644
--- a/app/src/main/java/de/danoeh/antennapod/dialog/EpisodesApplyActionFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/dialog/EpisodesApplyActionFragment.java
@@ -32,7 +32,7 @@ import de.danoeh.antennapod.core.util.LongList;
 
 public class EpisodesApplyActionFragment extends Fragment {
 
-    public String TAG = "EpisodeActionFragment";
+    public static final String TAG = "EpisodeActionFragment";
 
     public static final int ACTION_QUEUE = 1;
     public static final int ACTION_MARK_PLAYED = 2;
-- 
cgit v1.2.3


From 06113b089190f9a4ccfac685b17e38f03964a71e Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Sun, 21 Jan 2018 12:47:04 +0100
Subject: Removed unused import

---
 app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java | 1 -
 1 file changed, 1 deletion(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
index 37afe21be..ffc33eb1a 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
@@ -38,7 +38,6 @@ 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.service.playback.PlayerStatus;
 import de.danoeh.antennapod.core.storage.DBReader;
 import de.danoeh.antennapod.core.storage.DBTasks;
 import de.danoeh.antennapod.core.storage.DBWriter;
-- 
cgit v1.2.3


From 595674a8724c7b74b2087a728a2576ed01c3cc0f Mon Sep 17 00:00:00 2001
From: Martin Fietz <martin.fietz@gmail.com>
Date: Sun, 21 Jan 2018 13:03:30 +0100
Subject: Minor refactorings

---
 .../antennapod/activity/MediaplayerInfoActivity.java       | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerInfoActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerInfoActivity.java
index 5e182d39e..f3ed1cb62 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerInfoActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerInfoActivity.java
@@ -160,7 +160,7 @@ public abstract class MediaplayerInfoActivity extends MediaplayerActivity implem
         SharedPreferences prefs = getSharedPreferences(PREFS, MODE_PRIVATE);
         prefs.edit()
                 .putInt(PREF_KEY_SELECTED_FRAGMENT_POSITION, pager.getCurrentItem())
-                .commit();
+                .apply();
     }
 
     @Override
@@ -242,7 +242,7 @@ public abstract class MediaplayerInfoActivity extends MediaplayerActivity implem
 
         drawerToggle = new ActionBarDrawerToggle(this, drawerLayout, R.string.drawer_open, R.string.drawer_close);
         drawerToggle.setDrawerIndicatorEnabled(false);
-        drawerLayout.setDrawerListener(drawerToggle);
+        drawerLayout.addDrawerListener(drawerToggle);
 
         navAdapter = new NavListAdapter(itemAccess, this);
         navList.setAdapter(navAdapter);
@@ -396,12 +396,7 @@ public abstract class MediaplayerInfoActivity extends MediaplayerActivity implem
                 new RenameFeedDialog(this, feed).show();
                 return true;
             case R.id.remove_item:
-                final FeedRemover remover = new FeedRemover(this, feed) {
-                    @Override
-                    protected void onPostExecute(Void result) {
-                        super.onPostExecute(result);
-                    }
-                };
+                final FeedRemover remover = new FeedRemover(this, feed);
                 ConfirmationDialog conDialog = new ConfirmationDialog(this,
                         R.string.remove_feed_label,
                         getString(R.string.feed_delete_confirmation_msg, feed.getTitle())) {
@@ -413,7 +408,8 @@ public abstract class MediaplayerInfoActivity extends MediaplayerActivity implem
                             Playable playable = controller.getMedia();
                             if (playable != null && playable instanceof FeedMedia) {
                                 FeedMedia media = (FeedMedia) playable;
-                                if (media.getItem().getFeed().getId() == feed.getId()) {
+                                if (media.getItem() != null && media.getItem().getFeed() != null &&
+                                        media.getItem().getFeed().getId() == feed.getId()) {
                                     Log.d(TAG, "Currently playing episode is about to be deleted, skipping");
                                     remover.skipOnCompletion = true;
                                     if(controller.getStatus() == PlayerStatus.PLAYING) {
-- 
cgit v1.2.3


From db21463730ea9a458e98cccce886276926c3843d Mon Sep 17 00:00:00 2001
From: Martin Fietz <martin.fietz@gmail.com>
Date: Sun, 21 Jan 2018 13:07:28 +0100
Subject: Add missing spaces

---
 .../de/danoeh/antennapod/activity/DownloadAuthenticationActivity.java | 2 +-
 .../java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java    | 4 ++--
 .../main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/DownloadAuthenticationActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/DownloadAuthenticationActivity.java
index 0346cc717..e726afaec 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/DownloadAuthenticationActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/DownloadAuthenticationActivity.java
@@ -44,7 +44,7 @@ public class DownloadAuthenticationActivity extends AppCompatActivity {
         setTheme(UserPreferences.getTheme());
         super.onCreate(savedInstanceState);
         ActionBar actionBar = getSupportActionBar();
-        if(actionBar != null) {
+        if (actionBar != null) {
             actionBar.hide();
         }
 
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
index 2cec70ff6..f859f5466 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
@@ -129,7 +129,7 @@ public class OnlineFeedViewActivity extends AppCompatActivity {
         setTheme(UserPreferences.getTheme());
         super.onCreate(savedInstanceState);
         ActionBar actionBar = getSupportActionBar();
-        if(actionBar != null) {
+        if (actionBar != null) {
             actionBar.setDisplayHomeAsUpEnabled(true);
         }
 
@@ -146,7 +146,7 @@ public class OnlineFeedViewActivity extends AppCompatActivity {
                 || TextUtils.equals(getIntent().getAction(), Intent.ACTION_VIEW)) {
             feedUrl = (TextUtils.equals(getIntent().getAction(), Intent.ACTION_SEND))
                     ? getIntent().getStringExtra(Intent.EXTRA_TEXT) : getIntent().getDataString();
-            if(actionBar != null) {
+            if (actionBar != null) {
                 actionBar.setTitle(R.string.add_feed_label);
             }
         } else {
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
index e8821c2e2..54758acf4 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
@@ -368,7 +368,7 @@ public class VideoplayerActivity extends MediaplayerActivity {
             if (vpa.videoControlsShowing) {
                 Log.d(TAG, "Hiding video controls");
                 ActionBar actionBar = vpa.getSupportActionBar();
-                if(actionBar != null) {
+                if (actionBar != null) {
                     actionBar.hide();
                 }
                 vpa.hideVideoControls();
-- 
cgit v1.2.3


From 8090431d302db205cdc54bd2d2e2d32ce5e751c0 Mon Sep 17 00:00:00 2001
From: Oliver Crow <ocrow@matriculus.com>
Date: Sun, 28 Jan 2018 18:05:35 -0800
Subject: Fix for #2555 - can't open Preferences activity when there are stored
 WiFi connections with null SSID.

---
 .../de/danoeh/antennapod/preferences/PreferenceController.java     | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
index b5e0f1e99..0f42dd01a 100644
--- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
+++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
@@ -764,6 +764,10 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
         }
     }
 
+    private static String blankIfNull(String val) {
+        return val == null ? "" : val;
+    }
+
     private void buildAutodownloadSelectedNetworsPreference() {
         final Activity activity = ui.getActivity();
 
@@ -778,7 +782,8 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
             Log.e(TAG, "Couldn't get list of configure Wi-Fi networks");
             return;
         }
-        Collections.sort(networks, (x, y) -> x.SSID.compareTo(y.SSID));
+        Collections.sort(networks, (x, y) ->
+                blankIfNull(x.SSID).compareTo(blankIfNull(y.SSID)));
         selectedNetworks = new CheckBoxPreference[networks.size()];
         List<String> prefValues = Arrays.asList(UserPreferences
                 .getAutodownloadSelectedNetworks());
-- 
cgit v1.2.3


From 301bf782a102ee9eb71b4d0b71ff566c7bf35481 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Mon, 5 Feb 2018 00:16:07 +0100
Subject: Do not flicker when pressing back arrow

---
 app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java | 1 -
 1 file changed, 1 deletion(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
index bf22e71f5..de9932bef 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
@@ -109,7 +109,6 @@ public class QueueFragment extends Fragment {
     @Override
     public void onResume() {
         super.onResume();
-        recyclerView.setAdapter(recyclerAdapter);
         loadItems(true);
         EventDistributor.getInstance().register(contentUpdate);
         EventBus.getDefault().registerSticky(this);
-- 
cgit v1.2.3


From a9f566f3f104e37eb160a0dcb9dcb11f8879e110 Mon Sep 17 00:00:00 2001
From: Matthew Gaffen <matt@gaffen.co.uk>
Date: Fri, 16 Mar 2018 11:01:23 +0000
Subject: Only write queue order to database on drag release for the podcast
 queue.

This prevents large numbers of db writes in quick succession. This is a particular problem for large queue lengths. Fixes #2562 and potentially fixed #2573
---
 .../danoeh/antennapod/fragment/QueueFragment.java  | 29 ++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
index bf22e71f5..7ec96dbbe 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
@@ -389,17 +389,29 @@ public class QueueFragment extends Fragment {
         itemTouchHelper = new ItemTouchHelper(
             new ItemTouchHelper.SimpleCallback(ItemTouchHelper.UP | ItemTouchHelper.DOWN, ItemTouchHelper.RIGHT) {
 
+                // Position tracking whilst dragging
+                int dragFrom = -1;
+                int dragTo = -1;
+
                 @Override
                 public boolean onMove(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder, RecyclerView.ViewHolder target) {
+                    int fromPosition = viewHolder.getAdapterPosition();
+                    int toPosition = target.getAdapterPosition();
+
+                    // Update tracked position
+                    if(dragFrom == -1) {
+                        dragFrom =  fromPosition;
+                    }
+                    dragTo = toPosition;
+
                     int from = viewHolder.getAdapterPosition();
                     int to = target.getAdapterPosition();
-                    Log.d(TAG, "move(" + from + ", " + to + ")");
+                    Log.d(TAG, "move(" + from + ", " + to + ") in memory");
                     if(from >= queue.size() || to >= queue.size()) {
                         return false;
                     }
                     queue.add(to, queue.remove(from));
                     recyclerAdapter.notifyItemMoved(from, to);
-                    DBWriter.moveQueueItem(from, to, true);
                     return true;
                 }
 
@@ -453,12 +465,25 @@ public class QueueFragment extends Fragment {
                                       RecyclerView.ViewHolder viewHolder) {
                     super.clearView(recyclerView, viewHolder);
 
+                    // Check if drag finished
+                    if(dragFrom != -1 && dragTo != -1 && dragFrom != dragTo) {
+                        reallyMoved(dragFrom, dragTo);
+                    }
+
+                    dragFrom = dragTo = -1;
+
                     if (viewHolder instanceof QueueRecyclerAdapter.ItemTouchHelperViewHolder) {
                         QueueRecyclerAdapter.ItemTouchHelperViewHolder itemViewHolder =
                                 (QueueRecyclerAdapter.ItemTouchHelperViewHolder) viewHolder;
                         itemViewHolder.onItemClear();
                     }
                 }
+
+                private void reallyMoved(int from, int to) {
+                    // Write drag operation to database
+                    Log.d(TAG, "Write to database move(" + dragFrom + ", " + dragTo + ")");
+                    DBWriter.moveQueueItem(dragFrom, dragTo, true);
+                }
             }
         );
         itemTouchHelper.attachToRecyclerView(recyclerView);
-- 
cgit v1.2.3


From 05f923ebe256b71636e2369d48450a52ab87f944 Mon Sep 17 00:00:00 2001
From: alifeflow <de_al_m@qq.com>
Date: Sun, 25 Mar 2018 16:00:42 +0900
Subject: [Ture Black] True Black Theme for AMOLED

Add true black themese
Modified code that fails to support three themes
---
 .../main/java/de/danoeh/antennapod/activity/MainActivity.java |  1 +
 .../danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java  |  4 ++++
 .../de/danoeh/antennapod/adapter/ChaptersListAdapter.java     | 11 +++++++++--
 .../de/danoeh/antennapod/adapter/FeedItemlistAdapter.java     |  2 ++
 .../de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java    |  2 ++
 .../java/de/danoeh/antennapod/menuhandler/MenuItemUtils.java  |  3 ++-
 6 files changed, 20 insertions(+), 3 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
index f56dca173..cfe08cc23 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
@@ -7,6 +7,7 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
 import android.database.DataSetObserver;
+import android.graphics.Color;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java
index 715318db1..e4c090f9a 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java
@@ -22,6 +22,8 @@ import android.widget.TextView;
 import com.bumptech.glide.Glide;
 import com.joanzapata.iconify.Iconify;
 
+import org.shredzone.flattr4j.model.User;
+
 import java.lang.ref.WeakReference;
 
 import de.danoeh.antennapod.R;
@@ -69,6 +71,8 @@ public class AllEpisodesRecycleAdapter extends RecyclerView.Adapter<AllEpisodesR
 
         if(UserPreferences.getTheme() == R.style.Theme_AntennaPod_Dark) {
             playingBackGroundColor = ContextCompat.getColor(mainActivity, R.color.highlight_dark);
+        } else if(UserPreferences.getTheme() == R.style.Theme_AntennaPod_TrueBlack){
+            playingBackGroundColor = ContextCompat.getColor(mainActivity, R.color.highlight_trueblack);
         } else {
             playingBackGroundColor = ContextCompat.getColor(mainActivity, R.color.highlight_light);
         }
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/ChaptersListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/ChaptersListAdapter.java
index f55fe72b4..a07c0cae8 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/ChaptersListAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/ChaptersListAdapter.java
@@ -143,8 +143,15 @@ public class ChaptersListAdapter extends ArrayAdapter<Chapter> {
 
         Chapter current = ChapterUtils.getCurrentChapter(media);
         if (current == sc) {
-            boolean darkTheme = UserPreferences.getTheme() == R.style.Theme_AntennaPod_Dark;
-            int highlight = darkTheme ? R.color.highlight_dark : R.color.highlight_light;
+            int theme = UserPreferences.getTheme();
+            int highlight = R.color.highlight_light;
+            if (theme == R.style.Theme_AntennaPod_Dark) {
+                highlight = R.color.highlight_dark;
+            }else if (theme == R.style.Theme_AntennaPod_TrueBlack){
+                highlight = R.color.highlight_trueblack;
+            } else if (theme == R.style.Theme_AntennaPod_Light) {
+                highlight = R.color.highlight_light;
+            }
             int playingBackGroundColor = ContextCompat.getColor(getContext(), highlight);
             holder.view.setBackgroundColor(playingBackGroundColor);
         } else {
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java
index e29781be1..ad8567f1d 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java
@@ -62,6 +62,8 @@ public class FeedItemlistAdapter extends BaseAdapter {
 
         if(UserPreferences.getTheme() == R.style.Theme_AntennaPod_Dark) {
             playingBackGroundColor = ContextCompat.getColor(context, R.color.highlight_dark);
+        } else if(UserPreferences.getTheme() == R.style.Theme_AntennaPod_TrueBlack) {
+            playingBackGroundColor = ContextCompat.getColor(context, R.color.highlight_trueblack);
         } else {
             playingBackGroundColor = ContextCompat.getColor(context, R.color.highlight_light);
         }
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java
index 01dd4c2de..086ce1072 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java
@@ -77,6 +77,8 @@ public class QueueRecyclerAdapter extends RecyclerView.Adapter<QueueRecyclerAdap
 
         if(UserPreferences.getTheme() == R.style.Theme_AntennaPod_Dark) {
             playingBackGroundColor = ContextCompat.getColor(mainActivity, R.color.highlight_dark);
+        } else if(UserPreferences.getTheme() == R.style.Theme_AntennaPod_TrueBlack) {
+            playingBackGroundColor = ContextCompat.getColor(mainActivity, R.color.highlight_trueblack);
         } else {
             playingBackGroundColor = ContextCompat.getColor(mainActivity, R.color.highlight_light);
         }
diff --git a/app/src/main/java/de/danoeh/antennapod/menuhandler/MenuItemUtils.java b/app/src/main/java/de/danoeh/antennapod/menuhandler/MenuItemUtils.java
index ac703e13e..383198146 100644
--- a/app/src/main/java/de/danoeh/antennapod/menuhandler/MenuItemUtils.java
+++ b/app/src/main/java/de/danoeh/antennapod/menuhandler/MenuItemUtils.java
@@ -20,7 +20,8 @@ public class MenuItemUtils extends de.danoeh.antennapod.core.menuhandler.MenuIte
     public static void adjustTextColor(Context context, SearchView sv) {
         if(Build.VERSION.SDK_INT < 14) {
             EditText searchEditText = (EditText) sv.findViewById(R.id.search_src_text);
-            if(UserPreferences.getTheme() == de.danoeh.antennapod.R.style.Theme_AntennaPod_Dark) {
+            if(UserPreferences.getTheme() == de.danoeh.antennapod.R.style.Theme_AntennaPod_Dark
+                    || UserPreferences.getTheme() == R.style.Theme_AntennaPod_TrueBlack) {
                 searchEditText.setTextColor(Color.WHITE);
             } else {
                 searchEditText.setTextColor(Color.BLACK);
-- 
cgit v1.2.3


From 878428f3a92926db6f38c889be6777e39d0d9f3e Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Mon, 2 Apr 2018 22:18:35 +0200
Subject: Only stop videoControlsHider when actually stopping

---
 .../danoeh/antennapod/activity/VideoplayerActivity.java   | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
index be5107d75..e23291e0d 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
@@ -99,10 +99,16 @@ public class VideoplayerActivity extends MediaplayerActivity {
     }
 
     @Override
-    protected void onPause() {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N
-                || !isInPictureInPictureMode()) {
+    protected void onStop() {
+        super.onStop();
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N || !isInPictureInPictureMode()) {
             videoControlsHider.stop();
+        }
+    }
+
+    @Override
+    protected void onPause() {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N || !isInPictureInPictureMode()) {
             if (controller != null && controller.getStatus() == PlayerStatus.PLAYING) {
                 controller.pause();
             }
@@ -185,8 +191,7 @@ public class VideoplayerActivity extends MediaplayerActivity {
 
     private final View.OnTouchListener onVideoviewTouched = (v, event) -> {
         if (event.getAction() == MotionEvent.ACTION_DOWN) {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N
-                    && isInPictureInPictureMode()) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && isInPictureInPictureMode()) {
                 return true;
             }
             videoControlsHider.stop();
-- 
cgit v1.2.3


From 3c7f08db082e70fcf3925e84b0b22cea976a02e8 Mon Sep 17 00:00:00 2001
From: Hannes Achleitner <hannes.achleitner@gmx.de>
Date: Sat, 28 Oct 2017 22:00:00 +0200
Subject: replace old ActionBarActivity with AppCompatActivity

---
 .../de/danoeh/antennapod/activity/DownloadAuthenticationActivity.java | 4 ++--
 .../main/java/de/danoeh/antennapod/activity/FlattrAuthActivity.java   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/DownloadAuthenticationActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/DownloadAuthenticationActivity.java
index e726afaec..a97c350fb 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/DownloadAuthenticationActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/DownloadAuthenticationActivity.java
@@ -3,8 +3,8 @@ package de.danoeh.antennapod.activity;
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
+import android.support.v7.app.ActionBarActivity;
+import android.util.Log;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.TextView;
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/FlattrAuthActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/FlattrAuthActivity.java
index d9c250b38..26352f58f 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/FlattrAuthActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/FlattrAuthActivity.java
@@ -4,7 +4,7 @@ package de.danoeh.antennapod.activity;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -21,7 +21,7 @@ import de.danoeh.antennapod.core.util.flattr.FlattrUtils;
 
 /** Guides the user through the authentication process */
 
-public class FlattrAuthActivity extends ActionBarActivity {
+public class FlattrAuthActivity extends AppCompatActivity {
 	private static final String TAG = "FlattrAuthActivity";
 
 	private TextView txtvExplanation;
-- 
cgit v1.2.3


From 31385050275dbaedfabd553a3f00fba2c2efca33 Mon Sep 17 00:00:00 2001
From: Hannes Achleitner <hannes.software@gmx.at>
Date: Tue, 3 Apr 2018 08:38:57 +0200
Subject: Simplify build

---
 .../de/danoeh/antennapod/activity/DownloadAuthenticationActivity.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/DownloadAuthenticationActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/DownloadAuthenticationActivity.java
index a97c350fb..e726afaec 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/DownloadAuthenticationActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/DownloadAuthenticationActivity.java
@@ -3,8 +3,8 @@ package de.danoeh.antennapod.activity;
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.ActionBarActivity;
-import android.util.Log;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.AppCompatActivity;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.TextView;
-- 
cgit v1.2.3


From 67b01f6ec802b95732dec999d7dbc35ed9a2f0fa Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Thu, 5 Apr 2018 16:22:45 +0200
Subject: Use generic export message instead of OPML

The same message is shown for HTML and OPML. Fixes #2462.
Additionally, using string formatting now instead of just "+"
---
 .../java/de/danoeh/antennapod/preferences/PreferenceController.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
index 0f42dd01a..2877fe521 100644
--- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
+++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
@@ -474,8 +474,8 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
         subscription = observable.subscribeOn(Schedulers.newThread())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(output -> {
-                    alert.setTitle(R.string.opml_export_success_title);
-                    String message = context.getString(R.string.opml_export_success_sum) + output.toString();
+                    alert.setTitle(R.string.export_success_title);
+                    String message = context.getString(R.string.export_success_sum, output.toString());
                     alert.setMessage(message);
                     alert.setPositiveButton(R.string.send_label, (dialog, which) -> {
                         Uri fileUri = FileProvider.getUriForFile(context.getApplicationContext(),
-- 
cgit v1.2.3


From 8016a35193d704e197e8655dca8ee5398a3a6005 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Thu, 5 Apr 2018 16:57:48 +0200
Subject: Even use expired cache if there is no network

Closes #2260
---
 .../java/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java  | 5 +++++
 app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java    | 5 +++++
 2 files changed, 10 insertions(+)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java
index 935fd7898..417af6133 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java
@@ -33,6 +33,7 @@ import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.core.storage.DBReader;
 import de.danoeh.antennapod.core.util.Converter;
 import de.danoeh.antennapod.core.util.IntentUtils;
+import de.danoeh.antennapod.core.util.NetworkUtils;
 import de.danoeh.antennapod.core.util.ShareUtils;
 import de.danoeh.antennapod.core.util.ShownotesProvider;
 import de.danoeh.antennapod.core.util.playback.Playable;
@@ -118,6 +119,10 @@ public class ItemDescriptionFragment extends Fragment implements MediaplayerInfo
                 R.style.Theme_AntennaPod_Dark ? Color.BLACK : Color.WHITE);
         ta.recycle();
         webvDescription.setBackgroundColor(backgroundColor);
+        if (!NetworkUtils.networkAvailable()) {
+            webvDescription.getSettings().setCacheMode(WebSettings.LOAD_CACHE_ELSE_NETWORK);
+            // Use cached resources, even if they have expired
+        }
         webvDescription.getSettings().setUseWideViewPort(false);
         webvDescription.getSettings().setLayoutAlgorithm(WebSettings.LayoutAlgorithm.SINGLE_COLUMN);
         webvDescription.getSettings().setLoadWithOverviewMode(true);
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 4ae6b97ee..2d11e9f71 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
@@ -34,6 +34,7 @@ import com.bumptech.glide.Glide;
 import com.joanzapata.iconify.Iconify;
 import com.joanzapata.iconify.widget.IconButton;
 
+import de.danoeh.antennapod.core.util.NetworkUtils;
 import org.apache.commons.lang3.ArrayUtils;
 
 import java.util.List;
@@ -189,6 +190,10 @@ public class ItemFragment extends Fragment implements OnSwipeGesture {
             }
             webvDescription.setBackgroundColor(ContextCompat.getColor(getContext(), R.color.black));
         }
+        if (!NetworkUtils.networkAvailable()) {
+            webvDescription.getSettings().setCacheMode(WebSettings.LOAD_CACHE_ELSE_NETWORK);
+            // Use cached resources, even if they have expired
+        }
         webvDescription.getSettings().setUseWideViewPort(false);
         webvDescription.getSettings().setLayoutAlgorithm(
             WebSettings.LayoutAlgorithm.NARROW_COLUMNS);
-- 
cgit v1.2.3


From 15d93f01c98cee7457a022e6ef85532621b03c90 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Thu, 5 Apr 2018 17:09:09 +0200
Subject: Added OPML import option next to the export option

Fixes #2315
---
 .../de/danoeh/antennapod/preferences/PreferenceController.java     | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
index 0f42dd01a..f68901029 100644
--- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
+++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
@@ -39,6 +39,7 @@ import android.widget.Toast;
 import com.afollestad.materialdialogs.MaterialDialog;
 
 import de.danoeh.antennapod.activity.ImportExportActivity;
+import de.danoeh.antennapod.activity.OpmlImportFromPathActivity;
 import org.apache.commons.lang3.ArrayUtils;
 
 import java.io.File;
@@ -89,6 +90,7 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
     private static final String PREF_FLATTR_REVOKE = "prefRevokeAccess";
     private static final String PREF_AUTO_FLATTR_PREFS = "prefAutoFlattrPrefs";
     private static final String PREF_OPML_EXPORT = "prefOpmlExport";
+    private static final String PREF_OPML_IMPORT = "prefOpmlImport";
     private static final String PREF_HTML_EXPORT = "prefHtmlExport";
     private static final String STATISTICS = "statistics";
     private static final String IMPORT_EXPORT = "importExport";
@@ -185,6 +187,11 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
                 preference -> export(new OpmlWriter()));
         ui.findPreference(PreferenceController.PREF_HTML_EXPORT).setOnPreferenceClickListener(
                 preference -> export(new HtmlWriter()));
+        ui.findPreference(PreferenceController.PREF_OPML_IMPORT).setOnPreferenceClickListener(
+                preference -> {
+                    activity.startActivity(new Intent(activity, OpmlImportFromPathActivity.class));
+                    return true;
+                });
         ui.findPreference(PreferenceController.PREF_CHOOSE_DATA_DIR).setOnPreferenceClickListener(
                 preference -> {
                     if (Build.VERSION_CODES.KITKAT <= Build.VERSION.SDK_INT &&
-- 
cgit v1.2.3


From e41bc7bd61ba568adec4ff82c636cbbee7556022 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Thu, 5 Apr 2018 18:25:14 +0200
Subject: Showing URL for failed downloads

Closes #1082
---
 .../antennapod/fragment/DownloadLogFragment.java   | 27 ++++++++++++++++++++++
 1 file changed, 27 insertions(+)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/DownloadLogFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/DownloadLogFragment.java
index 9a4c9e030..ae9c60f65 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/DownloadLogFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/DownloadLogFragment.java
@@ -1,5 +1,7 @@
 package de.danoeh.antennapod.fragment;
 
+import android.app.AlertDialog;
+import android.app.Dialog;
 import android.content.res.TypedArray;
 import android.os.Bundle;
 import android.support.v4.app.ListFragment;
@@ -13,9 +15,11 @@ import android.widget.ListView;
 
 import java.util.List;
 
+import android.widget.TextView;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.adapter.DownloadLogAdapter;
 import de.danoeh.antennapod.core.feed.EventDistributor;
+import de.danoeh.antennapod.core.feed.FeedMedia;
 import de.danoeh.antennapod.core.service.download.DownloadStatus;
 import de.danoeh.antennapod.core.storage.DBReader;
 import de.danoeh.antennapod.core.storage.DBWriter;
@@ -82,6 +86,29 @@ public class DownloadLogFragment extends ListFragment {
         getActivity().supportInvalidateOptionsMenu();
     }
 
+    @Override
+    public void onListItemClick(ListView l, View v, int position, long id) {
+        super.onListItemClick(l, v, position, id);
+
+        DownloadStatus status = adapter.getItem(position);
+        String url = "unknown";
+        String message = getString(R.string.download_successful);
+        FeedMedia media = DBReader.getFeedMedia(status.getFeedfileId());
+        if (media != null) {
+            url = media.getDownload_url();
+        }
+        if (!status.isSuccessful()) {
+            message = status.getReasonDetailed();
+        }
+
+        AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
+        builder.setTitle(R.string.download_error_details);
+        builder.setMessage(getString(R.string.download_error_details_message, message, url));
+        builder.setPositiveButton(android.R.string.ok, null);
+        Dialog dialog = builder.show();
+        ((TextView) dialog.findViewById(android.R.id.message)).setTextIsSelectable(true);
+    }
+
     private final DownloadLogAdapter.ItemAccess itemAccess = new DownloadLogAdapter.ItemAccess() {
 
         @Override
-- 
cgit v1.2.3


From 1831430a6e47be1e34d2e8a4b977e79289ca7b2b Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Mon, 9 Apr 2018 00:04:02 +0200
Subject: Added checks for PiP support

---
 .../antennapod/activity/MediaplayerActivity.java     | 20 +++++++++++++++++++-
 .../antennapod/activity/VideoplayerActivity.java     | 10 +++++-----
 2 files changed, 24 insertions(+), 6 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
index f3c0760f3..b51f45d93 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
@@ -4,6 +4,7 @@ import android.annotation.TargetApi;
 import android.app.Activity;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.content.pm.PackageManager;
 import android.content.res.TypedArray;
 import android.graphics.Color;
 import android.graphics.PixelFormat;
@@ -225,7 +226,7 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements
 
     @Override
     protected void onPause() {
-        if (Build.VERSION.SDK_INT < 26 || !isInPictureInPictureMode()) {
+        if (!supportsAndisInPictureInPictureMode()) {
             if (controller != null) {
                 controller.reinitServiceIfPaused();
                 controller.pause();
@@ -907,6 +908,23 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements
         }
     }
 
+    /* package */ boolean supportsPictureInPicture() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            PackageManager packageManager = getApplicationContext().getPackageManager();
+            return packageManager.hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE);
+        } else {
+            return false;
+        }
+    }
+
+    /* package */ boolean supportsAndisInPictureInPictureMode() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && supportsPictureInPicture()) {
+            return isInPictureInPictureMode();
+        } else {
+            return false;
+        }
+    }
+
     private void checkFavorite() {
         Playable playable = controller.getMedia();
         if (playable != null && playable instanceof FeedMedia) {
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
index e23291e0d..4ab934cc2 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
@@ -101,14 +101,14 @@ public class VideoplayerActivity extends MediaplayerActivity {
     @Override
     protected void onStop() {
         super.onStop();
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N || !isInPictureInPictureMode()) {
+        if (!supportsAndisInPictureInPictureMode()) {
             videoControlsHider.stop();
         }
     }
 
     @Override
     protected void onPause() {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N || !isInPictureInPictureMode()) {
+        if (!supportsAndisInPictureInPictureMode()) {
             if (controller != null && controller.getStatus() == PlayerStatus.PLAYING) {
                 controller.pause();
             }
@@ -191,7 +191,7 @@ public class VideoplayerActivity extends MediaplayerActivity {
 
     private final View.OnTouchListener onVideoviewTouched = (v, event) -> {
         if (event.getAction() == MotionEvent.ACTION_DOWN) {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && isInPictureInPictureMode()) {
+            if (supportsAndisInPictureInPictureMode()) {
                 return true;
             }
             videoControlsHider.stop();
@@ -381,7 +381,7 @@ public class VideoplayerActivity extends MediaplayerActivity {
     @Override
     public boolean onPrepareOptionsMenu(Menu menu) {
         super.onPrepareOptionsMenu(menu);
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+        if (supportsPictureInPicture()) {
             menu.findItem(R.id.player_go_to_picture_in_picture).setVisible(true);
         }
         return true;
@@ -390,7 +390,7 @@ public class VideoplayerActivity extends MediaplayerActivity {
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == R.id.player_go_to_picture_in_picture) {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            if (supportsPictureInPicture() && Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
                 getSupportActionBar().hide();
                 hideVideoControls(false);
                 enterPictureInPictureMode();
-- 
cgit v1.2.3


From 562bbf21f056e03aa13d5b48a5cdb16031495f2f Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Mon, 9 Apr 2018 18:33:03 +0200
Subject: Split up two different uses of the string 'New'

Closes #2348
---
 app/src/main/java/de/danoeh/antennapod/fragment/EpisodesFragment.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/EpisodesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/EpisodesFragment.java
index 8928d2bf3..417ecff89 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/EpisodesFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/EpisodesFragment.java
@@ -106,7 +106,7 @@ public class EpisodesFragment extends Fragment {
                 case POS_ALL_EPISODES:
                     return resources.getString(R.string.all_episodes_short_label);
                 case POS_NEW_EPISODES:
-                    return resources.getString(R.string.new_label);
+                    return resources.getString(R.string.new_episodes_label);
                 case POS_FAV_EPISODES:
                     return resources.getString(R.string.favorite_episodes_label);
                 default:
-- 
cgit v1.2.3


From 64221f7f56a422406c2a664e18ad8593e6825ef2 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Mon, 9 Apr 2018 19:43:50 +0200
Subject: Allow to enter PiP automatically

---
 .../antennapod/activity/MediaplayerActivity.java   |  4 +--
 .../antennapod/activity/VideoplayerActivity.java   | 29 ++++++++++++++++------
 2 files changed, 23 insertions(+), 10 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
index b51f45d93..8431e7b2e 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
@@ -226,7 +226,7 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements
 
     @Override
     protected void onPause() {
-        if (!supportsAndisInPictureInPictureMode()) {
+        if (!compatIsInPictureInPictureMode()) {
             if (controller != null) {
                 controller.reinitServiceIfPaused();
                 controller.pause();
@@ -917,7 +917,7 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements
         }
     }
 
-    /* package */ boolean supportsAndisInPictureInPictureMode() {
+    /* package */ boolean compatIsInPictureInPictureMode() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && supportsPictureInPicture()) {
             return isInPictureInPictureMode();
         } else {
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
index 4ab934cc2..83635853a 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
@@ -24,6 +24,7 @@ import android.widget.ProgressBar;
 import android.widget.SeekBar;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.core.feed.MediaType;
+import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.core.service.playback.PlaybackService;
 import de.danoeh.antennapod.core.service.playback.PlayerStatus;
 import de.danoeh.antennapod.core.util.playback.ExternalMedia;
@@ -101,14 +102,22 @@ public class VideoplayerActivity extends MediaplayerActivity {
     @Override
     protected void onStop() {
         super.onStop();
-        if (!supportsAndisInPictureInPictureMode()) {
+        if (!compatIsInPictureInPictureMode()) {
             videoControlsHider.stop();
         }
     }
 
+    @Override
+    public void onUserLeaveHint () {
+        if (!compatIsInPictureInPictureMode() && UserPreferences.getVideoBackgroundBehavior()
+                == UserPreferences.VideoBackgroundBehavior.PICTURE_IN_PICTURE) {
+            compatEnterPictureInPicture();
+        }
+    }
+
     @Override
     protected void onPause() {
-        if (!supportsAndisInPictureInPictureMode()) {
+        if (!compatIsInPictureInPictureMode()) {
             if (controller != null && controller.getStatus() == PlayerStatus.PLAYING) {
                 controller.pause();
             }
@@ -191,7 +200,7 @@ public class VideoplayerActivity extends MediaplayerActivity {
 
     private final View.OnTouchListener onVideoviewTouched = (v, event) -> {
         if (event.getAction() == MotionEvent.ACTION_DOWN) {
-            if (supportsAndisInPictureInPictureMode()) {
+            if (compatIsInPictureInPictureMode()) {
                 return true;
             }
             videoControlsHider.stop();
@@ -390,16 +399,20 @@ public class VideoplayerActivity extends MediaplayerActivity {
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == R.id.player_go_to_picture_in_picture) {
-            if (supportsPictureInPicture() && Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-                getSupportActionBar().hide();
-                hideVideoControls(false);
-                enterPictureInPictureMode();
-            }
+            compatEnterPictureInPicture();
             return true;
         }
         return super.onOptionsItemSelected(item);
     }
 
+    private void compatEnterPictureInPicture() {
+        if (supportsPictureInPicture() && Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            getSupportActionBar().hide();
+            hideVideoControls(false);
+            enterPictureInPictureMode();
+        }
+    }
+
     private static class VideoControlsHider extends Handler {
 
         private static final int DELAY = 2500;
-- 
cgit v1.2.3


From d757abedbc771224787ab962134b7d61b27fd6e4 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Mon, 9 Apr 2018 22:20:43 +0200
Subject: Removing PiP option for unsupported devices

---
 .../antennapod/activity/MediaplayerActivity.java    | 21 ++-------------------
 .../antennapod/activity/VideoplayerActivity.java    | 13 +++++++------
 .../preferences/PreferenceController.java           |  7 +++++++
 3 files changed, 16 insertions(+), 25 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
index 8431e7b2e..21e375435 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
@@ -4,7 +4,6 @@ import android.annotation.TargetApi;
 import android.app.Activity;
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.content.pm.PackageManager;
 import android.content.res.TypedArray;
 import android.graphics.Color;
 import android.graphics.PixelFormat;
@@ -47,6 +46,7 @@ import de.danoeh.antennapod.core.util.Flavors;
 import de.danoeh.antennapod.core.util.ShareUtils;
 import de.danoeh.antennapod.core.util.StorageUtils;
 import de.danoeh.antennapod.core.util.Supplier;
+import de.danoeh.antennapod.core.util.gui.PictureInPictureUtil;
 import de.danoeh.antennapod.core.util.playback.MediaPlayerError;
 import de.danoeh.antennapod.core.util.playback.Playable;
 import de.danoeh.antennapod.core.util.playback.PlaybackController;
@@ -226,7 +226,7 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements
 
     @Override
     protected void onPause() {
-        if (!compatIsInPictureInPictureMode()) {
+        if (!PictureInPictureUtil.isInPictureInPictureMode(this)) {
             if (controller != null) {
                 controller.reinitServiceIfPaused();
                 controller.pause();
@@ -908,23 +908,6 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements
         }
     }
 
-    /* package */ boolean supportsPictureInPicture() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            PackageManager packageManager = getApplicationContext().getPackageManager();
-            return packageManager.hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE);
-        } else {
-            return false;
-        }
-    }
-
-    /* package */ boolean compatIsInPictureInPictureMode() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && supportsPictureInPicture()) {
-            return isInPictureInPictureMode();
-        } else {
-            return false;
-        }
-    }
-
     private void checkFavorite() {
         Playable playable = controller.getMedia();
         if (playable != null && playable instanceof FeedMedia) {
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
index 83635853a..999fd0714 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
@@ -27,6 +27,7 @@ import de.danoeh.antennapod.core.feed.MediaType;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.core.service.playback.PlaybackService;
 import de.danoeh.antennapod.core.service.playback.PlayerStatus;
+import de.danoeh.antennapod.core.util.gui.PictureInPictureUtil;
 import de.danoeh.antennapod.core.util.playback.ExternalMedia;
 import de.danoeh.antennapod.core.util.playback.Playable;
 import de.danoeh.antennapod.view.AspectRatioVideoView;
@@ -102,14 +103,14 @@ public class VideoplayerActivity extends MediaplayerActivity {
     @Override
     protected void onStop() {
         super.onStop();
-        if (!compatIsInPictureInPictureMode()) {
+        if (!PictureInPictureUtil.isInPictureInPictureMode(this)) {
             videoControlsHider.stop();
         }
     }
 
     @Override
     public void onUserLeaveHint () {
-        if (!compatIsInPictureInPictureMode() && UserPreferences.getVideoBackgroundBehavior()
+        if (!PictureInPictureUtil.isInPictureInPictureMode(this) && UserPreferences.getVideoBackgroundBehavior()
                 == UserPreferences.VideoBackgroundBehavior.PICTURE_IN_PICTURE) {
             compatEnterPictureInPicture();
         }
@@ -117,7 +118,7 @@ public class VideoplayerActivity extends MediaplayerActivity {
 
     @Override
     protected void onPause() {
-        if (!compatIsInPictureInPictureMode()) {
+        if (!PictureInPictureUtil.isInPictureInPictureMode(this)) {
             if (controller != null && controller.getStatus() == PlayerStatus.PLAYING) {
                 controller.pause();
             }
@@ -200,7 +201,7 @@ public class VideoplayerActivity extends MediaplayerActivity {
 
     private final View.OnTouchListener onVideoviewTouched = (v, event) -> {
         if (event.getAction() == MotionEvent.ACTION_DOWN) {
-            if (compatIsInPictureInPictureMode()) {
+            if (PictureInPictureUtil.isInPictureInPictureMode(this)) {
                 return true;
             }
             videoControlsHider.stop();
@@ -390,7 +391,7 @@ public class VideoplayerActivity extends MediaplayerActivity {
     @Override
     public boolean onPrepareOptionsMenu(Menu menu) {
         super.onPrepareOptionsMenu(menu);
-        if (supportsPictureInPicture()) {
+        if (PictureInPictureUtil.supportsPictureInPicture(this)) {
             menu.findItem(R.id.player_go_to_picture_in_picture).setVisible(true);
         }
         return true;
@@ -406,7 +407,7 @@ public class VideoplayerActivity extends MediaplayerActivity {
     }
 
     private void compatEnterPictureInPicture() {
-        if (supportsPictureInPicture() && Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+        if (PictureInPictureUtil.supportsPictureInPicture(this) && Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
             getSupportActionBar().hide();
             hideVideoControls(false);
             enterPictureInPictureMode();
diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
index 2c7d738dd..0e9cf73e0 100644
--- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
+++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
@@ -38,8 +38,10 @@ import android.widget.Toast;
 
 import com.afollestad.materialdialogs.MaterialDialog;
 
+import com.afollestad.materialdialogs.prefs.MaterialListPreference;
 import de.danoeh.antennapod.activity.ImportExportActivity;
 import de.danoeh.antennapod.activity.OpmlImportFromPathActivity;
+import de.danoeh.antennapod.core.util.gui.PictureInPictureUtil;
 import org.apache.commons.lang3.ArrayUtils;
 
 import java.io.File;
@@ -426,6 +428,11 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
                     return false;
                 }
         );
+        if (!PictureInPictureUtil.supportsPictureInPicture(activity)) {
+            MaterialListPreference behaviour = (MaterialListPreference) ui.findPreference(UserPreferences.PREF_VIDEO_BEHAVIOR);
+            behaviour.setEntries(R.array.video_background_behavior_options_without_pip);
+            behaviour.setEntryValues(R.array.video_background_behavior_values_without_pip);
+        }
         ui.findPreference(PREF_PROXY).setOnPreferenceClickListener(preference -> {
             ProxyDialog dialog = new ProxyDialog(ui.getActivity());
             dialog.createDialog().show();
-- 
cgit v1.2.3


From b5a8fe0a1b3b38f8980d4c6e9e65d568dc70a55e Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Mon, 9 Apr 2018 22:30:43 +0200
Subject: Using compat method

---
 .../main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
index 999fd0714..832386185 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
@@ -297,7 +297,7 @@ public class VideoplayerActivity extends MediaplayerActivity {
 
     @Override
     protected void onReloadNotification(int notificationCode) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && isInPictureInPictureMode()) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && PictureInPictureUtil.isInPictureInPictureMode(this)) {
             if (notificationCode == PlaybackService.EXTRA_CODE_AUDIO
                     || notificationCode == PlaybackService.EXTRA_CODE_CAST) {
                 finish();
-- 
cgit v1.2.3


From 12ac9c9fc2b89e11d1b4a27a625216ec04c20e04 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Tue, 10 Apr 2018 20:18:23 +0200
Subject: Added preference screens

---
 .../antennapod/activity/PreferenceActivity.java    | 57 +++++++++++++---
 .../preferences/PreferenceController.java          | 76 +++++++++++++++-------
 2 files changed, 98 insertions(+), 35 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java
index 12d918a76..99d39fbd9 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java
@@ -24,13 +24,20 @@ import de.danoeh.antennapod.preferences.PreferenceController;
  */
 public class PreferenceActivity extends AppCompatActivity {
 
+    public static final String PARAM_RESOURCE = "resource";
     private static WeakReference<PreferenceActivity> instance;
     private PreferenceController preferenceController;
-    private MainFragment prefFragment;
     private final PreferenceController.PreferenceUI preferenceUI = new PreferenceController.PreferenceUI() {
+        private PreferenceFragment fragment;
+
+        @Override
+        public void setFragment(PreferenceFragment fragment) {
+            this.fragment = fragment;
+        }
+
         @Override
         public Preference findPreference(CharSequence key) {
-            return prefFragment.findPreference(key);
+            return fragment.findPreference(key);
         }
 
         @Override
@@ -64,7 +71,11 @@ public class PreferenceActivity extends AppCompatActivity {
         // since the MainFragment depends on the preferenceController already being created
         preferenceController = new PreferenceController(preferenceUI);
 
-        prefFragment = new MainFragment();
+        PreferenceFragment prefFragment = new MainFragment();
+        preferenceUI.setFragment(prefFragment);
+        Bundle args = new Bundle();
+        args.putInt(PARAM_RESOURCE, R.xml.preferences);
+        prefFragment.setArguments(args);
         getFragmentManager().beginTransaction().replace(R.id.content, prefFragment).commit();
     }
 
@@ -84,7 +95,11 @@ public class PreferenceActivity extends AppCompatActivity {
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case android.R.id.home:
-                finish();
+                if (getFragmentManager().getBackStackEntryCount() == 0) {
+                    finish();
+                } else {
+                    getFragmentManager().popBackStack();
+                }
                 return true;
             default:
                 return false;
@@ -97,10 +112,11 @@ public class PreferenceActivity extends AppCompatActivity {
         public void onCreate(Bundle savedInstanceState) {
             super.onCreate(savedInstanceState);
             setRetainInstance(true);
-            addPreferencesFromResource(R.xml.preferences);
+            addPreferencesFromResource(getArguments().getInt(PARAM_RESOURCE));
             PreferenceActivity activity = instance.get();
-            if(activity != null && activity.preferenceController != null) {
-                activity.preferenceController.onCreate();
+            if (activity != null && activity.preferenceController != null) {
+                activity.preferenceUI.setFragment(this);
+                activity.preferenceController.onCreate(getArguments().getInt(PARAM_RESOURCE));
             }
         }
 
@@ -109,7 +125,26 @@ public class PreferenceActivity extends AppCompatActivity {
             super.onResume();
             PreferenceActivity activity = instance.get();
             if(activity != null && activity.preferenceController != null) {
-                activity.preferenceController.onResume();
+                activity.setTitle(getTitle(getArguments().getInt(PARAM_RESOURCE)));
+                activity.preferenceUI.setFragment(this);
+                activity.preferenceController.onResume(getArguments().getInt(PARAM_RESOURCE));
+            }
+        }
+
+        private int getTitle(int preferences) {
+            switch (preferences) {
+                case R.xml.preferences_downloads:
+                    return R.string.downloads_label;
+                case R.xml.preferences_playback:
+                    return R.string.playback_pref;
+                case R.xml.preferences_storage:
+                    return R.string.storage_pref;
+                case R.xml.preferences_user_interface:
+                    return R.string.user_interface_label;
+                case R.xml.preferences_services:
+                    return R.string.services_label;
+                default:
+                    return R.string.settings_label;
             }
         }
 
@@ -117,7 +152,8 @@ public class PreferenceActivity extends AppCompatActivity {
         public void onPause() {
             PreferenceActivity activity = instance.get();
             if(activity != null && activity.preferenceController != null) {
-                activity.preferenceController.onPause();
+                activity.preferenceUI.setFragment(this);
+                activity.preferenceController.onPause(getArguments().getInt(PARAM_RESOURCE));
             }
             super.onPause();
         }
@@ -126,7 +162,8 @@ public class PreferenceActivity extends AppCompatActivity {
         public void onStop() {
             PreferenceActivity activity = instance.get();
             if(activity != null && activity.preferenceController != null) {
-                activity.preferenceController.onStop();
+                activity.preferenceUI.setFragment(this);
+                activity.preferenceController.onStop(getArguments().getInt(PARAM_RESOURCE));
             }
             super.onStop();
         }
diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
index 2c7d738dd..5bba09dbe 100644
--- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
+++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
@@ -3,6 +3,7 @@ package de.danoeh.antennapod.preferences;
 import android.Manifest;
 import android.annotation.SuppressLint;
 import android.app.Activity;
+import android.app.Fragment;
 import android.app.ProgressDialog;
 import android.app.TimePickerDialog;
 import android.content.ActivityNotFoundException;
@@ -16,30 +17,27 @@ import android.net.Uri;
 import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiManager;
 import android.os.Build;
+import android.os.Bundle;
 import android.preference.CheckBoxPreference;
-import android.preference.EditTextPreference;
 import android.preference.ListPreference;
 import android.preference.Preference;
+import android.preference.PreferenceFragment;
 import android.preference.PreferenceManager;
 import android.preference.PreferenceScreen;
 import android.support.design.widget.Snackbar;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.content.FileProvider;
 import android.support.v7.app.AlertDialog;
-import android.text.Editable;
 import android.text.Html;
-import android.text.TextWatcher;
 import android.text.format.DateFormat;
 import android.text.format.DateUtils;
 import android.util.Log;
-import android.widget.EditText;
 import android.widget.ListView;
 import android.widget.Toast;
 
 import com.afollestad.materialdialogs.MaterialDialog;
 
-import de.danoeh.antennapod.activity.ImportExportActivity;
-import de.danoeh.antennapod.activity.OpmlImportFromPathActivity;
+import de.danoeh.antennapod.activity.PreferenceActivity;
 import org.apache.commons.lang3.ArrayUtils;
 
 import java.io.File;
@@ -53,30 +51,21 @@ import java.util.concurrent.TimeUnit;
 
 import de.danoeh.antennapod.CrashReportWriter;
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.activity.AboutActivity;
 import de.danoeh.antennapod.activity.DirectoryChooserActivity;
 import de.danoeh.antennapod.activity.MainActivity;
-import de.danoeh.antennapod.activity.MediaplayerActivity;
-import de.danoeh.antennapod.activity.StatisticsActivity;
 import de.danoeh.antennapod.asynctask.ExportWorker;
 import de.danoeh.antennapod.core.export.ExportWriter;
-import de.danoeh.antennapod.core.export.html.HtmlWriter;
-import de.danoeh.antennapod.core.export.opml.OpmlWriter;
 import de.danoeh.antennapod.core.preferences.GpodnetPreferences;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
-import de.danoeh.antennapod.core.service.GpodnetSyncService;
 import de.danoeh.antennapod.core.util.flattr.FlattrUtils;
-import de.danoeh.antennapod.dialog.AuthenticationDialog;
-import de.danoeh.antennapod.dialog.AutoFlattrPreferenceDialog;
 import de.danoeh.antennapod.dialog.ChooseDataFolderDialog;
-import de.danoeh.antennapod.dialog.GpodnetSetHostnameDialog;
-import de.danoeh.antennapod.dialog.ProxyDialog;
-import de.danoeh.antennapod.dialog.VariableSpeedDialog;
 import rx.Observable;
 import rx.Subscription;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.schedulers.Schedulers;
 
+import static de.danoeh.antennapod.activity.PreferenceActivity.PARAM_RESOURCE;
+
 /**
  * Sets up a preference UI that lets the user change user preferences.
  */
@@ -85,6 +74,13 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
 
     private static final String TAG = "PreferenceController";
 
+    private static final String PREF_SCREEN_USER_INTERFACE = "prefScreenInterface";
+    private static final String PREF_SCREEN_PLAYBACK = "prefScreenPlayback";
+    private static final String PREF_SCREEN_DOWNLOADS = "prefScreenDownloads";
+    private static final String PREF_SCREEN_SERVICES = "prefScreenServices";
+    private static final String PREF_SCREEN_STORAGE = "prefScreenStorage";
+    private static final String PREF_SCREEN_VARIOUS = "prefScreenVarious";
+
     private static final String PREF_FLATTR_SETTINGS = "prefFlattrSettings";
     private static final String PREF_FLATTR_AUTH = "pref_flattr_authenticate";
     private static final String PREF_FLATTR_REVOKE = "prefRevokeAccess";
@@ -143,9 +139,26 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
         }
     }
 
-    public void onCreate() {
+
+
+    public void onCreate(int screen) {
         final Activity activity = ui.getActivity();
 
+        if (screen == R.xml.preferences) {
+            ui.findPreference(PREF_SCREEN_USER_INTERFACE).setOnPreferenceClickListener(preference ->
+                    openScreen(R.xml.preferences_user_interface, activity));
+            ui.findPreference(PREF_SCREEN_PLAYBACK).setOnPreferenceClickListener(preference ->
+                    openScreen(R.xml.preferences_playback, activity));
+            ui.findPreference(PREF_SCREEN_DOWNLOADS).setOnPreferenceClickListener(preference ->
+                    openScreen(R.xml.preferences_downloads, activity));
+            ui.findPreference(PREF_SCREEN_SERVICES).setOnPreferenceClickListener(preference ->
+                    openScreen(R.xml.preferences_services, activity));
+            ui.findPreference(PREF_SCREEN_STORAGE).setOnPreferenceClickListener(preference ->
+                    openScreen(R.xml.preferences_storage, activity));
+            ui.findPreference(PREF_SCREEN_VARIOUS).setOnPreferenceClickListener(preference ->
+                    openScreen(R.xml.preferences_various, activity));
+        }
+/*
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN) {
             // disable expanded notification option on unsupported android versions
             ui.findPreference(PreferenceController.PREF_EXPANDED_NOTIFICATION).setEnabled(false);
@@ -466,7 +479,18 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
         buildEpisodeCleanupPreference();
         buildSmartMarkAsPlayedPreference();
         buildAutodownloadSelectedNetworsPreference();
-        setSelectedNetworksEnabled(UserPreferences.isEnableAutodownloadWifiFilter());
+        setSelectedNetworksEnabled(UserPreferences.isEnableAutodownloadWifiFilter());*/
+    }
+
+    private boolean openScreen(int preferences, Activity activity) {
+        Fragment prefFragment = new PreferenceActivity.MainFragment();
+        Bundle args = new Bundle();
+        args.putInt(PARAM_RESOURCE, preferences);
+        prefFragment.setArguments(args);
+        activity.getFragmentManager().beginTransaction()
+                .replace(R.id.content, prefFragment)
+                .addToBackStack(TAG).commit();
+        return true;
     }
 
     private boolean export(ExportWriter exportWriter) {
@@ -522,21 +546,21 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
         }
     }
 
-    public void onResume() {
-        checkItemVisibility();
+    public void onResume(int screen) {
+        /*checkItemVisibility();
         setUpdateIntervalText();
         setParallelDownloadsText(UserPreferences.getParallelDownloads());
         setEpisodeCacheSizeText(UserPreferences.getEpisodeCacheSize());
         setDataFolderText();
         GpodnetPreferences.registerOnSharedPreferenceChangeListener(gpoddernetListener);
-        updateGpodnetPreferenceScreen();
+        updateGpodnetPreferenceScreen();*/
     }
 
-    public void onPause() {
-        GpodnetPreferences.unregisterOnSharedPreferenceChangeListener(gpoddernetListener);
+    public void onPause(int screen) {
+        /*GpodnetPreferences.unregisterOnSharedPreferenceChangeListener(gpoddernetListener);*/
     }
 
-    public void onStop() {
+    public void onStop(int screen) {
         if(subscription != null) {
             subscription.unsubscribe();
         }
@@ -1006,6 +1030,8 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
 
     public interface PreferenceUI {
 
+        void setFragment(PreferenceFragment fragment);
+
         /**
          * Finds a preference based on its key.
          */
-- 
cgit v1.2.3


From 47909464af8486819ea73b3219374470277a59d0 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Tue, 10 Apr 2018 22:14:25 +0200
Subject: Extracted string resources

---
 app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java
index 99d39fbd9..07991ae74 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java
@@ -143,6 +143,8 @@ public class PreferenceActivity extends AppCompatActivity {
                     return R.string.user_interface_label;
                 case R.xml.preferences_services:
                     return R.string.services_label;
+                case R.xml.preferences_various:
+                    return R.string.various_pref;
                 default:
                     return R.string.settings_label;
             }
-- 
cgit v1.2.3


From 8ad9ef6c196f2fa5b01aa68edc7624e8628c482d Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Tue, 10 Apr 2018 23:33:04 +0200
Subject: Added categories

---
 .../main/java/de/danoeh/antennapod/activity/PreferenceActivity.java | 4 ++--
 .../java/de/danoeh/antennapod/preferences/PreferenceController.java | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java
index 07991ae74..b2e5c8f08 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java
@@ -143,8 +143,8 @@ public class PreferenceActivity extends AppCompatActivity {
                     return R.string.user_interface_label;
                 case R.xml.preferences_services:
                     return R.string.services_label;
-                case R.xml.preferences_various:
-                    return R.string.various_pref;
+                case R.xml.preferences_miscellaneous:
+                    return R.string.miscellaneous_pref;
                 default:
                     return R.string.settings_label;
             }
diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
index 5bba09dbe..9ec5eeb8e 100644
--- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
+++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
@@ -79,7 +79,7 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
     private static final String PREF_SCREEN_DOWNLOADS = "prefScreenDownloads";
     private static final String PREF_SCREEN_SERVICES = "prefScreenServices";
     private static final String PREF_SCREEN_STORAGE = "prefScreenStorage";
-    private static final String PREF_SCREEN_VARIOUS = "prefScreenVarious";
+    private static final String PREF_SCREEN_MISCELLANEOUS = "prefScreenMiscellaneous";
 
     private static final String PREF_FLATTR_SETTINGS = "prefFlattrSettings";
     private static final String PREF_FLATTR_AUTH = "pref_flattr_authenticate";
@@ -155,8 +155,8 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
                     openScreen(R.xml.preferences_services, activity));
             ui.findPreference(PREF_SCREEN_STORAGE).setOnPreferenceClickListener(preference ->
                     openScreen(R.xml.preferences_storage, activity));
-            ui.findPreference(PREF_SCREEN_VARIOUS).setOnPreferenceClickListener(preference ->
-                    openScreen(R.xml.preferences_various, activity));
+            ui.findPreference(PREF_SCREEN_MISCELLANEOUS).setOnPreferenceClickListener(preference ->
+                    openScreen(R.xml.preferences_miscellaneous, activity));
         }
 /*
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN) {
-- 
cgit v1.2.3


From 5a2dca284034b6f06313d13ef59bee330133d30e Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Tue, 10 Apr 2018 23:41:41 +0200
Subject: Removed misc settings

---
 .../main/java/de/danoeh/antennapod/activity/PreferenceActivity.java    | 2 --
 .../java/de/danoeh/antennapod/preferences/PreferenceController.java    | 3 ---
 2 files changed, 5 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java
index b2e5c8f08..99d39fbd9 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java
@@ -143,8 +143,6 @@ public class PreferenceActivity extends AppCompatActivity {
                     return R.string.user_interface_label;
                 case R.xml.preferences_services:
                     return R.string.services_label;
-                case R.xml.preferences_miscellaneous:
-                    return R.string.miscellaneous_pref;
                 default:
                     return R.string.settings_label;
             }
diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
index 9ec5eeb8e..1e0df6a94 100644
--- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
+++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
@@ -79,7 +79,6 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
     private static final String PREF_SCREEN_DOWNLOADS = "prefScreenDownloads";
     private static final String PREF_SCREEN_SERVICES = "prefScreenServices";
     private static final String PREF_SCREEN_STORAGE = "prefScreenStorage";
-    private static final String PREF_SCREEN_MISCELLANEOUS = "prefScreenMiscellaneous";
 
     private static final String PREF_FLATTR_SETTINGS = "prefFlattrSettings";
     private static final String PREF_FLATTR_AUTH = "pref_flattr_authenticate";
@@ -155,8 +154,6 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
                     openScreen(R.xml.preferences_services, activity));
             ui.findPreference(PREF_SCREEN_STORAGE).setOnPreferenceClickListener(preference ->
                     openScreen(R.xml.preferences_storage, activity));
-            ui.findPreference(PREF_SCREEN_MISCELLANEOUS).setOnPreferenceClickListener(preference ->
-                    openScreen(R.xml.preferences_miscellaneous, activity));
         }
 /*
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN) {
-- 
cgit v1.2.3


From 6957cc9e27c69792af6eb04f21ee4b39172ffa52 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Wed, 11 Apr 2018 00:30:42 +0200
Subject: Re-enabled preference setup methods

---
 .../antennapod/activity/PreferenceActivity.java    |   2 +-
 .../preferences/PreferenceController.java          | 389 ++++++++++++---------
 2 files changed, 233 insertions(+), 158 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java
index 99d39fbd9..5fe5bc334 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java
@@ -163,7 +163,7 @@ public class PreferenceActivity extends AppCompatActivity {
             PreferenceActivity activity = instance.get();
             if(activity != null && activity.preferenceController != null) {
                 activity.preferenceUI.setFragment(this);
-                activity.preferenceController.onStop(getArguments().getInt(PARAM_RESOURCE));
+                activity.preferenceController.onStop();
             }
             super.onStop();
         }
diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
index 1e0df6a94..0945ca660 100644
--- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
+++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
@@ -19,6 +19,7 @@ import android.net.wifi.WifiManager;
 import android.os.Build;
 import android.os.Bundle;
 import android.preference.CheckBoxPreference;
+import android.preference.EditTextPreference;
 import android.preference.ListPreference;
 import android.preference.Preference;
 import android.preference.PreferenceFragment;
@@ -28,16 +29,32 @@ import android.support.design.widget.Snackbar;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.content.FileProvider;
 import android.support.v7.app.AlertDialog;
+import android.text.Editable;
 import android.text.Html;
+import android.text.TextWatcher;
 import android.text.format.DateFormat;
 import android.text.format.DateUtils;
 import android.util.Log;
+import android.widget.EditText;
 import android.widget.ListView;
 import android.widget.Toast;
 
 import com.afollestad.materialdialogs.MaterialDialog;
 
+import de.danoeh.antennapod.activity.AboutActivity;
+import de.danoeh.antennapod.activity.ImportExportActivity;
+import de.danoeh.antennapod.activity.MediaplayerActivity;
+import de.danoeh.antennapod.activity.OpmlImportFromPathActivity;
 import de.danoeh.antennapod.activity.PreferenceActivity;
+import de.danoeh.antennapod.activity.StatisticsActivity;
+import de.danoeh.antennapod.core.export.html.HtmlWriter;
+import de.danoeh.antennapod.core.export.opml.OpmlWriter;
+import de.danoeh.antennapod.core.service.GpodnetSyncService;
+import de.danoeh.antennapod.dialog.AuthenticationDialog;
+import de.danoeh.antennapod.dialog.AutoFlattrPreferenceDialog;
+import de.danoeh.antennapod.dialog.GpodnetSetHostnameDialog;
+import de.danoeh.antennapod.dialog.ProxyDialog;
+import de.danoeh.antennapod.dialog.VariableSpeedDialog;
 import org.apache.commons.lang3.ArrayUtils;
 
 import java.io.File;
@@ -141,21 +158,36 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
 
 
     public void onCreate(int screen) {
+        switch (screen) {
+            case R.xml.preferences:
+                setupMainScreen();
+                break;
+            case R.xml.preferences_downloads:
+                setupDownloadsScreen();
+                buildAutodownloadSelectedNetworsPreference();
+                setSelectedNetworksEnabled(UserPreferences.isEnableAutodownloadWifiFilter());
+                buildEpisodeCleanupPreference();
+                break;
+            case R.xml.preferences_playback:
+                setupPlaybackScreen();
+                PreferenceControllerFlavorHelper.setupCastUI(ui);
+                buildSmartMarkAsPlayedPreference();
+                break;
+            case R.xml.preferences_services:
+                setupServicesScreen();
+                break;
+            case R.xml.preferences_storage:
+                setupStorageScreen();
+                break;
+            case R.xml.preferences_user_interface:
+                setupInterfaceScreen();
+                break;
+        }
+    }
+
+    private void setupInterfaceScreen() {
         final Activity activity = ui.getActivity();
 
-        if (screen == R.xml.preferences) {
-            ui.findPreference(PREF_SCREEN_USER_INTERFACE).setOnPreferenceClickListener(preference ->
-                    openScreen(R.xml.preferences_user_interface, activity));
-            ui.findPreference(PREF_SCREEN_PLAYBACK).setOnPreferenceClickListener(preference ->
-                    openScreen(R.xml.preferences_playback, activity));
-            ui.findPreference(PREF_SCREEN_DOWNLOADS).setOnPreferenceClickListener(preference ->
-                    openScreen(R.xml.preferences_downloads, activity));
-            ui.findPreference(PREF_SCREEN_SERVICES).setOnPreferenceClickListener(preference ->
-                    openScreen(R.xml.preferences_services, activity));
-            ui.findPreference(PREF_SCREEN_STORAGE).setOnPreferenceClickListener(preference ->
-                    openScreen(R.xml.preferences_storage, activity));
-        }
-/*
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN) {
             // disable expanded notification option on unsupported android versions
             ui.findPreference(PreferenceController.PREF_EXPANDED_NOTIFICATION).setEnabled(false);
@@ -168,25 +200,34 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
                     }
             );
         }
-        ui.findPreference(PreferenceController.PREF_FLATTR_REVOKE).setOnPreferenceClickListener(
-                preference -> {
-                    FlattrUtils.revokeAccessToken(activity);
-                    checkItemVisibility();
-                    return true;
-                }
-        );
-        ui.findPreference(PreferenceController.PREF_ABOUT).setOnPreferenceClickListener(
-                preference -> {
-                    activity.startActivity(new Intent(activity, AboutActivity.class));
+        ui.findPreference(UserPreferences.PREF_THEME)
+                .setOnPreferenceChangeListener(
+                        (preference, newValue) -> {
+                            Intent i = new Intent(activity, MainActivity.class);
+                            i.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK
+                                    | Intent.FLAG_ACTIVITY_NEW_TASK);
+                            activity.finish();
+                            activity.startActivity(i);
+                            return true;
+                        }
+                );
+        ui.findPreference(UserPreferences.PREF_HIDDEN_DRAWER_ITEMS)
+                .setOnPreferenceClickListener(preference -> {
+                    showDrawerPreferencesDialog();
                     return true;
-                }
-        );
-        ui.findPreference(PreferenceController.STATISTICS).setOnPreferenceClickListener(
-                preference -> {
-                    activity.startActivity(new Intent(activity, StatisticsActivity.class));
+                });
+
+        ui.findPreference(UserPreferences.PREF_COMPACT_NOTIFICATION_BUTTONS)
+                .setOnPreferenceClickListener(preference -> {
+                    showNotificationButtonsDialog();
                     return true;
-                }
-        );
+                });
+
+    }
+
+    private void setupStorageScreen() {
+        final Activity activity = ui.getActivity();
+
         ui.findPreference(PreferenceController.IMPORT_EXPORT).setOnPreferenceClickListener(
                 preference -> {
                     activity.startActivity(new Intent(activity, ImportExportActivity.class));
@@ -235,35 +276,127 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
                             return true;
                         }
                 );
-        ui.findPreference(UserPreferences.PREF_THEME)
-                .setOnPreferenceChangeListener(
-                        (preference, newValue) -> {
-                            Intent i = new Intent(activity, MainActivity.class);
-                            i.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK
-                                    | Intent.FLAG_ACTIVITY_NEW_TASK);
-                            activity.finish();
-                            activity.startActivity(i);
-                            return true;
+        ui.findPreference(UserPreferences.PREF_IMAGE_CACHE_SIZE).setOnPreferenceChangeListener(
+                (preference, o) -> {
+                    if (o instanceof String) {
+                        int newValue = Integer.parseInt((String) o) * 1024 * 1024;
+                        if (newValue != UserPreferences.getImageCacheSize()) {
+                            AlertDialog.Builder dialog = new AlertDialog.Builder(ui.getActivity());
+                            dialog.setTitle(android.R.string.dialog_alert_title);
+                            dialog.setMessage(R.string.pref_restart_required);
+                            dialog.setPositiveButton(android.R.string.ok, null);
+                            dialog.show();
                         }
-                );
-        ui.findPreference(UserPreferences.PREF_HIDDEN_DRAWER_ITEMS)
+                        return true;
+                    }
+                    return false;
+                }
+        );
+    }
+
+    private void setupServicesScreen() {
+        final Activity activity = ui.getActivity();
+
+        ui.findPreference(PreferenceController.PREF_FLATTR_REVOKE).setOnPreferenceClickListener(
+                preference -> {
+                    FlattrUtils.revokeAccessToken(activity);
+                    checkFlattrItemVisibility();
+                    return true;
+                }
+        );
+        ui.findPreference(PreferenceController.PREF_GPODNET_SETLOGIN_INFORMATION)
                 .setOnPreferenceClickListener(preference -> {
-                    showDrawerPreferencesDialog();
+                    AuthenticationDialog dialog = new AuthenticationDialog(activity,
+                            R.string.pref_gpodnet_setlogin_information_title, false, false, GpodnetPreferences.getUsername(),
+                            null) {
+
+                        @Override
+                        protected void onConfirmed(String username, String password, boolean saveUsernamePassword) {
+                            GpodnetPreferences.setPassword(password);
+                        }
+                    };
+                    dialog.show();
+                    return true;
+                });
+        ui.findPreference(PreferenceController.PREF_GPODNET_SYNC).
+                setOnPreferenceClickListener(preference -> {
+                    GpodnetSyncService.sendSyncIntent(ui.getActivity().getApplicationContext());
+                    Toast toast = Toast.makeText(ui.getActivity(), R.string.pref_gpodnet_sync_started,
+                            Toast.LENGTH_SHORT);
+                    toast.show();
+                    return true;
+                });
+        ui.findPreference(PreferenceController.PREF_GPODNET_FORCE_FULL_SYNC).
+                setOnPreferenceClickListener(preference -> {
+                    GpodnetPreferences.setLastSubscriptionSyncTimestamp(0L);
+                    GpodnetPreferences.setLastEpisodeActionsSyncTimestamp(0L);
+                    GpodnetPreferences.setLastSyncAttempt(false, 0);
+                    updateLastGpodnetSyncReport(false, 0);
+                    GpodnetSyncService.sendSyncIntent(ui.getActivity().getApplicationContext());
+                    Toast toast = Toast.makeText(ui.getActivity(), R.string.pref_gpodnet_sync_started,
+                            Toast.LENGTH_SHORT);
+                    toast.show();
+                    return true;
+                });
+        ui.findPreference(PreferenceController.PREF_GPODNET_LOGOUT).setOnPreferenceClickListener(
+                preference -> {
+                    GpodnetPreferences.logout();
+                    Toast toast = Toast.makeText(activity, R.string.pref_gpodnet_logout_toast, Toast.LENGTH_SHORT);
+                    toast.show();
+                    updateGpodnetPreferenceScreen();
+                    return true;
+                });
+        ui.findPreference(PreferenceController.PREF_GPODNET_HOSTNAME).setOnPreferenceClickListener(
+                preference -> {
+                    GpodnetSetHostnameDialog.createDialog(activity).setOnDismissListener(dialog -> updateGpodnetPreferenceScreen());
                     return true;
                 });
 
-        ui.findPreference(UserPreferences.PREF_COMPACT_NOTIFICATION_BUTTONS)
+        ui.findPreference(PreferenceController.PREF_AUTO_FLATTR_PREFS)
                 .setOnPreferenceClickListener(preference -> {
-                    showNotificationButtonsDialog();
+                    AutoFlattrPreferenceDialog.newAutoFlattrPreferenceDialog(activity,
+                            new AutoFlattrPreferenceDialog.AutoFlattrPreferenceDialogInterface() {
+                                @Override
+                                public void onCancelled() {
+
+                                }
+
+                                @Override
+                                public void onConfirmed(boolean autoFlattrEnabled, float autoFlattrValue) {
+                                    UserPreferences.setAutoFlattrSettings(autoFlattrEnabled, autoFlattrValue);
+                                    checkFlattrItemVisibility();
+                                }
+                            });
                     return true;
                 });
+    }
 
+    private void setupPlaybackScreen() {
+        final Activity activity = ui.getActivity();
+
+        ui.findPreference(PreferenceController.PREF_PLAYBACK_SPEED_LAUNCHER)
+                .setOnPreferenceClickListener(preference -> {
+                    VariableSpeedDialog.showDialog(activity);
+                    return true;
+                });
+        ui.findPreference(PreferenceController.PREF_PLAYBACK_REWIND_DELTA_LAUNCHER)
+                .setOnPreferenceClickListener(preference -> {
+                    MediaplayerActivity.showSkipPreference(activity, MediaplayerActivity.SkipDirection.SKIP_REWIND);
+                    return true;
+                });
+        ui.findPreference(PreferenceController.PREF_PLAYBACK_FAST_FORWARD_DELTA_LAUNCHER)
+                .setOnPreferenceClickListener(preference -> {
+                    MediaplayerActivity.showSkipPreference(activity, MediaplayerActivity.SkipDirection.SKIP_FORWARD);
+                    return true;
+                });
+    }
+
+    private void setupDownloadsScreen() {
         ui.findPreference(UserPreferences.PREF_UPDATE_INTERVAL)
                 .setOnPreferenceClickListener(preference -> {
                     showUpdateIntervalTimePreferencesDialog();
                     return true;
                 });
-
         ui.findPreference(UserPreferences.PREF_ENABLE_AUTODL).setOnPreferenceChangeListener(
                 (preference, newValue) -> {
                     if (newValue instanceof Boolean) {
@@ -340,107 +473,38 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
                             return true;
                         }
                 );
-        ui.findPreference(PreferenceController.PREF_PLAYBACK_SPEED_LAUNCHER)
-                .setOnPreferenceClickListener(preference -> {
-                    VariableSpeedDialog.showDialog(activity);
-                    return true;
-                });
-        ui.findPreference(PreferenceController.PREF_PLAYBACK_REWIND_DELTA_LAUNCHER)
-                .setOnPreferenceClickListener(preference -> {
-                    MediaplayerActivity.showSkipPreference(activity, MediaplayerActivity.SkipDirection.SKIP_REWIND);
-                    return true;
-                });
-        ui.findPreference(PreferenceController.PREF_PLAYBACK_FAST_FORWARD_DELTA_LAUNCHER)
-                .setOnPreferenceClickListener(preference -> {
-                    MediaplayerActivity.showSkipPreference(activity, MediaplayerActivity.SkipDirection.SKIP_FORWARD);
-                    return true;
-                });
-        ui.findPreference(PreferenceController.PREF_GPODNET_SETLOGIN_INFORMATION)
-                .setOnPreferenceClickListener(preference -> {
-                    AuthenticationDialog dialog = new AuthenticationDialog(activity,
-                            R.string.pref_gpodnet_setlogin_information_title, false, false, GpodnetPreferences.getUsername(),
-                            null) {
+        ui.findPreference(PREF_PROXY).setOnPreferenceClickListener(preference -> {
+            ProxyDialog dialog = new ProxyDialog(ui.getActivity());
+            dialog.createDialog().show();
+            return true;
+        });
+    }
 
-                        @Override
-                        protected void onConfirmed(String username, String password, boolean saveUsernamePassword) {
-                            GpodnetPreferences.setPassword(password);
-                        }
-                    };
-                    dialog.show();
-                    return true;
-                });
-        ui.findPreference(PreferenceController.PREF_GPODNET_SYNC).
-                setOnPreferenceClickListener(preference -> {
-                    GpodnetSyncService.sendSyncIntent(ui.getActivity().getApplicationContext());
-                    Toast toast = Toast.makeText(ui.getActivity(), R.string.pref_gpodnet_sync_started,
-                            Toast.LENGTH_SHORT);
-                    toast.show();
-                    return true;
-                });
-        ui.findPreference(PreferenceController.PREF_GPODNET_FORCE_FULL_SYNC).
-                setOnPreferenceClickListener(preference -> {
-                    GpodnetPreferences.setLastSubscriptionSyncTimestamp(0L);
-                    GpodnetPreferences.setLastEpisodeActionsSyncTimestamp(0L);
-                    GpodnetPreferences.setLastSyncAttempt(false, 0);
-                    updateLastGpodnetSyncReport(false, 0);
-                    GpodnetSyncService.sendSyncIntent(ui.getActivity().getApplicationContext());
-                    Toast toast = Toast.makeText(ui.getActivity(), R.string.pref_gpodnet_sync_started,
-                            Toast.LENGTH_SHORT);
-                    toast.show();
-                    return true;
-                });
-        ui.findPreference(PreferenceController.PREF_GPODNET_LOGOUT).setOnPreferenceClickListener(
+    private void setupMainScreen() {
+        final Activity activity = ui.getActivity();
+        ui.findPreference(PREF_SCREEN_USER_INTERFACE).setOnPreferenceClickListener(preference ->
+                openScreen(R.xml.preferences_user_interface, activity));
+        ui.findPreference(PREF_SCREEN_PLAYBACK).setOnPreferenceClickListener(preference ->
+                openScreen(R.xml.preferences_playback, activity));
+        ui.findPreference(PREF_SCREEN_DOWNLOADS).setOnPreferenceClickListener(preference ->
+                openScreen(R.xml.preferences_downloads, activity));
+        ui.findPreference(PREF_SCREEN_SERVICES).setOnPreferenceClickListener(preference ->
+                openScreen(R.xml.preferences_services, activity));
+        ui.findPreference(PREF_SCREEN_STORAGE).setOnPreferenceClickListener(preference ->
+                openScreen(R.xml.preferences_storage, activity));
+
+        ui.findPreference(PreferenceController.PREF_ABOUT).setOnPreferenceClickListener(
                 preference -> {
-                    GpodnetPreferences.logout();
-                    Toast toast = Toast.makeText(activity, R.string.pref_gpodnet_logout_toast, Toast.LENGTH_SHORT);
-                    toast.show();
-                    updateGpodnetPreferenceScreen();
+                    activity.startActivity(new Intent(activity, AboutActivity.class));
                     return true;
-                });
-        ui.findPreference(PreferenceController.PREF_GPODNET_HOSTNAME).setOnPreferenceClickListener(
+                }
+        );
+        ui.findPreference(PreferenceController.STATISTICS).setOnPreferenceClickListener(
                 preference -> {
-                    GpodnetSetHostnameDialog.createDialog(activity).setOnDismissListener(dialog -> updateGpodnetPreferenceScreen());
-                    return true;
-                });
-
-        ui.findPreference(PreferenceController.PREF_AUTO_FLATTR_PREFS)
-                .setOnPreferenceClickListener(preference -> {
-                    AutoFlattrPreferenceDialog.newAutoFlattrPreferenceDialog(activity,
-                            new AutoFlattrPreferenceDialog.AutoFlattrPreferenceDialogInterface() {
-                                @Override
-                                public void onCancelled() {
-
-                                }
-
-                                @Override
-                                public void onConfirmed(boolean autoFlattrEnabled, float autoFlattrValue) {
-                                    UserPreferences.setAutoFlattrSettings(autoFlattrEnabled, autoFlattrValue);
-                                    checkItemVisibility();
-                                }
-                            });
+                    activity.startActivity(new Intent(activity, StatisticsActivity.class));
                     return true;
-                });
-        ui.findPreference(UserPreferences.PREF_IMAGE_CACHE_SIZE).setOnPreferenceChangeListener(
-                (preference, o) -> {
-                    if (o instanceof String) {
-                        int newValue = Integer.parseInt((String) o) * 1024 * 1024;
-                        if (newValue != UserPreferences.getImageCacheSize()) {
-                            AlertDialog.Builder dialog = new AlertDialog.Builder(ui.getActivity());
-                            dialog.setTitle(android.R.string.dialog_alert_title);
-                            dialog.setMessage(R.string.pref_restart_required);
-                            dialog.setPositiveButton(android.R.string.ok, null);
-                            dialog.show();
-                        }
-                        return true;
-                    }
-                    return false;
                 }
         );
-        ui.findPreference(PREF_PROXY).setOnPreferenceClickListener(preference -> {
-            ProxyDialog dialog = new ProxyDialog(ui.getActivity());
-            dialog.createDialog().show();
-            return true;
-        });
         ui.findPreference(PREF_KNOWN_ISSUES).setOnPreferenceClickListener(preference -> {
             openInBrowser("https://github.com/AntennaPod/AntennaPod/labels/bug");
             return true;
@@ -472,11 +536,6 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
             ui.getActivity().startActivity(Intent.createChooser(emailIntent, intentTitle));
             return true;
         });
-        PreferenceControllerFlavorHelper.setupFlavoredUI(ui);
-        buildEpisodeCleanupPreference();
-        buildSmartMarkAsPlayedPreference();
-        buildAutodownloadSelectedNetworsPreference();
-        setSelectedNetworksEnabled(UserPreferences.isEnableAutodownloadWifiFilter());*/
     }
 
     private boolean openScreen(int preferences, Activity activity) {
@@ -544,21 +603,35 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
     }
 
     public void onResume(int screen) {
-        /*checkItemVisibility();
-        setUpdateIntervalText();
-        setParallelDownloadsText(UserPreferences.getParallelDownloads());
-        setEpisodeCacheSizeText(UserPreferences.getEpisodeCacheSize());
-        setDataFolderText();
-        GpodnetPreferences.registerOnSharedPreferenceChangeListener(gpoddernetListener);
-        updateGpodnetPreferenceScreen();*/
+        switch (screen) {
+            case R.xml.preferences_downloads:
+                setUpdateIntervalText();
+                setParallelDownloadsText(UserPreferences.getParallelDownloads());
+                setEpisodeCacheSizeText(UserPreferences.getEpisodeCacheSize());
+                checkAutodownloadItemVisibility();
+                break;
+            case R.xml.preferences_storage:
+                setDataFolderText();
+                break;
+            case R.xml.preferences_services:
+                GpodnetPreferences.registerOnSharedPreferenceChangeListener(gpoddernetListener);
+                updateGpodnetPreferenceScreen();
+                checkFlattrItemVisibility();
+                break;
+            case R.xml.preferences_playback:
+                checkSonicItemVisibility();
+                break;
+        }
     }
 
     public void onPause(int screen) {
-        /*GpodnetPreferences.unregisterOnSharedPreferenceChangeListener(gpoddernetListener);*/
+        if (screen == R.xml.preferences_services) {
+            GpodnetPreferences.unregisterOnSharedPreferenceChangeListener(gpoddernetListener);
+        }
     }
 
-    public void onStop(int screen) {
-        if(subscription != null) {
+    public void onStop() {
+        if (subscription != null) {
             subscription.unsubscribe();
         }
     }
@@ -713,21 +786,23 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
     }
 
     @SuppressWarnings("deprecation")
-    private void checkItemVisibility() {
+    private void checkFlattrItemVisibility() {
         boolean hasFlattrToken = FlattrUtils.hasToken();
         ui.findPreference(PreferenceController.PREF_FLATTR_SETTINGS).setEnabled(FlattrUtils.hasAPICredentials());
         ui.findPreference(PreferenceController.PREF_FLATTR_AUTH).setEnabled(!hasFlattrToken);
         ui.findPreference(PreferenceController.PREF_FLATTR_REVOKE).setEnabled(hasFlattrToken);
         ui.findPreference(PreferenceController.PREF_AUTO_FLATTR_PREFS).setEnabled(hasFlattrToken);
+    }
 
+    private void checkAutodownloadItemVisibility() {
         boolean autoDownload = UserPreferences.isEnableAutodownload();
         ui.findPreference(UserPreferences.PREF_EPISODE_CACHE_SIZE).setEnabled(autoDownload);
         ui.findPreference(UserPreferences.PREF_ENABLE_AUTODL_ON_BATTERY).setEnabled(autoDownload);
         ui.findPreference(UserPreferences.PREF_ENABLE_AUTODL_WIFI_FILTER).setEnabled(autoDownload);
         setSelectedNetworksEnabled(autoDownload && UserPreferences.isEnableAutodownloadWifiFilter());
+    }
 
-        ui.findPreference(PREF_SEND_CRASH_REPORT).setEnabled(CrashReportWriter.getFile().exists());
-
+    private void checkSonicItemVisibility() {
         if (Build.VERSION.SDK_INT >= 16) {
             ui.findPreference(UserPreferences.PREF_SONIC).setEnabled(true);
         } else {
-- 
cgit v1.2.3


From b1622fa6bef985f11474e60f103474180c642bda Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Wed, 11 Apr 2018 01:09:43 +0200
Subject: Revert rename of setupFlavoredUI

---
 .../java/de/danoeh/antennapod/preferences/PreferenceController.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
index 0945ca660..06d88156c 100644
--- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
+++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
@@ -170,7 +170,7 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
                 break;
             case R.xml.preferences_playback:
                 setupPlaybackScreen();
-                PreferenceControllerFlavorHelper.setupCastUI(ui);
+                PreferenceControllerFlavorHelper.setupFlavoredUI(ui);
                 buildSmartMarkAsPlayedPreference();
                 break;
             case R.xml.preferences_services:
-- 
cgit v1.2.3


From 0f80fac6805bd7b1476aa04a37d6f12f1ba10d92 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Wed, 11 Apr 2018 12:15:49 +0200
Subject: Allow to continue playback when leaving player

---
 .../main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
index 832386185..733f39b63 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
@@ -288,7 +288,9 @@ public class VideoplayerActivity extends MediaplayerActivity {
         public void surfaceDestroyed(SurfaceHolder holder) {
             Log.d(TAG, "Videosurface was destroyed");
             videoSurfaceCreated = false;
-            if (controller != null && !destroyingDueToReload) {
+            if (controller != null && !destroyingDueToReload
+                    && UserPreferences.getVideoBackgroundBehavior()
+                    != UserPreferences.VideoBackgroundBehavior.CONTINUE_PLAYING) {
                 controller.notifyVideoSurfaceAbandoned();
             }
         }
-- 
cgit v1.2.3


From c5bdf341faa235821ec1d4e8f1621c8e785dc480 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Wed, 11 Apr 2018 17:09:12 +0200
Subject: Changed batch edit icon and name

Closes #1146
---
 .../antennapod/fragment/CompletedDownloadsFragment.java     | 13 +------------
 .../de/danoeh/antennapod/fragment/ItemlistFragment.java     |  7 -------
 2 files changed, 1 insertion(+), 19 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java
index f37ecd5e7..f59bc88bf 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java
@@ -140,18 +140,7 @@ public class CompletedDownloadsFragment extends ListFragment {
         super.onCreateOptionsMenu(menu, inflater);
         if(items != null) {
             inflater.inflate(R.menu.downloads_completed, menu);
-            MenuItem episodeActions = menu.findItem(R.id.episode_actions);
-            if(items.size() > 0) {
-                int[] attrs = {R.attr.action_bar_icon_color};
-                TypedArray ta = getActivity().obtainStyledAttributes(UserPreferences.getTheme(), attrs);
-                int textColor = ta.getColor(0, Color.GRAY);
-                ta.recycle();
-                episodeActions.setIcon(new IconDrawable(getActivity(),
-                        FontAwesomeIcons.fa_gears).color(textColor).actionBarSize());
-                episodeActions.setVisible(true);
-            } else {
-                episodeActions.setVisible(false);
-            }
+            menu.findItem(R.id.episode_actions).setVisible(items.size() > 0);
         }
     }
 
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java
index 890f31f57..3954c194c 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java
@@ -221,13 +221,6 @@ public class ItemlistFragment extends ListFragment {
                 menu.findItem(R.id.share_link_item).setVisible(false);
                 menu.findItem(R.id.visit_website_item).setVisible(false);
             }
-            int[] attrs = { R.attr.action_bar_icon_color };
-            TypedArray ta = getActivity().obtainStyledAttributes(UserPreferences.getTheme(), attrs);
-            int textColor = ta.getColor(0, Color.GRAY);
-            ta.recycle();
-
-            menu.findItem(R.id.episode_actions).setIcon(new IconDrawable(getActivity(),
-                    FontAwesomeIcons.fa_gears).color(textColor).actionBarSize());
 
             isUpdatingFeed = MenuItemUtils.updateRefreshMenuItem(menu, R.id.refresh_item, updateRefreshMenuItemChecker);
         }
-- 
cgit v1.2.3


From c9fdc05784b5f8c4eb7ec5be9cbde4a684e64a99 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Fri, 13 Apr 2018 15:39:51 +0200
Subject: Split feed info and settings

---
 .../antennapod/activity/FeedInfoActivity.java      | 214 +------------
 .../antennapod/activity/FeedSettingsActivity.java  | 348 +++++++++++++++++++++
 .../antennapod/fragment/ItemlistFragment.java      |  19 +-
 3 files changed, 368 insertions(+), 213 deletions(-)
 create mode 100644 app/src/main/java/de/danoeh/antennapod/activity/FeedSettingsActivity.java

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/FeedInfoActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/FeedInfoActivity.java
index 8dea41b7c..ca8681ef8 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/FeedInfoActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/FeedInfoActivity.java
@@ -2,51 +2,35 @@ package de.danoeh.antennapod.activity;
 
 import android.content.ClipData;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
-import android.text.Editable;
 import android.text.TextUtils;
-import android.text.TextWatcher;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemSelectedListener;
-import android.widget.CheckBox;
-import android.widget.EditText;
 import android.widget.ImageView;
-import android.widget.RadioButton;
-import android.widget.Spinner;
 import android.widget.TextView;
 import android.widget.Toast;
-
 import com.bumptech.glide.Glide;
 import com.joanzapata.iconify.Iconify;
-
-import org.apache.commons.lang3.StringUtils;
-import org.jsoup.Jsoup;
-import org.jsoup.nodes.Document;
-
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.core.dialog.ConfirmationDialog;
 import de.danoeh.antennapod.core.dialog.DownloadRequestErrorDialogCreator;
 import de.danoeh.antennapod.core.feed.Feed;
-import de.danoeh.antennapod.core.feed.FeedFilter;
-import de.danoeh.antennapod.core.feed.FeedPreferences;
 import de.danoeh.antennapod.core.glide.ApGlideSettings;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.core.storage.DBReader;
-import de.danoeh.antennapod.core.storage.DBWriter;
 import de.danoeh.antennapod.core.storage.DownloadRequestException;
 import de.danoeh.antennapod.core.util.IntentUtils;
 import de.danoeh.antennapod.core.util.LangUtils;
 import de.danoeh.antennapod.core.util.syndication.HtmlToPlainText;
 import de.danoeh.antennapod.menuhandler.FeedMenuHandler;
+import org.apache.commons.lang3.StringUtils;
+import org.jsoup.Jsoup;
+import org.jsoup.nodes.Document;
 import rx.Observable;
 import rx.Subscription;
 import rx.android.schedulers.AndroidSchedulers;
@@ -59,7 +43,6 @@ public class FeedInfoActivity extends AppCompatActivity {
 
     public static final String EXTRA_FEED_ID = "de.danoeh.antennapod.extra.feedId";
     private static final String TAG = "FeedInfoActivity";
-    private boolean autoDeleteChanged = false;
     private Feed feed;
 
     private ImageView imgvCover;
@@ -70,15 +53,6 @@ public class FeedInfoActivity extends AppCompatActivity {
     private TextView lblAuthor;
     private TextView txtvAuthor;
     private TextView txtvUrl;
-    private EditText etxtUsername;
-    private EditText etxtPassword;
-    private EditText etxtFilterText;
-    private RadioButton rdoFilterInclude;
-    private RadioButton rdoFilterExclude;
-    private CheckBox cbxAutoDownload;
-    private CheckBox cbxKeepUpdated;
-    private Spinner spnAutoDelete;
-    private boolean filterInclude = true;
 
     private Subscription subscription;
 
@@ -98,40 +72,6 @@ public class FeedInfoActivity extends AppCompatActivity {
         }
     };
 
-    private boolean authInfoChanged = false;
-
-    private final TextWatcher authTextWatcher = new TextWatcher() {
-        @Override
-        public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-        }
-
-        @Override
-        public void onTextChanged(CharSequence s, int start, int before, int count) {
-        }
-
-        @Override
-        public void afterTextChanged(Editable s) {
-            authInfoChanged = true;
-        }
-    };
-
-    private boolean filterTextChanged = false;
-
-    private final TextWatcher filterTextWatcher = new TextWatcher() {
-        @Override
-        public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-        }
-
-        @Override
-        public void onTextChanged(CharSequence s, int start, int before, int count) {
-        }
-
-        @Override
-        public void afterTextChanged(Editable s) {
-            filterTextChanged = true;
-        }
-    };
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         setTheme(UserPreferences.getTheme());
@@ -148,22 +88,7 @@ public class FeedInfoActivity extends AppCompatActivity {
         lblAuthor = (TextView) findViewById(R.id.lblAuthor);
         txtvAuthor = (TextView) findViewById(R.id.txtvAuthor);
         txtvUrl = (TextView) findViewById(R.id.txtvUrl);
-        cbxAutoDownload = (CheckBox) findViewById(R.id.cbxAutoDownload);
-        cbxKeepUpdated = (CheckBox) findViewById(R.id.cbxKeepUpdated);
-        spnAutoDelete = (Spinner) findViewById(R.id.spnAutoDelete);
-        etxtUsername = (EditText) findViewById(R.id.etxtUsername);
-        etxtPassword = (EditText) findViewById(R.id.etxtPassword);
-        etxtFilterText = (EditText) findViewById(R.id.etxtEpisodeFilterText);
-        rdoFilterInclude = (RadioButton) findViewById(R.id.radio_filter_include);
-        rdoFilterInclude.setOnClickListener(v -> {
-            filterInclude = true;
-            filterTextChanged = true;
-        });
-        rdoFilterExclude = (RadioButton) findViewById(R.id.radio_filter_exclude);
-        rdoFilterExclude.setOnClickListener(v -> {
-            filterInclude = false;
-            filterTextChanged = true;
-        });
+
 
         txtvUrl.setOnClickListener(copyUrlToClipboard);
 
@@ -179,7 +104,6 @@ public class FeedInfoActivity extends AppCompatActivity {
                     Log.d(TAG, "Language is " + feed.getLanguage());
                     Log.d(TAG, "Author is " + feed.getAuthor());
                     Log.d(TAG, "URL is " + feed.getDownload_url());
-                    FeedPreferences prefs = feed.getPreferences();
                     Glide.with(FeedInfoActivity.this)
                             .load(feed.getImageLocation())
                             .placeholder(R.color.light_gray)
@@ -218,113 +142,13 @@ public class FeedInfoActivity extends AppCompatActivity {
                     txtvUrl.setText(feed.getDownload_url() + " {fa-paperclip}");
                     Iconify.addIcons(txtvUrl);
 
-                    cbxAutoDownload.setEnabled(UserPreferences.isEnableAutodownload());
-                    cbxAutoDownload.setChecked(prefs.getAutoDownload());
-                    cbxAutoDownload.setOnCheckedChangeListener((compoundButton, checked) -> {
-                        feed.getPreferences().setAutoDownload(checked);
-                        feed.savePreferences();
-                        updateAutoDownloadSettings();
-                        ApplyToEpisodesDialog dialog = new ApplyToEpisodesDialog(FeedInfoActivity.this,
-                                feed, checked);
-                        dialog.createNewDialog().show();
-                    });
-                    cbxKeepUpdated.setChecked(prefs.getKeepUpdated());
-                    cbxKeepUpdated.setOnCheckedChangeListener((compoundButton, checked) -> {
-                        feed.getPreferences().setKeepUpdated(checked);
-                        feed.savePreferences();
-                    });
-                    spnAutoDelete.setOnItemSelectedListener(new OnItemSelectedListener() {
-                        @Override
-                        public void onItemSelected(AdapterView<?> parent, View view, int pos, long id) {
-                            FeedPreferences.AutoDeleteAction auto_delete_action;
-                            switch (parent.getSelectedItemPosition()) {
-                                case 0:
-                                    auto_delete_action = FeedPreferences.AutoDeleteAction.GLOBAL;
-                                    break;
-                                case 1:
-                                    auto_delete_action = FeedPreferences.AutoDeleteAction.YES;
-                                    break;
-                                case 2:
-                                    auto_delete_action = FeedPreferences.AutoDeleteAction.NO;
-                                    break;
-                                default: // TODO - add exceptions here
-                                    return;
-                            }
-                            feed.getPreferences().setAutoDeleteAction(auto_delete_action);// p
-                            autoDeleteChanged = true;
-                        }
-
-                        @Override
-                        public void onNothingSelected(AdapterView<?> parent) {
-                            // Another interface callback
-                        }
-                    });
-                    spnAutoDelete.setSelection(prefs.getAutoDeleteAction().ordinal());
-
-                    etxtUsername.setText(prefs.getUsername());
-                    etxtPassword.setText(prefs.getPassword());
-
-                    etxtUsername.addTextChangedListener(authTextWatcher);
-                    etxtPassword.addTextChangedListener(authTextWatcher);
-
-                    FeedFilter filter = prefs.getFilter();
-                    if (filter.includeOnly()) {
-                        etxtFilterText.setText(filter.getIncludeFilter());
-                        rdoFilterInclude.setChecked(true);
-                        rdoFilterExclude.setChecked(false);
-                        filterInclude = true;
-                    } else if (filter.excludeOnly()) {
-                        etxtFilterText.setText(filter.getExcludeFilter());
-                        rdoFilterInclude.setChecked(false);
-                        rdoFilterExclude.setChecked(true);
-                        filterInclude = false;
-                    } else {
-                        Log.d(TAG, "No filter set");
-                        rdoFilterInclude.setChecked(false);
-                        rdoFilterExclude.setChecked(false);
-                        etxtFilterText.setText("");
-                    }
-                    etxtFilterText.addTextChangedListener(filterTextWatcher);
-
                     supportInvalidateOptionsMenu();
-                    updateAutoDownloadSettings();
                 }, error -> {
                     Log.d(TAG, Log.getStackTraceString(error));
                     finish();
                 });
     }
 
-    @Override
-    protected void onPause() {
-        super.onPause();
-        if (feed != null) {
-            FeedPreferences prefs = feed.getPreferences();
-            if (authInfoChanged) {
-                Log.d(TAG, "Auth info changed, saving credentials");
-                prefs.setUsername(etxtUsername.getText().toString());
-                prefs.setPassword(etxtPassword.getText().toString());
-            }
-            if (filterTextChanged) {
-                Log.d(TAG, "Filter info changed, saving...");
-                String filterText = etxtFilterText.getText().toString();
-                String includeString = "";
-                String excludeString = "";
-                if (filterInclude) {
-                    includeString = filterText;
-                } else {
-                    excludeString = filterText;
-                }
-                prefs.setFilter(new FeedFilter(includeString, excludeString));
-            }
-            if (authInfoChanged || autoDeleteChanged || filterTextChanged) {
-                DBWriter.setFeedPreferences(prefs);
-            }
-            authInfoChanged = false;
-            autoDeleteChanged = false;
-            filterTextChanged = false;
-        }
-    }
-
     @Override
     public void onDestroy() {
         super.onDestroy();
@@ -369,34 +193,4 @@ public class FeedInfoActivity extends AppCompatActivity {
                 return super.onOptionsItemSelected(item);
         }
     }
-
-    private void updateAutoDownloadSettings() {
-        if (feed != null && feed.getPreferences() != null) {
-            boolean enabled = feed.getPreferences().getAutoDownload() && UserPreferences.isEnableAutodownload();
-            rdoFilterInclude.setEnabled(enabled);
-            rdoFilterExclude.setEnabled(enabled);
-            etxtFilterText.setEnabled(enabled);
-        }
-    }
-
-    private static class ApplyToEpisodesDialog extends ConfirmationDialog {
-
-        private final Feed feed;
-        private final boolean autoDownload;
-
-        ApplyToEpisodesDialog(Context context, Feed feed, boolean autoDownload) {
-            super(context, R.string.auto_download_apply_to_items_title,
-                    R.string.auto_download_apply_to_items_message);
-            this.feed = feed;
-            this.autoDownload = autoDownload;
-            setPositiveText(R.string.yes);
-            setNegativeText(R.string.no);
-        }
-
-        @Override
-        public  void onConfirmButtonPressed(DialogInterface dialog) {
-            DBWriter.setFeedsItemsAutoDownload(feed, autoDownload);
-        }
-    }
-
 }
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/FeedSettingsActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/FeedSettingsActivity.java
new file mode 100644
index 000000000..d962da25a
--- /dev/null
+++ b/app/src/main/java/de/danoeh/antennapod/activity/FeedSettingsActivity.java
@@ -0,0 +1,348 @@
+package de.danoeh.antennapod.activity;
+
+import android.content.ClipData;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.util.Log;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemSelectedListener;
+import android.widget.CheckBox;
+import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.RadioButton;
+import android.widget.Spinner;
+import android.widget.TextView;
+import android.widget.Toast;
+import com.bumptech.glide.Glide;
+import de.danoeh.antennapod.R;
+import de.danoeh.antennapod.core.dialog.ConfirmationDialog;
+import de.danoeh.antennapod.core.dialog.DownloadRequestErrorDialogCreator;
+import de.danoeh.antennapod.core.feed.Feed;
+import de.danoeh.antennapod.core.feed.FeedFilter;
+import de.danoeh.antennapod.core.feed.FeedPreferences;
+import de.danoeh.antennapod.core.glide.ApGlideSettings;
+import de.danoeh.antennapod.core.preferences.UserPreferences;
+import de.danoeh.antennapod.core.storage.DBReader;
+import de.danoeh.antennapod.core.storage.DBWriter;
+import de.danoeh.antennapod.core.storage.DownloadRequestException;
+import de.danoeh.antennapod.core.util.IntentUtils;
+import de.danoeh.antennapod.menuhandler.FeedMenuHandler;
+import rx.Observable;
+import rx.Subscription;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
+
+/**
+ * Displays information about a feed.
+ */
+public class FeedSettingsActivity extends AppCompatActivity {
+
+    public static final String EXTRA_FEED_ID = "de.danoeh.antennapod.extra.feedId";
+    private static final String TAG = "FeedSettingsActivity";
+    private boolean autoDeleteChanged = false;
+    private Feed feed;
+
+    private ImageView imgvCover;
+    private TextView txtvTitle;
+    private EditText etxtUsername;
+    private EditText etxtPassword;
+    private EditText etxtFilterText;
+    private RadioButton rdoFilterInclude;
+    private RadioButton rdoFilterExclude;
+    private CheckBox cbxAutoDownload;
+    private CheckBox cbxKeepUpdated;
+    private Spinner spnAutoDelete;
+    private boolean filterInclude = true;
+
+    private Subscription subscription;
+
+
+    private final View.OnClickListener copyUrlToClipboard = new View.OnClickListener() {
+        @Override
+        public void onClick(View v) {
+            if(feed != null && feed.getDownload_url() != null) {
+                String url = feed.getDownload_url();
+                ClipData clipData = ClipData.newPlainText(url, url);
+                android.content.ClipboardManager cm = (android.content.ClipboardManager) FeedSettingsActivity.this
+                        .getSystemService(Context.CLIPBOARD_SERVICE);
+                cm.setPrimaryClip(clipData);
+                Toast t = Toast.makeText(FeedSettingsActivity.this, R.string.copied_url_msg, Toast.LENGTH_SHORT);
+                t.show();
+            }
+        }
+    };
+
+    private boolean authInfoChanged = false;
+
+    private final TextWatcher authTextWatcher = new TextWatcher() {
+        @Override
+        public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+        }
+
+        @Override
+        public void onTextChanged(CharSequence s, int start, int before, int count) {
+        }
+
+        @Override
+        public void afterTextChanged(Editable s) {
+            authInfoChanged = true;
+        }
+    };
+
+    private boolean filterTextChanged = false;
+
+    private final TextWatcher filterTextWatcher = new TextWatcher() {
+        @Override
+        public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+        }
+
+        @Override
+        public void onTextChanged(CharSequence s, int start, int before, int count) {
+        }
+
+        @Override
+        public void afterTextChanged(Editable s) {
+            filterTextChanged = true;
+        }
+    };
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        setTheme(UserPreferences.getTheme());
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.feedsettings);
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        long feedId = getIntent().getLongExtra(EXTRA_FEED_ID, -1);
+
+        imgvCover = (ImageView) findViewById(R.id.imgvCover);
+        txtvTitle = (TextView) findViewById(R.id.txtvTitle);
+        cbxAutoDownload = (CheckBox) findViewById(R.id.cbxAutoDownload);
+        cbxKeepUpdated = (CheckBox) findViewById(R.id.cbxKeepUpdated);
+        spnAutoDelete = (Spinner) findViewById(R.id.spnAutoDelete);
+        etxtUsername = (EditText) findViewById(R.id.etxtUsername);
+        etxtPassword = (EditText) findViewById(R.id.etxtPassword);
+        etxtFilterText = (EditText) findViewById(R.id.etxtEpisodeFilterText);
+        rdoFilterInclude = (RadioButton) findViewById(R.id.radio_filter_include);
+        rdoFilterInclude.setOnClickListener(v -> {
+            filterInclude = true;
+            filterTextChanged = true;
+        });
+        rdoFilterExclude = (RadioButton) findViewById(R.id.radio_filter_exclude);
+        rdoFilterExclude.setOnClickListener(v -> {
+            filterInclude = false;
+            filterTextChanged = true;
+        });
+
+        subscription = Observable.fromCallable(()-> DBReader.getFeed(feedId))
+                .subscribeOn(Schedulers.newThread())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(result -> {
+                    if (result == null) {
+                        Log.e(TAG, "Activity was started with invalid arguments");
+                        finish();
+                    }
+                    feed = result;
+                    FeedPreferences prefs = feed.getPreferences();
+                    Glide.with(FeedSettingsActivity.this)
+                            .load(feed.getImageLocation())
+                            .placeholder(R.color.light_gray)
+                            .error(R.color.light_gray)
+                            .diskCacheStrategy(ApGlideSettings.AP_DISK_CACHE_STRATEGY)
+                            .fitCenter()
+                            .dontAnimate()
+                            .into(imgvCover);
+
+                    txtvTitle.setText(feed.getTitle());
+
+                    cbxAutoDownload.setEnabled(UserPreferences.isEnableAutodownload());
+                    cbxAutoDownload.setChecked(prefs.getAutoDownload());
+                    cbxAutoDownload.setOnCheckedChangeListener((compoundButton, checked) -> {
+                        feed.getPreferences().setAutoDownload(checked);
+                        feed.savePreferences();
+                        updateAutoDownloadSettings();
+                        ApplyToEpisodesDialog dialog = new ApplyToEpisodesDialog(FeedSettingsActivity.this,
+                                feed, checked);
+                        dialog.createNewDialog().show();
+                    });
+                    cbxKeepUpdated.setChecked(prefs.getKeepUpdated());
+                    cbxKeepUpdated.setOnCheckedChangeListener((compoundButton, checked) -> {
+                        feed.getPreferences().setKeepUpdated(checked);
+                        feed.savePreferences();
+                    });
+                    spnAutoDelete.setOnItemSelectedListener(new OnItemSelectedListener() {
+                        @Override
+                        public void onItemSelected(AdapterView<?> parent, View view, int pos, long id) {
+                            FeedPreferences.AutoDeleteAction auto_delete_action;
+                            switch (parent.getSelectedItemPosition()) {
+                                case 0:
+                                    auto_delete_action = FeedPreferences.AutoDeleteAction.GLOBAL;
+                                    break;
+                                case 1:
+                                    auto_delete_action = FeedPreferences.AutoDeleteAction.YES;
+                                    break;
+                                case 2:
+                                    auto_delete_action = FeedPreferences.AutoDeleteAction.NO;
+                                    break;
+                                default: // TODO - add exceptions here
+                                    return;
+                            }
+                            feed.getPreferences().setAutoDeleteAction(auto_delete_action);// p
+                            autoDeleteChanged = true;
+                        }
+
+                        @Override
+                        public void onNothingSelected(AdapterView<?> parent) {
+                            // Another interface callback
+                        }
+                    });
+                    spnAutoDelete.setSelection(prefs.getAutoDeleteAction().ordinal());
+
+                    etxtUsername.setText(prefs.getUsername());
+                    etxtPassword.setText(prefs.getPassword());
+
+                    etxtUsername.addTextChangedListener(authTextWatcher);
+                    etxtPassword.addTextChangedListener(authTextWatcher);
+
+                    FeedFilter filter = prefs.getFilter();
+                    if (filter.includeOnly()) {
+                        etxtFilterText.setText(filter.getIncludeFilter());
+                        rdoFilterInclude.setChecked(true);
+                        rdoFilterExclude.setChecked(false);
+                        filterInclude = true;
+                    } else if (filter.excludeOnly()) {
+                        etxtFilterText.setText(filter.getExcludeFilter());
+                        rdoFilterInclude.setChecked(false);
+                        rdoFilterExclude.setChecked(true);
+                        filterInclude = false;
+                    } else {
+                        Log.d(TAG, "No filter set");
+                        rdoFilterInclude.setChecked(false);
+                        rdoFilterExclude.setChecked(false);
+                        etxtFilterText.setText("");
+                    }
+                    etxtFilterText.addTextChangedListener(filterTextWatcher);
+
+                    supportInvalidateOptionsMenu();
+                    updateAutoDownloadSettings();
+                }, error -> {
+                    Log.d(TAG, Log.getStackTraceString(error));
+                    finish();
+                });
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        if (feed != null) {
+            FeedPreferences prefs = feed.getPreferences();
+            if (authInfoChanged) {
+                Log.d(TAG, "Auth info changed, saving credentials");
+                prefs.setUsername(etxtUsername.getText().toString());
+                prefs.setPassword(etxtPassword.getText().toString());
+            }
+            if (filterTextChanged) {
+                Log.d(TAG, "Filter info changed, saving...");
+                String filterText = etxtFilterText.getText().toString();
+                String includeString = "";
+                String excludeString = "";
+                if (filterInclude) {
+                    includeString = filterText;
+                } else {
+                    excludeString = filterText;
+                }
+                prefs.setFilter(new FeedFilter(includeString, excludeString));
+            }
+            if (authInfoChanged || autoDeleteChanged || filterTextChanged) {
+                DBWriter.setFeedPreferences(prefs);
+            }
+            authInfoChanged = false;
+            autoDeleteChanged = false;
+            filterTextChanged = false;
+        }
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        if(subscription != null) {
+            subscription.unsubscribe();
+        }
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        super.onCreateOptionsMenu(menu);
+        MenuInflater inflater = getMenuInflater();
+        inflater.inflate(R.menu.feedinfo, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onPrepareOptionsMenu(Menu menu) {
+        super.onPrepareOptionsMenu(menu);
+        menu.findItem(R.id.support_item).setVisible(
+                feed != null && feed.getPaymentLink() != null);
+        menu.findItem(R.id.share_link_item).setVisible(feed != null && feed.getLink() != null);
+        menu.findItem(R.id.visit_website_item).setVisible(feed != null && feed.getLink() != null &&
+                IntentUtils.isCallable(this, new Intent(Intent.ACTION_VIEW, Uri.parse(feed.getLink()))));
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case android.R.id.home:
+                finish();
+                return true;
+            default:
+                try {
+                    return FeedMenuHandler.onOptionsItemClicked(this, item, feed);
+                } catch (DownloadRequestException e) {
+                    e.printStackTrace();
+                    DownloadRequestErrorDialogCreator.newRequestErrorDialog(this,
+                            e.getMessage());
+                }
+                return super.onOptionsItemSelected(item);
+        }
+    }
+
+    private void updateAutoDownloadSettings() {
+        if (feed != null && feed.getPreferences() != null) {
+            boolean enabled = feed.getPreferences().getAutoDownload() && UserPreferences.isEnableAutodownload();
+            rdoFilterInclude.setEnabled(enabled);
+            rdoFilterExclude.setEnabled(enabled);
+            etxtFilterText.setEnabled(enabled);
+        }
+    }
+
+    private static class ApplyToEpisodesDialog extends ConfirmationDialog {
+
+        private final Feed feed;
+        private final boolean autoDownload;
+
+        ApplyToEpisodesDialog(Context context, Feed feed, boolean autoDownload) {
+            super(context, R.string.auto_download_apply_to_items_title,
+                    R.string.auto_download_apply_to_items_message);
+            this.feed = feed;
+            this.autoDownload = autoDownload;
+            setPositiveText(R.string.yes);
+            setNegativeText(R.string.no);
+        }
+
+        @Override
+        public  void onConfirmButtonPressed(DialogInterface dialog) {
+            DBWriter.setFeedsItemsAutoDownload(feed, autoDownload);
+        }
+    }
+
+}
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java
index 890f31f57..b54ac461d 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java
@@ -31,6 +31,7 @@ import com.joanzapata.iconify.Iconify;
 import com.joanzapata.iconify.fonts.FontAwesomeIcons;
 import com.joanzapata.iconify.widget.IconTextView;
 
+import de.danoeh.antennapod.activity.FeedSettingsActivity;
 import org.apache.commons.lang3.Validate;
 
 import java.util.List;
@@ -497,6 +498,7 @@ public class ItemlistFragment extends ListFragment {
         imgvBackground = (ImageView) header.findViewById(R.id.imgvBackground);
         imgvCover = (ImageView) header.findViewById(R.id.imgvCover);
         ImageButton butShowInfo = (ImageButton) header.findViewById(R.id.butShowInfo);
+        ImageButton butShowSettings = (ImageButton) header.findViewById(R.id.butShowSettings);
         txtvInformation = (TextView) header.findViewById(R.id.txtvInformation);
         txtvFailure = (IconTextView) header.findViewById(R.id.txtvFailure);
 
@@ -509,10 +511,12 @@ public class ItemlistFragment extends ListFragment {
 
         loadFeedImage();
 
-        butShowInfo.setOnClickListener(v -> {
+        butShowInfo.setOnClickListener(v -> showFeedInfo());
+        imgvCover.setOnClickListener(v -> showFeedInfo());
+        butShowSettings.setOnClickListener(v -> {
             if (viewsCreated && itemsLoaded) {
-                Intent startIntent = new Intent(getActivity(), FeedInfoActivity.class);
-                startIntent.putExtra(FeedInfoActivity.EXTRA_FEED_ID,
+                Intent startIntent = new Intent(getActivity(), FeedSettingsActivity.class);
+                startIntent.putExtra(FeedSettingsActivity.EXTRA_FEED_ID,
                         feed.getId());
                 startActivity(startIntent);
             }
@@ -520,6 +524,15 @@ public class ItemlistFragment extends ListFragment {
         headerCreated = true;
     }
 
+    private void showFeedInfo() {
+        if (viewsCreated && itemsLoaded) {
+            Intent startIntent = new Intent(getActivity(), FeedInfoActivity.class);
+            startIntent.putExtra(FeedInfoActivity.EXTRA_FEED_ID,
+                    feed.getId());
+            startActivity(startIntent);
+        }
+    }
+
     private void loadFeedImage() {
         Glide.with(getActivity())
                 .load(feed.getImageLocation())
-- 
cgit v1.2.3


From a1ce4f8b6ffec4915e38962130fc625408041583 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Fri, 13 Apr 2018 16:23:01 +0200
Subject: Use better header in feed info and settings

---
 .../antennapod/activity/FeedInfoActivity.java      | 22 ++++++++++++++++++++--
 .../antennapod/activity/FeedSettingsActivity.java  | 22 ++++++++++++++++++++++
 2 files changed, 42 insertions(+), 2 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/FeedInfoActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/FeedInfoActivity.java
index ca8681ef8..6b1272b01 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/FeedInfoActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/FeedInfoActivity.java
@@ -3,6 +3,7 @@ package de.danoeh.antennapod.activity;
 import android.content.ClipData;
 import android.content.Context;
 import android.content.Intent;
+import android.graphics.LightingColorFilter;
 import android.net.Uri;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
@@ -21,6 +22,7 @@ import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.core.dialog.DownloadRequestErrorDialogCreator;
 import de.danoeh.antennapod.core.feed.Feed;
 import de.danoeh.antennapod.core.glide.ApGlideSettings;
+import de.danoeh.antennapod.core.glide.FastBlurTransformation;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.core.storage.DBReader;
 import de.danoeh.antennapod.core.storage.DownloadRequestException;
@@ -82,14 +84,21 @@ public class FeedInfoActivity extends AppCompatActivity {
 
         imgvCover = (ImageView) findViewById(R.id.imgvCover);
         txtvTitle = (TextView) findViewById(R.id.txtvTitle);
+        TextView txtvAuthorHeader = (TextView) findViewById(R.id.txtvAuthor);
+        ImageView imgvBackground = (ImageView) findViewById(R.id.imgvBackground);
+        findViewById(R.id.butShowInfo).setVisibility(View.INVISIBLE);
+        findViewById(R.id.butShowSettings).setVisibility(View.INVISIBLE);
+        // https://github.com/bumptech/glide/issues/529
+        imgvBackground.setColorFilter(new LightingColorFilter(0xff828282, 0x000000));
+
+
         txtvDescription = (TextView) findViewById(R.id.txtvDescription);
         lblLanguage = (TextView) findViewById(R.id.lblLanguage);
         txtvLanguage = (TextView) findViewById(R.id.txtvLanguage);
         lblAuthor = (TextView) findViewById(R.id.lblAuthor);
-        txtvAuthor = (TextView) findViewById(R.id.txtvAuthor);
+        txtvAuthor = (TextView) findViewById(R.id.txtvDetailsAuthor);
         txtvUrl = (TextView) findViewById(R.id.txtvUrl);
 
-
         txtvUrl.setOnClickListener(copyUrlToClipboard);
 
         subscription = Observable.fromCallable(()-> DBReader.getFeed(feedId))
@@ -112,6 +121,14 @@ public class FeedInfoActivity extends AppCompatActivity {
                             .fitCenter()
                             .dontAnimate()
                             .into(imgvCover);
+                    Glide.with(FeedInfoActivity.this)
+                            .load(feed.getImageLocation())
+                            .placeholder(R.color.image_readability_tint)
+                            .error(R.color.image_readability_tint)
+                            .diskCacheStrategy(ApGlideSettings.AP_DISK_CACHE_STRATEGY)
+                            .transform(new FastBlurTransformation(FeedInfoActivity.this))
+                            .dontAnimate()
+                            .into(imgvBackground);
 
                     txtvTitle.setText(feed.getTitle());
 
@@ -129,6 +146,7 @@ public class FeedInfoActivity extends AppCompatActivity {
 
                     if (!TextUtils.isEmpty(feed.getAuthor())) {
                         txtvAuthor.setText(feed.getAuthor());
+                        txtvAuthorHeader.setText(feed.getAuthor());
                     } else {
                         lblAuthor.setVisibility(View.GONE);
                         txtvAuthor.setVisibility(View.GONE);
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/FeedSettingsActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/FeedSettingsActivity.java
index d962da25a..5e15585a5 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/FeedSettingsActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/FeedSettingsActivity.java
@@ -4,10 +4,12 @@ import android.content.ClipData;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.graphics.LightingColorFilter;
 import android.net.Uri;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
 import android.text.Editable;
+import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.util.Log;
 import android.view.Menu;
@@ -31,6 +33,7 @@ import de.danoeh.antennapod.core.feed.Feed;
 import de.danoeh.antennapod.core.feed.FeedFilter;
 import de.danoeh.antennapod.core.feed.FeedPreferences;
 import de.danoeh.antennapod.core.glide.ApGlideSettings;
+import de.danoeh.antennapod.core.glide.FastBlurTransformation;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.core.storage.DBReader;
 import de.danoeh.antennapod.core.storage.DBWriter;
@@ -126,6 +129,13 @@ public class FeedSettingsActivity extends AppCompatActivity {
 
         imgvCover = (ImageView) findViewById(R.id.imgvCover);
         txtvTitle = (TextView) findViewById(R.id.txtvTitle);
+        TextView txtvAuthorHeader = (TextView) findViewById(R.id.txtvAuthor);
+        ImageView imgvBackground = (ImageView) findViewById(R.id.imgvBackground);
+        findViewById(R.id.butShowInfo).setVisibility(View.INVISIBLE);
+        findViewById(R.id.butShowSettings).setVisibility(View.INVISIBLE);
+        // https://github.com/bumptech/glide/issues/529
+        imgvBackground.setColorFilter(new LightingColorFilter(0xff828282, 0x000000));
+
         cbxAutoDownload = (CheckBox) findViewById(R.id.cbxAutoDownload);
         cbxKeepUpdated = (CheckBox) findViewById(R.id.cbxKeepUpdated);
         spnAutoDelete = (Spinner) findViewById(R.id.spnAutoDelete);
@@ -161,9 +171,21 @@ public class FeedSettingsActivity extends AppCompatActivity {
                             .fitCenter()
                             .dontAnimate()
                             .into(imgvCover);
+                    Glide.with(FeedSettingsActivity.this)
+                            .load(feed.getImageLocation())
+                            .placeholder(R.color.image_readability_tint)
+                            .error(R.color.image_readability_tint)
+                            .diskCacheStrategy(ApGlideSettings.AP_DISK_CACHE_STRATEGY)
+                            .transform(new FastBlurTransformation(FeedSettingsActivity.this))
+                            .dontAnimate()
+                            .into(imgvBackground);
 
                     txtvTitle.setText(feed.getTitle());
 
+                    if (!TextUtils.isEmpty(feed.getAuthor())) {
+                        txtvAuthorHeader.setText(feed.getAuthor());
+                    }
+
                     cbxAutoDownload.setEnabled(UserPreferences.isEnableAutodownload());
                     cbxAutoDownload.setChecked(prefs.getAutoDownload());
                     cbxAutoDownload.setOnCheckedChangeListener((compoundButton, checked) -> {
-- 
cgit v1.2.3


From deb2cea72f0f50d5ad2e3248bc8adc65ac896275 Mon Sep 17 00:00:00 2001
From: alifeflow <de_al_m@qq.com>
Date: Sat, 14 Apr 2018 14:09:19 +0900
Subject: [True Black] Cleaning up Code

Remove unused imports and redundant values
Coding style adjustment
---
 app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java       | 1 -
 .../java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java    | 2 --
 2 files changed, 3 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
index cfe08cc23..f56dca173 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
@@ -7,7 +7,6 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
 import android.database.DataSetObserver;
-import android.graphics.Color;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java
index e4c090f9a..b2a3e38c8 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java
@@ -22,8 +22,6 @@ import android.widget.TextView;
 import com.bumptech.glide.Glide;
 import com.joanzapata.iconify.Iconify;
 
-import org.shredzone.flattr4j.model.User;
-
 import java.lang.ref.WeakReference;
 
 import de.danoeh.antennapod.R;
-- 
cgit v1.2.3


From 12ee8d89b2fd7eeebcf3ec0432ffb343e07f81d2 Mon Sep 17 00:00:00 2001
From: alifeflow <de_al_m@qq.com>
Date: Sat, 14 Apr 2018 14:29:47 +0900
Subject: [True Black] Fix UI Elements

Add true black style for progress bar
Add true black style for item description
Add true black style for web description
---
 .../de/danoeh/antennapod/fragment/ItemDescriptionFragment.java     | 7 +++++--
 app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java  | 3 ++-
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java
index 935fd7898..2686664b3 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java
@@ -114,8 +114,11 @@ public class ItemDescriptionFragment extends Fragment implements MediaplayerInfo
         webvDescription.setLayerType(View.LAYER_TYPE_SOFTWARE, null);
         TypedArray ta = getActivity().getTheme().obtainStyledAttributes(new int[]
                 {android.R.attr.colorBackground});
-        int backgroundColor = ta.getColor(0, UserPreferences.getTheme() ==
-                R.style.Theme_AntennaPod_Dark ? Color.BLACK : Color.WHITE);
+        int backgroundColor = ta.getColor(0,
+                (UserPreferences.getTheme() == R.style.Theme_AntennaPod_Dark ||
+                        UserPreferences.getTheme() == R.style.Theme_AntennaPod_TrueBlack)?
+                        Color.BLACK : Color.WHITE
+        );
         ta.recycle();
         webvDescription.setBackgroundColor(backgroundColor);
         webvDescription.getSettings().setUseWideViewPort(false);
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 4ae6b97ee..d4ab482df 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
@@ -183,7 +183,8 @@ public class ItemFragment extends Fragment implements OnSwipeGesture {
             txtvTitle.setEllipsize(TextUtils.TruncateAt.END);
         }
         webvDescription = (WebView) layout.findViewById(R.id.webvDescription);
-        if (UserPreferences.getTheme() == R.style.Theme_AntennaPod_Dark) {
+        if (UserPreferences.getTheme() == R.style.Theme_AntennaPod_Dark ||
+                UserPreferences.getTheme() == R.style.Theme_AntennaPod_TrueBlack) {
             if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1) {
                 webvDescription.setLayerType(View.LAYER_TYPE_SOFTWARE, null);
             }
-- 
cgit v1.2.3


From cf2422b1db68fce61ee32acc94867736160fafb3 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Tue, 17 Apr 2018 14:39:53 +0200
Subject: Ignore invalid position updates

Closes #2642
---
 .../java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java    | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
index a9bf39632..4ef26ad6c 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
@@ -209,6 +209,10 @@ public class ExternalPlayerFragment extends Fragment {
     }
 
     private void onPositionObserverUpdate() {
+        if (controller.getPosition() == PlaybackService.INVALID_TIME
+                || controller.getDuration() == PlaybackService.INVALID_TIME) {
+            return;
+        }
         mProgressBar.setProgress((int)
                 ((double) controller.getPosition() / controller.getDuration() * 100));
     }
-- 
cgit v1.2.3


From 00ace172fc7e3c36381a4b6766dde94b2f9c8606 Mon Sep 17 00:00:00 2001
From: heckler01 <heckler01@hotmail.com>
Date: Wed, 11 Apr 2018 19:16:08 -0400
Subject: Replace deprecated create((Observable.OnSubscribe<T>)

---
 .../java/de/danoeh/antennapod/activity/AboutActivity.java     | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java
index 041053a25..e29f4f525 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java
@@ -75,7 +75,7 @@ public class AboutActivity extends AppCompatActivity {
     }
 
     private void loadAsset(String filename) {
-        subscription = Observable.create((Observable.OnSubscribe<String>) subscriber -> {
+        subscription = Observable.fromCallable(()-> {
             InputStream input = null;
             try {
                 TypedArray res = AboutActivity.this.getTheme().obtainStyledAttributes(
@@ -85,8 +85,7 @@ public class AboutActivity extends AppCompatActivity {
                 res.recycle();
                 input = getAssets().open(filename);
                 String webViewData = IOUtils.toString(input, Charset.defaultCharset());
-                if(!webViewData.startsWith("<!DOCTYPE html>")) {
-                    //webViewData = webViewData.replace("\n\n", "</p><p>");
+                if (!webViewData.startsWith("<!DOCTYPE html>")) {
                     webViewData = webViewData.replace("%", "&#37;");
                     webViewData =
                             "<!DOCTYPE html>" +
@@ -111,13 +110,13 @@ public class AboutActivity extends AppCompatActivity {
                     depth = 0;
                 }
                 webViewData = String.format(webViewData, colorString);
-                subscriber.onNext(webViewData);
+                return webViewData;
             } catch (IOException e) {
-                subscriber.onError(e);
+                Log.e(TAG, Log.getStackTraceString(e));
+                throw e;
             } finally {
                 IOUtils.closeQuietly(input);
             }
-            subscriber.onCompleted();
         })
                 .subscribeOn(Schedulers.newThread())
                 .observeOn(AndroidSchedulers.mainThread())
-- 
cgit v1.2.3


From b3d8a4c69f93b20ee0500695e5f9006f8ae3cbf0 Mon Sep 17 00:00:00 2001
From: heckler01 <heckler01@hotmail.com>
Date: Wed, 11 Apr 2018 20:49:21 -0400
Subject: Let webview handle if it can go back. When navigating the links,
 depth would increment, but never return to 0, and then get stuck on the about
 page.

---
 .../de/danoeh/antennapod/activity/AboutActivity.java     | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java
index e29f4f525..c97463155 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java
@@ -36,8 +36,6 @@ public class AboutActivity extends AppCompatActivity {
 
     private WebView webview;
     private LinearLayout webviewContainer;
-    private int depth = 0;
-
     private Subscription subscription;
 
     @Override
@@ -60,14 +58,12 @@ public class AboutActivity extends AppCompatActivity {
 
             @Override
             public boolean shouldOverrideUrlLoading(WebView view, String url) {
-                if(url.startsWith("http")) {
-                    depth++;
-                    return false;
-                } else {
+                if (!url.startsWith("http")) {
                     url = url.replace("file:///android_asset/", "");
                     loadAsset(url);
                     return true;
                 }
+                return false;
             }
 
         });
@@ -105,9 +101,6 @@ public class AboutActivity extends AppCompatActivity {
                             "    </style>" +
                             "</head><body><p>" + webViewData + "</p></body></html>";
                     webViewData = webViewData.replace("\n", "<br/>");
-                    depth++;
-                } else {
-                    depth = 0;
                 }
                 webViewData = String.format(webViewData, colorString);
                 return webViewData;
@@ -129,10 +122,7 @@ public class AboutActivity extends AppCompatActivity {
 
     @Override
     public void onBackPressed() {
-        Log.d(TAG, "depth: " + depth);
-        if(depth == 1) {
-            loadAsset("about.html");
-        } else if(depth > 1) {
+        if (webview.canGoBack()) {
             webview.goBack();
         } else {
             super.onBackPressed();
-- 
cgit v1.2.3


From 4c014bd3e34adb992b8ff40dfb047a24c28b4729 Mon Sep 17 00:00:00 2001
From: heckler01 <heckler01@hotmail.com>
Date: Wed, 11 Apr 2018 20:50:03 -0400
Subject: Remove unnecessary version check

---
 app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java
index c97463155..c0bdc7722 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java
@@ -48,8 +48,7 @@ public class AboutActivity extends AppCompatActivity {
         webview = (WebView) findViewById(R.id.webvAbout);
         webview.getSettings().setCacheMode(WebSettings.LOAD_NO_CACHE);
         if (UserPreferences.getTheme() == R.style.Theme_AntennaPod_Dark) {
-            if (Build.VERSION.SDK_INT >= 11
-                    && Build.VERSION.SDK_INT <= Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1) {
+            if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1) {
                 webview.setLayerType(View.LAYER_TYPE_SOFTWARE, null);
             }
             webview.setBackgroundColor(Color.TRANSPARENT);
-- 
cgit v1.2.3


From 0499ef60ac7122dfad8c1579327c72eaca37cde9 Mon Sep 17 00:00:00 2001
From: heckler01 <heckler01@hotmail.com>
Date: Wed, 11 Apr 2018 21:04:52 -0400
Subject: Fix typos

---
 .../danoeh/antennapod/activity/AboutActivity.java  | 28 +++++++++++-----------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java
index c0bdc7722..eed4de86f 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java
@@ -34,8 +34,8 @@ public class AboutActivity extends AppCompatActivity {
 
     private static final String TAG = AboutActivity.class.getSimpleName();
 
-    private WebView webview;
-    private LinearLayout webviewContainer;
+    private WebView webView;
+    private LinearLayout webViewContainer;
     private Subscription subscription;
 
     @Override
@@ -44,16 +44,16 @@ public class AboutActivity extends AppCompatActivity {
         super.onCreate(savedInstanceState);
         getSupportActionBar().setDisplayShowHomeEnabled(true);
         setContentView(R.layout.about);
-        webviewContainer = (LinearLayout) findViewById(R.id.webvContainer);
-        webview = (WebView) findViewById(R.id.webvAbout);
-        webview.getSettings().setCacheMode(WebSettings.LOAD_NO_CACHE);
+        webViewContainer = (LinearLayout) findViewById(R.id.webViewContainer);
+        webView = (WebView) findViewById(R.id.webViewAbout);
+        webView.getSettings().setCacheMode(WebSettings.LOAD_NO_CACHE);
         if (UserPreferences.getTheme() == R.style.Theme_AntennaPod_Dark) {
             if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1) {
-                webview.setLayerType(View.LAYER_TYPE_SOFTWARE, null);
+                webView.setLayerType(View.LAYER_TYPE_SOFTWARE, null);
             }
-            webview.setBackgroundColor(Color.TRANSPARENT);
+            webView.setBackgroundColor(Color.TRANSPARENT);
         }
-        webview.setWebViewClient(new WebViewClient() {
+        webView.setWebViewClient(new WebViewClient() {
 
             @Override
             public boolean shouldOverrideUrlLoading(WebView view, String url) {
@@ -114,15 +114,15 @@ public class AboutActivity extends AppCompatActivity {
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(
                         webviewData ->
-                                webview.loadDataWithBaseURL("file:///android_asset/", webviewData, "text/html", "utf-8", "about:blank"),
+                                webView.loadDataWithBaseURL("file:///android_asset/", webviewData, "text/html", "utf-8", "about:blank"),
                         error -> Log.e(TAG, Log.getStackTraceString(error))
                 );
     }
 
     @Override
     public void onBackPressed() {
-        if (webview.canGoBack()) {
-            webview.goBack();
+        if (webView.canGoBack()) {
+            webView.goBack();
         } else {
             super.onBackPressed();
         }
@@ -144,9 +144,9 @@ public class AboutActivity extends AppCompatActivity {
         if(subscription != null) {
             subscription.unsubscribe();
         }
-        if (webviewContainer != null && webview != null) {
-            webviewContainer.removeAllViews();
-            webview.destroy();
+        if (webViewContainer != null && webView != null) {
+            webViewContainer.removeAllViews();
+            webView.destroy();
         }
     }
 }
-- 
cgit v1.2.3


From 3e10e50741ab1bd82b8bc337f1a21b45fafe1772 Mon Sep 17 00:00:00 2001
From: heckler01 <heckler01@hotmail.com>
Date: Wed, 11 Apr 2018 21:05:36 -0400
Subject: Remove unncessary inport

---
 app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java | 1 -
 1 file changed, 1 deletion(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java
index eed4de86f..d39c882f8 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java
@@ -22,7 +22,6 @@ import java.nio.charset.Charset;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
 import rx.Observable;
-import rx.Subscriber;
 import rx.Subscription;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.schedulers.Schedulers;
-- 
cgit v1.2.3


From fd13603be6f4f2092f4bacfab6a59fc8471fc0bb Mon Sep 17 00:00:00 2001
From: ydinath <ydinath@gmail.com>
Date: Fri, 13 Apr 2018 14:23:11 -0400
Subject: Use single instead of fromCallable

---
 .../java/de/danoeh/antennapod/activity/AboutActivity.java    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java
index d39c882f8..fed22d896 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java
@@ -21,7 +21,7 @@ import java.nio.charset.Charset;
 
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
-import rx.Observable;
+import rx.Single;
 import rx.Subscription;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.schedulers.Schedulers;
@@ -69,7 +69,7 @@ public class AboutActivity extends AppCompatActivity {
     }
 
     private void loadAsset(String filename) {
-        subscription = Observable.fromCallable(()-> {
+        subscription = Single.create(subscriber -> {
             InputStream input = null;
             try {
                 TypedArray res = AboutActivity.this.getTheme().obtainStyledAttributes(
@@ -101,10 +101,10 @@ public class AboutActivity extends AppCompatActivity {
                     webViewData = webViewData.replace("\n", "<br/>");
                 }
                 webViewData = String.format(webViewData, colorString);
-                return webViewData;
+                subscriber.onSuccess(webViewData);
             } catch (IOException e) {
                 Log.e(TAG, Log.getStackTraceString(e));
-                throw e;
+                subscriber.onError(e);
             } finally {
                 IOUtils.closeQuietly(input);
             }
@@ -112,8 +112,8 @@ public class AboutActivity extends AppCompatActivity {
                 .subscribeOn(Schedulers.newThread())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(
-                        webviewData ->
-                                webView.loadDataWithBaseURL("file:///android_asset/", webviewData, "text/html", "utf-8", "about:blank"),
+                        webViewData ->
+                                webView.loadDataWithBaseURL("file:///android_asset/", webViewData.toString(), "text/html", "utf-8", "about:blank"),
                         error -> Log.e(TAG, Log.getStackTraceString(error))
                 );
     }
-- 
cgit v1.2.3


From d50dcac96e223f48a218093007130eb7fd5ca0c2 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Sat, 21 Apr 2018 17:58:14 +0200
Subject: Added ExoPlayer setting

---
 .../danoeh/antennapod/dialog/VariableSpeedDialog.java   |  2 +-
 .../antennapod/preferences/PreferenceController.java    | 17 ++++++-----------
 2 files changed, 7 insertions(+), 12 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/VariableSpeedDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/VariableSpeedDialog.java
index 6a975fe49..cf9a2907b 100644
--- a/app/src/main/java/de/danoeh/antennapod/dialog/VariableSpeedDialog.java
+++ b/app/src/main/java/de/danoeh/antennapod/dialog/VariableSpeedDialog.java
@@ -52,7 +52,7 @@ public class VariableSpeedDialog {
         builder.neutralText(R.string.close_label);
         builder.onPositive((dialog, which) -> {
             if (Build.VERSION.SDK_INT >= 16) { // just to be safe
-                UserPreferences.enableSonic(true);
+                UserPreferences.enableSonic();
                 if(showSpeedSelector) {
                     showSpeedSelectorDialog(context);
                 }
diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
index 2c7d738dd..a67d0bfe1 100644
--- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
+++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
@@ -38,6 +38,7 @@ import android.widget.Toast;
 
 import com.afollestad.materialdialogs.MaterialDialog;
 
+import com.afollestad.materialdialogs.prefs.MaterialListPreference;
 import de.danoeh.antennapod.activity.ImportExportActivity;
 import de.danoeh.antennapod.activity.OpmlImportFromPathActivity;
 import org.apache.commons.lang3.ArrayUtils;
@@ -135,12 +136,7 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
 
     @Override
     public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
-        if(key.equals(UserPreferences.PREF_SONIC)) {
-            CheckBoxPreference prefSonic = (CheckBoxPreference) ui.findPreference(UserPreferences.PREF_SONIC);
-            if(prefSonic != null) {
-                prefSonic.setChecked(sharedPreferences.getBoolean(UserPreferences.PREF_SONIC, false));
-            }
-        }
+
     }
 
     public void onCreate() {
@@ -707,11 +703,10 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
 
         ui.findPreference(PREF_SEND_CRASH_REPORT).setEnabled(CrashReportWriter.getFile().exists());
 
-        if (Build.VERSION.SDK_INT >= 16) {
-            ui.findPreference(UserPreferences.PREF_SONIC).setEnabled(true);
-        } else {
-            Preference prefSonic = ui.findPreference(UserPreferences.PREF_SONIC);
-            prefSonic.setSummary("[Android 4.1+]\n" + prefSonic.getSummary());
+        if (Build.VERSION.SDK_INT < 16) {
+            MaterialListPreference p = ((MaterialListPreference) ui.findPreference(UserPreferences.PREF_MEDIA_PLAYER));
+            p.setEntries(R.array.media_player_options_no_sonic);
+            p.setEntryValues(R.array.media_player_values_no_sonic);
         }
     }
 
-- 
cgit v1.2.3


From f022ddaf8f3444b9be02829bd0fb358f625db37b Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Sat, 21 Apr 2018 19:11:22 +0200
Subject: Added warning to 'Mark all played'

Closes #2643
---
 .../danoeh/antennapod/activity/MainActivity.java   | 23 ++++++++++--
 .../antennapod/fragment/SubscriptionFragment.java  | 41 ++++++++++++++++------
 2 files changed, 52 insertions(+), 12 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
index f56dca173..e593934a9 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
@@ -572,10 +572,29 @@ public class MainActivity extends CastEnabledActivity implements NavDrawerActivi
         Feed feed = navDrawerData.feeds.get(position - navAdapter.getSubscriptionOffset());
         switch(item.getItemId()) {
             case R.id.mark_all_seen_item:
-                DBWriter.markFeedSeen(feed.getId());
+                ConfirmationDialog markAllSeenConfirmationDialog = new ConfirmationDialog(this,
+                        R.string.mark_all_seen_label,
+                        R.string.mark_all_seen_confirmation_msg) {
+                    @Override
+                    public void onConfirmButtonPressed(DialogInterface dialog) {
+                        dialog.dismiss();
+                        DBWriter.markFeedSeen(feed.getId());
+                    }
+                };
+                markAllSeenConfirmationDialog.createNewDialog().show();
                 return true;
             case R.id.mark_all_read_item:
-                DBWriter.markFeedRead(feed.getId());
+                ConfirmationDialog markAllReadConfirmationDialog = new ConfirmationDialog(this,
+                        R.string.mark_all_read_label,
+                        R.string.mark_all_read_confirmation_msg) {
+
+                    @Override
+                    public void onConfirmButtonPressed(DialogInterface dialog) {
+                        dialog.dismiss();
+                        DBWriter.markFeedRead(feed.getId());
+                    }
+                };
+                markAllReadConfirmationDialog.createNewDialog().show();
                 return true;
             case R.id.rename_item:
                 new RenameFeedDialog(this, feed).show();
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/SubscriptionFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/SubscriptionFragment.java
index c834b7ea7..1247aacbb 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/SubscriptionFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/SubscriptionFragment.java
@@ -152,18 +152,39 @@ public class SubscriptionFragment extends Fragment {
         Feed feed = (Feed)selectedObject;
         switch(item.getItemId()) {
             case R.id.mark_all_seen_item:
-                Observable.fromCallable(() -> DBWriter.markFeedSeen(feed.getId()))
-                        .subscribeOn(Schedulers.newThread())
-                        .observeOn(AndroidSchedulers.mainThread())
-                        .subscribe(result -> loadSubscriptions(),
-                                error -> Log.e(TAG, Log.getStackTraceString(error)));
+                ConfirmationDialog markAllSeenConfirmationDialog = new ConfirmationDialog(getActivity(),
+                        R.string.mark_all_seen_label,
+                        R.string.mark_all_seen_confirmation_msg) {
+
+                    @Override
+                    public void onConfirmButtonPressed(DialogInterface dialog) {
+                        dialog.dismiss();
+
+                        Observable.fromCallable(() -> DBWriter.markFeedSeen(feed.getId()))
+                                .subscribeOn(Schedulers.newThread())
+                                .observeOn(AndroidSchedulers.mainThread())
+                                .subscribe(result -> loadSubscriptions(),
+                                        error -> Log.e(TAG, Log.getStackTraceString(error)));
+                    }
+                };
+                markAllSeenConfirmationDialog.createNewDialog().show();
                 return true;
             case R.id.mark_all_read_item:
-                Observable.fromCallable(() -> DBWriter.markFeedRead(feed.getId()))
-                        .subscribeOn(Schedulers.newThread())
-                        .observeOn(AndroidSchedulers.mainThread())
-                        .subscribe(result -> loadSubscriptions(),
-                                error -> Log.e(TAG, Log.getStackTraceString(error)));
+                ConfirmationDialog markAllReadConfirmationDialog = new ConfirmationDialog(getActivity(),
+                        R.string.mark_all_read_label,
+                        R.string.mark_all_read_confirmation_msg) {
+
+                    @Override
+                    public void onConfirmButtonPressed(DialogInterface dialog) {
+                        dialog.dismiss();
+                        Observable.fromCallable(() -> DBWriter.markFeedRead(feed.getId()))
+                                .subscribeOn(Schedulers.newThread())
+                                .observeOn(AndroidSchedulers.mainThread())
+                                .subscribe(result -> loadSubscriptions(),
+                                        error -> Log.e(TAG, Log.getStackTraceString(error)));
+                    }
+                };
+                markAllReadConfirmationDialog.createNewDialog().show();
                 return true;
             case R.id.rename_item:
                 new RenameFeedDialog(getActivity(), feed).show();
-- 
cgit v1.2.3


From d78191c8e844ea87dcab81f0160b7e1eef649d6f Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Sun, 22 Apr 2018 09:37:54 +0200
Subject: Ignore more invalid positions

---
 .../java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
index 4ef26ad6c..2705e7402 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
@@ -124,8 +124,7 @@ public class ExternalPlayerFragment extends Fragment {
     public void onResume() {
         super.onResume();
         controller.init();
-        mProgressBar.setProgress((int)
-                ((double) controller.getPosition() / controller.getDuration() * 100));
+        onPositionObserverUpdate();
     }
 
     @Override
-- 
cgit v1.2.3


From a64c996e9c4d04391d0278f69d14fb7b2aca565b Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Sun, 22 Apr 2018 18:12:40 +0200
Subject: Moved autodownload to new file

---
 .../antennapod/activity/PreferenceActivity.java    |  8 ++++
 .../preferences/PreferenceController.java          | 48 ++++++++++++++--------
 2 files changed, 39 insertions(+), 17 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java
index 5fe5bc334..271fc667d 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java
@@ -5,6 +5,7 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.preference.Preference;
 import android.preference.PreferenceFragment;
+import android.preference.PreferenceScreen;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
 import android.view.Menu;
@@ -40,6 +41,11 @@ public class PreferenceActivity extends AppCompatActivity {
             return fragment.findPreference(key);
         }
 
+        @Override
+        public PreferenceScreen getPreferenceScreen() {
+            return fragment.getPreferenceScreen();
+        }
+
         @Override
         public Activity getActivity() {
             return PreferenceActivity.this;
@@ -135,6 +141,8 @@ public class PreferenceActivity extends AppCompatActivity {
             switch (preferences) {
                 case R.xml.preferences_downloads:
                     return R.string.downloads_label;
+                case R.xml.preferences_autodownload:
+                    return R.string.pref_automatic_download_title;
                 case R.xml.preferences_playback:
                     return R.string.playback_pref;
                 case R.xml.preferences_storage:
diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
index 407ab0bdb..58ddc07c7 100644
--- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
+++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
@@ -22,6 +22,7 @@ import android.preference.CheckBoxPreference;
 import android.preference.EditTextPreference;
 import android.preference.ListPreference;
 import android.preference.Preference;
+import android.preference.PreferenceCategory;
 import android.preference.PreferenceFragment;
 import android.preference.PreferenceManager;
 import android.preference.PreferenceScreen;
@@ -166,6 +167,9 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
                 break;
             case R.xml.preferences_downloads:
                 setupDownloadsScreen();
+                break;
+            case R.xml.preferences_autodownload:
+                setupAutoDownloadScreen();
                 buildAutodownloadSelectedNetworsPreference();
                 setSelectedNetworksEnabled(UserPreferences.isEnableAutodownloadWifiFilter());
                 buildEpisodeCleanupPreference();
@@ -398,12 +402,7 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
         }
     }
 
-    private void setupDownloadsScreen() {
-        ui.findPreference(UserPreferences.PREF_UPDATE_INTERVAL)
-                .setOnPreferenceClickListener(preference -> {
-                    showUpdateIntervalTimePreferencesDialog();
-                    return true;
-                });
+    private void setupAutoDownloadScreen() {
         ui.findPreference(UserPreferences.PREF_ENABLE_AUTODL).setOnPreferenceChangeListener(
                 (preference, newValue) -> {
                     if (newValue instanceof Boolean) {
@@ -426,6 +425,26 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
                             }
                         }
                 );
+        ui.findPreference(UserPreferences.PREF_EPISODE_CACHE_SIZE)
+                .setOnPreferenceChangeListener(
+                        (preference, o) -> {
+                            if (o instanceof String) {
+                                setEpisodeCacheSizeText(UserPreferences.readEpisodeCacheSize((String) o));
+                            }
+                            return true;
+                        }
+                );
+    }
+
+    private void setupDownloadsScreen() {
+        final Activity activity = ui.getActivity();
+        ui.findPreference(AUTO_DL_PREF_SCREEN).setOnPreferenceClickListener(preference ->
+                openScreen(R.xml.preferences_autodownload, activity));
+        ui.findPreference(UserPreferences.PREF_UPDATE_INTERVAL)
+                .setOnPreferenceClickListener(preference -> {
+                    showUpdateIntervalTimePreferencesDialog();
+                    return true;
+                });
         ui.findPreference(UserPreferences.PREF_PARALLEL_DOWNLOADS)
                 .setOnPreferenceChangeListener(
                         (preference, o) -> {
@@ -471,15 +490,6 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
                 }
             }
         });
-        ui.findPreference(UserPreferences.PREF_EPISODE_CACHE_SIZE)
-                .setOnPreferenceChangeListener(
-                        (preference, o) -> {
-                            if (o instanceof String) {
-                                setEpisodeCacheSizeText(UserPreferences.readEpisodeCacheSize((String) o));
-                            }
-                            return true;
-                        }
-                );
         ui.findPreference(PREF_PROXY).setOnPreferenceClickListener(preference -> {
             ProxyDialog dialog = new ProxyDialog(ui.getActivity());
             dialog.createDialog().show();
@@ -614,6 +624,8 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
             case R.xml.preferences_downloads:
                 setUpdateIntervalText();
                 setParallelDownloadsText(UserPreferences.getParallelDownloads());
+                break;
+            case R.xml.preferences_autodownload:
                 setEpisodeCacheSizeText(UserPreferences.getEpisodeCacheSize());
                 checkAutodownloadItemVisibility();
                 break;
@@ -897,7 +909,7 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
         selectedNetworks = new CheckBoxPreference[networks.size()];
         List<String> prefValues = Arrays.asList(UserPreferences
                 .getAutodownloadSelectedNetworks());
-        PreferenceScreen prefScreen = (PreferenceScreen) ui.findPreference(PreferenceController.AUTO_DL_PREF_SCREEN);
+        PreferenceScreen prefScreen = ui.getPreferenceScreen();
         Preference.OnPreferenceClickListener clickListener = preference -> {
             if (preference instanceof CheckBoxPreference) {
                 String key = preference.getKey();
@@ -944,7 +956,7 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
 
     private void clearAutodownloadSelectedNetworsPreference() {
         if (selectedNetworks != null) {
-            PreferenceScreen prefScreen = (PreferenceScreen) ui.findPreference(PreferenceController.AUTO_DL_PREF_SCREEN);
+            PreferenceScreen prefScreen = ui.getPreferenceScreen();
 
             for (CheckBoxPreference network : selectedNetworks) {
                 if (network != null) {
@@ -1116,6 +1128,8 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
          */
         Preference findPreference(CharSequence key);
 
+        PreferenceScreen getPreferenceScreen();
+
         Activity getActivity();
     }
 }
-- 
cgit v1.2.3


From bb42ddbd565e678ddbae93218bfdb09e85b71200 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Sun, 22 Apr 2018 18:41:43 +0200
Subject: MasterSwitchPreference

---
 .../preferences/MasterSwitchPreference.java        | 45 ++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 app/src/main/java/de/danoeh/antennapod/preferences/MasterSwitchPreference.java

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/MasterSwitchPreference.java b/app/src/main/java/de/danoeh/antennapod/preferences/MasterSwitchPreference.java
new file mode 100644
index 000000000..bcac65804
--- /dev/null
+++ b/app/src/main/java/de/danoeh/antennapod/preferences/MasterSwitchPreference.java
@@ -0,0 +1,45 @@
+package de.danoeh.antennapod.preferences;
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.graphics.Typeface;
+import android.os.Build;
+import android.util.AttributeSet;
+import android.util.TypedValue;
+import android.view.View;
+import android.widget.TextView;
+import de.danoeh.antennapod.R;
+
+public class MasterSwitchPreference extends SwitchCompatPreference {
+
+    public MasterSwitchPreference(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
+    public MasterSwitchPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+
+    public MasterSwitchPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public MasterSwitchPreference(Context context) {
+        super(context);
+    }
+
+    @Override
+    protected void onBindView(View view) {
+        super.onBindView(view);
+
+        TypedValue typedValue = new TypedValue();
+        getContext().getTheme().resolveAttribute(R.attr.master_switch_background, typedValue, true);
+        view.setBackgroundColor(typedValue.data);
+
+        TextView title = (TextView) view.findViewById(android.R.id.title);
+        if (title != null) {
+            title.setTypeface(title.getTypeface(), Typeface.BOLD);
+        }
+    }
+}
\ No newline at end of file
-- 
cgit v1.2.3


From 03f1af6ad422378caba24301c230ca042344972e Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Sun, 22 Apr 2018 18:51:10 +0200
Subject: Disable items correctly in autodownload

---
 .../antennapod/preferences/PreferenceController.java   | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
index 58ddc07c7..5b27be45e 100644
--- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
+++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
@@ -22,7 +22,6 @@ import android.preference.CheckBoxPreference;
 import android.preference.EditTextPreference;
 import android.preference.ListPreference;
 import android.preference.Preference;
-import android.preference.PreferenceCategory;
 import android.preference.PreferenceFragment;
 import android.preference.PreferenceManager;
 import android.preference.PreferenceScreen;
@@ -99,6 +98,7 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
     private static final String PREF_SCREEN_DOWNLOADS = "prefScreenDownloads";
     private static final String PREF_SCREEN_SERVICES = "prefScreenServices";
     private static final String PREF_SCREEN_STORAGE = "prefScreenStorage";
+    private static final String PREF_SCREEN_AUTODL = "prefAutoDownloadSettings";
 
     private static final String PREF_FLATTR_SETTINGS = "prefFlattrSettings";
     private static final String PREF_FLATTR_AUTH = "pref_flattr_authenticate";
@@ -111,7 +111,6 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
     private static final String IMPORT_EXPORT = "importExport";
     private static final String PREF_ABOUT = "prefAbout";
     private static final String PREF_CHOOSE_DATA_DIR = "prefChooseDataDir";
-    private static final String AUTO_DL_PREF_SCREEN = "prefAutoDownloadSettings";
     private static final String PREF_PLAYBACK_SPEED_LAUNCHER = "prefPlaybackSpeedLauncher";
     private static final String PREF_PLAYBACK_REWIND_DELTA_LAUNCHER = "prefPlaybackRewindDeltaLauncher";
     private static final String PREF_PLAYBACK_FAST_FORWARD_DELTA_LAUNCHER = "prefPlaybackFastForwardDeltaLauncher";
@@ -406,11 +405,7 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
         ui.findPreference(UserPreferences.PREF_ENABLE_AUTODL).setOnPreferenceChangeListener(
                 (preference, newValue) -> {
                     if (newValue instanceof Boolean) {
-                        boolean enabled = (Boolean) newValue;
-                        ui.findPreference(UserPreferences.PREF_EPISODE_CACHE_SIZE).setEnabled(enabled);
-                        ui.findPreference(UserPreferences.PREF_ENABLE_AUTODL_ON_BATTERY).setEnabled(enabled);
-                        ui.findPreference(UserPreferences.PREF_ENABLE_AUTODL_WIFI_FILTER).setEnabled(enabled);
-                        setSelectedNetworksEnabled(enabled && UserPreferences.isEnableAutodownloadWifiFilter());
+                        checkAutodownloadItemVisibility((Boolean) newValue);
                     }
                     return true;
                 });
@@ -438,7 +433,7 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
 
     private void setupDownloadsScreen() {
         final Activity activity = ui.getActivity();
-        ui.findPreference(AUTO_DL_PREF_SCREEN).setOnPreferenceClickListener(preference ->
+        ui.findPreference(PREF_SCREEN_AUTODL).setOnPreferenceClickListener(preference ->
                 openScreen(R.xml.preferences_autodownload, activity));
         ui.findPreference(UserPreferences.PREF_UPDATE_INTERVAL)
                 .setOnPreferenceClickListener(preference -> {
@@ -627,7 +622,7 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
                 break;
             case R.xml.preferences_autodownload:
                 setEpisodeCacheSizeText(UserPreferences.getEpisodeCacheSize());
-                checkAutodownloadItemVisibility();
+                checkAutodownloadItemVisibility(UserPreferences.isEnableAutodownload());
                 break;
             case R.xml.preferences_storage:
                 setDataFolderText();
@@ -813,11 +808,12 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
         ui.findPreference(PreferenceController.PREF_AUTO_FLATTR_PREFS).setEnabled(hasFlattrToken);
     }
 
-    private void checkAutodownloadItemVisibility() {
-        boolean autoDownload = UserPreferences.isEnableAutodownload();
+    private void checkAutodownloadItemVisibility(boolean autoDownload) {
         ui.findPreference(UserPreferences.PREF_EPISODE_CACHE_SIZE).setEnabled(autoDownload);
         ui.findPreference(UserPreferences.PREF_ENABLE_AUTODL_ON_BATTERY).setEnabled(autoDownload);
         ui.findPreference(UserPreferences.PREF_ENABLE_AUTODL_WIFI_FILTER).setEnabled(autoDownload);
+        ui.findPreference(UserPreferences.PREF_EPISODE_CLEANUP).setEnabled(autoDownload);
+        ui.findPreference(UserPreferences.PREF_ENABLE_AUTODL_ON_MOBILE).setEnabled(autoDownload);
         setSelectedNetworksEnabled(autoDownload && UserPreferences.isEnableAutodownloadWifiFilter());
     }
 
-- 
cgit v1.2.3


From 1690bd64ccd185b51dedb91ce05ae54541cacc1b Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Sun, 22 Apr 2018 19:00:07 +0200
Subject: Actually renamy downloads to network

---
 .../de/danoeh/antennapod/activity/PreferenceActivity.java  |  4 ++--
 .../antennapod/preferences/PreferenceController.java       | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java
index 271fc667d..f7f785acf 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java
@@ -139,8 +139,8 @@ public class PreferenceActivity extends AppCompatActivity {
 
         private int getTitle(int preferences) {
             switch (preferences) {
-                case R.xml.preferences_downloads:
-                    return R.string.downloads_label;
+                case R.xml.preferences_network:
+                    return R.string.network_pref;
                 case R.xml.preferences_autodownload:
                     return R.string.pref_automatic_download_title;
                 case R.xml.preferences_playback:
diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
index 5b27be45e..01cd4fba7 100644
--- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
+++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
@@ -95,7 +95,7 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
 
     private static final String PREF_SCREEN_USER_INTERFACE = "prefScreenInterface";
     private static final String PREF_SCREEN_PLAYBACK = "prefScreenPlayback";
-    private static final String PREF_SCREEN_DOWNLOADS = "prefScreenDownloads";
+    private static final String PREF_SCREEN_NETWORK = "prefScreenNetwork";
     private static final String PREF_SCREEN_SERVICES = "prefScreenServices";
     private static final String PREF_SCREEN_STORAGE = "prefScreenStorage";
     private static final String PREF_SCREEN_AUTODL = "prefAutoDownloadSettings";
@@ -164,8 +164,8 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
             case R.xml.preferences:
                 setupMainScreen();
                 break;
-            case R.xml.preferences_downloads:
-                setupDownloadsScreen();
+            case R.xml.preferences_network:
+                setupNetworkScreen();
                 break;
             case R.xml.preferences_autodownload:
                 setupAutoDownloadScreen();
@@ -431,7 +431,7 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
                 );
     }
 
-    private void setupDownloadsScreen() {
+    private void setupNetworkScreen() {
         final Activity activity = ui.getActivity();
         ui.findPreference(PREF_SCREEN_AUTODL).setOnPreferenceClickListener(preference ->
                 openScreen(R.xml.preferences_autodownload, activity));
@@ -498,8 +498,8 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
                 openScreen(R.xml.preferences_user_interface, activity));
         ui.findPreference(PREF_SCREEN_PLAYBACK).setOnPreferenceClickListener(preference ->
                 openScreen(R.xml.preferences_playback, activity));
-        ui.findPreference(PREF_SCREEN_DOWNLOADS).setOnPreferenceClickListener(preference ->
-                openScreen(R.xml.preferences_downloads, activity));
+        ui.findPreference(PREF_SCREEN_NETWORK).setOnPreferenceClickListener(preference ->
+                openScreen(R.xml.preferences_network, activity));
         ui.findPreference(PREF_SCREEN_SERVICES).setOnPreferenceClickListener(preference ->
                 openScreen(R.xml.preferences_services, activity));
         ui.findPreference(PREF_SCREEN_STORAGE).setOnPreferenceClickListener(preference ->
@@ -616,7 +616,7 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
 
     public void onResume(int screen) {
         switch (screen) {
-            case R.xml.preferences_downloads:
+            case R.xml.preferences_network:
                 setUpdateIntervalText();
                 setParallelDownloadsText(UserPreferences.getParallelDownloads());
                 break;
-- 
cgit v1.2.3


From f2ee5d7ff204ec71d5ae06a01a53db3c73c7e15c Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Sun, 22 Apr 2018 19:20:11 +0200
Subject: Renamed Services to Integrations

---
 .../danoeh/antennapod/activity/PreferenceActivity.java   |  4 ++--
 .../antennapod/preferences/PreferenceController.java     | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java
index f7f785acf..83578ff5c 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java
@@ -149,8 +149,8 @@ public class PreferenceActivity extends AppCompatActivity {
                     return R.string.storage_pref;
                 case R.xml.preferences_user_interface:
                     return R.string.user_interface_label;
-                case R.xml.preferences_services:
-                    return R.string.services_label;
+                case R.xml.preferences_integrations:
+                    return R.string.integrations_label;
                 default:
                     return R.string.settings_label;
             }
diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
index 01cd4fba7..b2d1fa4d2 100644
--- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
+++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
@@ -96,7 +96,7 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
     private static final String PREF_SCREEN_USER_INTERFACE = "prefScreenInterface";
     private static final String PREF_SCREEN_PLAYBACK = "prefScreenPlayback";
     private static final String PREF_SCREEN_NETWORK = "prefScreenNetwork";
-    private static final String PREF_SCREEN_SERVICES = "prefScreenServices";
+    private static final String PREF_SCREEN_INTEGRATIONS = "prefScreenIntegrations";
     private static final String PREF_SCREEN_STORAGE = "prefScreenStorage";
     private static final String PREF_SCREEN_AUTODL = "prefAutoDownloadSettings";
 
@@ -178,8 +178,8 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
                 PreferenceControllerFlavorHelper.setupFlavoredUI(ui);
                 buildSmartMarkAsPlayedPreference();
                 break;
-            case R.xml.preferences_services:
-                setupServicesScreen();
+            case R.xml.preferences_integrations:
+                setupIntegrationsScreen();
                 break;
             case R.xml.preferences_storage:
                 setupStorageScreen();
@@ -299,7 +299,7 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
         );
     }
 
-    private void setupServicesScreen() {
+    private void setupIntegrationsScreen() {
         final Activity activity = ui.getActivity();
 
         ui.findPreference(PreferenceController.PREF_FLATTR_REVOKE).setOnPreferenceClickListener(
@@ -500,8 +500,8 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
                 openScreen(R.xml.preferences_playback, activity));
         ui.findPreference(PREF_SCREEN_NETWORK).setOnPreferenceClickListener(preference ->
                 openScreen(R.xml.preferences_network, activity));
-        ui.findPreference(PREF_SCREEN_SERVICES).setOnPreferenceClickListener(preference ->
-                openScreen(R.xml.preferences_services, activity));
+        ui.findPreference(PREF_SCREEN_INTEGRATIONS).setOnPreferenceClickListener(preference ->
+                openScreen(R.xml.preferences_integrations, activity));
         ui.findPreference(PREF_SCREEN_STORAGE).setOnPreferenceClickListener(preference ->
                 openScreen(R.xml.preferences_storage, activity));
 
@@ -627,7 +627,7 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
             case R.xml.preferences_storage:
                 setDataFolderText();
                 break;
-            case R.xml.preferences_services:
+            case R.xml.preferences_integrations:
                 GpodnetPreferences.registerOnSharedPreferenceChangeListener(gpoddernetListener);
                 updateGpodnetPreferenceScreen();
                 checkFlattrItemVisibility();
@@ -639,7 +639,7 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
     }
 
     public void onPause(int screen) {
-        if (screen == R.xml.preferences_services) {
+        if (screen == R.xml.preferences_integrations) {
             GpodnetPreferences.unregisterOnSharedPreferenceChangeListener(gpoddernetListener);
         }
     }
-- 
cgit v1.2.3


From 9d3d92cc9d98a908a5e2147aee0c6d5cb6b4db47 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Sun, 22 Apr 2018 21:26:13 +0200
Subject: Fixed crash when changing settings

Looking at Fragment1, clicking Fragment2
Fragment2.onCreate
Fragment2.onResume
Fragment1.onPause <- This sets PreferenceUI to Fragment1, so onClickListeners
                     in Fragment2 now have a reference to the wrong fragment
---
 .../antennapod/activity/PreferenceActivity.java      | 20 ++++++++++----------
 .../antennapod/preferences/PreferenceController.java |  8 +++-----
 2 files changed, 13 insertions(+), 15 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java
index 83578ff5c..a6aec2425 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java
@@ -113,16 +113,18 @@ public class PreferenceActivity extends AppCompatActivity {
     }
 
     public static class MainFragment extends PreferenceFragment {
+        private int screen;
 
         @Override
         public void onCreate(Bundle savedInstanceState) {
             super.onCreate(savedInstanceState);
             setRetainInstance(true);
-            addPreferencesFromResource(getArguments().getInt(PARAM_RESOURCE));
+            screen = getArguments().getInt(PARAM_RESOURCE);
+            addPreferencesFromResource(screen);
             PreferenceActivity activity = instance.get();
             if (activity != null && activity.preferenceController != null) {
                 activity.preferenceUI.setFragment(this);
-                activity.preferenceController.onCreate(getArguments().getInt(PARAM_RESOURCE));
+                activity.preferenceController.onCreate(screen);
             }
         }
 
@@ -131,9 +133,9 @@ public class PreferenceActivity extends AppCompatActivity {
             super.onResume();
             PreferenceActivity activity = instance.get();
             if(activity != null && activity.preferenceController != null) {
-                activity.setTitle(getTitle(getArguments().getInt(PARAM_RESOURCE)));
+                activity.setTitle(getTitle(screen));
                 activity.preferenceUI.setFragment(this);
-                activity.preferenceController.onResume(getArguments().getInt(PARAM_RESOURCE));
+                activity.preferenceController.onResume(screen);
             }
         }
 
@@ -159,9 +161,8 @@ public class PreferenceActivity extends AppCompatActivity {
         @Override
         public void onPause() {
             PreferenceActivity activity = instance.get();
-            if(activity != null && activity.preferenceController != null) {
-                activity.preferenceUI.setFragment(this);
-                activity.preferenceController.onPause(getArguments().getInt(PARAM_RESOURCE));
+            if (screen == R.xml.preferences_integrations) {
+                activity.preferenceController.unregisterGpodnet();
             }
             super.onPause();
         }
@@ -169,9 +170,8 @@ public class PreferenceActivity extends AppCompatActivity {
         @Override
         public void onStop() {
             PreferenceActivity activity = instance.get();
-            if(activity != null && activity.preferenceController != null) {
-                activity.preferenceUI.setFragment(this);
-                activity.preferenceController.onStop();
+            if (screen == R.xml.preferences_storage) {
+                activity.preferenceController.unsubscribeExportSubscription();
             }
             super.onStop();
         }
diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
index b2d1fa4d2..fceaf6abf 100644
--- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
+++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
@@ -638,13 +638,11 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
         }
     }
 
-    public void onPause(int screen) {
-        if (screen == R.xml.preferences_integrations) {
-            GpodnetPreferences.unregisterOnSharedPreferenceChangeListener(gpoddernetListener);
-        }
+    public void unregisterGpodnet() {
+        GpodnetPreferences.unregisterOnSharedPreferenceChangeListener(gpoddernetListener);
     }
 
-    public void onStop() {
+    public void unsubscribeExportSubscription() {
         if (subscription != null) {
             subscription.unsubscribe();
         }
-- 
cgit v1.2.3


From 921665167f50f85683cdd7154e62fc48841687c1 Mon Sep 17 00:00:00 2001
From: ydinath <ydinath@gmail.com>
Date: Mon, 23 Apr 2018 20:23:39 -0400
Subject: canGoBack doesn't work consistently when using loadDataWithBaseURL.
 Update old logic to allow depth > 1.

https://stackoverflow.com/questions/2686933/android-webview-can-render-html-going-forward-but-not-backward
https://stackoverflow.com/questions/14948652/webview-cangoback-not-working-when-using-loaddatawithbaseurl/15074071#15074071
---
 .../main/java/de/danoeh/antennapod/activity/AboutActivity.java   | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java
index fed22d896..443f4257f 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java
@@ -36,6 +36,7 @@ public class AboutActivity extends AppCompatActivity {
     private WebView webView;
     private LinearLayout webViewContainer;
     private Subscription subscription;
+    private int depth = 0;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -56,6 +57,7 @@ public class AboutActivity extends AppCompatActivity {
 
             @Override
             public boolean shouldOverrideUrlLoading(WebView view, String url) {
+                depth++;
                 if (!url.startsWith("http")) {
                     url = url.replace("file:///android_asset/", "");
                     loadAsset(url);
@@ -100,6 +102,10 @@ public class AboutActivity extends AppCompatActivity {
                             "</head><body><p>" + webViewData + "</p></body></html>";
                     webViewData = webViewData.replace("\n", "<br/>");
                 }
+                else
+                {
+                    depth = 0;
+                }
                 webViewData = String.format(webViewData, colorString);
                 subscriber.onSuccess(webViewData);
             } catch (IOException e) {
@@ -120,8 +126,9 @@ public class AboutActivity extends AppCompatActivity {
 
     @Override
     public void onBackPressed() {
-        if (webView.canGoBack()) {
+        if (depth != 0) {
             webView.goBack();
+            depth--;
         } else {
             super.onBackPressed();
         }
-- 
cgit v1.2.3


From bb5f4597442d061719b934ee31510aea8c1b5d9a Mon Sep 17 00:00:00 2001
From: ydinath <ydinath@gmail.com>
Date: Tue, 24 Apr 2018 04:48:44 -0400
Subject: Respect coding standard

---
 app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java
index 443f4257f..6715ecf97 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java
@@ -101,9 +101,7 @@ public class AboutActivity extends AppCompatActivity {
                             "    </style>" +
                             "</head><body><p>" + webViewData + "</p></body></html>";
                     webViewData = webViewData.replace("\n", "<br/>");
-                }
-                else
-                {
+                } else {
                     depth = 0;
                 }
                 webViewData = String.format(webViewData, colorString);
-- 
cgit v1.2.3


From 91120d98a461d4050da30f3d039eb9b7db01c23a Mon Sep 17 00:00:00 2001
From: mr-intj <github@scott-smith.us>
Date: Fri, 27 Apr 2018 17:30:40 -0700
Subject: Added "Random" and "Smart Shuffle" items at the bottom of the
 Queue|Sort menu.

Added "Permutor" interface to allow specification of reordering logic to be specified in QueueSorter (vs. DBWriter), similar to the existing sort logic.

Added "Random" and "Smart Shuffle" strings to core/src/main/res/values (did not add translations for non-English languages)

Closes #2366, Closes #2602
---
 .../main/java/de/danoeh/antennapod/fragment/QueueFragment.java   | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
index fba445d3a..85abdd281 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
@@ -327,6 +327,15 @@ public class QueueFragment extends Fragment {
                 case R.id.queue_sort_feed_title_desc:
                     QueueSorter.sort(getActivity(), QueueSorter.Rule.FEED_TITLE_DESC, true);
                     return true;
+                case R.id.queue_sort_random:
+                    QueueSorter.sort(getActivity(), QueueSorter.Rule.RANDOM, true);
+                    return true;
+                case R.id.queue_sort_smart_shuffle_asc:
+                    QueueSorter.sort(getActivity(), QueueSorter.Rule.SMART_SHUFFLE_ASC, true);
+                    return true;
+                case R.id.queue_sort_smart_shuffle_desc:
+                    QueueSorter.sort(getActivity(), QueueSorter.Rule.SMART_SHUFFLE_DESC, true);
+                    return true;
                 default:
                     return false;
             }
-- 
cgit v1.2.3


From 4bba6b30a1b5e82b93edc27742ec35362b08d1c7 Mon Sep 17 00:00:00 2001
From: orionlee <orionlee@yahoo.com>
Date: Mon, 30 Apr 2018 14:59:45 -0700
Subject: Issue #2579: Provide share Link in episode playback screen even when
 the episode has no link - Use podcast link as the fallback. Also bug fix
 share link with position: to include epsiode and podcast title.

---
 .../main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
index 21e375435..b9d261b0e 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
@@ -324,7 +324,7 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements
         menu.findItem(R.id.visit_website_item).setVisible(hasWebsiteLink);
 
         boolean isItemAndHasLink = isFeedMedia &&
-                ((FeedMedia) media).getItem() != null && ((FeedMedia) media).getItem().getLink() != null;
+                ShareUtils.hasLinkToShare(((FeedMedia) media).getItem());
         menu.findItem(R.id.share_link_item).setVisible(isItemAndHasLink);
         menu.findItem(R.id.share_link_with_position_item).setVisible(isItemAndHasLink);
 
-- 
cgit v1.2.3


From 36507eb5064fe4b10a364f7b24855dba7f10d1c0 Mon Sep 17 00:00:00 2001
From: orionlee <orionlee@yahoo.com>
Date: Mon, 30 Apr 2018 15:14:58 -0700
Subject: Provide share Link in episode information screen, similar to episode
 playback screen.

---
 .../main/java/de/danoeh/antennapod/menuhandler/FeedItemMenuHandler.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/menuhandler/FeedItemMenuHandler.java b/app/src/main/java/de/danoeh/antennapod/menuhandler/FeedItemMenuHandler.java
index f6f73e017..1de41421f 100644
--- a/app/src/main/java/de/danoeh/antennapod/menuhandler/FeedItemMenuHandler.java
+++ b/app/src/main/java/de/danoeh/antennapod/menuhandler/FeedItemMenuHandler.java
@@ -86,7 +86,7 @@ public class FeedItemMenuHandler {
             mi.setItemVisibility(R.id.add_to_queue_item, false);
         }
 
-        if (!showExtendedMenu || selectedItem.getLink() == null) {
+        if (!showExtendedMenu || !ShareUtils.hasLinkToShare(selectedItem)) {
             mi.setItemVisibility(R.id.visit_website_item, false);
             mi.setItemVisibility(R.id.share_link_item, false);
             mi.setItemVisibility(R.id.share_link_with_position_item, false);
-- 
cgit v1.2.3


From 345fcc17d0416f8db61a2506aa88c25b53718ebb Mon Sep 17 00:00:00 2001
From: orionlee <orionlee@yahoo.com>
Date: Mon, 30 Apr 2018 15:44:19 -0700
Subject: FeedItem Visit Website tweak: use feed website as a fallback,
 analogous to how share FeedItem link work. Applicable to both feed playback
 screen and feed information screen.

---
 .../antennapod/activity/MediaplayerActivity.java       | 18 ++++++++++++++++--
 .../antennapod/menuhandler/FeedItemMenuHandler.java    |  3 ++-
 2 files changed, 18 insertions(+), 3 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
index b9d261b0e..229848753 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
@@ -42,6 +42,7 @@ import de.danoeh.antennapod.core.storage.DBReader;
 import de.danoeh.antennapod.core.storage.DBTasks;
 import de.danoeh.antennapod.core.storage.DBWriter;
 import de.danoeh.antennapod.core.util.Converter;
+import de.danoeh.antennapod.core.util.FeedItemUtil;
 import de.danoeh.antennapod.core.util.Flavors;
 import de.danoeh.antennapod.core.util.ShareUtils;
 import de.danoeh.antennapod.core.util.StorageUtils;
@@ -320,7 +321,7 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements
                         ((FeedMedia) media).getItem().getFlattrStatus().flattrable()
         );
 
-        boolean hasWebsiteLink = media != null && media.getWebsiteLink() != null;
+        boolean hasWebsiteLink = ( getWebsiteLinkWithFallback(media) != null );
         menu.findItem(R.id.visit_website_item).setVisible(hasWebsiteLink);
 
         boolean isItemAndHasLink = isFeedMedia &&
@@ -560,7 +561,7 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements
                         });
                         break;
                     case R.id.visit_website_item:
-                        Uri uri = Uri.parse(media.getWebsiteLink());
+                        Uri uri = Uri.parse(getWebsiteLinkWithFallback(media));
                         startActivity(new Intent(Intent.ACTION_VIEW, uri));
                         break;
                     case R.id.support_item:
@@ -603,6 +604,19 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements
         }
     }
 
+    private static String getWebsiteLinkWithFallback(Playable media) {
+        String link = null;
+        if (media != null) {
+            link = media.getWebsiteLink();
+            if (link == null) {
+                if (media instanceof FeedMedia) {
+                    link = FeedItemUtil.getLinkWithFallback(((FeedMedia)media).getItem());
+                } // else case not a FeedMedia, return null
+            }
+        } // else no media, return null
+        return link;
+    }
+
     @Override
     protected void onResume() {
         super.onResume();
diff --git a/app/src/main/java/de/danoeh/antennapod/menuhandler/FeedItemMenuHandler.java b/app/src/main/java/de/danoeh/antennapod/menuhandler/FeedItemMenuHandler.java
index 1de41421f..de47ee5e4 100644
--- a/app/src/main/java/de/danoeh/antennapod/menuhandler/FeedItemMenuHandler.java
+++ b/app/src/main/java/de/danoeh/antennapod/menuhandler/FeedItemMenuHandler.java
@@ -17,6 +17,7 @@ import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.core.service.playback.PlaybackService;
 import de.danoeh.antennapod.core.storage.DBTasks;
 import de.danoeh.antennapod.core.storage.DBWriter;
+import de.danoeh.antennapod.core.util.FeedItemUtil;
 import de.danoeh.antennapod.core.util.IntentUtils;
 import de.danoeh.antennapod.core.util.LongList;
 import de.danoeh.antennapod.core.util.ShareUtils;
@@ -216,7 +217,7 @@ public class FeedItemMenuHandler {
                 DBWriter.setFeedItemAutoDownload(selectedItem, false);
                 break;
             case R.id.visit_website_item:
-                Uri uri = Uri.parse(selectedItem.getLink());
+                Uri uri = Uri.parse(FeedItemUtil.getLinkWithFallback(selectedItem));
                 Intent intent = new Intent(Intent.ACTION_VIEW, uri);
                 if(IntentUtils.isCallable(context, intent)) {
                     context.startActivity(intent);
-- 
cgit v1.2.3


From 9dcbddf371f6ac04fdbddc4415ff079dcd3ea392 Mon Sep 17 00:00:00 2001
From: orionlee <orionlee@yahoo.com>
Date: Wed, 2 May 2018 13:15:14 -0700
Subject: Issue #2580: Expose "Mark as seen" as a context menu item in Episode
 screen, in addition to the existing swipe in Episode > New tab.

---
 .../adapter/AllEpisodesRecycleAdapter.java         |  5 +++
 .../antennapod/fragment/AllEpisodesFragment.java   | 46 +++++++++++++++++++++-
 .../antennapod/fragment/NewEpisodesFragment.java   | 33 +---------------
 3 files changed, 51 insertions(+), 33 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java
index 715318db1..6897cc676 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java
@@ -299,6 +299,11 @@ public class AllEpisodesRecycleAdapter extends RecyclerView.Adapter<AllEpisodesR
                 }
             };
             FeedItemMenuHandler.onPrepareMenu(contextMenuInterface, item, true, null);
+
+            // Currently, Mark as seen only available on Episodes screen.
+            // Hence it is not added to the more generic FeedItemMenuHandler.onPrepareMenu
+            // see AllEpisodesFragment for the actual logic
+            contextMenuInterface.setItemVisibility(R.id.mark_as_seen_item, item.isNew());
         }
 
     }
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java
index f3846c8a4..497891dbd 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java
@@ -4,6 +4,8 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.content.SharedPreferences;
 import android.os.Bundle;
+import android.os.Handler;
+import android.support.design.widget.Snackbar;
 import android.support.v4.app.Fragment;
 import android.support.v4.view.MenuItemCompat;
 import android.support.v7.widget.LinearLayoutManager;
@@ -36,12 +38,12 @@ import de.danoeh.antennapod.core.feed.EventDistributor;
 import de.danoeh.antennapod.core.feed.Feed;
 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.download.DownloadService;
 import de.danoeh.antennapod.core.service.download.Downloader;
 import de.danoeh.antennapod.core.storage.DBReader;
 import de.danoeh.antennapod.core.storage.DBTasks;
 import de.danoeh.antennapod.core.storage.DBWriter;
-import de.danoeh.antennapod.core.storage.DownloadRequestException;
 import de.danoeh.antennapod.core.storage.DownloadRequester;
 import de.danoeh.antennapod.core.util.FeedItemUtil;
 import de.danoeh.antennapod.core.util.LongList;
@@ -284,6 +286,16 @@ public class AllEpisodesFragment extends Fragment {
             return super.onContextItemSelected(item);
         }
 
+        // Mark as seen contains UI logic specific to All/New/FavoriteSegments,
+        // e.g., Undo with Snackbar,
+        // and is handled by this class rather than the generic FeedItemMenuHandler
+        // Undo is useful for Mark as seen, given there is no UI to undo it otherwise,
+        // i.e., there is context menu item for Mark as new
+        if (R.id.mark_as_seen_item == item.getItemId()) {
+            markItemAsSeenWithUndo(selectedItem);
+            return true;
+        }
+
         return FeedItemMenuHandler.onMenuItemClicked(getActivity(), item.getItemId(), selectedItem);
     }
 
@@ -481,4 +493,36 @@ public class AllEpisodesFragment extends Fragment {
         return DBReader.getRecentlyPublishedEpisodes(RECENT_EPISODES_LIMIT);
     }
 
+    void markItemAsSeenWithUndo(FeedItem item) {
+        if (item == null) {
+            return;
+        }
+
+        Log.d(TAG, "markItemAsSeenWithUndo(" + item.getId() + ")");
+        if (subscription != null) {
+            subscription.unsubscribe();
+        }
+        // we're marking it as unplayed since the user didn't actually play it
+        // but they don't want it considered 'NEW' anymore
+        DBWriter.markItemPlayed(FeedItem.UNPLAYED, item.getId());
+
+        final Handler h = new Handler(getActivity().getMainLooper());
+        final Runnable r  = () -> {
+            FeedMedia media = item.getMedia();
+            if (media != null && media.hasAlmostEnded() && UserPreferences.isAutoDelete()) {
+                DBWriter.deleteFeedMediaOfItem(getActivity(), media.getId());
+            }
+        };
+
+        Snackbar snackbar = Snackbar.make(getView(), getString(R.string.marked_as_seen_label),
+                Snackbar.LENGTH_LONG);
+        snackbar.setAction(getString(R.string.undo), v -> {
+            DBWriter.markItemPlayed(FeedItem.NEW, item.getId());
+            // don't forget to cancel the thing that's going to remove the media
+            h.removeCallbacks(r);
+        });
+        snackbar.show();
+        h.postDelayed(r, (int)Math.ceil(snackbar.getDuration() * 1.05f));
+    }
+
 }
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/NewEpisodesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/NewEpisodesFragment.java
index c136eb6ae..6695ba427 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/NewEpisodesFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/NewEpisodesFragment.java
@@ -1,8 +1,6 @@
 package de.danoeh.antennapod.fragment;
 
 import android.os.Bundle;
-import android.os.Handler;
-import android.support.design.widget.Snackbar;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.helper.ItemTouchHelper;
 import android.util.Log;
@@ -16,10 +14,7 @@ import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.adapter.AllEpisodesRecycleAdapter;
 import de.danoeh.antennapod.core.event.FeedItemEvent;
 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.storage.DBReader;
-import de.danoeh.antennapod.core.storage.DBWriter;
 import de.danoeh.antennapod.core.util.FeedItemUtil;
 
 
@@ -74,33 +69,7 @@ public class NewEpisodesFragment extends AllEpisodesFragment {
             @Override
             public void onSwiped(RecyclerView.ViewHolder viewHolder, int swipeDir) {
                 AllEpisodesRecycleAdapter.Holder holder = (AllEpisodesRecycleAdapter.Holder)viewHolder;
-
-                Log.d(TAG, "remove(" + holder.getItemId() + ")");
-                if (subscription != null) {
-                    subscription.unsubscribe();
-                }
-                FeedItem item = holder.getFeedItem();
-                // we're marking it as unplayed since the user didn't actually play it
-                // but they don't want it considered 'NEW' anymore
-                DBWriter.markItemPlayed(FeedItem.UNPLAYED, item.getId());
-
-                final Handler h = new Handler(getActivity().getMainLooper());
-                final Runnable r  = () -> {
-                    FeedMedia media = item.getMedia();
-                    if (media != null && media.hasAlmostEnded() && UserPreferences.isAutoDelete()) {
-                        DBWriter.deleteFeedMediaOfItem(getActivity(), media.getId());
-                    }
-                };
-
-                Snackbar snackbar = Snackbar.make(root, getString(R.string.marked_as_seen_label),
-                        Snackbar.LENGTH_LONG);
-                snackbar.setAction(getString(R.string.undo), v -> {
-                    DBWriter.markItemPlayed(FeedItem.NEW, item.getId());
-                    // don't forget to cancel the thing that's going to remove the media
-                    h.removeCallbacks(r);
-                });
-                snackbar.show();
-                h.postDelayed(r, (int)Math.ceil(snackbar.getDuration() * 1.05f));
+                markItemAsSeenWithUndo(holder.getFeedItem());
             }
 
             @Override
-- 
cgit v1.2.3


From 4c7531d277bf4b2a733031b9b1d3a7e9c1ad0241 Mon Sep 17 00:00:00 2001
From: orionlee <orionlee@yahoo.com>
Date: Wed, 2 May 2018 13:53:56 -0700
Subject: Flatten nested ifs, per @ByteHamster feedback

---
 .../antennapod/activity/MediaplayerActivity.java       | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
index 229848753..35f9579df 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
@@ -605,16 +605,14 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements
     }
 
     private static String getWebsiteLinkWithFallback(Playable media) {
-        String link = null;
-        if (media != null) {
-            link = media.getWebsiteLink();
-            if (link == null) {
-                if (media instanceof FeedMedia) {
-                    link = FeedItemUtil.getLinkWithFallback(((FeedMedia)media).getItem());
-                } // else case not a FeedMedia, return null
-            }
-        } // else no media, return null
-        return link;
+        if (media == null) {
+            return null;
+        } else if (media.getWebsiteLink() != null) {
+            return media.getWebsiteLink();
+        } else if (media instanceof FeedMedia) {
+            return FeedItemUtil.getLinkWithFallback(((FeedMedia)media).getItem());
+        }
+        return null;
     }
 
     @Override
-- 
cgit v1.2.3


From 7ad176ce299bb2abfa3698ce64ffc69b16cfdc8b Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Wed, 10 Jan 2018 21:50:29 +0100
Subject: Added notification categories

Android treats IMPORTANCE_DEFAULT as IMPORTANCE_HIGH
https://issuetracker.google.com/issues/65108694
---
 .../java/de/danoeh/antennapod/activity/ImportExportActivity.java | 9 ++++++---
 .../main/java/de/danoeh/antennapod/activity/MainActivity.java    | 2 ++
 2 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/ImportExportActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/ImportExportActivity.java
index 6a97adcc3..91462bce9 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/ImportExportActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/ImportExportActivity.java
@@ -8,7 +8,7 @@ import android.os.Bundle;
 import android.os.Environment;
 import android.os.ParcelFileDescriptor;
 import android.support.design.widget.Snackbar;
-import android.support.v4.content.IntentCompat;
+import android.support.v7.app.ActionBar;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
@@ -39,7 +39,10 @@ public class ImportExportActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         setTheme(UserPreferences.getTheme());
         super.onCreate(savedInstanceState);
-        getSupportActionBar().setDisplayShowHomeEnabled(true);
+        ActionBar actionBar = getSupportActionBar();
+        if (actionBar != null) {
+            actionBar.setDisplayShowHomeEnabled(true);
+        }
         setContentView(R.layout.import_export_activity);
 
         findViewById(R.id.button_export).setOnClickListener(view -> backup());
@@ -125,7 +128,7 @@ public class ImportExportActivity extends AppCompatActivity {
         d.setPositiveButton(android.R.string.ok, (dialogInterface, i) -> {
             Intent intent = new Intent(getApplicationContext(), SplashActivity.class);
             ComponentName cn = intent.getComponent();
-            Intent mainIntent = IntentCompat.makeRestartActivityTask(cn);
+            Intent mainIntent = Intent.makeRestartActivityTask(cn);
             startActivity(mainIntent);
         });
         d.show();
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
index e593934a9..cb4dae942 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
@@ -30,6 +30,7 @@ import android.widget.ListView;
 
 import com.bumptech.glide.Glide;
 
+import de.danoeh.antennapod.core.util.NotificationUtils;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.Validate;
 
@@ -200,6 +201,7 @@ public class MainActivity extends CastEnabledActivity implements NavDrawerActivi
         transaction.commit();
 
         checkFirstLaunch();
+        NotificationUtils.createChannels(this);
     }
 
     private void saveLastNavFragment(String tag) {
-- 
cgit v1.2.3


From 3e98ab61ea50b320989c26f6548303fd91447073 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Sun, 22 Apr 2018 22:21:46 +0200
Subject: Start PlaybackService lazily to allow using ForegroundService

---
 .../antennapod/activity/AudioplayerActivity.java   |  3 ++-
 .../danoeh/antennapod/activity/MainActivity.java   | 10 +++++++++
 .../antennapod/activity/MediaplayerActivity.java   | 24 ++++++++++++++++++++--
 .../antennapod/activity/VideoplayerActivity.java   |  4 +++-
 .../adapter/DefaultActionButtonCallback.java       |  6 ++++++
 .../fragment/ExternalPlayerFragment.java           | 17 ++++++++++-----
 .../danoeh/antennapod/fragment/ItemFragment.java   |  4 ++++
 .../danoeh/antennapod/receiver/PlayerWidget.java   |  3 ++-
 8 files changed, 61 insertions(+), 10 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java
index 123f66661..3ddf3ed74 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java
@@ -1,6 +1,7 @@
 package de.danoeh.antennapod.activity;
 
 import android.content.Intent;
+import android.support.v4.content.ContextCompat;
 import android.support.v4.view.ViewCompat;
 import android.text.TextUtils;
 import android.util.Log;
@@ -41,7 +42,7 @@ public class AudioplayerActivity extends MediaplayerInfoActivity {
             launchIntent.putExtra(PlaybackService.EXTRA_SHOULD_STREAM, false);
             launchIntent.putExtra(PlaybackService.EXTRA_PREPARE_IMMEDIATELY,
                     true);
-            startService(launchIntent);
+            ContextCompat.startForegroundService(this, launchIntent);
         } else if (PlaybackService.isCasting()) {
             Intent intent = PlaybackService.getPlayerActivityIntent(this);
             if (intent.getComponent() != null &&
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
index cb4dae942..c2ea7fc12 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
@@ -30,6 +30,7 @@ import android.widget.ListView;
 
 import com.bumptech.glide.Glide;
 
+import de.danoeh.antennapod.core.event.ServiceEvent;
 import de.danoeh.antennapod.core.util.NotificationUtils;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.Validate;
@@ -741,6 +742,15 @@ public class MainActivity extends CastEnabledActivity implements NavDrawerActivi
         loadData();
     }
 
+    public void onEventMainThread(ServiceEvent event) {
+        Log.d(TAG, "onEvent(" + event + ")");
+        switch(event.action) {
+            case SERVICE_STARTED:
+                externalPlayerFragment.connectToPlaybackService();
+                break;
+        }
+    }
+
     public void onEventMainThread(ProgressEvent event) {
         Log.d(TAG, "onEvent(" + event + ")");
         switch(event.action) {
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
index 21e375435..116709587 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
@@ -34,6 +34,7 @@ import com.joanzapata.iconify.fonts.FontAwesomeIcons;
 import java.util.Locale;
 
 import de.danoeh.antennapod.R;
+import de.danoeh.antennapod.core.event.ServiceEvent;
 import de.danoeh.antennapod.core.feed.FeedItem;
 import de.danoeh.antennapod.core.feed.FeedMedia;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
@@ -270,6 +271,9 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements
             controller.release();
         }
         controller = newPlaybackController();
+        setupGUI();
+        loadMediaInfo();
+        onPositionObserverUpdate();
     }
 
     @Override
@@ -608,8 +612,23 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements
         super.onResume();
         Log.d(TAG, "onResume()");
         StorageUtils.checkStorageAvailability(this);
-        if(controller != null) {
-            controller.init();
+        if (controller != null) {
+            if (PlaybackService.isRunning) {
+                controller.init();
+            } else {
+                controller.resumeServiceNotRunning();
+            }
+        }
+    }
+
+    public void onEventMainThread(ServiceEvent event) {
+        Log.d(TAG, "onEvent(" + event + ")");
+        switch(event.action) {
+            case SERVICE_STARTED:
+                if (controller != null) {
+                    controller.init();
+                }
+                break;
         }
     }
 
@@ -853,6 +872,7 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements
         if(controller == null) {
             return;
         }
+        controller.init();
         controller.playPause();
     }
 
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
index 733f39b63..e91e96a13 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
@@ -6,6 +6,7 @@ import android.graphics.drawable.ColorDrawable;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
+import android.support.v4.content.ContextCompat;
 import android.support.v4.view.WindowCompat;
 import android.support.v7.app.ActionBar;
 import android.util.Log;
@@ -30,6 +31,7 @@ import de.danoeh.antennapod.core.service.playback.PlayerStatus;
 import de.danoeh.antennapod.core.util.gui.PictureInPictureUtil;
 import de.danoeh.antennapod.core.util.playback.ExternalMedia;
 import de.danoeh.antennapod.core.util.playback.Playable;
+import de.danoeh.antennapod.service.PlayerWidgetService;
 import de.danoeh.antennapod.view.AspectRatioVideoView;
 
 import java.lang.ref.WeakReference;
@@ -89,7 +91,7 @@ public class VideoplayerActivity extends MediaplayerActivity {
             launchIntent.putExtra(PlaybackService.EXTRA_SHOULD_STREAM, false);
             launchIntent.putExtra(PlaybackService.EXTRA_PREPARE_IMMEDIATELY,
                     true);
-            startService(launchIntent);
+            ContextCompat.startForegroundService(this, launchIntent);
         } else if (PlaybackService.isCasting()) {
             Intent intent = PlaybackService.getPlayerActivityIntent(this);
             if (!intent.getComponent().getClassName().equals(VideoplayerActivity.class.getName())) {
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 4a53be9dc..31b0ce333 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/DefaultActionButtonCallback.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/DefaultActionButtonCallback.java
@@ -81,9 +81,15 @@ public class DefaultActionButtonCallback implements ActionButtonCallback {
                 }
             } else { // media is downloaded
                 if (item.hasMedia() && item.getMedia().isCurrentlyPlaying()) {
+                    if (!PlaybackService.isRunning) {
+                        PlaybackService.startService(context, media, true, false);
+                    }
                     context.sendBroadcast(new Intent(PlaybackService.ACTION_PAUSE_PLAY_CURRENT_EPISODE));
                 }
                 else if (item.hasMedia() && item.getMedia().isCurrentlyPaused()) {
+                    if (!PlaybackService.isRunning) {
+                        PlaybackService.startService(context, media, true, false);
+                    }
                     context.sendBroadcast(new Intent(PlaybackService.ACTION_RESUME_PLAY_CURRENT_EPISODE));
                 }
                 else {
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
index 2705e7402..e75f312d3 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
@@ -37,7 +37,6 @@ public class ExternalPlayerFragment extends Fragment {
     private ImageButton butPlay;
     private TextView mFeedName;
     private ProgressBar mProgressBar;
-
     private PlaybackController controller;
 
     public ExternalPlayerFragment() {
@@ -83,6 +82,11 @@ public class ExternalPlayerFragment extends Fragment {
                 controller.playPause();
             }
         });
+        loadMediaInfo();
+    }
+
+    public void connectToPlaybackService() {
+        controller.init();
     }
 
     private PlaybackController setupPlaybackController() {
@@ -123,7 +127,11 @@ public class ExternalPlayerFragment extends Fragment {
     @Override
     public void onResume() {
         super.onResume();
-        controller.init();
+        if (PlaybackService.isRunning) {
+            controller.init();
+        } else {
+            controller.resumeServiceNotRunning();
+        }
         onPositionObserverUpdate();
     }
 
@@ -164,13 +172,12 @@ public class ExternalPlayerFragment extends Fragment {
 
     private boolean loadMediaInfo() {
         Log.d(TAG, "Loading media info");
-        if (controller != null && controller.serviceAvailable()) {
+        if (controller != null) {
             Playable media = controller.getMedia();
             if (media != null) {
                 txtvTitle.setText(media.getEpisodeTitle());
                 mFeedName.setText(media.getFeedTitle());
-                mProgressBar.setProgress((int)
-                        ((double) controller.getPosition() / controller.getDuration() * 100));
+                onPositionObserverUpdate();
 
                 Glide.with(getActivity())
                         .load(media.getImageLocation())
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 2d11e9f71..7078eeb63 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
@@ -34,6 +34,7 @@ import com.bumptech.glide.Glide;
 import com.joanzapata.iconify.Iconify;
 import com.joanzapata.iconify.widget.IconButton;
 
+import de.danoeh.antennapod.core.service.playback.PlaybackService;
 import de.danoeh.antennapod.core.util.NetworkUtils;
 import org.apache.commons.lang3.ArrayUtils;
 
@@ -243,6 +244,9 @@ public class ItemFragment extends Fragment implements OnSwipeGesture {
             if (item.hasMedia()) {
                 FeedMedia media = item.getMedia();
                 if (!media.isDownloaded()) {
+                    if (!PlaybackService.isRunning) {
+                        PlaybackService.startService(getActivity(), media, true, false);
+                    }
                     DBTasks.playMedia(getActivity(), media, true, true, true);
                     ((MainActivity) getActivity()).dismissChildFragment();
                 } else {
diff --git a/app/src/main/java/de/danoeh/antennapod/receiver/PlayerWidget.java b/app/src/main/java/de/danoeh/antennapod/receiver/PlayerWidget.java
index a90f0f706..31242f1fd 100644
--- a/app/src/main/java/de/danoeh/antennapod/receiver/PlayerWidget.java
+++ b/app/src/main/java/de/danoeh/antennapod/receiver/PlayerWidget.java
@@ -5,6 +5,7 @@ import android.appwidget.AppWidgetProvider;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.support.v4.content.ContextCompat;
 import android.text.TextUtils;
 import android.util.Log;
 
@@ -60,7 +61,7 @@ public class PlayerWidget extends AppWidgetProvider {
 
     private void startUpdate(Context context) {
         Log.d(TAG, "startUpdate() called with: " + "context = [" + context + "]");
-        context.startService(new Intent(context, PlayerWidgetService.class));
+        ContextCompat.startForegroundService(context, new Intent(context, PlayerWidgetService.class));
     }
 
     private void stopUpdate(Context context) {
-- 
cgit v1.2.3


From 2190101cf949d58057e0f0e2ca24dbe81d201426 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Thu, 3 May 2018 18:47:57 +0200
Subject: Added JobScheduler for feed updates

---
 app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
index c2ea7fc12..fb18ceecd 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
@@ -203,6 +203,7 @@ public class MainActivity extends CastEnabledActivity implements NavDrawerActivi
 
         checkFirstLaunch();
         NotificationUtils.createChannels(this);
+        UserPreferences.restartUpdateAlarm(false);
     }
 
     private void saveLastNavFragment(String tag) {
-- 
cgit v1.2.3


From f66e19845c123160ba6174c2dec337070a6d9b22 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Fri, 4 May 2018 14:36:32 +0200
Subject: Review changes

---
 .../java/de/danoeh/antennapod/activity/MediaplayerActivity.java   | 6 +-----
 .../de/danoeh/antennapod/adapter/DefaultActionButtonCallback.java | 8 ++------
 .../de/danoeh/antennapod/fragment/ExternalPlayerFragment.java     | 6 +-----
 app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java | 4 +---
 4 files changed, 5 insertions(+), 19 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
index 116709587..de65ca406 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
@@ -613,11 +613,7 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements
         Log.d(TAG, "onResume()");
         StorageUtils.checkStorageAvailability(this);
         if (controller != null) {
-            if (PlaybackService.isRunning) {
-                controller.init();
-            } else {
-                controller.resumeServiceNotRunning();
-            }
+            controller.init();
         }
     }
 
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 31b0ce333..3f8f871c2 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/DefaultActionButtonCallback.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/DefaultActionButtonCallback.java
@@ -81,15 +81,11 @@ public class DefaultActionButtonCallback implements ActionButtonCallback {
                 }
             } else { // media is downloaded
                 if (item.hasMedia() && item.getMedia().isCurrentlyPlaying()) {
-                    if (!PlaybackService.isRunning) {
-                        PlaybackService.startService(context, media, true, false);
-                    }
+                    PlaybackService.startIfNotRunning(context, media, true, false);
                     context.sendBroadcast(new Intent(PlaybackService.ACTION_PAUSE_PLAY_CURRENT_EPISODE));
                 }
                 else if (item.hasMedia() && item.getMedia().isCurrentlyPaused()) {
-                    if (!PlaybackService.isRunning) {
-                        PlaybackService.startService(context, media, true, false);
-                    }
+                    PlaybackService.startIfNotRunning(context, media, true, false);
                     context.sendBroadcast(new Intent(PlaybackService.ACTION_RESUME_PLAY_CURRENT_EPISODE));
                 }
                 else {
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
index e75f312d3..27df29f9f 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
@@ -127,11 +127,7 @@ public class ExternalPlayerFragment extends Fragment {
     @Override
     public void onResume() {
         super.onResume();
-        if (PlaybackService.isRunning) {
-            controller.init();
-        } else {
-            controller.resumeServiceNotRunning();
-        }
+        controller.init();
         onPositionObserverUpdate();
     }
 
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 7078eeb63..5088d71a6 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
@@ -244,9 +244,7 @@ public class ItemFragment extends Fragment implements OnSwipeGesture {
             if (item.hasMedia()) {
                 FeedMedia media = item.getMedia();
                 if (!media.isDownloaded()) {
-                    if (!PlaybackService.isRunning) {
-                        PlaybackService.startService(getActivity(), media, true, false);
-                    }
+                    PlaybackService.startIfNotRunning(getActivity(), media, true, false);
                     DBTasks.playMedia(getActivity(), media, true, true, true);
                     ((MainActivity) getActivity()).dismissChildFragment();
                 } else {
-- 
cgit v1.2.3


From 686801fea2fbe162fae9f1c64ab204587e19fc95 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Fri, 4 May 2018 17:51:12 +0200
Subject: Switched to PreferenceCompat

---
 .../antennapod/activity/PreferenceActivity.java    |  48 +++------
 .../preferences/MasterSwitchPreference.java        |  14 +--
 .../preferences/PreferenceController.java          | 119 ++++++++++-----------
 .../preferences/SwitchCompatPreference.java        |  37 -------
 4 files changed, 83 insertions(+), 135 deletions(-)
 delete mode 100644 app/src/main/java/de/danoeh/antennapod/preferences/SwitchCompatPreference.java

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java
index a6aec2425..43bd147ea 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java
@@ -1,13 +1,12 @@
 package de.danoeh.antennapod.activity;
 
-import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
-import android.preference.Preference;
-import android.preference.PreferenceFragment;
-import android.preference.PreferenceScreen;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceFragmentCompat;
+import android.support.v7.preference.PreferenceScreen;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.ViewGroup;
@@ -29,10 +28,10 @@ public class PreferenceActivity extends AppCompatActivity {
     private static WeakReference<PreferenceActivity> instance;
     private PreferenceController preferenceController;
     private final PreferenceController.PreferenceUI preferenceUI = new PreferenceController.PreferenceUI() {
-        private PreferenceFragment fragment;
+        private PreferenceFragmentCompat fragment;
 
         @Override
-        public void setFragment(PreferenceFragment fragment) {
+        public void setFragment(PreferenceFragmentCompat fragment) {
             this.fragment = fragment;
         }
 
@@ -47,7 +46,7 @@ public class PreferenceActivity extends AppCompatActivity {
         }
 
         @Override
-        public Activity getActivity() {
+        public AppCompatActivity getActivity() {
             return PreferenceActivity.this;
         }
     };
@@ -77,12 +76,12 @@ public class PreferenceActivity extends AppCompatActivity {
         // since the MainFragment depends on the preferenceController already being created
         preferenceController = new PreferenceController(preferenceUI);
 
-        PreferenceFragment prefFragment = new MainFragment();
+        PreferenceFragmentCompat prefFragment = new MainFragment();
         preferenceUI.setFragment(prefFragment);
         Bundle args = new Bundle();
         args.putInt(PARAM_RESOURCE, R.xml.preferences);
         prefFragment.setArguments(args);
-        getFragmentManager().beginTransaction().replace(R.id.content, prefFragment).commit();
+        getSupportFragmentManager().beginTransaction().replace(R.id.content, prefFragment).commit();
     }
 
     @Override
@@ -101,10 +100,10 @@ public class PreferenceActivity extends AppCompatActivity {
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case android.R.id.home:
-                if (getFragmentManager().getBackStackEntryCount() == 0) {
+                if (getSupportFragmentManager().getBackStackEntryCount() == 0) {
                     finish();
                 } else {
-                    getFragmentManager().popBackStack();
+                    getSupportFragmentManager().popBackStack();
                 }
                 return true;
             default:
@@ -112,13 +111,17 @@ public class PreferenceActivity extends AppCompatActivity {
         }
     }
 
-    public static class MainFragment extends PreferenceFragment {
+    public static class MainFragment extends PreferenceFragmentCompat {
         private int screen;
 
         @Override
         public void onCreate(Bundle savedInstanceState) {
             super.onCreate(savedInstanceState);
             setRetainInstance(true);
+        }
+
+        @Override
+        public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
             screen = getArguments().getInt(PARAM_RESOURCE);
             addPreferencesFromResource(screen);
             PreferenceActivity activity = instance.get();
@@ -133,31 +136,12 @@ public class PreferenceActivity extends AppCompatActivity {
             super.onResume();
             PreferenceActivity activity = instance.get();
             if(activity != null && activity.preferenceController != null) {
-                activity.setTitle(getTitle(screen));
+                activity.setTitle(activity.preferenceController.getTitleOfPage(screen));
                 activity.preferenceUI.setFragment(this);
                 activity.preferenceController.onResume(screen);
             }
         }
 
-        private int getTitle(int preferences) {
-            switch (preferences) {
-                case R.xml.preferences_network:
-                    return R.string.network_pref;
-                case R.xml.preferences_autodownload:
-                    return R.string.pref_automatic_download_title;
-                case R.xml.preferences_playback:
-                    return R.string.playback_pref;
-                case R.xml.preferences_storage:
-                    return R.string.storage_pref;
-                case R.xml.preferences_user_interface:
-                    return R.string.user_interface_label;
-                case R.xml.preferences_integrations:
-                    return R.string.integrations_label;
-                default:
-                    return R.string.settings_label;
-            }
-        }
-
         @Override
         public void onPause() {
             PreferenceActivity activity = instance.get();
diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/MasterSwitchPreference.java b/app/src/main/java/de/danoeh/antennapod/preferences/MasterSwitchPreference.java
index bcac65804..e500267fe 100644
--- a/app/src/main/java/de/danoeh/antennapod/preferences/MasterSwitchPreference.java
+++ b/app/src/main/java/de/danoeh/antennapod/preferences/MasterSwitchPreference.java
@@ -4,13 +4,14 @@ import android.annotation.TargetApi;
 import android.content.Context;
 import android.graphics.Typeface;
 import android.os.Build;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.PreferenceViewHolder;
 import android.util.AttributeSet;
 import android.util.TypedValue;
-import android.view.View;
 import android.widget.TextView;
 import de.danoeh.antennapod.R;
 
-public class MasterSwitchPreference extends SwitchCompatPreference {
+public class MasterSwitchPreference extends SwitchPreference {
 
     public MasterSwitchPreference(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
@@ -29,15 +30,16 @@ public class MasterSwitchPreference extends SwitchCompatPreference {
         super(context);
     }
 
+
     @Override
-    protected void onBindView(View view) {
-        super.onBindView(view);
+    public void onBindViewHolder(PreferenceViewHolder holder) {
+        super.onBindViewHolder(holder);
 
         TypedValue typedValue = new TypedValue();
         getContext().getTheme().resolveAttribute(R.attr.master_switch_background, typedValue, true);
-        view.setBackgroundColor(typedValue.data);
+        holder.itemView.setBackgroundColor(typedValue.data);
 
-        TextView title = (TextView) view.findViewById(android.R.id.title);
+        TextView title = (TextView) holder.findViewById(android.R.id.title);
         if (title != null) {
             title.setTypeface(title.getTypeface(), Typeface.BOLD);
         }
diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
index fceaf6abf..2902e00bc 100644
--- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
+++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
@@ -3,7 +3,6 @@ package de.danoeh.antennapod.preferences;
 import android.Manifest;
 import android.annotation.SuppressLint;
 import android.app.Activity;
-import android.app.Fragment;
 import android.app.ProgressDialog;
 import android.app.TimePickerDialog;
 import android.content.ActivityNotFoundException;
@@ -18,31 +17,27 @@ import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiManager;
 import android.os.Build;
 import android.os.Bundle;
-import android.preference.CheckBoxPreference;
-import android.preference.EditTextPreference;
-import android.preference.ListPreference;
-import android.preference.Preference;
-import android.preference.PreferenceFragment;
-import android.preference.PreferenceManager;
-import android.preference.PreferenceScreen;
 import android.support.design.widget.Snackbar;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.content.FileProvider;
 import android.support.v7.app.AlertDialog;
-import android.text.Editable;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.preference.CheckBoxPreference;
+import android.support.v7.preference.ListPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceFragmentCompat;
+import android.support.v7.preference.PreferenceManager;
+import android.support.v7.preference.PreferenceScreen;
 import android.text.Html;
-import android.text.TextWatcher;
 import android.text.format.DateFormat;
 import android.text.format.DateUtils;
 import android.util.Log;
-import android.widget.EditText;
 import android.widget.ListView;
 import android.widget.Toast;
 
 import com.afollestad.materialdialogs.MaterialDialog;
 
 import de.danoeh.antennapod.activity.AboutActivity;
-import com.afollestad.materialdialogs.prefs.MaterialListPreference;
 import de.danoeh.antennapod.activity.ImportExportActivity;
 import de.danoeh.antennapod.activity.MediaplayerActivity;
 import de.danoeh.antennapod.activity.OpmlImportFromPathActivity;
@@ -395,7 +390,7 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
                     return true;
                 });
         if (!PictureInPictureUtil.supportsPictureInPicture(activity)) {
-            MaterialListPreference behaviour = (MaterialListPreference) ui.findPreference(UserPreferences.PREF_VIDEO_BEHAVIOR);
+            ListPreference behaviour = (ListPreference) ui.findPreference(UserPreferences.PREF_VIDEO_BEHAVIOR);
             behaviour.setEntries(R.array.video_background_behavior_options_without_pip);
             behaviour.setEntryValues(R.array.video_background_behavior_values_without_pip);
         }
@@ -432,9 +427,11 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
     }
 
     private void setupNetworkScreen() {
-        final Activity activity = ui.getActivity();
-        ui.findPreference(PREF_SCREEN_AUTODL).setOnPreferenceClickListener(preference ->
-                openScreen(R.xml.preferences_autodownload, activity));
+        final AppCompatActivity activity = ui.getActivity();
+        ui.findPreference(PREF_SCREEN_AUTODL).setOnPreferenceClickListener(preference -> {
+            openScreen(R.xml.preferences_autodownload, activity);
+            return true;
+        });
         ui.findPreference(UserPreferences.PREF_UPDATE_INTERVAL)
                 .setOnPreferenceClickListener(preference -> {
                     showUpdateIntervalTimePreferencesDialog();
@@ -458,33 +455,6 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
                         }
                 );
         // validate and set correct value: number of downloads between 1 and 50 (inclusive)
-        final EditText ev = ((EditTextPreference) ui.findPreference(UserPreferences.PREF_PARALLEL_DOWNLOADS)).getEditText();
-        ev.addTextChangedListener(new TextWatcher() {
-            @Override
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-            }
-
-            @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-            }
-
-            @Override
-            public void afterTextChanged(Editable s) {
-                if (s.length() > 0) {
-                    try {
-                        int value = Integer.parseInt(s.toString());
-                        if (value <= 0) {
-                            ev.setText("1");
-                        } else if (value > 50) {
-                            ev.setText("50");
-                        }
-                    } catch (NumberFormatException e) {
-                        ev.setText("6");
-                    }
-                    ev.setSelection(ev.getText().length());
-                }
-            }
-        });
         ui.findPreference(PREF_PROXY).setOnPreferenceClickListener(preference -> {
             ProxyDialog dialog = new ProxyDialog(ui.getActivity());
             dialog.createDialog().show();
@@ -493,17 +463,27 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
     }
 
     private void setupMainScreen() {
-        final Activity activity = ui.getActivity();
-        ui.findPreference(PREF_SCREEN_USER_INTERFACE).setOnPreferenceClickListener(preference ->
-                openScreen(R.xml.preferences_user_interface, activity));
-        ui.findPreference(PREF_SCREEN_PLAYBACK).setOnPreferenceClickListener(preference ->
-                openScreen(R.xml.preferences_playback, activity));
-        ui.findPreference(PREF_SCREEN_NETWORK).setOnPreferenceClickListener(preference ->
-                openScreen(R.xml.preferences_network, activity));
-        ui.findPreference(PREF_SCREEN_INTEGRATIONS).setOnPreferenceClickListener(preference ->
-                openScreen(R.xml.preferences_integrations, activity));
-        ui.findPreference(PREF_SCREEN_STORAGE).setOnPreferenceClickListener(preference ->
-                openScreen(R.xml.preferences_storage, activity));
+        final AppCompatActivity activity = ui.getActivity();
+        ui.findPreference(PREF_SCREEN_USER_INTERFACE).setOnPreferenceClickListener(preference -> {
+            openScreen(R.xml.preferences_user_interface, activity);
+            return true;
+        });
+        ui.findPreference(PREF_SCREEN_PLAYBACK).setOnPreferenceClickListener(preference -> {
+            openScreen(R.xml.preferences_playback, activity);
+            return true;
+        });
+        ui.findPreference(PREF_SCREEN_NETWORK).setOnPreferenceClickListener(preference -> {
+            openScreen(R.xml.preferences_network, activity);
+            return true;
+        });
+        ui.findPreference(PREF_SCREEN_INTEGRATIONS).setOnPreferenceClickListener(preference -> {
+            openScreen(R.xml.preferences_integrations, activity);
+            return true;
+        });
+        ui.findPreference(PREF_SCREEN_STORAGE).setOnPreferenceClickListener(preference -> {
+            openScreen(R.xml.preferences_storage, activity);
+            return true;
+        });
 
         ui.findPreference(PreferenceController.PREF_ABOUT).setOnPreferenceClickListener(
                 preference -> {
@@ -550,15 +530,34 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
         });
     }
 
-    private boolean openScreen(int preferences, Activity activity) {
-        Fragment prefFragment = new PreferenceActivity.MainFragment();
+    public PreferenceFragmentCompat openScreen(int preferences, AppCompatActivity activity) {
+        PreferenceFragmentCompat prefFragment = new PreferenceActivity.MainFragment();
         Bundle args = new Bundle();
         args.putInt(PARAM_RESOURCE, preferences);
         prefFragment.setArguments(args);
-        activity.getFragmentManager().beginTransaction()
+        activity.getSupportFragmentManager().beginTransaction()
                 .replace(R.id.content, prefFragment)
                 .addToBackStack(TAG).commit();
-        return true;
+        return prefFragment;
+    }
+
+    public int getTitleOfPage(int preferences) {
+        switch (preferences) {
+            case R.xml.preferences_network:
+                return R.string.network_pref;
+            case R.xml.preferences_autodownload:
+                return R.string.pref_automatic_download_title;
+            case R.xml.preferences_playback:
+                return R.string.playback_pref;
+            case R.xml.preferences_storage:
+                return R.string.storage_pref;
+            case R.xml.preferences_user_interface:
+                return R.string.user_interface_label;
+            case R.xml.preferences_integrations:
+                return R.string.integrations_label;
+            default:
+                return R.string.settings_label;
+        }
     }
 
     private boolean export(ExportWriter exportWriter) {
@@ -1115,7 +1114,7 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
 
     public interface PreferenceUI {
 
-        void setFragment(PreferenceFragment fragment);
+        void setFragment(PreferenceFragmentCompat fragment);
 
         /**
          * Finds a preference based on its key.
@@ -1124,6 +1123,6 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
 
         PreferenceScreen getPreferenceScreen();
 
-        Activity getActivity();
+        AppCompatActivity getActivity();
     }
 }
diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/SwitchCompatPreference.java b/app/src/main/java/de/danoeh/antennapod/preferences/SwitchCompatPreference.java
deleted file mode 100644
index 10c11b88e..000000000
--- a/app/src/main/java/de/danoeh/antennapod/preferences/SwitchCompatPreference.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package de.danoeh.antennapod.preferences;
-
-import android.annotation.TargetApi;
-import android.content.Context;
-import android.os.Build;
-import android.preference.CheckBoxPreference;
-import android.util.AttributeSet;
-
-import de.danoeh.antennapod.R;
-
-public class SwitchCompatPreference extends CheckBoxPreference {
-
-    public SwitchCompatPreference(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-        init();
-    }
-
-    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
-    public SwitchCompatPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
-        super(context, attrs, defStyleAttr, defStyleRes);
-        init();
-    }
-
-    public SwitchCompatPreference(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        init();
-    }
-
-    public SwitchCompatPreference(Context context) {
-        super(context);
-        init();
-    }
-
-    private void init() {
-        setWidgetLayoutResource(R.layout.preference_switch_layout);
-    }
-}
\ No newline at end of file
-- 
cgit v1.2.3


From c3510d821dff78298d68087ab6b4c6bfe33d1e89 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Fri, 4 May 2018 19:03:11 +0200
Subject: Moved Flattr/gpodder to their own files

---
 .../antennapod/activity/PreferenceActivity.java    |  2 +-
 .../preferences/PreferenceController.java          | 81 ++++++++++++++++------
 2 files changed, 60 insertions(+), 23 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java
index 43bd147ea..34c68084f 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java
@@ -145,7 +145,7 @@ public class PreferenceActivity extends AppCompatActivity {
         @Override
         public void onPause() {
             PreferenceActivity activity = instance.get();
-            if (screen == R.xml.preferences_integrations) {
+            if (screen == R.xml.preferences_gpodder) {
                 activity.preferenceController.unregisterGpodnet();
             }
             super.onPause();
diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
index 2902e00bc..62d4793cf 100644
--- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
+++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
@@ -94,8 +94,9 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
     private static final String PREF_SCREEN_INTEGRATIONS = "prefScreenIntegrations";
     private static final String PREF_SCREEN_STORAGE = "prefScreenStorage";
     private static final String PREF_SCREEN_AUTODL = "prefAutoDownloadSettings";
+    private static final String PREF_SCREEN_FLATTR = "prefFlattrSettings";
+    private static final String PREF_SCREEN_GPODDER = "prefGpodderSettings";
 
-    private static final String PREF_FLATTR_SETTINGS = "prefFlattrSettings";
     private static final String PREF_FLATTR_AUTH = "pref_flattr_authenticate";
     private static final String PREF_FLATTR_REVOKE = "prefRevokeAccess";
     private static final String PREF_AUTO_FLATTR_PREFS = "prefAutoFlattrPrefs";
@@ -176,6 +177,12 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
             case R.xml.preferences_integrations:
                 setupIntegrationsScreen();
                 break;
+            case R.xml.preferences_flattr:
+                setupFlattrScreen();
+                break;
+            case R.xml.preferences_gpodder:
+                setupGpodderScreen();
+                break;
             case R.xml.preferences_storage:
                 setupStorageScreen();
                 break;
@@ -295,7 +302,20 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
     }
 
     private void setupIntegrationsScreen() {
-        final Activity activity = ui.getActivity();
+        final AppCompatActivity activity = ui.getActivity();
+
+        ui.findPreference(PREF_SCREEN_FLATTR).setOnPreferenceClickListener(preference -> {
+            openScreen(R.xml.preferences_flattr, activity);
+            return true;
+        });
+        ui.findPreference(PREF_SCREEN_GPODDER).setOnPreferenceClickListener(preference -> {
+            openScreen(R.xml.preferences_gpodder, activity);
+            return true;
+        });
+    }
+
+    private void setupFlattrScreen() {
+        final AppCompatActivity activity = ui.getActivity();
 
         ui.findPreference(PreferenceController.PREF_FLATTR_REVOKE).setOnPreferenceClickListener(
                 preference -> {
@@ -304,6 +324,29 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
                     return true;
                 }
         );
+
+        ui.findPreference(PreferenceController.PREF_AUTO_FLATTR_PREFS)
+                .setOnPreferenceClickListener(preference -> {
+                    AutoFlattrPreferenceDialog.newAutoFlattrPreferenceDialog(activity,
+                            new AutoFlattrPreferenceDialog.AutoFlattrPreferenceDialogInterface() {
+                                @Override
+                                public void onCancelled() {
+
+                                }
+
+                                @Override
+                                public void onConfirmed(boolean autoFlattrEnabled, float autoFlattrValue) {
+                                    UserPreferences.setAutoFlattrSettings(autoFlattrEnabled, autoFlattrValue);
+                                    checkFlattrItemVisibility();
+                                }
+                            });
+                    return true;
+                });
+    }
+
+    private void setupGpodderScreen() {
+        final AppCompatActivity activity = ui.getActivity();
+
         ui.findPreference(PreferenceController.PREF_GPODNET_SETLOGIN_INFORMATION)
                 .setOnPreferenceClickListener(preference -> {
                     AuthenticationDialog dialog = new AuthenticationDialog(activity,
@@ -351,24 +394,6 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
                     GpodnetSetHostnameDialog.createDialog(activity).setOnDismissListener(dialog -> updateGpodnetPreferenceScreen());
                     return true;
                 });
-
-        ui.findPreference(PreferenceController.PREF_AUTO_FLATTR_PREFS)
-                .setOnPreferenceClickListener(preference -> {
-                    AutoFlattrPreferenceDialog.newAutoFlattrPreferenceDialog(activity,
-                            new AutoFlattrPreferenceDialog.AutoFlattrPreferenceDialogInterface() {
-                                @Override
-                                public void onCancelled() {
-
-                                }
-
-                                @Override
-                                public void onConfirmed(boolean autoFlattrEnabled, float autoFlattrValue) {
-                                    UserPreferences.setAutoFlattrSettings(autoFlattrEnabled, autoFlattrValue);
-                                    checkFlattrItemVisibility();
-                                }
-                            });
-                    return true;
-                });
     }
 
     private void setupPlaybackScreen() {
@@ -555,6 +580,10 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
                 return R.string.user_interface_label;
             case R.xml.preferences_integrations:
                 return R.string.integrations_label;
+            case R.xml.preferences_flattr:
+                return R.string.flattr_label;
+            case R.xml.preferences_gpodder:
+                return R.string.gpodnet_main_label;
             default:
                 return R.string.settings_label;
         }
@@ -627,9 +656,14 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
                 setDataFolderText();
                 break;
             case R.xml.preferences_integrations:
+                setIntegrationsItemVisibility();
+                return;
+            case R.xml.preferences_flattr:
+                checkFlattrItemVisibility();
+                break;
+            case R.xml.preferences_gpodder:
                 GpodnetPreferences.registerOnSharedPreferenceChangeListener(gpoddernetListener);
                 updateGpodnetPreferenceScreen();
-                checkFlattrItemVisibility();
                 break;
             case R.xml.preferences_playback:
                 checkSonicItemVisibility();
@@ -796,10 +830,13 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
         }
     }
 
+    private void setIntegrationsItemVisibility() {
+        ui.findPreference(PreferenceController.PREF_SCREEN_FLATTR).setEnabled(FlattrUtils.hasAPICredentials());
+    }
+
     @SuppressWarnings("deprecation")
     private void checkFlattrItemVisibility() {
         boolean hasFlattrToken = FlattrUtils.hasToken();
-        ui.findPreference(PreferenceController.PREF_FLATTR_SETTINGS).setEnabled(FlattrUtils.hasAPICredentials());
         ui.findPreference(PreferenceController.PREF_FLATTR_AUTH).setEnabled(!hasFlattrToken);
         ui.findPreference(PreferenceController.PREF_FLATTR_REVOKE).setEnabled(hasFlattrToken);
         ui.findPreference(PreferenceController.PREF_AUTO_FLATTR_PREFS).setEnabled(hasFlattrToken);
-- 
cgit v1.2.3


From 0b54d97a0a9a2caeb51c85a68749df9afe0dbdb3 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Sat, 5 May 2018 13:39:57 +0200
Subject: Switched widget to JobIntentService

---
 .../antennapod/activity/VideoplayerActivity.java   |   1 -
 .../danoeh/antennapod/receiver/PlayerWidget.java   |  35 +--
 .../antennapod/service/PlayerWidgetJobService.java | 182 +++++++++++++++
 .../antennapod/service/PlayerWidgetService.java    | 244 ---------------------
 4 files changed, 188 insertions(+), 274 deletions(-)
 create mode 100644 app/src/main/java/de/danoeh/antennapod/service/PlayerWidgetJobService.java
 delete mode 100644 app/src/main/java/de/danoeh/antennapod/service/PlayerWidgetService.java

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
index e91e96a13..efa91d786 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
@@ -31,7 +31,6 @@ import de.danoeh.antennapod.core.service.playback.PlayerStatus;
 import de.danoeh.antennapod.core.util.gui.PictureInPictureUtil;
 import de.danoeh.antennapod.core.util.playback.ExternalMedia;
 import de.danoeh.antennapod.core.util.playback.Playable;
-import de.danoeh.antennapod.service.PlayerWidgetService;
 import de.danoeh.antennapod.view.AspectRatioVideoView;
 
 import java.lang.ref.WeakReference;
diff --git a/app/src/main/java/de/danoeh/antennapod/receiver/PlayerWidget.java b/app/src/main/java/de/danoeh/antennapod/receiver/PlayerWidget.java
index 31242f1fd..c50160934 100644
--- a/app/src/main/java/de/danoeh/antennapod/receiver/PlayerWidget.java
+++ b/app/src/main/java/de/danoeh/antennapod/receiver/PlayerWidget.java
@@ -5,14 +5,13 @@ import android.appwidget.AppWidgetProvider;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.support.v4.content.ContextCompat;
 import android.text.TextUtils;
 import android.util.Log;
 
 import java.util.Arrays;
 
 import de.danoeh.antennapod.core.service.playback.PlaybackService;
-import de.danoeh.antennapod.service.PlayerWidgetService;
+import de.danoeh.antennapod.service.PlayerWidgetJobService;
 
 public class PlayerWidget extends AppWidgetProvider {
     private static final String TAG = "PlayerWidget";
@@ -23,17 +22,7 @@ public class PlayerWidget extends AppWidgetProvider {
     public void onReceive(Context context, Intent intent) {
         Log.d(TAG, "onReceive");
         super.onReceive(context, intent);
-        // don't do anything if we're not enabled
-        if (!isEnabled(context)) {
-            return;
-        }
-
-        // these come from the PlaybackService when things should get updated
-        if (TextUtils.equals(intent.getAction(), PlaybackService.FORCE_WIDGET_UPDATE)) {
-            startUpdate(context);
-        } else if (TextUtils.equals(intent.getAction(), PlaybackService.STOP_WIDGET_UPDATE)) {
-            stopUpdate(context);
-        }
+        PlayerWidgetJobService.updateWidget(context);
     }
 
     @Override
@@ -41,14 +30,13 @@ public class PlayerWidget extends AppWidgetProvider {
         super.onEnabled(context);
         Log.d(TAG, "Widget enabled");
         setEnabled(context, true);
-        startUpdate(context);
+        PlayerWidgetJobService.updateWidget(context);
     }
 
     @Override
-    public void onUpdate(Context context, AppWidgetManager appWidgetManager,
-                         int[] appWidgetIds) {
+    public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
         Log.d(TAG, "onUpdate() called with: " + "context = [" + context + "], appWidgetManager = [" + appWidgetManager + "], appWidgetIds = [" + Arrays.toString(appWidgetIds) + "]");
-        startUpdate(context);
+        PlayerWidgetJobService.updateWidget(context);
     }
 
     @Override
@@ -56,20 +44,9 @@ public class PlayerWidget extends AppWidgetProvider {
         super.onDisabled(context);
         Log.d(TAG, "Widget disabled");
         setEnabled(context, false);
-        stopUpdate(context);
-    }
-
-    private void startUpdate(Context context) {
-        Log.d(TAG, "startUpdate() called with: " + "context = [" + context + "]");
-        ContextCompat.startForegroundService(context, new Intent(context, PlayerWidgetService.class));
-    }
-
-    private void stopUpdate(Context context) {
-        Log.d(TAG, "stopUpdate() called with: " + "context = [" + context + "]");
-        context.stopService(new Intent(context, PlayerWidgetService.class));
     }
 
-    private boolean isEnabled(Context context) {
+    public static boolean isEnabled(Context context) {
         SharedPreferences prefs = context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
         return prefs.getBoolean(KEY_ENABLED, false);
     }
diff --git a/app/src/main/java/de/danoeh/antennapod/service/PlayerWidgetJobService.java b/app/src/main/java/de/danoeh/antennapod/service/PlayerWidgetJobService.java
new file mode 100644
index 000000000..21e1b299e
--- /dev/null
+++ b/app/src/main/java/de/danoeh/antennapod/service/PlayerWidgetJobService.java
@@ -0,0 +1,182 @@
+package de.danoeh.antennapod.service;
+
+import android.app.PendingIntent;
+import android.appwidget.AppWidgetManager;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.ServiceConnection;
+import android.os.Build;
+import android.os.IBinder;
+import android.support.annotation.NonNull;
+import android.support.v4.app.JobIntentService;
+import android.util.Log;
+import android.view.KeyEvent;
+import android.view.View;
+import android.widget.RemoteViews;
+import de.danoeh.antennapod.R;
+import de.danoeh.antennapod.activity.MainActivity;
+import de.danoeh.antennapod.core.receiver.MediaButtonReceiver;
+import de.danoeh.antennapod.core.service.playback.PlaybackService;
+import de.danoeh.antennapod.core.service.playback.PlayerStatus;
+import de.danoeh.antennapod.core.util.Converter;
+import de.danoeh.antennapod.core.util.playback.Playable;
+import de.danoeh.antennapod.fragment.QueueFragment;
+import de.danoeh.antennapod.receiver.PlayerWidget;
+
+/**
+ * Updates the state of the player widget
+ */
+public class PlayerWidgetJobService extends JobIntentService {
+    private static final String TAG = "PlayerWidgetJobService";
+
+    private PlaybackService playbackService;
+    private final Object waitForService = new Object();
+
+    public PlayerWidgetJobService() {
+    }
+
+    public static void updateWidget(Context context) {
+        enqueueWork(context, PlayerWidgetJobService.class, 0, new Intent(context, PlayerWidgetJobService.class));
+    }
+
+    @Override
+    protected void onHandleWork(@NonNull Intent intent) {
+        if (!PlayerWidget.isEnabled(getApplicationContext())) {
+            return;
+        }
+
+        if (PlaybackService.isRunning && playbackService == null) {
+            synchronized (waitForService) {
+                bindService(new Intent(this, PlaybackService.class), mConnection, 0);
+                while (playbackService == null) {
+                    try {
+                        waitForService.wait();
+                    } catch (InterruptedException e) {
+                        return;
+                    }
+                }
+            }
+        }
+
+        updateViews();
+
+        if (playbackService != null) {
+            try {
+                unbindService(mConnection);
+            } catch (IllegalArgumentException e) {
+                Log.w(TAG, "IllegalArgumentException when trying to unbind service");
+            }
+        }
+    }
+
+    private void updateViews() {
+
+        ComponentName playerWidget = new ComponentName(this, PlayerWidget.class);
+        AppWidgetManager manager = AppWidgetManager.getInstance(this);
+        RemoteViews views = new RemoteViews(getPackageName(), R.layout.player_widget);
+        PendingIntent startMediaplayer = PendingIntent.getActivity(this, 0,
+                PlaybackService.getPlayerActivityIntent(this), 0);
+
+        Intent startApp = new Intent(getBaseContext(), MainActivity.class);
+        startApp.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        startApp.putExtra(MainActivity.EXTRA_FRAGMENT_TAG, QueueFragment.TAG);
+        PendingIntent startAppPending = PendingIntent.getActivity(getBaseContext(), 0, startApp, PendingIntent.FLAG_UPDATE_CURRENT);
+
+        boolean nothingPlaying = false;
+        Playable media;
+        PlayerStatus status;
+        if (playbackService != null) {
+            media = playbackService.getPlayable();
+            status = playbackService.getStatus();
+        } else {
+            media = Playable.PlayableUtils.createInstanceFromPreferences(getApplicationContext());
+            status = PlayerStatus.STOPPED;
+        }
+
+        if (media != null) {
+            views.setOnClickPendingIntent(R.id.layout_left, startMediaplayer);
+
+            views.setTextViewText(R.id.txtvTitle, media.getEpisodeTitle());
+
+            String progressString;
+            if (playbackService != null) {
+                progressString = getProgressString(playbackService.getCurrentPosition(), playbackService.getDuration());
+            } else {
+                progressString = getProgressString(media.getPosition(), media.getDuration());
+            }
+
+            if (progressString != null) {
+                views.setViewVisibility(R.id.txtvProgress, View.VISIBLE);
+                views.setTextViewText(R.id.txtvProgress, progressString);
+            }
+
+            if (status == PlayerStatus.PLAYING) {
+                views.setImageViewResource(R.id.butPlay, R.drawable.ic_pause_white_24dp);
+                if (Build.VERSION.SDK_INT >= 15) {
+                    views.setContentDescription(R.id.butPlay, getString(R.string.pause_label));
+                }
+            } else {
+                views.setImageViewResource(R.id.butPlay, R.drawable.ic_play_arrow_white_24dp);
+                if (Build.VERSION.SDK_INT >= 15) {
+                    views.setContentDescription(R.id.butPlay, getString(R.string.play_label));
+                }
+            }
+            views.setOnClickPendingIntent(R.id.butPlay, createMediaButtonIntent());
+        } else {
+            nothingPlaying = true;
+        }
+
+        if (nothingPlaying) {
+            // start the app if they click anything
+            views.setOnClickPendingIntent(R.id.layout_left, startAppPending);
+            views.setOnClickPendingIntent(R.id.butPlay, startAppPending);
+            views.setViewVisibility(R.id.txtvProgress, View.INVISIBLE);
+            views.setTextViewText(R.id.txtvTitle,
+                    this.getString(R.string.no_media_playing_label));
+            views.setImageViewResource(R.id.butPlay, R.drawable.ic_play_arrow_white_24dp);
+        }
+
+        manager.updateAppWidget(playerWidget, views);
+    }
+
+    /**
+     * Creates an intent which fakes a mediabutton press
+     */
+    private PendingIntent createMediaButtonIntent() {
+        KeyEvent event = new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE);
+        Intent startingIntent = new Intent(getBaseContext(), MediaButtonReceiver.class);
+        startingIntent.setAction(MediaButtonReceiver.NOTIFY_BUTTON_RECEIVER);
+        startingIntent.putExtra(Intent.EXTRA_KEY_EVENT, event);
+
+        return PendingIntent.getBroadcast(this, 0, startingIntent, 0);
+    }
+
+    private String getProgressString(int position, int duration) {
+        if (position > 0 && duration > 0) {
+            return Converter.getDurationStringLong(position) + " / "
+                    + Converter.getDurationStringLong(duration);
+        } else {
+            return null;
+        }
+    }
+
+    private final ServiceConnection mConnection = new ServiceConnection() {
+        public void onServiceConnected(ComponentName className, IBinder service) {
+            Log.d(TAG, "Connection to service established");
+            if (service instanceof PlaybackService.LocalBinder) {
+                synchronized (waitForService) {
+                    playbackService = ((PlaybackService.LocalBinder) service).getService();
+                    waitForService.notifyAll();
+                }
+            }
+        }
+
+        @Override
+        public void onServiceDisconnected(ComponentName name) {
+            playbackService = null;
+            Log.d(TAG, "Disconnected from service");
+        }
+
+    };
+}
diff --git a/app/src/main/java/de/danoeh/antennapod/service/PlayerWidgetService.java b/app/src/main/java/de/danoeh/antennapod/service/PlayerWidgetService.java
deleted file mode 100644
index d5141bd37..000000000
--- a/app/src/main/java/de/danoeh/antennapod/service/PlayerWidgetService.java
+++ /dev/null
@@ -1,244 +0,0 @@
-package de.danoeh.antennapod.service;
-
-import android.app.PendingIntent;
-import android.app.Service;
-import android.appwidget.AppWidgetManager;
-import android.content.ComponentName;
-import android.content.Intent;
-import android.content.ServiceConnection;
-import android.os.Build;
-import android.os.IBinder;
-import android.util.Log;
-import android.view.KeyEvent;
-import android.view.View;
-import android.widget.RemoteViews;
-
-import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.activity.MainActivity;
-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.receiver.MediaButtonReceiver;
-import de.danoeh.antennapod.core.service.playback.PlaybackService;
-import de.danoeh.antennapod.core.service.playback.PlayerStatus;
-import de.danoeh.antennapod.core.storage.DBWriter;
-import de.danoeh.antennapod.core.util.Converter;
-import de.danoeh.antennapod.core.util.playback.Playable;
-import de.danoeh.antennapod.fragment.QueueFragment;
-import de.danoeh.antennapod.receiver.PlayerWidget;
-
-/**
- * Updates the state of the player widget
- */
-public class PlayerWidgetService extends Service {
-    private static final String TAG = "PlayerWidgetService";
-
-    private PlaybackService playbackService;
-
-    /**
-     * Controls write access to playbackservice reference
-     */
-    private final Object psLock = new Object();
-
-    /**
-     * True while service is updating the widget
-     */
-    private volatile boolean isUpdating;
-
-    public PlayerWidgetService() {
-    }
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        Log.d(TAG, "Service created");
-        isUpdating = false;
-    }
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        Log.d(TAG, "Service is about to be destroyed");
-        if (playbackService != null) {
-            Playable playable = playbackService.getPlayable();
-            if (playable != null && playable instanceof FeedMedia) {
-                FeedMedia media = (FeedMedia) playable;
-                if (media.hasAlmostEnded()) {
-                    Log.d(TAG, "smart mark as read");
-                    FeedItem item = media.getItem();
-                    DBWriter.markItemPlayed(item, FeedItem.PLAYED, false);
-                    DBWriter.removeQueueItem(this, item, false);
-                    DBWriter.addItemToPlaybackHistory(media);
-                    if (item.getFeed().getPreferences().getCurrentAutoDelete() &&
-                            (!item.isTagged(FeedItem.TAG_FAVORITE) || !UserPreferences.shouldFavoriteKeepEpisode())) {
-                        Log.d(TAG, "Delete " + media.toString());
-                        DBWriter.deleteFeedMediaOfItem(this, media.getId());
-                    }
-                }
-            }
-        }
-
-        try {
-            unbindService(mConnection);
-        } catch (IllegalArgumentException e) {
-            Log.w(TAG, "IllegalArgumentException when trying to unbind service");
-        }
-    }
-
-    @Override
-    public IBinder onBind(Intent intent) {
-        return null;
-    }
-
-    @Override
-    public int onStartCommand(Intent intent, int flags, int startId) {
-        if (!isUpdating) {
-            if (playbackService == null && PlaybackService.isRunning) {
-                bindService(new Intent(this, PlaybackService.class),
-                        mConnection, 0);
-            } else {
-                startViewUpdaterIfNotRunning();
-            }
-        } else {
-            Log.d(TAG, "Service was called while updating. Ignoring update request");
-        }
-        return Service.START_NOT_STICKY;
-    }
-
-    private void updateViews() {
-        isUpdating = true;
-
-        ComponentName playerWidget = new ComponentName(this, PlayerWidget.class);
-        AppWidgetManager manager = AppWidgetManager.getInstance(this);
-        RemoteViews views = new RemoteViews(getPackageName(),
-                R.layout.player_widget);
-        PendingIntent startMediaplayer = PendingIntent.getActivity(this, 0,
-                PlaybackService.getPlayerActivityIntent(this), 0);
-
-        Intent startApp = new Intent(getBaseContext(), MainActivity.class);
-        startApp.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        startApp.putExtra(MainActivity.EXTRA_FRAGMENT_TAG, QueueFragment.TAG);
-        PendingIntent startAppPending = PendingIntent.getActivity(getBaseContext(), 0, startApp, PendingIntent.FLAG_UPDATE_CURRENT);
-
-        boolean nothingPlaying = false;
-        if (playbackService != null) {
-            final Playable media = playbackService.getPlayable();
-            if (media != null) {
-                PlayerStatus status = playbackService.getStatus();
-                views.setOnClickPendingIntent(R.id.layout_left, startMediaplayer);
-
-                views.setTextViewText(R.id.txtvTitle, media.getEpisodeTitle());
-
-                String progressString = getProgressString();
-                if (progressString != null) {
-                    views.setViewVisibility(R.id.txtvProgress, View.VISIBLE);
-                    views.setTextViewText(R.id.txtvProgress, progressString);
-                }
-
-                if (status == PlayerStatus.PLAYING) {
-                    views.setImageViewResource(R.id.butPlay, R.drawable.ic_pause_white_24dp);
-                    if (Build.VERSION.SDK_INT >= 15) {
-                        views.setContentDescription(R.id.butPlay, getString(R.string.pause_label));
-                    }
-                } else {
-                    views.setImageViewResource(R.id.butPlay, R.drawable.ic_play_arrow_white_24dp);
-                    if (Build.VERSION.SDK_INT >= 15) {
-                        views.setContentDescription(R.id.butPlay, getString(R.string.play_label));
-                    }
-                }
-                views.setOnClickPendingIntent(R.id.butPlay,
-                        createMediaButtonIntent());
-            } else {
-                nothingPlaying = true;
-            }
-        } else {
-            nothingPlaying = true;
-        }
-
-        if (nothingPlaying) {
-            // start the app if they click anything
-            views.setOnClickPendingIntent(R.id.layout_left, startAppPending);
-            views.setOnClickPendingIntent(R.id.butPlay, startAppPending);
-            views.setViewVisibility(R.id.txtvProgress, View.INVISIBLE);
-            views.setTextViewText(R.id.txtvTitle,
-                    this.getString(R.string.no_media_playing_label));
-            views.setImageViewResource(R.id.butPlay, R.drawable.ic_play_arrow_white_24dp);
-        }
-
-        manager.updateAppWidget(playerWidget, views);
-        isUpdating = false;
-    }
-
-    /**
-     * Creates an intent which fakes a mediabutton press
-     */
-    private PendingIntent createMediaButtonIntent() {
-        KeyEvent event = new KeyEvent(KeyEvent.ACTION_DOWN,
-                KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE);
-        Intent startingIntent = new Intent(
-                MediaButtonReceiver.NOTIFY_BUTTON_RECEIVER);
-        startingIntent.putExtra(Intent.EXTRA_KEY_EVENT, event);
-
-        return PendingIntent.getBroadcast(this, 0, startingIntent, 0);
-    }
-
-    private String getProgressString() {
-        int position = playbackService.getCurrentPosition();
-        int duration = playbackService.getDuration();
-        if (position > 0 && duration > 0) {
-            return Converter.getDurationStringLong(position) + " / "
-                    + Converter.getDurationStringLong(duration);
-        } else {
-            return null;
-        }
-    }
-
-    private final ServiceConnection mConnection = new ServiceConnection() {
-        public void onServiceConnected(ComponentName className, IBinder service) {
-            Log.d(TAG, "Connection to service established");
-            synchronized (psLock) {
-                if(service instanceof PlaybackService.LocalBinder) {
-                    playbackService = ((PlaybackService.LocalBinder) service).getService();
-                    startViewUpdaterIfNotRunning();
-                }
-            }
-        }
-
-        @Override
-        public void onServiceDisconnected(ComponentName name) {
-            synchronized (psLock) {
-                playbackService = null;
-                Log.d(TAG, "Disconnected from service");
-            }
-        }
-
-    };
-
-    private void startViewUpdaterIfNotRunning() {
-        if (!isUpdating) {
-            ViewUpdater updateThread = new ViewUpdater(this);
-            updateThread.start();
-        }
-    }
-
-    class ViewUpdater extends Thread {
-        private static final String THREAD_NAME = "ViewUpdater";
-        private final PlayerWidgetService service;
-
-        public ViewUpdater(PlayerWidgetService service) {
-            super();
-            setName(THREAD_NAME);
-            this.service = service;
-
-        }
-
-        @Override
-        public void run() {
-            synchronized (psLock) {
-                service.updateViews();
-            }
-        }
-
-    }
-
-}
-- 
cgit v1.2.3


From 7107819a6aa61c6f171e43fe582133302d5f260b Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Sat, 5 May 2018 14:04:12 +0200
Subject: Moved widget from app to core

---
 .../danoeh/antennapod/receiver/PlayerWidget.java   |  58 -------
 .../antennapod/service/PlayerWidgetJobService.java | 182 ---------------------
 2 files changed, 240 deletions(-)
 delete mode 100644 app/src/main/java/de/danoeh/antennapod/receiver/PlayerWidget.java
 delete mode 100644 app/src/main/java/de/danoeh/antennapod/service/PlayerWidgetJobService.java

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/receiver/PlayerWidget.java b/app/src/main/java/de/danoeh/antennapod/receiver/PlayerWidget.java
deleted file mode 100644
index c50160934..000000000
--- a/app/src/main/java/de/danoeh/antennapod/receiver/PlayerWidget.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package de.danoeh.antennapod.receiver;
-
-import android.appwidget.AppWidgetManager;
-import android.appwidget.AppWidgetProvider;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.text.TextUtils;
-import android.util.Log;
-
-import java.util.Arrays;
-
-import de.danoeh.antennapod.core.service.playback.PlaybackService;
-import de.danoeh.antennapod.service.PlayerWidgetJobService;
-
-public class PlayerWidget extends AppWidgetProvider {
-    private static final String TAG = "PlayerWidget";
-    private static final String PREFS_NAME = "PlayerWidgetPrefs";
-    private static final String KEY_ENABLED = "WidgetEnabled";
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        Log.d(TAG, "onReceive");
-        super.onReceive(context, intent);
-        PlayerWidgetJobService.updateWidget(context);
-    }
-
-    @Override
-    public void onEnabled(Context context) {
-        super.onEnabled(context);
-        Log.d(TAG, "Widget enabled");
-        setEnabled(context, true);
-        PlayerWidgetJobService.updateWidget(context);
-    }
-
-    @Override
-    public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
-        Log.d(TAG, "onUpdate() called with: " + "context = [" + context + "], appWidgetManager = [" + appWidgetManager + "], appWidgetIds = [" + Arrays.toString(appWidgetIds) + "]");
-        PlayerWidgetJobService.updateWidget(context);
-    }
-
-    @Override
-    public void onDisabled(Context context) {
-        super.onDisabled(context);
-        Log.d(TAG, "Widget disabled");
-        setEnabled(context, false);
-    }
-
-    public static boolean isEnabled(Context context) {
-        SharedPreferences prefs = context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
-        return prefs.getBoolean(KEY_ENABLED, false);
-    }
-
-    private void setEnabled(Context context, boolean enabled) {
-        SharedPreferences prefs = context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
-        prefs.edit().putBoolean(KEY_ENABLED, enabled).apply();
-    }
-}
diff --git a/app/src/main/java/de/danoeh/antennapod/service/PlayerWidgetJobService.java b/app/src/main/java/de/danoeh/antennapod/service/PlayerWidgetJobService.java
deleted file mode 100644
index 21e1b299e..000000000
--- a/app/src/main/java/de/danoeh/antennapod/service/PlayerWidgetJobService.java
+++ /dev/null
@@ -1,182 +0,0 @@
-package de.danoeh.antennapod.service;
-
-import android.app.PendingIntent;
-import android.appwidget.AppWidgetManager;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.ServiceConnection;
-import android.os.Build;
-import android.os.IBinder;
-import android.support.annotation.NonNull;
-import android.support.v4.app.JobIntentService;
-import android.util.Log;
-import android.view.KeyEvent;
-import android.view.View;
-import android.widget.RemoteViews;
-import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.activity.MainActivity;
-import de.danoeh.antennapod.core.receiver.MediaButtonReceiver;
-import de.danoeh.antennapod.core.service.playback.PlaybackService;
-import de.danoeh.antennapod.core.service.playback.PlayerStatus;
-import de.danoeh.antennapod.core.util.Converter;
-import de.danoeh.antennapod.core.util.playback.Playable;
-import de.danoeh.antennapod.fragment.QueueFragment;
-import de.danoeh.antennapod.receiver.PlayerWidget;
-
-/**
- * Updates the state of the player widget
- */
-public class PlayerWidgetJobService extends JobIntentService {
-    private static final String TAG = "PlayerWidgetJobService";
-
-    private PlaybackService playbackService;
-    private final Object waitForService = new Object();
-
-    public PlayerWidgetJobService() {
-    }
-
-    public static void updateWidget(Context context) {
-        enqueueWork(context, PlayerWidgetJobService.class, 0, new Intent(context, PlayerWidgetJobService.class));
-    }
-
-    @Override
-    protected void onHandleWork(@NonNull Intent intent) {
-        if (!PlayerWidget.isEnabled(getApplicationContext())) {
-            return;
-        }
-
-        if (PlaybackService.isRunning && playbackService == null) {
-            synchronized (waitForService) {
-                bindService(new Intent(this, PlaybackService.class), mConnection, 0);
-                while (playbackService == null) {
-                    try {
-                        waitForService.wait();
-                    } catch (InterruptedException e) {
-                        return;
-                    }
-                }
-            }
-        }
-
-        updateViews();
-
-        if (playbackService != null) {
-            try {
-                unbindService(mConnection);
-            } catch (IllegalArgumentException e) {
-                Log.w(TAG, "IllegalArgumentException when trying to unbind service");
-            }
-        }
-    }
-
-    private void updateViews() {
-
-        ComponentName playerWidget = new ComponentName(this, PlayerWidget.class);
-        AppWidgetManager manager = AppWidgetManager.getInstance(this);
-        RemoteViews views = new RemoteViews(getPackageName(), R.layout.player_widget);
-        PendingIntent startMediaplayer = PendingIntent.getActivity(this, 0,
-                PlaybackService.getPlayerActivityIntent(this), 0);
-
-        Intent startApp = new Intent(getBaseContext(), MainActivity.class);
-        startApp.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        startApp.putExtra(MainActivity.EXTRA_FRAGMENT_TAG, QueueFragment.TAG);
-        PendingIntent startAppPending = PendingIntent.getActivity(getBaseContext(), 0, startApp, PendingIntent.FLAG_UPDATE_CURRENT);
-
-        boolean nothingPlaying = false;
-        Playable media;
-        PlayerStatus status;
-        if (playbackService != null) {
-            media = playbackService.getPlayable();
-            status = playbackService.getStatus();
-        } else {
-            media = Playable.PlayableUtils.createInstanceFromPreferences(getApplicationContext());
-            status = PlayerStatus.STOPPED;
-        }
-
-        if (media != null) {
-            views.setOnClickPendingIntent(R.id.layout_left, startMediaplayer);
-
-            views.setTextViewText(R.id.txtvTitle, media.getEpisodeTitle());
-
-            String progressString;
-            if (playbackService != null) {
-                progressString = getProgressString(playbackService.getCurrentPosition(), playbackService.getDuration());
-            } else {
-                progressString = getProgressString(media.getPosition(), media.getDuration());
-            }
-
-            if (progressString != null) {
-                views.setViewVisibility(R.id.txtvProgress, View.VISIBLE);
-                views.setTextViewText(R.id.txtvProgress, progressString);
-            }
-
-            if (status == PlayerStatus.PLAYING) {
-                views.setImageViewResource(R.id.butPlay, R.drawable.ic_pause_white_24dp);
-                if (Build.VERSION.SDK_INT >= 15) {
-                    views.setContentDescription(R.id.butPlay, getString(R.string.pause_label));
-                }
-            } else {
-                views.setImageViewResource(R.id.butPlay, R.drawable.ic_play_arrow_white_24dp);
-                if (Build.VERSION.SDK_INT >= 15) {
-                    views.setContentDescription(R.id.butPlay, getString(R.string.play_label));
-                }
-            }
-            views.setOnClickPendingIntent(R.id.butPlay, createMediaButtonIntent());
-        } else {
-            nothingPlaying = true;
-        }
-
-        if (nothingPlaying) {
-            // start the app if they click anything
-            views.setOnClickPendingIntent(R.id.layout_left, startAppPending);
-            views.setOnClickPendingIntent(R.id.butPlay, startAppPending);
-            views.setViewVisibility(R.id.txtvProgress, View.INVISIBLE);
-            views.setTextViewText(R.id.txtvTitle,
-                    this.getString(R.string.no_media_playing_label));
-            views.setImageViewResource(R.id.butPlay, R.drawable.ic_play_arrow_white_24dp);
-        }
-
-        manager.updateAppWidget(playerWidget, views);
-    }
-
-    /**
-     * Creates an intent which fakes a mediabutton press
-     */
-    private PendingIntent createMediaButtonIntent() {
-        KeyEvent event = new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE);
-        Intent startingIntent = new Intent(getBaseContext(), MediaButtonReceiver.class);
-        startingIntent.setAction(MediaButtonReceiver.NOTIFY_BUTTON_RECEIVER);
-        startingIntent.putExtra(Intent.EXTRA_KEY_EVENT, event);
-
-        return PendingIntent.getBroadcast(this, 0, startingIntent, 0);
-    }
-
-    private String getProgressString(int position, int duration) {
-        if (position > 0 && duration > 0) {
-            return Converter.getDurationStringLong(position) + " / "
-                    + Converter.getDurationStringLong(duration);
-        } else {
-            return null;
-        }
-    }
-
-    private final ServiceConnection mConnection = new ServiceConnection() {
-        public void onServiceConnected(ComponentName className, IBinder service) {
-            Log.d(TAG, "Connection to service established");
-            if (service instanceof PlaybackService.LocalBinder) {
-                synchronized (waitForService) {
-                    playbackService = ((PlaybackService.LocalBinder) service).getService();
-                    waitForService.notifyAll();
-                }
-            }
-        }
-
-        @Override
-        public void onServiceDisconnected(ComponentName name) {
-            playbackService = null;
-            Log.d(TAG, "Disconnected from service");
-        }
-
-    };
-}
-- 
cgit v1.2.3


From 1628360c4b4aa0d3c5d3a119b9bd51908f490249 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Sat, 5 May 2018 11:27:16 +0200
Subject: Prevent deletion of currently playing item

Was already prevented in the download list but not on the details fragment.
Added alpha to make disabled state clear.

Closes #2285
---
 .../antennapod/adapter/DownloadedEpisodesListAdapter.java      |  2 ++
 .../main/java/de/danoeh/antennapod/fragment/ItemFragment.java  | 10 ++++++++++
 2 files changed, 12 insertions(+)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java
index c62c30c90..c4f476634 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java
@@ -100,8 +100,10 @@ public class DownloadedEpisodesListAdapter extends BaseAdapter {
         FeedItem.State state = item.getState();
         if (state == FeedItem.State.PLAYING) {
             holder.butSecondary.setEnabled(false);
+            holder.butSecondary.setAlpha(0.5f);
         } else {
             holder.butSecondary.setEnabled(true);
+            holder.butSecondary.setAlpha(1.0f);
         }
         holder.butSecondary.setFocusable(false);
         holder.butSecondary.setTag(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 2d11e9f71..2aa97977e 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
@@ -432,6 +432,16 @@ public class ItemFragment extends Fragment implements OnSwipeGesture {
                 butAction1Text = R.string.download_label;
             }
         }
+
+        FeedItem.State state = item.getState();
+        if (butAction2Text == R.string.delete_label && state == FeedItem.State.PLAYING) {
+            butAction2.setEnabled(false);
+            butAction2.setAlpha(0.5f);
+        } else {
+            butAction2.setEnabled(true);
+            butAction2.setAlpha(1.0f);
+        }
+
         if(butAction1Icon != null && butAction1Text != 0) {
             butAction1.setText(butAction1Icon +"\u0020\u0020" + getActivity().getString(butAction1Text));
             Iconify.addIcons(butAction1);
-- 
cgit v1.2.3


From 221ca84aaf17360ba2604f7699832580ca3caf2f Mon Sep 17 00:00:00 2001
From: orionlee <orionlee@yahoo.com>
Date: Sat, 5 May 2018 13:45:23 -0700
Subject: Remove comments per @mfietz feedback.

---
 .../java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java   | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java
index 6897cc676..d032e82fa 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java
@@ -300,9 +300,6 @@ public class AllEpisodesRecycleAdapter extends RecyclerView.Adapter<AllEpisodesR
             };
             FeedItemMenuHandler.onPrepareMenu(contextMenuInterface, item, true, null);
 
-            // Currently, Mark as seen only available on Episodes screen.
-            // Hence it is not added to the more generic FeedItemMenuHandler.onPrepareMenu
-            // see AllEpisodesFragment for the actual logic
             contextMenuInterface.setItemVisibility(R.id.mark_as_seen_item, item.isNew());
         }
 
-- 
cgit v1.2.3


From ce1f0620fec7edb96cb08b46a3713a12263e5c48 Mon Sep 17 00:00:00 2001
From: ydinath <ydinath@gmail.com>
Date: Sat, 5 May 2018 17:35:43 -0400
Subject: Fix back press issue

---
 .../main/java/de/danoeh/antennapod/activity/AboutActivity.java   | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java
index 6715ecf97..b3418e7b2 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java
@@ -36,7 +36,6 @@ public class AboutActivity extends AppCompatActivity {
     private WebView webView;
     private LinearLayout webViewContainer;
     private Subscription subscription;
-    private int depth = 0;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -57,7 +56,6 @@ public class AboutActivity extends AppCompatActivity {
 
             @Override
             public boolean shouldOverrideUrlLoading(WebView view, String url) {
-                depth++;
                 if (!url.startsWith("http")) {
                     url = url.replace("file:///android_asset/", "");
                     loadAsset(url);
@@ -101,8 +99,6 @@ public class AboutActivity extends AppCompatActivity {
                             "    </style>" +
                             "</head><body><p>" + webViewData + "</p></body></html>";
                     webViewData = webViewData.replace("\n", "<br/>");
-                } else {
-                    depth = 0;
                 }
                 webViewData = String.format(webViewData, colorString);
                 subscriber.onSuccess(webViewData);
@@ -117,16 +113,15 @@ public class AboutActivity extends AppCompatActivity {
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(
                         webViewData ->
-                                webView.loadDataWithBaseURL("file:///android_asset/", webViewData.toString(), "text/html", "utf-8", "about:blank"),
+                                webView.loadDataWithBaseURL("file:///android_asset/", webViewData.toString(), "text/html", "utf-8", "file:///android_asset/" + webViewData.toString()),
                         error -> Log.e(TAG, Log.getStackTraceString(error))
                 );
     }
 
     @Override
     public void onBackPressed() {
-        if (depth != 0) {
+        if (webView.canGoBack()) {
             webView.goBack();
-            depth--;
         } else {
             super.onBackPressed();
         }
-- 
cgit v1.2.3


From 274230ad25cccb9f55305870a82f3ab4e02e7d63 Mon Sep 17 00:00:00 2001
From: ydinath <ydinath@gmail.com>
Date: Sat, 5 May 2018 18:07:51 -0400
Subject: Use filename instead

---
 app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java
index b3418e7b2..4d9b50073 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java
@@ -113,7 +113,7 @@ public class AboutActivity extends AppCompatActivity {
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(
                         webViewData ->
-                                webView.loadDataWithBaseURL("file:///android_asset/", webViewData.toString(), "text/html", "utf-8", "file:///android_asset/" + webViewData.toString()),
+                                webView.loadDataWithBaseURL("file:///android_asset/", webViewData.toString(), "text/html", "utf-8", "file:///android_asset/" + filename.toString()),
                         error -> Log.e(TAG, Log.getStackTraceString(error))
                 );
     }
-- 
cgit v1.2.3


From 61f8000352d80eef4687a66e0d6174637469adc2 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Sun, 6 May 2018 18:52:16 +0200
Subject: Using callback instead of sync/async methods

---
 .../main/java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java    | 2 +-
 app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java
index f3846c8a4..209d5bca8 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java
@@ -224,7 +224,7 @@ public class AllEpisodesFragment extends Fragment {
                 case R.id.refresh_item:
                     List<Feed> feeds = ((MainActivity) getActivity()).getFeeds();
                     if (feeds != null) {
-                        DBTasks.refreshAllFeeds(getActivity(), feeds);
+                        DBTasks.refreshAllFeeds(getActivity(), feeds, null);
                     }
                     return true;
                 case R.id.mark_all_read_item:
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
index 85abdd281..349b4bd8f 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
@@ -285,7 +285,7 @@ public class QueueFragment extends Fragment {
                 case R.id.refresh_item:
                     List<Feed> feeds = ((MainActivity) getActivity()).getFeeds();
                     if (feeds != null) {
-                        DBTasks.refreshAllFeeds(getActivity(), feeds);
+                        DBTasks.refreshAllFeeds(getActivity(), feeds, null);
                     }
                     return true;
                 case R.id.clear_queue:
-- 
cgit v1.2.3


From cb70aeb3cfe1cdf81937ee98c79cee324024048a Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Sun, 6 May 2018 19:15:40 +0200
Subject: Code style improvements

---
 .../antennapod/activity/MediaplayerActivity.java   | 11 +++--
 .../adapter/DefaultActionButtonCallback.java       |  8 ++--
 .../fragment/ExternalPlayerFragment.java           | 52 +++++++++++-----------
 3 files changed, 34 insertions(+), 37 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
index de65ca406..701f9b79a 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
@@ -619,12 +619,11 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements
 
     public void onEventMainThread(ServiceEvent event) {
         Log.d(TAG, "onEvent(" + event + ")");
-        switch(event.action) {
-            case SERVICE_STARTED:
-                if (controller != null) {
-                    controller.init();
-                }
-                break;
+        if (event.action == ServiceEvent.Action.SERVICE_STARTED) {
+            if (controller != null) {
+                controller.init();
+            }
+
         }
     }
 
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 3f8f871c2..a531c86ed 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/DefaultActionButtonCallback.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/DefaultActionButtonCallback.java
@@ -80,15 +80,13 @@ public class DefaultActionButtonCallback implements ActionButtonCallback {
                     Toast.makeText(context, R.string.download_canceled_msg, Toast.LENGTH_LONG).show();
                 }
             } else { // media is downloaded
-                if (item.hasMedia() && item.getMedia().isCurrentlyPlaying()) {
+                if (media.isCurrentlyPlaying()) {
                     PlaybackService.startIfNotRunning(context, media, true, false);
                     context.sendBroadcast(new Intent(PlaybackService.ACTION_PAUSE_PLAY_CURRENT_EPISODE));
-                }
-                else if (item.hasMedia() && item.getMedia().isCurrentlyPaused()) {
+                } else if (media.isCurrentlyPaused()) {
                     PlaybackService.startIfNotRunning(context, media, true, false);
                     context.sendBroadcast(new Intent(PlaybackService.ACTION_RESUME_PLAY_CURRENT_EPISODE));
-                }
-                else {
+                } else {
                     DBTasks.playMedia(context, media, false, true, false);
                 }
             }
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
index 27df29f9f..b072aeaf2 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
@@ -168,35 +168,35 @@ public class ExternalPlayerFragment extends Fragment {
 
     private boolean loadMediaInfo() {
         Log.d(TAG, "Loading media info");
-        if (controller != null) {
-            Playable media = controller.getMedia();
-            if (media != null) {
-                txtvTitle.setText(media.getEpisodeTitle());
-                mFeedName.setText(media.getFeedTitle());
-                onPositionObserverUpdate();
-
-                Glide.with(getActivity())
-                        .load(media.getImageLocation())
-                        .placeholder(R.color.light_gray)
-                        .error(R.color.light_gray)
-                        .diskCacheStrategy(ApGlideSettings.AP_DISK_CACHE_STRATEGY)
-                        .fitCenter()
-                        .dontAnimate()
-                        .into(imgvCover);
-
-                fragmentLayout.setVisibility(View.VISIBLE);
-                if (controller.isPlayingVideoLocally()) {
-                    butPlay.setVisibility(View.GONE);
-                } else {
-                    butPlay.setVisibility(View.VISIBLE);
-                }
-                return true;
+        if (controller == null) {
+            Log.w(TAG, "loadMediaInfo was called while PlaybackController was null!");
+            return false;
+        }
+
+        Playable media = controller.getMedia();
+        if (media != null) {
+            txtvTitle.setText(media.getEpisodeTitle());
+            mFeedName.setText(media.getFeedTitle());
+            onPositionObserverUpdate();
+
+            Glide.with(getActivity())
+                    .load(media.getImageLocation())
+                    .placeholder(R.color.light_gray)
+                    .error(R.color.light_gray)
+                    .diskCacheStrategy(ApGlideSettings.AP_DISK_CACHE_STRATEGY)
+                    .fitCenter()
+                    .dontAnimate()
+                    .into(imgvCover);
+
+            fragmentLayout.setVisibility(View.VISIBLE);
+            if (controller.isPlayingVideoLocally()) {
+                butPlay.setVisibility(View.GONE);
             } else {
-                Log.w(TAG,  "loadMediaInfo was called while the media object of playbackService was null!");
-                return false;
+                butPlay.setVisibility(View.VISIBLE);
             }
+            return true;
         } else {
-            Log.w(TAG, "loadMediaInfo was called while playbackService was null!");
+            Log.w(TAG,  "loadMediaInfo was called while the media object of playbackService was null!");
             return false;
         }
     }
-- 
cgit v1.2.3


From f6082f58088d79a8b46556fc68c7bbbf30008c82 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Sun, 6 May 2018 19:44:07 +0200
Subject: Using builder to call PlaybackService

---
 .../danoeh/antennapod/activity/AudioplayerActivity.java | 17 ++++++++---------
 .../danoeh/antennapod/activity/VideoplayerActivity.java | 16 +++++++---------
 .../antennapod/adapter/DefaultActionButtonCallback.java | 11 +++++++++--
 .../de/danoeh/antennapod/fragment/ItemFragment.java     |  1 -
 4 files changed, 24 insertions(+), 21 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java
index 3ddf3ed74..207aec20f 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java
@@ -1,7 +1,6 @@
 package de.danoeh.antennapod.activity;
 
 import android.content.Intent;
-import android.support.v4.content.ContextCompat;
 import android.support.v4.view.ViewCompat;
 import android.text.TextUtils;
 import android.util.Log;
@@ -14,6 +13,7 @@ import de.danoeh.antennapod.core.feed.MediaType;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.core.service.playback.PlaybackService;
 import de.danoeh.antennapod.core.util.playback.ExternalMedia;
+import de.danoeh.antennapod.core.util.playback.PlaybackServiceStarter;
 import de.danoeh.antennapod.dialog.VariableSpeedDialog;
 
 /**
@@ -35,14 +35,13 @@ public class AudioplayerActivity extends MediaplayerInfoActivity {
             Log.d(TAG, "Received VIEW intent: " + intent.getData().getPath());
             ExternalMedia media = new ExternalMedia(intent.getData().getPath(),
                     MediaType.AUDIO);
-            Intent launchIntent = new Intent(this, PlaybackService.class);
-            launchIntent.putExtra(PlaybackService.EXTRA_PLAYABLE, media);
-            launchIntent.putExtra(PlaybackService.EXTRA_START_WHEN_PREPARED,
-                    true);
-            launchIntent.putExtra(PlaybackService.EXTRA_SHOULD_STREAM, false);
-            launchIntent.putExtra(PlaybackService.EXTRA_PREPARE_IMMEDIATELY,
-                    true);
-            ContextCompat.startForegroundService(this, launchIntent);
+
+            new PlaybackServiceStarter(this, media)
+                    .startWhenPrepared(true)
+                    .shouldStream(false)
+                    .prepareImmediately(true)
+                    .start();
+
         } else if (PlaybackService.isCasting()) {
             Intent intent = PlaybackService.getPlayerActivityIntent(this);
             if (intent.getComponent() != null &&
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
index efa91d786..c8fb12abc 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
@@ -6,7 +6,6 @@ import android.graphics.drawable.ColorDrawable;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.v4.content.ContextCompat;
 import android.support.v4.view.WindowCompat;
 import android.support.v7.app.ActionBar;
 import android.util.Log;
@@ -31,6 +30,7 @@ import de.danoeh.antennapod.core.service.playback.PlayerStatus;
 import de.danoeh.antennapod.core.util.gui.PictureInPictureUtil;
 import de.danoeh.antennapod.core.util.playback.ExternalMedia;
 import de.danoeh.antennapod.core.util.playback.Playable;
+import de.danoeh.antennapod.core.util.playback.PlaybackServiceStarter;
 import de.danoeh.antennapod.view.AspectRatioVideoView;
 
 import java.lang.ref.WeakReference;
@@ -83,14 +83,12 @@ public class VideoplayerActivity extends MediaplayerActivity {
             Log.d(TAG, "Received VIEW intent: " + intent.getData().getPath());
             ExternalMedia media = new ExternalMedia(intent.getData().getPath(),
                     MediaType.VIDEO);
-            Intent launchIntent = new Intent(this, PlaybackService.class);
-            launchIntent.putExtra(PlaybackService.EXTRA_PLAYABLE, media);
-            launchIntent.putExtra(PlaybackService.EXTRA_START_WHEN_PREPARED,
-                    true);
-            launchIntent.putExtra(PlaybackService.EXTRA_SHOULD_STREAM, false);
-            launchIntent.putExtra(PlaybackService.EXTRA_PREPARE_IMMEDIATELY,
-                    true);
-            ContextCompat.startForegroundService(this, launchIntent);
+
+            new PlaybackServiceStarter(this, media)
+                    .startWhenPrepared(true)
+                    .shouldStream(false)
+                    .prepareImmediately(true)
+                    .start();
         } else if (PlaybackService.isCasting()) {
             Intent intent = PlaybackService.getPlayerActivityIntent(this);
             if (!intent.getComponent().getClassName().equals(VideoplayerActivity.class.getName())) {
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 a531c86ed..54afde1c7 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/DefaultActionButtonCallback.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/DefaultActionButtonCallback.java
@@ -6,6 +6,7 @@ import android.widget.Toast;
 
 import com.afollestad.materialdialogs.MaterialDialog;
 
+import de.danoeh.antennapod.core.util.playback.PlaybackServiceStarter;
 import org.apache.commons.lang3.Validate;
 
 import de.danoeh.antennapod.R;
@@ -81,10 +82,16 @@ public class DefaultActionButtonCallback implements ActionButtonCallback {
                 }
             } else { // media is downloaded
                 if (media.isCurrentlyPlaying()) {
-                    PlaybackService.startIfNotRunning(context, media, true, false);
+                    new PlaybackServiceStarter(context, media)
+                            .startWhenPrepared(false)
+                            .shouldStream(false)
+                            .start();
                     context.sendBroadcast(new Intent(PlaybackService.ACTION_PAUSE_PLAY_CURRENT_EPISODE));
                 } else if (media.isCurrentlyPaused()) {
-                    PlaybackService.startIfNotRunning(context, media, true, false);
+                    new PlaybackServiceStarter(context, media)
+                            .startWhenPrepared(false)
+                            .shouldStream(false)
+                            .start();
                     context.sendBroadcast(new Intent(PlaybackService.ACTION_RESUME_PLAY_CURRENT_EPISODE));
                 } else {
                     DBTasks.playMedia(context, media, false, true, false);
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 5088d71a6..63727a1f4 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
@@ -244,7 +244,6 @@ public class ItemFragment extends Fragment implements OnSwipeGesture {
             if (item.hasMedia()) {
                 FeedMedia media = item.getMedia();
                 if (!media.isDownloaded()) {
-                    PlaybackService.startIfNotRunning(getActivity(), media, true, false);
                     DBTasks.playMedia(getActivity(), media, true, true, true);
                     ((MainActivity) getActivity()).dismissChildFragment();
                 } else {
-- 
cgit v1.2.3


From 4787e2ecc97c8da89af27f6db943e69c90484518 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Sun, 6 May 2018 20:07:35 +0200
Subject: Fixed starting with DefaultActionButtonCallback

---
 .../de/danoeh/antennapod/adapter/DefaultActionButtonCallback.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/src/main/java/de')

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 54afde1c7..d8f324e8a 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/DefaultActionButtonCallback.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/DefaultActionButtonCallback.java
@@ -83,13 +83,13 @@ public class DefaultActionButtonCallback implements ActionButtonCallback {
             } else { // media is downloaded
                 if (media.isCurrentlyPlaying()) {
                     new PlaybackServiceStarter(context, media)
-                            .startWhenPrepared(false)
+                            .startWhenPrepared(true)
                             .shouldStream(false)
                             .start();
                     context.sendBroadcast(new Intent(PlaybackService.ACTION_PAUSE_PLAY_CURRENT_EPISODE));
                 } else if (media.isCurrentlyPaused()) {
                     new PlaybackServiceStarter(context, media)
-                            .startWhenPrepared(false)
+                            .startWhenPrepared(true)
                             .shouldStream(false)
                             .start();
                     context.sendBroadcast(new Intent(PlaybackService.ACTION_RESUME_PLAY_CURRENT_EPISODE));
-- 
cgit v1.2.3


From f8950ae9b8e4b5528ed9cbca2f6639540f11e800 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Sun, 6 May 2018 23:46:45 +0200
Subject: Add search function to preferences

---
 .../antennapod/activity/PreferenceActivity.java    | 31 +++++++++++++++++++---
 .../preferences/PreferenceController.java          | 24 ++++++++++++++++-
 2 files changed, 50 insertions(+), 5 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java
index 34c68084f..3f005fe36 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java
@@ -14,6 +14,9 @@ import android.widget.FrameLayout;
 
 import java.lang.ref.WeakReference;
 
+import com.bytehamster.lib.preferencesearch.SearchPreference;
+import com.bytehamster.lib.preferencesearch.SearchPreferenceResult;
+import com.bytehamster.lib.preferencesearch.SearchPreferenceResultListener;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.preferences.PreferenceController;
@@ -22,7 +25,7 @@ import de.danoeh.antennapod.preferences.PreferenceController;
  * PreferenceActivity for API 11+. In order to change the behavior of the preference UI, see
  * PreferenceController.
  */
-public class PreferenceActivity extends AppCompatActivity {
+public class PreferenceActivity extends AppCompatActivity implements SearchPreferenceResultListener {
 
     public static final String PARAM_RESOURCE = "resource";
     private static WeakReference<PreferenceActivity> instance;
@@ -35,6 +38,11 @@ public class PreferenceActivity extends AppCompatActivity {
             this.fragment = fragment;
         }
 
+        @Override
+        public PreferenceFragmentCompat getFragment() {
+            return fragment;
+        }
+
         @Override
         public Preference findPreference(CharSequence key) {
             return fragment.findPreference(key);
@@ -76,12 +84,21 @@ public class PreferenceActivity extends AppCompatActivity {
         // since the MainFragment depends on the preferenceController already being created
         preferenceController = new PreferenceController(preferenceUI);
 
+        showPreferenceScreen(R.xml.preferences, false);
+    }
+
+    private void showPreferenceScreen(int screen, boolean addHistory) {
         PreferenceFragmentCompat prefFragment = new MainFragment();
         preferenceUI.setFragment(prefFragment);
         Bundle args = new Bundle();
-        args.putInt(PARAM_RESOURCE, R.xml.preferences);
+        args.putInt(PARAM_RESOURCE, screen);
         prefFragment.setArguments(args);
-        getSupportFragmentManager().beginTransaction().replace(R.id.content, prefFragment).commit();
+        if (addHistory) {
+            getSupportFragmentManager().beginTransaction().replace(R.id.content, prefFragment)
+                    .addToBackStack(getString(PreferenceController.getTitleOfPage(screen))).commit();
+        } else {
+            getSupportFragmentManager().beginTransaction().replace(R.id.content, prefFragment).commit();
+        }
     }
 
     @Override
@@ -111,6 +128,12 @@ public class PreferenceActivity extends AppCompatActivity {
         }
     }
 
+    @Override
+    public void onSearchResultClicked(SearchPreferenceResult result) {
+        showPreferenceScreen(result.getResourceFile(), true);
+        result.highlight(preferenceUI.getFragment());
+    }
+
     public static class MainFragment extends PreferenceFragmentCompat {
         private int screen;
 
@@ -136,7 +159,7 @@ public class PreferenceActivity extends AppCompatActivity {
             super.onResume();
             PreferenceActivity activity = instance.get();
             if(activity != null && activity.preferenceController != null) {
-                activity.setTitle(activity.preferenceController.getTitleOfPage(screen));
+                activity.setTitle(PreferenceController.getTitleOfPage(screen));
                 activity.preferenceUI.setFragment(this);
                 activity.preferenceController.onResume(screen);
             }
diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
index 62d4793cf..eb10b1ebc 100644
--- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
+++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
@@ -37,6 +37,7 @@ import android.widget.Toast;
 
 import com.afollestad.materialdialogs.MaterialDialog;
 
+import com.bytehamster.lib.preferencesearch.SearchPreference;
 import de.danoeh.antennapod.activity.AboutActivity;
 import de.danoeh.antennapod.activity.ImportExportActivity;
 import de.danoeh.antennapod.activity.MediaplayerActivity;
@@ -489,6 +490,7 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
 
     private void setupMainScreen() {
         final AppCompatActivity activity = ui.getActivity();
+        setupSearch();
         ui.findPreference(PREF_SCREEN_USER_INTERFACE).setOnPreferenceClickListener(preference -> {
             openScreen(R.xml.preferences_user_interface, activity);
             return true;
@@ -555,6 +557,25 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
         });
     }
 
+    private void setupSearch() {
+        final AppCompatActivity activity = ui.getActivity();
+
+        SearchPreference searchPreference = (SearchPreference) ui.findPreference("searchPreference");
+        searchPreference.setActivity(activity);
+        searchPreference.setFragmentContainerViewId(R.id.content);
+        searchPreference.setBreadcrumbsEnabled(true);
+
+        searchPreference.addResourceFileToIndex(R.xml.preferences_user_interface, getTitleOfPage(R.xml.preferences_user_interface));
+        searchPreference.addResourceFileToIndex(R.xml.preferences_playback, getTitleOfPage(R.xml.preferences_playback));
+        searchPreference.addResourceFileToIndex(R.xml.preferences_network, getTitleOfPage(R.xml.preferences_network));
+        searchPreference.addResourceFileToIndex(R.xml.preferences_storage, getTitleOfPage(R.xml.preferences_storage));
+        String integrations = activity.getString(getTitleOfPage(R.xml.preferences_integrations));
+        String flattr = activity.getString(getTitleOfPage(R.xml.preferences_flattr));
+        String gpodder = activity.getString(getTitleOfPage(R.xml.preferences_gpodder));
+        searchPreference.addResourceFileToIndex(R.xml.preferences_flattr, integrations + " > " + flattr);
+        searchPreference.addResourceFileToIndex(R.xml.preferences_gpodder, integrations + " > " + gpodder);
+    }
+
     public PreferenceFragmentCompat openScreen(int preferences, AppCompatActivity activity) {
         PreferenceFragmentCompat prefFragment = new PreferenceActivity.MainFragment();
         Bundle args = new Bundle();
@@ -566,7 +587,7 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
         return prefFragment;
     }
 
-    public int getTitleOfPage(int preferences) {
+    public static int getTitleOfPage(int preferences) {
         switch (preferences) {
             case R.xml.preferences_network:
                 return R.string.network_pref;
@@ -1152,6 +1173,7 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
     public interface PreferenceUI {
 
         void setFragment(PreferenceFragmentCompat fragment);
+        PreferenceFragmentCompat getFragment();
 
         /**
          * Finds a preference based on its key.
-- 
cgit v1.2.3


From ea96e239faca979114df18df118e458b80e61dce Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Mon, 7 May 2018 18:00:28 +0200
Subject: Updated library

---
 .../preferences/PreferenceController.java          | 36 ++++++++++++++++------
 1 file changed, 27 insertions(+), 9 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
index eb10b1ebc..929d03d34 100644
--- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
+++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
@@ -565,15 +565,33 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
         searchPreference.setFragmentContainerViewId(R.id.content);
         searchPreference.setBreadcrumbsEnabled(true);
 
-        searchPreference.addResourceFileToIndex(R.xml.preferences_user_interface, getTitleOfPage(R.xml.preferences_user_interface));
-        searchPreference.addResourceFileToIndex(R.xml.preferences_playback, getTitleOfPage(R.xml.preferences_playback));
-        searchPreference.addResourceFileToIndex(R.xml.preferences_network, getTitleOfPage(R.xml.preferences_network));
-        searchPreference.addResourceFileToIndex(R.xml.preferences_storage, getTitleOfPage(R.xml.preferences_storage));
-        String integrations = activity.getString(getTitleOfPage(R.xml.preferences_integrations));
-        String flattr = activity.getString(getTitleOfPage(R.xml.preferences_flattr));
-        String gpodder = activity.getString(getTitleOfPage(R.xml.preferences_gpodder));
-        searchPreference.addResourceFileToIndex(R.xml.preferences_flattr, integrations + " > " + flattr);
-        searchPreference.addResourceFileToIndex(R.xml.preferences_gpodder, integrations + " > " + gpodder);
+        searchPreference.index()
+                .addBreadcrumb(getTitleOfPage(R.xml.preferences_user_interface))
+                .addFile(R.xml.preferences_user_interface);
+        searchPreference.index()
+                .addBreadcrumb(getTitleOfPage(R.xml.preferences_playback))
+                .addFile(R.xml.preferences_playback);
+        searchPreference.index()
+                .addBreadcrumb(getTitleOfPage(R.xml.preferences_network))
+                .addFile(R.xml.preferences_network);
+        searchPreference.index()
+                .addBreadcrumb(getTitleOfPage(R.xml.preferences_storage))
+                .addFile(R.xml.preferences_storage);
+        searchPreference.index()
+                .addBreadcrumb(getTitleOfPage(R.xml.preferences_network))
+                .addBreadcrumb(R.string.automation)
+                .addBreadcrumb(getTitleOfPage(R.xml.preferences_autodownload))
+                .addFile(R.xml.preferences_autodownload);
+        searchPreference.index()
+                .addBreadcrumb(getTitleOfPage(R.xml.preferences_integrations))
+                .addBreadcrumb(getTitleOfPage(R.xml.preferences_gpodder))
+                .addFile(R.xml.preferences_gpodder);
+        if (FlattrUtils.hasToken()) {
+            searchPreference.index()
+                    .addBreadcrumb(getTitleOfPage(R.xml.preferences_integrations))
+                    .addBreadcrumb(getTitleOfPage(R.xml.preferences_flattr))
+                    .addFile(R.xml.preferences_flattr);
+        }
     }
 
     public PreferenceFragmentCompat openScreen(int preferences, AppCompatActivity activity) {
-- 
cgit v1.2.3


From 3b445c3403597cc2977d5e64758c5a4bab81a4b8 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Mon, 7 May 2018 18:11:43 +0200
Subject: Re-enabled flattr

---
 .../de/danoeh/antennapod/preferences/PreferenceController.java | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
index 929d03d34..31a31adb4 100644
--- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
+++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
@@ -586,12 +586,10 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
                 .addBreadcrumb(getTitleOfPage(R.xml.preferences_integrations))
                 .addBreadcrumb(getTitleOfPage(R.xml.preferences_gpodder))
                 .addFile(R.xml.preferences_gpodder);
-        if (FlattrUtils.hasToken()) {
-            searchPreference.index()
-                    .addBreadcrumb(getTitleOfPage(R.xml.preferences_integrations))
-                    .addBreadcrumb(getTitleOfPage(R.xml.preferences_flattr))
-                    .addFile(R.xml.preferences_flattr);
-        }
+        searchPreference.index()
+                .addBreadcrumb(getTitleOfPage(R.xml.preferences_integrations))
+                .addBreadcrumb(getTitleOfPage(R.xml.preferences_flattr))
+                .addFile(R.xml.preferences_flattr);
     }
 
     public PreferenceFragmentCompat openScreen(int preferences, AppCompatActivity activity) {
-- 
cgit v1.2.3


From 5fe060506a189c8f675b77f4df5b5d7d71af8d11 Mon Sep 17 00:00:00 2001
From: amhokies <amhokies@gmail.com>
Date: Thu, 10 May 2018 21:25:36 -0400
Subject: Issue #2680: Display time left in queue info bar

---
 app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
index 85abdd281..bae77d58b 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
@@ -534,14 +534,15 @@ public class QueueFragment extends Fragment {
     private void refreshInfoBar() {
         String info = queue.size() + getString(R.string.episodes_suffix);
         if(queue.size() > 0) {
-            long duration = 0;
+            long timeLeft = 0;
             for(FeedItem item : queue) {
                 if(item.getMedia() != null) {
-                    duration += item.getMedia().getDuration();
+                    timeLeft += item.getMedia().getDuration() - item.getMedia().getPosition();
                 }
             }
             info += " \u2022 ";
-            info += Converter.getDurationStringLocalized(getActivity(), duration);
+            info += getString(R.string.time_left_label);
+            info += Converter.getDurationStringLocalized(getActivity(), timeLeft);
         }
         infoBar.setText(info);
     }
-- 
cgit v1.2.3


From cddc1a7354514f005b59970bf2f4cc27a7942ba3 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Fri, 18 May 2018 11:54:53 +0200
Subject: Improve autodownload in search

---
 .../preferences/PreferenceController.java          | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
index 31a31adb4..9bb0edeb2 100644
--- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
+++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
@@ -37,6 +37,7 @@ import android.widget.Toast;
 
 import com.afollestad.materialdialogs.MaterialDialog;
 
+import com.bytehamster.lib.preferencesearch.SearchConfiguration;
 import com.bytehamster.lib.preferencesearch.SearchPreference;
 import de.danoeh.antennapod.activity.AboutActivity;
 import de.danoeh.antennapod.activity.ImportExportActivity;
@@ -561,32 +562,33 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
         final AppCompatActivity activity = ui.getActivity();
 
         SearchPreference searchPreference = (SearchPreference) ui.findPreference("searchPreference");
-        searchPreference.setActivity(activity);
-        searchPreference.setFragmentContainerViewId(R.id.content);
-        searchPreference.setBreadcrumbsEnabled(true);
+        SearchConfiguration config = searchPreference.getSearchConfiguration();
+        config.setActivity(activity);
+        config.setFragmentContainerViewId(R.id.content);
+        config.setBreadcrumbsEnabled(true);
 
-        searchPreference.index()
+        config.index()
                 .addBreadcrumb(getTitleOfPage(R.xml.preferences_user_interface))
                 .addFile(R.xml.preferences_user_interface);
-        searchPreference.index()
+        config.index()
                 .addBreadcrumb(getTitleOfPage(R.xml.preferences_playback))
                 .addFile(R.xml.preferences_playback);
-        searchPreference.index()
+        config.index()
                 .addBreadcrumb(getTitleOfPage(R.xml.preferences_network))
                 .addFile(R.xml.preferences_network);
-        searchPreference.index()
+        config.index()
                 .addBreadcrumb(getTitleOfPage(R.xml.preferences_storage))
                 .addFile(R.xml.preferences_storage);
-        searchPreference.index()
+        config.index()
                 .addBreadcrumb(getTitleOfPage(R.xml.preferences_network))
                 .addBreadcrumb(R.string.automation)
                 .addBreadcrumb(getTitleOfPage(R.xml.preferences_autodownload))
                 .addFile(R.xml.preferences_autodownload);
-        searchPreference.index()
+        config.index()
                 .addBreadcrumb(getTitleOfPage(R.xml.preferences_integrations))
                 .addBreadcrumb(getTitleOfPage(R.xml.preferences_gpodder))
                 .addFile(R.xml.preferences_gpodder);
-        searchPreference.index()
+        config.index()
                 .addBreadcrumb(getTitleOfPage(R.xml.preferences_integrations))
                 .addBreadcrumb(getTitleOfPage(R.xml.preferences_flattr))
                 .addFile(R.xml.preferences_flattr);
-- 
cgit v1.2.3


From 3edbbe8c5356f00cd12824b5819ec9b42a347eca Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Sat, 26 May 2018 23:13:16 +0200
Subject: Moved notification utils to other package

---
 app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
index fb18ceecd..294ab5af8 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
@@ -31,7 +31,7 @@ import android.widget.ListView;
 import com.bumptech.glide.Glide;
 
 import de.danoeh.antennapod.core.event.ServiceEvent;
-import de.danoeh.antennapod.core.util.NotificationUtils;
+import de.danoeh.antennapod.core.util.gui.NotificationUtils;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.Validate;
 
-- 
cgit v1.2.3


From 9ce48bd86bc5f32f197f2f5b0d3a78596b9c15fe Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Sat, 26 May 2018 23:20:47 +0200
Subject: Added a refreshAllFeeds method without callback

---
 .../main/java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java    | 2 +-
 app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java
index 209d5bca8..f3846c8a4 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java
@@ -224,7 +224,7 @@ public class AllEpisodesFragment extends Fragment {
                 case R.id.refresh_item:
                     List<Feed> feeds = ((MainActivity) getActivity()).getFeeds();
                     if (feeds != null) {
-                        DBTasks.refreshAllFeeds(getActivity(), feeds, null);
+                        DBTasks.refreshAllFeeds(getActivity(), feeds);
                     }
                     return true;
                 case R.id.mark_all_read_item:
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
index 349b4bd8f..85abdd281 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
@@ -285,7 +285,7 @@ public class QueueFragment extends Fragment {
                 case R.id.refresh_item:
                     List<Feed> feeds = ((MainActivity) getActivity()).getFeeds();
                     if (feeds != null) {
-                        DBTasks.refreshAllFeeds(getActivity(), feeds, null);
+                        DBTasks.refreshAllFeeds(getActivity(), feeds);
                     }
                     return true;
                 case R.id.clear_queue:
-- 
cgit v1.2.3


From 920f0613857f468804114fcd85da8733b71db9bd Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Sat, 26 May 2018 23:49:47 +0200
Subject: Fixed build

---
 .../java/de/danoeh/antennapod/preferences/PreferenceController.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
index c1aea28c8..29bbee980 100644
--- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
+++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
@@ -887,7 +887,7 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
 
     private void checkSonicItemVisibility() {
         if (Build.VERSION.SDK_INT < 16) {
-            MaterialListPreference p = ((MaterialListPreference) ui.findPreference(UserPreferences.PREF_MEDIA_PLAYER));
+            ListPreference p = (ListPreference) ui.findPreference(UserPreferences.PREF_MEDIA_PLAYER);
             p.setEntries(R.array.media_player_options_no_sonic);
             p.setEntryValues(R.array.media_player_values_no_sonic);
         }
-- 
cgit v1.2.3


From 9df23ebbf65cd80ae08f2fb3beb55f106a782a1f Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Sun, 27 May 2018 20:03:44 +0200
Subject: Removed unused code

---
 .../java/de/danoeh/antennapod/activity/MediaplayerActivity.java  | 1 -
 .../java/de/danoeh/antennapod/adapter/DownloadlistAdapter.java   | 9 ---------
 2 files changed, 10 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
index 091f8daab..285ba54ea 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
@@ -690,7 +690,6 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements
         if(controller == null || controller.getMedia() == null) {
             return false;
         }
-        Playable media = controller.getMedia();
         SharedPreferences prefs = getSharedPreferences(PREFS, MODE_PRIVATE);
         showTimeLeft = prefs.getBoolean(PREF_SHOW_TIME_LEFT, false);
         onPositionObserverUpdate();
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadlistAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadlistAdapter.java
index 5bc67a95a..a8c60c19e 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadlistAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadlistAdapter.java
@@ -121,15 +121,6 @@ public class DownloadlistAdapter extends BaseAdapter {
         ImageButton butSecondary;
     }
 
-    public int getSelectedItemIndex() {
-        return selectedItemIndex;
-    }
-
-    public void setSelectedItemIndex(int selectedItemIndex) {
-        this.selectedItemIndex = selectedItemIndex;
-        notifyDataSetChanged();
-    }
-
     public interface ItemAccess {
         int getCount();
 
-- 
cgit v1.2.3


From 02186a3f0da9c8f687607f72fb8613989b6fb8e2 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Tue, 29 May 2018 23:25:19 +0200
Subject: Limit broadcasts to current app

---
 app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java   | 3 ++-
 .../java/de/danoeh/antennapod/activity/MediaplayerActivity.java     | 3 ++-
 .../java/de/danoeh/antennapod/activity/MediaplayerInfoActivity.java | 3 ++-
 .../de/danoeh/antennapod/adapter/DefaultActionButtonCallback.java   | 6 ++++--
 .../java/de/danoeh/antennapod/fragment/SubscriptionFragment.java    | 3 ++-
 .../java/de/danoeh/antennapod/menuhandler/FeedItemMenuHandler.java  | 3 ++-
 app/src/main/java/de/danoeh/antennapod/spa/SPAUtil.java             | 3 ++-
 7 files changed, 16 insertions(+), 8 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
index 294ab5af8..8d51d0bd3 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
@@ -628,7 +628,8 @@ public class MainActivity extends CastEnabledActivity implements NavDrawerActivi
                             int playerStatus = PlaybackPreferences.getCurrentPlayerStatus();
                             if(playerStatus == PlaybackPreferences.PLAYER_STATUS_PLAYING) {
                                 sendBroadcast(new Intent(
-                                        PlaybackService.ACTION_PAUSE_PLAY_CURRENT_EPISODE));
+                                        PlaybackService.ACTION_PAUSE_PLAY_CURRENT_EPISODE)
+                                        .setPackage(getPackageName()));
                             }
                         }
                         remover.executeAsync();
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
index 091f8daab..deda73970 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
@@ -863,7 +863,8 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements
         }
 
         if (butSkip != null) {
-            butSkip.setOnClickListener(v -> sendBroadcast(new Intent(PlaybackService.ACTION_SKIP_CURRENT_EPISODE)));
+            butSkip.setOnClickListener(v -> sendBroadcast(new Intent(PlaybackService.ACTION_SKIP_CURRENT_EPISODE)
+                    .setPackage(getPackageName())));
         }
     }
 
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerInfoActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerInfoActivity.java
index f3ed1cb62..4b2af2cf5 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerInfoActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerInfoActivity.java
@@ -414,7 +414,8 @@ public abstract class MediaplayerInfoActivity extends MediaplayerActivity implem
                                     remover.skipOnCompletion = true;
                                     if(controller.getStatus() == PlayerStatus.PLAYING) {
                                         sendBroadcast(new Intent(
-                                                PlaybackService.ACTION_PAUSE_PLAY_CURRENT_EPISODE));
+                                                PlaybackService.ACTION_PAUSE_PLAY_CURRENT_EPISODE)
+                                                .setPackage(getPackageName()));
                                     }
                                 }
                             }
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 d8f324e8a..1656af338 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/DefaultActionButtonCallback.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/DefaultActionButtonCallback.java
@@ -86,13 +86,15 @@ public class DefaultActionButtonCallback implements ActionButtonCallback {
                             .startWhenPrepared(true)
                             .shouldStream(false)
                             .start();
-                    context.sendBroadcast(new Intent(PlaybackService.ACTION_PAUSE_PLAY_CURRENT_EPISODE));
+                    context.sendBroadcast(new Intent(PlaybackService.ACTION_PAUSE_PLAY_CURRENT_EPISODE)
+                            .setPackage(context.getPackageName()));
                 } else if (media.isCurrentlyPaused()) {
                     new PlaybackServiceStarter(context, media)
                             .startWhenPrepared(true)
                             .shouldStream(false)
                             .start();
-                    context.sendBroadcast(new Intent(PlaybackService.ACTION_RESUME_PLAY_CURRENT_EPISODE));
+                    context.sendBroadcast(new Intent(PlaybackService.ACTION_RESUME_PLAY_CURRENT_EPISODE)
+                            .setPackage(context.getPackageName()));
                 } else {
                     DBTasks.playMedia(context, media, false, true, false);
                 }
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/SubscriptionFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/SubscriptionFragment.java
index 1247aacbb..66171ece1 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/SubscriptionFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/SubscriptionFragment.java
@@ -212,7 +212,8 @@ public class SubscriptionFragment extends Fragment {
                             int playerStatus = PlaybackPreferences.getCurrentPlayerStatus();
                             if(playerStatus == PlaybackPreferences.PLAYER_STATUS_PLAYING) {
                                 getActivity().sendBroadcast(new Intent(
-                                        PlaybackService.ACTION_PAUSE_PLAY_CURRENT_EPISODE));
+                                        PlaybackService.ACTION_PAUSE_PLAY_CURRENT_EPISODE)
+                                        .setPackage(getContext().getPackageName()));
                             }
                         }
                         remover.executeAsync();
diff --git a/app/src/main/java/de/danoeh/antennapod/menuhandler/FeedItemMenuHandler.java b/app/src/main/java/de/danoeh/antennapod/menuhandler/FeedItemMenuHandler.java
index de47ee5e4..65fae96eb 100644
--- a/app/src/main/java/de/danoeh/antennapod/menuhandler/FeedItemMenuHandler.java
+++ b/app/src/main/java/de/danoeh/antennapod/menuhandler/FeedItemMenuHandler.java
@@ -158,7 +158,8 @@ public class FeedItemMenuHandler {
                                             FeedItem selectedItem) {
         switch (menuItemId) {
             case R.id.skip_episode_item:
-                context.sendBroadcast(new Intent(PlaybackService.ACTION_SKIP_CURRENT_EPISODE));
+                context.sendBroadcast(new Intent(PlaybackService.ACTION_SKIP_CURRENT_EPISODE)
+                        .setPackage(context.getPackageName()));
                 break;
             case R.id.remove_item:
                 DBWriter.deleteFeedMediaOfItem(context, selectedItem.getMedia().getId());
diff --git a/app/src/main/java/de/danoeh/antennapod/spa/SPAUtil.java b/app/src/main/java/de/danoeh/antennapod/spa/SPAUtil.java
index 75cbd8b5a..27a3213f7 100644
--- a/app/src/main/java/de/danoeh/antennapod/spa/SPAUtil.java
+++ b/app/src/main/java/de/danoeh/antennapod/spa/SPAUtil.java
@@ -41,7 +41,8 @@ public class SPAUtil {
         }
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(appContext);
         if (!prefs.getBoolean(PREF_HAS_QUERIED_SP_APPS, false)) {
-            appContext.sendBroadcast(new Intent(SPAReceiver.ACTION_SP_APPS_QUERY_FEEDS));
+            appContext.sendBroadcast(new Intent(SPAReceiver.ACTION_SP_APPS_QUERY_FEEDS)
+                    .setPackage(context.getPackageName()));
             if (BuildConfig.DEBUG) Log.d(TAG, "Sending SP_APPS_QUERY_FEEDS intent");
 
             SharedPreferences.Editor editor = prefs.edit();
-- 
cgit v1.2.3


From ba2233430e96f31de10aa82468529bfd781a742a Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Tue, 5 Jun 2018 23:52:19 +0200
Subject: Removed FeedImage

---
 .../java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java  | 4 ++--
 .../main/java/de/danoeh/antennapod/adapter/DownloadLogAdapter.java  | 6 +-----
 2 files changed, 3 insertions(+), 7 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
index f859f5466..92f8ca8b7 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
@@ -393,9 +393,9 @@ public class OnlineFeedViewActivity extends AppCompatActivity {
 
         subscribeButton = (Button) header.findViewById(R.id.butSubscribe);
 
-        if (feed.getImage() != null && StringUtils.isNotBlank(feed.getImage().getDownload_url())) {
+        if (StringUtils.isNotBlank(feed.getImageUrl())) {
             Glide.with(this)
-                    .load(feed.getImage().getDownload_url())
+                    .load(feed.getImageUrl())
                     .placeholder(R.color.light_gray)
                     .error(R.color.light_gray)
                     .diskCacheStrategy(ApGlideSettings.AP_DISK_CACHE_STRATEGY)
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadLogAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadLogAdapter.java
index 7c0be47b6..163366c3c 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadLogAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadLogAdapter.java
@@ -19,7 +19,6 @@ import com.joanzapata.iconify.widget.IconTextView;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.core.dialog.DownloadRequestErrorDialogCreator;
 import de.danoeh.antennapod.core.feed.Feed;
-import de.danoeh.antennapod.core.feed.FeedImage;
 import de.danoeh.antennapod.core.feed.FeedMedia;
 import de.danoeh.antennapod.core.service.download.DownloadStatus;
 import de.danoeh.antennapod.core.storage.DBReader;
@@ -67,8 +66,6 @@ public class DownloadLogAdapter extends BaseAdapter {
 			holder.type.setText(R.string.download_type_feed);
 		} else if (status.getFeedfileType() == FeedMedia.FEEDFILETYPE_FEEDMEDIA) {
 			holder.type.setText(R.string.download_type_media);
-		} else if (status.getFeedfileType() == FeedImage.FEEDFILETYPE_FEEDIMAGE) {
-			holder.type.setText(R.string.download_type_image);
 		}
 		if (status.getTitle() != null) {
 			holder.title.setText(status.getTitle());
@@ -94,8 +91,7 @@ public class DownloadLogAdapter extends BaseAdapter {
 			}
 			holder.reason.setText(reasonText);
 			holder.reason.setVisibility(View.VISIBLE);
-			if(status.getFeedfileType() != FeedImage.FEEDFILETYPE_FEEDIMAGE &&
-					!newerWasSuccessful(position, status.getFeedfileType(), status.getFeedfileId())) {
+			if(!newerWasSuccessful(position, status.getFeedfileType(), status.getFeedfileId())) {
 				holder.retry.setVisibility(View.VISIBLE);
 				holder.retry.setOnClickListener(clickListener);
 				ButtonHolder btnHolder;
-- 
cgit v1.2.3


From 9cf71f85b99382456c70425946e3482a59521275 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Wed, 6 Jun 2018 16:05:05 +0200
Subject: Using utils

---
 app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java  | 5 ++---
 .../java/de/danoeh/antennapod/activity/MediaplayerActivity.java    | 5 +++--
 .../de/danoeh/antennapod/activity/MediaplayerInfoActivity.java     | 5 ++---
 .../de/danoeh/antennapod/adapter/DefaultActionButtonCallback.java  | 7 +++----
 .../java/de/danoeh/antennapod/fragment/SubscriptionFragment.java   | 7 ++++---
 .../java/de/danoeh/antennapod/menuhandler/FeedItemMenuHandler.java | 3 +--
 app/src/main/java/de/danoeh/antennapod/spa/SPAUtil.java            | 7 +++++--
 7 files changed, 20 insertions(+), 19 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
index 8d51d0bd3..0879b2cec 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
@@ -31,6 +31,7 @@ import android.widget.ListView;
 import com.bumptech.glide.Glide;
 
 import de.danoeh.antennapod.core.event.ServiceEvent;
+import de.danoeh.antennapod.core.util.IntentUtils;
 import de.danoeh.antennapod.core.util.gui.NotificationUtils;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.Validate;
@@ -627,9 +628,7 @@ public class MainActivity extends CastEnabledActivity implements NavDrawerActivi
                             remover.skipOnCompletion = true;
                             int playerStatus = PlaybackPreferences.getCurrentPlayerStatus();
                             if(playerStatus == PlaybackPreferences.PLAYER_STATUS_PLAYING) {
-                                sendBroadcast(new Intent(
-                                        PlaybackService.ACTION_PAUSE_PLAY_CURRENT_EPISODE)
-                                        .setPackage(getPackageName()));
+                                IntentUtils.sendLocalBroadcast(MainActivity.this, PlaybackService.ACTION_PAUSE_PLAY_CURRENT_EPISODE);
                             }
                         }
                         remover.executeAsync();
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
index deda73970..70fddf986 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
@@ -45,6 +45,7 @@ import de.danoeh.antennapod.core.storage.DBWriter;
 import de.danoeh.antennapod.core.util.Converter;
 import de.danoeh.antennapod.core.util.FeedItemUtil;
 import de.danoeh.antennapod.core.util.Flavors;
+import de.danoeh.antennapod.core.util.IntentUtils;
 import de.danoeh.antennapod.core.util.ShareUtils;
 import de.danoeh.antennapod.core.util.StorageUtils;
 import de.danoeh.antennapod.core.util.Supplier;
@@ -863,8 +864,8 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements
         }
 
         if (butSkip != null) {
-            butSkip.setOnClickListener(v -> sendBroadcast(new Intent(PlaybackService.ACTION_SKIP_CURRENT_EPISODE)
-                    .setPackage(getPackageName())));
+            butSkip.setOnClickListener(v ->
+                    IntentUtils.sendLocalBroadcast(MediaplayerActivity.this, PlaybackService.ACTION_SKIP_CURRENT_EPISODE));
         }
     }
 
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerInfoActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerInfoActivity.java
index 4b2af2cf5..49a0e898b 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerInfoActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerInfoActivity.java
@@ -48,6 +48,7 @@ import de.danoeh.antennapod.core.service.playback.PlayerStatus;
 import de.danoeh.antennapod.core.storage.DBReader;
 import de.danoeh.antennapod.core.storage.DBTasks;
 import de.danoeh.antennapod.core.storage.DBWriter;
+import de.danoeh.antennapod.core.util.IntentUtils;
 import de.danoeh.antennapod.core.util.playback.Playable;
 import de.danoeh.antennapod.core.util.playback.PlaybackController;
 import de.danoeh.antennapod.dialog.RenameFeedDialog;
@@ -413,9 +414,7 @@ public abstract class MediaplayerInfoActivity extends MediaplayerActivity implem
                                     Log.d(TAG, "Currently playing episode is about to be deleted, skipping");
                                     remover.skipOnCompletion = true;
                                     if(controller.getStatus() == PlayerStatus.PLAYING) {
-                                        sendBroadcast(new Intent(
-                                                PlaybackService.ACTION_PAUSE_PLAY_CURRENT_EPISODE)
-                                                .setPackage(getPackageName()));
+                                        IntentUtils.sendLocalBroadcast(MediaplayerInfoActivity.this, PlaybackService.ACTION_PAUSE_PLAY_CURRENT_EPISODE);
                                     }
                                 }
                             }
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 1656af338..08b2908ac 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/DefaultActionButtonCallback.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/DefaultActionButtonCallback.java
@@ -6,6 +6,7 @@ import android.widget.Toast;
 
 import com.afollestad.materialdialogs.MaterialDialog;
 
+import de.danoeh.antennapod.core.util.IntentUtils;
 import de.danoeh.antennapod.core.util.playback.PlaybackServiceStarter;
 import org.apache.commons.lang3.Validate;
 
@@ -86,15 +87,13 @@ public class DefaultActionButtonCallback implements ActionButtonCallback {
                             .startWhenPrepared(true)
                             .shouldStream(false)
                             .start();
-                    context.sendBroadcast(new Intent(PlaybackService.ACTION_PAUSE_PLAY_CURRENT_EPISODE)
-                            .setPackage(context.getPackageName()));
+                    IntentUtils.sendLocalBroadcast(context, PlaybackService.ACTION_PAUSE_PLAY_CURRENT_EPISODE);
                 } else if (media.isCurrentlyPaused()) {
                     new PlaybackServiceStarter(context, media)
                             .startWhenPrepared(true)
                             .shouldStream(false)
                             .start();
-                    context.sendBroadcast(new Intent(PlaybackService.ACTION_RESUME_PLAY_CURRENT_EPISODE)
-                            .setPackage(context.getPackageName()));
+                    IntentUtils.sendLocalBroadcast(context, PlaybackService.ACTION_RESUME_PLAY_CURRENT_EPISODE);
                 } else {
                     DBTasks.playMedia(context, media, false, true, false);
                 }
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/SubscriptionFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/SubscriptionFragment.java
index 66171ece1..aec2bb536 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/SubscriptionFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/SubscriptionFragment.java
@@ -16,6 +16,7 @@ import android.widget.GridView;
 
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.activity.MainActivity;
+import de.danoeh.antennapod.activity.MediaplayerInfoActivity;
 import de.danoeh.antennapod.adapter.SubscriptionsAdapter;
 import de.danoeh.antennapod.core.asynctask.FeedRemover;
 import de.danoeh.antennapod.core.dialog.ConfirmationDialog;
@@ -26,6 +27,7 @@ import de.danoeh.antennapod.core.service.playback.PlaybackService;
 import de.danoeh.antennapod.core.storage.DBReader;
 import de.danoeh.antennapod.core.storage.DBWriter;
 import de.danoeh.antennapod.core.util.FeedItemUtil;
+import de.danoeh.antennapod.core.util.IntentUtils;
 import de.danoeh.antennapod.dialog.RenameFeedDialog;
 import rx.Observable;
 import rx.Subscription;
@@ -211,9 +213,8 @@ public class SubscriptionFragment extends Fragment {
                             remover.skipOnCompletion = true;
                             int playerStatus = PlaybackPreferences.getCurrentPlayerStatus();
                             if(playerStatus == PlaybackPreferences.PLAYER_STATUS_PLAYING) {
-                                getActivity().sendBroadcast(new Intent(
-                                        PlaybackService.ACTION_PAUSE_PLAY_CURRENT_EPISODE)
-                                        .setPackage(getContext().getPackageName()));
+                                IntentUtils.sendLocalBroadcast(getContext(), PlaybackService.ACTION_PAUSE_PLAY_CURRENT_EPISODE);
+
                             }
                         }
                         remover.executeAsync();
diff --git a/app/src/main/java/de/danoeh/antennapod/menuhandler/FeedItemMenuHandler.java b/app/src/main/java/de/danoeh/antennapod/menuhandler/FeedItemMenuHandler.java
index 65fae96eb..ffdfa9516 100644
--- a/app/src/main/java/de/danoeh/antennapod/menuhandler/FeedItemMenuHandler.java
+++ b/app/src/main/java/de/danoeh/antennapod/menuhandler/FeedItemMenuHandler.java
@@ -158,8 +158,7 @@ public class FeedItemMenuHandler {
                                             FeedItem selectedItem) {
         switch (menuItemId) {
             case R.id.skip_episode_item:
-                context.sendBroadcast(new Intent(PlaybackService.ACTION_SKIP_CURRENT_EPISODE)
-                        .setPackage(context.getPackageName()));
+                IntentUtils.sendLocalBroadcast(context, PlaybackService.ACTION_SKIP_CURRENT_EPISODE);
                 break;
             case R.id.remove_item:
                 DBWriter.deleteFeedMediaOfItem(context, selectedItem.getMedia().getId());
diff --git a/app/src/main/java/de/danoeh/antennapod/spa/SPAUtil.java b/app/src/main/java/de/danoeh/antennapod/spa/SPAUtil.java
index 27a3213f7..8bea4793c 100644
--- a/app/src/main/java/de/danoeh/antennapod/spa/SPAUtil.java
+++ b/app/src/main/java/de/danoeh/antennapod/spa/SPAUtil.java
@@ -6,6 +6,9 @@ import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
 import android.util.Log;
 
+import de.danoeh.antennapod.activity.MediaplayerInfoActivity;
+import de.danoeh.antennapod.core.service.playback.PlaybackService;
+import de.danoeh.antennapod.core.util.IntentUtils;
 import org.apache.commons.lang3.Validate;
 
 import de.danoeh.antennapod.BuildConfig;
@@ -41,8 +44,8 @@ public class SPAUtil {
         }
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(appContext);
         if (!prefs.getBoolean(PREF_HAS_QUERIED_SP_APPS, false)) {
-            appContext.sendBroadcast(new Intent(SPAReceiver.ACTION_SP_APPS_QUERY_FEEDS)
-                    .setPackage(context.getPackageName()));
+            appContext.sendBroadcast(new Intent(SPAReceiver.ACTION_SP_APPS_QUERY_FEEDS));
+
             if (BuildConfig.DEBUG) Log.d(TAG, "Sending SP_APPS_QUERY_FEEDS intent");
 
             SharedPreferences.Editor editor = prefs.edit();
-- 
cgit v1.2.3


From dcb215ad70d9872648c741afa6fdf5f7e889cfb3 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Wed, 6 Jun 2018 16:07:37 +0200
Subject: Removed unused imports

---
 app/src/main/java/de/danoeh/antennapod/spa/SPAUtil.java | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/spa/SPAUtil.java b/app/src/main/java/de/danoeh/antennapod/spa/SPAUtil.java
index 8bea4793c..75cbd8b5a 100644
--- a/app/src/main/java/de/danoeh/antennapod/spa/SPAUtil.java
+++ b/app/src/main/java/de/danoeh/antennapod/spa/SPAUtil.java
@@ -6,9 +6,6 @@ import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
 import android.util.Log;
 
-import de.danoeh.antennapod.activity.MediaplayerInfoActivity;
-import de.danoeh.antennapod.core.service.playback.PlaybackService;
-import de.danoeh.antennapod.core.util.IntentUtils;
 import org.apache.commons.lang3.Validate;
 
 import de.danoeh.antennapod.BuildConfig;
@@ -45,7 +42,6 @@ public class SPAUtil {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(appContext);
         if (!prefs.getBoolean(PREF_HAS_QUERIED_SP_APPS, false)) {
             appContext.sendBroadcast(new Intent(SPAReceiver.ACTION_SP_APPS_QUERY_FEEDS));
-
             if (BuildConfig.DEBUG) Log.d(TAG, "Sending SP_APPS_QUERY_FEEDS intent");
 
             SharedPreferences.Editor editor = prefs.edit();
-- 
cgit v1.2.3


From bb716ce9eadb0b63b0b3dfea269898ef928a6ff0 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Wed, 6 Jun 2018 16:32:41 +0200
Subject: Moved playing background into attr

---
 .../antennapod/adapter/AllEpisodesRecycleAdapter.java       | 10 ++--------
 .../de/danoeh/antennapod/adapter/ChaptersListAdapter.java   | 13 ++-----------
 .../de/danoeh/antennapod/adapter/FeedItemlistAdapter.java   |  9 +--------
 .../de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java  |  9 ++-------
 .../danoeh/antennapod/fragment/ItemDescriptionFragment.java | 10 +++++-----
 .../de/danoeh/antennapod/menuhandler/MenuItemUtils.java     |  2 +-
 6 files changed, 13 insertions(+), 40 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java
index b2a3e38c8..33b61b916 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java
@@ -29,12 +29,12 @@ import de.danoeh.antennapod.activity.MainActivity;
 import de.danoeh.antennapod.core.feed.FeedItem;
 import de.danoeh.antennapod.core.feed.FeedMedia;
 import de.danoeh.antennapod.core.glide.ApGlideSettings;
-import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.core.storage.DownloadRequester;
 import de.danoeh.antennapod.core.util.Converter;
 import de.danoeh.antennapod.core.util.DateUtils;
 import de.danoeh.antennapod.core.util.LongList;
 import de.danoeh.antennapod.core.util.NetworkUtils;
+import de.danoeh.antennapod.core.util.ThemeUtils;
 import de.danoeh.antennapod.fragment.ItemFragment;
 import de.danoeh.antennapod.menuhandler.FeedItemMenuHandler;
 
@@ -67,13 +67,7 @@ public class AllEpisodesRecycleAdapter extends RecyclerView.Adapter<AllEpisodesR
         this.actionButtonCallback = actionButtonCallback;
         this.showOnlyNewEpisodes = showOnlyNewEpisodes;
 
-        if(UserPreferences.getTheme() == R.style.Theme_AntennaPod_Dark) {
-            playingBackGroundColor = ContextCompat.getColor(mainActivity, R.color.highlight_dark);
-        } else if(UserPreferences.getTheme() == R.style.Theme_AntennaPod_TrueBlack){
-            playingBackGroundColor = ContextCompat.getColor(mainActivity, R.color.highlight_trueblack);
-        } else {
-            playingBackGroundColor = ContextCompat.getColor(mainActivity, R.color.highlight_light);
-        }
+        playingBackGroundColor = ThemeUtils.getColorFromAttr(mainActivity, R.attr.currently_playing_background);
         normalBackGroundColor = ContextCompat.getColor(mainActivity, android.R.color.transparent);
     }
 
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/ChaptersListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/ChaptersListAdapter.java
index a07c0cae8..cbd089d4c 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/ChaptersListAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/ChaptersListAdapter.java
@@ -19,9 +19,9 @@ import android.widget.TextView;
 
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.core.feed.Chapter;
-import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.core.util.ChapterUtils;
 import de.danoeh.antennapod.core.util.Converter;
+import de.danoeh.antennapod.core.util.ThemeUtils;
 import de.danoeh.antennapod.core.util.playback.Playable;
 
 public class ChaptersListAdapter extends ArrayAdapter<Chapter> {
@@ -143,16 +143,7 @@ public class ChaptersListAdapter extends ArrayAdapter<Chapter> {
 
         Chapter current = ChapterUtils.getCurrentChapter(media);
         if (current == sc) {
-            int theme = UserPreferences.getTheme();
-            int highlight = R.color.highlight_light;
-            if (theme == R.style.Theme_AntennaPod_Dark) {
-                highlight = R.color.highlight_dark;
-            }else if (theme == R.style.Theme_AntennaPod_TrueBlack){
-                highlight = R.color.highlight_trueblack;
-            } else if (theme == R.style.Theme_AntennaPod_Light) {
-                highlight = R.color.highlight_light;
-            }
-            int playingBackGroundColor = ContextCompat.getColor(getContext(), highlight);
+            int playingBackGroundColor = ThemeUtils.getColorFromAttr(getContext(), R.attr.currently_playing_background);
             holder.view.setBackgroundColor(playingBackGroundColor);
         } else {
             holder.view.setBackgroundColor(ContextCompat.getColor(getContext(), android.R.color.transparent));
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java
index ad8567f1d..cf3dd8b09 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java
@@ -21,7 +21,6 @@ import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.core.feed.FeedItem;
 import de.danoeh.antennapod.core.feed.FeedMedia;
 import de.danoeh.antennapod.core.feed.MediaType;
-import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.core.storage.DownloadRequester;
 import de.danoeh.antennapod.core.util.DateUtils;
 import de.danoeh.antennapod.core.util.LongList;
@@ -60,13 +59,7 @@ public class FeedItemlistAdapter extends BaseAdapter {
         this.actionButtonUtils = new ActionButtonUtils(context);
         this.makePlayedItemsTransparent = makePlayedItemsTransparent;
 
-        if(UserPreferences.getTheme() == R.style.Theme_AntennaPod_Dark) {
-            playingBackGroundColor = ContextCompat.getColor(context, R.color.highlight_dark);
-        } else if(UserPreferences.getTheme() == R.style.Theme_AntennaPod_TrueBlack) {
-            playingBackGroundColor = ContextCompat.getColor(context, R.color.highlight_trueblack);
-        } else {
-            playingBackGroundColor = ContextCompat.getColor(context, R.color.highlight_light);
-        }
+        playingBackGroundColor = ThemeUtils.getColorFromAttr(context, R.attr.currently_playing_background);
         normalBackGroundColor = ContextCompat.getColor(context, android.R.color.transparent);
     }
 
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java
index 086ce1072..ee14cb70a 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java
@@ -25,6 +25,7 @@ import android.widget.TextView;
 import com.bumptech.glide.Glide;
 import com.joanzapata.iconify.Iconify;
 
+import de.danoeh.antennapod.core.util.ThemeUtils;
 import org.apache.commons.lang3.ArrayUtils;
 
 import java.lang.ref.WeakReference;
@@ -75,13 +76,7 @@ public class QueueRecyclerAdapter extends RecyclerView.Adapter<QueueRecyclerAdap
         this.itemTouchHelper = itemTouchHelper;
         locked = UserPreferences.isQueueLocked();
 
-        if(UserPreferences.getTheme() == R.style.Theme_AntennaPod_Dark) {
-            playingBackGroundColor = ContextCompat.getColor(mainActivity, R.color.highlight_dark);
-        } else if(UserPreferences.getTheme() == R.style.Theme_AntennaPod_TrueBlack) {
-            playingBackGroundColor = ContextCompat.getColor(mainActivity, R.color.highlight_trueblack);
-        } else {
-            playingBackGroundColor = ContextCompat.getColor(mainActivity, R.color.highlight_light);
-        }
+        playingBackGroundColor = ThemeUtils.getColorFromAttr(mainActivity, R.attr.currently_playing_background);
         normalBackGroundColor = ContextCompat.getColor(mainActivity, android.R.color.transparent);
     }
 
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java
index 1775307ed..829e1924a 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java
@@ -113,13 +113,13 @@ public class ItemDescriptionFragment extends Fragment implements MediaplayerInfo
         Log.d(TAG, "Creating view");
         webvDescription = new WebView(getActivity().getApplicationContext());
         webvDescription.setLayerType(View.LAYER_TYPE_SOFTWARE, null);
+
         TypedArray ta = getActivity().getTheme().obtainStyledAttributes(new int[]
                 {android.R.attr.colorBackground});
-        int backgroundColor = ta.getColor(0,
-                (UserPreferences.getTheme() == R.style.Theme_AntennaPod_Dark ||
-                        UserPreferences.getTheme() == R.style.Theme_AntennaPod_TrueBlack)?
-                        Color.BLACK : Color.WHITE
-        );
+        boolean black = UserPreferences.getTheme() == R.style.Theme_AntennaPod_Dark
+                || UserPreferences.getTheme() == R.style.Theme_AntennaPod_TrueBlack;
+        int backgroundColor = ta.getColor(0, black ? Color.BLACK : Color.WHITE);
+
         ta.recycle();
         webvDescription.setBackgroundColor(backgroundColor);
         if (!NetworkUtils.networkAvailable()) {
diff --git a/app/src/main/java/de/danoeh/antennapod/menuhandler/MenuItemUtils.java b/app/src/main/java/de/danoeh/antennapod/menuhandler/MenuItemUtils.java
index 383198146..66e229bdd 100644
--- a/app/src/main/java/de/danoeh/antennapod/menuhandler/MenuItemUtils.java
+++ b/app/src/main/java/de/danoeh/antennapod/menuhandler/MenuItemUtils.java
@@ -20,7 +20,7 @@ public class MenuItemUtils extends de.danoeh.antennapod.core.menuhandler.MenuIte
     public static void adjustTextColor(Context context, SearchView sv) {
         if(Build.VERSION.SDK_INT < 14) {
             EditText searchEditText = (EditText) sv.findViewById(R.id.search_src_text);
-            if(UserPreferences.getTheme() == de.danoeh.antennapod.R.style.Theme_AntennaPod_Dark
+            if (UserPreferences.getTheme() == de.danoeh.antennapod.R.style.Theme_AntennaPod_Dark
                     || UserPreferences.getTheme() == R.style.Theme_AntennaPod_TrueBlack) {
                 searchEditText.setTextColor(Color.WHITE);
             } else {
-- 
cgit v1.2.3


From 8a0769d466e8f1148ecdc1f947821dfac9583f1a Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Fri, 6 Jul 2018 10:10:21 +0200
Subject: Better feed parser errors

---
 .../java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
index 92f8ca8b7..28cabfbc7 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
@@ -317,7 +317,7 @@ public class OnlineFeedViewActivity extends AppCompatActivity {
                         return handler.parseFeed(feed);
                     } catch (UnsupportedFeedtypeException e) {
                         Log.d(TAG, "Unsupported feed type detected");
-                        if (TextUtils.equals("html", e.getRootElement().toLowerCase())) {
+                        if ("html".equalsIgnoreCase(e.getRootElement())) {
                             showFeedDiscoveryDialog(new File(feed.getFile_url()), feed.getDownload_url());
                             return null;
                         } else {
@@ -342,6 +342,7 @@ public class OnlineFeedViewActivity extends AppCompatActivity {
                     String errorMsg = DownloadError.ERROR_PARSER_EXCEPTION.getErrorString(
                             OnlineFeedViewActivity.this) + " (" + error.getMessage() + ")";
                     showErrorDialog(errorMsg);
+                    Log.d(TAG, "Feed parser exception: " + Log.getStackTraceString(error));
                 });
     }
 
-- 
cgit v1.2.3


From cc645c5fb1079ef324bb507b99626ad83fbff21f Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Fri, 13 Jul 2018 09:18:12 +0200
Subject: Only prevent deletion if PlaybackService is running (Closes #2759)

---
 .../de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java    | 3 ++-
 app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java      | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java
index c4f476634..51e1271d9 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java
@@ -16,6 +16,7 @@ import com.bumptech.glide.Glide;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.core.feed.FeedItem;
 import de.danoeh.antennapod.core.glide.ApGlideSettings;
+import de.danoeh.antennapod.core.service.playback.PlaybackService;
 import de.danoeh.antennapod.core.util.Converter;
 import de.danoeh.antennapod.core.util.DateUtils;
 
@@ -98,7 +99,7 @@ public class DownloadedEpisodesListAdapter extends BaseAdapter {
         holder.pubDate.setText(pubDateStr);
 
         FeedItem.State state = item.getState();
-        if (state == FeedItem.State.PLAYING) {
+        if (state == FeedItem.State.PLAYING && PlaybackService.isRunning) {
             holder.butSecondary.setEnabled(false);
             holder.butSecondary.setAlpha(0.5f);
         } else {
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 240a7ada8..5075d022a 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
@@ -436,7 +436,7 @@ public class ItemFragment extends Fragment implements OnSwipeGesture {
         }
 
         FeedItem.State state = item.getState();
-        if (butAction2Text == R.string.delete_label && state == FeedItem.State.PLAYING) {
+        if (butAction2Text == R.string.delete_label && state == FeedItem.State.PLAYING && PlaybackService.isRunning) {
             butAction2.setEnabled(false);
             butAction2.setAlpha(0.5f);
         } else {
-- 
cgit v1.2.3


From 235b81d40affcf7127c34bfe8014a83481678cae Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Fri, 13 Jul 2018 10:52:58 +0200
Subject: Allow to add to queue from downloads section

---
 .../java/de/danoeh/antennapod/dialog/EpisodesApplyActionFragment.java   | 2 +-
 .../java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/EpisodesApplyActionFragment.java b/app/src/main/java/de/danoeh/antennapod/dialog/EpisodesApplyActionFragment.java
index 10ce12771..d1ee926ac 100644
--- a/app/src/main/java/de/danoeh/antennapod/dialog/EpisodesApplyActionFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/dialog/EpisodesApplyActionFragment.java
@@ -34,7 +34,7 @@ public class EpisodesApplyActionFragment extends Fragment {
 
     public static final String TAG = "EpisodeActionFragment";
 
-    private static final int ACTION_QUEUE = 1;
+    public static final int ACTION_QUEUE = 1;
     private static final int ACTION_MARK_PLAYED = 2;
     private static final int ACTION_MARK_UNPLAYED = 4;
     private static final int ACTION_DOWNLOAD = 8;
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java
index f59bc88bf..f6d503b29 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java
@@ -149,7 +149,7 @@ public class CompletedDownloadsFragment extends ListFragment {
         switch (item.getItemId()) {
             case R.id.episode_actions:
                 EpisodesApplyActionFragment fragment = EpisodesApplyActionFragment
-                        .newInstance(items, EpisodesApplyActionFragment.ACTION_REMOVE);
+                        .newInstance(items, EpisodesApplyActionFragment.ACTION_REMOVE | EpisodesApplyActionFragment.ACTION_QUEUE);
                 ((MainActivity) getActivity()).loadChildFragment(fragment);
                 return true;
             default:
-- 
cgit v1.2.3


From 0d43cc8658d49e45fa9ad94a3e44a15bc8e9dffc Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Fri, 13 Jul 2018 18:29:05 +0200
Subject: Requesting storage permissions for external files

---
 .../antennapod/activity/AudioplayerActivity.java   | 12 +------
 .../antennapod/activity/MediaplayerActivity.java   | 40 ++++++++++++++++++++++
 .../antennapod/activity/VideoplayerActivity.java   | 19 ++++------
 3 files changed, 47 insertions(+), 24 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java
index 207aec20f..2651a1527 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java
@@ -12,8 +12,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import de.danoeh.antennapod.core.feed.MediaType;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.core.service.playback.PlaybackService;
-import de.danoeh.antennapod.core.util.playback.ExternalMedia;
-import de.danoeh.antennapod.core.util.playback.PlaybackServiceStarter;
 import de.danoeh.antennapod.dialog.VariableSpeedDialog;
 
 /**
@@ -32,15 +30,7 @@ public class AudioplayerActivity extends MediaplayerInfoActivity {
             if (intent.getData() == null) {
                 return;
             }
-            Log.d(TAG, "Received VIEW intent: " + intent.getData().getPath());
-            ExternalMedia media = new ExternalMedia(intent.getData().getPath(),
-                    MediaType.AUDIO);
-
-            new PlaybackServiceStarter(this, media)
-                    .startWhenPrepared(true)
-                    .shouldStream(false)
-                    .prepareImmediately(true)
-                    .start();
+            playExternalMedia(intent.getData().getPath(), MediaType.AUDIO);
 
         } else if (PlaybackService.isCasting()) {
             Intent intent = PlaybackService.getPlayerActivityIntent(this);
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
index 4e35d9080..e88b2be7b 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
@@ -1,9 +1,11 @@
 package de.danoeh.antennapod.activity;
 
+import android.Manifest;
 import android.annotation.TargetApi;
 import android.app.Activity;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.content.pm.PackageManager;
 import android.content.res.TypedArray;
 import android.graphics.Color;
 import android.graphics.PixelFormat;
@@ -11,7 +13,9 @@ import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
+import android.support.v4.app.ActivityCompat;
 import android.support.v4.app.ActivityOptionsCompat;
+import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AlertDialog;
 import android.util.Log;
 import android.view.Menu;
@@ -37,6 +41,7 @@ import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.core.event.ServiceEvent;
 import de.danoeh.antennapod.core.feed.FeedItem;
 import de.danoeh.antennapod.core.feed.FeedMedia;
+import de.danoeh.antennapod.core.feed.MediaType;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.core.service.playback.PlaybackService;
 import de.danoeh.antennapod.core.storage.DBReader;
@@ -50,9 +55,11 @@ import de.danoeh.antennapod.core.util.ShareUtils;
 import de.danoeh.antennapod.core.util.StorageUtils;
 import de.danoeh.antennapod.core.util.Supplier;
 import de.danoeh.antennapod.core.util.gui.PictureInPictureUtil;
+import de.danoeh.antennapod.core.util.playback.ExternalMedia;
 import de.danoeh.antennapod.core.util.playback.MediaPlayerError;
 import de.danoeh.antennapod.core.util.playback.Playable;
 import de.danoeh.antennapod.core.util.playback.PlaybackController;
+import de.danoeh.antennapod.core.util.playback.PlaybackServiceStarter;
 import de.danoeh.antennapod.dialog.SleepTimerDialog;
 import de.danoeh.antennapod.dialog.VariableSpeedDialog;
 import rx.Observable;
@@ -70,6 +77,7 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements
     private static final String TAG = "MediaplayerActivity";
     private static final String PREFS = "MediaPlayerActivityPreferences";
     private static final String PREF_SHOW_TIME_LEFT = "showTimeLeft";
+    private static final int REQUEST_CODE_STORAGE = 42;
 
     PlaybackController controller;
 
@@ -956,4 +964,36 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements
         }
     }
 
+    void playExternalMedia(String path, MediaType type) {
+        if (Build.VERSION.SDK_INT >= 23
+                && ContextCompat.checkSelfPermission(this, Manifest.permission.READ_EXTERNAL_STORAGE)
+                != PackageManager.PERMISSION_GRANTED) {
+
+            if (ActivityCompat.shouldShowRequestPermissionRationale(this, Manifest.permission.READ_EXTERNAL_STORAGE)) {
+                Toast.makeText(this, R.string.needs_storage_permission, Toast.LENGTH_LONG).show();
+            } else {
+                ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE},
+                        REQUEST_CODE_STORAGE);
+            }
+            return;
+        }
+
+        Log.d(TAG, "Received VIEW intent: " + path);
+        ExternalMedia media = new ExternalMedia(path, type);
+
+        new PlaybackServiceStarter(this, media)
+                .startWhenPrepared(true)
+                .shouldStream(false)
+                .prepareImmediately(true)
+                .start();
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, String permissions[], int[] grantResults) {
+        if (requestCode == REQUEST_CODE_STORAGE) {
+            if (grantResults.length <= 0 || grantResults[0] != PackageManager.PERMISSION_GRANTED) {
+                Toast.makeText(this, R.string.needs_storage_permission, Toast.LENGTH_LONG).show();
+            }
+        }
+    }
 }
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
index c8fb12abc..1392292a3 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
@@ -8,6 +8,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.support.v4.view.WindowCompat;
 import android.support.v7.app.ActionBar;
+import android.text.TextUtils;
 import android.util.Log;
 import android.util.Pair;
 import android.view.Menu;
@@ -28,9 +29,7 @@ import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.core.service.playback.PlaybackService;
 import de.danoeh.antennapod.core.service.playback.PlayerStatus;
 import de.danoeh.antennapod.core.util.gui.PictureInPictureUtil;
-import de.danoeh.antennapod.core.util.playback.ExternalMedia;
 import de.danoeh.antennapod.core.util.playback.Playable;
-import de.danoeh.antennapod.core.util.playback.PlaybackServiceStarter;
 import de.danoeh.antennapod.view.AspectRatioVideoView;
 
 import java.lang.ref.WeakReference;
@@ -77,18 +76,12 @@ public class VideoplayerActivity extends MediaplayerActivity {
     @Override
     protected void onResume() {
         super.onResume();
-        if (getIntent().getAction() != null
-                && getIntent().getAction().equals(Intent.ACTION_VIEW)) {
+        if (TextUtils.equals(getIntent().getAction(), Intent.ACTION_VIEW)) {
             Intent intent = getIntent();
-            Log.d(TAG, "Received VIEW intent: " + intent.getData().getPath());
-            ExternalMedia media = new ExternalMedia(intent.getData().getPath(),
-                    MediaType.VIDEO);
-
-            new PlaybackServiceStarter(this, media)
-                    .startWhenPrepared(true)
-                    .shouldStream(false)
-                    .prepareImmediately(true)
-                    .start();
+            if (intent.getData() == null) {
+                return;
+            }
+            playExternalMedia(intent.getData().getPath(), MediaType.VIDEO);
         } else if (PlaybackService.isCasting()) {
             Intent intent = PlaybackService.getPlayerActivityIntent(this);
             if (!intent.getComponent().getClassName().equals(VideoplayerActivity.class.getName())) {
-- 
cgit v1.2.3


From f9eb2f839b91e2970dd7cb18cf16057b87507df1 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Wed, 25 Jul 2018 16:02:44 +0200
Subject: Improved about screen

---
 app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java
index 4d9b50073..bf0709e6e 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java
@@ -92,7 +92,7 @@ public class AboutActivity extends AppCompatActivity {
                             "           src: url('file:///android_asset/Roboto-Light.ttf');" +
                             "        }" +
                             "        * {" +
-                            "           color: %s;" +
+                            "           color: @fontcolor@;" +
                             "           font-family: roboto-Light;" +
                             "           font-size: 8pt;" +
                             "        }" +
@@ -100,7 +100,7 @@ public class AboutActivity extends AppCompatActivity {
                             "</head><body><p>" + webViewData + "</p></body></html>";
                     webViewData = webViewData.replace("\n", "<br/>");
                 }
-                webViewData = String.format(webViewData, colorString);
+                webViewData = webViewData.replace("@fontcolor@", colorString);
                 subscriber.onSuccess(webViewData);
             } catch (IOException e) {
                 Log.e(TAG, Log.getStackTraceString(e));
-- 
cgit v1.2.3


From 66fc848fe9907e26d1ec8237a3176da085fa360a Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Wed, 25 Jul 2018 16:23:20 +0200
Subject: Fixed options menu persisting (Closes #2776)

---
 .../java/de/danoeh/antennapod/fragment/AddFeedFragment.java   | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/AddFeedFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/AddFeedFragment.java
index c050221e1..a243ddcdc 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/AddFeedFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/AddFeedFragment.java
@@ -66,4 +66,15 @@ public class AddFeedFragment extends Fragment {
 
         return root;
     }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setRetainInstance(true);
+
+        // So, we certainly *don't* have an options menu,
+        // but unless we say we do, old options menus sometimes
+        // persist.  mfietz thinks this causes the ActionBar to be invalidated
+        setHasOptionsMenu(true);
+    }
 }
-- 
cgit v1.2.3


From 14ca32a624d874051e680c3843b837d70266caee Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Wed, 25 Jul 2018 23:19:25 +0200
Subject: Simplifications

---
 .../java/de/danoeh/antennapod/activity/AudioplayerActivity.java  | 7 +------
 .../java/de/danoeh/antennapod/activity/MediaplayerActivity.java  | 9 ++++++---
 .../java/de/danoeh/antennapod/activity/VideoplayerActivity.java  | 6 +-----
 3 files changed, 8 insertions(+), 14 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java
index 2651a1527..67dda01cf 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java
@@ -26,12 +26,7 @@ public class AudioplayerActivity extends MediaplayerInfoActivity {
     protected void onResume() {
         super.onResume();
         if (TextUtils.equals(getIntent().getAction(), Intent.ACTION_VIEW)) {
-            Intent intent = getIntent();
-            if (intent.getData() == null) {
-                return;
-            }
-            playExternalMedia(intent.getData().getPath(), MediaType.AUDIO);
-
+            playExternalMedia(getIntent(), MediaType.AUDIO);
         } else if (PlaybackService.isCasting()) {
             Intent intent = PlaybackService.getPlayerActivityIntent(this);
             if (intent.getComponent() != null &&
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
index e88b2be7b..be9d60c93 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
@@ -964,7 +964,10 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements
         }
     }
 
-    void playExternalMedia(String path, MediaType type) {
+    void playExternalMedia(Intent intent, MediaType type) {
+        if (intent == null || intent.getData() == null) {
+            return;
+        }
         if (Build.VERSION.SDK_INT >= 23
                 && ContextCompat.checkSelfPermission(this, Manifest.permission.READ_EXTERNAL_STORAGE)
                 != PackageManager.PERMISSION_GRANTED) {
@@ -978,8 +981,8 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements
             return;
         }
 
-        Log.d(TAG, "Received VIEW intent: " + path);
-        ExternalMedia media = new ExternalMedia(path, type);
+        Log.d(TAG, "Received VIEW intent: " + intent.getData().getPath());
+        ExternalMedia media = new ExternalMedia(intent.getData().getPath(), type);
 
         new PlaybackServiceStarter(this, media)
                 .startWhenPrepared(true)
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
index 1392292a3..ea408c650 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
@@ -77,11 +77,7 @@ public class VideoplayerActivity extends MediaplayerActivity {
     protected void onResume() {
         super.onResume();
         if (TextUtils.equals(getIntent().getAction(), Intent.ACTION_VIEW)) {
-            Intent intent = getIntent();
-            if (intent.getData() == null) {
-                return;
-            }
-            playExternalMedia(intent.getData().getPath(), MediaType.VIDEO);
+            playExternalMedia(getIntent(), MediaType.VIDEO);
         } else if (PlaybackService.isCasting()) {
             Intent intent = PlaybackService.getPlayerActivityIntent(this);
             if (!intent.getComponent().getClassName().equals(VideoplayerActivity.class.getName())) {
-- 
cgit v1.2.3


From 7e05ff2a4eaf82e20e58575610da63502250f8d5 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Thu, 26 Jul 2018 10:26:00 +0200
Subject: Theming support for about screen

---
 .../java/de/danoeh/antennapod/activity/AboutActivity.java  | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java
index bf0709e6e..141fddd1c 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java
@@ -73,9 +73,12 @@ public class AboutActivity extends AppCompatActivity {
             InputStream input = null;
             try {
                 TypedArray res = AboutActivity.this.getTheme().obtainStyledAttributes(
-                        new int[] { android.R.attr.textColorPrimary });
-                int colorResource = res.getColor(0, 0);
-                String colorString = String.format("#%06X", 0xFFFFFF & colorResource);
+                        new int[] { R.attr.about_screen_font_color, R.attr.about_screen_background,
+                        R.attr.about_screen_card_background, R.attr.about_screen_card_border});
+                String fontColor = String.format("#%06X", 0xFFFFFF & res.getColor(0, 0));
+                String backgroundColor = String.format("#%06X", 0xFFFFFF & res.getColor(1, 0));
+                String cardBackground = String.format("#%06X", 0xFFFFFF & res.getColor(2, 0));
+                String cardBorder = String.format("#%06X", 0xFFFFFF & res.getColor(3, 0));
                 res.recycle();
                 input = getAssets().open(filename);
                 String webViewData = IOUtils.toString(input, Charset.defaultCharset());
@@ -100,7 +103,10 @@ public class AboutActivity extends AppCompatActivity {
                             "</head><body><p>" + webViewData + "</p></body></html>";
                     webViewData = webViewData.replace("\n", "<br/>");
                 }
-                webViewData = webViewData.replace("@fontcolor@", colorString);
+                webViewData = webViewData.replace("@fontcolor@", fontColor);
+                webViewData = webViewData.replace("@background@", backgroundColor);
+                webViewData = webViewData.replace("@card_background@", cardBackground);
+                webViewData = webViewData.replace("@card_border@", cardBorder);
                 subscriber.onSuccess(webViewData);
             } catch (IOException e) {
                 Log.e(TAG, Log.getStackTraceString(e));
-- 
cgit v1.2.3


From 1d265a9c3a6f72c0e1455dd4381505b8bee02b3f Mon Sep 17 00:00:00 2001
From: "H. Lehmann" <ByteHamster@users.noreply.github.com>
Date: Mon, 6 Aug 2018 23:38:37 +0200
Subject: Database access threading (#2781)

---
 .../danoeh/antennapod/activity/SplashActivity.java | 49 +++++++++++++++++-----
 .../fragment/ExternalPlayerFragment.java           | 17 ++++++--
 2 files changed, 51 insertions(+), 15 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/SplashActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/SplashActivity.java
index b92ac8577..73b495a42 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/SplashActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/SplashActivity.java
@@ -1,23 +1,50 @@
 package de.danoeh.antennapod.activity;
 
 import android.content.Intent;
+import android.graphics.PorterDuff;
+import android.graphics.drawable.Drawable;
+import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
+import android.support.v4.graphics.drawable.DrawableCompat;
 import android.support.v7.app.AppCompatActivity;
+import android.widget.ProgressBar;
+import de.danoeh.antennapod.R;
+import de.danoeh.antennapod.core.storage.PodDBAdapter;
+import rx.Completable;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
 
 /**
- * Creator: vbarad
- * Date: 2016-12-03
- * Project: AntennaPod
+ * Shows the AntennaPod logo while waiting for the main activity to start
  */
-
 public class SplashActivity extends AppCompatActivity {
-  @Override
-  protected void onCreate(@Nullable Bundle savedInstanceState) {
-    super.onCreate(savedInstanceState);
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.splash);
+
+        ProgressBar progressBar = findViewById(R.id.progressBar);
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
+            Drawable wrapDrawable = DrawableCompat.wrap(progressBar.getIndeterminateDrawable());
+            DrawableCompat.setTint(wrapDrawable, 0xffffffff);
+            progressBar.setIndeterminateDrawable(DrawableCompat.unwrap(wrapDrawable));
+        } else {
+            progressBar.getIndeterminateDrawable().setColorFilter(0xffffffff, PorterDuff.Mode.SRC_IN);
+        }
 
-    Intent intent = new Intent(this, MainActivity.class);
-    startActivity(intent);
-    finish();
-  }
+        Completable.create(subscriber -> {
+            // Trigger schema updates
+            PodDBAdapter.getInstance().open();
+            PodDBAdapter.getInstance().close();
+            subscriber.onCompleted();
+        })
+            .subscribeOn(Schedulers.newThread())
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe(() -> {
+                Intent intent = new Intent(SplashActivity.this, MainActivity.class);
+                startActivity(intent);
+                finish();
+            });
+    }
 }
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
index b072aeaf2..dc0ea07ff 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
@@ -23,6 +23,9 @@ import de.danoeh.antennapod.core.service.playback.PlaybackService;
 import de.danoeh.antennapod.core.util.Converter;
 import de.danoeh.antennapod.core.util.playback.Playable;
 import de.danoeh.antennapod.core.util.playback.PlaybackController;
+import rx.Single;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
 
 /**
  * Fragment which is supposed to be displayed outside of the MediaplayerActivity
@@ -127,8 +130,9 @@ public class ExternalPlayerFragment extends Fragment {
     @Override
     public void onResume() {
         super.onResume();
-        controller.init();
         onPositionObserverUpdate();
+
+        controller.init();
     }
 
     @Override
@@ -173,7 +177,14 @@ public class ExternalPlayerFragment extends Fragment {
             return false;
         }
 
-        Playable media = controller.getMedia();
+        Single.create(subscriber -> subscriber.onSuccess(controller.getMedia()))
+                .subscribeOn(Schedulers.newThread())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(media -> updateUi((Playable) media));
+        return true;
+    }
+
+    private void updateUi(Playable media) {
         if (media != null) {
             txtvTitle.setText(media.getEpisodeTitle());
             mFeedName.setText(media.getFeedTitle());
@@ -194,10 +205,8 @@ public class ExternalPlayerFragment extends Fragment {
             } else {
                 butPlay.setVisibility(View.VISIBLE);
             }
-            return true;
         } else {
             Log.w(TAG,  "loadMediaInfo was called while the media object of playbackService was null!");
-            return false;
         }
     }
 
-- 
cgit v1.2.3


From 2d1045cacfefb74a9f835e63d621cb08d9ae079b Mon Sep 17 00:00:00 2001
From: Marc Lasson <marc.lasson@gmail.com>
Date: Sat, 8 Sep 2018 15:52:16 +0200
Subject: Fix typo

---
 .../java/de/danoeh/antennapod/preferences/PreferenceController.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
index 29bbee980..fc00fc784 100644
--- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
+++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
@@ -162,7 +162,7 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
                 break;
             case R.xml.preferences_autodownload:
                 setupAutoDownloadScreen();
-                buildAutodownloadSelectedNetworsPreference();
+                buildAutodownloadSelectedNetworksPreference();
                 setSelectedNetworksEnabled(UserPreferences.isEnableAutodownloadWifiFilter());
                 buildEpisodeCleanupPreference();
                 break;
@@ -953,7 +953,7 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
         return val == null ? "" : val;
     }
 
-    private void buildAutodownloadSelectedNetworsPreference() {
+    private void buildAutodownloadSelectedNetworksPreference() {
         final Activity activity = ui.getActivity();
 
         if (selectedNetworks != null) {
-- 
cgit v1.2.3


From 9fee2110c792ace57bfc82a70f1b41dc50905b4b Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Wed, 26 Sep 2018 16:59:51 +0200
Subject: Implemented number picker preference

---
 .../preferences/NumberPickerPreference.java        | 106 +++++++++++++++++++++
 .../preferences/PreferenceController.java          |  14 +--
 2 files changed, 109 insertions(+), 11 deletions(-)
 create mode 100644 app/src/main/java/de/danoeh/antennapod/preferences/NumberPickerPreference.java

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/NumberPickerPreference.java b/app/src/main/java/de/danoeh/antennapod/preferences/NumberPickerPreference.java
new file mode 100644
index 000000000..20b07e486
--- /dev/null
+++ b/app/src/main/java/de/danoeh/antennapod/preferences/NumberPickerPreference.java
@@ -0,0 +1,106 @@
+package de.danoeh.antennapod.preferences;
+
+import android.app.AlertDialog;
+import android.content.Context;
+import android.support.v7.preference.Preference;
+import android.text.InputFilter;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.WindowManager;
+import android.widget.EditText;
+import de.danoeh.antennapod.R;
+
+public class NumberPickerPreference extends Preference {
+    private Context context;
+    private int defaultValue = 0;
+    private int minValue = 0;
+    private int maxValue = Integer.MAX_VALUE;
+
+    public NumberPickerPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+        init(context, attrs);
+    }
+
+    public NumberPickerPreference(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init(context, attrs);
+    }
+
+    public NumberPickerPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init(context, attrs);
+    }
+
+    public NumberPickerPreference(Context context) {
+        super(context);
+        this.context = context;
+    }
+
+    private void init(Context context, AttributeSet attrs) {
+        this.context = context;
+
+        for (int i = 0; i < attrs.getAttributeCount(); i++) {
+            String name = attrs.getAttributeName(i);
+            String value = attrs.getAttributeValue(i);
+            switch (name) {
+                case "defaultValue":
+                    defaultValue = Integer.parseInt(value);
+                    break;
+                case "minValue":
+                    minValue = Integer.parseInt(value);
+                    break;
+                case "maxValue":
+                    maxValue = Integer.parseInt(value);
+                    break;
+            }
+        }
+    }
+
+    @Override
+    protected void onClick() {
+        super.onClick();
+
+        View view = View.inflate(context, R.layout.numberpicker, null);
+        EditText number = view.findViewById(R.id.number);
+        number.setText(getSharedPreferences().getString(getKey(), ""+defaultValue));
+        number.setFilters(new InputFilter[]{(source, start, end, dest, dstart, dend) -> {
+            try {
+                String newVal = dest.toString().substring(0, dstart) + dest.toString().substring(dend);
+                newVal = newVal.substring(0, dstart) + source.toString() + newVal.substring(dstart);
+                int input = Integer.parseInt(newVal);
+                if (input >= minValue && input <= maxValue) {
+                    return null;
+                }
+            } catch (NumberFormatException nfe) {
+                nfe.printStackTrace();
+            }
+            return "";
+        }});
+
+        AlertDialog dialog = new AlertDialog.Builder(context)
+                .setTitle(getTitle())
+                .setView(view)
+                .setNegativeButton(android.R.string.cancel, null)
+                .setPositiveButton(android.R.string.ok, (dialogInterface, i) -> {
+                    try {
+                        String numberString = number.getText().toString();
+                        int value = Integer.parseInt(numberString);
+
+                        if (value < minValue || value > maxValue) {
+                            return;
+                        }
+
+                        getSharedPreferences().edit().putString(getKey(), "" + value).apply();
+
+                        if (getOnPreferenceChangeListener() != null) {
+                            getOnPreferenceChangeListener().onPreferenceChange(this, value);
+                        }
+                    } catch (NumberFormatException e) {
+                        // Do not set value
+                    }
+                })
+                .create();
+        dialog.show();
+        dialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
+    }
+}
diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
index fc00fc784..c55117ecc 100644
--- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
+++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
@@ -462,18 +462,10 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
         ui.findPreference(UserPreferences.PREF_PARALLEL_DOWNLOADS)
                 .setOnPreferenceChangeListener(
                         (preference, o) -> {
-                            if (o instanceof String) {
-                                try {
-                                    int value = Integer.parseInt((String) o);
-                                    if (1 <= value && value <= 50) {
-                                        setParallelDownloadsText(value);
-                                        return true;
-                                    }
-                                } catch (NumberFormatException e) {
-                                    return false;
-                                }
+                            if (o instanceof Integer) {
+                                setParallelDownloadsText((Integer) o);
                             }
-                            return false;
+                            return true;
                         }
                 );
         // validate and set correct value: number of downloads between 1 and 50 (inclusive)
-- 
cgit v1.2.3


From 3de661d9538b5f67fa6c3318a4096e7fe45c00e3 Mon Sep 17 00:00:00 2001
From: Martin Fietz <martin.fietz@gmail.com>
Date: Sun, 30 Sep 2018 19:58:53 +0200
Subject: Migrate rxjava to version 2

---
 .../danoeh/antennapod/activity/AboutActivity.java  | 18 +++----
 .../antennapod/activity/FeedInfoActivity.java      | 42 +++++++++------
 .../antennapod/activity/FeedSettingsActivity.java  | 53 ++++++++----------
 .../danoeh/antennapod/activity/MainActivity.java   | 24 ++++-----
 .../antennapod/activity/MediaplayerActivity.java   | 62 +++++++++++++---------
 .../activity/MediaplayerInfoActivity.java          | 18 +++----
 .../activity/OnlineFeedViewActivity.java           | 26 ++++-----
 .../danoeh/antennapod/activity/SplashActivity.java | 13 ++---
 .../antennapod/activity/StatisticsActivity.java    | 32 ++++++-----
 .../danoeh/antennapod/asynctask/ExportWorker.java  |  4 +-
 .../de/danoeh/antennapod/dialog/ProxyDialog.java   | 25 +++++----
 .../antennapod/fragment/AllEpisodesFragment.java   | 26 ++++-----
 .../fragment/CompletedDownloadsFragment.java       | 44 +++++++--------
 .../antennapod/fragment/DownloadLogFragment.java   | 24 ++++-----
 .../fragment/ExternalPlayerFragment.java           | 22 +++++---
 .../fragment/FavoriteEpisodesFragment.java         |  4 +-
 .../antennapod/fragment/FyydSearchFragment.java    | 22 ++++----
 .../fragment/ItemDescriptionFragment.java          | 20 +++----
 .../danoeh/antennapod/fragment/ItemFragment.java   | 27 +++++-----
 .../antennapod/fragment/ItemlistFragment.java      | 29 +++++-----
 .../antennapod/fragment/ItunesSearchFragment.java  | 52 +++++++++---------
 .../fragment/PlaybackHistoryFragment.java          | 26 ++++-----
 .../danoeh/antennapod/fragment/QueueFragment.java  | 28 +++++-----
 .../danoeh/antennapod/fragment/SearchFragment.java | 26 ++++-----
 .../antennapod/fragment/SubscriptionFragment.java  | 28 +++++-----
 .../preferences/PreferenceController.java          | 48 ++++++++---------
 26 files changed, 371 insertions(+), 372 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java
index 141fddd1c..6cbfbc6a7 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java
@@ -21,10 +21,10 @@ import java.nio.charset.Charset;
 
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
-import rx.Single;
-import rx.Subscription;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import io.reactivex.Single;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.schedulers.Schedulers;
 
 /**
  * Displays the 'about' screen
@@ -35,7 +35,7 @@ public class AboutActivity extends AppCompatActivity {
 
     private WebView webView;
     private LinearLayout webViewContainer;
-    private Subscription subscription;
+    private Disposable disposable;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -69,7 +69,7 @@ public class AboutActivity extends AppCompatActivity {
     }
 
     private void loadAsset(String filename) {
-        subscription = Single.create(subscriber -> {
+        disposable = Single.create(subscriber -> {
             InputStream input = null;
             try {
                 TypedArray res = AboutActivity.this.getTheme().obtainStyledAttributes(
@@ -115,7 +115,7 @@ public class AboutActivity extends AppCompatActivity {
                 IOUtils.closeQuietly(input);
             }
         })
-                .subscribeOn(Schedulers.newThread())
+                .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(
                         webViewData ->
@@ -146,8 +146,8 @@ public class AboutActivity extends AppCompatActivity {
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        if(subscription != null) {
-            subscription.unsubscribe();
+        if(disposable != null) {
+            disposable.dispose();
         }
         if (webViewContainer != null && webView != null) {
             webViewContainer.removeAllViews();
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/FeedInfoActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/FeedInfoActivity.java
index 6b1272b01..ebb826287 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/FeedInfoActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/FeedInfoActivity.java
@@ -16,8 +16,14 @@ import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
+
 import com.bumptech.glide.Glide;
 import com.joanzapata.iconify.Iconify;
+
+import org.apache.commons.lang3.StringUtils;
+import org.jsoup.Jsoup;
+import org.jsoup.nodes.Document;
+
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.core.dialog.DownloadRequestErrorDialogCreator;
 import de.danoeh.antennapod.core.feed.Feed;
@@ -30,13 +36,11 @@ import de.danoeh.antennapod.core.util.IntentUtils;
 import de.danoeh.antennapod.core.util.LangUtils;
 import de.danoeh.antennapod.core.util.syndication.HtmlToPlainText;
 import de.danoeh.antennapod.menuhandler.FeedMenuHandler;
-import org.apache.commons.lang3.StringUtils;
-import org.jsoup.Jsoup;
-import org.jsoup.nodes.Document;
-import rx.Observable;
-import rx.Subscription;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import io.reactivex.Maybe;
+import io.reactivex.MaybeOnSubscribe;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.schedulers.Schedulers;
 
 /**
  * Displays information about a feed.
@@ -56,7 +60,7 @@ public class FeedInfoActivity extends AppCompatActivity {
     private TextView txtvAuthor;
     private TextView txtvUrl;
 
-    private Subscription subscription;
+    private Disposable disposable;
 
 
     private final View.OnClickListener copyUrlToClipboard = new View.OnClickListener() {
@@ -101,14 +105,17 @@ public class FeedInfoActivity extends AppCompatActivity {
 
         txtvUrl.setOnClickListener(copyUrlToClipboard);
 
-        subscription = Observable.fromCallable(()-> DBReader.getFeed(feedId))
-                .subscribeOn(Schedulers.newThread())
+        disposable = Maybe.create((MaybeOnSubscribe<Feed>) emitter -> {
+            Feed feed = DBReader.getFeed(feedId);
+            if(feed != null) {
+                emitter.onSuccess(feed);
+            } else {
+                emitter.onComplete();
+            }
+        })
+                .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(result -> {
-                    if (result == null) {
-                        Log.e(TAG, "Activity was started with invalid arguments");
-                        finish();
-                    }
                     feed = result;
                     Log.d(TAG, "Language is " + feed.getLanguage());
                     Log.d(TAG, "Author is " + feed.getAuthor());
@@ -164,14 +171,17 @@ public class FeedInfoActivity extends AppCompatActivity {
                 }, error -> {
                     Log.d(TAG, Log.getStackTraceString(error));
                     finish();
+                }, () -> {
+                    Log.e(TAG, "Activity was started with invalid arguments");
+                    finish();
                 });
     }
 
     @Override
     public void onDestroy() {
         super.onDestroy();
-        if(subscription != null) {
-            subscription.unsubscribe();
+        if(disposable != null) {
+            disposable.dispose();
         }
     }
 
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/FeedSettingsActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/FeedSettingsActivity.java
index 5e15585a5..0a724d149 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/FeedSettingsActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/FeedSettingsActivity.java
@@ -1,6 +1,5 @@
 package de.danoeh.antennapod.activity;
 
-import android.content.ClipData;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -24,8 +23,9 @@ import android.widget.ImageView;
 import android.widget.RadioButton;
 import android.widget.Spinner;
 import android.widget.TextView;
-import android.widget.Toast;
+
 import com.bumptech.glide.Glide;
+
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.core.dialog.ConfirmationDialog;
 import de.danoeh.antennapod.core.dialog.DownloadRequestErrorDialogCreator;
@@ -40,10 +40,11 @@ import de.danoeh.antennapod.core.storage.DBWriter;
 import de.danoeh.antennapod.core.storage.DownloadRequestException;
 import de.danoeh.antennapod.core.util.IntentUtils;
 import de.danoeh.antennapod.menuhandler.FeedMenuHandler;
-import rx.Observable;
-import rx.Subscription;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import io.reactivex.Maybe;
+import io.reactivex.MaybeOnSubscribe;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.schedulers.Schedulers;
 
 /**
  * Displays information about a feed.
@@ -67,23 +68,7 @@ public class FeedSettingsActivity extends AppCompatActivity {
     private Spinner spnAutoDelete;
     private boolean filterInclude = true;
 
-    private Subscription subscription;
-
-
-    private final View.OnClickListener copyUrlToClipboard = new View.OnClickListener() {
-        @Override
-        public void onClick(View v) {
-            if(feed != null && feed.getDownload_url() != null) {
-                String url = feed.getDownload_url();
-                ClipData clipData = ClipData.newPlainText(url, url);
-                android.content.ClipboardManager cm = (android.content.ClipboardManager) FeedSettingsActivity.this
-                        .getSystemService(Context.CLIPBOARD_SERVICE);
-                cm.setPrimaryClip(clipData);
-                Toast t = Toast.makeText(FeedSettingsActivity.this, R.string.copied_url_msg, Toast.LENGTH_SHORT);
-                t.show();
-            }
-        }
-    };
+    private Disposable disposable;
 
     private boolean authInfoChanged = false;
 
@@ -153,14 +138,17 @@ public class FeedSettingsActivity extends AppCompatActivity {
             filterTextChanged = true;
         });
 
-        subscription = Observable.fromCallable(()-> DBReader.getFeed(feedId))
-                .subscribeOn(Schedulers.newThread())
+        disposable = Maybe.create((MaybeOnSubscribe<Feed>) emitter -> {
+            Feed feed = DBReader.getFeed(feedId);
+            if(feed != null) {
+                emitter.onSuccess(feed);
+            } else {
+                emitter.onComplete();
+            }
+        })
+                .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(result -> {
-                    if (result == null) {
-                        Log.e(TAG, "Activity was started with invalid arguments");
-                        finish();
-                    }
                     feed = result;
                     FeedPreferences prefs = feed.getPreferences();
                     Glide.with(FeedSettingsActivity.this)
@@ -259,6 +247,9 @@ public class FeedSettingsActivity extends AppCompatActivity {
                 }, error -> {
                     Log.d(TAG, Log.getStackTraceString(error));
                     finish();
+                }, () -> {
+                    Log.e(TAG, "Activity was started with invalid arguments");
+                    finish();
                 });
     }
 
@@ -296,8 +287,8 @@ public class FeedSettingsActivity extends AppCompatActivity {
     @Override
     public void onDestroy() {
         super.onDestroy();
-        if(subscription != null) {
-            subscription.unsubscribe();
+        if(disposable != null) {
+            disposable.dispose();
         }
     }
 
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
index 0879b2cec..71f18ec01 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
@@ -30,9 +30,6 @@ import android.widget.ListView;
 
 import com.bumptech.glide.Glide;
 
-import de.danoeh.antennapod.core.event.ServiceEvent;
-import de.danoeh.antennapod.core.util.IntentUtils;
-import de.danoeh.antennapod.core.util.gui.NotificationUtils;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.Validate;
 
@@ -45,6 +42,7 @@ import de.danoeh.antennapod.core.dialog.ConfirmationDialog;
 import de.danoeh.antennapod.core.event.MessageEvent;
 import de.danoeh.antennapod.core.event.ProgressEvent;
 import de.danoeh.antennapod.core.event.QueueEvent;
+import de.danoeh.antennapod.core.event.ServiceEvent;
 import de.danoeh.antennapod.core.feed.EventDistributor;
 import de.danoeh.antennapod.core.feed.Feed;
 import de.danoeh.antennapod.core.preferences.PlaybackPreferences;
@@ -55,7 +53,9 @@ import de.danoeh.antennapod.core.storage.DBTasks;
 import de.danoeh.antennapod.core.storage.DBWriter;
 import de.danoeh.antennapod.core.util.FeedItemUtil;
 import de.danoeh.antennapod.core.util.Flavors;
+import de.danoeh.antennapod.core.util.IntentUtils;
 import de.danoeh.antennapod.core.util.StorageUtils;
+import de.danoeh.antennapod.core.util.gui.NotificationUtils;
 import de.danoeh.antennapod.dialog.RatingDialog;
 import de.danoeh.antennapod.dialog.RenameFeedDialog;
 import de.danoeh.antennapod.fragment.AddFeedFragment;
@@ -68,10 +68,10 @@ import de.danoeh.antennapod.fragment.QueueFragment;
 import de.danoeh.antennapod.fragment.SubscriptionFragment;
 import de.danoeh.antennapod.menuhandler.NavDrawerActivity;
 import de.greenrobot.event.EventBus;
-import rx.Observable;
-import rx.Subscription;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import io.reactivex.Observable;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.schedulers.Schedulers;
 
 /**
  * The activity that is shown when the user launches the app.
@@ -121,7 +121,7 @@ public class MainActivity extends CastEnabledActivity implements NavDrawerActivi
 
     private ProgressDialog pd;
 
-    private Subscription subscription;
+    private Disposable disposable;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -488,8 +488,8 @@ public class MainActivity extends CastEnabledActivity implements NavDrawerActivi
         super.onStop();
         EventDistributor.getInstance().unregister(contentUpdate);
         EventBus.getDefault().unregister(this);
-        if(subscription != null) {
-            subscription.unsubscribe();
+        if(disposable != null) {
+            disposable.dispose();
         }
         if(pd != null) {
             pd.dismiss();
@@ -717,8 +717,8 @@ public class MainActivity extends CastEnabledActivity implements NavDrawerActivi
     };
 
     private void loadData() {
-        subscription = Observable.fromCallable(DBReader::getNavDrawerData)
-                .subscribeOn(Schedulers.newThread())
+        disposable = Observable.fromCallable(DBReader::getNavDrawerData)
+                .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(result -> {
                     boolean handleIntent = (navDrawerData == null);
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
index be9d60c93..09d2c447d 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
@@ -47,9 +47,11 @@ import de.danoeh.antennapod.core.service.playback.PlaybackService;
 import de.danoeh.antennapod.core.storage.DBReader;
 import de.danoeh.antennapod.core.storage.DBTasks;
 import de.danoeh.antennapod.core.storage.DBWriter;
+import de.danoeh.antennapod.core.util.Consumer;
 import de.danoeh.antennapod.core.util.Converter;
 import de.danoeh.antennapod.core.util.FeedItemUtil;
 import de.danoeh.antennapod.core.util.Flavors;
+import de.danoeh.antennapod.core.util.Function;
 import de.danoeh.antennapod.core.util.IntentUtils;
 import de.danoeh.antennapod.core.util.ShareUtils;
 import de.danoeh.antennapod.core.util.StorageUtils;
@@ -62,11 +64,10 @@ import de.danoeh.antennapod.core.util.playback.PlaybackController;
 import de.danoeh.antennapod.core.util.playback.PlaybackServiceStarter;
 import de.danoeh.antennapod.dialog.SleepTimerDialog;
 import de.danoeh.antennapod.dialog.VariableSpeedDialog;
-import rx.Observable;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.functions.Action1;
-import rx.functions.Func1;
-import rx.schedulers.Schedulers;
+import io.reactivex.Observable;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.schedulers.Schedulers;
 
 
 /**
@@ -95,6 +96,8 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements
 
     private boolean isFavorite = false;
 
+    private Disposable disposable;
+
     private PlaybackController newPlaybackController() {
         return new PlaybackController(this, false) {
 
@@ -293,6 +296,9 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements
             controller.release();
             controller = null; // prevent leak
         }
+        if(disposable != null) {
+            disposable.dispose();
+        }
         super.onStop();
     }
 
@@ -644,7 +650,6 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements
             if (controller != null) {
                 controller.init();
             }
-
         }
     }
 
@@ -730,8 +735,8 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements
                 R.string.pref_rewind);
 
         private final Supplier<Integer> getPrefSecsFn;
-        private final Func1<MediaplayerActivity, TextView> getTextViewFn;
-        private final Action1<Integer> setPrefSecsFn;
+        private final Function<MediaplayerActivity, TextView> getTextViewFn;
+        private final Consumer<Integer> setPrefSecsFn;
         private final int titleResourceID;
 
         /**
@@ -743,7 +748,7 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements
          * @param setPrefSecsFn Handle to function that sets the preference (setting) for the skip delta value (and optionally updates the button label with the current values)
          * @param titleResourceID ID of the resource string with the title for a view
          */
-        SkipDirection(Supplier<Integer> getPrefSecsFn, Func1<MediaplayerActivity, TextView> getTextViewFn, Action1<Integer> setPrefSecsFn, int titleResourceID) {
+        SkipDirection(Supplier<Integer> getPrefSecsFn, Function<MediaplayerActivity, TextView> getTextViewFn, Consumer<Integer> setPrefSecsFn, int titleResourceID) {
             this.getPrefSecsFn = getPrefSecsFn;
             this.getTextViewFn = getTextViewFn;
             this.setPrefSecsFn = setPrefSecsFn;
@@ -762,10 +767,10 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements
          * @param activity MediaplyerActivity that contains textview to update the display of the skip delta setting (or null if nothing to update)
          */
         public void setPrefSkipSeconds(int seconds, @Nullable Activity activity) {
-            setPrefSecsFn.call(seconds);
+            setPrefSecsFn.accept(seconds);
 
             if (activity != null && activity instanceof  MediaplayerActivity)  {
-                TextView tv = getTextViewFn.call((MediaplayerActivity)activity);
+                TextView tv = getTextViewFn.apply((MediaplayerActivity)activity);
                 if (tv != null) tv.setText(String.valueOf(seconds));
             }
         }
@@ -946,22 +951,27 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements
 
     private void checkFavorite() {
         Playable playable = controller.getMedia();
-        if (playable != null && playable instanceof FeedMedia) {
-            FeedItem feedItem = ((FeedMedia) playable).getItem();
-            if (feedItem != null) {
-                Observable.fromCallable(() -> DBReader.getFeedItem(feedItem.getId()))
-                    .subscribeOn(Schedulers.newThread())
-                    .observeOn(AndroidSchedulers.mainThread())
-                    .subscribe(
-                        item -> {
-                            boolean isFav = item.isTagged(FeedItem.TAG_FAVORITE);
-                            if (isFavorite != isFav) {
-                                isFavorite = isFav;
-                                invalidateOptionsMenu();
-                            }
-                        }, error -> Log.e(TAG, Log.getStackTraceString(error)));
-            }
+        if (!(playable instanceof FeedMedia)) {
+            return;
+        }
+        FeedItem feedItem = ((FeedMedia) playable).getItem();
+        if (feedItem == null) {
+            return;
         }
+        if(disposable != null) {
+            disposable.dispose();
+        }
+        disposable = Observable.fromCallable(() -> DBReader.getFeedItem(feedItem.getId()))
+            .subscribeOn(Schedulers.io())
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe(
+                item -> {
+                    boolean isFav = item.isTagged(FeedItem.TAG_FAVORITE);
+                    if (isFavorite != isFav) {
+                        isFavorite = isFav;
+                        invalidateOptionsMenu();
+                    }
+                }, error -> Log.e(TAG, Log.getStackTraceString(error)));
     }
 
     void playExternalMedia(Intent intent, MediaType type) {
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerInfoActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerInfoActivity.java
index 49a0e898b..feac289cc 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerInfoActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerInfoActivity.java
@@ -63,10 +63,10 @@ import de.danoeh.antennapod.fragment.QueueFragment;
 import de.danoeh.antennapod.fragment.SubscriptionFragment;
 import de.danoeh.antennapod.menuhandler.NavDrawerActivity;
 import de.greenrobot.event.EventBus;
-import rx.Observable;
-import rx.Subscription;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import io.reactivex.Observable;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.schedulers.Schedulers;
 
 /**
  * Activity for playing files that do not require a video surface.
@@ -106,7 +106,7 @@ public abstract class MediaplayerInfoActivity extends MediaplayerActivity implem
     private ViewPager pager;
     private MediaplayerInfoPagerAdapter pagerAdapter;
 
-    private Subscription subscription;
+    private Disposable disposable;
 
     @Override
     protected void onPause() {
@@ -127,8 +127,8 @@ public abstract class MediaplayerInfoActivity extends MediaplayerActivity implem
         if(pagerAdapter != null) {
             pagerAdapter.setController(null);
         }
-        if(subscription != null) {
-            subscription.unsubscribe();
+        if(disposable != null) {
+            disposable.dispose();
         }
         EventDistributor.getInstance().unregister(contentUpdate);
         saveCurrentFragment();
@@ -472,8 +472,8 @@ public abstract class MediaplayerInfoActivity extends MediaplayerActivity implem
     private DBReader.NavDrawerData navDrawerData;
 
     private void loadData() {
-        subscription = Observable.fromCallable(DBReader::getNavDrawerData)
-                .subscribeOn(Schedulers.newThread())
+        disposable = Observable.fromCallable(DBReader::getNavDrawerData)
+                .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(result -> {
                     navDrawerData = result;
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
index 28cabfbc7..ea063e47d 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
@@ -65,10 +65,10 @@ import de.danoeh.antennapod.core.util.syndication.FeedDiscoverer;
 import de.danoeh.antennapod.core.util.syndication.HtmlToPlainText;
 import de.danoeh.antennapod.dialog.AuthenticationDialog;
 import de.greenrobot.event.EventBus;
-import rx.Observable;
-import rx.Subscription;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import io.reactivex.Observable;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.schedulers.Schedulers;
 
 /**
  * Downloads a feed from a feed URL and parses it. Subclasses can display the
@@ -97,15 +97,15 @@ public class OnlineFeedViewActivity extends AppCompatActivity {
 
     private Button subscribeButton;
 
-    private Subscription download;
-    private Subscription parser;
-    private Subscription updater;
+    private Disposable download;
+    private Disposable parser;
+    private Disposable updater;
     private final EventDistributor.EventListener listener = new EventDistributor.EventListener() {
         @Override
         public void update(EventDistributor eventDistributor, Integer arg) {
             if ((arg & EventDistributor.FEED_LIST_UPDATE) != 0) {
                 updater = Observable.fromCallable(DBReader::getFeedList)
-                        .subscribeOn(Schedulers.newThread())
+                        .subscribeOn(Schedulers.io())
                         .observeOn(AndroidSchedulers.mainThread())
                         .subscribe(
                                 feeds -> {
@@ -212,13 +212,13 @@ public class OnlineFeedViewActivity extends AppCompatActivity {
     public void onDestroy() {
         super.onDestroy();
         if(updater != null) {
-            updater.unsubscribe();
+            updater.dispose();
         }
         if(download != null) {
-            download.unsubscribe();
+            download.dispose();
         }
         if(parser != null) {
-            parser.unsubscribe();
+            parser.dispose();
         }
     }
 
@@ -273,7 +273,7 @@ public class OnlineFeedViewActivity extends AppCompatActivity {
                     downloader.call();
                     return downloader.getResult();
                 })
-                .subscribeOn(Schedulers.newThread())
+                .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(this::checkDownloadResult,
                         error -> Log.e(TAG, Log.getStackTraceString(error)));
@@ -331,7 +331,7 @@ public class OnlineFeedViewActivity extends AppCompatActivity {
                         Log.d(TAG, "Deleted feed source file. Result: " + rc);
                     }
                 })
-                .subscribeOn(Schedulers.newThread())
+                .subscribeOn(Schedulers.computation())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(result -> {
                     if(result != null) {
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/SplashActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/SplashActivity.java
index 73b495a42..727e83320 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/SplashActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/SplashActivity.java
@@ -9,11 +9,12 @@ import android.support.annotation.Nullable;
 import android.support.v4.graphics.drawable.DrawableCompat;
 import android.support.v7.app.AppCompatActivity;
 import android.widget.ProgressBar;
+
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.core.storage.PodDBAdapter;
-import rx.Completable;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import io.reactivex.Completable;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 
 /**
  * Shows the AntennaPod logo while waiting for the main activity to start
@@ -37,14 +38,14 @@ public class SplashActivity extends AppCompatActivity {
             // Trigger schema updates
             PodDBAdapter.getInstance().open();
             PodDBAdapter.getInstance().close();
-            subscriber.onCompleted();
+            subscriber.onComplete();
         })
-            .subscribeOn(Schedulers.newThread())
+            .subscribeOn(Schedulers.io())
             .observeOn(AndroidSchedulers.mainThread())
             .subscribe(() -> {
                 Intent intent = new Intent(SplashActivity.this, MainActivity.class);
-                startActivity(intent);
                 finish();
+                startActivity(intent);
             });
     }
 }
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/StatisticsActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/StatisticsActivity.java
index b2ff43c43..0ed4be906 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/StatisticsActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/StatisticsActivity.java
@@ -20,10 +20,10 @@ import de.danoeh.antennapod.adapter.StatisticsListAdapter;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.core.storage.DBReader;
 import de.danoeh.antennapod.core.util.Converter;
-import rx.Observable;
-import rx.Subscription;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import io.reactivex.Observable;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.schedulers.Schedulers;
 
 /**
  * Displays the 'statistics' screen
@@ -35,7 +35,7 @@ public class StatisticsActivity extends AppCompatActivity
     private static final String PREF_NAME = "StatisticsActivityPrefs";
     private static final String PREF_COUNT_ALL = "countAll";
 
-    private Subscription subscription;
+    private Disposable disposable;
     private TextView totalTimeTextView;
     private ListView feedStatisticsList;
     private ProgressBar progressBar;
@@ -119,21 +119,19 @@ public class StatisticsActivity extends AppCompatActivity
     }
 
     private void loadStatistics() {
-        if (subscription != null) {
-            subscription.unsubscribe();
+        if (disposable != null) {
+            disposable.dispose();
         }
-        subscription = Observable.fromCallable(() -> DBReader.getStatistics(countAll))
-                .subscribeOn(Schedulers.newThread())
+        disposable = Observable.fromCallable(() -> DBReader.getStatistics(countAll))
+                .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(result -> {
-                    if (result != null) {
-                        totalTimeTextView.setText(Converter
-                                .shortLocalizedDuration(this, countAll ? result.totalTimeCountAll : result.totalTime));
-                        listAdapter.update(result.feedTime);
-                        progressBar.setVisibility(View.GONE);
-                        totalTimeTextView.setVisibility(View.VISIBLE);
-                        feedStatisticsList.setVisibility(View.VISIBLE);
-                    }
+                    totalTimeTextView.setText(Converter
+                            .shortLocalizedDuration(this, countAll ? result.totalTimeCountAll : result.totalTime));
+                    listAdapter.update(result.feedTime);
+                    progressBar.setVisibility(View.GONE);
+                    totalTimeTextView.setVisibility(View.VISIBLE);
+                    feedStatisticsList.setVisibility(View.VISIBLE);
                 }, error -> Log.e(TAG, Log.getStackTraceString(error)));
     }
 
diff --git a/app/src/main/java/de/danoeh/antennapod/asynctask/ExportWorker.java b/app/src/main/java/de/danoeh/antennapod/asynctask/ExportWorker.java
index b6cf5cb84..7c3c570a0 100644
--- a/app/src/main/java/de/danoeh/antennapod/asynctask/ExportWorker.java
+++ b/app/src/main/java/de/danoeh/antennapod/asynctask/ExportWorker.java
@@ -12,7 +12,7 @@ import de.danoeh.antennapod.core.export.ExportWriter;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.core.storage.DBReader;
 import de.danoeh.antennapod.core.util.LangUtils;
-import rx.Observable;
+import io.reactivex.Observable;
 
 /**
  * Writes an OPML file into the export directory in the background.
@@ -57,7 +57,7 @@ public class ExportWorker {
                         subscriber.onError(e);
                     }
                 }
-                subscriber.onCompleted();
+                subscriber.onComplete();
             }
         });
     }
diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/ProxyDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/ProxyDialog.java
index b9276982a..f5632cad3 100644
--- a/app/src/main/java/de/danoeh/antennapod/dialog/ProxyDialog.java
+++ b/app/src/main/java/de/danoeh/antennapod/dialog/ProxyDialog.java
@@ -29,15 +29,15 @@ import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.core.service.download.AntennapodHttpClient;
 import de.danoeh.antennapod.core.service.download.ProxyConfig;
+import io.reactivex.Single;
+import io.reactivex.SingleOnSubscribe;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.schedulers.Schedulers;
 import okhttp3.Credentials;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
-import rx.Observable;
-import rx.Subscriber;
-import rx.Subscription;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
 
 public class ProxyDialog {
 
@@ -55,7 +55,7 @@ public class ProxyDialog {
 
     private boolean testSuccessful = false;
     private TextView txtvMessage;
-    private Subscription subscription;
+    private Disposable disposable;
 
     public ProxyDialog(Context context) {
         this.context = context;
@@ -229,8 +229,8 @@ public class ProxyDialog {
     }
 
     private void test() {
-        if(subscription != null) {
-            subscription.unsubscribe();
+        if(disposable != null) {
+            disposable.dispose();
         }
         if(!checkValidity()) {
             setTestRequired(true);
@@ -243,7 +243,7 @@ public class ProxyDialog {
         txtvMessage.setTextColor(textColorPrimary);
         txtvMessage.setText("{fa-circle-o-notch spin} " + checking);
         txtvMessage.setVisibility(View.VISIBLE);
-        subscription = Observable.create((Observable.OnSubscribe<Response>) subscriber -> {
+        disposable = Single.create((SingleOnSubscribe<Response>) emitter -> {
             String type = (String) spType.getSelectedItem();
             String host = etHost.getText().toString();
             String port = etPort.getText().toString();
@@ -275,13 +275,12 @@ public class ProxyDialog {
                     .build();
             try {
                 Response response = client.newCall(request).execute();
-                subscriber.onNext(response);
+                emitter.onSuccess(response);
             } catch(IOException e) {
-                subscriber.onError(e);
+                emitter.onError(e);
             }
-            subscriber.onCompleted();
         })
-                .subscribeOn(Schedulers.newThread())
+                .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(
                         response -> {
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java
index 497891dbd..e98265a82 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java
@@ -50,10 +50,10 @@ import de.danoeh.antennapod.core.util.LongList;
 import de.danoeh.antennapod.menuhandler.FeedItemMenuHandler;
 import de.danoeh.antennapod.menuhandler.MenuItemUtils;
 import de.greenrobot.event.EventBus;
-import rx.Observable;
-import rx.Subscription;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import io.reactivex.Observable;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.schedulers.Schedulers;
 
 /**
  * Shows unread or recently published episodes
@@ -84,7 +84,7 @@ public class AllEpisodesFragment extends Fragment {
     private boolean isUpdatingFeeds;
     boolean isMenuInvalidationAllowed = false;
 
-    Subscription subscription;
+    Disposable disposable;
     private LinearLayoutManager layoutManager;
 
     boolean showOnlyNewEpisodes() { return false; }
@@ -125,8 +125,8 @@ public class AllEpisodesFragment extends Fragment {
     public void onStop() {
         super.onStop();
         EventDistributor.getInstance().unregister(contentUpdate);
-        if(subscription != null) {
-            subscription.unsubscribe();
+        if(disposable != null) {
+            disposable.dispose();
         }
     }
 
@@ -466,15 +466,15 @@ public class AllEpisodesFragment extends Fragment {
     }
 
     void loadItems() {
-        if(subscription != null) {
-            subscription.unsubscribe();
+        if(disposable != null) {
+            disposable.dispose();
         }
         if (viewsCreated && !itemsLoaded) {
             recyclerView.setVisibility(View.GONE);
             progLoading.setVisibility(View.VISIBLE);
         }
-        subscription = Observable.fromCallable(this::loadData)
-                .subscribeOn(Schedulers.newThread())
+        disposable = Observable.fromCallable(this::loadData)
+                .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(data -> {
                     recyclerView.setVisibility(View.VISIBLE);
@@ -499,8 +499,8 @@ public class AllEpisodesFragment extends Fragment {
         }
 
         Log.d(TAG, "markItemAsSeenWithUndo(" + item.getId() + ")");
-        if (subscription != null) {
-            subscription.unsubscribe();
+        if (disposable != null) {
+            disposable.dispose();
         }
         // we're marking it as unplayed since the user didn't actually play it
         // but they don't want it considered 'NEW' anymore
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java
index f6d503b29..d2b9d2f67 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java
@@ -1,8 +1,6 @@
 package de.danoeh.antennapod.fragment;
 
 import android.content.Context;
-import android.content.res.TypedArray;
-import android.graphics.Color;
 import android.os.Bundle;
 import android.support.v4.app.ListFragment;
 import android.util.Log;
@@ -12,9 +10,6 @@ import android.view.MenuItem;
 import android.view.View;
 import android.widget.ListView;
 
-import com.joanzapata.iconify.IconDrawable;
-import com.joanzapata.iconify.fonts.FontAwesomeIcons;
-
 import java.util.List;
 
 import de.danoeh.antennapod.R;
@@ -22,15 +17,14 @@ import de.danoeh.antennapod.activity.MainActivity;
 import de.danoeh.antennapod.adapter.DownloadedEpisodesListAdapter;
 import de.danoeh.antennapod.core.feed.EventDistributor;
 import de.danoeh.antennapod.core.feed.FeedItem;
-import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.core.storage.DBReader;
 import de.danoeh.antennapod.core.storage.DBWriter;
 import de.danoeh.antennapod.core.util.FeedItemUtil;
 import de.danoeh.antennapod.dialog.EpisodesApplyActionFragment;
-import rx.Observable;
-import rx.Subscription;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import io.reactivex.Observable;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.schedulers.Schedulers;
 
 /**
  * Displays all running downloads and provides a button to delete them
@@ -48,7 +42,7 @@ public class CompletedDownloadsFragment extends ListFragment {
 
     private boolean viewCreated = false;
 
-    private Subscription subscription;
+    private Disposable disposable;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -67,16 +61,16 @@ public class CompletedDownloadsFragment extends ListFragment {
     public void onStop() {
         super.onStop();
         EventDistributor.getInstance().unregister(contentUpdate);
-        if(subscription != null) {
-            subscription.unsubscribe();
+        if(disposable != null) {
+            disposable.dispose();
         }
     }
 
     @Override
     public void onDetach() {
         super.onDetach();
-        if(subscription != null) {
-            subscription.unsubscribe();
+        if(disposable != null) {
+            disposable.dispose();
         }
     }
 
@@ -85,8 +79,8 @@ public class CompletedDownloadsFragment extends ListFragment {
         super.onDestroyView();
         listAdapter = null;
         viewCreated = false;
-        if(subscription != null) {
-            subscription.unsubscribe();
+        if(disposable != null) {
+            disposable.dispose();
         }
     }
 
@@ -188,21 +182,19 @@ public class CompletedDownloadsFragment extends ListFragment {
     };
 
     private void loadItems() {
-        if(subscription != null) {
-            subscription.unsubscribe();
+        if(disposable != null) {
+            disposable.dispose();
         }
         if (items == null && viewCreated) {
             setListShown(false);
         }
-        subscription = Observable.fromCallable(DBReader::getDownloadedItems)
-                .subscribeOn(Schedulers.newThread())
+        disposable = Observable.fromCallable(DBReader::getDownloadedItems)
+                .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(result -> {
-                    if (result != null) {
-                        items = result;
-                        if (viewCreated && getActivity() != null) {
-                            onFragmentLoaded();
-                        }
+                    items = result;
+                    if (viewCreated && getActivity() != null) {
+                        onFragmentLoaded();
                     }
                 }, error ->  Log.e(TAG, Log.getStackTraceString(error)));
     }
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/DownloadLogFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/DownloadLogFragment.java
index ae9c60f65..5ab6bac63 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/DownloadLogFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/DownloadLogFragment.java
@@ -12,10 +12,10 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.ListView;
+import android.widget.TextView;
 
 import java.util.List;
 
-import android.widget.TextView;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.adapter.DownloadLogAdapter;
 import de.danoeh.antennapod.core.feed.EventDistributor;
@@ -23,10 +23,10 @@ import de.danoeh.antennapod.core.feed.FeedMedia;
 import de.danoeh.antennapod.core.service.download.DownloadStatus;
 import de.danoeh.antennapod.core.storage.DBReader;
 import de.danoeh.antennapod.core.storage.DBWriter;
-import rx.Observable;
-import rx.Subscription;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import io.reactivex.Observable;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.schedulers.Schedulers;
 
 /**
  * Shows the download log
@@ -41,7 +41,7 @@ public class DownloadLogFragment extends ListFragment {
     private boolean viewsCreated = false;
     private boolean itemsLoaded = false;
 
-    private Subscription subscription;
+    private Disposable disposable;
 
     @Override
     public void onStart() {
@@ -55,8 +55,8 @@ public class DownloadLogFragment extends ListFragment {
     public void onStop() {
         super.onStop();
         EventDistributor.getInstance().unregister(contentUpdate);
-        if(subscription != null) {
-            subscription.unsubscribe();
+        if(disposable != null) {
+            disposable.dispose();
         }
     }
 
@@ -178,11 +178,11 @@ public class DownloadLogFragment extends ListFragment {
     }
 
     private void loadItems() {
-        if(subscription != null) {
-            subscription.unsubscribe();
+        if(disposable != null) {
+            disposable.dispose();
         }
-        subscription = Observable.fromCallable(DBReader::getDownloadLog)
-                .subscribeOn(Schedulers.newThread())
+        disposable = Observable.fromCallable(DBReader::getDownloadLog)
+                .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(result -> {
                     if (result != null) {
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
index dc0ea07ff..0f4d6b6eb 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
@@ -23,9 +23,10 @@ import de.danoeh.antennapod.core.service.playback.PlaybackService;
 import de.danoeh.antennapod.core.util.Converter;
 import de.danoeh.antennapod.core.util.playback.Playable;
 import de.danoeh.antennapod.core.util.playback.PlaybackController;
-import rx.Single;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import io.reactivex.Maybe;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.schedulers.Schedulers;
 
 /**
  * Fragment which is supposed to be displayed outside of the MediaplayerActivity
@@ -41,6 +42,7 @@ public class ExternalPlayerFragment extends Fragment {
     private TextView mFeedName;
     private ProgressBar mProgressBar;
     private PlaybackController controller;
+    private Disposable disposable;
 
     public ExternalPlayerFragment() {
         super();
@@ -177,10 +179,18 @@ public class ExternalPlayerFragment extends Fragment {
             return false;
         }
 
-        Single.create(subscriber -> subscriber.onSuccess(controller.getMedia()))
-                .subscribeOn(Schedulers.newThread())
+        disposable = Maybe.create(emitter -> {
+                    Playable media = controller.getMedia();
+                    if(media != null) {
+                        emitter.onSuccess(media);
+                    } else {
+                        emitter.onComplete();
+                    }
+                })
+                .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(media -> updateUi((Playable) media));
+                .subscribe(media -> updateUi((Playable) media),
+                        error -> Log.e(TAG, Log.getStackTraceString(error)));
         return true;
     }
 
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/FavoriteEpisodesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/FavoriteEpisodesFragment.java
index 76d19d61c..70f82c2ec 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/FavoriteEpisodesFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/FavoriteEpisodesFragment.java
@@ -62,8 +62,8 @@ public class FavoriteEpisodesFragment extends AllEpisodesFragment {
                 AllEpisodesRecycleAdapter.Holder holder = (AllEpisodesRecycleAdapter.Holder)viewHolder;
                 Log.d(TAG, "remove(" + holder.getItemId() + ")");
 
-                if (subscription != null) {
-                    subscription.unsubscribe();
+                if (disposable != null) {
+                    disposable.dispose();
                 }
                 FeedItem item = holder.getFeedItem();
                 if (item != null) {
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/FyydSearchFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/FyydSearchFragment.java
index 6ee9ce467..a5fd467a7 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/FyydSearchFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/FyydSearchFragment.java
@@ -28,9 +28,9 @@ import de.danoeh.antennapod.menuhandler.MenuItemUtils;
 import de.mfietz.fyydlin.FyydClient;
 import de.mfietz.fyydlin.FyydResponse;
 import de.mfietz.fyydlin.SearchHit;
-import rx.Subscription;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.schedulers.Schedulers;
 
 import static de.danoeh.antennapod.adapter.itunes.ItunesAdapter.Podcast;
 import static java.util.Collections.emptyList;
@@ -55,7 +55,7 @@ public class FyydSearchFragment extends Fragment {
      * List of podcasts retreived from the search
      */
     private List<Podcast> searchResults;
-    private Subscription subscription;
+    private Disposable disposable;
 
     /**
      * Constructor
@@ -98,8 +98,8 @@ public class FyydSearchFragment extends Fragment {
     @Override
     public void onDestroy() {
         super.onDestroy();
-        if (subscription != null) {
-            subscription.unsubscribe();
+        if (disposable != null) {
+            disposable.dispose();
         }
         adapter = null;
     }
@@ -141,12 +141,12 @@ public class FyydSearchFragment extends Fragment {
     }
 
     private void search(String query) {
-        if (subscription != null) {
-            subscription.unsubscribe();
+        if (disposable != null) {
+            disposable.dispose();
         }
         showOnlyProgressBar();
-        subscription =  client.searchPodcasts(query)
-                .subscribeOn(Schedulers.newThread())
+        disposable =  client.searchPodcasts(query, 10)
+                .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(result -> {
                     progressBar.setVisibility(View.GONE);
@@ -174,7 +174,7 @@ public class FyydSearchFragment extends Fragment {
         if (!response.getData().isEmpty()) {
             adapter.clear();
             searchResults = new ArrayList<>();
-            for (SearchHit searchHit : response.getData().values()) {
+            for (SearchHit searchHit : response.getData()) {
                 Podcast podcast = Podcast.fromSearch(searchHit);
                 searchResults.add(podcast);
             }
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java
index 829e1924a..4ee7a06ad 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java
@@ -39,10 +39,10 @@ import de.danoeh.antennapod.core.util.ShownotesProvider;
 import de.danoeh.antennapod.core.util.playback.Playable;
 import de.danoeh.antennapod.core.util.playback.PlaybackController;
 import de.danoeh.antennapod.core.util.playback.Timeline;
-import rx.Observable;
-import rx.Subscription;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import io.reactivex.Observable;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.schedulers.Schedulers;
 
 /**
  * Displays the description of a Playable object in a Webview.
@@ -66,7 +66,7 @@ public class ItemDescriptionFragment extends Fragment implements MediaplayerInfo
     private ShownotesProvider shownotesProvider;
     private Playable media;
 
-    private Subscription webViewLoader;
+    private Disposable webViewLoader;
 
     /**
      * URL that was selected via long-press.
@@ -167,7 +167,7 @@ public class ItemDescriptionFragment extends Fragment implements MediaplayerInfo
         super.onDestroy();
         Log.d(TAG, "Fragment destroyed");
         if (webViewLoader != null) {
-            webViewLoader.unsubscribe();
+            webViewLoader.dispose();
         }
         if (webvDescription != null) {
             webvDescription.removeAllViews();
@@ -198,7 +198,7 @@ public class ItemDescriptionFragment extends Fragment implements MediaplayerInfo
         } else if (args.containsKey(ARG_FEEDITEM_ID)) {
             long id = getArguments().getLong(ARG_FEEDITEM_ID);
             Observable.defer(() -> Observable.just(DBReader.getFeedItem(id)))
-                    .subscribeOn(Schedulers.newThread())
+                    .subscribeOn(Schedulers.io())
                     .observeOn(AndroidSchedulers.mainThread())
                     .subscribe(feedItem -> {
                         shownotesProvider = feedItem;
@@ -298,13 +298,13 @@ public class ItemDescriptionFragment extends Fragment implements MediaplayerInfo
     private void load() {
         Log.d(TAG, "load()");
         if(webViewLoader != null) {
-            webViewLoader.unsubscribe();
+            webViewLoader.dispose();
         }
         if(shownotesProvider == null) {
             return;
         }
-        webViewLoader = Observable.defer(() -> Observable.just(loadData()))
-                .subscribeOn(Schedulers.newThread())
+        webViewLoader = Observable.fromCallable(this::loadData)
+                .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(data -> {
                     webvDescription.loadDataWithBaseURL(null, data, "text/html",
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 5075d022a..cfcc99171 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
@@ -34,8 +34,6 @@ import com.bumptech.glide.Glide;
 import com.joanzapata.iconify.Iconify;
 import com.joanzapata.iconify.widget.IconButton;
 
-import de.danoeh.antennapod.core.service.playback.PlaybackService;
-import de.danoeh.antennapod.core.util.NetworkUtils;
 import org.apache.commons.lang3.ArrayUtils;
 
 import java.util.List;
@@ -53,26 +51,27 @@ import de.danoeh.antennapod.core.feed.FeedMedia;
 import de.danoeh.antennapod.core.glide.ApGlideSettings;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.core.service.download.Downloader;
+import de.danoeh.antennapod.core.service.playback.PlaybackService;
 import de.danoeh.antennapod.core.storage.DBReader;
 import de.danoeh.antennapod.core.storage.DBTasks;
 import de.danoeh.antennapod.core.storage.DBWriter;
-import de.danoeh.antennapod.core.storage.DownloadRequestException;
 import de.danoeh.antennapod.core.storage.DownloadRequester;
 import de.danoeh.antennapod.core.util.Converter;
 import de.danoeh.antennapod.core.util.DateUtils;
 import de.danoeh.antennapod.core.util.Flavors;
 import de.danoeh.antennapod.core.util.IntentUtils;
 import de.danoeh.antennapod.core.util.LongList;
+import de.danoeh.antennapod.core.util.NetworkUtils;
 import de.danoeh.antennapod.core.util.ShareUtils;
 import de.danoeh.antennapod.core.util.playback.Timeline;
 import de.danoeh.antennapod.menuhandler.FeedItemMenuHandler;
 import de.danoeh.antennapod.view.OnSwipeGesture;
 import de.danoeh.antennapod.view.SwipeGestureDetector;
 import de.greenrobot.event.EventBus;
-import rx.Observable;
-import rx.Subscription;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import io.reactivex.Observable;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.schedulers.Schedulers;
 
 /**
  * Displays information about a FeedItem and actions.
@@ -135,7 +134,7 @@ public class ItemFragment extends Fragment implements OnSwipeGesture {
     private IconButton butAction2;
     private Menu popupMenu;
 
-    private Subscription subscription;
+    private Disposable disposable;
 
     /**
      * URL that was selected via long-press.
@@ -286,8 +285,8 @@ public class ItemFragment extends Fragment implements OnSwipeGesture {
     @Override
     public void onDestroyView() {
         super.onDestroyView();
-        if(subscription != null) {
-            subscription.unsubscribe();
+        if(disposable != null) {
+            disposable.dispose();
         }
         if (webvDescription != null && root != null) {
             root.removeView(webvDescription);
@@ -572,12 +571,12 @@ public class ItemFragment extends Fragment implements OnSwipeGesture {
     };
 
     private void load() {
-        if(subscription != null) {
-            subscription.unsubscribe();
+        if(disposable != null) {
+            disposable.dispose();
         }
         progbarLoading.setVisibility(View.VISIBLE);
-        subscription = Observable.fromCallable(this::loadInBackground)
-            .subscribeOn(Schedulers.newThread())
+        disposable = Observable.fromCallable(this::loadInBackground)
+            .subscribeOn(Schedulers.io())
             .observeOn(AndroidSchedulers.mainThread())
             .subscribe(result -> {
                 progbarLoading.setVisibility(View.GONE);
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java
index 83d6f9615..d5dc851fb 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java
@@ -4,8 +4,6 @@ import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.content.res.TypedArray;
-import android.graphics.Color;
 import android.graphics.LightingColorFilter;
 import android.os.Bundle;
 import android.support.v4.app.ListFragment;
@@ -26,18 +24,16 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
-import com.joanzapata.iconify.IconDrawable;
 import com.joanzapata.iconify.Iconify;
-import com.joanzapata.iconify.fonts.FontAwesomeIcons;
 import com.joanzapata.iconify.widget.IconTextView;
 
-import de.danoeh.antennapod.activity.FeedSettingsActivity;
 import org.apache.commons.lang3.Validate;
 
 import java.util.List;
 
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.activity.FeedInfoActivity;
+import de.danoeh.antennapod.activity.FeedSettingsActivity;
 import de.danoeh.antennapod.activity.MainActivity;
 import de.danoeh.antennapod.adapter.DefaultActionButtonCallback;
 import de.danoeh.antennapod.adapter.FeedItemlistAdapter;
@@ -55,7 +51,6 @@ import de.danoeh.antennapod.core.feed.FeedItemFilter;
 import de.danoeh.antennapod.core.feed.FeedMedia;
 import de.danoeh.antennapod.core.glide.ApGlideSettings;
 import de.danoeh.antennapod.core.glide.FastBlurTransformation;
-import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.core.service.download.DownloadService;
 import de.danoeh.antennapod.core.service.download.Downloader;
 import de.danoeh.antennapod.core.storage.DBReader;
@@ -71,10 +66,10 @@ import de.danoeh.antennapod.menuhandler.FeedItemMenuHandler;
 import de.danoeh.antennapod.menuhandler.FeedMenuHandler;
 import de.danoeh.antennapod.menuhandler.MenuItemUtils;
 import de.greenrobot.event.EventBus;
-import rx.Observable;
-import rx.Subscription;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import io.reactivex.Observable;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.schedulers.Schedulers;
 
 /**
  * Displays a list of FeedItems.
@@ -114,7 +109,7 @@ public class ItemlistFragment extends ListFragment {
 
     private TextView txtvInformation;
 
-    private Subscription subscription;
+    private Disposable disposable;
 
     /**
      * Creates new ItemlistFragment which shows the Feeditems of a specific
@@ -165,8 +160,8 @@ public class ItemlistFragment extends ListFragment {
         super.onPause();
         EventDistributor.getInstance().unregister(contentUpdate);
         EventBus.getDefault().unregister(this);
-        if(subscription != null) {
-            subscription.unsubscribe();
+        if(disposable != null) {
+            disposable.dispose();
         }
     }
 
@@ -618,11 +613,11 @@ public class ItemlistFragment extends ListFragment {
 
 
     private void loadItems() {
-        if(subscription != null) {
-            subscription.unsubscribe();
+        if(disposable != null) {
+            disposable.dispose();
         }
-        subscription = Observable.fromCallable(this::loadData)
-                .subscribeOn(Schedulers.newThread())
+        disposable = Observable.fromCallable(this::loadData)
+                .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(result -> {
                     if (result != null) {
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ItunesSearchFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ItunesSearchFragment.java
index 08610c1f3..51054abc0 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ItunesSearchFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItunesSearchFragment.java
@@ -36,13 +36,14 @@ import de.danoeh.antennapod.adapter.itunes.ItunesAdapter;
 import de.danoeh.antennapod.core.ClientConfig;
 import de.danoeh.antennapod.core.service.download.AntennapodHttpClient;
 import de.danoeh.antennapod.menuhandler.MenuItemUtils;
+import io.reactivex.Single;
+import io.reactivex.SingleOnSubscribe;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.schedulers.Schedulers;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
-import rx.Observable;
-import rx.Subscription;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
 
 import static de.danoeh.antennapod.adapter.itunes.ItunesAdapter.Podcast;
 
@@ -69,7 +70,7 @@ public class ItunesSearchFragment extends Fragment {
      */
     private List<Podcast> searchResults;
     private List<Podcast> topList;
-    private Subscription subscription;
+    private Disposable disposable;
 
     /**
      * Replace adapter data with provided search results from SearchTask.
@@ -127,7 +128,7 @@ public class ItunesSearchFragment extends Fragment {
             } else {
                 gridView.setVisibility(View.GONE);
                 progressBar.setVisibility(View.VISIBLE);
-                subscription = Observable.create((Observable.OnSubscribe<String>) subscriber -> {
+                disposable = Single.create((SingleOnSubscribe<String>) emitter -> {
                             OkHttpClient client = AntennapodHttpClient.getHttpClient();
                             Request.Builder httpReq = new Request.Builder()
                                     .url(podcast.feedUrl)
@@ -139,17 +140,16 @@ public class ItunesSearchFragment extends Fragment {
                                     JSONObject result = new JSONObject(resultString);
                                     JSONObject results = result.getJSONArray("results").getJSONObject(0);
                                     String feedUrl = results.getString("feedUrl");
-                                    subscriber.onNext(feedUrl);
+                                    emitter.onSuccess(feedUrl);
                                 } else {
                                     String prefix = getString(R.string.error_msg_prefix);
-                                    subscriber.onError(new IOException(prefix + response));
+                                    emitter.onError(new IOException(prefix + response));
                                 }
                             } catch (IOException | JSONException e) {
-                                subscriber.onError(e);
+                                emitter.onError(e);
                             }
-                            subscriber.onCompleted();
                         })
-                        .subscribeOn(Schedulers.newThread())
+                        .subscribeOn(Schedulers.io())
                         .observeOn(AndroidSchedulers.mainThread())
                         .subscribe(feedUrl -> {
                             progressBar.setVisibility(View.GONE);
@@ -183,8 +183,8 @@ public class ItunesSearchFragment extends Fragment {
     @Override
     public void onDestroy() {
         super.onDestroy();
-        if (subscription != null) {
-            subscription.unsubscribe();
+        if (disposable != null) {
+            disposable.dispose();
         }
         adapter = null;
     }
@@ -228,15 +228,15 @@ public class ItunesSearchFragment extends Fragment {
     }
 
     private void loadToplist() {
-        if (subscription != null) {
-            subscription.unsubscribe();
+        if (disposable != null) {
+            disposable.dispose();
         }
         gridView.setVisibility(View.GONE);
         txtvError.setVisibility(View.GONE);
         butRetry.setVisibility(View.GONE);
         txtvEmpty.setVisibility(View.GONE);
         progressBar.setVisibility(View.VISIBLE);
-        subscription = Observable.create((Observable.OnSubscribe<List<Podcast>>) subscriber -> {
+        disposable = Single.create((SingleOnSubscribe<List<Podcast>>) emitter -> {
                     String lang = Locale.getDefault().getLanguage();
                     String url = "https://itunes.apple.com/" + lang + "/rss/toppodcasts/limit=25/explicit=true/json";
                     OkHttpClient client = AntennapodHttpClient.getHttpClient();
@@ -268,15 +268,14 @@ public class ItunesSearchFragment extends Fragment {
                         }
                         else {
                             String prefix = getString(R.string.error_msg_prefix);
-                            subscriber.onError(new IOException(prefix + response));
+                            emitter.onError(new IOException(prefix + response));
                         }
                     } catch (IOException | JSONException e) {
-                        subscriber.onError(e);
+                        emitter.onError(e);
                     }
-                    subscriber.onNext(results);
-                    subscriber.onCompleted();
+                    emitter.onSuccess(results);
                 })
-                .subscribeOn(Schedulers.newThread())
+                .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(podcasts -> {
                     progressBar.setVisibility(View.GONE);
@@ -293,15 +292,15 @@ public class ItunesSearchFragment extends Fragment {
     }
 
     private void search(String query) {
-        if (subscription != null) {
-            subscription.unsubscribe();
+        if (disposable != null) {
+            disposable.dispose();
         }
         gridView.setVisibility(View.GONE);
         txtvError.setVisibility(View.GONE);
         butRetry.setVisibility(View.GONE);
         txtvEmpty.setVisibility(View.GONE);
         progressBar.setVisibility(View.VISIBLE);
-        subscription = rx.Observable.create((Observable.OnSubscribe<List<Podcast>>) subscriber -> {
+        disposable = Single.create((SingleOnSubscribe<List<Podcast>>) subscriber -> {
                     String encodedQuery = null;
                     try {
                         encodedQuery = URLEncoder.encode(query, "UTF-8");
@@ -341,10 +340,9 @@ public class ItunesSearchFragment extends Fragment {
                     } catch (IOException | JSONException e) {
                         subscriber.onError(e);
                     }
-                    subscriber.onNext(podcasts);
-                    subscriber.onCompleted();
+                    subscriber.onSuccess(podcasts);
                 })
-                .subscribeOn(Schedulers.newThread())
+                .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(podcasts -> {
                     progressBar.setVisibility(View.GONE);
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java
index fb6280021..c2a9200c8 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java
@@ -30,10 +30,10 @@ import de.danoeh.antennapod.core.storage.DBWriter;
 import de.danoeh.antennapod.core.util.FeedItemUtil;
 import de.danoeh.antennapod.core.util.LongList;
 import de.greenrobot.event.EventBus;
-import rx.Observable;
-import rx.Subscription;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import io.reactivex.Observable;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.schedulers.Schedulers;
 
 public class PlaybackHistoryFragment extends ListFragment {
 
@@ -50,7 +50,7 @@ public class PlaybackHistoryFragment extends ListFragment {
 
     private List<Downloader> downloaderList;
 
-    private Subscription subscription;
+    private Disposable disposable;
 
     @Override
     public void onAttach(Context context) {
@@ -107,16 +107,16 @@ public class PlaybackHistoryFragment extends ListFragment {
     public void onStop() {
         super.onStop();
         EventDistributor.getInstance().unregister(contentUpdate);
-        if(subscription != null) {
-            subscription.unsubscribe();
+        if(disposable != null) {
+            disposable.dispose();
         }
     }
 
     @Override
     public void onDetach() {
         super.onDetach();
-        if(subscription != null) {
-            subscription.unsubscribe();
+        if(disposable != null) {
+            disposable.dispose();
         }
     }
 
@@ -269,11 +269,11 @@ public class PlaybackHistoryFragment extends ListFragment {
     };
 
     private void loadItems() {
-        if(subscription != null) {
-            subscription.unsubscribe();
+        if(disposable != null) {
+            disposable.dispose();
         }
-        subscription = Observable.fromCallable(this::loadData)
-                .subscribeOn(Schedulers.newThread())
+        disposable = Observable.fromCallable(this::loadData)
+                .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(result -> {
                     if (result != null) {
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
index bae77d58b..6a44e917e 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
@@ -21,7 +21,6 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ProgressBar;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import com.yqritc.recyclerviewflexibledivider.HorizontalDividerItemDecoration;
 
@@ -46,7 +45,6 @@ import de.danoeh.antennapod.core.service.download.Downloader;
 import de.danoeh.antennapod.core.storage.DBReader;
 import de.danoeh.antennapod.core.storage.DBTasks;
 import de.danoeh.antennapod.core.storage.DBWriter;
-import de.danoeh.antennapod.core.storage.DownloadRequestException;
 import de.danoeh.antennapod.core.storage.DownloadRequester;
 import de.danoeh.antennapod.core.util.Converter;
 import de.danoeh.antennapod.core.util.FeedItemUtil;
@@ -55,10 +53,10 @@ import de.danoeh.antennapod.core.util.QueueSorter;
 import de.danoeh.antennapod.menuhandler.FeedItemMenuHandler;
 import de.danoeh.antennapod.menuhandler.MenuItemUtils;
 import de.greenrobot.event.EventBus;
-import rx.Observable;
-import rx.Subscription;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import io.reactivex.Observable;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.schedulers.Schedulers;
 
 /**
  * Shows all items in the queue
@@ -86,7 +84,7 @@ public class QueueFragment extends Fragment {
     private static final String PREF_SCROLL_POSITION = "scroll_position";
     private static final String PREF_SCROLL_OFFSET = "scroll_offset";
 
-    private Subscription subscription;
+    private Disposable disposable;
     private LinearLayoutManager layoutManager;
     private ItemTouchHelper itemTouchHelper;
 
@@ -120,8 +118,8 @@ public class QueueFragment extends Fragment {
         saveScrollPosition();
         EventDistributor.getInstance().unregister(contentUpdate);
         EventBus.getDefault().unregister(this);
-        if(subscription != null) {
-            subscription.unsubscribe();
+        if(disposable != null) {
+            disposable.dispose();
         }
     }
 
@@ -425,8 +423,8 @@ public class QueueFragment extends Fragment {
 
                 @Override
                 public void onSwiped(RecyclerView.ViewHolder viewHolder, int direction) {
-                    if(subscription != null) {
-                        subscription.unsubscribe();
+                    if(disposable != null) {
+                        disposable.dispose();
                     }
                     final int position = viewHolder.getAdapterPosition();
                     Log.d(TAG, "remove(" + position + ")");
@@ -622,16 +620,16 @@ public class QueueFragment extends Fragment {
 
     private void loadItems(final boolean restoreScrollPosition) {
         Log.d(TAG, "loadItems()");
-        if(subscription != null) {
-            subscription.unsubscribe();
+        if(disposable != null) {
+            disposable.dispose();
         }
         if (queue == null) {
             recyclerView.setVisibility(View.GONE);
             txtvEmpty.setVisibility(View.GONE);
             progLoading.setVisibility(View.VISIBLE);
         }
-        subscription = Observable.fromCallable(DBReader::getQueue)
-                .subscribeOn(Schedulers.newThread())
+        disposable = Observable.fromCallable(DBReader::getQueue)
+                .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(items -> {
                     if(items != null) {
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/SearchFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/SearchFragment.java
index f64b4c20a..8322a5573 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/SearchFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/SearchFragment.java
@@ -24,10 +24,10 @@ import de.danoeh.antennapod.core.feed.FeedComponent;
 import de.danoeh.antennapod.core.feed.FeedItem;
 import de.danoeh.antennapod.core.feed.SearchResult;
 import de.danoeh.antennapod.core.storage.FeedSearcher;
-import rx.Observable;
-import rx.Subscription;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import io.reactivex.Observable;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.schedulers.Schedulers;
 
 /**
  * Performs a search operation on all feeds or one specific feed and displays the search result.
@@ -44,7 +44,7 @@ public class SearchFragment extends ListFragment {
     private boolean viewCreated = false;
     private boolean itemsLoaded = false;
 
-    private Subscription subscription;
+    private Disposable disposable;
 
     /**
      * Create a new SearchFragment that searches all feeds.
@@ -85,8 +85,8 @@ public class SearchFragment extends ListFragment {
     @Override
     public void onStop() {
         super.onStop();
-        if(subscription != null) {
-            subscription.unsubscribe();
+        if(disposable != null) {
+            disposable.dispose();
         }
         EventDistributor.getInstance().unregister(contentUpdate);
     }
@@ -94,8 +94,8 @@ public class SearchFragment extends ListFragment {
     @Override
     public void onDetach() {
         super.onDetach();
-        if(subscription != null) {
-            subscription.unsubscribe();
+        if(disposable != null) {
+            disposable.dispose();
         }
     }
 
@@ -205,14 +205,14 @@ public class SearchFragment extends ListFragment {
 
 
     private void search() {
-        if(subscription != null) {
-            subscription.unsubscribe();
+        if(disposable != null) {
+            disposable.dispose();
         }
         if (viewCreated && !itemsLoaded) {
             setListShown(false);
         }
-        subscription = Observable.fromCallable(this::performSearch)
-                .subscribeOn(Schedulers.newThread())
+        disposable = Observable.fromCallable(this::performSearch)
+                .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(result -> {
                     if (result != null) {
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/SubscriptionFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/SubscriptionFragment.java
index aec2bb536..6a1dd4c2d 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/SubscriptionFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/SubscriptionFragment.java
@@ -1,7 +1,6 @@
 package de.danoeh.antennapod.fragment;
 
 import android.content.DialogInterface;
-import android.content.Intent;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.util.Log;
@@ -16,7 +15,6 @@ import android.widget.GridView;
 
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.activity.MainActivity;
-import de.danoeh.antennapod.activity.MediaplayerInfoActivity;
 import de.danoeh.antennapod.adapter.SubscriptionsAdapter;
 import de.danoeh.antennapod.core.asynctask.FeedRemover;
 import de.danoeh.antennapod.core.dialog.ConfirmationDialog;
@@ -29,10 +27,10 @@ import de.danoeh.antennapod.core.storage.DBWriter;
 import de.danoeh.antennapod.core.util.FeedItemUtil;
 import de.danoeh.antennapod.core.util.IntentUtils;
 import de.danoeh.antennapod.dialog.RenameFeedDialog;
-import rx.Observable;
-import rx.Subscription;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import io.reactivex.Observable;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.schedulers.Schedulers;
 
 /**
  * Fragment for displaying feed subscriptions
@@ -50,7 +48,7 @@ public class SubscriptionFragment extends Fragment {
 
     private int mPosition = -1;
 
-    private Subscription subscription;
+    private Disposable disposable;
 
     public SubscriptionFragment() {
     }
@@ -96,17 +94,17 @@ public class SubscriptionFragment extends Fragment {
     @Override
     public void onDestroy() {
         super.onDestroy();
-        if(subscription != null) {
-            subscription.unsubscribe();
+        if(disposable != null) {
+            disposable.dispose();
         }
     }
 
     private void loadSubscriptions() {
-        if(subscription != null) {
-            subscription.unsubscribe();
+        if(disposable != null) {
+            disposable.dispose();
         }
-        subscription = Observable.fromCallable(DBReader::getNavDrawerData)
-                .subscribeOn(Schedulers.newThread())
+        disposable = Observable.fromCallable(DBReader::getNavDrawerData)
+                .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(result -> {
                     navDrawerData = result;
@@ -163,7 +161,7 @@ public class SubscriptionFragment extends Fragment {
                         dialog.dismiss();
 
                         Observable.fromCallable(() -> DBWriter.markFeedSeen(feed.getId()))
-                                .subscribeOn(Schedulers.newThread())
+                                .subscribeOn(Schedulers.io())
                                 .observeOn(AndroidSchedulers.mainThread())
                                 .subscribe(result -> loadSubscriptions(),
                                         error -> Log.e(TAG, Log.getStackTraceString(error)));
@@ -180,7 +178,7 @@ public class SubscriptionFragment extends Fragment {
                     public void onConfirmButtonPressed(DialogInterface dialog) {
                         dialog.dismiss();
                         Observable.fromCallable(() -> DBWriter.markFeedRead(feed.getId()))
-                                .subscribeOn(Schedulers.newThread())
+                                .subscribeOn(Schedulers.io())
                                 .observeOn(AndroidSchedulers.mainThread())
                                 .subscribe(result -> loadSubscriptions(),
                                         error -> Log.e(TAG, Log.getStackTraceString(error)));
diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
index c55117ecc..ca70d9594 100644
--- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
+++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
@@ -36,24 +36,9 @@ import android.widget.ListView;
 import android.widget.Toast;
 
 import com.afollestad.materialdialogs.MaterialDialog;
-
 import com.bytehamster.lib.preferencesearch.SearchConfiguration;
 import com.bytehamster.lib.preferencesearch.SearchPreference;
-import de.danoeh.antennapod.activity.AboutActivity;
-import de.danoeh.antennapod.activity.ImportExportActivity;
-import de.danoeh.antennapod.activity.MediaplayerActivity;
-import de.danoeh.antennapod.activity.OpmlImportFromPathActivity;
-import de.danoeh.antennapod.activity.PreferenceActivity;
-import de.danoeh.antennapod.activity.StatisticsActivity;
-import de.danoeh.antennapod.core.export.html.HtmlWriter;
-import de.danoeh.antennapod.core.export.opml.OpmlWriter;
-import de.danoeh.antennapod.core.service.GpodnetSyncService;
-import de.danoeh.antennapod.dialog.AuthenticationDialog;
-import de.danoeh.antennapod.dialog.AutoFlattrPreferenceDialog;
-import de.danoeh.antennapod.dialog.GpodnetSetHostnameDialog;
-import de.danoeh.antennapod.dialog.ProxyDialog;
-import de.danoeh.antennapod.dialog.VariableSpeedDialog;
-import de.danoeh.antennapod.core.util.gui.PictureInPictureUtil;
+
 import org.apache.commons.lang3.ArrayUtils;
 
 import java.io.File;
@@ -67,18 +52,33 @@ import java.util.concurrent.TimeUnit;
 
 import de.danoeh.antennapod.CrashReportWriter;
 import de.danoeh.antennapod.R;
+import de.danoeh.antennapod.activity.AboutActivity;
 import de.danoeh.antennapod.activity.DirectoryChooserActivity;
+import de.danoeh.antennapod.activity.ImportExportActivity;
 import de.danoeh.antennapod.activity.MainActivity;
+import de.danoeh.antennapod.activity.MediaplayerActivity;
+import de.danoeh.antennapod.activity.OpmlImportFromPathActivity;
+import de.danoeh.antennapod.activity.PreferenceActivity;
+import de.danoeh.antennapod.activity.StatisticsActivity;
 import de.danoeh.antennapod.asynctask.ExportWorker;
 import de.danoeh.antennapod.core.export.ExportWriter;
+import de.danoeh.antennapod.core.export.html.HtmlWriter;
+import de.danoeh.antennapod.core.export.opml.OpmlWriter;
 import de.danoeh.antennapod.core.preferences.GpodnetPreferences;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
+import de.danoeh.antennapod.core.service.GpodnetSyncService;
 import de.danoeh.antennapod.core.util.flattr.FlattrUtils;
+import de.danoeh.antennapod.core.util.gui.PictureInPictureUtil;
+import de.danoeh.antennapod.dialog.AuthenticationDialog;
+import de.danoeh.antennapod.dialog.AutoFlattrPreferenceDialog;
 import de.danoeh.antennapod.dialog.ChooseDataFolderDialog;
-import rx.Observable;
-import rx.Subscription;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import de.danoeh.antennapod.dialog.GpodnetSetHostnameDialog;
+import de.danoeh.antennapod.dialog.ProxyDialog;
+import de.danoeh.antennapod.dialog.VariableSpeedDialog;
+import io.reactivex.Observable;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.schedulers.Schedulers;
 
 import static de.danoeh.antennapod.activity.PreferenceActivity.PARAM_RESOURCE;
 
@@ -137,7 +137,7 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
                 }
             };
     private CheckBoxPreference[] selectedNetworks;
-    private Subscription subscription;
+    private Disposable disposable;
 
     public PreferenceController(PreferenceUI ui) {
         this.ui = ui;
@@ -624,7 +624,7 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
         final AlertDialog.Builder alert = new AlertDialog.Builder(context)
                 .setNeutralButton(android.R.string.ok, (dialog, which) -> dialog.dismiss());
         Observable<File> observable = new ExportWorker(exportWriter).exportObservable();
-        subscription = observable.subscribeOn(Schedulers.newThread())
+        disposable = observable.subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(output -> {
                     alert.setTitle(R.string.export_success_title);
@@ -702,8 +702,8 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
     }
 
     public void unsubscribeExportSubscription() {
-        if (subscription != null) {
-            subscription.unsubscribe();
+        if (disposable != null) {
+            disposable.dispose();
         }
     }
 
-- 
cgit v1.2.3


From 20328dbd97c0ff561b815efe3cc088884f7378eb Mon Sep 17 00:00:00 2001
From: Martin Fietz <martin.fietz@gmail.com>
Date: Sun, 30 Sep 2018 20:33:40 +0200
Subject: Fix fyyd

---
 .../main/java/de/danoeh/antennapod/adapter/itunes/ItunesAdapter.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/itunes/ItunesAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/itunes/ItunesAdapter.java
index e493a2ecc..4a941275d 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/itunes/ItunesAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/itunes/ItunesAdapter.java
@@ -132,7 +132,7 @@ public class ItunesAdapter extends ArrayAdapter<ItunesAdapter.Podcast> {
         }
 
         public static Podcast fromSearch(SearchHit searchHit) {
-            return new Podcast(searchHit.getTitle(), searchHit.getImageUrl(), searchHit.getXmlUrl());
+            return new Podcast(searchHit.getTitle(), searchHit.getThumbImageURL(), searchHit.getXmlUrl());
         }
 
         /**
-- 
cgit v1.2.3


From 98a19f0235f40377be7d402330e8f45269e112da Mon Sep 17 00:00:00 2001
From: egsavage <egs@egsavage.com>
Date: Sun, 7 Oct 2018 19:23:34 -0400
Subject: Resolves #2829 - Make queue remaining time sensitive to playback
 speed

---
 app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
index bae77d58b..f5fdd4f9c 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
@@ -21,7 +21,6 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ProgressBar;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import com.yqritc.recyclerviewflexibledivider.HorizontalDividerItemDecoration;
 
@@ -46,7 +45,6 @@ import de.danoeh.antennapod.core.service.download.Downloader;
 import de.danoeh.antennapod.core.storage.DBReader;
 import de.danoeh.antennapod.core.storage.DBTasks;
 import de.danoeh.antennapod.core.storage.DBWriter;
-import de.danoeh.antennapod.core.storage.DownloadRequestException;
 import de.danoeh.antennapod.core.storage.DownloadRequester;
 import de.danoeh.antennapod.core.util.Converter;
 import de.danoeh.antennapod.core.util.FeedItemUtil;
@@ -535,9 +533,12 @@ public class QueueFragment extends Fragment {
         String info = queue.size() + getString(R.string.episodes_suffix);
         if(queue.size() > 0) {
             long timeLeft = 0;
+            float playbackSpeed = Float.valueOf(UserPreferences.getPlaybackSpeed());
             for(FeedItem item : queue) {
                 if(item.getMedia() != null) {
-                    timeLeft += item.getMedia().getDuration() - item.getMedia().getPosition();
+                    timeLeft +=
+                            (item.getMedia().getDuration() - item.getMedia().getPosition())
+                                    / playbackSpeed;
                 }
             }
             info += " \u2022 ";
-- 
cgit v1.2.3


From d88e1202b13ba77f120f93360a1472738b219c38 Mon Sep 17 00:00:00 2001
From: Andrew Gaul <andrew@gaul.org>
Date: Fri, 12 Oct 2018 21:14:50 -0700
Subject: Fix error-prone errors

---
 app/src/main/java/de/danoeh/antennapod/PodcastApp.java   |  2 +-
 .../danoeh/antennapod/activity/FeedSettingsActivity.java | 16 ----------------
 .../danoeh/antennapod/activity/MediaplayerActivity.java  | 10 ++--------
 .../antennapod/activity/MediaplayerInfoActivity.java     |  2 +-
 .../antennapod/activity/OnlineFeedViewActivity.java      |  4 ++--
 .../gpoddernet/GpodnetAuthenticationActivity.java        |  2 --
 .../de/danoeh/antennapod/fragment/CoverFragment.java     |  1 -
 .../antennapod/fragment/ExternalPlayerFragment.java      |  5 -----
 .../de/danoeh/antennapod/fragment/ItemlistFragment.java  |  6 ------
 .../de/danoeh/antennapod/fragment/QueueFragment.java     |  8 ++++----
 10 files changed, 10 insertions(+), 46 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/PodcastApp.java b/app/src/main/java/de/danoeh/antennapod/PodcastApp.java
index 3abf7557a..fde9af16f 100644
--- a/app/src/main/java/de/danoeh/antennapod/PodcastApp.java
+++ b/app/src/main/java/de/danoeh/antennapod/PodcastApp.java
@@ -20,7 +20,7 @@ public class PodcastApp extends Application {
         try {
             Class.forName("de.danoeh.antennapod.config.ClientConfigurator");
         } catch (Exception e) {
-            throw new RuntimeException("ClientConfigurator not found");
+            throw new RuntimeException("ClientConfigurator not found", e);
         }
     }
 
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/FeedSettingsActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/FeedSettingsActivity.java
index 5e15585a5..b500cda87 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/FeedSettingsActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/FeedSettingsActivity.java
@@ -69,22 +69,6 @@ public class FeedSettingsActivity extends AppCompatActivity {
 
     private Subscription subscription;
 
-
-    private final View.OnClickListener copyUrlToClipboard = new View.OnClickListener() {
-        @Override
-        public void onClick(View v) {
-            if(feed != null && feed.getDownload_url() != null) {
-                String url = feed.getDownload_url();
-                ClipData clipData = ClipData.newPlainText(url, url);
-                android.content.ClipboardManager cm = (android.content.ClipboardManager) FeedSettingsActivity.this
-                        .getSystemService(Context.CLIPBOARD_SERVICE);
-                cm.setPrimaryClip(clipData);
-                Toast t = Toast.makeText(FeedSettingsActivity.this, R.string.copied_url_msg, Toast.LENGTH_SHORT);
-                t.show();
-            }
-        }
-    };
-
     private boolean authInfoChanged = false;
 
     private final TextWatcher authTextWatcher = new TextWatcher() {
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
index be9d60c93..637198784 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
@@ -231,7 +231,6 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements
         Log.d(TAG, "onCreate()");
         StorageUtils.checkStorageAvailability(this);
 
-        orientation = getResources().getConfiguration().orientation;
         getWindow().setFormat(PixelFormat.TRANSPARENT);
     }
 
@@ -265,15 +264,10 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements
 
     private void onBufferUpdate(float progress) {
         if (sbPosition != null) {
-            sbPosition.setSecondaryProgress((int) progress * sbPosition.getMax());
+            sbPosition.setSecondaryProgress((int) (progress * sbPosition.getMax()));
         }
     }
 
-    /**
-     * Current screen orientation.
-     */
-    private int orientation;
-
     @Override
     protected void onStart() {
         super.onStart();
@@ -992,7 +986,7 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements
     }
 
     @Override
-    public void onRequestPermissionsResult(int requestCode, String permissions[], int[] grantResults) {
+    public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
         if (requestCode == REQUEST_CODE_STORAGE) {
             if (grantResults.length <= 0 || grantResults[0] != PackageManager.PERMISSION_GRANTED) {
                 Toast.makeText(this, R.string.needs_storage_permission, Toast.LENGTH_LONG).show();
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerInfoActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerInfoActivity.java
index 49a0e898b..ce9bbb955 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerInfoActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerInfoActivity.java
@@ -357,7 +357,7 @@ public abstract class MediaplayerInfoActivity extends MediaplayerActivity implem
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        return drawerToggle != null && drawerToggle.onOptionsItemSelected(item) || super.onOptionsItemSelected(item);
+        return (drawerToggle != null && drawerToggle.onOptionsItemSelected(item)) || super.onOptionsItemSelected(item);
     }
 
     @Override
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
index 28cabfbc7..b5cc1c931 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
@@ -144,7 +144,7 @@ public class OnlineFeedViewActivity extends AppCompatActivity {
             feedUrl = getIntent().getStringExtra(ARG_FEEDURL);
         } else if (TextUtils.equals(getIntent().getAction(), Intent.ACTION_SEND)
                 || TextUtils.equals(getIntent().getAction(), Intent.ACTION_VIEW)) {
-            feedUrl = (TextUtils.equals(getIntent().getAction(), Intent.ACTION_SEND))
+            feedUrl = TextUtils.equals(getIntent().getAction(), Intent.ACTION_SEND)
                     ? getIntent().getStringExtra(Intent.EXTRA_TEXT) : getIntent().getDataString();
             if (actionBar != null) {
                 actionBar.setTitle(R.string.add_feed_label);
@@ -306,7 +306,7 @@ public class OnlineFeedViewActivity extends AppCompatActivity {
     }
 
     private void parseFeed() {
-        if (feed == null || feed.getFile_url() == null && feed.isDownloaded()) {
+        if (feed == null || (feed.getFile_url() == null && feed.isDownloaded())) {
             throw new IllegalStateException("feed must be non-null and downloaded when parseFeed is called");
         }
         Log.d(TAG, "Parsing feed");
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/gpoddernet/GpodnetAuthenticationActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/gpoddernet/GpodnetAuthenticationActivity.java
index 8f447ac90..81e51e304 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/gpoddernet/GpodnetAuthenticationActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/gpoddernet/GpodnetAuthenticationActivity.java
@@ -45,8 +45,6 @@ import de.danoeh.antennapod.core.service.GpodnetSyncService;
 public class GpodnetAuthenticationActivity extends AppCompatActivity {
     private static final String TAG = "GpodnetAuthActivity";
 
-    private static final String CURRENT_STEP = "current_step";
-
     private ViewFlipper viewFlipper;
 
     private static final int STEP_DEFAULT = -1;
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/CoverFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/CoverFragment.java
index 1d3fcefba..128c5f6bf 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/CoverFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/CoverFragment.java
@@ -22,7 +22,6 @@ import de.danoeh.antennapod.core.util.playback.Playable;
 public class CoverFragment extends Fragment implements MediaplayerInfoContentFragment {
 
     private static final String TAG = "CoverFragment";
-    private static final String ARG_PLAYABLE = "arg.playable";
 
     private Playable media;
 
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
index dc0ea07ff..c33d097a4 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
@@ -210,11 +210,6 @@ public class ExternalPlayerFragment extends Fragment {
         }
     }
 
-    private String getPositionString(int position, int duration) {
-        return Converter.getDurationStringLong(position) + " / "
-                + Converter.getDurationStringLong(duration);
-    }
-
     public PlaybackController getPlaybackControllerTestingOnly() {
         return controller;
     }
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java
index 83d6f9615..dbea23aeb 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java
@@ -417,13 +417,10 @@ public class ItemlistFragment extends ListFragment {
 
     }
 
-    private boolean insideOnFragmentLoaded = false;
-
     private void onFragmentLoaded() {
         if(!isVisible()) {
             return;
         }
-        insideOnFragmentLoaded = true;
         if (adapter == null) {
             setListAdapter(null);
             setupHeaderView();
@@ -440,9 +437,6 @@ public class ItemlistFragment extends ListFragment {
         if (feed != null && feed.getNextPageLink() == null && listFooter != null) {
             getListView().removeFooterView(listFooter.getRoot());
         }
-
-        insideOnFragmentLoaded = false;
-
     }
 
     private void refreshHeaderView() {
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
index f5fdd4f9c..00b4d9eee 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
@@ -487,8 +487,8 @@ public class QueueFragment extends Fragment {
 
                 private void reallyMoved(int from, int to) {
                     // Write drag operation to database
-                    Log.d(TAG, "Write to database move(" + dragFrom + ", " + dragTo + ")");
-                    DBWriter.moveQueueItem(dragFrom, dragTo, true);
+                    Log.d(TAG, "Write to database move(" + from + ", " + to + ")");
+                    DBWriter.moveQueueItem(from, to, true);
                 }
             }
         );
@@ -537,8 +537,8 @@ public class QueueFragment extends Fragment {
             for(FeedItem item : queue) {
                 if(item.getMedia() != null) {
                     timeLeft +=
-                            (item.getMedia().getDuration() - item.getMedia().getPosition())
-                                    / playbackSpeed;
+                            (long) ((item.getMedia().getDuration() - item.getMedia().getPosition())
+                                    / playbackSpeed);
                 }
             }
             info += " \u2022 ";
-- 
cgit v1.2.3


From 2a067df6d197d1a525e65d3ce9f87a75a32fd1d0 Mon Sep 17 00:00:00 2001
From: Martin Fietz <martin.fietz@gmail.com>
Date: Sat, 13 Oct 2018 12:08:23 +0200
Subject: 2855 Cancel UI media info update when fragment is destroyed

---
 .../fragment/ExternalPlayerFragment.java           | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
index dc0ea07ff..9e8c9731e 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
@@ -20,10 +20,10 @@ import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.core.feed.MediaType;
 import de.danoeh.antennapod.core.glide.ApGlideSettings;
 import de.danoeh.antennapod.core.service.playback.PlaybackService;
-import de.danoeh.antennapod.core.util.Converter;
 import de.danoeh.antennapod.core.util.playback.Playable;
 import de.danoeh.antennapod.core.util.playback.PlaybackController;
 import rx.Single;
+import rx.Subscription;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.schedulers.Schedulers;
 
@@ -41,6 +41,7 @@ public class ExternalPlayerFragment extends Fragment {
     private TextView mFeedName;
     private ProgressBar mProgressBar;
     private PlaybackController controller;
+    private Subscription subscription;
 
     public ExternalPlayerFragment() {
         super();
@@ -81,7 +82,7 @@ public class ExternalPlayerFragment extends Fragment {
         super.onActivityCreated(savedInstanceState);
         controller = setupPlaybackController();
         butPlay.setOnClickListener(v -> {
-            if(controller != null) {
+            if (controller != null) {
                 controller.playPause();
             }
         });
@@ -142,6 +143,9 @@ public class ExternalPlayerFragment extends Fragment {
         if (controller != null) {
             controller.release();
         }
+        if (subscription != null) {
+            subscription.unsubscribe();
+        }
     }
 
     @Override
@@ -162,7 +166,7 @@ public class ExternalPlayerFragment extends Fragment {
         controller = setupPlaybackController();
         if (butPlay != null) {
             butPlay.setOnClickListener(v -> {
-                if(controller != null) {
+                if (controller != null) {
                     controller.playPause();
                 }
             });
@@ -177,7 +181,10 @@ public class ExternalPlayerFragment extends Fragment {
             return false;
         }
 
-        Single.create(subscriber -> subscriber.onSuccess(controller.getMedia()))
+        if (subscription != null) {
+            subscription.unsubscribe();
+        }
+        subscription = Single.create(subscriber -> subscriber.onSuccess(controller.getMedia()))
                 .subscribeOn(Schedulers.newThread())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(media -> updateUi((Playable) media));
@@ -206,15 +213,10 @@ public class ExternalPlayerFragment extends Fragment {
                 butPlay.setVisibility(View.VISIBLE);
             }
         } else {
-            Log.w(TAG,  "loadMediaInfo was called while the media object of playbackService was null!");
+            Log.w(TAG, "loadMediaInfo was called while the media object of playbackService was null!");
         }
     }
 
-    private String getPositionString(int position, int duration) {
-        return Converter.getDurationStringLong(position) + " / "
-                + Converter.getDurationStringLong(duration);
-    }
-
     public PlaybackController getPlaybackControllerTestingOnly() {
         return controller;
     }
-- 
cgit v1.2.3


From a05f386793a7790302502983579b528bb6b46eaa Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Sun, 14 Oct 2018 10:26:36 +0200
Subject: Upgraded Glide to version 4.8.0

---
 .../antennapod/activity/FeedInfoActivity.java      | 23 +++++++++--------
 .../antennapod/activity/FeedSettingsActivity.java  | 23 +++++++++--------
 .../activity/OnlineFeedViewActivity.java           | 12 +++++----
 .../adapter/AllEpisodesRecycleAdapter.java         |  8 +++---
 .../de/danoeh/antennapod/adapter/CoverTarget.java  | 30 ++++++++++++++--------
 .../adapter/DownloadedEpisodesListAdapter.java     | 12 +++++----
 .../danoeh/antennapod/adapter/NavListAdapter.java  | 12 +++++----
 .../antennapod/adapter/QueueRecyclerAdapter.java   |  8 +++---
 .../antennapod/adapter/SearchlistAdapter.java      | 23 +++++++++--------
 .../antennapod/adapter/StatisticsListAdapter.java  | 12 +++++----
 .../antennapod/adapter/SubscriptionsAdapter.java   | 12 +++++----
 .../adapter/gpodnet/PodcastListAdapter.java        | 12 +++++----
 .../antennapod/adapter/itunes/ItunesAdapter.java   | 11 +++++---
 .../danoeh/antennapod/fragment/CoverFragment.java  |  8 +++---
 .../fragment/ExternalPlayerFragment.java           | 12 +++++----
 .../danoeh/antennapod/fragment/ItemFragment.java   | 12 +++++----
 .../antennapod/fragment/ItemlistFragment.java      | 23 +++++++++--------
 17 files changed, 150 insertions(+), 103 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/FeedInfoActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/FeedInfoActivity.java
index 6b1272b01..e07b6e13b 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/FeedInfoActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/FeedInfoActivity.java
@@ -17,6 +17,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 import com.bumptech.glide.Glide;
+import com.bumptech.glide.request.RequestOptions;
 import com.joanzapata.iconify.Iconify;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.core.dialog.DownloadRequestErrorDialogCreator;
@@ -115,19 +116,21 @@ public class FeedInfoActivity extends AppCompatActivity {
                     Log.d(TAG, "URL is " + feed.getDownload_url());
                     Glide.with(FeedInfoActivity.this)
                             .load(feed.getImageLocation())
-                            .placeholder(R.color.light_gray)
-                            .error(R.color.light_gray)
-                            .diskCacheStrategy(ApGlideSettings.AP_DISK_CACHE_STRATEGY)
-                            .fitCenter()
-                            .dontAnimate()
+                            .apply(new RequestOptions()
+                                .placeholder(R.color.light_gray)
+                                .error(R.color.light_gray)
+                                .diskCacheStrategy(ApGlideSettings.AP_DISK_CACHE_STRATEGY)
+                                .fitCenter()
+                                .dontAnimate())
                             .into(imgvCover);
                     Glide.with(FeedInfoActivity.this)
                             .load(feed.getImageLocation())
-                            .placeholder(R.color.image_readability_tint)
-                            .error(R.color.image_readability_tint)
-                            .diskCacheStrategy(ApGlideSettings.AP_DISK_CACHE_STRATEGY)
-                            .transform(new FastBlurTransformation(FeedInfoActivity.this))
-                            .dontAnimate()
+                            .apply(new RequestOptions()
+                                .placeholder(R.color.image_readability_tint)
+                                .error(R.color.image_readability_tint)
+                                .diskCacheStrategy(ApGlideSettings.AP_DISK_CACHE_STRATEGY)
+                                .transform(new FastBlurTransformation())
+                                .dontAnimate())
                             .into(imgvBackground);
 
                     txtvTitle.setText(feed.getTitle());
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/FeedSettingsActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/FeedSettingsActivity.java
index 5e15585a5..7c0965c76 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/FeedSettingsActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/FeedSettingsActivity.java
@@ -26,6 +26,7 @@ import android.widget.Spinner;
 import android.widget.TextView;
 import android.widget.Toast;
 import com.bumptech.glide.Glide;
+import com.bumptech.glide.request.RequestOptions;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.core.dialog.ConfirmationDialog;
 import de.danoeh.antennapod.core.dialog.DownloadRequestErrorDialogCreator;
@@ -165,19 +166,21 @@ public class FeedSettingsActivity extends AppCompatActivity {
                     FeedPreferences prefs = feed.getPreferences();
                     Glide.with(FeedSettingsActivity.this)
                             .load(feed.getImageLocation())
-                            .placeholder(R.color.light_gray)
-                            .error(R.color.light_gray)
-                            .diskCacheStrategy(ApGlideSettings.AP_DISK_CACHE_STRATEGY)
-                            .fitCenter()
-                            .dontAnimate()
+                            .apply(new RequestOptions()
+                                .placeholder(R.color.light_gray)
+                                .error(R.color.light_gray)
+                                .diskCacheStrategy(ApGlideSettings.AP_DISK_CACHE_STRATEGY)
+                                .fitCenter()
+                                .dontAnimate())
                             .into(imgvCover);
                     Glide.with(FeedSettingsActivity.this)
                             .load(feed.getImageLocation())
-                            .placeholder(R.color.image_readability_tint)
-                            .error(R.color.image_readability_tint)
-                            .diskCacheStrategy(ApGlideSettings.AP_DISK_CACHE_STRATEGY)
-                            .transform(new FastBlurTransformation(FeedSettingsActivity.this))
-                            .dontAnimate()
+                            .apply(new RequestOptions()
+                                .placeholder(R.color.image_readability_tint)
+                                .error(R.color.image_readability_tint)
+                                .diskCacheStrategy(ApGlideSettings.AP_DISK_CACHE_STRATEGY)
+                                .transform(new FastBlurTransformation())
+                                .dontAnimate())
                             .into(imgvBackground);
 
                     txtvTitle.setText(feed.getTitle());
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
index 28cabfbc7..063da8555 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
@@ -28,6 +28,7 @@ import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
 
+import com.bumptech.glide.request.RequestOptions;
 import org.apache.commons.lang3.StringUtils;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
@@ -397,11 +398,12 @@ public class OnlineFeedViewActivity extends AppCompatActivity {
         if (StringUtils.isNotBlank(feed.getImageUrl())) {
             Glide.with(this)
                     .load(feed.getImageUrl())
-                    .placeholder(R.color.light_gray)
-                    .error(R.color.light_gray)
-                    .diskCacheStrategy(ApGlideSettings.AP_DISK_CACHE_STRATEGY)
-                    .fitCenter()
-                    .dontAnimate()
+                    .apply(new RequestOptions()
+                        .placeholder(R.color.light_gray)
+                        .error(R.color.light_gray)
+                        .diskCacheStrategy(ApGlideSettings.AP_DISK_CACHE_STRATEGY)
+                        .fitCenter()
+                        .dontAnimate())
                     .into(cover);
         }
 
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java
index 9739b999b..11526a35d 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java
@@ -20,6 +20,7 @@ import android.widget.ProgressBar;
 import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
+import com.bumptech.glide.request.RequestOptions;
 import com.joanzapata.iconify.Iconify;
 
 import java.lang.ref.WeakReference;
@@ -194,9 +195,10 @@ public class AllEpisodesRecycleAdapter extends RecyclerView.Adapter<AllEpisodesR
 
         Glide.with(mainActivityRef.get())
                 .load(item.getImageLocation())
-                .diskCacheStrategy(ApGlideSettings.AP_DISK_CACHE_STRATEGY)
-                .fitCenter()
-                .dontAnimate()
+                .apply(new RequestOptions()
+                    .diskCacheStrategy(ApGlideSettings.AP_DISK_CACHE_STRATEGY)
+                    .fitCenter()
+                    .dontAnimate())
                 .into(new CoverTarget(item.getFeed().getImageLocation(), holder.placeholder, holder.cover, mainActivityRef.get()));
     }
 
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/CoverTarget.java b/app/src/main/java/de/danoeh/antennapod/adapter/CoverTarget.java
index ba6e7b25d..5c6980b85 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/CoverTarget.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/CoverTarget.java
@@ -1,21 +1,23 @@
 package de.danoeh.antennapod.adapter;
 
 import android.graphics.drawable.Drawable;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
-import com.bumptech.glide.load.resource.drawable.GlideDrawable;
-import com.bumptech.glide.request.animation.GlideAnimation;
-import com.bumptech.glide.request.target.GlideDrawableImageViewTarget;
+import com.bumptech.glide.request.RequestOptions;
+import com.bumptech.glide.request.target.CustomViewTarget;
 
 import java.lang.ref.WeakReference;
 
+import com.bumptech.glide.request.transition.Transition;
 import de.danoeh.antennapod.activity.MainActivity;
 import de.danoeh.antennapod.core.glide.ApGlideSettings;
 
-class CoverTarget extends GlideDrawableImageViewTarget {
+class CoverTarget extends CustomViewTarget<ImageView, Drawable> {
 
     private final WeakReference<String> fallback;
     private final WeakReference<TextView> placeholder;
@@ -31,7 +33,7 @@ class CoverTarget extends GlideDrawableImageViewTarget {
     }
 
     @Override
-    public void onLoadFailed(Exception e, Drawable errorDrawable) {
+    public void onLoadFailed(Drawable errorDrawable) {
         String fallbackUri = fallback.get();
         TextView txtvPlaceholder = placeholder.get();
         ImageView imgvCover = cover.get();
@@ -39,19 +41,27 @@ class CoverTarget extends GlideDrawableImageViewTarget {
             MainActivity activity = mainActivity.get();
             Glide.with(activity)
                     .load(fallbackUri)
-                    .diskCacheStrategy(ApGlideSettings.AP_DISK_CACHE_STRATEGY)
-                    .fitCenter()
-                    .dontAnimate()
+                    .apply(new RequestOptions()
+                        .diskCacheStrategy(ApGlideSettings.AP_DISK_CACHE_STRATEGY)
+                        .fitCenter()
+                        .dontAnimate())
                     .into(new CoverTarget(null, txtvPlaceholder, imgvCover, activity));
         }
     }
 
     @Override
-    public void onResourceReady(GlideDrawable drawable, GlideAnimation<? super GlideDrawable> anim) {
-        super.onResourceReady(drawable, anim);
+    public void onResourceReady(@NonNull Drawable resource, @Nullable Transition<? super Drawable> transition) {
         TextView txtvPlaceholder = placeholder.get();
         if (txtvPlaceholder != null) {
             txtvPlaceholder.setVisibility(View.INVISIBLE);
         }
+        ImageView ivCover = cover.get();
+        ivCover.setImageDrawable(resource);
+    }
+
+    @Override
+    protected void onResourceCleared(@Nullable Drawable placeholder) {
+        ImageView ivCover = cover.get();
+        ivCover.setImageDrawable(placeholder);
     }
 }
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java
index 51e1271d9..52a78c82d 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java
@@ -13,6 +13,7 @@ import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
 
+import com.bumptech.glide.request.RequestOptions;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.core.feed.FeedItem;
 import de.danoeh.antennapod.core.glide.ApGlideSettings;
@@ -79,11 +80,12 @@ public class DownloadedEpisodesListAdapter extends BaseAdapter {
 
         Glide.with(context)
                 .load(item.getImageLocation())
-                .placeholder(R.color.light_gray)
-                .error(R.color.light_gray)
-                .diskCacheStrategy(ApGlideSettings.AP_DISK_CACHE_STRATEGY)
-                .fitCenter()
-                .dontAnimate()
+                .apply(new RequestOptions()
+                    .placeholder(R.color.light_gray)
+                    .error(R.color.light_gray)
+                    .diskCacheStrategy(ApGlideSettings.AP_DISK_CACHE_STRATEGY)
+                    .fitCenter()
+                    .dontAnimate())
                 .into(holder.imageView);
 
         if(item.isPlayed()) {
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java
index 2daa5e70f..eaff1eb12 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java
@@ -17,6 +17,7 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
+import com.bumptech.glide.request.RequestOptions;
 import com.joanzapata.iconify.Iconify;
 import com.joanzapata.iconify.widget.IconTextView;
 
@@ -336,11 +337,12 @@ public class NavListAdapter extends BaseAdapter
 
         Glide.with(context)
                 .load(feed.getImageLocation())
-                .placeholder(R.color.light_gray)
-                .error(R.color.light_gray)
-                .diskCacheStrategy(ApGlideSettings.AP_DISK_CACHE_STRATEGY)
-                .fitCenter()
-                .dontAnimate()
+                .apply(new RequestOptions()
+                    .placeholder(R.color.light_gray)
+                    .error(R.color.light_gray)
+                    .diskCacheStrategy(ApGlideSettings.AP_DISK_CACHE_STRATEGY)
+                    .fitCenter()
+                    .dontAnimate())
                 .into(holder.image);
 
         holder.title.setText(feed.getTitle());
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java
index ee14cb70a..87b5b5e9a 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java
@@ -23,6 +23,7 @@ import android.widget.ProgressBar;
 import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
+import com.bumptech.glide.request.RequestOptions;
 import com.joanzapata.iconify.Iconify;
 
 import de.danoeh.antennapod.core.util.ThemeUtils;
@@ -293,9 +294,10 @@ public class QueueRecyclerAdapter extends RecyclerView.Adapter<QueueRecyclerAdap
 
             Glide.with(mainActivity.get())
                 .load(item.getImageLocation())
-                .diskCacheStrategy(ApGlideSettings.AP_DISK_CACHE_STRATEGY)
-                .fitCenter()
-                .dontAnimate()
+                .apply(new RequestOptions()
+                    .diskCacheStrategy(ApGlideSettings.AP_DISK_CACHE_STRATEGY)
+                    .fitCenter()
+                    .dontAnimate())
                 .into(new CoverTarget(item.getFeed().getImageLocation(), placeholder, cover, mainActivity.get()));
         }
 
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/SearchlistAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/SearchlistAdapter.java
index beb62b3bb..e2c31f0e8 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/SearchlistAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/SearchlistAdapter.java
@@ -12,6 +12,7 @@ import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
 
+import com.bumptech.glide.request.RequestOptions;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.core.feed.Feed;
 import de.danoeh.antennapod.core.feed.FeedComponent;
@@ -81,11 +82,12 @@ public class SearchlistAdapter extends BaseAdapter {
 
             Glide.with(context)
                     .load(feed.getImageLocation())
-                    .placeholder(R.color.light_gray)
-                    .error(R.color.light_gray)
-                    .diskCacheStrategy(ApGlideSettings.AP_DISK_CACHE_STRATEGY)
-                    .fitCenter()
-                    .dontAnimate()
+                    .apply(new RequestOptions()
+                        .placeholder(R.color.light_gray)
+                        .error(R.color.light_gray)
+                        .diskCacheStrategy(ApGlideSettings.AP_DISK_CACHE_STRATEGY)
+                        .fitCenter()
+                        .dontAnimate())
                     .into(holder.cover);
 
         } else if (component.getClass() == FeedItem.class) {
@@ -100,11 +102,12 @@ public class SearchlistAdapter extends BaseAdapter {
 
             Glide.with(context)
                     .load(item.getFeed().getImageLocation())
-                    .placeholder(R.color.light_gray)
-                    .error(R.color.light_gray)
-                    .diskCacheStrategy(ApGlideSettings.AP_DISK_CACHE_STRATEGY)
-                    .fitCenter()
-                    .dontAnimate()
+                    .apply(new RequestOptions()
+                        .placeholder(R.color.light_gray)
+                        .error(R.color.light_gray)
+                        .diskCacheStrategy(ApGlideSettings.AP_DISK_CACHE_STRATEGY)
+                        .fitCenter()
+                        .dontAnimate())
                     .into(holder.cover);
 
         }
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/StatisticsListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/StatisticsListAdapter.java
index 50255c11f..d60f4406a 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/StatisticsListAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/StatisticsListAdapter.java
@@ -13,6 +13,7 @@ import com.bumptech.glide.Glide;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.bumptech.glide.request.RequestOptions;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.core.feed.Feed;
 import de.danoeh.antennapod.core.glide.ApGlideSettings;
@@ -72,11 +73,12 @@ public class StatisticsListAdapter extends BaseAdapter {
 
         Glide.with(context)
                 .load(feed.getImageLocation())
-                .placeholder(R.color.light_gray)
-                .error(R.color.light_gray)
-                .diskCacheStrategy(ApGlideSettings.AP_DISK_CACHE_STRATEGY)
-                .fitCenter()
-                .dontAnimate()
+                .apply(new RequestOptions()
+                    .placeholder(R.color.light_gray)
+                    .error(R.color.light_gray)
+                    .diskCacheStrategy(ApGlideSettings.AP_DISK_CACHE_STRATEGY)
+                    .fitCenter()
+                    .dontAnimate())
                 .into(holder.image);
 
         holder.title.setText(feed.getTitle());
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/SubscriptionsAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/SubscriptionsAdapter.java
index bb76ab501..0a5c6a947 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/SubscriptionsAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/SubscriptionsAdapter.java
@@ -14,6 +14,7 @@ import com.bumptech.glide.Glide;
 
 import java.lang.ref.WeakReference;
 
+import com.bumptech.glide.request.RequestOptions;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.activity.MainActivity;
 import de.danoeh.antennapod.core.feed.Feed;
@@ -108,7 +109,7 @@ public class SubscriptionsAdapter extends BaseAdapter implements AdapterView.OnI
             holder.count.setVisibility(View.INVISIBLE);
 
             // when this holder is reused, we could else end up with a cover image
-            Glide.clear(holder.imageView);
+            Glide.with(mainActivityRef.get()).clear(holder.imageView);
 
             return convertView;
         }
@@ -127,10 +128,11 @@ public class SubscriptionsAdapter extends BaseAdapter implements AdapterView.OnI
         }
         Glide.with(mainActivityRef.get())
                 .load(feed.getImageLocation())
-                .error(R.color.light_gray)
-                .diskCacheStrategy(ApGlideSettings.AP_DISK_CACHE_STRATEGY)
-                .fitCenter()
-                .dontAnimate()
+                .apply(new RequestOptions()
+                    .error(R.color.light_gray)
+                    .diskCacheStrategy(ApGlideSettings.AP_DISK_CACHE_STRATEGY)
+                    .fitCenter()
+                    .dontAnimate())
                 .into(new CoverTarget(null, holder.feedTitle, holder.imageView, mainActivityRef.get()));
 
         return convertView;
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/gpodnet/PodcastListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/gpodnet/PodcastListAdapter.java
index aea3d583f..490114492 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/gpodnet/PodcastListAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/gpodnet/PodcastListAdapter.java
@@ -10,6 +10,7 @@ import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
 
+import com.bumptech.glide.request.RequestOptions;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.List;
@@ -52,11 +53,12 @@ public class PodcastListAdapter extends ArrayAdapter<GpodnetPodcast> {
         if (StringUtils.isNotBlank(podcast.getLogoUrl())) {
             Glide.with(convertView.getContext())
                     .load(podcast.getLogoUrl())
-                    .placeholder(R.color.light_gray)
-                    .error(R.color.light_gray)
-                    .diskCacheStrategy(ApGlideSettings.AP_DISK_CACHE_STRATEGY)
-                    .fitCenter()
-                    .dontAnimate()
+                    .apply(new RequestOptions()
+                        .placeholder(R.color.light_gray)
+                        .error(R.color.light_gray)
+                        .diskCacheStrategy(ApGlideSettings.AP_DISK_CACHE_STRATEGY)
+                        .fitCenter()
+                        .dontAnimate())
                     .into(holder.image);
         }
 
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/itunes/ItunesAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/itunes/ItunesAdapter.java
index e493a2ecc..79c9b63b4 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/itunes/ItunesAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/itunes/ItunesAdapter.java
@@ -12,6 +12,8 @@ import android.widget.TextView;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
 
+import com.bumptech.glide.request.RequestOptions;
+import de.danoeh.antennapod.core.glide.ApGlideSettings;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -80,10 +82,11 @@ public class ItunesAdapter extends ArrayAdapter<ItunesAdapter.Podcast> {
         //Update the empty imageView with the image from the feed
         Glide.with(context)
                 .load(podcast.imageUrl)
-                .placeholder(R.color.light_gray)
-                .diskCacheStrategy(DiskCacheStrategy.NONE)
-                .fitCenter()
-                .dontAnimate()
+                .apply(new RequestOptions()
+                    .placeholder(R.color.light_gray)
+                    .diskCacheStrategy(DiskCacheStrategy.NONE)
+                    .fitCenter()
+                    .dontAnimate())
                 .into(viewHolder.coverView);
 
         //Feed the grid view
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/CoverFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/CoverFragment.java
index 1d3fcefba..1b3691f6f 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/CoverFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/CoverFragment.java
@@ -11,6 +11,7 @@ import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
 
+import com.bumptech.glide.request.RequestOptions;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.activity.MediaplayerInfoActivity.MediaplayerInfoContentFragment;
 import de.danoeh.antennapod.core.glide.ApGlideSettings;
@@ -61,9 +62,10 @@ public class CoverFragment extends Fragment implements MediaplayerInfoContentFra
             txtvEpisodeTitle.setText(media.getEpisodeTitle());
             Glide.with(this)
                     .load(media.getImageLocation())
-                    .diskCacheStrategy(ApGlideSettings.AP_DISK_CACHE_STRATEGY)
-                    .dontAnimate()
-                    .fitCenter()
+                    .apply(new RequestOptions()
+                        .diskCacheStrategy(ApGlideSettings.AP_DISK_CACHE_STRATEGY)
+                        .dontAnimate()
+                        .fitCenter())
                     .into(imgvCover);
         } else {
             Log.w(TAG, "loadMediaInfo was called while media was null");
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
index dc0ea07ff..bdc133132 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
@@ -16,6 +16,7 @@ import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
 
+import com.bumptech.glide.request.RequestOptions;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.core.feed.MediaType;
 import de.danoeh.antennapod.core.glide.ApGlideSettings;
@@ -192,11 +193,12 @@ public class ExternalPlayerFragment extends Fragment {
 
             Glide.with(getActivity())
                     .load(media.getImageLocation())
-                    .placeholder(R.color.light_gray)
-                    .error(R.color.light_gray)
-                    .diskCacheStrategy(ApGlideSettings.AP_DISK_CACHE_STRATEGY)
-                    .fitCenter()
-                    .dontAnimate()
+                    .apply(new RequestOptions()
+                        .placeholder(R.color.light_gray)
+                        .error(R.color.light_gray)
+                        .diskCacheStrategy(ApGlideSettings.AP_DISK_CACHE_STRATEGY)
+                        .fitCenter()
+                        .dontAnimate())
                     .into(imgvCover);
 
             fragmentLayout.setVisibility(View.VISIBLE);
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 5075d022a..4500452c2 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
@@ -31,6 +31,7 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import com.bumptech.glide.Glide;
+import com.bumptech.glide.request.RequestOptions;
 import com.joanzapata.iconify.Iconify;
 import com.joanzapata.iconify.widget.IconButton;
 
@@ -379,11 +380,12 @@ public class ItemFragment extends Fragment implements OnSwipeGesture {
 
         Glide.with(getActivity())
                 .load(item.getImageLocation())
-                .placeholder(R.color.light_gray)
-                .error(R.color.light_gray)
-                .diskCacheStrategy(ApGlideSettings.AP_DISK_CACHE_STRATEGY)
-                .fitCenter()
-                .dontAnimate()
+                .apply(new RequestOptions()
+                    .placeholder(R.color.light_gray)
+                    .error(R.color.light_gray)
+                    .diskCacheStrategy(ApGlideSettings.AP_DISK_CACHE_STRATEGY)
+                    .fitCenter()
+                    .dontAnimate())
                 .into(imgvCover);
 
         progbarDownload.setVisibility(View.GONE);
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java
index 83d6f9615..c11c12c7a 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java
@@ -26,6 +26,7 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
+import com.bumptech.glide.request.RequestOptions;
 import com.joanzapata.iconify.IconDrawable;
 import com.joanzapata.iconify.Iconify;
 import com.joanzapata.iconify.fonts.FontAwesomeIcons;
@@ -529,20 +530,22 @@ public class ItemlistFragment extends ListFragment {
     private void loadFeedImage() {
         Glide.with(getActivity())
                 .load(feed.getImageLocation())
-                .placeholder(R.color.image_readability_tint)
-                .error(R.color.image_readability_tint)
-                .diskCacheStrategy(ApGlideSettings.AP_DISK_CACHE_STRATEGY)
-                .transform(new FastBlurTransformation(getActivity()))
-                .dontAnimate()
+                .apply(new RequestOptions()
+                    .placeholder(R.color.image_readability_tint)
+                    .error(R.color.image_readability_tint)
+                    .diskCacheStrategy(ApGlideSettings.AP_DISK_CACHE_STRATEGY)
+                    .transform(new FastBlurTransformation())
+                    .dontAnimate())
                 .into(imgvBackground);
 
         Glide.with(getActivity())
                 .load(feed.getImageLocation())
-                .placeholder(R.color.light_gray)
-                .error(R.color.light_gray)
-                .diskCacheStrategy(ApGlideSettings.AP_DISK_CACHE_STRATEGY)
-                .fitCenter()
-                .dontAnimate()
+                .apply(new RequestOptions()
+                    .placeholder(R.color.light_gray)
+                    .error(R.color.light_gray)
+                    .diskCacheStrategy(ApGlideSettings.AP_DISK_CACHE_STRATEGY)
+                    .fitCenter()
+                    .dontAnimate())
                 .into(imgvCover);
     }
 
-- 
cgit v1.2.3


From 221de87c04fe6f865e81d5f28a56ac64e62cd030 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Mon, 15 Oct 2018 15:31:14 +0200
Subject: Hiding expand notification preference on API 26

---
 .../java/de/danoeh/antennapod/preferences/PreferenceController.java    | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
index c55117ecc..e1fcc43c5 100644
--- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
+++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
@@ -227,6 +227,9 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
                     return true;
                 });
 
+        if (Build.VERSION.SDK_INT >= 26) {
+            ui.findPreference(UserPreferences.PREF_EXPANDED_NOTIFICATION).setVisible(false);
+        }
     }
 
     private void setupStorageScreen() {
-- 
cgit v1.2.3


From 8ebb9854e6b371c8b8d6a013d13cb583040ac64a Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Tue, 16 Oct 2018 14:31:49 +0200
Subject: Allow to select all above in batch editor

---
 .../dialog/EpisodesApplyActionFragment.java        | 23 ++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/EpisodesApplyActionFragment.java b/app/src/main/java/de/danoeh/antennapod/dialog/EpisodesApplyActionFragment.java
index d1ee926ac..7f054f5dd 100644
--- a/app/src/main/java/de/danoeh/antennapod/dialog/EpisodesApplyActionFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/dialog/EpisodesApplyActionFragment.java
@@ -1,5 +1,6 @@
 package de.danoeh.antennapod.dialog;
 
+import android.app.AlertDialog;
 import android.content.res.TypedArray;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
@@ -95,6 +96,28 @@ public class EpisodesApplyActionFragment extends Fragment {
             }
             refreshCheckboxes();
         });
+        mListView.setOnItemLongClickListener((adapterView, view12, position, id) -> {
+            new AlertDialog.Builder(getActivity())
+                    .setItems(R.array.batch_long_press_options, (dialogInterface, item) -> {
+                        int direction;
+                        if (item == 0) {
+                            direction = -1;
+                        } else {
+                            direction = 1;
+                        }
+
+                        int currentPosition = position + direction;
+                        while (currentPosition >= 0 && currentPosition < episodes.size()) {
+                            long id1 = episodes.get(currentPosition).getId();
+                            if (!checkedIds.contains(id1)) {
+                                checkedIds.add(id1);
+                            }
+                            currentPosition += direction;
+                        }
+                        refreshCheckboxes();
+                    }).show();
+            return true;
+        });
 
         for(FeedItem episode : episodes) {
             titles.add(episode.getTitle());
-- 
cgit v1.2.3


From 2dbcae1576a570b0e17a5bd389c749eafd24bdfb Mon Sep 17 00:00:00 2001
From: egsavage <egs@egsavage.com>
Date: Sun, 7 Oct 2018 21:32:42 -0400
Subject: Optimize imports

---
 .../antennapod/activity/FeedInfoActivity.java      |  9 ++++--
 .../antennapod/activity/FeedSettingsActivity.java  |  2 ++
 .../antennapod/activity/ImportExportActivity.java  |  8 ++++--
 .../danoeh/antennapod/activity/MainActivity.java   |  6 ++--
 .../antennapod/activity/PreferenceActivity.java    |  6 ++--
 .../danoeh/antennapod/activity/SplashActivity.java |  1 +
 .../antennapod/activity/VideoplayerActivity.java   |  7 +++--
 .../adapter/DefaultActionButtonCallback.java       |  5 ++--
 .../antennapod/adapter/QueueRecyclerAdapter.java   |  2 +-
 .../config/PlaybackServiceCallbacksImpl.java       |  1 -
 .../de/danoeh/antennapod/dialog/ProxyDialog.java   |  1 -
 .../fragment/CompletedDownloadsFragment.java       |  6 ----
 .../antennapod/fragment/DownloadLogFragment.java   |  2 +-
 .../danoeh/antennapod/fragment/ItemFragment.java   |  5 ++--
 .../antennapod/fragment/ItemlistFragment.java      |  7 +----
 .../antennapod/fragment/SubscriptionFragment.java  |  2 --
 .../preferences/MasterSwitchPreference.java        |  1 +
 .../preferences/NumberPickerPreference.java        |  1 +
 .../preferences/PreferenceController.java          | 32 +++++++++++-----------
 19 files changed, 50 insertions(+), 54 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/FeedInfoActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/FeedInfoActivity.java
index 6b1272b01..f4c74d161 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/FeedInfoActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/FeedInfoActivity.java
@@ -16,8 +16,14 @@ import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
+
 import com.bumptech.glide.Glide;
 import com.joanzapata.iconify.Iconify;
+
+import org.apache.commons.lang3.StringUtils;
+import org.jsoup.Jsoup;
+import org.jsoup.nodes.Document;
+
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.core.dialog.DownloadRequestErrorDialogCreator;
 import de.danoeh.antennapod.core.feed.Feed;
@@ -30,9 +36,6 @@ import de.danoeh.antennapod.core.util.IntentUtils;
 import de.danoeh.antennapod.core.util.LangUtils;
 import de.danoeh.antennapod.core.util.syndication.HtmlToPlainText;
 import de.danoeh.antennapod.menuhandler.FeedMenuHandler;
-import org.apache.commons.lang3.StringUtils;
-import org.jsoup.Jsoup;
-import org.jsoup.nodes.Document;
 import rx.Observable;
 import rx.Subscription;
 import rx.android.schedulers.AndroidSchedulers;
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/FeedSettingsActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/FeedSettingsActivity.java
index b500cda87..eea47c363 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/FeedSettingsActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/FeedSettingsActivity.java
@@ -25,7 +25,9 @@ import android.widget.RadioButton;
 import android.widget.Spinner;
 import android.widget.TextView;
 import android.widget.Toast;
+
 import com.bumptech.glide.Glide;
+
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.core.dialog.ConfirmationDialog;
 import de.danoeh.antennapod.core.dialog.DownloadRequestErrorDialogCreator;
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/ImportExportActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/ImportExportActivity.java
index 91462bce9..e6c9c37cc 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/ImportExportActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/ImportExportActivity.java
@@ -13,9 +13,7 @@ import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.view.MenuItem;
-import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.core.preferences.UserPreferences;
-import de.danoeh.antennapod.core.storage.PodDBAdapter;
+
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 
@@ -26,6 +24,10 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.nio.channels.FileChannel;
 
+import de.danoeh.antennapod.R;
+import de.danoeh.antennapod.core.preferences.UserPreferences;
+import de.danoeh.antennapod.core.storage.PodDBAdapter;
+
 /**
  * Displays the 'import/export' screen
  */
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
index 0879b2cec..6e3e2794d 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
@@ -30,9 +30,6 @@ import android.widget.ListView;
 
 import com.bumptech.glide.Glide;
 
-import de.danoeh.antennapod.core.event.ServiceEvent;
-import de.danoeh.antennapod.core.util.IntentUtils;
-import de.danoeh.antennapod.core.util.gui.NotificationUtils;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.Validate;
 
@@ -45,6 +42,7 @@ import de.danoeh.antennapod.core.dialog.ConfirmationDialog;
 import de.danoeh.antennapod.core.event.MessageEvent;
 import de.danoeh.antennapod.core.event.ProgressEvent;
 import de.danoeh.antennapod.core.event.QueueEvent;
+import de.danoeh.antennapod.core.event.ServiceEvent;
 import de.danoeh.antennapod.core.feed.EventDistributor;
 import de.danoeh.antennapod.core.feed.Feed;
 import de.danoeh.antennapod.core.preferences.PlaybackPreferences;
@@ -55,7 +53,9 @@ import de.danoeh.antennapod.core.storage.DBTasks;
 import de.danoeh.antennapod.core.storage.DBWriter;
 import de.danoeh.antennapod.core.util.FeedItemUtil;
 import de.danoeh.antennapod.core.util.Flavors;
+import de.danoeh.antennapod.core.util.IntentUtils;
 import de.danoeh.antennapod.core.util.StorageUtils;
+import de.danoeh.antennapod.core.util.gui.NotificationUtils;
 import de.danoeh.antennapod.dialog.RatingDialog;
 import de.danoeh.antennapod.dialog.RenameFeedDialog;
 import de.danoeh.antennapod.fragment.AddFeedFragment;
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java
index 3f005fe36..452e91bd3 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java
@@ -12,11 +12,11 @@ import android.view.MenuItem;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
-import java.lang.ref.WeakReference;
-
-import com.bytehamster.lib.preferencesearch.SearchPreference;
 import com.bytehamster.lib.preferencesearch.SearchPreferenceResult;
 import com.bytehamster.lib.preferencesearch.SearchPreferenceResultListener;
+
+import java.lang.ref.WeakReference;
+
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.preferences.PreferenceController;
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/SplashActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/SplashActivity.java
index 73b495a42..ef1850d92 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/SplashActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/SplashActivity.java
@@ -9,6 +9,7 @@ import android.support.annotation.Nullable;
 import android.support.v4.graphics.drawable.DrawableCompat;
 import android.support.v7.app.AppCompatActivity;
 import android.widget.ProgressBar;
+
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.core.storage.PodDBAdapter;
 import rx.Completable;
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
index ea408c650..5f5cd9519 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
@@ -23,6 +23,10 @@ import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.SeekBar;
+
+import java.lang.ref.WeakReference;
+import java.util.concurrent.atomic.AtomicBoolean;
+
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.core.feed.MediaType;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
@@ -32,9 +36,6 @@ import de.danoeh.antennapod.core.util.gui.PictureInPictureUtil;
 import de.danoeh.antennapod.core.util.playback.Playable;
 import de.danoeh.antennapod.view.AspectRatioVideoView;
 
-import java.lang.ref.WeakReference;
-import java.util.concurrent.atomic.AtomicBoolean;
-
 /**
  * Activity for playing video files.
  */
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 08b2908ac..1286d9dc7 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/DefaultActionButtonCallback.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/DefaultActionButtonCallback.java
@@ -1,13 +1,12 @@
 package de.danoeh.antennapod.adapter;
 
 import android.content.Context;
+import android.support.annotation.NonNull;
 import android.content.Intent;
 import android.widget.Toast;
 
 import com.afollestad.materialdialogs.MaterialDialog;
 
-import de.danoeh.antennapod.core.util.IntentUtils;
-import de.danoeh.antennapod.core.util.playback.PlaybackServiceStarter;
 import org.apache.commons.lang3.Validate;
 
 import de.danoeh.antennapod.R;
@@ -21,8 +20,10 @@ import de.danoeh.antennapod.core.storage.DBTasks;
 import de.danoeh.antennapod.core.storage.DBWriter;
 import de.danoeh.antennapod.core.storage.DownloadRequestException;
 import de.danoeh.antennapod.core.storage.DownloadRequester;
+import de.danoeh.antennapod.core.util.IntentUtils;
 import de.danoeh.antennapod.core.util.LongList;
 import de.danoeh.antennapod.core.util.NetworkUtils;
+import de.danoeh.antennapod.core.util.playback.PlaybackServiceStarter;
 
 /**
  * Default implementation of an ActionButtonCallback
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java
index ee14cb70a..c407d3bb3 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java
@@ -25,7 +25,6 @@ import android.widget.TextView;
 import com.bumptech.glide.Glide;
 import com.joanzapata.iconify.Iconify;
 
-import de.danoeh.antennapod.core.util.ThemeUtils;
 import org.apache.commons.lang3.ArrayUtils;
 
 import java.lang.ref.WeakReference;
@@ -41,6 +40,7 @@ import de.danoeh.antennapod.core.util.Converter;
 import de.danoeh.antennapod.core.util.DateUtils;
 import de.danoeh.antennapod.core.util.LongList;
 import de.danoeh.antennapod.core.util.NetworkUtils;
+import de.danoeh.antennapod.core.util.ThemeUtils;
 import de.danoeh.antennapod.fragment.ItemFragment;
 import de.danoeh.antennapod.menuhandler.FeedItemMenuHandler;
 
diff --git a/app/src/main/java/de/danoeh/antennapod/config/PlaybackServiceCallbacksImpl.java b/app/src/main/java/de/danoeh/antennapod/config/PlaybackServiceCallbacksImpl.java
index 83dd3fe9c..eb70d8e0b 100644
--- a/app/src/main/java/de/danoeh/antennapod/config/PlaybackServiceCallbacksImpl.java
+++ b/app/src/main/java/de/danoeh/antennapod/config/PlaybackServiceCallbacksImpl.java
@@ -2,7 +2,6 @@ package de.danoeh.antennapod.config;
 
 import android.content.Context;
 import android.content.Intent;
-
 import android.os.Build;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.activity.AudioplayerActivity;
diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/ProxyDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/ProxyDialog.java
index b9276982a..4a5c61c86 100644
--- a/app/src/main/java/de/danoeh/antennapod/dialog/ProxyDialog.java
+++ b/app/src/main/java/de/danoeh/antennapod/dialog/ProxyDialog.java
@@ -34,7 +34,6 @@ import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
 import rx.Observable;
-import rx.Subscriber;
 import rx.Subscription;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.schedulers.Schedulers;
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java
index f6d503b29..7c28ba21f 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java
@@ -1,8 +1,6 @@
 package de.danoeh.antennapod.fragment;
 
 import android.content.Context;
-import android.content.res.TypedArray;
-import android.graphics.Color;
 import android.os.Bundle;
 import android.support.v4.app.ListFragment;
 import android.util.Log;
@@ -12,9 +10,6 @@ import android.view.MenuItem;
 import android.view.View;
 import android.widget.ListView;
 
-import com.joanzapata.iconify.IconDrawable;
-import com.joanzapata.iconify.fonts.FontAwesomeIcons;
-
 import java.util.List;
 
 import de.danoeh.antennapod.R;
@@ -22,7 +17,6 @@ import de.danoeh.antennapod.activity.MainActivity;
 import de.danoeh.antennapod.adapter.DownloadedEpisodesListAdapter;
 import de.danoeh.antennapod.core.feed.EventDistributor;
 import de.danoeh.antennapod.core.feed.FeedItem;
-import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.core.storage.DBReader;
 import de.danoeh.antennapod.core.storage.DBWriter;
 import de.danoeh.antennapod.core.util.FeedItemUtil;
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/DownloadLogFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/DownloadLogFragment.java
index ae9c60f65..a5eaa161f 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/DownloadLogFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/DownloadLogFragment.java
@@ -12,10 +12,10 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.ListView;
+import android.widget.TextView;
 
 import java.util.List;
 
-import android.widget.TextView;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.adapter.DownloadLogAdapter;
 import de.danoeh.antennapod.core.feed.EventDistributor;
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 5075d022a..250964301 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
@@ -34,8 +34,6 @@ import com.bumptech.glide.Glide;
 import com.joanzapata.iconify.Iconify;
 import com.joanzapata.iconify.widget.IconButton;
 
-import de.danoeh.antennapod.core.service.playback.PlaybackService;
-import de.danoeh.antennapod.core.util.NetworkUtils;
 import org.apache.commons.lang3.ArrayUtils;
 
 import java.util.List;
@@ -53,16 +51,17 @@ import de.danoeh.antennapod.core.feed.FeedMedia;
 import de.danoeh.antennapod.core.glide.ApGlideSettings;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.core.service.download.Downloader;
+import de.danoeh.antennapod.core.service.playback.PlaybackService;
 import de.danoeh.antennapod.core.storage.DBReader;
 import de.danoeh.antennapod.core.storage.DBTasks;
 import de.danoeh.antennapod.core.storage.DBWriter;
-import de.danoeh.antennapod.core.storage.DownloadRequestException;
 import de.danoeh.antennapod.core.storage.DownloadRequester;
 import de.danoeh.antennapod.core.util.Converter;
 import de.danoeh.antennapod.core.util.DateUtils;
 import de.danoeh.antennapod.core.util.Flavors;
 import de.danoeh.antennapod.core.util.IntentUtils;
 import de.danoeh.antennapod.core.util.LongList;
+import de.danoeh.antennapod.core.util.NetworkUtils;
 import de.danoeh.antennapod.core.util.ShareUtils;
 import de.danoeh.antennapod.core.util.playback.Timeline;
 import de.danoeh.antennapod.menuhandler.FeedItemMenuHandler;
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java
index dbea23aeb..55c32dbdf 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java
@@ -4,8 +4,6 @@ import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.content.res.TypedArray;
-import android.graphics.Color;
 import android.graphics.LightingColorFilter;
 import android.os.Bundle;
 import android.support.v4.app.ListFragment;
@@ -26,18 +24,16 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
-import com.joanzapata.iconify.IconDrawable;
 import com.joanzapata.iconify.Iconify;
-import com.joanzapata.iconify.fonts.FontAwesomeIcons;
 import com.joanzapata.iconify.widget.IconTextView;
 
-import de.danoeh.antennapod.activity.FeedSettingsActivity;
 import org.apache.commons.lang3.Validate;
 
 import java.util.List;
 
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.activity.FeedInfoActivity;
+import de.danoeh.antennapod.activity.FeedSettingsActivity;
 import de.danoeh.antennapod.activity.MainActivity;
 import de.danoeh.antennapod.adapter.DefaultActionButtonCallback;
 import de.danoeh.antennapod.adapter.FeedItemlistAdapter;
@@ -55,7 +51,6 @@ import de.danoeh.antennapod.core.feed.FeedItemFilter;
 import de.danoeh.antennapod.core.feed.FeedMedia;
 import de.danoeh.antennapod.core.glide.ApGlideSettings;
 import de.danoeh.antennapod.core.glide.FastBlurTransformation;
-import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.core.service.download.DownloadService;
 import de.danoeh.antennapod.core.service.download.Downloader;
 import de.danoeh.antennapod.core.storage.DBReader;
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/SubscriptionFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/SubscriptionFragment.java
index aec2bb536..6e7e1d2b2 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/SubscriptionFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/SubscriptionFragment.java
@@ -1,7 +1,6 @@
 package de.danoeh.antennapod.fragment;
 
 import android.content.DialogInterface;
-import android.content.Intent;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.util.Log;
@@ -16,7 +15,6 @@ import android.widget.GridView;
 
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.activity.MainActivity;
-import de.danoeh.antennapod.activity.MediaplayerInfoActivity;
 import de.danoeh.antennapod.adapter.SubscriptionsAdapter;
 import de.danoeh.antennapod.core.asynctask.FeedRemover;
 import de.danoeh.antennapod.core.dialog.ConfirmationDialog;
diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/MasterSwitchPreference.java b/app/src/main/java/de/danoeh/antennapod/preferences/MasterSwitchPreference.java
index e500267fe..b810cbfa6 100644
--- a/app/src/main/java/de/danoeh/antennapod/preferences/MasterSwitchPreference.java
+++ b/app/src/main/java/de/danoeh/antennapod/preferences/MasterSwitchPreference.java
@@ -9,6 +9,7 @@ import android.support.v7.preference.PreferenceViewHolder;
 import android.util.AttributeSet;
 import android.util.TypedValue;
 import android.widget.TextView;
+
 import de.danoeh.antennapod.R;
 
 public class MasterSwitchPreference extends SwitchPreference {
diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/NumberPickerPreference.java b/app/src/main/java/de/danoeh/antennapod/preferences/NumberPickerPreference.java
index 20b07e486..50e76838c 100644
--- a/app/src/main/java/de/danoeh/antennapod/preferences/NumberPickerPreference.java
+++ b/app/src/main/java/de/danoeh/antennapod/preferences/NumberPickerPreference.java
@@ -8,6 +8,7 @@ import android.util.AttributeSet;
 import android.view.View;
 import android.view.WindowManager;
 import android.widget.EditText;
+
 import de.danoeh.antennapod.R;
 
 public class NumberPickerPreference extends Preference {
diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
index e1fcc43c5..1d93afad9 100644
--- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
+++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
@@ -36,24 +36,9 @@ import android.widget.ListView;
 import android.widget.Toast;
 
 import com.afollestad.materialdialogs.MaterialDialog;
-
 import com.bytehamster.lib.preferencesearch.SearchConfiguration;
 import com.bytehamster.lib.preferencesearch.SearchPreference;
-import de.danoeh.antennapod.activity.AboutActivity;
-import de.danoeh.antennapod.activity.ImportExportActivity;
-import de.danoeh.antennapod.activity.MediaplayerActivity;
-import de.danoeh.antennapod.activity.OpmlImportFromPathActivity;
-import de.danoeh.antennapod.activity.PreferenceActivity;
-import de.danoeh.antennapod.activity.StatisticsActivity;
-import de.danoeh.antennapod.core.export.html.HtmlWriter;
-import de.danoeh.antennapod.core.export.opml.OpmlWriter;
-import de.danoeh.antennapod.core.service.GpodnetSyncService;
-import de.danoeh.antennapod.dialog.AuthenticationDialog;
-import de.danoeh.antennapod.dialog.AutoFlattrPreferenceDialog;
-import de.danoeh.antennapod.dialog.GpodnetSetHostnameDialog;
-import de.danoeh.antennapod.dialog.ProxyDialog;
-import de.danoeh.antennapod.dialog.VariableSpeedDialog;
-import de.danoeh.antennapod.core.util.gui.PictureInPictureUtil;
+
 import org.apache.commons.lang3.ArrayUtils;
 
 import java.io.File;
@@ -67,14 +52,29 @@ import java.util.concurrent.TimeUnit;
 
 import de.danoeh.antennapod.CrashReportWriter;
 import de.danoeh.antennapod.R;
+import de.danoeh.antennapod.activity.AboutActivity;
 import de.danoeh.antennapod.activity.DirectoryChooserActivity;
+import de.danoeh.antennapod.activity.ImportExportActivity;
 import de.danoeh.antennapod.activity.MainActivity;
+import de.danoeh.antennapod.activity.MediaplayerActivity;
+import de.danoeh.antennapod.activity.OpmlImportFromPathActivity;
+import de.danoeh.antennapod.activity.PreferenceActivity;
+import de.danoeh.antennapod.activity.StatisticsActivity;
 import de.danoeh.antennapod.asynctask.ExportWorker;
 import de.danoeh.antennapod.core.export.ExportWriter;
+import de.danoeh.antennapod.core.export.html.HtmlWriter;
+import de.danoeh.antennapod.core.export.opml.OpmlWriter;
 import de.danoeh.antennapod.core.preferences.GpodnetPreferences;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
+import de.danoeh.antennapod.core.service.GpodnetSyncService;
 import de.danoeh.antennapod.core.util.flattr.FlattrUtils;
+import de.danoeh.antennapod.core.util.gui.PictureInPictureUtil;
+import de.danoeh.antennapod.dialog.AuthenticationDialog;
+import de.danoeh.antennapod.dialog.AutoFlattrPreferenceDialog;
 import de.danoeh.antennapod.dialog.ChooseDataFolderDialog;
+import de.danoeh.antennapod.dialog.GpodnetSetHostnameDialog;
+import de.danoeh.antennapod.dialog.ProxyDialog;
+import de.danoeh.antennapod.dialog.VariableSpeedDialog;
 import rx.Observable;
 import rx.Subscription;
 import rx.android.schedulers.AndroidSchedulers;
-- 
cgit v1.2.3


From a52f1ba34f917aa3cbaf0aff661d6ba64607a32d Mon Sep 17 00:00:00 2001
From: egsavage <egs@egsavage.com>
Date: Sun, 7 Oct 2018 22:04:44 -0400
Subject: Remove redundant type casts

---
 .../danoeh/antennapod/activity/AboutActivity.java  |  4 +--
 .../activity/DirectoryChooserActivity.java         | 10 ++++----
 .../activity/DownloadAuthenticationActivity.java   | 10 ++++----
 .../antennapod/activity/FeedInfoActivity.java      | 20 +++++++--------
 .../antennapod/activity/FeedSettingsActivity.java  | 24 ++++++++---------
 .../antennapod/activity/FlattrAuthActivity.java    |  6 ++---
 .../danoeh/antennapod/activity/MainActivity.java   |  6 ++---
 .../antennapod/activity/MediaplayerActivity.java   | 18 ++++++-------
 .../activity/MediaplayerInfoActivity.java          | 16 ++++++------
 .../activity/OnlineFeedViewActivity.java           | 14 +++++-----
 .../activity/OpmlFeedChooserActivity.java          |  6 ++---
 .../activity/OpmlImportFromPathActivity.java       | 14 +++++-----
 .../antennapod/activity/StatisticsActivity.java    |  6 ++---
 .../antennapod/activity/StorageErrorActivity.java  |  2 +-
 .../antennapod/activity/VideoplayerActivity.java   | 10 ++++----
 .../gpoddernet/GpodnetAuthenticationActivity.java  | 30 +++++++++++-----------
 .../adapter/AllEpisodesRecycleAdapter.java         | 20 +++++++--------
 .../antennapod/adapter/ChaptersListAdapter.java    | 10 ++++----
 .../antennapod/adapter/DownloadLogAdapter.java     | 12 ++++-----
 .../adapter/DownloadedEpisodesListAdapter.java     | 12 ++++-----
 .../antennapod/adapter/DownloadlistAdapter.java    | 10 ++++----
 .../antennapod/adapter/FeedItemlistAdapter.java    | 16 ++++++------
 .../adapter/FeedItemlistDescriptionAdapter.java    |  6 ++---
 .../danoeh/antennapod/adapter/NavListAdapter.java  | 16 ++++++------
 .../antennapod/adapter/QueueRecyclerAdapter.java   | 20 +++++++--------
 .../antennapod/adapter/SearchlistAdapter.java      |  6 ++---
 .../antennapod/adapter/StatisticsListAdapter.java  |  6 ++---
 .../antennapod/adapter/SubscriptionsAdapter.java   |  6 ++---
 .../adapter/gpodnet/PodcastListAdapter.java        |  8 +++---
 .../antennapod/adapter/gpodnet/TagListAdapter.java |  4 +--
 .../antennapod/adapter/itunes/ItunesAdapter.java   |  6 ++---
 .../antennapod/dialog/AuthenticationDialog.java    | 10 ++++----
 .../dialog/AutoFlattrPreferenceDialog.java         |  6 ++---
 .../dialog/EpisodesApplyActionFragment.java        | 12 ++++-----
 .../de/danoeh/antennapod/dialog/ProxyDialog.java   | 12 ++++-----
 .../danoeh/antennapod/dialog/SleepTimerDialog.java | 10 ++++----
 .../antennapod/fragment/AddFeedFragment.java       | 12 ++++-----
 .../antennapod/fragment/AllEpisodesFragment.java   |  4 +--
 .../danoeh/antennapod/fragment/CoverFragment.java  |  6 ++---
 .../antennapod/fragment/DownloadsFragment.java     |  4 +--
 .../antennapod/fragment/EpisodesFragment.java      |  4 +--
 .../fragment/ExternalPlayerFragment.java           | 12 ++++-----
 .../antennapod/fragment/FyydSearchFragment.java    | 10 ++++----
 .../danoeh/antennapod/fragment/ItemFragment.java   | 24 ++++++++---------
 .../antennapod/fragment/ItemlistFragment.java      | 16 ++++++------
 .../antennapod/fragment/ItunesSearchFragment.java  | 10 ++++----
 .../danoeh/antennapod/fragment/QueueFragment.java  |  8 +++---
 .../antennapod/fragment/SubscriptionFragment.java  |  2 +-
 .../fragment/gpodnet/GpodnetMainFragment.java      |  4 +--
 .../fragment/gpodnet/PodcastListFragment.java      |  8 +++---
 .../antennapod/menuhandler/MenuItemUtils.java      |  2 +-
 .../java/de/danoeh/antennapod/spa/SPAUtil.java     |  2 +-
 52 files changed, 266 insertions(+), 266 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java
index 141fddd1c..266619840 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java
@@ -43,8 +43,8 @@ public class AboutActivity extends AppCompatActivity {
         super.onCreate(savedInstanceState);
         getSupportActionBar().setDisplayShowHomeEnabled(true);
         setContentView(R.layout.about);
-        webViewContainer = (LinearLayout) findViewById(R.id.webViewContainer);
-        webView = (WebView) findViewById(R.id.webViewAbout);
+        webViewContainer = findViewById(R.id.webViewContainer);
+        webView = findViewById(R.id.webViewAbout);
         webView.getSettings().setCacheMode(WebSettings.LOAD_NO_CACHE);
         if (UserPreferences.getTheme() == R.style.Theme_AntennaPod_Dark) {
             if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1) {
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/DirectoryChooserActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/DirectoryChooserActivity.java
index 390d4cef8..33def125e 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/DirectoryChooserActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/DirectoryChooserActivity.java
@@ -64,11 +64,11 @@ public class DirectoryChooserActivity extends AppCompatActivity {
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
         setContentView(R.layout.directory_chooser);
-        butConfirm = (Button) findViewById(R.id.butConfirm);
-        butCancel = (Button) findViewById(R.id.butCancel);
-        butNavUp = (ImageButton) findViewById(R.id.butNavUp);
-        txtvSelectedFolder = (TextView) findViewById(R.id.txtvSelectedFolder);
-        listDirectories = (ListView) findViewById(R.id.directory_list);
+        butConfirm = findViewById(R.id.butConfirm);
+        butCancel = findViewById(R.id.butCancel);
+        butNavUp = findViewById(R.id.butNavUp);
+        txtvSelectedFolder = findViewById(R.id.txtvSelectedFolder);
+        listDirectories = findViewById(R.id.directory_list);
 
         butConfirm.setOnClickListener(new OnClickListener() {
 
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/DownloadAuthenticationActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/DownloadAuthenticationActivity.java
index e726afaec..5e04d743d 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/DownloadAuthenticationActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/DownloadAuthenticationActivity.java
@@ -49,11 +49,11 @@ public class DownloadAuthenticationActivity extends AppCompatActivity {
         }
 
         setContentView(R.layout.download_authentication_activity);
-        TextView txtvDescription = (TextView) findViewById(R.id.txtvDescription);
-        etxtUsername = (EditText) findViewById(R.id.etxtUsername);
-        etxtPassword = (EditText) findViewById(R.id.etxtPassword);
-        Button butConfirm = (Button) findViewById(R.id.butConfirm);
-        Button butCancel = (Button) findViewById(R.id.butCancel);
+        TextView txtvDescription = findViewById(R.id.txtvDescription);
+        etxtUsername = findViewById(R.id.etxtUsername);
+        etxtPassword = findViewById(R.id.etxtPassword);
+        Button butConfirm = findViewById(R.id.butConfirm);
+        Button butCancel = findViewById(R.id.butCancel);
 
         Validate.isTrue(getIntent().hasExtra(ARG_DOWNLOAD_REQUEST), "Download request missing");
         DownloadRequest request = getIntent().getParcelableExtra(ARG_DOWNLOAD_REQUEST);
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/FeedInfoActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/FeedInfoActivity.java
index f4c74d161..c533adc10 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/FeedInfoActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/FeedInfoActivity.java
@@ -85,22 +85,22 @@ public class FeedInfoActivity extends AppCompatActivity {
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         long feedId = getIntent().getLongExtra(EXTRA_FEED_ID, -1);
 
-        imgvCover = (ImageView) findViewById(R.id.imgvCover);
-        txtvTitle = (TextView) findViewById(R.id.txtvTitle);
-        TextView txtvAuthorHeader = (TextView) findViewById(R.id.txtvAuthor);
-        ImageView imgvBackground = (ImageView) findViewById(R.id.imgvBackground);
+        imgvCover = findViewById(R.id.imgvCover);
+        txtvTitle = findViewById(R.id.txtvTitle);
+        TextView txtvAuthorHeader = findViewById(R.id.txtvAuthor);
+        ImageView imgvBackground = findViewById(R.id.imgvBackground);
         findViewById(R.id.butShowInfo).setVisibility(View.INVISIBLE);
         findViewById(R.id.butShowSettings).setVisibility(View.INVISIBLE);
         // https://github.com/bumptech/glide/issues/529
         imgvBackground.setColorFilter(new LightingColorFilter(0xff828282, 0x000000));
 
 
-        txtvDescription = (TextView) findViewById(R.id.txtvDescription);
-        lblLanguage = (TextView) findViewById(R.id.lblLanguage);
-        txtvLanguage = (TextView) findViewById(R.id.txtvLanguage);
-        lblAuthor = (TextView) findViewById(R.id.lblAuthor);
-        txtvAuthor = (TextView) findViewById(R.id.txtvDetailsAuthor);
-        txtvUrl = (TextView) findViewById(R.id.txtvUrl);
+        txtvDescription = findViewById(R.id.txtvDescription);
+        lblLanguage = findViewById(R.id.lblLanguage);
+        txtvLanguage = findViewById(R.id.txtvLanguage);
+        lblAuthor = findViewById(R.id.lblAuthor);
+        txtvAuthor = findViewById(R.id.txtvDetailsAuthor);
+        txtvUrl = findViewById(R.id.txtvUrl);
 
         txtvUrl.setOnClickListener(copyUrlToClipboard);
 
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/FeedSettingsActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/FeedSettingsActivity.java
index eea47c363..dcce63a44 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/FeedSettingsActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/FeedSettingsActivity.java
@@ -113,27 +113,27 @@ public class FeedSettingsActivity extends AppCompatActivity {
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         long feedId = getIntent().getLongExtra(EXTRA_FEED_ID, -1);
 
-        imgvCover = (ImageView) findViewById(R.id.imgvCover);
-        txtvTitle = (TextView) findViewById(R.id.txtvTitle);
-        TextView txtvAuthorHeader = (TextView) findViewById(R.id.txtvAuthor);
-        ImageView imgvBackground = (ImageView) findViewById(R.id.imgvBackground);
+        imgvCover = findViewById(R.id.imgvCover);
+        txtvTitle = findViewById(R.id.txtvTitle);
+        TextView txtvAuthorHeader = findViewById(R.id.txtvAuthor);
+        ImageView imgvBackground = findViewById(R.id.imgvBackground);
         findViewById(R.id.butShowInfo).setVisibility(View.INVISIBLE);
         findViewById(R.id.butShowSettings).setVisibility(View.INVISIBLE);
         // https://github.com/bumptech/glide/issues/529
         imgvBackground.setColorFilter(new LightingColorFilter(0xff828282, 0x000000));
 
-        cbxAutoDownload = (CheckBox) findViewById(R.id.cbxAutoDownload);
-        cbxKeepUpdated = (CheckBox) findViewById(R.id.cbxKeepUpdated);
-        spnAutoDelete = (Spinner) findViewById(R.id.spnAutoDelete);
-        etxtUsername = (EditText) findViewById(R.id.etxtUsername);
-        etxtPassword = (EditText) findViewById(R.id.etxtPassword);
-        etxtFilterText = (EditText) findViewById(R.id.etxtEpisodeFilterText);
-        rdoFilterInclude = (RadioButton) findViewById(R.id.radio_filter_include);
+        cbxAutoDownload = findViewById(R.id.cbxAutoDownload);
+        cbxKeepUpdated = findViewById(R.id.cbxKeepUpdated);
+        spnAutoDelete = findViewById(R.id.spnAutoDelete);
+        etxtUsername = findViewById(R.id.etxtUsername);
+        etxtPassword = findViewById(R.id.etxtPassword);
+        etxtFilterText = findViewById(R.id.etxtEpisodeFilterText);
+        rdoFilterInclude = findViewById(R.id.radio_filter_include);
         rdoFilterInclude.setOnClickListener(v -> {
             filterInclude = true;
             filterTextChanged = true;
         });
-        rdoFilterExclude = (RadioButton) findViewById(R.id.radio_filter_exclude);
+        rdoFilterExclude = findViewById(R.id.radio_filter_exclude);
         rdoFilterExclude.setOnClickListener(v -> {
             filterInclude = false;
             filterTextChanged = true;
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/FlattrAuthActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/FlattrAuthActivity.java
index 26352f58f..2b4384a02 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/FlattrAuthActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/FlattrAuthActivity.java
@@ -41,9 +41,9 @@ public class FlattrAuthActivity extends AppCompatActivity {
 		if (BuildConfig.DEBUG) Log.d(TAG, "Activity created");
 		getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 		setContentView(R.layout.flattr_auth);
-		txtvExplanation = (TextView) findViewById(R.id.txtvExplanation);
-		butAuthenticate = (Button) findViewById(R.id.but_authenticate);
-		butReturn = (Button) findViewById(R.id.but_return_home);
+		txtvExplanation = findViewById(R.id.txtvExplanation);
+		butAuthenticate = findViewById(R.id.but_authenticate);
+		butReturn = findViewById(R.id.but_return_home);
 
 		butReturn.setOnClickListener(v -> {
             Intent intent = new Intent(FlattrAuthActivity.this, MainActivity.class);
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
index 6e3e2794d..f506921d2 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
@@ -130,7 +130,7 @@ public class MainActivity extends CastEnabledActivity implements NavDrawerActivi
         StorageUtils.checkStorageAvailability(this);
         setContentView(R.layout.main);
 
-        toolbar = (Toolbar) findViewById(R.id.toolbar);
+        toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
@@ -142,8 +142,8 @@ public class MainActivity extends CastEnabledActivity implements NavDrawerActivi
 
         currentTitle = getTitle();
 
-        drawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout);
-        navList = (ListView) findViewById(R.id.nav_list);
+        drawerLayout = findViewById(R.id.drawer_layout);
+        navList = findViewById(R.id.nav_list);
         navDrawer = findViewById(R.id.nav_layout);
 
         drawerToggle = new ActionBarDrawerToggle(this, drawerLayout, R.string.drawer_open, R.string.drawer_close);
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
index 637198784..9c8999927 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
@@ -797,13 +797,13 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements
 
     void setupGUI() {
         setContentView(getContentViewResourceId());
-        sbPosition = (SeekBar) findViewById(R.id.sbPosition);
-        txtvPosition = (TextView) findViewById(R.id.txtvPosition);
+        sbPosition = findViewById(R.id.sbPosition);
+        txtvPosition = findViewById(R.id.txtvPosition);
 
         SharedPreferences prefs = getSharedPreferences(PREFS, MODE_PRIVATE);
         showTimeLeft = prefs.getBoolean(PREF_SHOW_TIME_LEFT, false);
         Log.d("timeleft", showTimeLeft ? "true" : "false");
-        txtvLength = (TextView) findViewById(R.id.txtvLength);
+        txtvLength = findViewById(R.id.txtvLength);
         if (txtvLength != null) {
             txtvLength.setOnClickListener(v -> {
                 showTimeLeft = !showTimeLeft;
@@ -827,18 +827,18 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements
             });
         }
 
-        butRev = (ImageButton) findViewById(R.id.butRev);
-        txtvRev = (TextView) findViewById(R.id.txtvRev);
+        butRev = findViewById(R.id.butRev);
+        txtvRev = findViewById(R.id.txtvRev);
         if (txtvRev != null) {
             txtvRev.setText(String.valueOf(UserPreferences.getRewindSecs()));
         }
-        butPlay = (ImageButton) findViewById(R.id.butPlay);
-        butFF = (ImageButton) findViewById(R.id.butFF);
-        txtvFF = (TextView) findViewById(R.id.txtvFF);
+        butPlay = findViewById(R.id.butPlay);
+        butFF = findViewById(R.id.butFF);
+        txtvFF = findViewById(R.id.txtvFF);
         if (txtvFF != null) {
             txtvFF.setText(String.valueOf(UserPreferences.getFastForwardSecs()));
         }
-        butSkip = (ImageButton) findViewById(R.id.butSkip);
+        butSkip = findViewById(R.id.butSkip);
 
         // SEEKBAR SETUP
 
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerInfoActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerInfoActivity.java
index ce9bbb955..7d79f0a57 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerInfoActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerInfoActivity.java
@@ -227,18 +227,18 @@ public abstract class MediaplayerInfoActivity extends MediaplayerActivity implem
     @Override
     protected void setupGUI() {
         super.setupGUI();
-        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         getSupportActionBar().setTitle("");
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             findViewById(R.id.shadow).setVisibility(View.GONE);
-            AppBarLayout appBarLayout = (AppBarLayout) findViewById(R.id.appBar);
+            AppBarLayout appBarLayout = findViewById(R.id.appBar);
             float px = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 4, getResources().getDisplayMetrics());
             appBarLayout.setElevation(px);
         }
-        drawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout);
-        navList = (ListView) findViewById(R.id.nav_list);
+        drawerLayout = findViewById(R.id.drawer_layout);
+        navList = findViewById(R.id.nav_list);
         navDrawer = findViewById(R.id.nav_layout);
 
         drawerToggle = new ActionBarDrawerToggle(this, drawerLayout, R.string.drawer_open, R.string.drawer_close);
@@ -274,14 +274,14 @@ public abstract class MediaplayerInfoActivity extends MediaplayerActivity implem
             startActivity(new Intent(MediaplayerInfoActivity.this, PreferenceActivity.class));
         });
 
-        butPlaybackSpeed = (Button) findViewById(R.id.butPlaybackSpeed);
-        butCastDisconnect = (ImageButton) findViewById(R.id.butCastDisconnect);
+        butPlaybackSpeed = findViewById(R.id.butPlaybackSpeed);
+        butCastDisconnect = findViewById(R.id.butCastDisconnect);
 
-        pager = (ViewPager) findViewById(R.id.pager);
+        pager = findViewById(R.id.pager);
         pagerAdapter = new MediaplayerInfoPagerAdapter(getSupportFragmentManager(), media);
         pagerAdapter.setController(controller);
         pager.setAdapter(pagerAdapter);
-        CirclePageIndicator pageIndicator = (CirclePageIndicator) findViewById(R.id.page_indicator);
+        CirclePageIndicator pageIndicator = findViewById(R.id.page_indicator);
         pageIndicator.setViewPager(pager);
         loadLastFragment();
         pager.onSaveInstanceState();
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
index b5cc1c931..feae7d402 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
@@ -379,20 +379,20 @@ public class OnlineFeedViewActivity extends AppCompatActivity {
         this.feed = feed;
         this.selectedDownloadUrl = feed.getDownload_url();
         EventDistributor.getInstance().register(listener);
-        ListView listView = (ListView) findViewById(R.id.listview);
+        ListView listView = findViewById(R.id.listview);
         LayoutInflater inflater = LayoutInflater.from(this);
         View header = inflater.inflate(R.layout.onlinefeedview_header, listView, false);
         listView.addHeaderView(header);
 
         listView.setAdapter(new FeedItemlistDescriptionAdapter(this, 0, feed.getItems()));
 
-        ImageView cover = (ImageView) header.findViewById(R.id.imgvCover);
-        TextView title = (TextView) header.findViewById(R.id.txtvTitle);
-        TextView author = (TextView) header.findViewById(R.id.txtvAuthor);
-        TextView description = (TextView) header.findViewById(R.id.txtvDescription);
-        Spinner spAlternateUrls = (Spinner) header.findViewById(R.id.spinnerAlternateUrls);
+        ImageView cover = header.findViewById(R.id.imgvCover);
+        TextView title = header.findViewById(R.id.txtvTitle);
+        TextView author = header.findViewById(R.id.txtvAuthor);
+        TextView description = header.findViewById(R.id.txtvDescription);
+        Spinner spAlternateUrls = header.findViewById(R.id.spinnerAlternateUrls);
 
-        subscribeButton = (Button) header.findViewById(R.id.butSubscribe);
+        subscribeButton = header.findViewById(R.id.butSubscribe);
 
         if (StringUtils.isNotBlank(feed.getImageUrl())) {
             Glide.with(this)
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/OpmlFeedChooserActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/OpmlFeedChooserActivity.java
index cd375a65a..72759c59c 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/OpmlFeedChooserActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/OpmlFeedChooserActivity.java
@@ -39,9 +39,9 @@ public class OpmlFeedChooserActivity extends AppCompatActivity {
         super.onCreate(savedInstanceState);
 
         setContentView(R.layout.opml_selection);
-        butConfirm = (Button) findViewById(R.id.butConfirm);
-        butCancel = (Button) findViewById(R.id.butCancel);
-        feedlist = (ListView) findViewById(R.id.feedlist);
+        butConfirm = findViewById(R.id.butConfirm);
+        butCancel = findViewById(R.id.butCancel);
+        feedlist = findViewById(R.id.feedlist);
 
         feedlist.setChoiceMode(ListView.CHOICE_MODE_MULTIPLE);
         listAdapter = new ArrayAdapter<>(this,
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportFromPathActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportFromPathActivity.java
index ed7ab5d34..a63d3b735 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportFromPathActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportFromPathActivity.java
@@ -36,16 +36,16 @@ public class OpmlImportFromPathActivity extends OpmlImportBaseActivity {
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         setContentView(R.layout.opml_import);
 
-        final TextView txtvHeaderExplanation1 = (TextView) findViewById(R.id.txtvHeadingExplanation1);
-        final TextView txtvExplanation1 = (TextView) findViewById(R.id.txtvExplanation1);
-        final TextView txtvHeaderExplanation2 = (TextView) findViewById(R.id.txtvHeadingExplanation2);
-        final TextView txtvExplanation2 = (TextView) findViewById(R.id.txtvExplanation2);
-        final TextView txtvHeaderExplanation3 = (TextView) findViewById(R.id.txtvHeadingExplanation3);
+        final TextView txtvHeaderExplanation1 = findViewById(R.id.txtvHeadingExplanation1);
+        final TextView txtvExplanation1 = findViewById(R.id.txtvExplanation1);
+        final TextView txtvHeaderExplanation2 = findViewById(R.id.txtvHeadingExplanation2);
+        final TextView txtvExplanation2 = findViewById(R.id.txtvExplanation2);
+        final TextView txtvHeaderExplanation3 = findViewById(R.id.txtvHeadingExplanation3);
 
-        Button butChooseFilesystem = (Button) findViewById(R.id.butChooseFileFromFilesystem);
+        Button butChooseFilesystem = findViewById(R.id.butChooseFileFromFilesystem);
         butChooseFilesystem.setOnClickListener(v -> chooseFileFromFilesystem());
 
-        Button butChooseExternal = (Button) findViewById(R.id.butChooseFileFromExternal);
+        Button butChooseExternal = findViewById(R.id.butChooseFileFromExternal);
         butChooseExternal.setOnClickListener(v -> chooseFileFromExternal());
 
         int nextOption = 1;
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/StatisticsActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/StatisticsActivity.java
index b2ff43c43..d2a70b695 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/StatisticsActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/StatisticsActivity.java
@@ -53,9 +53,9 @@ public class StatisticsActivity extends AppCompatActivity
         prefs = getSharedPreferences(PREF_NAME, MODE_PRIVATE);
         countAll = prefs.getBoolean(PREF_COUNT_ALL, false);
 
-        totalTimeTextView = (TextView) findViewById(R.id.total_time);
-        feedStatisticsList = (ListView) findViewById(R.id.statistics_list);
-        progressBar = (ProgressBar) findViewById(R.id.progressBar);
+        totalTimeTextView = findViewById(R.id.total_time);
+        feedStatisticsList = findViewById(R.id.statistics_list);
+        progressBar = findViewById(R.id.progressBar);
         listAdapter = new StatisticsListAdapter(this);
         listAdapter.setCountAll(countAll);
         feedStatisticsList.setAdapter(listAdapter);
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/StorageErrorActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/StorageErrorActivity.java
index a2a49f54e..20e34cc52 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/StorageErrorActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/StorageErrorActivity.java
@@ -42,7 +42,7 @@ public class StorageErrorActivity extends AppCompatActivity {
 
 		setContentView(R.layout.storage_error);
 
-		Button btnChooseDataFolder = (Button) findViewById(R.id.btnChooseDataFolder);
+		Button btnChooseDataFolder = findViewById(R.id.btnChooseDataFolder);
 		btnChooseDataFolder.setOnClickListener(v -> {
             if (Build.VERSION_CODES.KITKAT <= Build.VERSION.SDK_INT &&
                     Build.VERSION.SDK_INT <= Build.VERSION_CODES.LOLLIPOP_MR1) {
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
index 5f5cd9519..78cc15b2c 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
@@ -143,11 +143,11 @@ public class VideoplayerActivity extends MediaplayerActivity {
         }
         super.setupGUI();
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-        controls = (LinearLayout) findViewById(R.id.controls);
-        videoOverlay = (LinearLayout) findViewById(R.id.overlay);
-        videoview = (AspectRatioVideoView) findViewById(R.id.videoview);
-        videoframe = (FrameLayout) findViewById(R.id.videoframe);
-        progressIndicator = (ProgressBar) findViewById(R.id.progressIndicator);
+        controls = findViewById(R.id.controls);
+        videoOverlay = findViewById(R.id.overlay);
+        videoview = findViewById(R.id.videoview);
+        videoframe = findViewById(R.id.videoframe);
+        progressIndicator = findViewById(R.id.progressIndicator);
         videoview.getHolder().addCallback(surfaceHolderCallback);
         videoframe.setOnTouchListener(onVideoviewTouched);
         videoOverlay.setOnTouchListener((view, motionEvent) -> true); // To suppress touches directly below the slider
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/gpoddernet/GpodnetAuthenticationActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/gpoddernet/GpodnetAuthenticationActivity.java
index 81e51e304..8fcdb4371 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/gpoddernet/GpodnetAuthenticationActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/gpoddernet/GpodnetAuthenticationActivity.java
@@ -70,7 +70,7 @@ public class GpodnetAuthenticationActivity extends AppCompatActivity {
         setContentView(R.layout.gpodnetauth_activity);
         service = new GpodnetService();
 
-        viewFlipper = (ViewFlipper) findViewById(R.id.viewflipper);
+        viewFlipper = findViewById(R.id.viewflipper);
         LayoutInflater inflater = (LayoutInflater)
                 getSystemService(Context.LAYOUT_INFLATER_SERVICE);
         views = new View[]{
@@ -107,11 +107,11 @@ public class GpodnetAuthenticationActivity extends AppCompatActivity {
     }
 
     private void setupLoginView(View view) {
-        final EditText username = (EditText) view.findViewById(R.id.etxtUsername);
-        final EditText password = (EditText) view.findViewById(R.id.etxtPassword);
-        final Button login = (Button) view.findViewById(R.id.butLogin);
-        final TextView txtvError = (TextView) view.findViewById(R.id.txtvError);
-        final ProgressBar progressBar = (ProgressBar) view.findViewById(R.id.progBarLogin);
+        final EditText username = view.findViewById(R.id.etxtUsername);
+        final EditText password = view.findViewById(R.id.etxtPassword);
+        final Button login = view.findViewById(R.id.butLogin);
+        final TextView txtvError = view.findViewById(R.id.txtvError);
+        final ProgressBar progressBar = view.findViewById(R.id.progBarLogin);
 
         password.setOnEditorActionListener((v, actionID, event) ->
             actionID == EditorInfo.IME_ACTION_GO && login.performClick());
@@ -175,13 +175,13 @@ public class GpodnetAuthenticationActivity extends AppCompatActivity {
     }
 
     private void setupDeviceView(View view) {
-        final EditText deviceID = (EditText) view.findViewById(R.id.etxtDeviceID);
-        final EditText caption = (EditText) view.findViewById(R.id.etxtCaption);
-        final Button createNewDevice = (Button) view.findViewById(R.id.butCreateNewDevice);
-        final Button chooseDevice = (Button) view.findViewById(R.id.butChooseExistingDevice);
-        final TextView txtvError = (TextView) view.findViewById(R.id.txtvError);
-        final ProgressBar progBarCreateDevice = (ProgressBar) view.findViewById(R.id.progbarCreateDevice);
-        final Spinner spinnerDevices = (Spinner) view.findViewById(R.id.spinnerChooseDevice);
+        final EditText deviceID = view.findViewById(R.id.etxtDeviceID);
+        final EditText caption = view.findViewById(R.id.etxtCaption);
+        final Button createNewDevice = view.findViewById(R.id.butCreateNewDevice);
+        final Button chooseDevice = view.findViewById(R.id.butChooseExistingDevice);
+        final TextView txtvError = view.findViewById(R.id.txtvError);
+        final ProgressBar progBarCreateDevice = view.findViewById(R.id.progbarCreateDevice);
+        final Spinner spinnerDevices = view.findViewById(R.id.spinnerChooseDevice);
 
 
         // load device list
@@ -346,8 +346,8 @@ public class GpodnetAuthenticationActivity extends AppCompatActivity {
     }
 
     private void setupFinishView(View view) {
-        final Button sync = (Button) view.findViewById(R.id.butSyncNow);
-        final Button back = (Button) view.findViewById(R.id.butGoMainscreen);
+        final Button sync = view.findViewById(R.id.butSyncNow);
+        final Button back = view.findViewById(R.id.butGoMainscreen);
 
         sync.setOnClickListener(v -> {
             GpodnetSyncService.sendSyncIntent(GpodnetAuthenticationActivity.this);
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java
index 9739b999b..a431a47db 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java
@@ -76,24 +76,24 @@ public class AllEpisodesRecycleAdapter extends RecyclerView.Adapter<AllEpisodesR
         View view = LayoutInflater.from(parent.getContext())
                 .inflate(R.layout.new_episodes_listitem, parent, false);
         Holder holder = new Holder(view);
-        holder.container = (FrameLayout) view.findViewById(R.id.container);
-        holder.content = (LinearLayout) view.findViewById(R.id.content);
-        holder.placeholder = (TextView) view.findViewById(R.id.txtvPlaceholder);
-        holder.title = (TextView) view.findViewById(R.id.txtvTitle);
+        holder.container = view.findViewById(R.id.container);
+        holder.content = view.findViewById(R.id.content);
+        holder.placeholder = view.findViewById(R.id.txtvPlaceholder);
+        holder.title = view.findViewById(R.id.txtvTitle);
         if(Build.VERSION.SDK_INT >= 23) {
             holder.title.setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_FULL);
         }
-        holder.pubDate = (TextView) view
+        holder.pubDate = view
                 .findViewById(R.id.txtvPublished);
         holder.statusUnread = view.findViewById(R.id.statusUnread);
-        holder.butSecondary = (ImageButton) view
+        holder.butSecondary = view
                 .findViewById(R.id.butSecondaryAction);
-        holder.queueStatus = (ImageView) view
+        holder.queueStatus = view
                 .findViewById(R.id.imgvInPlaylist);
-        holder.progress = (ProgressBar) view
+        holder.progress = view
                 .findViewById(R.id.pbar_progress);
-        holder.cover = (ImageView) view.findViewById(R.id.imgvCover);
-        holder.txtvDuration = (TextView) view.findViewById(R.id.txtvDuration);
+        holder.cover = view.findViewById(R.id.imgvCover);
+        holder.txtvDuration = view.findViewById(R.id.txtvDuration);
         holder.item = null;
         holder.mainActivityRef = mainActivityRef;
         // so we can grab this later
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/ChaptersListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/ChaptersListAdapter.java
index cbd089d4c..c3fac7e18 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/ChaptersListAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/ChaptersListAdapter.java
@@ -57,12 +57,12 @@ public class ChaptersListAdapter extends ArrayAdapter<Chapter> {
 
             convertView = inflater.inflate(R.layout.simplechapter_item, parent, false);
             holder.view = convertView;
-            holder.title = (TextView) convertView.findViewById(R.id.txtvTitle);
+            holder.title = convertView.findViewById(R.id.txtvTitle);
             defaultTextColor = holder.title.getTextColors().getDefaultColor();
-            holder.start = (TextView) convertView.findViewById(R.id.txtvStart);
-            holder.link = (TextView) convertView.findViewById(R.id.txtvLink);
-            holder.duration = (TextView) convertView.findViewById(R.id.txtvDuration);
-            holder.butPlayChapter = (ImageButton) convertView.findViewById(R.id.butPlayChapter);
+            holder.start = convertView.findViewById(R.id.txtvStart);
+            holder.link = convertView.findViewById(R.id.txtvLink);
+            holder.duration = convertView.findViewById(R.id.txtvDuration);
+            holder.butPlayChapter = convertView.findViewById(R.id.butPlayChapter);
             convertView.setTag(holder);
         } else {
             holder = (Holder) convertView.getTag();
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadLogAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadLogAdapter.java
index 163366c3c..789c01a26 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadLogAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadLogAdapter.java
@@ -49,15 +49,15 @@ public class DownloadLogAdapter extends BaseAdapter {
 			LayoutInflater inflater = (LayoutInflater) context
 					.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
 			convertView = inflater.inflate(R.layout.downloadlog_item, parent, false);
-			holder.icon = (IconTextView) convertView.findViewById(R.id.txtvIcon);
-			holder.retry = (IconButton) convertView.findViewById(R.id.btnRetry);
-			holder.date = (TextView) convertView.findViewById(R.id.txtvDate);
-			holder.title = (TextView) convertView.findViewById(R.id.txtvTitle);
+			holder.icon = convertView.findViewById(R.id.txtvIcon);
+			holder.retry = convertView.findViewById(R.id.btnRetry);
+			holder.date = convertView.findViewById(R.id.txtvDate);
+			holder.title = convertView.findViewById(R.id.txtvTitle);
 			if(Build.VERSION.SDK_INT >= 23) {
 				holder.title.setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_FULL);
 			}
-			holder.type = (TextView) convertView.findViewById(R.id.txtvType);
-			holder.reason = (TextView) convertView.findViewById(R.id.txtvReason);
+			holder.type = convertView.findViewById(R.id.txtvType);
+			holder.reason = convertView.findViewById(R.id.txtvReason);
 			convertView.setTag(holder);
 		} else {
 			holder = (Holder) convertView.getTag();
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java
index 51e1271d9..014e43ee7 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java
@@ -61,16 +61,16 @@ public class DownloadedEpisodesListAdapter extends BaseAdapter {
                     .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
             convertView = inflater.inflate(R.layout.downloaded_episodeslist_item,
                     parent, false);
-            holder.imageView = (ImageView) convertView.findViewById(R.id.imgvImage);
-            holder.title = (TextView) convertView.findViewById(R.id.txtvTitle);
+            holder.imageView = convertView.findViewById(R.id.imgvImage);
+            holder.title = convertView.findViewById(R.id.txtvTitle);
             if(Build.VERSION.SDK_INT >= 23) {
                 holder.title.setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_FULL);
             }
-            holder.txtvSize = (TextView) convertView.findViewById(R.id.txtvSize);
-            holder.queueStatus = (ImageView) convertView.findViewById(R.id.imgvInPlaylist);
-            holder.pubDate = (TextView) convertView
+            holder.txtvSize = convertView.findViewById(R.id.txtvSize);
+            holder.queueStatus = convertView.findViewById(R.id.imgvInPlaylist);
+            holder.pubDate = convertView
                     .findViewById(R.id.txtvPublished);
-            holder.butSecondary = (ImageButton) convertView
+            holder.butSecondary = convertView
                     .findViewById(R.id.butSecondaryAction);
             convertView.setTag(holder);
         } else {
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadlistAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadlistAdapter.java
index a8c60c19e..b85d1d35d 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadlistAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadlistAdapter.java
@@ -59,14 +59,14 @@ public class DownloadlistAdapter extends BaseAdapter {
             LayoutInflater inflater = (LayoutInflater) context
                     .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
             convertView = inflater.inflate(R.layout.downloadlist_item, parent, false);
-            holder.title = (TextView) convertView.findViewById(R.id.txtvTitle);
-            holder.downloaded = (TextView) convertView
+            holder.title = convertView.findViewById(R.id.txtvTitle);
+            holder.downloaded = convertView
                     .findViewById(R.id.txtvDownloaded);
-            holder.percent = (TextView) convertView
+            holder.percent = convertView
                     .findViewById(R.id.txtvPercent);
-            holder.progbar = (ProgressBar) convertView
+            holder.progbar = convertView
                     .findViewById(R.id.progProgress);
-            holder.butSecondary = (ImageButton) convertView
+            holder.butSecondary = convertView
                     .findViewById(R.id.butSecondaryAction);
 
             convertView.setTag(holder);
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java
index cf3dd8b09..738a0a636 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java
@@ -90,24 +90,24 @@ public class FeedItemlistAdapter extends BaseAdapter {
             LayoutInflater inflater = (LayoutInflater) context
                     .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
             convertView = inflater.inflate(R.layout.feeditemlist_item, parent, false);
-            holder.container = (LinearLayout) convertView
+            holder.container = convertView
                     .findViewById(R.id.container);
-            holder.title = (TextView) convertView.findViewById(R.id.txtvItemname);
+            holder.title = convertView.findViewById(R.id.txtvItemname);
             if(Build.VERSION.SDK_INT >= 23) {
                 holder.title.setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_FULL);
             }
-            holder.lenSize = (TextView) convertView
+            holder.lenSize = convertView
                     .findViewById(R.id.txtvLenSize);
-            holder.butAction = (ImageButton) convertView
+            holder.butAction = convertView
                     .findViewById(R.id.butSecondaryAction);
-            holder.published = (TextView) convertView
+            holder.published = convertView
                     .findViewById(R.id.txtvPublished);
-            holder.inPlaylist = (ImageView) convertView
+            holder.inPlaylist = convertView
                     .findViewById(R.id.imgvInPlaylist);
-            holder.type = (ImageView) convertView.findViewById(R.id.imgvType);
+            holder.type = convertView.findViewById(R.id.imgvType);
             holder.statusUnread = convertView
                     .findViewById(R.id.statusUnread);
-            holder.episodeProgress = (ProgressBar) convertView
+            holder.episodeProgress = convertView
                     .findViewById(R.id.pbar_episode_progress);
 
             convertView.setTag(holder);
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistDescriptionAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistDescriptionAdapter.java
index 5b205e91f..c10bb7638 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistDescriptionAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistDescriptionAdapter.java
@@ -34,9 +34,9 @@ public class FeedItemlistDescriptionAdapter extends ArrayAdapter<FeedItem> {
             LayoutInflater inflater = (LayoutInflater) getContext()
                     .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
             convertView = inflater.inflate(R.layout.itemdescription_listitem, parent, false);
-            holder.title = (TextView) convertView.findViewById(R.id.txtvTitle);
-            holder.pubDate = (TextView) convertView.findViewById(R.id.txtvPubDate);
-            holder.description = (TextView) convertView.findViewById(R.id.txtvDescription);
+            holder.title = convertView.findViewById(R.id.txtvTitle);
+            holder.pubDate = convertView.findViewById(R.id.txtvPubDate);
+            holder.description = convertView.findViewById(R.id.txtvDescription);
 
             convertView.setTag(holder);
         } else {
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java
index 2daa5e70f..5adf662b3 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java
@@ -212,7 +212,7 @@ public class NavListAdapter extends BaseAdapter
             v = getFeedView(position, convertView, parent);
         }
         if (v != null && viewType != VIEW_TYPE_SECTION_DIVIDER) {
-            TextView txtvTitle = (TextView) v.findViewById(R.id.txtvTitle);
+            TextView txtvTitle = v.findViewById(R.id.txtvTitle);
             if (position == itemAccess.getSelectedItemIndex()) {
                 txtvTitle.setTypeface(null, Typeface.BOLD);
             } else {
@@ -235,9 +235,9 @@ public class NavListAdapter extends BaseAdapter
 
             convertView = inflater.inflate(R.layout.nav_listitem, parent, false);
 
-            holder.image = (ImageView) convertView.findViewById(R.id.imgvCover);
-            holder.title = (TextView) convertView.findViewById(R.id.txtvTitle);
-            holder.count = (TextView) convertView.findViewById(R.id.txtvCount);
+            holder.image = convertView.findViewById(R.id.imgvCover);
+            holder.title = convertView.findViewById(R.id.txtvTitle);
+            holder.count = convertView.findViewById(R.id.txtvCount);
             convertView.setTag(holder);
         } else {
             holder = (NavHolder) convertView.getTag();
@@ -325,10 +325,10 @@ public class NavListAdapter extends BaseAdapter
 
             convertView = inflater.inflate(R.layout.nav_feedlistitem, parent, false);
 
-            holder.image = (ImageView) convertView.findViewById(R.id.imgvCover);
-            holder.title = (TextView) convertView.findViewById(R.id.txtvTitle);
-            holder.failure = (IconTextView) convertView.findViewById(R.id.itxtvFailure);
-            holder.count = (TextView) convertView.findViewById(R.id.txtvCount);
+            holder.image = convertView.findViewById(R.id.imgvCover);
+            holder.title = convertView.findViewById(R.id.txtvTitle);
+            holder.failure = convertView.findViewById(R.id.itxtvFailure);
+            holder.count = convertView.findViewById(R.id.txtvCount);
             convertView.setTag(holder);
         } else {
             holder = (FeedHolder) convertView.getTag();
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java
index c407d3bb3..3ad9dc79c 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java
@@ -134,19 +134,19 @@ public class QueueRecyclerAdapter extends RecyclerView.Adapter<QueueRecyclerAdap
 
         public ViewHolder(View v) {
             super(v);
-            container = (FrameLayout) v.findViewById(R.id.container);
-            dragHandle = (ImageView) v.findViewById(R.id.drag_handle);
-            placeholder = (TextView) v.findViewById(R.id.txtvPlaceholder);
-            cover = (ImageView) v.findViewById(R.id.imgvCover);
-            title = (TextView) v.findViewById(R.id.txtvTitle);
+            container = v.findViewById(R.id.container);
+            dragHandle = v.findViewById(R.id.drag_handle);
+            placeholder = v.findViewById(R.id.txtvPlaceholder);
+            cover = v.findViewById(R.id.imgvCover);
+            title = v.findViewById(R.id.txtvTitle);
             if(Build.VERSION.SDK_INT >= 23) {
                 title.setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_FULL);
             }
-            pubDate = (TextView) v.findViewById(R.id.txtvPubDate);
-            progressLeft = (TextView) v.findViewById(R.id.txtvProgressLeft);
-            progressRight = (TextView) v.findViewById(R.id.txtvProgressRight);
-            butSecondary = (ImageButton) v.findViewById(R.id.butSecondaryAction);
-            progressBar = (ProgressBar) v.findViewById(R.id.progressBar);
+            pubDate = v.findViewById(R.id.txtvPubDate);
+            progressLeft = v.findViewById(R.id.txtvProgressLeft);
+            progressRight = v.findViewById(R.id.txtvProgressRight);
+            butSecondary = v.findViewById(R.id.butSecondaryAction);
+            progressBar = v.findViewById(R.id.progressBar);
             v.setTag(this);
             v.setOnClickListener(this);
             v.setOnCreateContextMenuListener(this);
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/SearchlistAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/SearchlistAdapter.java
index beb62b3bb..74c0d6473 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/SearchlistAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/SearchlistAdapter.java
@@ -61,13 +61,13 @@ public class SearchlistAdapter extends BaseAdapter {
                     .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
 
             convertView = inflater.inflate(R.layout.searchlist_item, parent, false);
-            holder.title = (TextView) convertView.findViewById(R.id.txtvTitle);
+            holder.title = convertView.findViewById(R.id.txtvTitle);
             if(Build.VERSION.SDK_INT >= 23) {
                 holder.title.setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_FULL);
             }
-            holder.cover = (ImageView) convertView
+            holder.cover = convertView
                     .findViewById(R.id.imgvFeedimage);
-            holder.subtitle = (TextView) convertView
+            holder.subtitle = convertView
                     .findViewById(R.id.txtvSubtitle);
 
             convertView.setTag(holder);
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/StatisticsListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/StatisticsListAdapter.java
index 50255c11f..d1f1d85bc 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/StatisticsListAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/StatisticsListAdapter.java
@@ -62,9 +62,9 @@ public class StatisticsListAdapter extends BaseAdapter {
 
             convertView = inflater.inflate(R.layout.statistics_listitem, parent, false);
 
-            holder.image = (ImageView) convertView.findViewById(R.id.imgvCover);
-            holder.title = (TextView) convertView.findViewById(R.id.txtvTitle);
-            holder.time = (TextView) convertView.findViewById(R.id.txtvTime);
+            holder.image = convertView.findViewById(R.id.imgvCover);
+            holder.title = convertView.findViewById(R.id.txtvTitle);
+            holder.time = convertView.findViewById(R.id.txtvTime);
             convertView.setTag(holder);
         } else {
             holder = (StatisticsHolder) convertView.getTag();
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/SubscriptionsAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/SubscriptionsAdapter.java
index bb76ab501..9230967ab 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/SubscriptionsAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/SubscriptionsAdapter.java
@@ -89,9 +89,9 @@ public class SubscriptionsAdapter extends BaseAdapter implements AdapterView.OnI
             LayoutInflater layoutInflater =
                     (LayoutInflater) mainActivityRef.get().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
             convertView = layoutInflater.inflate(R.layout.subscription_item, parent, false);
-            holder.feedTitle = (TextView) convertView.findViewById(R.id.txtvTitle);
-            holder.imageView = (ImageView) convertView.findViewById(R.id.imgvCover);
-            holder.count = (TriangleLabelView) convertView.findViewById(R.id.triangleCountView);
+            holder.feedTitle = convertView.findViewById(R.id.txtvTitle);
+            holder.imageView = convertView.findViewById(R.id.imgvCover);
+            holder.count = convertView.findViewById(R.id.triangleCountView);
 
 
             convertView.setTag(holder);
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/gpodnet/PodcastListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/gpodnet/PodcastListAdapter.java
index aea3d583f..9cc0e36cf 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/gpodnet/PodcastListAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/gpodnet/PodcastListAdapter.java
@@ -40,10 +40,10 @@ public class PodcastListAdapter extends ArrayAdapter<GpodnetPodcast> {
                     .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
 
             convertView = inflater.inflate(R.layout.gpodnet_podcast_listitem, parent, false);
-            holder.image = (ImageView) convertView.findViewById(R.id.imgvCover);
-            holder.title = (TextView) convertView.findViewById(R.id.txtvTitle);
-            holder.subscribers = (TextView) convertView.findViewById(R.id.txtvSubscribers);
-            holder.url = (TextView) convertView.findViewById(R.id.txtvUrl);
+            holder.image = convertView.findViewById(R.id.imgvCover);
+            holder.title = convertView.findViewById(R.id.txtvTitle);
+            holder.subscribers = convertView.findViewById(R.id.txtvSubscribers);
+            holder.url = convertView.findViewById(R.id.txtvUrl);
             convertView.setTag(holder);
         } else {
             holder = (Holder) convertView.getTag();
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/gpodnet/TagListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/gpodnet/TagListAdapter.java
index b4eadefb5..52fca792e 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/gpodnet/TagListAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/gpodnet/TagListAdapter.java
@@ -34,8 +34,8 @@ public class TagListAdapter extends ArrayAdapter<GpodnetTag> {
                     .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
 
             convertView = inflater.inflate(R.layout.gpodnet_tag_listitem, parent, false);
-            holder.title = (TextView) convertView.findViewById(R.id.txtvTitle);
-            holder.usage = (TextView) convertView.findViewById(R.id.txtvUsage);
+            holder.title = convertView.findViewById(R.id.txtvTitle);
+            holder.usage = convertView.findViewById(R.id.txtvUsage);
             convertView.setTag(holder);
         } else {
             holder = (Holder) convertView.getTag();
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/itunes/ItunesAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/itunes/ItunesAdapter.java
index e493a2ecc..14389d289 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/itunes/ItunesAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/itunes/ItunesAdapter.java
@@ -182,9 +182,9 @@ public class ItunesAdapter extends ArrayAdapter<ItunesAdapter.Podcast> {
          * @param view GridView cell
          */
         PodcastViewHolder(View view){
-            coverView = (ImageView) view.findViewById(R.id.imgvCover);
-            titleView = (TextView) view.findViewById(R.id.txtvTitle);
-            urlView = (TextView) view.findViewById(R.id.txtvUrl);
+            coverView = view.findViewById(R.id.imgvCover);
+            titleView = view.findViewById(R.id.txtvTitle);
+            urlView = view.findViewById(R.id.txtvUrl);
         }
     }
 }
diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/AuthenticationDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/AuthenticationDialog.java
index 6f9e221ec..2c41b8cb8 100644
--- a/app/src/main/java/de/danoeh/antennapod/dialog/AuthenticationDialog.java
+++ b/app/src/main/java/de/danoeh/antennapod/dialog/AuthenticationDialog.java
@@ -35,11 +35,11 @@ public abstract class AuthenticationDialog extends Dialog {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.authentication_dialog);
-        final EditText etxtUsername = (EditText) findViewById(R.id.etxtUsername);
-        final EditText etxtPassword = (EditText) findViewById(R.id.etxtPassword);
-        final CheckBox saveUsernamePassword = (CheckBox) findViewById(R.id.chkSaveUsernamePassword);
-        final Button butConfirm = (Button) findViewById(R.id.butConfirm);
-        final Button butCancel = (Button) findViewById(R.id.butCancel);
+        final EditText etxtUsername = findViewById(R.id.etxtUsername);
+        final EditText etxtPassword = findViewById(R.id.etxtPassword);
+        final CheckBox saveUsernamePassword = findViewById(R.id.chkSaveUsernamePassword);
+        final Button butConfirm = findViewById(R.id.butConfirm);
+        final Button butCancel = findViewById(R.id.butCancel);
 
         if (titleRes != 0) {
             setTitle(titleRes);
diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/AutoFlattrPreferenceDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/AutoFlattrPreferenceDialog.java
index 93425949c..c28342374 100644
--- a/app/src/main/java/de/danoeh/antennapod/dialog/AutoFlattrPreferenceDialog.java
+++ b/app/src/main/java/de/danoeh/antennapod/dialog/AutoFlattrPreferenceDialog.java
@@ -29,9 +29,9 @@ public class AutoFlattrPreferenceDialog {
         AlertDialog.Builder builder = new AlertDialog.Builder(activity);
 
         @SuppressLint("InflateParams") View view = activity.getLayoutInflater().inflate(R.layout.autoflattr_preference_dialog, null);
-        final CheckBox chkAutoFlattr = (CheckBox) view.findViewById(R.id.chkAutoFlattr);
-        final SeekBar skbPercent = (SeekBar) view.findViewById(R.id.skbPercent);
-        final TextView txtvStatus = (TextView) view.findViewById(R.id.txtvStatus);
+        final CheckBox chkAutoFlattr = view.findViewById(R.id.chkAutoFlattr);
+        final SeekBar skbPercent = view.findViewById(R.id.skbPercent);
+        final TextView txtvStatus = view.findViewById(R.id.txtvStatus);
 
         chkAutoFlattr.setChecked(UserPreferences.isAutoFlattr());
         skbPercent.setEnabled(chkAutoFlattr.isChecked());
diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/EpisodesApplyActionFragment.java b/app/src/main/java/de/danoeh/antennapod/dialog/EpisodesApplyActionFragment.java
index 7f054f5dd..07a64cde8 100644
--- a/app/src/main/java/de/danoeh/antennapod/dialog/EpisodesApplyActionFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/dialog/EpisodesApplyActionFragment.java
@@ -85,7 +85,7 @@ public class EpisodesApplyActionFragment extends Fragment {
                              Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.episodes_apply_action_fragment, container, false);
 
-        mListView = (ListView) view.findViewById(android.R.id.list);
+        mListView = view.findViewById(android.R.id.list);
         mListView.setChoiceMode(ListView.CHOICE_MODE_MULTIPLE);
         mListView.setOnItemClickListener((ListView, view1, position, rowId) -> {
             long id = episodes.get(position).getId();
@@ -129,7 +129,7 @@ public class EpisodesApplyActionFragment extends Fragment {
         checkAll();
 
         int lastVisibleDiv = 0;
-        btnAddToQueue = (Button) view.findViewById(R.id.btnAddToQueue);
+        btnAddToQueue = view.findViewById(R.id.btnAddToQueue);
         if((actions & ACTION_QUEUE) != 0) {
             btnAddToQueue.setOnClickListener(v -> queueChecked());
             lastVisibleDiv = R.id.divider1;
@@ -137,7 +137,7 @@ public class EpisodesApplyActionFragment extends Fragment {
             btnAddToQueue.setVisibility(View.GONE);
             view.findViewById(R.id.divider1).setVisibility(View.GONE);
         }
-        btnMarkAsPlayed = (Button) view.findViewById(R.id.btnMarkAsPlayed);
+        btnMarkAsPlayed = view.findViewById(R.id.btnMarkAsPlayed);
         if((actions & ACTION_MARK_PLAYED) != 0) {
             btnMarkAsPlayed.setOnClickListener(v -> markedCheckedPlayed());
             lastVisibleDiv = R.id.divider2;
@@ -145,7 +145,7 @@ public class EpisodesApplyActionFragment extends Fragment {
             btnMarkAsPlayed.setVisibility(View.GONE);
             view.findViewById(R.id.divider2).setVisibility(View.GONE);
         }
-        btnMarkAsUnplayed = (Button) view.findViewById(R.id.btnMarkAsUnplayed);
+        btnMarkAsUnplayed = view.findViewById(R.id.btnMarkAsUnplayed);
         if((actions & ACTION_MARK_UNPLAYED) != 0) {
             btnMarkAsUnplayed.setOnClickListener(v -> markedCheckedUnplayed());
             lastVisibleDiv = R.id.divider3;
@@ -153,7 +153,7 @@ public class EpisodesApplyActionFragment extends Fragment {
             btnMarkAsUnplayed.setVisibility(View.GONE);
             view.findViewById(R.id.divider3).setVisibility(View.GONE);
         }
-        btnDownload = (Button) view.findViewById(R.id.btnDownload);
+        btnDownload = view.findViewById(R.id.btnDownload);
         if((actions & ACTION_DOWNLOAD) != 0) {
             btnDownload.setOnClickListener(v -> downloadChecked());
             lastVisibleDiv = R.id.divider4;
@@ -161,7 +161,7 @@ public class EpisodesApplyActionFragment extends Fragment {
             btnDownload.setVisibility(View.GONE);
             view.findViewById(R.id.divider4).setVisibility(View.GONE);
         }
-        btnDelete = (Button) view.findViewById(R.id.btnDelete);
+        btnDelete = view.findViewById(R.id.btnDelete);
         if((actions & ACTION_REMOVE) != 0) {
             btnDelete.setOnClickListener(v -> deleteChecked());
         } else {
diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/ProxyDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/ProxyDialog.java
index 4a5c61c86..8f15e78e5 100644
--- a/app/src/main/java/de/danoeh/antennapod/dialog/ProxyDialog.java
+++ b/app/src/main/java/de/danoeh/antennapod/dialog/ProxyDialog.java
@@ -101,7 +101,7 @@ public class ProxyDialog {
                 .autoDismiss(false)
                 .build();
         View view = dialog.getCustomView();
-        spType = (Spinner) view.findViewById(R.id.spType);
+        spType = view.findViewById(R.id.spType);
         String[] types = { Proxy.Type.DIRECT.name(), Proxy.Type.HTTP.name() };
         ArrayAdapter<String> adapter = new ArrayAdapter<>(context,
             android.R.layout.simple_spinner_item, types);
@@ -109,22 +109,22 @@ public class ProxyDialog {
         spType.setAdapter(adapter);
         ProxyConfig proxyConfig = UserPreferences.getProxyConfig();
         spType.setSelection(adapter.getPosition(proxyConfig.type.name()));
-        etHost = (EditText) view.findViewById(R.id.etHost);
+        etHost = view.findViewById(R.id.etHost);
         if(!TextUtils.isEmpty(proxyConfig.host)) {
             etHost.setText(proxyConfig.host);
         }
         etHost.addTextChangedListener(requireTestOnChange);
-        etPort = (EditText) view.findViewById(R.id.etPort);
+        etPort = view.findViewById(R.id.etPort);
         if(proxyConfig.port > 0) {
             etPort.setText(String.valueOf(proxyConfig.port));
         }
         etPort.addTextChangedListener(requireTestOnChange);
-        etUsername = (EditText) view.findViewById(R.id.etUsername);
+        etUsername = view.findViewById(R.id.etUsername);
         if(!TextUtils.isEmpty(proxyConfig.username)) {
             etUsername.setText(proxyConfig.username);
         }
         etUsername.addTextChangedListener(requireTestOnChange);
-        etPassword = (EditText) view.findViewById(R.id.etPassword);
+        etPassword = view.findViewById(R.id.etPassword);
         if(!TextUtils.isEmpty(proxyConfig.password)) {
             etPassword.setText(proxyConfig.username);
         }
@@ -145,7 +145,7 @@ public class ProxyDialog {
                 enableSettings(false);
             }
         });
-        txtvMessage = (TextView) view.findViewById(R.id.txtvMessage);
+        txtvMessage = view.findViewById(R.id.txtvMessage);
         checkValidity();
         return dialog;
     }
diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/SleepTimerDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/SleepTimerDialog.java
index be7850495..4b8601ec6 100644
--- a/app/src/main/java/de/danoeh/antennapod/dialog/SleepTimerDialog.java
+++ b/app/src/main/java/de/danoeh/antennapod/dialog/SleepTimerDialog.java
@@ -61,11 +61,11 @@ public abstract class SleepTimerDialog {
         dialog = builder.build();
         
         View view = dialog.getView();
-        etxtTime = (EditText) view.findViewById(R.id.etxtTime);
-        spTimeUnit = (Spinner) view.findViewById(R.id.spTimeUnit);
-        cbShakeToReset = (CheckBox) view.findViewById(R.id.cbShakeToReset);
-        cbVibrate = (CheckBox) view.findViewById(R.id.cbVibrate);
-        chAutoEnable = (CheckBox) view.findViewById(R.id.chAutoEnable);
+        etxtTime = view.findViewById(R.id.etxtTime);
+        spTimeUnit = view.findViewById(R.id.spTimeUnit);
+        cbShakeToReset = view.findViewById(R.id.cbShakeToReset);
+        cbVibrate = view.findViewById(R.id.cbVibrate);
+        chAutoEnable = view.findViewById(R.id.chAutoEnable);
 
         etxtTime.setText(SleepTimerPreferences.lastTimerValue());
         etxtTime.addTextChangedListener(new TextWatcher() {
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/AddFeedFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/AddFeedFragment.java
index a243ddcdc..ee2373da8 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/AddFeedFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/AddFeedFragment.java
@@ -32,18 +32,18 @@ public class AddFeedFragment extends Fragment {
         super.onCreateView(inflater, container, savedInstanceState);
         View root = inflater.inflate(R.layout.addfeed, container, false);
 
-        final EditText etxtFeedurl = (EditText) root.findViewById(R.id.etxtFeedurl);
+        final EditText etxtFeedurl = root.findViewById(R.id.etxtFeedurl);
 
         Bundle args = getArguments();
         if (args != null && args.getString(ARG_FEED_URL) != null) {
             etxtFeedurl.setText(args.getString(ARG_FEED_URL));
         }
 
-        Button butSearchITunes = (Button) root.findViewById(R.id.butSearchItunes);
-        Button butBrowserGpoddernet = (Button) root.findViewById(R.id.butBrowseGpoddernet);
-        Button butSearchFyyd = (Button) root.findViewById(R.id.butSearchFyyd);
-        Button butOpmlImport = (Button) root.findViewById(R.id.butOpmlImport);
-        Button butConfirm = (Button) root.findViewById(R.id.butConfirm);
+        Button butSearchITunes = root.findViewById(R.id.butSearchItunes);
+        Button butBrowserGpoddernet = root.findViewById(R.id.butBrowseGpoddernet);
+        Button butSearchFyyd = root.findViewById(R.id.butSearchFyyd);
+        Button butOpmlImport = root.findViewById(R.id.butOpmlImport);
+        Button butConfirm = root.findViewById(R.id.butConfirm);
 
         final MainActivity activity = (MainActivity) getActivity();
         activity.getSupportActionBar().setTitle(R.string.add_feed_label);
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java
index 497891dbd..ff7af97f6 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java
@@ -313,7 +313,7 @@ public class AllEpisodesFragment extends Fragment {
 
         View root = inflater.inflate(fragmentResource, container, false);
 
-        recyclerView = (RecyclerView) root.findViewById(android.R.id.list);
+        recyclerView = root.findViewById(android.R.id.list);
         RecyclerView.ItemAnimator animator = recyclerView.getItemAnimator();
         if (animator instanceof SimpleItemAnimator) {
             ((SimpleItemAnimator) animator).setSupportsChangeAnimations(false);
@@ -323,7 +323,7 @@ public class AllEpisodesFragment extends Fragment {
         recyclerView.setHasFixedSize(true);
         recyclerView.addItemDecoration(new HorizontalDividerItemDecoration.Builder(getActivity()).build());
 
-        progLoading = (ProgressBar) root.findViewById(R.id.progLoading);
+        progLoading = root.findViewById(R.id.progLoading);
 
         if (!itemsLoaded) {
             progLoading.setVisibility(View.VISIBLE);
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/CoverFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/CoverFragment.java
index 128c5f6bf..0230c9036 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/CoverFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/CoverFragment.java
@@ -48,9 +48,9 @@ public class CoverFragment extends Fragment implements MediaplayerInfoContentFra
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         root = inflater.inflate(R.layout.cover_fragment, container, false);
-        txtvPodcastTitle = (TextView) root.findViewById(R.id.txtvPodcastTitle);
-        txtvEpisodeTitle = (TextView) root.findViewById(R.id.txtvEpisodeTitle);
-        imgvCover = (ImageView) root.findViewById(R.id.imgvCover);
+        txtvPodcastTitle = root.findViewById(R.id.txtvPodcastTitle);
+        txtvEpisodeTitle = root.findViewById(R.id.txtvEpisodeTitle);
+        imgvCover = root.findViewById(R.id.imgvCover);
         return root;
     }
 
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/DownloadsFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/DownloadsFragment.java
index 9c4d00e31..aa6029c84 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/DownloadsFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/DownloadsFragment.java
@@ -38,12 +38,12 @@ public class DownloadsFragment extends Fragment {
         super.onCreateView(inflater, container, savedInstanceState);
         View root = inflater.inflate(R.layout.pager_fragment, container, false);
 
-        viewPager = (ViewPager)root.findViewById(R.id.viewpager);
+        viewPager = root.findViewById(R.id.viewpager);
         DownloadsPagerAdapter pagerAdapter = new DownloadsPagerAdapter(getChildFragmentManager(), getResources());
         viewPager.setAdapter(pagerAdapter);
 
         // Give the TabLayout the ViewPager
-        tabLayout = (TabLayout) root.findViewById(R.id.sliding_tabs);
+        tabLayout = root.findViewById(R.id.sliding_tabs);
         tabLayout.setupWithViewPager(viewPager);
 
         return root;
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/EpisodesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/EpisodesFragment.java
index 417ecff89..0610bfd24 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/EpisodesFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/EpisodesFragment.java
@@ -46,11 +46,11 @@ public class EpisodesFragment extends Fragment {
         ((MainActivity) getActivity()).getSupportActionBar().setTitle(R.string.episodes_label);
 
         View rootView = inflater.inflate(R.layout.pager_fragment, container, false);
-        viewPager = (ViewPager)rootView.findViewById(R.id.viewpager);
+        viewPager = rootView.findViewById(R.id.viewpager);
         viewPager.setAdapter(new EpisodesPagerAdapter(getChildFragmentManager(), getResources()));
 
         // Give the TabLayout the ViewPager
-        tabLayout = (TabLayout) rootView.findViewById(R.id.sliding_tabs);
+        tabLayout = rootView.findViewById(R.id.sliding_tabs);
         tabLayout.setupWithViewPager(viewPager);
 
         return rootView;
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
index 9e8c9731e..2055c560e 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
@@ -52,12 +52,12 @@ public class ExternalPlayerFragment extends Fragment {
                              Bundle savedInstanceState) {
         View root = inflater.inflate(R.layout.external_player_fragment,
                 container, false);
-        fragmentLayout = (ViewGroup) root.findViewById(R.id.fragmentLayout);
-        imgvCover = (ImageView) root.findViewById(R.id.imgvCover);
-        txtvTitle = (TextView) root.findViewById(R.id.txtvTitle);
-        butPlay = (ImageButton) root.findViewById(R.id.butPlay);
-        mFeedName = (TextView) root.findViewById(R.id.txtvAuthor);
-        mProgressBar = (ProgressBar) root.findViewById(R.id.episodeProgress);
+        fragmentLayout = root.findViewById(R.id.fragmentLayout);
+        imgvCover = root.findViewById(R.id.imgvCover);
+        txtvTitle = root.findViewById(R.id.txtvTitle);
+        butPlay = root.findViewById(R.id.butPlay);
+        mFeedName = root.findViewById(R.id.txtvAuthor);
+        mProgressBar = root.findViewById(R.id.episodeProgress);
 
         fragmentLayout.setOnClickListener(v -> {
             Log.d(TAG, "layoutInfo was clicked");
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/FyydSearchFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/FyydSearchFragment.java
index 6ee9ce467..80c66077e 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/FyydSearchFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/FyydSearchFragment.java
@@ -75,7 +75,7 @@ public class FyydSearchFragment extends Fragment {
                              Bundle savedInstanceState) {
         // Inflate the layout for this fragment
         View root = inflater.inflate(R.layout.fragment_itunes_search, container, false);
-        gridView = (GridView) root.findViewById(R.id.gridView);
+        gridView = root.findViewById(R.id.gridView);
         adapter = new ItunesAdapter(getActivity(), new ArrayList<>());
         gridView.setAdapter(adapter);
 
@@ -87,10 +87,10 @@ public class FyydSearchFragment extends Fragment {
             intent.putExtra(OnlineFeedViewActivity.ARG_TITLE, podcast.title);
             startActivity(intent);
         });
-        progressBar = (ProgressBar) root.findViewById(R.id.progressBar);
-        txtvError = (TextView) root.findViewById(R.id.txtvError);
-        butRetry = (Button) root.findViewById(R.id.butRetry);
-        txtvEmpty = (TextView) root.findViewById(android.R.id.empty);
+        progressBar = root.findViewById(R.id.progressBar);
+        txtvError = root.findViewById(R.id.txtvError);
+        butRetry = root.findViewById(R.id.butRetry);
+        txtvEmpty = root.findViewById(android.R.id.empty);
 
         return root;
     }
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 250964301..c1d9bb9ab 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
@@ -165,25 +165,25 @@ public class ItemFragment extends Fragment implements OnSwipeGesture {
         super.onCreateView(inflater, container, savedInstanceState);
         View layout = inflater.inflate(R.layout.feeditem_fragment, container, false);
 
-        root = (ViewGroup) layout.findViewById(R.id.content_root);
+        root = layout.findViewById(R.id.content_root);
 
-        LinearLayout header = (LinearLayout) root.findViewById(R.id.header);
+        LinearLayout header = root.findViewById(R.id.header);
         if(feedItems.length > 0) {
             header.setOnTouchListener((v, event) -> headerGestureDetector.onTouchEvent(event));
         }
 
-        txtvPodcast = (TextView) layout.findViewById(R.id.txtvPodcast);
+        txtvPodcast = layout.findViewById(R.id.txtvPodcast);
         txtvPodcast.setOnClickListener(v -> openPodcast());
-        txtvTitle = (TextView) layout.findViewById(R.id.txtvTitle);
+        txtvTitle = layout.findViewById(R.id.txtvTitle);
         if(Build.VERSION.SDK_INT >= 23) {
             txtvTitle.setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_FULL);
         }
-        txtvDuration = (TextView) layout.findViewById(R.id.txtvDuration);
-        txtvPublished = (TextView) layout.findViewById(R.id.txtvPublished);
+        txtvDuration = layout.findViewById(R.id.txtvDuration);
+        txtvPublished = layout.findViewById(R.id.txtvPublished);
         if (Build.VERSION.SDK_INT >= 14) { // ellipsize is causing problems on old versions, see #448
             txtvTitle.setEllipsize(TextUtils.TruncateAt.END);
         }
-        webvDescription = (WebView) layout.findViewById(R.id.webvDescription);
+        webvDescription = layout.findViewById(R.id.webvDescription);
         if (UserPreferences.getTheme() == R.style.Theme_AntennaPod_Dark ||
                 UserPreferences.getTheme() == R.style.Theme_AntennaPod_TrueBlack) {
             if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1) {
@@ -215,12 +215,12 @@ public class ItemFragment extends Fragment implements OnSwipeGesture {
         });
         registerForContextMenu(webvDescription);
 
-        imgvCover = (ImageView) layout.findViewById(R.id.imgvCover);
+        imgvCover = layout.findViewById(R.id.imgvCover);
         imgvCover.setOnClickListener(v -> openPodcast());
-        progbarDownload = (ProgressBar) layout.findViewById(R.id.progbarDownload);
-        progbarLoading = (ProgressBar) layout.findViewById(R.id.progbarLoading);
-        butAction1 = (IconButton) layout.findViewById(R.id.butAction1);
-        butAction2 = (IconButton) layout.findViewById(R.id.butAction2);
+        progbarDownload = layout.findViewById(R.id.progbarDownload);
+        progbarLoading = layout.findViewById(R.id.progbarLoading);
+        butAction1 = layout.findViewById(R.id.butAction1);
+        butAction2 = layout.findViewById(R.id.butAction2);
 
         butAction1.setOnClickListener(v -> {
             if (item == null) {
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java
index 55c32dbdf..bc38af9f3 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java
@@ -475,14 +475,14 @@ public class ItemlistFragment extends ListFragment {
         View header = inflater.inflate(R.layout.feeditemlist_header, lv, false);
         lv.addHeaderView(header);
 
-        txtvTitle = (TextView) header.findViewById(R.id.txtvTitle);
-        TextView txtvAuthor = (TextView) header.findViewById(R.id.txtvAuthor);
-        imgvBackground = (ImageView) header.findViewById(R.id.imgvBackground);
-        imgvCover = (ImageView) header.findViewById(R.id.imgvCover);
-        ImageButton butShowInfo = (ImageButton) header.findViewById(R.id.butShowInfo);
-        ImageButton butShowSettings = (ImageButton) header.findViewById(R.id.butShowSettings);
-        txtvInformation = (TextView) header.findViewById(R.id.txtvInformation);
-        txtvFailure = (IconTextView) header.findViewById(R.id.txtvFailure);
+        txtvTitle = header.findViewById(R.id.txtvTitle);
+        TextView txtvAuthor = header.findViewById(R.id.txtvAuthor);
+        imgvBackground = header.findViewById(R.id.imgvBackground);
+        imgvCover = header.findViewById(R.id.imgvCover);
+        ImageButton butShowInfo = header.findViewById(R.id.butShowInfo);
+        ImageButton butShowSettings = header.findViewById(R.id.butShowSettings);
+        txtvInformation = header.findViewById(R.id.txtvInformation);
+        txtvFailure = header.findViewById(R.id.txtvFailure);
 
         txtvTitle.setText(feed.getTitle());
         txtvAuthor.setText(feed.getAuthor());
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ItunesSearchFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ItunesSearchFragment.java
index 08610c1f3..57cbdc9c3 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ItunesSearchFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItunesSearchFragment.java
@@ -109,7 +109,7 @@ public class ItunesSearchFragment extends Fragment {
                              Bundle savedInstanceState) {
         // Inflate the layout for this fragment
         View root = inflater.inflate(R.layout.fragment_itunes_search, container, false);
-        gridView = (GridView) root.findViewById(R.id.gridView);
+        gridView = root.findViewById(R.id.gridView);
         adapter = new ItunesAdapter(getActivity(), new ArrayList<>());
         gridView.setAdapter(adapter);
 
@@ -170,10 +170,10 @@ public class ItunesSearchFragment extends Fragment {
                         });
             }
         });
-        progressBar = (ProgressBar) root.findViewById(R.id.progressBar);
-        txtvError = (TextView) root.findViewById(R.id.txtvError);
-        butRetry = (Button) root.findViewById(R.id.butRetry);
-        txtvEmpty = (TextView) root.findViewById(android.R.id.empty);
+        progressBar = root.findViewById(R.id.progressBar);
+        txtvError = root.findViewById(R.id.txtvError);
+        butRetry = root.findViewById(R.id.butRetry);
+        txtvEmpty = root.findViewById(android.R.id.empty);
 
         loadToplist();
 
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
index 00b4d9eee..c6db974c1 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
@@ -380,8 +380,8 @@ public class QueueFragment extends Fragment {
         ((MainActivity) getActivity()).getSupportActionBar().setTitle(R.string.queue_label);
 
         View root = inflater.inflate(R.layout.queue_fragment, container, false);
-        infoBar = (TextView) root.findViewById(R.id.info_bar);
-        recyclerView = (RecyclerView) root.findViewById(R.id.recyclerView);
+        infoBar = root.findViewById(R.id.info_bar);
+        recyclerView = root.findViewById(R.id.recyclerView);
         RecyclerView.ItemAnimator animator = recyclerView.getItemAnimator();
         if (animator instanceof SimpleItemAnimator) {
             ((SimpleItemAnimator) animator).setSupportsChangeAnimations(false);
@@ -494,9 +494,9 @@ public class QueueFragment extends Fragment {
         );
         itemTouchHelper.attachToRecyclerView(recyclerView);
 
-        txtvEmpty = (TextView) root.findViewById(android.R.id.empty);
+        txtvEmpty = root.findViewById(android.R.id.empty);
         txtvEmpty.setVisibility(View.GONE);
-        progLoading = (ProgressBar) root.findViewById(R.id.progLoading);
+        progLoading = root.findViewById(R.id.progLoading);
         progLoading.setVisibility(View.VISIBLE);
 
         return root;
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/SubscriptionFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/SubscriptionFragment.java
index 6e7e1d2b2..36a9c5ba8 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/SubscriptionFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/SubscriptionFragment.java
@@ -68,7 +68,7 @@ public class SubscriptionFragment extends Fragment {
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         View root = inflater.inflate(R.layout.fragment_subscriptions, container, false);
-        subscriptionGridLayout = (GridView) root.findViewById(R.id.subscriptions_grid);
+        subscriptionGridLayout = root.findViewById(R.id.subscriptions_grid);
         registerForContextMenu(subscriptionGridLayout);
         return root;
     }
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/GpodnetMainFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/GpodnetMainFragment.java
index b48027668..4dc114f9b 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/GpodnetMainFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/GpodnetMainFragment.java
@@ -31,12 +31,12 @@ public class GpodnetMainFragment extends Fragment {
         super.onCreateView(inflater, container, savedInstanceState);
         View root = inflater.inflate(R.layout.pager_fragment, container, false);
 
-        viewPager = (ViewPager)root.findViewById(R.id.viewpager);
+        viewPager = root.findViewById(R.id.viewpager);
         GpodnetPagerAdapter pagerAdapter = new GpodnetPagerAdapter(getChildFragmentManager(), getResources());
         viewPager.setAdapter(pagerAdapter);
 
         // Give the TabLayout the ViewPager
-        tabLayout = (TabLayout) root.findViewById(R.id.sliding_tabs);
+        tabLayout = root.findViewById(R.id.sliding_tabs);
         tabLayout.setupWithViewPager(viewPager);
 
         return root;
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/PodcastListFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/PodcastListFragment.java
index 055358c64..49851ebb4 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/PodcastListFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/PodcastListFragment.java
@@ -78,10 +78,10 @@ public abstract class PodcastListFragment extends Fragment {
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View root = inflater.inflate(R.layout.gpodnet_podcast_list, container, false);
 
-        gridView = (GridView) root.findViewById(R.id.gridView);
-        progressBar = (ProgressBar) root.findViewById(R.id.progressBar);
-        txtvError = (TextView) root.findViewById(R.id.txtvError);
-        butRetry = (Button) root.findViewById(R.id.butRetry);
+        gridView = root.findViewById(R.id.gridView);
+        progressBar = root.findViewById(R.id.progressBar);
+        txtvError = root.findViewById(R.id.txtvError);
+        butRetry = root.findViewById(R.id.butRetry);
 
         gridView.setOnItemClickListener((parent, view, position, id) ->
                 onPodcastSelected((GpodnetPodcast) gridView.getAdapter().getItem(position)));
diff --git a/app/src/main/java/de/danoeh/antennapod/menuhandler/MenuItemUtils.java b/app/src/main/java/de/danoeh/antennapod/menuhandler/MenuItemUtils.java
index 66e229bdd..7b9fcad9b 100644
--- a/app/src/main/java/de/danoeh/antennapod/menuhandler/MenuItemUtils.java
+++ b/app/src/main/java/de/danoeh/antennapod/menuhandler/MenuItemUtils.java
@@ -19,7 +19,7 @@ public class MenuItemUtils extends de.danoeh.antennapod.core.menuhandler.MenuIte
 
     public static void adjustTextColor(Context context, SearchView sv) {
         if(Build.VERSION.SDK_INT < 14) {
-            EditText searchEditText = (EditText) sv.findViewById(R.id.search_src_text);
+            EditText searchEditText = sv.findViewById(R.id.search_src_text);
             if (UserPreferences.getTheme() == de.danoeh.antennapod.R.style.Theme_AntennaPod_Dark
                     || UserPreferences.getTheme() == R.style.Theme_AntennaPod_TrueBlack) {
                 searchEditText.setTextColor(Color.WHITE);
diff --git a/app/src/main/java/de/danoeh/antennapod/spa/SPAUtil.java b/app/src/main/java/de/danoeh/antennapod/spa/SPAUtil.java
index 75cbd8b5a..03958508d 100644
--- a/app/src/main/java/de/danoeh/antennapod/spa/SPAUtil.java
+++ b/app/src/main/java/de/danoeh/antennapod/spa/SPAUtil.java
@@ -33,7 +33,7 @@ public class SPAUtil {
      * sent before.
      */
     public static synchronized boolean sendSPAppsQueryFeedsIntent(Context context) {
-        if (context == null) throw new IllegalArgumentException("context = null");
+        assert context != null : "context = null";
         final Context appContext = context.getApplicationContext();
         if (appContext == null) {
             Log.wtf(TAG, "Unable to get application context");
-- 
cgit v1.2.3


From b3fbb0ec7574cf1090bfb410589753ba8ef51bbb Mon Sep 17 00:00:00 2001
From: Petar Kukolj <petarkukolj3@yahoo.com>
Date: Wed, 14 Nov 2018 16:18:58 +0100
Subject: Add configurable behavior of the back button

This PR allows users to change how the back button functions. Closes #2196

Possible choices are following:

 - **Default** - back button functions how it currently functions (closes the app if there is nowhere to go back to)

 - **Open navigation drawer** - back button always opens the navigation drawer instead of closing the app

 - **Double tap to exit** - like default, but requires two taps to close the app

 - **Confirm to exit** - like default, but prompts user if they really want to exit
---
 .../danoeh/antennapod/activity/MainActivity.java   | 31 +++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
index f506921d2..fffd751c9 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
@@ -27,6 +27,7 @@ import android.view.MenuItem;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ListView;
+import android.widget.Toast;
 
 import com.bumptech.glide.Glide;
 
@@ -123,6 +124,8 @@ public class MainActivity extends CastEnabledActivity implements NavDrawerActivi
 
     private Subscription subscription;
 
+    private long lastBackButtonPressTime = 0;
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         setTheme(UserPreferences.getNoTitleTheme());
@@ -646,7 +649,33 @@ public class MainActivity extends CastEnabledActivity implements NavDrawerActivi
         if(isDrawerOpen()) {
             drawerLayout.closeDrawer(navDrawer);
         } else {
-            super.onBackPressed();
+            switch (UserPreferences.getBackButtonBehavior()) {
+                case OPEN_DRAWER:
+                    drawerLayout.openDrawer(navDrawer);
+                    break;
+                case SHOW_PROMPT:
+                    new AlertDialog.Builder(this)
+                        .setMessage(R.string.close_prompt)
+                        .setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
+                            @Override
+                            public void onClick(DialogInterface dialogInterface, int i) {
+                                MainActivity.super.onBackPressed();
+                            }
+                        })
+                        .setNegativeButton(R.string.no, null)
+                        .setCancelable(false)
+                        .show();
+                    break;
+                case DOUBLE_TAP:
+                    if(lastBackButtonPressTime < System.currentTimeMillis() - 2000) {
+                        Toast.makeText(this, R.string.double_tap_toast, Toast.LENGTH_SHORT).show();
+                        lastBackButtonPressTime = System.currentTimeMillis();
+                    } else {
+                        super.onBackPressed();
+                    }
+                    break;
+                default: super.onBackPressed();
+            }
         }
     }
 
-- 
cgit v1.2.3


From 6262f98e39badde997d3e5793411a398cc062e09 Mon Sep 17 00:00:00 2001
From: Petar Kukolj <petarkukolj3@yahoo.com>
Date: Thu, 15 Nov 2018 20:54:40 +0100
Subject: Add go to page option

---
 .../danoeh/antennapod/activity/MainActivity.java   | 28 +++++++++++++++++-----
 .../preferences/PreferenceController.java          | 27 +++++++++++++++++++++
 2 files changed, 49 insertions(+), 6 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
index fffd751c9..4c25c5c28 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
@@ -656,12 +656,7 @@ public class MainActivity extends CastEnabledActivity implements NavDrawerActivi
                 case SHOW_PROMPT:
                     new AlertDialog.Builder(this)
                         .setMessage(R.string.close_prompt)
-                        .setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
-                            @Override
-                            public void onClick(DialogInterface dialogInterface, int i) {
-                                MainActivity.super.onBackPressed();
-                            }
-                        })
+                        .setPositiveButton(R.string.yes, (dialogInterface, i) -> MainActivity.super.onBackPressed())
                         .setNegativeButton(R.string.no, null)
                         .setCancelable(false)
                         .show();
@@ -674,6 +669,27 @@ public class MainActivity extends CastEnabledActivity implements NavDrawerActivi
                         super.onBackPressed();
                     }
                     break;
+                case GO_TO_QUEUE:
+                    if(getLastNavFragment().equals(QueueFragment.TAG)) {
+                        super.onBackPressed();
+                    } else {
+                        loadFragment(QueueFragment.TAG, null);
+                    }
+                    break;
+                case GO_TO_EPISODES:
+                    if(getLastNavFragment().equals(EpisodesFragment.TAG)) {
+                        super.onBackPressed();
+                    } else {
+                        loadFragment(EpisodesFragment.TAG, null);
+                    }
+                    break;
+                case GO_TO_SUBSCRIPTIONS:
+                    if(getLastNavFragment().equals(SubscriptionFragment.TAG)) {
+                        super.onBackPressed();
+                    } else {
+                        loadFragment(SubscriptionFragment.TAG, null);
+                    }
+                    break;
                 default: super.onBackPressed();
             }
         }
diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
index 1d93afad9..56af71dc4 100644
--- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
+++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
@@ -227,6 +227,33 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
                     return true;
                 });
 
+        ui.findPreference(UserPreferences.PREF_BACK_BUTTON_BEHAVIOR)
+                .setOnPreferenceChangeListener((preference, newValue) -> {
+                        if(newValue.equals("page")) {
+                            final Context context = ui.getActivity();
+                            final String[] navTitles = context.getResources().getStringArray(R.array.back_button_go_to_pages);
+                            final int choice[] = { UserPreferences.getBackButtonGoToPage() };
+
+                            AlertDialog.Builder builder = new AlertDialog.Builder(context);
+                            builder.setTitle(R.string.back_button_go_to_page_title);
+                            builder.setSingleChoiceItems(navTitles, choice[0], (dialogInterface, i) -> {
+                                if(i >= 0) {
+                                    choice[0] = i;
+                                }
+                            });
+                            builder.setPositiveButton(R.string.confirm_label, (dialogInterface, i) -> {
+                                if (choice[0] != UserPreferences.getBackButtonGoToPage()) {
+                                    UserPreferences.setBackButtonGoToPage(choice[0]);
+                                }
+                            });
+                            builder.setNegativeButton(R.string.cancel_label, null);
+                            builder.create().show();
+                            return true;
+                        } else {
+                            return true;
+                        }
+                    });
+
         if (Build.VERSION.SDK_INT >= 26) {
             ui.findPreference(UserPreferences.PREF_EXPANDED_NOTIFICATION).setVisible(false);
         }
-- 
cgit v1.2.3


From 1d87910cbed3f3d29573d45ad0877275a70b4d11 Mon Sep 17 00:00:00 2001
From: orionlee <orionlee@yahoo.com>
Date: Fri, 16 Nov 2018 13:42:56 -0800
Subject: #2878: fix episode screen context menu is applied on wrong feed item
 during refresh

---
 .../adapter/AllEpisodesRecycleAdapter.java           | 20 ++++++++------------
 .../antennapod/fragment/AllEpisodesFragment.java     |  8 ++------
 2 files changed, 10 insertions(+), 18 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java
index a431a47db..da1ce7670 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java
@@ -1,6 +1,7 @@
 package de.danoeh.antennapod.adapter;
 
 import android.os.Build;
+import android.support.annotation.Nullable;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.helper.ItemTouchHelper;
@@ -51,7 +52,7 @@ public class AllEpisodesRecycleAdapter extends RecyclerView.Adapter<AllEpisodesR
     private final ActionButtonUtils actionButtonUtils;
     private final boolean showOnlyNewEpisodes;
 
-    private int position = -1;
+    private FeedItem selectedItem;
 
     private final int playingBackGroundColor;
     private final int normalBackGroundColor;
@@ -107,7 +108,7 @@ public class AllEpisodesRecycleAdapter extends RecyclerView.Adapter<AllEpisodesR
         final FeedItem item = itemAccess.getItem(position);
         if (item == null) return;
         holder.itemView.setOnLongClickListener(v -> {
-            this.position = holder.getAdapterPosition();
+            this.selectedItem = item;
             return false;
         });
         holder.item = item;
@@ -200,6 +201,11 @@ public class AllEpisodesRecycleAdapter extends RecyclerView.Adapter<AllEpisodesR
                 .into(new CoverTarget(item.getFeed().getImageLocation(), holder.placeholder, holder.cover, mainActivityRef.get()));
     }
 
+    @Nullable
+    public FeedItem getSelectedItem() {
+        return selectedItem;
+    }
+
     @Override
     public long getItemId(int position) {
         FeedItem item = itemAccess.getItem(position);
@@ -211,16 +217,6 @@ public class AllEpisodesRecycleAdapter extends RecyclerView.Adapter<AllEpisodesR
         return itemAccess.getCount();
     }
 
-    public FeedItem getItem(int position) {
-        return itemAccess.getItem(position);
-    }
-
-    public int getPosition() {
-        int pos = position;
-        position = -1; // reset
-        return pos;
-    }
-
     private final View.OnClickListener secondaryActionListener = new View.OnClickListener() {
         @Override
         public void onClick(View v) {
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java
index ff7af97f6..eeec9ff49 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java
@@ -275,14 +275,10 @@ public class AllEpisodesFragment extends Fragment {
         if(item.getItemId() == R.id.share_item) {
             return true; // avoids that the position is reset when we need it in the submenu
         }
-        int pos = listAdapter.getPosition();
-        if(pos < 0) {
-            return false;
-        }
-        FeedItem selectedItem = itemAccess.getItem(pos);
 
+        FeedItem selectedItem = listAdapter.getSelectedItem();
         if (selectedItem == null) {
-            Log.i(TAG, "Selected item at position " + pos + " was null, ignoring selection");
+            Log.i(TAG, "Selected item was null, ignoring selection");
             return super.onContextItemSelected(item);
         }
 
-- 
cgit v1.2.3


From 0d1b9c4c55436ae77bbd3067f4eb839a71c20934 Mon Sep 17 00:00:00 2001
From: Petar Kukolj <petarkukolj3@yahoo.com>
Date: Sat, 17 Nov 2018 20:13:35 +0100
Subject: Use fragment tags instead of position indexes for saving chosen
 fragment

---
 .../de/danoeh/antennapod/activity/MainActivity.java  | 20 +++-----------------
 .../antennapod/preferences/PreferenceController.java | 10 ++++++----
 2 files changed, 9 insertions(+), 21 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
index 4c25c5c28..d2a0c3aab 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
@@ -669,25 +669,11 @@ public class MainActivity extends CastEnabledActivity implements NavDrawerActivi
                         super.onBackPressed();
                     }
                     break;
-                case GO_TO_QUEUE:
-                    if(getLastNavFragment().equals(QueueFragment.TAG)) {
+                case GO_TO_PAGE:
+                    if(getLastNavFragment().equals(UserPreferences.getBackButtonGoToPage())) {
                         super.onBackPressed();
                     } else {
-                        loadFragment(QueueFragment.TAG, null);
-                    }
-                    break;
-                case GO_TO_EPISODES:
-                    if(getLastNavFragment().equals(EpisodesFragment.TAG)) {
-                        super.onBackPressed();
-                    } else {
-                        loadFragment(EpisodesFragment.TAG, null);
-                    }
-                    break;
-                case GO_TO_SUBSCRIPTIONS:
-                    if(getLastNavFragment().equals(SubscriptionFragment.TAG)) {
-                        super.onBackPressed();
-                    } else {
-                        loadFragment(SubscriptionFragment.TAG, null);
+                        loadFragment(UserPreferences.getBackButtonGoToPage(), null);
                     }
                     break;
                 default: super.onBackPressed();
diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
index 56af71dc4..ec1767062 100644
--- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
+++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
@@ -232,17 +232,19 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
                         if(newValue.equals("page")) {
                             final Context context = ui.getActivity();
                             final String[] navTitles = context.getResources().getStringArray(R.array.back_button_go_to_pages);
-                            final int choice[] = { UserPreferences.getBackButtonGoToPage() };
+                            final String[] navTags = new String[3];
+                            System.arraycopy(MainActivity.NAV_DRAWER_TAGS, 0, navTags, 0, 3);
+                            final String choice[] = { UserPreferences.getBackButtonGoToPage() };
 
                             AlertDialog.Builder builder = new AlertDialog.Builder(context);
                             builder.setTitle(R.string.back_button_go_to_page_title);
-                            builder.setSingleChoiceItems(navTitles, choice[0], (dialogInterface, i) -> {
+                            builder.setSingleChoiceItems(navTitles, ArrayUtils.indexOf(navTags, UserPreferences.getBackButtonGoToPage()), (dialogInterface, i) -> {
                                 if(i >= 0) {
-                                    choice[0] = i;
+                                    choice[0] = navTags[i];
                                 }
                             });
                             builder.setPositiveButton(R.string.confirm_label, (dialogInterface, i) -> {
-                                if (choice[0] != UserPreferences.getBackButtonGoToPage()) {
+                                if (!choice[0].equals(UserPreferences.getBackButtonGoToPage())) {
                                     UserPreferences.setBackButtonGoToPage(choice[0]);
                                 }
                             });
-- 
cgit v1.2.3


From 98e75fc313df0a6d1fc79485f6d58bfbf2c9bc96 Mon Sep 17 00:00:00 2001
From: Petar Kukolj <petarkukolj3@yahoo.com>
Date: Tue, 20 Nov 2018 23:40:31 +0100
Subject: Fix not going back on child fragments

---
 app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
index d2a0c3aab..122b6040e 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
@@ -648,6 +648,8 @@ public class MainActivity extends CastEnabledActivity implements NavDrawerActivi
     public void onBackPressed() {
         if(isDrawerOpen()) {
             drawerLayout.closeDrawer(navDrawer);
+        } else if(getSupportFragmentManager().getBackStackEntryCount() != 0) {
+            super.onBackPressed();
         } else {
             switch (UserPreferences.getBackButtonBehavior()) {
                 case OPEN_DRAWER:
-- 
cgit v1.2.3


From feef92f80263a8304b7204cd719b54e1891d0ef0 Mon Sep 17 00:00:00 2001
From: orionlee <orionlee@yahoo.com>
Date: Wed, 21 Nov 2018 12:11:39 -0800
Subject: #2906: refactor: move auto feed update by interval helper,
 checkShouldRefreshFeeds(), to proper level of abstraction.

---
 app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java     | 4 ++--
 .../java/de/danoeh/antennapod/activity/MediaplayerInfoActivity.java   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
index f506921d2..7a95ba4f7 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
@@ -49,12 +49,12 @@ import de.danoeh.antennapod.core.preferences.PlaybackPreferences;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.core.service.playback.PlaybackService;
 import de.danoeh.antennapod.core.storage.DBReader;
-import de.danoeh.antennapod.core.storage.DBTasks;
 import de.danoeh.antennapod.core.storage.DBWriter;
 import de.danoeh.antennapod.core.util.FeedItemUtil;
 import de.danoeh.antennapod.core.util.Flavors;
 import de.danoeh.antennapod.core.util.IntentUtils;
 import de.danoeh.antennapod.core.util.StorageUtils;
+import de.danoeh.antennapod.core.util.download.AutoUpdateManager;
 import de.danoeh.antennapod.core.util.gui.NotificationUtils;
 import de.danoeh.antennapod.dialog.RatingDialog;
 import de.danoeh.antennapod.dialog.RenameFeedDialog;
@@ -471,7 +471,7 @@ public class MainActivity extends CastEnabledActivity implements NavDrawerActivi
     protected void onResume() {
         super.onResume();
         StorageUtils.checkStorageAvailability(this);
-        DBTasks.checkShouldRefreshFeeds(getApplicationContext());
+        AutoUpdateManager.checkShouldRefreshFeeds(getApplicationContext());
 
         Intent intent = getIntent();
         if (intent.hasExtra(EXTRA_FEED_ID) ||
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerInfoActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerInfoActivity.java
index 7d79f0a57..28156b835 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerInfoActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerInfoActivity.java
@@ -46,9 +46,9 @@ import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.core.service.playback.PlaybackService;
 import de.danoeh.antennapod.core.service.playback.PlayerStatus;
 import de.danoeh.antennapod.core.storage.DBReader;
-import de.danoeh.antennapod.core.storage.DBTasks;
 import de.danoeh.antennapod.core.storage.DBWriter;
 import de.danoeh.antennapod.core.util.IntentUtils;
+import de.danoeh.antennapod.core.util.download.AutoUpdateManager;
 import de.danoeh.antennapod.core.util.playback.Playable;
 import de.danoeh.antennapod.core.util.playback.PlaybackController;
 import de.danoeh.antennapod.dialog.RenameFeedDialog;
@@ -187,7 +187,7 @@ public abstract class MediaplayerInfoActivity extends MediaplayerActivity implem
             pagerAdapter.onMediaChanged(media);
             pagerAdapter.setController(controller);
         }
-        DBTasks.checkShouldRefreshFeeds(getApplicationContext());
+        AutoUpdateManager.checkShouldRefreshFeeds(getApplicationContext());
 
         EventDistributor.getInstance().register(contentUpdate);
         EventBus.getDefault().register(this);
-- 
cgit v1.2.3


From 2393d4512c25cdd9095a3546c2bc9aa139bca798 Mon Sep 17 00:00:00 2001
From: Petar Kukolj <petarkukolj3@yahoo.com>
Date: Thu, 22 Nov 2018 17:05:04 +0100
Subject: Fix coding style problems

---
 app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java | 8 ++++----
 .../de/danoeh/antennapod/preferences/PreferenceController.java    | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
index 122b6040e..5595aeac4 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
@@ -646,9 +646,9 @@ public class MainActivity extends CastEnabledActivity implements NavDrawerActivi
 
     @Override
     public void onBackPressed() {
-        if(isDrawerOpen()) {
+        if (isDrawerOpen()) {
             drawerLayout.closeDrawer(navDrawer);
-        } else if(getSupportFragmentManager().getBackStackEntryCount() != 0) {
+        } else if (getSupportFragmentManager().getBackStackEntryCount() != 0) {
             super.onBackPressed();
         } else {
             switch (UserPreferences.getBackButtonBehavior()) {
@@ -664,7 +664,7 @@ public class MainActivity extends CastEnabledActivity implements NavDrawerActivi
                         .show();
                     break;
                 case DOUBLE_TAP:
-                    if(lastBackButtonPressTime < System.currentTimeMillis() - 2000) {
+                    if (lastBackButtonPressTime < System.currentTimeMillis() - 2000) {
                         Toast.makeText(this, R.string.double_tap_toast, Toast.LENGTH_SHORT).show();
                         lastBackButtonPressTime = System.currentTimeMillis();
                     } else {
@@ -672,7 +672,7 @@ public class MainActivity extends CastEnabledActivity implements NavDrawerActivi
                     }
                     break;
                 case GO_TO_PAGE:
-                    if(getLastNavFragment().equals(UserPreferences.getBackButtonGoToPage())) {
+                    if (getLastNavFragment().equals(UserPreferences.getBackButtonGoToPage())) {
                         super.onBackPressed();
                     } else {
                         loadFragment(UserPreferences.getBackButtonGoToPage(), null);
diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
index ec1767062..587b533a2 100644
--- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
+++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
@@ -229,7 +229,7 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
 
         ui.findPreference(UserPreferences.PREF_BACK_BUTTON_BEHAVIOR)
                 .setOnPreferenceChangeListener((preference, newValue) -> {
-                        if(newValue.equals("page")) {
+                        if (newValue.equals("page")) {
                             final Context context = ui.getActivity();
                             final String[] navTitles = context.getResources().getStringArray(R.array.back_button_go_to_pages);
                             final String[] navTags = new String[3];
@@ -239,7 +239,7 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
                             AlertDialog.Builder builder = new AlertDialog.Builder(context);
                             builder.setTitle(R.string.back_button_go_to_page_title);
                             builder.setSingleChoiceItems(navTitles, ArrayUtils.indexOf(navTags, UserPreferences.getBackButtonGoToPage()), (dialogInterface, i) -> {
-                                if(i >= 0) {
+                                if (i >= 0) {
                                     choice[0] = navTags[i];
                                 }
                             });
-- 
cgit v1.2.3


From df90cb00ebb12193e10e6817b3633857aaca9d0e Mon Sep 17 00:00:00 2001
From: Petar Kukolj <petarkukolj3@yahoo.com>
Date: Fri, 30 Nov 2018 13:28:39 +0100
Subject: Fix NPE when selecting Go to page for the first time

---
 .../de/danoeh/antennapod/preferences/PreferenceController.java   | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
index 587b533a2..7e724c74b 100644
--- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
+++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
@@ -232,8 +232,7 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
                         if (newValue.equals("page")) {
                             final Context context = ui.getActivity();
                             final String[] navTitles = context.getResources().getStringArray(R.array.back_button_go_to_pages);
-                            final String[] navTags = new String[3];
-                            System.arraycopy(MainActivity.NAV_DRAWER_TAGS, 0, navTags, 0, 3);
+                            final String[] navTags = { MainActivity.NAV_DRAWER_TAGS[0], MainActivity.NAV_DRAWER_TAGS[1], MainActivity.NAV_DRAWER_TAGS[2] };
                             final String choice[] = { UserPreferences.getBackButtonGoToPage() };
 
                             AlertDialog.Builder builder = new AlertDialog.Builder(context);
@@ -243,11 +242,7 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
                                     choice[0] = navTags[i];
                                 }
                             });
-                            builder.setPositiveButton(R.string.confirm_label, (dialogInterface, i) -> {
-                                if (!choice[0].equals(UserPreferences.getBackButtonGoToPage())) {
-                                    UserPreferences.setBackButtonGoToPage(choice[0]);
-                                }
-                            });
+                            builder.setPositiveButton(R.string.confirm_label, (dialogInterface, i) -> UserPreferences.setBackButtonGoToPage(choice[0]));
                             builder.setNegativeButton(R.string.cancel_label, null);
                             builder.create().show();
                             return true;
-- 
cgit v1.2.3


From 53957c9aa1aacf7629ded6562e163d77f0fe08e4 Mon Sep 17 00:00:00 2001
From: Petar Kukolj <petarkukolj3@yahoo.com>
Date: Fri, 30 Nov 2018 17:59:29 +0100
Subject: Use a resoruce array for fragments tags

---
 .../java/de/danoeh/antennapod/preferences/PreferenceController.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
index 7e724c74b..a9a82d749 100644
--- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
+++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
@@ -232,7 +232,7 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
                         if (newValue.equals("page")) {
                             final Context context = ui.getActivity();
                             final String[] navTitles = context.getResources().getStringArray(R.array.back_button_go_to_pages);
-                            final String[] navTags = { MainActivity.NAV_DRAWER_TAGS[0], MainActivity.NAV_DRAWER_TAGS[1], MainActivity.NAV_DRAWER_TAGS[2] };
+                            final String[] navTags = context.getResources().getStringArray(R.array.back_button_go_to_pages_tags);
                             final String choice[] = { UserPreferences.getBackButtonGoToPage() };
 
                             AlertDialog.Builder builder = new AlertDialog.Builder(context);
-- 
cgit v1.2.3


From f23682f53822fd01214bad1878947e001b392b8c Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Sun, 23 Dec 2018 15:45:30 +0100
Subject: Do not crash

---
 .../main/java/de/danoeh/antennapod/adapter/CoverTarget.java   | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/CoverTarget.java b/app/src/main/java/de/danoeh/antennapod/adapter/CoverTarget.java
index 5c6980b85..656a8d15b 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/CoverTarget.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/CoverTarget.java
@@ -1,6 +1,7 @@
 package de.danoeh.antennapod.adapter;
 
 import android.graphics.drawable.Drawable;
+import android.os.Handler;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.view.View;
@@ -39,13 +40,13 @@ class CoverTarget extends CustomViewTarget<ImageView, Drawable> {
         ImageView imgvCover = cover.get();
         if (fallbackUri != null && txtvPlaceholder != null && imgvCover != null) {
             MainActivity activity = mainActivity.get();
-            Glide.with(activity)
+            new Handler().post(() -> Glide.with(activity)
                     .load(fallbackUri)
                     .apply(new RequestOptions()
-                        .diskCacheStrategy(ApGlideSettings.AP_DISK_CACHE_STRATEGY)
-                        .fitCenter()
-                        .dontAnimate())
-                    .into(new CoverTarget(null, txtvPlaceholder, imgvCover, activity));
+                            .diskCacheStrategy(ApGlideSettings.AP_DISK_CACHE_STRATEGY)
+                            .fitCenter()
+                            .dontAnimate())
+                    .into(new CoverTarget(null, txtvPlaceholder, imgvCover, activity)));
         }
     }
 
-- 
cgit v1.2.3


From 02bf71551bacd65be19ff6fb220e70162c4534da Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Wed, 26 Dec 2018 08:53:41 +0100
Subject: Code style

---
 .../main/java/de/danoeh/antennapod/activity/AboutActivity.java    | 2 +-
 .../main/java/de/danoeh/antennapod/activity/FeedInfoActivity.java | 4 ++--
 .../java/de/danoeh/antennapod/activity/FeedSettingsActivity.java  | 4 ++--
 app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java | 2 +-
 .../java/de/danoeh/antennapod/activity/MediaplayerActivity.java   | 4 ++--
 .../de/danoeh/antennapod/activity/MediaplayerInfoActivity.java    | 2 +-
 app/src/main/java/de/danoeh/antennapod/dialog/ProxyDialog.java    | 2 +-
 .../java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java   | 4 ++--
 .../de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java | 8 ++++----
 .../de/danoeh/antennapod/fragment/ExternalPlayerFragment.java     | 2 +-
 10 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java
index 2270c144c..ecfdf24b0 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java
@@ -146,7 +146,7 @@ public class AboutActivity extends AppCompatActivity {
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        if(disposable != null) {
+        if (disposable != null) {
             disposable.dispose();
         }
         if (webViewContainer != null && webView != null) {
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/FeedInfoActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/FeedInfoActivity.java
index f6a878873..178d0e743 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/FeedInfoActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/FeedInfoActivity.java
@@ -107,7 +107,7 @@ public class FeedInfoActivity extends AppCompatActivity {
 
         disposable = Maybe.create((MaybeOnSubscribe<Feed>) emitter -> {
             Feed feed = DBReader.getFeed(feedId);
-            if(feed != null) {
+            if (feed != null) {
                 emitter.onSuccess(feed);
             } else {
                 emitter.onComplete();
@@ -180,7 +180,7 @@ public class FeedInfoActivity extends AppCompatActivity {
     @Override
     public void onDestroy() {
         super.onDestroy();
-        if(disposable != null) {
+        if (disposable != null) {
             disposable.dispose();
         }
     }
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/FeedSettingsActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/FeedSettingsActivity.java
index fcda186ad..f7bde5f21 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/FeedSettingsActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/FeedSettingsActivity.java
@@ -140,7 +140,7 @@ public class FeedSettingsActivity extends AppCompatActivity {
 
         disposable = Maybe.create((MaybeOnSubscribe<Feed>) emitter -> {
             Feed feed = DBReader.getFeed(feedId);
-            if(feed != null) {
+            if (feed != null) {
                 emitter.onSuccess(feed);
             } else {
                 emitter.onComplete();
@@ -287,7 +287,7 @@ public class FeedSettingsActivity extends AppCompatActivity {
     @Override
     public void onDestroy() {
         super.onDestroy();
-        if(disposable != null) {
+        if (disposable != null) {
             disposable.dispose();
         }
     }
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
index 35c468b53..05519d728 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
@@ -491,7 +491,7 @@ public class MainActivity extends CastEnabledActivity implements NavDrawerActivi
         super.onStop();
         EventDistributor.getInstance().unregister(contentUpdate);
         EventBus.getDefault().unregister(this);
-        if(disposable != null) {
+        if (disposable != null) {
             disposable.dispose();
         }
         if(pd != null) {
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
index 165cb7679..1cddaa655 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
@@ -290,7 +290,7 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements
             controller.release();
             controller = null; // prevent leak
         }
-        if(disposable != null) {
+        if (disposable != null) {
             disposable.dispose();
         }
         super.onStop();
@@ -952,7 +952,7 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements
         if (feedItem == null) {
             return;
         }
-        if(disposable != null) {
+        if (disposable != null) {
             disposable.dispose();
         }
         disposable = Observable.fromCallable(() -> DBReader.getFeedItem(feedItem.getId()))
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerInfoActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerInfoActivity.java
index e549f0115..1c1de583a 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerInfoActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerInfoActivity.java
@@ -127,7 +127,7 @@ public abstract class MediaplayerInfoActivity extends MediaplayerActivity implem
         if(pagerAdapter != null) {
             pagerAdapter.setController(null);
         }
-        if(disposable != null) {
+        if (disposable != null) {
             disposable.dispose();
         }
         EventDistributor.getInstance().unregister(contentUpdate);
diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/ProxyDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/ProxyDialog.java
index cc331e24a..8f2629b43 100644
--- a/app/src/main/java/de/danoeh/antennapod/dialog/ProxyDialog.java
+++ b/app/src/main/java/de/danoeh/antennapod/dialog/ProxyDialog.java
@@ -229,7 +229,7 @@ public class ProxyDialog {
     }
 
     private void test() {
-        if(disposable != null) {
+        if (disposable != null) {
             disposable.dispose();
         }
         if(!checkValidity()) {
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java
index 485ae25fd..ef522d3b3 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java
@@ -125,7 +125,7 @@ public class AllEpisodesFragment extends Fragment {
     public void onStop() {
         super.onStop();
         EventDistributor.getInstance().unregister(contentUpdate);
-        if(disposable != null) {
+        if (disposable != null) {
             disposable.dispose();
         }
     }
@@ -462,7 +462,7 @@ public class AllEpisodesFragment extends Fragment {
     }
 
     void loadItems() {
-        if(disposable != null) {
+        if (disposable != null) {
             disposable.dispose();
         }
         if (viewsCreated && !itemsLoaded) {
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java
index d2b9d2f67..4bba9b255 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java
@@ -61,7 +61,7 @@ public class CompletedDownloadsFragment extends ListFragment {
     public void onStop() {
         super.onStop();
         EventDistributor.getInstance().unregister(contentUpdate);
-        if(disposable != null) {
+        if (disposable != null) {
             disposable.dispose();
         }
     }
@@ -69,7 +69,7 @@ public class CompletedDownloadsFragment extends ListFragment {
     @Override
     public void onDetach() {
         super.onDetach();
-        if(disposable != null) {
+        if (disposable != null) {
             disposable.dispose();
         }
     }
@@ -79,7 +79,7 @@ public class CompletedDownloadsFragment extends ListFragment {
         super.onDestroyView();
         listAdapter = null;
         viewCreated = false;
-        if(disposable != null) {
+        if (disposable != null) {
             disposable.dispose();
         }
     }
@@ -182,7 +182,7 @@ public class CompletedDownloadsFragment extends ListFragment {
     };
 
     private void loadItems() {
-        if(disposable != null) {
+        if (disposable != null) {
             disposable.dispose();
         }
         if (items == null && viewCreated) {
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
index 4e010f184..d3f3cbd7a 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
@@ -186,7 +186,7 @@ public class ExternalPlayerFragment extends Fragment {
         }
         disposable = Maybe.create(emitter -> {
                     Playable media = controller.getMedia();
-                    if(media != null) {
+                    if (media != null) {
                         emitter.onSuccess(media);
                     } else {
                         emitter.onComplete();
-- 
cgit v1.2.3


From a23e3466adfcbe011522d67acef30e4872b92f39 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Thu, 3 Jan 2019 13:48:03 +0100
Subject: Switched splash screen start

The splash screen was added to prevent seeing the "non-ready" MainActivity.
If the splash is closed before showing MainActivity, the splash does
nothing in most cases, just flashes the screen blue for a few milliseconds.
After that, you see MainActivity just as it was before adding the splash.
---
 app/src/main/java/de/danoeh/antennapod/activity/SplashActivity.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/SplashActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/SplashActivity.java
index 727e83320..52102eee1 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/SplashActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/SplashActivity.java
@@ -44,8 +44,8 @@ public class SplashActivity extends AppCompatActivity {
             .observeOn(AndroidSchedulers.mainThread())
             .subscribe(() -> {
                 Intent intent = new Intent(SplashActivity.this, MainActivity.class);
-                finish();
                 startActivity(intent);
+                finish();
             });
     }
 }
-- 
cgit v1.2.3


From c05f81a9f1a39b1cf9b116fffb17befa03b6b08b Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Thu, 3 Jan 2019 14:59:35 +0100
Subject: Encapsulated CoverTarget

---
 .../adapter/AllEpisodesRecycleAdapter.java         |  16 +--
 .../de/danoeh/antennapod/adapter/CoverLoader.java  | 123 +++++++++++++++++++++
 .../de/danoeh/antennapod/adapter/CoverTarget.java  |  68 ------------
 .../antennapod/adapter/QueueRecyclerAdapter.java   |  13 +--
 .../antennapod/adapter/SubscriptionsAdapter.java   |  15 ++-
 5 files changed, 142 insertions(+), 93 deletions(-)
 create mode 100644 app/src/main/java/de/danoeh/antennapod/adapter/CoverLoader.java
 delete mode 100644 app/src/main/java/de/danoeh/antennapod/adapter/CoverTarget.java

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java
index fee03a3f6..0b2b81edb 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java
@@ -20,8 +20,6 @@ import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.request.RequestOptions;
 import com.joanzapata.iconify.Iconify;
 
 import java.lang.ref.WeakReference;
@@ -30,7 +28,6 @@ import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.activity.MainActivity;
 import de.danoeh.antennapod.core.feed.FeedItem;
 import de.danoeh.antennapod.core.feed.FeedMedia;
-import de.danoeh.antennapod.core.glide.ApGlideSettings;
 import de.danoeh.antennapod.core.storage.DownloadRequester;
 import de.danoeh.antennapod.core.util.Converter;
 import de.danoeh.antennapod.core.util.DateUtils;
@@ -194,13 +191,12 @@ public class AllEpisodesRecycleAdapter extends RecyclerView.Adapter<AllEpisodesR
         holder.butSecondary.setTag(item);
         holder.butSecondary.setOnClickListener(secondaryActionListener);
 
-        Glide.with(mainActivityRef.get())
-                .load(item.getImageLocation())
-                .apply(new RequestOptions()
-                    .diskCacheStrategy(ApGlideSettings.AP_DISK_CACHE_STRATEGY)
-                    .fitCenter()
-                    .dontAnimate())
-                .into(new CoverTarget(item.getFeed().getImageLocation(), holder.placeholder, holder.cover, mainActivityRef.get()));
+        new CoverLoader(mainActivityRef.get())
+                .withUri(item.getImageLocation())
+                .withFallbackUri(item.getFeed().getImageLocation())
+                .withPlaceholderView(holder.placeholder)
+                .withCoverView(holder.cover)
+                .load();
     }
 
     @Nullable
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/CoverLoader.java b/app/src/main/java/de/danoeh/antennapod/adapter/CoverLoader.java
new file mode 100644
index 000000000..7d8ff2897
--- /dev/null
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/CoverLoader.java
@@ -0,0 +1,123 @@
+package de.danoeh.antennapod.adapter;
+
+import android.graphics.drawable.Drawable;
+import android.os.Handler;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.RequestBuilder;
+import com.bumptech.glide.request.RequestOptions;
+import com.bumptech.glide.request.target.CustomViewTarget;
+
+import java.lang.ref.WeakReference;
+
+import com.bumptech.glide.request.transition.Transition;
+import de.danoeh.antennapod.activity.MainActivity;
+import de.danoeh.antennapod.core.glide.ApGlideSettings;
+
+public class CoverLoader {
+    private String uri;
+    private String fallbackUri;
+    private TextView txtvPlaceholder;
+    private ImageView imgvCover;
+    private MainActivity activity;
+    private int errorResource = -1;
+
+    public CoverLoader(MainActivity activity) {
+        this.activity = activity;
+    }
+
+    public CoverLoader withUri(String uri) {
+        this.uri = uri;
+        return this;
+    }
+
+    public CoverLoader withFallbackUri(String uri) {
+        fallbackUri = uri;
+        return this;
+    }
+
+    public CoverLoader withCoverView(ImageView coverView) {
+        imgvCover = coverView;
+        return this;
+    }
+
+    public CoverLoader withError(int errorResource) {
+        this.errorResource = errorResource;
+        return this;
+    }
+
+    public CoverLoader withPlaceholderView(TextView placeholderView) {
+        txtvPlaceholder = placeholderView;
+        return this;
+    }
+
+    public void load() {
+        RequestOptions options = new RequestOptions()
+                .diskCacheStrategy(ApGlideSettings.AP_DISK_CACHE_STRATEGY)
+                .fitCenter()
+                .dontAnimate();
+
+        if (errorResource != -1) {
+            options = options.error(errorResource);
+        }
+
+        Glide.with(activity)
+                .load(uri)
+                .apply(options)
+                .into(new CoverTarget(fallbackUri, txtvPlaceholder, imgvCover, activity));
+    }
+
+    class CoverTarget extends CustomViewTarget<ImageView, Drawable> {
+
+        private final WeakReference<String> fallback;
+        private final WeakReference<TextView> placeholder;
+        private final WeakReference<ImageView> cover;
+        private final WeakReference<MainActivity> mainActivity;
+
+        public CoverTarget(String fallbackUri, TextView txtvPlaceholder, ImageView imgvCover, MainActivity activity) {
+            super(imgvCover);
+            fallback = new WeakReference<>(fallbackUri);
+            placeholder = new WeakReference<>(txtvPlaceholder);
+            cover = new WeakReference<>(imgvCover);
+            mainActivity = new WeakReference<>(activity);
+        }
+
+        @Override
+        public void onLoadFailed(Drawable errorDrawable) {
+            String fallbackUri = fallback.get();
+            TextView txtvPlaceholder = placeholder.get();
+            ImageView imgvCover = cover.get();
+            if (fallbackUri != null && txtvPlaceholder != null && imgvCover != null) {
+                MainActivity activity = mainActivity.get();
+                new Handler().post(() -> Glide.with(activity)
+                        .load(fallbackUri)
+                        .apply(new RequestOptions()
+                                .diskCacheStrategy(ApGlideSettings.AP_DISK_CACHE_STRATEGY)
+                                .fitCenter()
+                                .dontAnimate())
+                        .into(new CoverTarget(null, txtvPlaceholder, imgvCover, activity)));
+            }
+        }
+
+        @Override
+        public void onResourceReady(@NonNull Drawable resource, @Nullable Transition<? super Drawable> transition) {
+            TextView txtvPlaceholder = placeholder.get();
+            if (txtvPlaceholder != null) {
+                txtvPlaceholder.setVisibility(View.INVISIBLE);
+            }
+            ImageView ivCover = cover.get();
+            ivCover.setImageDrawable(resource);
+        }
+
+        @Override
+        protected void onResourceCleared(@Nullable Drawable placeholder) {
+            ImageView ivCover = cover.get();
+            ivCover.setImageDrawable(placeholder);
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/CoverTarget.java b/app/src/main/java/de/danoeh/antennapod/adapter/CoverTarget.java
deleted file mode 100644
index 656a8d15b..000000000
--- a/app/src/main/java/de/danoeh/antennapod/adapter/CoverTarget.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package de.danoeh.antennapod.adapter;
-
-import android.graphics.drawable.Drawable;
-import android.os.Handler;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.request.RequestOptions;
-import com.bumptech.glide.request.target.CustomViewTarget;
-
-import java.lang.ref.WeakReference;
-
-import com.bumptech.glide.request.transition.Transition;
-import de.danoeh.antennapod.activity.MainActivity;
-import de.danoeh.antennapod.core.glide.ApGlideSettings;
-
-class CoverTarget extends CustomViewTarget<ImageView, Drawable> {
-
-    private final WeakReference<String> fallback;
-    private final WeakReference<TextView> placeholder;
-    private final WeakReference<ImageView> cover;
-    private final WeakReference<MainActivity> mainActivity;
-
-    public CoverTarget(String fallbackUri, TextView txtvPlaceholder, ImageView imgvCover, MainActivity activity) {
-        super(imgvCover);
-        fallback = new WeakReference<>(fallbackUri);
-        placeholder = new WeakReference<>(txtvPlaceholder);
-        cover = new WeakReference<>(imgvCover);
-        mainActivity = new WeakReference<>(activity);
-    }
-
-    @Override
-    public void onLoadFailed(Drawable errorDrawable) {
-        String fallbackUri = fallback.get();
-        TextView txtvPlaceholder = placeholder.get();
-        ImageView imgvCover = cover.get();
-        if (fallbackUri != null && txtvPlaceholder != null && imgvCover != null) {
-            MainActivity activity = mainActivity.get();
-            new Handler().post(() -> Glide.with(activity)
-                    .load(fallbackUri)
-                    .apply(new RequestOptions()
-                            .diskCacheStrategy(ApGlideSettings.AP_DISK_CACHE_STRATEGY)
-                            .fitCenter()
-                            .dontAnimate())
-                    .into(new CoverTarget(null, txtvPlaceholder, imgvCover, activity)));
-        }
-    }
-
-    @Override
-    public void onResourceReady(@NonNull Drawable resource, @Nullable Transition<? super Drawable> transition) {
-        TextView txtvPlaceholder = placeholder.get();
-        if (txtvPlaceholder != null) {
-            txtvPlaceholder.setVisibility(View.INVISIBLE);
-        }
-        ImageView ivCover = cover.get();
-        ivCover.setImageDrawable(resource);
-    }
-
-    @Override
-    protected void onResourceCleared(@Nullable Drawable placeholder) {
-        ImageView ivCover = cover.get();
-        ivCover.setImageDrawable(placeholder);
-    }
-}
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java
index 8a19dcaaf..df8cafb9d 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java
@@ -292,13 +292,12 @@ public class QueueRecyclerAdapter extends RecyclerView.Adapter<QueueRecyclerAdap
             butSecondary.setTag(item);
             butSecondary.setOnClickListener(secondaryActionListener);
 
-            Glide.with(mainActivity.get())
-                .load(item.getImageLocation())
-                .apply(new RequestOptions()
-                    .diskCacheStrategy(ApGlideSettings.AP_DISK_CACHE_STRATEGY)
-                    .fitCenter()
-                    .dontAnimate())
-                .into(new CoverTarget(item.getFeed().getImageLocation(), placeholder, cover, mainActivity.get()));
+            new CoverLoader(mainActivity.get())
+                    .withUri(item.getImageLocation())
+                    .withFallbackUri(item.getFeed().getImageLocation())
+                    .withPlaceholderView(placeholder)
+                    .withCoverView(cover)
+                    .load();
         }
 
     }
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/SubscriptionsAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/SubscriptionsAdapter.java
index e890d34dd..763dcb57d 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/SubscriptionsAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/SubscriptionsAdapter.java
@@ -126,14 +126,13 @@ public class SubscriptionsAdapter extends BaseAdapter implements AdapterView.OnI
         } else {
             holder.count.setVisibility(View.GONE);
         }
-        Glide.with(mainActivityRef.get())
-                .load(feed.getImageLocation())
-                .apply(new RequestOptions()
-                    .error(R.color.light_gray)
-                    .diskCacheStrategy(ApGlideSettings.AP_DISK_CACHE_STRATEGY)
-                    .fitCenter()
-                    .dontAnimate())
-                .into(new CoverTarget(null, holder.feedTitle, holder.imageView, mainActivityRef.get()));
+
+        new CoverLoader(mainActivityRef.get())
+                .withUri(feed.getImageLocation())
+                .withPlaceholderView(holder.feedTitle)
+                .withCoverView(holder.imageView)
+                .withError(R.color.light_gray)
+                .load();
 
         return convertView;
     }
-- 
cgit v1.2.3


From e360aa04efb2a1e66a65ea3d40720f190a70f2f9 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Thu, 3 Jan 2019 15:09:30 +0100
Subject: Fixed flickering caused by handler

---
 .../de/danoeh/antennapod/adapter/CoverLoader.java  | 34 ++++++++--------------
 1 file changed, 12 insertions(+), 22 deletions(-)

(limited to 'app/src/main/java/de')

diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/CoverLoader.java b/app/src/main/java/de/danoeh/antennapod/adapter/CoverLoader.java
index 7d8ff2897..54ecdae77 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/CoverLoader.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/CoverLoader.java
@@ -66,42 +66,32 @@ public class CoverLoader {
             options = options.error(errorResource);
         }
 
-        Glide.with(activity)
+        RequestBuilder builder = Glide.with(activity)
                 .load(uri)
-                .apply(options)
-                .into(new CoverTarget(fallbackUri, txtvPlaceholder, imgvCover, activity));
+                .apply(options);
+
+        if (fallbackUri != null && txtvPlaceholder != null && imgvCover != null) {
+            builder = builder.error(Glide.with(activity)
+                    .load(fallbackUri)
+                    .apply(options));
+        }
+
+        builder.into(new CoverTarget(txtvPlaceholder, imgvCover));
     }
 
     class CoverTarget extends CustomViewTarget<ImageView, Drawable> {
-
-        private final WeakReference<String> fallback;
         private final WeakReference<TextView> placeholder;
         private final WeakReference<ImageView> cover;
-        private final WeakReference<MainActivity> mainActivity;
 
-        public CoverTarget(String fallbackUri, TextView txtvPlaceholder, ImageView imgvCover, MainActivity activity) {
+        public CoverTarget(TextView txtvPlaceholder, ImageView imgvCover) {
             super(imgvCover);
-            fallback = new WeakReference<>(fallbackUri);
             placeholder = new WeakReference<>(txtvPlaceholder);
             cover = new WeakReference<>(imgvCover);
-            mainActivity = new WeakReference<>(activity);
         }
 
         @Override
         public void onLoadFailed(Drawable errorDrawable) {
-            String fallbackUri = fallback.get();
-            TextView txtvPlaceholder = placeholder.get();
-            ImageView imgvCover = cover.get();
-            if (fallbackUri != null && txtvPlaceholder != null && imgvCover != null) {
-                MainActivity activity = mainActivity.get();
-                new Handler().post(() -> Glide.with(activity)
-                        .load(fallbackUri)
-                        .apply(new RequestOptions()
-                                .diskCacheStrategy(ApGlideSettings.AP_DISK_CACHE_STRATEGY)
-                                .fitCenter()
-                                .dontAnimate())
-                        .into(new CoverTarget(null, txtvPlaceholder, imgvCover, activity)));
-            }
+
         }
 
         @Override
-- 
cgit v1.2.3