Merge pull request #5737 from ByteHamster/show-error-in-dialog

Show feed error in dialog instead of opening download log screen
AntennaPod · Feb 20, 2022 · 449f1ca · 449f1ca
2 parents 4ba0e98 + a779c7a
commit 449f1ca
Show file tree

Hide file tree

Showing 3 changed files with 107 additions and 73 deletions.
diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/DownloadLogDetailsDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/DownloadLogDetailsDialog.java
@@ -0,0 +1,59 @@
+package de.danoeh.antennapod.dialog;
+
+import android.content.ClipData;
+import android.content.ClipboardManager;
+import android.content.Context;
+import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+import de.danoeh.antennapod.R;
+import de.danoeh.antennapod.core.service.download.DownloadStatus;
+import de.danoeh.antennapod.core.storage.DBReader;
+import de.danoeh.antennapod.event.MessageEvent;
+import de.danoeh.antennapod.model.feed.Feed;
+import de.danoeh.antennapod.model.feed.FeedMedia;
+import org.greenrobot.eventbus.EventBus;
+
+public class DownloadLogDetailsDialog extends AlertDialog.Builder {
+
+    public DownloadLogDetailsDialog(@NonNull Context context, DownloadStatus status) {
+        super(context);
+
+        String url = "unknown";
+        String message = context.getString(R.string.download_successful);
+        if (status.getFeedfileType() == FeedMedia.FEEDFILETYPE_FEEDMEDIA) {
+            FeedMedia media = DBReader.getFeedMedia(status.getFeedfileId());
+            if (media != null) {
+                url = media.getDownload_url();
+            }
+        } else if (status.getFeedfileType() == Feed.FEEDFILETYPE_FEED) {
+            Feed feed = DBReader.getFeed(status.getFeedfileId());
+            if (feed != null) {
+                url = feed.getDownload_url();
+            }
+        }
+
+        if (!status.isSuccessful()) {
+            message = status.getReasonDetailed();
+        }
+
+        String messageFull = context.getString(R.string.download_error_details_message, message, url);
+        setTitle(R.string.download_error_details);
+        setMessage(messageFull);
+        setPositiveButton(android.R.string.ok, null);
+        setNeutralButton(R.string.copy_to_clipboard, (dialog, which) -> {
+            ClipboardManager clipboard = (ClipboardManager) getContext()
+                    .getSystemService(Context.CLIPBOARD_SERVICE);
+            ClipData clip = ClipData.newPlainText(context.getString(R.string.download_error_details), messageFull);
+            clipboard.setPrimaryClip(clip);
+            EventBus.getDefault().post(new MessageEvent(context.getString(R.string.copied_to_clipboard)));
+        });
+    }
+
+    @Override
+    public AlertDialog show() {
+        AlertDialog dialog = super.show();
+        ((TextView) dialog.findViewById(android.R.id.message)).setTextIsSelectable(true);
+        return dialog;
+    }
+}
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/DownloadLogFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/DownloadLogFragment.java
@@ -1,23 +1,15 @@
 package de.danoeh.antennapod.fragment;
 
-import android.app.Dialog;
-import android.content.ClipData;
-import android.content.ClipboardManager;
-import android.content.Context;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.ListView;
-import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.ListFragment;
-import com.google.android.material.snackbar.Snackbar;
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.activity.MainActivity;
 import de.danoeh.antennapod.adapter.DownloadLogAdapter;
 import de.danoeh.antennapod.core.event.DownloadEvent;
 import de.danoeh.antennapod.core.event.DownloadLogEvent;
@@ -30,7 +22,7 @@
 import de.danoeh.antennapod.core.storage.DBReader;
 import de.danoeh.antennapod.core.storage.DBWriter;
 import de.danoeh.antennapod.core.util.download.AutoUpdateManager;
-import de.danoeh.antennapod.model.feed.Feed;
+import de.danoeh.antennapod.dialog.DownloadLogDetailsDialog;
 import de.danoeh.antennapod.model.feed.FeedItem;
 import de.danoeh.antennapod.model.feed.FeedMedia;
 import de.danoeh.antennapod.view.EmptyViewHandler;
@@ -116,40 +108,7 @@ public void onListItemClick(@NonNull ListView l, @NonNull View v, int position,
                 DBWriter.setFeedItem(feedItem);
             }
         } else if (item instanceof DownloadStatus) {
-            DownloadStatus status = (DownloadStatus) item;
-            String url = "unknown";
-            String message = getString(R.string.download_successful);
-            if (status.getFeedfileType() == FeedMedia.FEEDFILETYPE_FEEDMEDIA) {
-                FeedMedia media = DBReader.getFeedMedia(status.getFeedfileId());
-                if (media != null) {
-                    url = media.getDownload_url();
-                }
-            } else if (status.getFeedfileType() == Feed.FEEDFILETYPE_FEED) {
-                Feed feed = DBReader.getFeed(status.getFeedfileId());
-                if (feed != null) {
-                    url = feed.getDownload_url();
-                }
-            }
-
-            if (!status.isSuccessful()) {
-                message = status.getReasonDetailed();
-            }
-
-            String messageFull = getString(R.string.download_error_details_message, message, url);
-            AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
-            builder.setTitle(R.string.download_error_details);
-            builder.setMessage(messageFull);
-            builder.setPositiveButton(android.R.string.ok, null);
-            builder.setNeutralButton(R.string.copy_to_clipboard, (dialog, which) -> {
-                ClipboardManager clipboard = (ClipboardManager) getContext()
-                        .getSystemService(Context.CLIPBOARD_SERVICE);
-                ClipData clip = ClipData.newPlainText(getString(R.string.download_error_details), messageFull);
-                clipboard.setPrimaryClip(clip);
-                ((MainActivity) getActivity()).showSnackbarAbovePlayer(
-                        R.string.copied_to_clipboard, Snackbar.LENGTH_SHORT);
-            });
-            Dialog dialog = builder.show();
-            ((TextView) dialog.findViewById(android.R.id.message)).setTextIsSelectable(true);
+            new DownloadLogDetailsDialog(getContext(), (DownloadStatus) item).show();
         }
     }
 

diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java
@@ -9,6 +9,7 @@
 import android.os.Looper;
 import android.util.Log;
 import android.view.ContextMenu;
+import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
@@ -19,14 +20,13 @@
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.Toast;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.content.res.AppCompatResources;
 import androidx.appcompat.widget.Toolbar;
+import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
-
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
 import com.google.android.material.appbar.AppBarLayout;
@@ -35,43 +35,36 @@
 import com.joanzapata.iconify.Iconify;
 import com.joanzapata.iconify.widget.IconTextView;
 import com.leinardi.android.speeddial.SpeedDialView;
-
-import de.danoeh.antennapod.core.menuhandler.MenuItemUtils;
-import org.apache.commons.lang3.Validate;
-import org.greenrobot.eventbus.EventBus;
-import org.greenrobot.eventbus.Subscribe;
-import org.greenrobot.eventbus.ThreadMode;
-
-import java.util.List;
-import java.util.Set;
-
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.activity.MainActivity;
 import de.danoeh.antennapod.adapter.EpisodeItemListAdapter;
 import de.danoeh.antennapod.core.event.DownloadEvent;
 import de.danoeh.antennapod.core.event.DownloaderUpdate;
-import de.danoeh.antennapod.event.FavoritesEvent;
-import de.danoeh.antennapod.event.FeedItemEvent;
-import de.danoeh.antennapod.event.FeedListUpdateEvent;
-import de.danoeh.antennapod.event.playback.PlaybackPositionEvent;
-import de.danoeh.antennapod.event.PlayerStatusEvent;
-import de.danoeh.antennapod.event.QueueEvent;
-import de.danoeh.antennapod.event.UnreadItemsUpdateEvent;
 import de.danoeh.antennapod.core.feed.FeedEvent;
 import de.danoeh.antennapod.core.glide.ApGlideSettings;
 import de.danoeh.antennapod.core.glide.FastBlurTransformation;
+import de.danoeh.antennapod.core.menuhandler.MenuItemUtils;
 import de.danoeh.antennapod.core.service.download.DownloadService;
+import de.danoeh.antennapod.core.service.download.DownloadStatus;
 import de.danoeh.antennapod.core.storage.DBReader;
 import de.danoeh.antennapod.core.storage.DBTasks;
 import de.danoeh.antennapod.core.storage.DBWriter;
 import de.danoeh.antennapod.core.util.FeedItemPermutors;
 import de.danoeh.antennapod.core.util.FeedItemUtil;
 import de.danoeh.antennapod.core.util.gui.MoreContentListFooterUtil;
+import de.danoeh.antennapod.dialog.DownloadLogDetailsDialog;
 import de.danoeh.antennapod.dialog.FilterDialog;
 import de.danoeh.antennapod.dialog.RemoveFeedDialog;
 import de.danoeh.antennapod.dialog.RenameItemDialog;
-import de.danoeh.antennapod.fragment.swipeactions.SwipeActions;
+import de.danoeh.antennapod.event.FavoritesEvent;
+import de.danoeh.antennapod.event.FeedItemEvent;
+import de.danoeh.antennapod.event.FeedListUpdateEvent;
+import de.danoeh.antennapod.event.PlayerStatusEvent;
+import de.danoeh.antennapod.event.QueueEvent;
+import de.danoeh.antennapod.event.UnreadItemsUpdateEvent;
+import de.danoeh.antennapod.event.playback.PlaybackPositionEvent;
 import de.danoeh.antennapod.fragment.actions.EpisodeMultiSelectActionHandler;
+import de.danoeh.antennapod.fragment.swipeactions.SwipeActions;
 import de.danoeh.antennapod.menuhandler.FeedItemMenuHandler;
 import de.danoeh.antennapod.menuhandler.FeedMenuHandler;
 import de.danoeh.antennapod.model.feed.Feed;
@@ -80,12 +73,18 @@
 import de.danoeh.antennapod.view.EpisodeItemListRecyclerView;
 import de.danoeh.antennapod.view.ToolbarIconTintManager;
 import de.danoeh.antennapod.view.viewholder.EpisodeItemViewHolder;
+import io.reactivex.Maybe;
 import io.reactivex.Observable;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.Disposable;
 import io.reactivex.schedulers.Schedulers;
-import android.view.KeyEvent;
-import androidx.fragment.app.Fragment;
+import org.apache.commons.lang3.Validate;
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+
+import java.util.List;
+import java.util.Set;
 
 /**
  * Displays a list of FeedItems.
@@ -547,17 +546,34 @@ private void setupHeaderView() {
                 ((MainActivity) getActivity()).loadChildFragment(fragment, TransitionEffect.SLIDE);
             }
         });
-        txtvFailure.setOnClickListener(v -> {
-            Intent intent = new Intent(getContext(), MainActivity.class);
-            intent.putExtra(MainActivity.EXTRA_FRAGMENT_TAG, DownloadsFragment.TAG);
-            Bundle args = new Bundle();
-            args.putInt(DownloadsFragment.ARG_SELECTED_TAB, DownloadsFragment.POS_LOG);
-            intent.putExtra(MainActivity.EXTRA_FRAGMENT_ARGS, args);
-            startActivity(intent);
-        });
+        txtvFailure.setOnClickListener(v -> showErrorDetails());
         headerCreated = true;
     }
 
+    private void showErrorDetails() {
+        Maybe.fromCallable(
+                () -> {
+                    List<DownloadStatus> feedDownloadLog = DBReader.getFeedDownloadLog(feedID);
+                    if (feedDownloadLog.size() == 0 || feedDownloadLog.get(0).isSuccessful()) {
+                        return null;
+                    }
+                    return feedDownloadLog.get(0);
+                })
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(
+                    downloadStatus -> new DownloadLogDetailsDialog(getContext(), downloadStatus).show(),
+                    error -> error.printStackTrace(),
+                    () -> {
+                        Intent intent = new Intent(getContext(), MainActivity.class);
+                        intent.putExtra(MainActivity.EXTRA_FRAGMENT_TAG, DownloadsFragment.TAG);
+                        Bundle args = new Bundle();
+                        args.putInt(DownloadsFragment.ARG_SELECTED_TAB, DownloadsFragment.POS_LOG);
+                        intent.putExtra(MainActivity.EXTRA_FRAGMENT_ARGS, args);
+                        startActivity(intent);
+                    });
+    }
+
     private void showFeedInfo() {
         if (feed != null) {
             FeedInfoFragment fragment = FeedInfoFragment.newInstance(feed);