From 22c98d9606a3adc1feade37ebef00754b6c725d4 Mon Sep 17 00:00:00 2001 From: Andrew Rabert Date: Fri, 13 Dec 2019 00:25:51 -0500 Subject: [PATCH] Stop looping over unplayable songs --- .../nullsum/audinaut/service/DownloadService.java | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/net/nullsum/audinaut/service/DownloadService.java b/app/src/main/java/net/nullsum/audinaut/service/DownloadService.java index f98004b..c68edce 100644 --- a/app/src/main/java/net/nullsum/audinaut/service/DownloadService.java +++ b/app/src/main/java/net/nullsum/audinaut/service/DownloadService.java @@ -1370,15 +1370,10 @@ public class DownloadService extends Service { final int duration = downloadFile.getSong().getDuration() == null ? 0 : downloadFile.getSong().getDuration() * 1000; mediaPlayer.setOnErrorListener((mediaPlayer, what, extra) -> { Log.w(TAG, "Error on playing file " + "(" + what + ", " + extra + "): " + downloadFile); - int pos = getPlayerPosition(); - reset(); - if (!isPartial || (downloadFile.isWorkDone() && (Math.abs(duration - pos) < 10000))) { - playNext(); - } else { - downloadFile.setPlaying(false); - doPlay(downloadFile, pos, isPlaying); - downloadFile.setPlaying(true); - } + int index = getNextPlayingIndex(); + remove(downloadFile); + downloadFile.delete(); + play(index - 1); return true; });