Merge pull request #5485 from ByteHamster/media-player-errors

Show actual error messages instead of just the error codes

3 files changed, 0 insertions, 42 deletions

diff --git a/app/src/androidTest/java/de/test/antennapod/service/playback/CancelablePSMPCallback.java b/app/src/androidTest/java/de/test/antennapod/service/playback/CancelablePSMPCallback.java
index ae38fd5e7..30a84ecb9 100644
--- a/app/src/androidTest/java/de/test/antennapod/service/playback/CancelablePSMPCallback.java
+++ b/app/src/androidTest/java/de/test/antennapod/service/playback/CancelablePSMPCallback.java
@@ -67,14 +67,6 @@ public class CancelablePSMPCallback implements PlaybackServiceMediaPlayer.PSMPCa
     }
 
     @Override
-    public boolean onMediaPlayerError(Object inObj, int what, int extra) {
-        if (isCancelled) {
-            return true;
-        }
-        return originalCallback.onMediaPlayerError(inObj, what, extra);
-    }
-
-    @Override
     public void onPostPlayback(@NonNull Playable media, boolean ended, boolean skipped, boolean playingNext) {
         if (isCancelled) {
             return;
diff --git a/app/src/androidTest/java/de/test/antennapod/service/playback/DefaultPSMPCallback.java b/app/src/androidTest/java/de/test/antennapod/service/playback/DefaultPSMPCallback.java
index 29a854f20..167b1b55c 100644
--- a/app/src/androidTest/java/de/test/antennapod/service/playback/DefaultPSMPCallback.java
+++ b/app/src/androidTest/java/de/test/antennapod/service/playback/DefaultPSMPCallback.java
@@ -38,11 +38,6 @@ public class DefaultPSMPCallback implements PlaybackServiceMediaPlayer.PSMPCallb
         }
 
         @Override
-        public boolean onMediaPlayerError(Object inObj, int what, int extra) {
-            return false;
-        }
-
-        @Override
         public void onPostPlayback(@NonNull Playable media, boolean ended, boolean skipped, boolean playingNext) {
 
         }
diff --git a/app/src/androidTest/java/de/test/antennapod/service/playback/PlaybackServiceMediaPlayerTest.java b/app/src/androidTest/java/de/test/antennapod/service/playback/PlaybackServiceMediaPlayerTest.java
index dfb0e3e36..87a5fa65c 100644
--- a/app/src/androidTest/java/de/test/antennapod/service/playback/PlaybackServiceMediaPlayerTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/service/playback/PlaybackServiceMediaPlayerTest.java
@@ -514,13 +514,6 @@ public class PlaybackServiceMediaPlayerTest {
                 if (assertionError == null)
                     assertionError = new AssertionFailedError("Unexpected call to shouldStop");
             }
-
-            @Override
-            public boolean onMediaPlayerError(Object inObj, int what, int extra) {
-                if (assertionError == null)
-                    assertionError = new AssertionFailedError("Unexpected call to onMediaPlayerError");
-                return false;
-            }
         });
         PlaybackServiceMediaPlayer psmp = new LocalPSMP(c, callback);
         Playable p = writeTestPlayable(playableFileUrl, PLAYABLE_LOCAL_URL);
@@ -604,14 +597,6 @@ public class PlaybackServiceMediaPlayerTest {
                 }
 
             }
-
-            @Override
-            public boolean onMediaPlayerError(Object inObj, int what, int extra) {
-                if (assertionError == null) {
-                    assertionError = new AssertionFailedError("Unexpected call of onMediaPlayerError");
-                }
-                return false;
-            }
         });
         PlaybackServiceMediaPlayer psmp = new LocalPSMP(c, callback);
         if (initialState == PlayerStatus.PREPARED || initialState == PlayerStatus.PLAYING || initialState == PlayerStatus.PAUSED) {
@@ -664,13 +649,6 @@ public class PlaybackServiceMediaPlayerTest {
                     }
                 }
             }
-
-            @Override
-            public boolean onMediaPlayerError(Object inObj, int what, int extra) {
-                if (assertionError == null)
-                    assertionError = new AssertionFailedError("Unexpected call to onMediaPlayerError");
-                return false;
-            }
         });
         PlaybackServiceMediaPlayer psmp = new LocalPSMP(c, callback);
         Playable p = writeTestPlayable(playableFileUrl, PLAYABLE_LOCAL_URL);
@@ -738,13 +716,6 @@ public class PlaybackServiceMediaPlayerTest {
                     }
                 }
             }
-
-            @Override
-            public boolean onMediaPlayerError(Object inObj, int what, int extra) {
-                if (assertionError == null)
-                    assertionError = new AssertionFailedError("Unexpected call to onMediaPlayerError");
-                return false;
-            }
         });
         PlaybackServiceMediaPlayer psmp = new LocalPSMP(c, callback);
         Playable p = writeTestPlayable(playableFileUrl, PLAYABLE_LOCAL_URL);