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 @@ Filtered {fa-exclamation-circle} Last Refresh failed Open Podcast + Please wait until the data is loaded Download