diff options
author | ByteHamster <info@bytehamster.com> | 2019-12-19 16:52:37 +0100 |
---|---|---|
committer | ByteHamster <info@bytehamster.com> | 2019-12-19 16:52:37 +0100 |
commit | 6785eb7689e3010c455b0b49db46671fe93d5f46 (patch) | |
tree | b480ce9f9b5705072ccf11ab8ee38c967cfc94f4 | |
parent | ecad7bdf94f67f2495d24151919e48d234a906bf (diff) | |
download | AntennaPod-6785eb7689e3010c455b0b49db46671fe93d5f46.zip |
Do not crash when clicking menu items while loading
3 files changed, 10 insertions, 0 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/FeedInfoFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/FeedInfoFragment.java index 3b843e150..79637d79a 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/FeedInfoFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/FeedInfoFragment.java @@ -214,6 +214,10 @@ public class FeedInfoFragment extends Fragment { @Override public boolean onOptionsItemSelected(MenuItem item) { + if (feed == null) { + Toast.makeText(getContext(), R.string.please_wait_for_data, Toast.LENGTH_LONG).show(); + return super.onOptionsItemSelected(item); + } boolean handled = false; try { handled = FeedMenuHandler.onOptionsItemClicked(getContext(), item, feed); diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java index f03aef207..33343948f 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java @@ -19,6 +19,7 @@ import android.widget.ListView; import android.widget.RelativeLayout; import android.widget.TextView; +import android.widget.Toast; import androidx.annotation.NonNull; import androidx.appcompat.widget.SearchView; import androidx.core.view.MenuItemCompat; @@ -235,6 +236,10 @@ public class FeedItemlistFragment extends ListFragment { @Override public boolean onOptionsItemSelected(MenuItem item) { if (!super.onOptionsItemSelected(item)) { + if (feed == null) { + Toast.makeText(getContext(), R.string.please_wait_for_data, Toast.LENGTH_LONG).show(); + return true; + } try { if (!FeedMenuHandler.onOptionsItemClicked(getActivity(), item, feed)) { switch (item.getItemId()) { diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml index 2e1c5c717..ce6a0e41d 100644 --- a/core/src/main/res/values/strings.xml +++ b/core/src/main/res/values/strings.xml @@ -157,6 +157,7 @@ <string name="filtered_label">Filtered</string> <string name="refresh_failed_msg">{fa-exclamation-circle} Last Refresh failed</string> <string name="open_podcast">Open Podcast</string> + <string name="please_wait_for_data">Please wait until the data is loaded</string> <!-- actions on feeditems --> <string name="download_label">Download</string> |