Merge pull request #3654 from ByteHamster/emulator-test

Run integration tests on CI

2 files changed, 7 insertions, 15 deletions

diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java b/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java
index 73133620d..7c05293c6 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java
@@ -215,7 +215,7 @@ public class DownloadService extends Service {
 
         downloadCompletionThread.interrupt();
         try {
-            downloadCompletionThread.join();
+            downloadCompletionThread.join(1000);
         } catch (InterruptedException e) {
             e.printStackTrace();
         }
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java
index b43e62519..d53f7d669 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java
@@ -985,23 +985,15 @@ public class PlaybackService extends MediaBrowserServiceCompat {
         }
 
         if (item != null) {
-            if (ended || smartMarkAsPlayed ||
-                    (skipped && !UserPreferences.shouldSkipKeepEpisode())) {
+            if (ended || smartMarkAsPlayed
+                    || (skipped && !UserPreferences.shouldSkipKeepEpisode())) {
                 // only mark the item as played if we're not keeping it anyways
                 DBWriter.markItemPlayed(item, FeedItem.PLAYED, ended);
-                try {
-                    final List<FeedItem> queue = taskManager.getQueue();
-                    if (QueueAccess.ItemListAccess(queue).contains(item.getId())) {
-                        // don't know if it actually matters to not autodownload when smart mark as played is triggered
-                        DBWriter.removeQueueItem(PlaybackService.this, ended, item);
-                    }
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                    // isInQueue remains false
-                }
+                // don't know if it actually matters to not autodownload when smart mark as played is triggered
+                DBWriter.removeQueueItem(PlaybackService.this, ended, item);
                 // Delete episode if enabled
-                if (item.getFeed().getPreferences().getCurrentAutoDelete() &&
-                        (!item.isTagged(FeedItem.TAG_FAVORITE) || !UserPreferences.shouldFavoriteKeepEpisode())) {
+                if (item.getFeed().getPreferences().getCurrentAutoDelete()
+                        && (!item.isTagged(FeedItem.TAG_FAVORITE) || !UserPreferences.shouldFavoriteKeepEpisode())) {
                     DBWriter.deleteFeedMediaOfItem(PlaybackService.this, media.getId());
                     Log.d(TAG, "Episode Deleted");
                 }