Merge branch 'develop' into NotificationForAutoDownloads

2 files changed, 3 insertions, 7 deletions

diff --git a/app/src/androidTest/java/de/test/antennapod/service/download/DownloadServiceTest.java b/app/src/androidTest/java/de/test/antennapod/service/download/DownloadServiceTest.java
index 0af972352..b75044d73 100644
--- a/app/src/androidTest/java/de/test/antennapod/service/download/DownloadServiceTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/service/download/DownloadServiceTest.java
@@ -4,6 +4,7 @@ import android.content.Context;
 import android.content.Intent;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.util.Consumer;
 import androidx.test.InstrumentationRegistry;
 import androidx.test.runner.AndroidJUnit4;
 
@@ -35,7 +36,6 @@ import de.danoeh.antennapod.core.service.download.StubDownloader;
 import de.danoeh.antennapod.core.storage.DBReader;
 import de.danoeh.antennapod.core.storage.DBWriter;
 import de.danoeh.antennapod.core.storage.DownloadRequester;
-import de.danoeh.antennapod.core.util.Consumer;
 
 import static de.test.antennapod.util.event.DownloadEventListener.withDownloadEventListener;
 import static de.test.antennapod.util.event.FeedItemEventListener.withFeedItemEventListener;
@@ -45,13 +45,10 @@ import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 /**
- * @see HttpDownloaderTest for the test of actual download (and saving the file)
+ * @see HttpDownloaderTest for the test of actual download (and saving the file).
  */
 @RunWith(AndroidJUnit4.class)
 public class DownloadServiceTest {
-
-    private CountDownLatch latch = null;
-    private Feed testFeed = null;
     private FeedMedia testMedia11 = null;
 
     private DownloaderFactory origFactory = null;
@@ -61,7 +58,7 @@ public class DownloadServiceTest {
         EspressoTestUtils.clearDatabase();
         EspressoTestUtils.clearPreferences();
         origFactory = DownloadService.getDownloaderFactory();
-        testFeed = setUpTestFeeds();
+        Feed testFeed = setUpTestFeeds();
         testMedia11 = testFeed.getItemAtIndex(0).getMedia();
     }
 
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 d4af79645..a00a9965f 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
@@ -124,7 +124,6 @@ public class PlaybackServiceMediaPlayerTest {
     }
 
     private Playable writeTestPlayable(String downloadUrl, String fileUrl) {
-        final Context c = getInstrumentation().getTargetContext();
         Feed f = new Feed(0, null, "f", "l", "d", null, null, null, null, "i", null, null, "l", false);
         FeedPreferences prefs = new FeedPreferences(f.getId(), false, FeedPreferences.AutoDeleteAction.NO, VolumeAdaptionSetting.OFF, null, null);
         f.setPreferences(prefs);