diff options
Diffstat (limited to 'app/src')
4 files changed, 3 insertions, 5 deletions
diff --git a/app/src/androidTest/java/de/test/antennapod/EspressoTestUtils.java b/app/src/androidTest/java/de/test/antennapod/EspressoTestUtils.java index d32a6b382..225f07dfd 100644 --- a/app/src/androidTest/java/de/test/antennapod/EspressoTestUtils.java +++ b/app/src/androidTest/java/de/test/antennapod/EspressoTestUtils.java @@ -71,8 +71,7 @@ public class EspressoTestUtils { } uiController.loopMainThreadForAtLeast(50); - } - while (System.currentTimeMillis() < endTime); + } while (System.currentTimeMillis() < endTime); // timeout happens throw new PerformException.Builder() diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/DeleteActionButton.java b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/DeleteActionButton.java index 4d1ae76a2..45cce23b8 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/DeleteActionButton.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/DeleteActionButton.java @@ -38,6 +38,6 @@ public class DeleteActionButton extends ItemActionButton { @Override public int getVisibility() { - return (item.isPlayed()) ? View.INVISIBLE : View.VISIBLE; + return (item.getMedia() != null && item.getMedia().isDownloaded()) ? View.VISIBLE : View.INVISIBLE; } } diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/DownloadActionButton.java b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/DownloadActionButton.java index 0a1199e9b..f70d41a97 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/DownloadActionButton.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/DownloadActionButton.java @@ -72,7 +72,6 @@ public class DownloadActionButton extends ItemActionButton { private void downloadEpisode(Context context) { try { DownloadRequester.getInstance().downloadMedia(context, item); - Toast.makeText(context, R.string.status_downloading_label, Toast.LENGTH_SHORT).show(); } catch (DownloadRequestException e) { e.printStackTrace(); DownloadRequestErrorDialogCreator.newRequestErrorDialog(context, e.getMessage()); diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/UserInterfacePreferencesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/UserInterfacePreferencesFragment.java index 7cb07e447..c3611d683 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/UserInterfacePreferencesFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/UserInterfacePreferencesFragment.java @@ -63,7 +63,7 @@ public class UserInterfacePreferencesFragment extends PreferenceFragmentCompat { final Context context = getActivity(); final String[] navTitles = context.getResources().getStringArray(R.array.back_button_go_to_pages); final String[] navTags = context.getResources().getStringArray(R.array.back_button_go_to_pages_tags); - final String choice[] = { UserPreferences.getBackButtonGoToPage() }; + final String[] choice = { UserPreferences.getBackButtonGoToPage() }; AlertDialog.Builder builder = new AlertDialog.Builder(context); builder.setTitle(R.string.back_button_go_to_page_title); |