Castopod/AntennaPod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not crash when clicking menu items while loading

Browse Source
This commit is contained in:
ByteHamster 2019-12-19 16:52:37 +01:00
parent ecad7bdf94
commit 6785eb7689
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/de/danoeh/antennapod/fragment/FeedInfoFragment.java
View File

@ -214,6 +214,10 @@ public class FeedInfoFragment extends Fragment {
@Override @Override
public boolean onOptionsItemSelected(MenuItem item) { 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; boolean handled = false;
try { try {
handled = FeedMenuHandler.onOptionsItemClicked(getContext(), item, feed); handled = FeedMenuHandler.onOptionsItemClicked(getContext(), item, feed);

5
app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java
View File

@ -19,6 +19,7 @@ import android.widget.ListView;
import android.widget.RelativeLayout; import android.widget.RelativeLayout;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.appcompat.widget.SearchView; import androidx.appcompat.widget.SearchView;
import androidx.core.view.MenuItemCompat; import androidx.core.view.MenuItemCompat;
@ -235,6 +236,10 @@ public class FeedItemlistFragment extends ListFragment {
@Override @Override
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
if (!super.onOptionsItemSelected(item)) { if (!super.onOptionsItemSelected(item)) {
if (feed == null) {
Toast.makeText(getContext(), R.string.please_wait_for_data, Toast.LENGTH_LONG).show();
return true;
}
try { try {
if (!FeedMenuHandler.onOptionsItemClicked(getActivity(), item, feed)) { if (!FeedMenuHandler.onOptionsItemClicked(getActivity(), item, feed)) {
switch (item.getItemId()) { switch (item.getItemId()) {

1
core/src/main/res/values/strings.xml
View File

@ -157,6 +157,7 @@
<string name="filtered_label">Filtered</string> <string name="filtered_label">Filtered</string>
<string name="refresh_failed_msg">{fa-exclamation-circle} Last Refresh failed</string> <string name="refresh_failed_msg">{fa-exclamation-circle} Last Refresh failed</string>
<string name="open_podcast">Open Podcast</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 --> <!-- actions on feeditems -->
<string name="download_label">Download</string> <string name="download_label">Download</string>