From 0eeb47ee1e2ad4d2f91c1851480af80fcc364181 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Sun, 24 Oct 2021 12:33:45 +0200
Subject: Show actual error messages instead of just the error codes

---
 .../antennapod/activity/VideoplayerActivity.java   | 20 ++++++------
 .../antennapod/fragment/AudioPlayerFragment.java   | 36 +++++++++++-----------
 2 files changed, 28 insertions(+), 28 deletions(-)

(limited to 'app/src/main')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
index d436acf0d..c35709f05 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
@@ -37,6 +37,7 @@ import androidx.interpolator.view.animation.FastOutSlowInInterpolator;
 import com.bumptech.glide.Glide;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.core.event.PlaybackPositionEvent;
+import de.danoeh.antennapod.core.event.PlayerErrorEvent;
 import de.danoeh.antennapod.core.event.ServiceEvent;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.core.service.playback.PlaybackService;
@@ -50,7 +51,6 @@ import de.danoeh.antennapod.core.util.ShareUtils;
 import de.danoeh.antennapod.core.util.StorageUtils;
 import de.danoeh.antennapod.core.util.TimeSpeedConverter;
 import de.danoeh.antennapod.core.util.gui.PictureInPictureUtil;
-import de.danoeh.antennapod.core.util.playback.MediaPlayerError;
 import de.danoeh.antennapod.core.util.playback.PlaybackController;
 import de.danoeh.antennapod.databinding.VideoplayerActivityBinding;
 import de.danoeh.antennapod.dialog.PlaybackControlsDialog;
@@ -207,15 +207,6 @@ public class VideoplayerActivity extends CastEnabledActivity implements SeekBar.
                 viewBinding.sbPosition.setSecondaryProgress((int) (progress * viewBinding.sbPosition.getMax()));
             }
 
-            @Override
-            public void handleError(int code) {
-                final AlertDialog.Builder errorDialog = new AlertDialog.Builder(VideoplayerActivity.this);
-                errorDialog.setTitle(R.string.error_label);
-                errorDialog.setMessage(MediaPlayerError.getErrorString(VideoplayerActivity.this, code));
-                errorDialog.setNeutralButton(android.R.string.ok, (dialog, which) -> finish());
-                errorDialog.show();
-            }
-
             @Override
             public void onReloadNotification(int code) {
                 VideoplayerActivity.this.onReloadNotification(code);
@@ -550,6 +541,15 @@ public class VideoplayerActivity extends CastEnabledActivity implements SeekBar.
         }
     }
 
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onMediaPlayerError(PlayerErrorEvent event) {
+        final AlertDialog.Builder errorDialog = new AlertDialog.Builder(VideoplayerActivity.this);
+        errorDialog.setTitle(R.string.error_label);
+        errorDialog.setMessage(event.getMessage());
+        errorDialog.setNeutralButton(android.R.string.ok, (dialog, which) -> finish());
+        errorDialog.show();
+    }
+
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         super.onCreateOptionsMenu(menu);
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/AudioPlayerFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/AudioPlayerFragment.java
index 168133c7a..eef2c0fff 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/AudioPlayerFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/AudioPlayerFragment.java
@@ -25,6 +25,7 @@ import androidx.viewpager2.widget.ViewPager2;
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
 import com.google.android.material.snackbar.Snackbar;
 
+import de.danoeh.antennapod.core.event.PlayerErrorEvent;
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
@@ -50,7 +51,6 @@ import de.danoeh.antennapod.core.util.ChapterUtils;
 import de.danoeh.antennapod.core.util.Converter;
 import de.danoeh.antennapod.core.util.IntentUtils;
 import de.danoeh.antennapod.core.util.TimeSpeedConverter;
-import de.danoeh.antennapod.core.util.playback.MediaPlayerError;
 import de.danoeh.antennapod.model.playback.Playable;
 import de.danoeh.antennapod.core.util.playback.PlaybackController;
 import de.danoeh.antennapod.dialog.PlaybackControlsDialog;
@@ -300,23 +300,6 @@ public class AudioPlayerFragment extends Fragment implements
                 }
             }
 
-            @Override
-            public void handleError(int code) {
-                final AlertDialog.Builder errorDialog = new AlertDialog.Builder(getContext());
-                errorDialog.setTitle(R.string.error_label);
-                errorDialog.setMessage(MediaPlayerError.getErrorString(getContext(), code));
-                errorDialog.setPositiveButton(android.R.string.ok, (dialog, which) ->
-                        ((MainActivity) getActivity()).getBottomSheet().setState(BottomSheetBehavior.STATE_COLLAPSED));
-                if (!UserPreferences.useExoplayer()) {
-                    errorDialog.setNeutralButton(R.string.media_player_switch_to_exoplayer, (dialog, which) -> {
-                        UserPreferences.enableExoplayer();
-                        ((MainActivity) getActivity()).showSnackbarAbovePlayer(
-                                R.string.media_player_switched_to_exoplayer, Snackbar.LENGTH_LONG);
-                    });
-                }
-                errorDialog.create().show();
-            }
-
             @Override
             public void onSleepTimerUpdate() {
                 AudioPlayerFragment.this.loadMediaInfo(false);
@@ -419,6 +402,23 @@ public class AudioPlayerFragment extends Fragment implements
         AudioPlayerFragment.this.loadMediaInfo(false);
     }
 
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void mediaPlayerError(PlayerErrorEvent event) {
+        final AlertDialog.Builder errorDialog = new AlertDialog.Builder(getContext());
+        errorDialog.setTitle(R.string.error_label);
+        errorDialog.setMessage(event.getMessage());
+        errorDialog.setPositiveButton(android.R.string.ok, (dialog, which) ->
+                ((MainActivity) getActivity()).getBottomSheet().setState(BottomSheetBehavior.STATE_COLLAPSED));
+        if (!UserPreferences.useExoplayer()) {
+            errorDialog.setNeutralButton(R.string.media_player_switch_to_exoplayer, (dialog, which) -> {
+                UserPreferences.enableExoplayer();
+                ((MainActivity) getActivity()).showSnackbarAbovePlayer(
+                        R.string.media_player_switched_to_exoplayer, Snackbar.LENGTH_LONG);
+            });
+        }
+        errorDialog.create().show();
+    }
+
     @Override
     public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
         if (controller == null || txtvLength == null) {
-- 
cgit v1.2.3