diff options
| author | ByteHamster <info@bytehamster.com> | 2018-07-13 19:26:09 +0200 |
|---|---|---|
| committer | ByteHamster <info@bytehamster.com> | 2018-07-13 19:26:09 +0200 |
| commit | c2184cfab20aafbed70a30ee1d8f23c67f552d2b (patch) | |
| tree | a0a5232c70a54e726a6abcf6c11606c528b5f655 /app/src/main/java/de/danoeh/antennapod | |
| parent | 626621044f0dcb77080400d86571ca4a46043b06 (diff) | |
| parent | 740e202d7f1a2279c2b3e1fb5c3bdab9829818a3 (diff) | |
| download | AntennaPod-c2184cfab20aafbed70a30ee1d8f23c67f552d2b.zip | |
Merge branch 'develop' into exo-player
Diffstat (limited to 'app/src/main/java/de/danoeh/antennapod')
3 files changed, 4 insertions, 3 deletions
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)); }); } 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: |