Merge branch 'develop'

27 files changed, 228 insertions, 356 deletions

diff --git a/app/src/androidTest/java/de/test/antennapod/feed/FeedItemTest.java b/app/src/androidTest/java/de/test/antennapod/feed/FeedItemTest.java
new file mode 100644
index 000000000..db463132d
--- /dev/null
+++ b/app/src/androidTest/java/de/test/antennapod/feed/FeedItemTest.java
@@ -0,0 +1,37 @@
+package de.test.antennapod.feed;
+
+import android.test.AndroidTestCase;
+import de.danoeh.antennapod.core.feed.FeedItem;
+
+public class FeedItemTest extends AndroidTestCase {
+    private static final String TEXT_LONG = "Lorem ipsum dolor sit amet, consectetur adipiscing elit.";
+    private static final String TEXT_SHORT = "Lorem ipsum";
+
+    /**
+     * If one of `description` or `content:encoded` is null, use the other one.
+     */
+    public void testShownotesNullValues() throws Exception {
+        testShownotes(null, TEXT_LONG);
+        testShownotes(TEXT_LONG, null);
+    }
+
+    /**
+     * If `description` is reasonably longer than `content:encoded`, use `description`.
+     */
+    public void testShownotesLength() throws Exception {
+        testShownotes(TEXT_SHORT, TEXT_LONG);
+        testShownotes(TEXT_LONG, TEXT_SHORT);
+    }
+
+    /**
+     * Checks if the shownotes equal TEXT_LONG, using the given `description` and `content:encoded`
+     * @param description Description of the feed item
+     * @param contentEncoded `content:encoded` of the feed item
+     */
+    private void testShownotes(String description, String contentEncoded) throws Exception {
+        FeedItem item = new FeedItem();
+        item.setDescription(description);
+        item.setContentEncoded(contentEncoded);
+        assertEquals(TEXT_LONG, item.loadShownotes().call());
+    }
+}
diff --git a/app/src/androidTest/java/de/test/antennapod/gpodnet/GPodnetServiceTest.java b/app/src/androidTest/java/de/test/antennapod/gpodnet/GPodnetServiceTest.java
index 88e05942b..a880c330b 100644
--- a/app/src/androidTest/java/de/test/antennapod/gpodnet/GPodnetServiceTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/gpodnet/GPodnetServiceTest.java
@@ -2,14 +2,16 @@ package de.test.antennapod.gpodnet;
 
 import android.test.AndroidTestCase;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
 import de.danoeh.antennapod.core.gpoddernet.GpodnetService;
 import de.danoeh.antennapod.core.gpoddernet.GpodnetServiceException;
 import de.danoeh.antennapod.core.gpoddernet.model.GpodnetDevice;
 import de.danoeh.antennapod.core.gpoddernet.model.GpodnetTag;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import static java.util.Collections.singletonList;
 
 /**
  * Test class for GpodnetService
@@ -55,7 +57,7 @@ public class GPodnetServiceTest extends AndroidTestCase {
         authenticate();
         String[] URLS = {"http://bitsundso.de/feed", "http://gamesundso.de/feed", "http://cre.fm/feed/mp3/", "http://freakshow.fm/feed/m4a/"};
         List<String> subscriptions = Arrays.asList(URLS[0], URLS[1]);
-        List<String> removed = Arrays.asList(URLS[0]);
+        List<String> removed = singletonList(URLS[0]);
         List<String> added = Arrays.asList(URLS[2], URLS[3]);
         service.uploadSubscriptions(USER, "radio", subscriptions);
         service.uploadChanges(USER, "radio", added, removed);
diff --git a/app/src/androidTest/java/de/test/antennapod/handler/FeedHandlerTest.java b/app/src/androidTest/java/de/test/antennapod/handler/FeedHandlerTest.java
index ee454ce8a..6908e2ec7 100644
--- a/app/src/androidTest/java/de/test/antennapod/handler/FeedHandlerTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/handler/FeedHandlerTest.java
@@ -17,7 +17,6 @@ import javax.xml.parsers.ParserConfigurationException;
 
 import de.danoeh.antennapod.core.feed.Chapter;
 import de.danoeh.antennapod.core.feed.Feed;
-import de.danoeh.antennapod.core.feed.FeedImage;
 import de.danoeh.antennapod.core.feed.FeedItem;
 import de.danoeh.antennapod.core.feed.FeedMedia;
 import de.danoeh.antennapod.core.syndication.handler.FeedHandler;
@@ -32,8 +31,8 @@ import de.test.antennapod.util.syndication.feedgenerator.RSS2Generator;
 public class FeedHandlerTest extends InstrumentationTestCase {
     private static final String FEEDS_DIR = "testfeeds";
 
-    File file = null;
-    OutputStream outputStream = null;
+    private File file = null;
+    private OutputStream outputStream = null;
 
     protected void setUp() throws Exception {
         super.setUp();
@@ -82,15 +81,7 @@ public class FeedHandlerTest extends InstrumentationTestCase {
         assertEquals(feed.getLink(), parsedFeed.getLink());
         assertEquals(feed.getDescription(), parsedFeed.getDescription());
         assertEquals(feed.getPaymentLink(), parsedFeed.getPaymentLink());
-
-        if (feed.getImage() != null) {
-            FeedImage image = feed.getImage();
-            FeedImage parsedImage = parsedFeed.getImage();
-            assertNotNull(parsedImage);
-
-            assertEquals(image.getTitle(), parsedImage.getTitle());
-            assertEquals(image.getDownload_url(), parsedImage.getDownload_url());
-        }
+        assertEquals(feed.getImageUrl(), parsedFeed.getImageUrl());
 
         if (feed.getItems() != null) {
             assertNotNull(parsedFeed.getItems());
@@ -119,14 +110,7 @@ public class FeedHandlerTest extends InstrumentationTestCase {
                     assertEquals(media.getMime_type(), parsedMedia.getMime_type());
                 }
 
-                if (item.hasItemImage()) {
-                    assertTrue(parsedItem.hasItemImage());
-                    FeedImage image = item.getImage();
-                    FeedImage parsedImage = parsedItem.getImage();
-
-                    assertEquals(image.getTitle(), parsedImage.getTitle());
-                    assertEquals(image.getDownload_url(), parsedImage.getDownload_url());
-                }
+                assertEquals(item.getImageUrl(), parsedFeed.getImageUrl());
 
                 if (item.getChapters() != null) {
                     assertNotNull(parsedItem.getChapters());
@@ -158,14 +142,10 @@ public class FeedHandlerTest extends InstrumentationTestCase {
     }
 
     private Feed createTestFeed(int numItems, boolean withImage, boolean withFeedMedia, boolean withChapters) {
-        FeedImage image = null;
-        if (withImage) {
-            image = new FeedImage(0, "image", null, "http://example.com/picture", false);
-        }
         Feed feed = new Feed(0, null, "title", "http://example.com", "This is the description",
-                "http://example.com/payment", "Daniel", "en", null, "http://example.com/feed", image, file.getAbsolutePath(),
+                "http://example.com/payment", "Daniel", "en", null, "http://example.com/feed", "http://example.com/picture", file.getAbsolutePath(),
                 "http://example.com/feed", true);
-        feed.setItems(new ArrayList<FeedItem>());
+        feed.setItems(new ArrayList<>());
 
         for (int i = 0; i < numItems; i++) {
             FeedItem item = new FeedItem(0, "item-" + i, "http://example.com/item-" + i,
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 9ac92c2f9..2f53ea8a6 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
@@ -23,8 +23,8 @@ import de.danoeh.antennapod.core.feed.FeedItem;
 import de.danoeh.antennapod.core.feed.FeedMedia;
 import de.danoeh.antennapod.core.feed.FeedPreferences;
 import de.danoeh.antennapod.core.feed.MediaType;
-import de.danoeh.antennapod.core.service.playback.PlaybackServiceMediaPlayer;
 import de.danoeh.antennapod.core.service.playback.LocalPSMP;
+import de.danoeh.antennapod.core.service.playback.PlaybackServiceMediaPlayer;
 import de.danoeh.antennapod.core.service.playback.PlayerStatus;
 import de.danoeh.antennapod.core.storage.PodDBAdapter;
 import de.danoeh.antennapod.core.util.playback.Playable;
diff --git a/app/src/androidTest/java/de/test/antennapod/service/playback/PlaybackServiceTaskManagerTest.java b/app/src/androidTest/java/de/test/antennapod/service/playback/PlaybackServiceTaskManagerTest.java
index 6ab6e5c61..8be57a074 100644
--- a/app/src/androidTest/java/de/test/antennapod/service/playback/PlaybackServiceTaskManagerTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/service/playback/PlaybackServiceTaskManagerTest.java
@@ -9,10 +9,10 @@ import java.util.List;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
+import de.danoeh.antennapod.core.event.QueueEvent;
 import de.danoeh.antennapod.core.feed.EventDistributor;
 import de.danoeh.antennapod.core.feed.Feed;
 import de.danoeh.antennapod.core.feed.FeedItem;
-import de.danoeh.antennapod.core.event.QueueEvent;
 import de.danoeh.antennapod.core.service.playback.PlaybackServiceTaskManager;
 import de.danoeh.antennapod.core.storage.PodDBAdapter;
 import de.danoeh.antennapod.core.util.playback.Playable;
diff --git a/app/src/androidTest/java/de/test/antennapod/storage/DBCleanupTests.java b/app/src/androidTest/java/de/test/antennapod/storage/DBCleanupTests.java
index 09533208f..5cd4e9906 100644
--- a/app/src/androidTest/java/de/test/antennapod/storage/DBCleanupTests.java
+++ b/app/src/androidTest/java/de/test/antennapod/storage/DBCleanupTests.java
@@ -27,12 +27,12 @@ import static de.test.antennapod.storage.DBTestUtils.saveFeedlist;
 public class DBCleanupTests extends InstrumentationTestCase {
 
     private static final String TAG = "DBTasksTest";
-    protected static final int EPISODE_CACHE_SIZE = 5;
+    static final int EPISODE_CACHE_SIZE = 5;
     private final int cleanupAlgorithm;
 
-    protected Context context;
+    Context context;
 
-    protected File destFolder;
+    private File destFolder;
 
     public DBCleanupTests() {
         this.cleanupAlgorithm = UserPreferences.EPISODE_CLEANUP_DEFAULT;
@@ -104,9 +104,9 @@ public class DBCleanupTests extends InstrumentationTestCase {
         }
     }
 
-    protected void populateItems(final int numItems, Feed feed, List<FeedItem> items,
-                                 List<File> files, int itemState, boolean addToQueue,
-                                 boolean addToFavorites) throws IOException {
+    void populateItems(final int numItems, Feed feed, List<FeedItem> items,
+                       List<File> files, int itemState, boolean addToQueue,
+                       boolean addToFavorites) throws IOException {
         for (int i = 0; i < numItems; i++) {
             Date itemDate = new Date(numItems - i);
             Date playbackCompletionDate = null;
diff --git a/app/src/androidTest/java/de/test/antennapod/storage/DBQueueCleanupAlgorithmTest.java b/app/src/androidTest/java/de/test/antennapod/storage/DBQueueCleanupAlgorithmTest.java
index 3bd508eaf..d602d150b 100644
--- a/app/src/androidTest/java/de/test/antennapod/storage/DBQueueCleanupAlgorithmTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/storage/DBQueueCleanupAlgorithmTest.java
@@ -5,7 +5,6 @@ import android.test.FlakyTest;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 import de.danoeh.antennapod.core.feed.Feed;
diff --git a/app/src/androidTest/java/de/test/antennapod/storage/DBTasksTest.java b/app/src/androidTest/java/de/test/antennapod/storage/DBTasksTest.java
index 13cf56ff4..93a9408b7 100644
--- a/app/src/androidTest/java/de/test/antennapod/storage/DBTasksTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/storage/DBTasksTest.java
@@ -18,6 +18,8 @@ import de.danoeh.antennapod.core.storage.DBReader;
 import de.danoeh.antennapod.core.storage.DBTasks;
 import de.danoeh.antennapod.core.storage.PodDBAdapter;
 
+import static java.util.Collections.singletonList;
+
 /**
  * Test class for DBTasks
  */
@@ -125,7 +127,7 @@ public class DBTasksTest extends InstrumentationTestCase {
     public void testUpdateFeedMediaUrlResetState() {
         final Feed feed = new Feed("url", null, "title");
         FeedItem item = new FeedItem(0, "item", "id", "link", new Date(), FeedItem.PLAYED, feed);
-        feed.setItems(Arrays.asList(item));
+        feed.setItems(singletonList(item));
 
         PodDBAdapter adapter = PodDBAdapter.getInstance();
         adapter.open();
@@ -138,7 +140,7 @@ public class DBTasksTest extends InstrumentationTestCase {
 
         FeedMedia media = new FeedMedia(item, "url", 1024, "mime/type");
         item.setMedia(media);
-        feed.setItems(Arrays.asList(item));
+        feed.setItems(singletonList(item));
 
         final Feed newFeed = DBTasks.updateFeed(context, feed)[0];
         assertTrue(feed != newFeed);
diff --git a/app/src/androidTest/java/de/test/antennapod/storage/DBTestUtils.java b/app/src/androidTest/java/de/test/antennapod/storage/DBTestUtils.java
index 30f465784..a577e5e36 100644
--- a/app/src/androidTest/java/de/test/antennapod/storage/DBTestUtils.java
+++ b/app/src/androidTest/java/de/test/antennapod/storage/DBTestUtils.java
@@ -19,7 +19,7 @@ import de.danoeh.antennapod.core.util.flattr.FlattrStatus;
 /**
  * Utility methods for DB* tests.
  */
-public class DBTestUtils {
+class DBTestUtils {
 
     private DBTestUtils(){}
     /**
diff --git a/app/src/androidTest/java/de/test/antennapod/storage/DBWriterTest.java b/app/src/androidTest/java/de/test/antennapod/storage/DBWriterTest.java
index 7095d50b1..387ab91b3 100644
--- a/app/src/androidTest/java/de/test/antennapod/storage/DBWriterTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/storage/DBWriterTest.java
@@ -15,9 +15,7 @@ import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
-import de.danoeh.antennapod.core.feed.Chapter;
 import de.danoeh.antennapod.core.feed.Feed;
-import de.danoeh.antennapod.core.feed.FeedImage;
 import de.danoeh.antennapod.core.feed.FeedItem;
 import de.danoeh.antennapod.core.feed.FeedMedia;
 import de.danoeh.antennapod.core.feed.SimpleChapter;
@@ -124,89 +122,13 @@ public class DBWriterTest extends InstrumentationTestCase {
         assertNull(media.getFile_url());
     }
 
-    public void testDeleteFeed() throws IOException, ExecutionException, InterruptedException, TimeoutException {
+    public void testDeleteFeed() throws ExecutionException, InterruptedException, IOException, TimeoutException {
         File destFolder = getInstrumentation().getTargetContext().getExternalFilesDir(TEST_FOLDER);
         assertNotNull(destFolder);
 
         Feed feed = new Feed("url", null, "title");
         feed.setItems(new ArrayList<>());
 
-        // create Feed image
-        File imgFile = new File(destFolder, "image");
-        assertTrue(imgFile.createNewFile());
-        FeedImage image = new FeedImage(0, "image", imgFile.getAbsolutePath(), "url", true);
-        image.setOwner(feed);
-        feed.setImage(image);
-
-        List<File> itemFiles = new ArrayList<>();
-        // create items with downloaded media files
-        for (int i = 0; i < 10; i++) {
-            FeedItem item = new FeedItem(0, "Item " + i, "Item" + i, "url", new Date(), FeedItem.PLAYED, feed, true);
-            feed.getItems().add(item);
-
-            File enc = new File(destFolder, "file " + i);
-            assertTrue(enc.createNewFile());
-            itemFiles.add(enc);
-
-            FeedMedia media = new FeedMedia(0, item, 1, 1, 1, "mime_type", enc.getAbsolutePath(), "download_url", true, null, 0, 0);
-            item.setMedia(media);
-
-            item.setChapters(new ArrayList<Chapter>());
-            item.getChapters().add(new SimpleChapter(0, "item " + i, item, "example.com"));
-        }
-
-        PodDBAdapter adapter = PodDBAdapter.getInstance();
-        adapter.open();
-        adapter.setCompleteFeed(feed);
-        adapter.close();
-
-        assertTrue(feed.getId() != 0);
-        assertTrue(feed.getImage().getId() != 0);
-        for (FeedItem item : feed.getItems()) {
-            assertTrue(item.getId() != 0);
-            assertTrue(item.getMedia().getId() != 0);
-            assertTrue(item.getChapters().get(0).getId() != 0);
-        }
-
-        DBWriter.deleteFeed(getInstrumentation().getTargetContext(), feed.getId()).get(TIMEOUT, TimeUnit.SECONDS);
-
-        // check if files still exist
-        assertFalse(imgFile.exists());
-        for (File f : itemFiles) {
-            assertFalse(f.exists());
-        }
-
-        adapter = PodDBAdapter.getInstance();
-        adapter.open();
-        Cursor c = adapter.getFeedCursor(feed.getId());
-        assertEquals(0, c.getCount());
-        c.close();
-        c = adapter.getImageCursor(String.valueOf(image.getId()));
-        assertEquals(0, c.getCount());
-        c.close();
-        for (FeedItem item : feed.getItems()) {
-            c = adapter.getFeedItemCursor(String.valueOf(item.getId()));
-            assertEquals(0, c.getCount());
-            c.close();
-            c = adapter.getSingleFeedMediaCursor(item.getMedia().getId());
-            assertEquals(0, c.getCount());
-            c.close();
-            c = adapter.getSimpleChaptersOfFeedItemCursor(item);
-            assertEquals(0, c.getCount());
-            c.close();
-        }
-        adapter.close();
-    }
-
-    public void testDeleteFeedNoImage() throws ExecutionException, InterruptedException, IOException, TimeoutException {
-        File destFolder = getInstrumentation().getTargetContext().getExternalFilesDir(TEST_FOLDER);
-        assertNotNull(destFolder);
-
-        Feed feed = new Feed("url", null, "title");
-        feed.setItems(new ArrayList<>());
-
-        feed.setImage(null);
-
         List<File> itemFiles = new ArrayList<>();
         // create items with downloaded media files
         for (int i = 0; i < 10; i++) {
@@ -261,13 +183,7 @@ public class DBWriterTest extends InstrumentationTestCase {
 
         Feed feed = new Feed("url", null, "title");
         feed.setItems(null);
-
-        // create Feed image
-        File imgFile = new File(destFolder, "image");
-        assertTrue(imgFile.createNewFile());
-        FeedImage image = new FeedImage(0, "image", imgFile.getAbsolutePath(), "url", true);
-        image.setOwner(feed);
-        feed.setImage(image);
+        feed.setImageUrl("url");
 
         PodDBAdapter adapter = PodDBAdapter.getInstance();
         adapter.open();
@@ -275,21 +191,14 @@ public class DBWriterTest extends InstrumentationTestCase {
         adapter.close();
 
         assertTrue(feed.getId() != 0);
-        assertTrue(feed.getImage().getId() != 0);
 
         DBWriter.deleteFeed(getInstrumentation().getTargetContext(), feed.getId()).get(TIMEOUT, TimeUnit.SECONDS);
 
-        // check if files still exist
-        assertFalse(imgFile.exists());
-
         adapter = PodDBAdapter.getInstance();
         adapter.open();
         Cursor c = adapter.getFeedCursor(feed.getId());
         assertTrue(c.getCount() == 0);
         c.close();
-        c = adapter.getImageCursor(String.valueOf(image.getId()));
-        assertTrue(c.getCount() == 0);
-        c.close();
         adapter.close();
     }
 
@@ -300,12 +209,7 @@ public class DBWriterTest extends InstrumentationTestCase {
         Feed feed = new Feed("url", null, "title");
         feed.setItems(new ArrayList<>());
 
-        // create Feed image
-        File imgFile = new File(destFolder, "image");
-        assertTrue(imgFile.createNewFile());
-        FeedImage image = new FeedImage(0, "image", imgFile.getAbsolutePath(), "url", true);
-        image.setOwner(feed);
-        feed.setImage(image);
+        feed.setImageUrl("url");
 
         // create items
         for (int i = 0; i < 10; i++) {
@@ -320,24 +224,18 @@ public class DBWriterTest extends InstrumentationTestCase {
         adapter.close();
 
         assertTrue(feed.getId() != 0);
-        assertTrue(feed.getImage().getId() != 0);
         for (FeedItem item : feed.getItems()) {
             assertTrue(item.getId() != 0);
         }
 
         DBWriter.deleteFeed(getInstrumentation().getTargetContext(), feed.getId()).get(TIMEOUT, TimeUnit.SECONDS);
 
-        // check if files still exist
-        assertFalse(imgFile.exists());
 
         adapter = PodDBAdapter.getInstance();
         adapter.open();
         Cursor c = adapter.getFeedCursor(feed.getId());
         assertTrue(c.getCount() == 0);
         c.close();
-        c = adapter.getImageCursor(String.valueOf(image.getId()));
-        assertTrue(c.getCount() == 0);
-        c.close();
         for (FeedItem item : feed.getItems()) {
             c = adapter.getFeedItemCursor(String.valueOf(item.getId()));
             assertTrue(c.getCount() == 0);
@@ -346,65 +244,6 @@ public class DBWriterTest extends InstrumentationTestCase {
         adapter.close();
     }
 
-    public void testDeleteFeedWithItemImages() throws InterruptedException, ExecutionException, TimeoutException, IOException {
-        File destFolder = getInstrumentation().getTargetContext().getExternalFilesDir(TEST_FOLDER);
-        assertNotNull(destFolder);
-
-        Feed feed = new Feed("url", null, "title");
-        feed.setItems(new ArrayList<>());
-
-        // create Feed image
-        File imgFile = new File(destFolder, "image");
-        assertTrue(imgFile.createNewFile());
-        FeedImage image = new FeedImage(0, "image", imgFile.getAbsolutePath(), "url", true);
-        image.setOwner(feed);
-        feed.setImage(image);
-
-        // create items with images
-        for (int i = 0; i < 10; i++) {
-            FeedItem item = new FeedItem(0, "Item " + i, "Item" + i, "url", new Date(), FeedItem.PLAYED, feed);
-            feed.getItems().add(item);
-            File itemImageFile = new File(destFolder, "item-image-" + i);
-            FeedImage itemImage = new FeedImage(0, "item-image" + i, itemImageFile.getAbsolutePath(), "url", true);
-            item.setImage(itemImage);
-        }
-
-        PodDBAdapter adapter = PodDBAdapter.getInstance();
-        adapter.open();
-        adapter.setCompleteFeed(feed);
-        adapter.close();
-
-        assertTrue(feed.getId() != 0);
-        assertTrue(feed.getImage().getId() != 0);
-        for (FeedItem item : feed.getItems()) {
-            assertTrue(item.getId() != 0);
-            assertTrue(item.getImage().getId() != 0);
-        }
-
-        DBWriter.deleteFeed(getInstrumentation().getTargetContext(), feed.getId()).get(TIMEOUT, TimeUnit.SECONDS);
-
-        // check if files still exist
-        assertFalse(imgFile.exists());
-
-        adapter = PodDBAdapter.getInstance();
-        adapter.open();
-        Cursor c = adapter.getFeedCursor(feed.getId());
-        assertTrue(c.getCount() == 0);
-        c.close();
-        c = adapter.getImageCursor(String.valueOf(image.getId()));
-        assertTrue(c.getCount() == 0);
-        c.close();
-        for (FeedItem item : feed.getItems()) {
-            c = adapter.getFeedItemCursor(String.valueOf(item.getId()));
-            assertTrue(c.getCount() == 0);
-            c.close();
-            c = adapter.getImageCursor(String.valueOf(item.getImage().getId()));
-            assertEquals(0, c.getCount());
-            c.close();
-        }
-        adapter.close();
-    }
-
     public void testDeleteFeedWithQueueItems() throws ExecutionException, InterruptedException, TimeoutException {
         File destFolder = getInstrumentation().getTargetContext().getExternalFilesDir(TEST_FOLDER);
         assertNotNull(destFolder);
@@ -412,11 +251,7 @@ public class DBWriterTest extends InstrumentationTestCase {
         Feed feed = new Feed("url", null, "title");
         feed.setItems(new ArrayList<>());
 
-        // create Feed image
-        File imgFile = new File(destFolder, "image");
-        FeedImage image = new FeedImage(0, "image", imgFile.getAbsolutePath(), "url", true);
-        image.setOwner(feed);
-        feed.setImage(image);
+        feed.setImageUrl("url");
 
         List<File> itemFiles = new ArrayList<>();
         // create items with downloaded media files
@@ -437,7 +272,6 @@ public class DBWriterTest extends InstrumentationTestCase {
         adapter.close();
 
         assertTrue(feed.getId() != 0);
-        assertTrue(feed.getImage().getId() != 0);
         for (FeedItem item : feed.getItems()) {
             assertTrue(item.getId() != 0);
             assertTrue(item.getMedia().getId() != 0);
@@ -460,9 +294,6 @@ public class DBWriterTest extends InstrumentationTestCase {
         Cursor c = adapter.getFeedCursor(feed.getId());
         assertTrue(c.getCount() == 0);
         c.close();
-        c = adapter.getImageCursor(String.valueOf(image.getId()));
-        assertTrue(c.getCount() == 0);
-        c.close();
         for (FeedItem item : feed.getItems()) {
             c = adapter.getFeedItemCursor(String.valueOf(item.getId()));
             assertTrue(c.getCount() == 0);
@@ -484,11 +315,7 @@ public class DBWriterTest extends InstrumentationTestCase {
         Feed feed = new Feed("url", null, "title");
         feed.setItems(new ArrayList<>());
 
-        // create Feed image
-        File imgFile = new File(destFolder, "image");
-        FeedImage image = new FeedImage(0, "image", imgFile.getAbsolutePath(), "url", true);
-        image.setOwner(feed);
-        feed.setImage(image);
+        feed.setImageUrl("url");
 
         List<File> itemFiles = new ArrayList<>();
         // create items with downloaded media files
@@ -509,7 +336,6 @@ public class DBWriterTest extends InstrumentationTestCase {
         adapter.close();
 
         assertTrue(feed.getId() != 0);
-        assertTrue(feed.getImage().getId() != 0);
         for (FeedItem item : feed.getItems()) {
             assertTrue(item.getId() != 0);
             assertTrue(item.getMedia().getId() != 0);
@@ -522,9 +348,6 @@ public class DBWriterTest extends InstrumentationTestCase {
         Cursor c = adapter.getFeedCursor(feed.getId());
         assertTrue(c.getCount() == 0);
         c.close();
-        c = adapter.getImageCursor(String.valueOf(image.getId()));
-        assertTrue(c.getCount() == 0);
-        c.close();
         for (FeedItem item : feed.getItems()) {
             c = adapter.getFeedItemCursor(String.valueOf(item.getId()));
             assertTrue(c.getCount() == 0);
@@ -539,7 +362,7 @@ public class DBWriterTest extends InstrumentationTestCase {
     private FeedMedia playbackHistorySetup(Date playbackCompletionDate) {
         final Context context = getInstrumentation().getTargetContext();
         Feed feed = new Feed("url", null, "title");
-        feed.setItems(new ArrayList<FeedItem>());
+        feed.setItems(new ArrayList<>());
         FeedItem item = new FeedItem(0, "title", "id", "link", new Date(), FeedItem.PLAYED, feed);
         FeedMedia media = new FeedMedia(0, item, 10, 0, 1, "mime", null, "url", false, playbackCompletionDate, 0, 0);
         feed.getItems().add(item);
@@ -791,7 +614,7 @@ public class DBWriterTest extends InstrumentationTestCase {
     public void testMarkFeedRead() throws InterruptedException, ExecutionException, TimeoutException {
         final int NUM_ITEMS = 10;
         Feed feed = new Feed("url", null, "title");
-        feed.setItems(new ArrayList<FeedItem>());
+        feed.setItems(new ArrayList<>());
         for (int i = 0; i < NUM_ITEMS; i++) {
             FeedItem item = new FeedItem(0, "title " + i, "id " + i, "link " + i, new Date(), FeedItem.UNPLAYED, feed);
             feed.getItems().add(item);
diff --git a/app/src/androidTest/java/de/test/antennapod/ui/MainActivityTest.java b/app/src/androidTest/java/de/test/antennapod/ui/MainActivityTest.java
index bd9057b47..6156da926 100644
--- a/app/src/androidTest/java/de/test/antennapod/ui/MainActivityTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/ui/MainActivityTest.java
@@ -15,6 +15,7 @@ import java.util.List;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.activity.MainActivity;
 import de.danoeh.antennapod.activity.OnlineFeedViewActivity;
+import de.danoeh.antennapod.activity.PreferenceActivity;
 import de.danoeh.antennapod.core.feed.Feed;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.core.storage.PodDBAdapter;
@@ -22,7 +23,6 @@ import de.danoeh.antennapod.fragment.DownloadsFragment;
 import de.danoeh.antennapod.fragment.EpisodesFragment;
 import de.danoeh.antennapod.fragment.PlaybackHistoryFragment;
 import de.danoeh.antennapod.fragment.QueueFragment;
-import de.danoeh.antennapod.preferences.PreferenceController;
 
 /**
  * User interface tests for MainActivity
@@ -96,7 +96,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
     public void testClickNavDrawer() throws Exception {
         uiTestUtils.addLocalFeedData(false);
 
-        UserPreferences.setHiddenDrawerItems(new ArrayList<String>());
+        UserPreferences.setHiddenDrawerItems(new ArrayList<>());
 
         // queue
         openNavDrawer();
@@ -155,11 +155,11 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
     public void testGoToPreferences() {
         openNavDrawer();
         solo.clickOnText(solo.getString(R.string.settings_label));
-        solo.waitForActivity(PreferenceController.getPreferenceActivity());
+        solo.waitForActivity(PreferenceActivity.class);
     }
 
     public void testDrawerPreferencesHideSomeElements() {
-        UserPreferences.setHiddenDrawerItems(new ArrayList<String>());
+        UserPreferences.setHiddenDrawerItems(new ArrayList<>());
         openNavDrawer();
         solo.clickLongOnText(solo.getString(R.string.queue_label));
         solo.waitForDialogToOpen();
@@ -190,7 +190,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
     }
 
     public void testDrawerPreferencesHideAllElements() {
-        UserPreferences.setHiddenDrawerItems(new ArrayList<String>());
+        UserPreferences.setHiddenDrawerItems(new ArrayList<>());
         String[] titles = getInstrumentation().getTargetContext().getResources().getStringArray(R.array.nav_drawer_titles);
 
         openNavDrawer();
@@ -209,7 +209,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
     }
 
     public void testDrawerPreferencesHideCurrentElement() {
-        UserPreferences.setHiddenDrawerItems(new ArrayList<String>());
+        UserPreferences.setHiddenDrawerItems(new ArrayList<>());
 
         openNavDrawer();
         String downloads = solo.getString(R.string.downloads_label);
diff --git a/app/src/androidTest/java/de/test/antennapod/ui/PlaybackSonicTest.java b/app/src/androidTest/java/de/test/antennapod/ui/PlaybackSonicTest.java
index bfbeedd83..293ed2848 100644
--- a/app/src/androidTest/java/de/test/antennapod/ui/PlaybackSonicTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/ui/PlaybackSonicTest.java
@@ -33,8 +33,8 @@ import de.danoeh.antennapod.core.storage.PodDBAdapter;
 public class PlaybackSonicTest extends ActivityInstrumentationTestCase2<MainActivity> {
 
     private static final String TAG = PlaybackTest.class.getSimpleName();
-    public static final int EPISODES_DRAWER_LIST_INDEX = 1;
-    public static final int QUEUE_DRAWER_LIST_INDEX = 0;
+    private static final int EPISODES_DRAWER_LIST_INDEX = 1;
+    private static final int QUEUE_DRAWER_LIST_INDEX = 0;
 
     private Solo solo;
     private UITestUtils uiTestUtils;
diff --git a/app/src/androidTest/java/de/test/antennapod/ui/PlaybackTest.java b/app/src/androidTest/java/de/test/antennapod/ui/PlaybackTest.java
index 661c2200b..74d59abd7 100644
--- a/app/src/androidTest/java/de/test/antennapod/ui/PlaybackTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/ui/PlaybackTest.java
@@ -30,8 +30,8 @@ import de.danoeh.antennapod.core.storage.PodDBAdapter;
 public class PlaybackTest extends ActivityInstrumentationTestCase2<MainActivity> {
 
     private static final String TAG = PlaybackTest.class.getSimpleName();
-    public static final int EPISODES_DRAWER_LIST_INDEX = 1;
-    public static final int QUEUE_DRAWER_LIST_INDEX = 0;
+    private static final int EPISODES_DRAWER_LIST_INDEX = 1;
+    private static final int QUEUE_DRAWER_LIST_INDEX = 0;
 
     private Solo solo;
     private UITestUtils uiTestUtils;
diff --git a/app/src/androidTest/java/de/test/antennapod/ui/PreferencesTest.java b/app/src/androidTest/java/de/test/antennapod/ui/PreferencesTest.java
index 91928f01e..9a5ea437c 100644
--- a/app/src/androidTest/java/de/test/antennapod/ui/PreferencesTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/ui/PreferencesTest.java
@@ -3,7 +3,6 @@ package de.test.antennapod.ui;
 import android.content.Context;
 import android.content.res.Resources;
 import android.test.ActivityInstrumentationTestCase2;
-import android.util.Log;
 
 import com.robotium.solo.Solo;
 import com.robotium.solo.Timeout;
@@ -56,6 +55,7 @@ public class PreferencesTest extends ActivityInstrumentationTestCase2<Preference
         } else {
             otherTheme = R.string.pref_theme_title_light;
         }
+        solo.clickOnText(solo.getString(R.string.user_interface_label));
         solo.clickOnText(solo.getString(R.string.pref_set_theme_title));
         solo.waitForDialogToOpen();
         solo.clickOnText(solo.getString(otherTheme));
@@ -70,6 +70,7 @@ public class PreferencesTest extends ActivityInstrumentationTestCase2<Preference
         } else {
             otherTheme = R.string.pref_theme_title_light;
         }
+        solo.clickOnText(solo.getString(R.string.user_interface_label));
         solo.clickOnText(solo.getString(R.string.pref_set_theme_title));
         solo.waitForDialogToOpen(1000);
         solo.clickOnText(solo.getString(otherTheme));
@@ -77,6 +78,7 @@ public class PreferencesTest extends ActivityInstrumentationTestCase2<Preference
     }
 
     public void testExpandNotification() {
+        solo.clickOnText(solo.getString(R.string.user_interface_label));
         final int priority = UserPreferences.getNotifyPriority();
         solo.clickOnText(solo.getString(R.string.pref_expandNotify_title));
         assertTrue(solo.waitForCondition(() -> priority != UserPreferences.getNotifyPriority(), Timeout.getLargeTimeout()));
@@ -85,7 +87,10 @@ public class PreferencesTest extends ActivityInstrumentationTestCase2<Preference
     }
 
     public void testEnablePersistentPlaybackControls() {
+        solo.clickOnText(solo.getString(R.string.user_interface_label));
         final boolean persistNotify = UserPreferences.isPersistNotify();
+        solo.scrollDown();
+        solo.scrollDown();
         solo.clickOnText(solo.getString(R.string.pref_persistNotify_title));
         assertTrue(solo.waitForCondition(() -> persistNotify != UserPreferences.isPersistNotify(), Timeout.getLargeTimeout()));
         solo.clickOnText(solo.getString(R.string.pref_persistNotify_title));
@@ -93,14 +98,16 @@ public class PreferencesTest extends ActivityInstrumentationTestCase2<Preference
     }
 
     public void testSetLockscreenButtons() {
+        solo.clickOnText(solo.getString(R.string.user_interface_label));
+        solo.scrollDown();
         String[] buttons = res.getStringArray(R.array.compact_notification_buttons_options);
         solo.clickOnText(solo.getString(R.string.pref_compact_notification_buttons_title));
         solo.waitForDialogToOpen(1000);
         // First uncheck every checkbox
-        for (int i=0; i<buttons.length; i++) {
-            assertTrue(solo.searchText(buttons[i]));
-            if (solo.isTextChecked(buttons[i])) {
-                solo.clickOnText(buttons[i]);
+        for (String button : buttons) {
+            assertTrue(solo.searchText(button));
+            if (solo.isTextChecked(button)) {
+                solo.clickOnText(button);
             }
         }
         // Now try to check all checkboxes
@@ -111,13 +118,16 @@ public class PreferencesTest extends ActivityInstrumentationTestCase2<Preference
         assertTrue(!solo.isTextChecked(buttons[2]));
         solo.clickOnText(solo.getString(R.string.confirm_label));
         solo.waitForDialogToClose(1000);
-        assertTrue(solo.waitForCondition(() -> UserPreferences.showRewindOnCompactNotification(), Timeout.getLargeTimeout()));
-        assertTrue(solo.waitForCondition(() -> UserPreferences.showFastForwardOnCompactNotification(), Timeout.getLargeTimeout()));
+        assertTrue(solo.waitForCondition(UserPreferences::showRewindOnCompactNotification, Timeout.getLargeTimeout()));
+        assertTrue(solo.waitForCondition(UserPreferences::showFastForwardOnCompactNotification, Timeout.getLargeTimeout()));
         assertTrue(solo.waitForCondition(() -> !UserPreferences.showSkipOnCompactNotification(), Timeout.getLargeTimeout()));
     }
 
     public void testEnqueueAtFront() {
+        solo.clickOnText(solo.getString(R.string.playback_pref));
         final boolean enqueueAtFront = UserPreferences.enqueueAtFront();
+        solo.scrollDown();
+        solo.scrollDown();
         solo.clickOnText(solo.getString(R.string.pref_queueAddToFront_title));
         assertTrue(solo.waitForCondition(() -> enqueueAtFront != UserPreferences.enqueueAtFront(), Timeout.getLargeTimeout()));
         solo.clickOnText(solo.getString(R.string.pref_queueAddToFront_title));
@@ -125,6 +135,7 @@ public class PreferencesTest extends ActivityInstrumentationTestCase2<Preference
     }
 
     public void testHeadPhonesDisconnect() {
+        solo.clickOnText(solo.getString(R.string.playback_pref));
         final boolean pauseOnHeadsetDisconnect = UserPreferences.isPauseOnHeadsetDisconnect();
         solo.clickOnText(solo.getString(R.string.pref_pauseOnHeadsetDisconnect_title));
         assertTrue(solo.waitForCondition(() -> pauseOnHeadsetDisconnect != UserPreferences.isPauseOnHeadsetDisconnect(), Timeout.getLargeTimeout()));
@@ -133,9 +144,10 @@ public class PreferencesTest extends ActivityInstrumentationTestCase2<Preference
     }
 
     public void testHeadPhonesReconnect() {
+        solo.clickOnText(solo.getString(R.string.playback_pref));
         if(UserPreferences.isPauseOnHeadsetDisconnect() == false) {
             solo.clickOnText(solo.getString(R.string.pref_pauseOnHeadsetDisconnect_title));
-            assertTrue(solo.waitForCondition(() -> UserPreferences.isPauseOnHeadsetDisconnect(), Timeout.getLargeTimeout()));
+            assertTrue(solo.waitForCondition(UserPreferences::isPauseOnHeadsetDisconnect, Timeout.getLargeTimeout()));
         }
         final boolean unpauseOnHeadsetReconnect = UserPreferences.isUnpauseOnHeadsetReconnect();
         solo.clickOnText(solo.getString(R.string.pref_unpauseOnHeadsetReconnect_title));
@@ -145,9 +157,10 @@ public class PreferencesTest extends ActivityInstrumentationTestCase2<Preference
     }
 
     public void testBluetoothReconnect() {
+        solo.clickOnText(solo.getString(R.string.playback_pref));
         if(UserPreferences.isPauseOnHeadsetDisconnect() == false) {
             solo.clickOnText(solo.getString(R.string.pref_pauseOnHeadsetDisconnect_title));
-            assertTrue(solo.waitForCondition(() -> UserPreferences.isPauseOnHeadsetDisconnect(), Timeout.getLargeTimeout()));
+            assertTrue(solo.waitForCondition(UserPreferences::isPauseOnHeadsetDisconnect, Timeout.getLargeTimeout()));
         }
         final boolean unpauseOnBluetoothReconnect = UserPreferences.isUnpauseOnBluetoothReconnect();
         solo.clickOnText(solo.getString(R.string.pref_unpauseOnBluetoothReconnect_title));
@@ -157,7 +170,10 @@ public class PreferencesTest extends ActivityInstrumentationTestCase2<Preference
     }
 
     public void testContinuousPlayback() {
+        solo.clickOnText(solo.getString(R.string.playback_pref));
         final boolean continuousPlayback = UserPreferences.isFollowQueue();
+        solo.scrollDown();
+        solo.scrollDown();
         solo.clickOnText(solo.getString(R.string.pref_followQueue_title));
         assertTrue(solo.waitForCondition(() -> continuousPlayback != UserPreferences.isFollowQueue(), Timeout.getLargeTimeout()));
         solo.clickOnText(solo.getString(R.string.pref_followQueue_title));
@@ -165,6 +181,7 @@ public class PreferencesTest extends ActivityInstrumentationTestCase2<Preference
     }
 
     public void testAutoDelete() {
+        solo.clickOnText(solo.getString(R.string.storage_pref));
         final boolean autoDelete = UserPreferences.isAutoDelete();
         solo.clickOnText(solo.getString(R.string.pref_auto_delete_title));
         assertTrue(solo.waitForCondition(() -> autoDelete != UserPreferences.isAutoDelete(), Timeout.getLargeTimeout()));
@@ -173,6 +190,9 @@ public class PreferencesTest extends ActivityInstrumentationTestCase2<Preference
     }
 
     public void testPlaybackSpeeds() {
+        solo.clickOnText(solo.getString(R.string.playback_pref));
+        solo.scrollDown();
+        solo.scrollDown();
         solo.clickOnText(solo.getString(R.string.pref_playback_speed_title));
         solo.waitForDialogToOpen(1000);
         assertTrue(solo.searchText(res.getStringArray(R.array.playback_speed_values)[0]));
@@ -181,6 +201,7 @@ public class PreferencesTest extends ActivityInstrumentationTestCase2<Preference
     }
 
     public void testPauseForInterruptions() {
+        solo.clickOnText(solo.getString(R.string.playback_pref));
         final boolean pauseForFocusLoss = UserPreferences.shouldPauseForFocusLoss();
         solo.clickOnText(solo.getString(R.string.pref_pausePlaybackForFocusLoss_title));
         assertTrue(solo.waitForCondition(() -> pauseForFocusLoss != UserPreferences.shouldPauseForFocusLoss(), Timeout.getLargeTimeout()));
@@ -189,6 +210,7 @@ public class PreferencesTest extends ActivityInstrumentationTestCase2<Preference
     }
 
     public void testDisableUpdateInterval() {
+        solo.clickOnText(solo.getString(R.string.network_pref));
         solo.clickOnText(solo.getString(R.string.pref_autoUpdateIntervallOrTime_sum));
         solo.waitForDialogToOpen();
         solo.clickOnText(solo.getString(R.string.pref_autoUpdateIntervallOrTime_Disable));
@@ -196,6 +218,7 @@ public class PreferencesTest extends ActivityInstrumentationTestCase2<Preference
     }
 
     public void testSetUpdateInterval() {
+        solo.clickOnText(solo.getString(R.string.network_pref));
         solo.clickOnText(solo.getString(R.string.pref_autoUpdateIntervallOrTime_title));
         solo.waitForDialogToOpen();
         solo.clickOnText(solo.getString(R.string.pref_autoUpdateIntervallOrTime_Interval));
@@ -208,6 +231,7 @@ public class PreferencesTest extends ActivityInstrumentationTestCase2<Preference
     }
 
     public void testMobileUpdates() {
+        solo.clickOnText(solo.getString(R.string.network_pref));
         final boolean mobileUpdates = UserPreferences.isAllowMobileUpdate();
         solo.clickOnText(solo.getString(R.string.pref_mobileUpdate_title));
         assertTrue(solo.waitForCondition(() -> mobileUpdates != UserPreferences.isAllowMobileUpdate(), Timeout.getLargeTimeout()));
@@ -216,6 +240,7 @@ public class PreferencesTest extends ActivityInstrumentationTestCase2<Preference
     }
 
     public void testSetSequentialDownload() {
+        solo.clickOnText(solo.getString(R.string.network_pref));
         solo.clickOnText(solo.getString(R.string.pref_parallel_downloads_title));
         solo.waitForDialogToOpen();
         solo.clearEditText(0);
@@ -225,6 +250,7 @@ public class PreferencesTest extends ActivityInstrumentationTestCase2<Preference
     }
 
     public void testSetParallelDownloads() {
+        solo.clickOnText(solo.getString(R.string.network_pref));
         solo.clickOnText(solo.getString(R.string.pref_parallel_downloads_title));
         solo.waitForDialogToOpen();
         solo.clearEditText(0);
@@ -234,6 +260,7 @@ public class PreferencesTest extends ActivityInstrumentationTestCase2<Preference
     }
 
     public void testSetParallelDownloadsInvalidInput() {
+        solo.clickOnText(solo.getString(R.string.network_pref));
         solo.clickOnText(solo.getString(R.string.pref_parallel_downloads_title));
         solo.waitForDialogToOpen();
         solo.clearEditText(0);
@@ -249,6 +276,7 @@ public class PreferencesTest extends ActivityInstrumentationTestCase2<Preference
         String[] values = res.getStringArray(R.array.episode_cache_size_values);
         String entry = entries[entries.length/2];
         final int value = Integer.valueOf(values[values.length/2]);
+        solo.clickOnText(solo.getString(R.string.network_pref));
         solo.clickOnText(solo.getString(R.string.pref_automatic_download_title));
         solo.waitForText(solo.getString(R.string.pref_automatic_download_title));
         solo.clickOnText(solo.getString(R.string.pref_episode_cache_title));
@@ -262,6 +290,7 @@ public class PreferencesTest extends ActivityInstrumentationTestCase2<Preference
         String[] values = res.getStringArray(R.array.episode_cache_size_values);
         String minEntry = entries[0];
         final int minValue = Integer.valueOf(values[0]);
+        solo.clickOnText(solo.getString(R.string.network_pref));
         solo.clickOnText(solo.getString(R.string.pref_automatic_download_title));
         solo.waitForText(solo.getString(R.string.pref_automatic_download_title));
         if(!UserPreferences.isEnableAutodownload()) {
@@ -279,6 +308,7 @@ public class PreferencesTest extends ActivityInstrumentationTestCase2<Preference
         String[] values = res.getStringArray(R.array.episode_cache_size_values);
         String maxEntry = entries[entries.length-1];
         final int maxValue = Integer.valueOf(values[values.length-1]);
+        solo.clickOnText(solo.getString(R.string.network_pref));
         solo.clickOnText(solo.getString(R.string.pref_automatic_download_title));
         solo.waitForText(solo.getString(R.string.pref_automatic_download_title));
         if(!UserPreferences.isEnableAutodownload()) {
@@ -292,6 +322,7 @@ public class PreferencesTest extends ActivityInstrumentationTestCase2<Preference
 
     public void testAutomaticDownload() {
         final boolean automaticDownload = UserPreferences.isEnableAutodownload();
+        solo.clickOnText(solo.getString(R.string.network_pref));
         solo.clickOnText(solo.getString(R.string.pref_automatic_download_title));
         solo.waitForText(solo.getString(R.string.pref_automatic_download_title));
         solo.clickOnText(solo.getString(R.string.pref_automatic_download_title));
@@ -313,6 +344,8 @@ public class PreferencesTest extends ActivityInstrumentationTestCase2<Preference
     }
 
     public void testEpisodeCleanupQueueOnly() {
+        solo.clickOnText(solo.getString(R.string.network_pref));
+        solo.clickOnText(solo.getString(R.string.pref_automatic_download_title));
         solo.clickOnText(solo.getString(R.string.pref_episode_cleanup_title));
         solo.waitForText(solo.getString(R.string.episode_cleanup_queue_removal));
         solo.clickOnText(solo.getString(R.string.episode_cleanup_queue_removal));
@@ -324,6 +357,8 @@ public class PreferencesTest extends ActivityInstrumentationTestCase2<Preference
     }
 
     public void testEpisodeCleanupNeverAlg() {
+        solo.clickOnText(solo.getString(R.string.network_pref));
+        solo.clickOnText(solo.getString(R.string.pref_automatic_download_title));
         solo.clickOnText(solo.getString(R.string.pref_episode_cleanup_title));
         solo.waitForText(solo.getString(R.string.episode_cleanup_never));
         solo.clickOnText(solo.getString(R.string.episode_cleanup_never));
@@ -335,6 +370,8 @@ public class PreferencesTest extends ActivityInstrumentationTestCase2<Preference
     }
 
     public void testEpisodeCleanupClassic() {
+        solo.clickOnText(solo.getString(R.string.network_pref));
+        solo.clickOnText(solo.getString(R.string.pref_automatic_download_title));
         solo.clickOnText(solo.getString(R.string.pref_episode_cleanup_title));
         solo.waitForText(solo.getString(R.string.episode_cleanup_after_listening));
         solo.clickOnText(solo.getString(R.string.episode_cleanup_after_listening));
@@ -350,6 +387,8 @@ public class PreferencesTest extends ActivityInstrumentationTestCase2<Preference
     }
 
     public void testEpisodeCleanupNumDays() {
+        solo.clickOnText(solo.getString(R.string.network_pref));
+        solo.clickOnText(solo.getString(R.string.pref_automatic_download_title));
         solo.clickOnText(solo.getString(R.string.pref_episode_cleanup_title));
         solo.waitForText(solo.getString(R.string.episode_cleanup_after_listening));
         solo.clickOnText("5");
@@ -369,6 +408,9 @@ public class PreferencesTest extends ActivityInstrumentationTestCase2<Preference
         int seconds = UserPreferences.getRewindSecs();
         int deltas[] = res.getIntArray(R.array.seek_delta_values);
 
+        solo.clickOnText(solo.getString(R.string.playback_pref));
+        solo.scrollDown();
+        solo.scrollDown();
         solo.clickOnText(solo.getString(R.string.pref_rewind));
         solo.waitForDialogToOpen();
 
@@ -387,6 +429,9 @@ public class PreferencesTest extends ActivityInstrumentationTestCase2<Preference
     }
 
     public void testFastForwardChange() {
+        solo.clickOnText(solo.getString(R.string.playback_pref));
+        solo.scrollDown();
+        solo.scrollDown();
         for (int i = 2; i > 0; i--) { // repeat twice to catch any error where fastforward is tracking rewind
             int seconds = UserPreferences.getFastForwardSecs();
             int deltas[] = res.getIntArray(R.array.seek_delta_values);
diff --git a/app/src/androidTest/java/de/test/antennapod/ui/UITestUtils.java b/app/src/androidTest/java/de/test/antennapod/ui/UITestUtils.java
index ccac4e761..ff5374268 100644
--- a/app/src/androidTest/java/de/test/antennapod/ui/UITestUtils.java
+++ b/app/src/androidTest/java/de/test/antennapod/ui/UITestUtils.java
@@ -1,9 +1,7 @@
 package de.test.antennapod.ui;
 
-import android.annotation.TargetApi;
 import android.content.Context;
 import android.graphics.Bitmap;
-import android.os.Build;
 import android.util.Log;
 
 import junit.framework.Assert;
@@ -20,14 +18,12 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.activity.MainActivity;
+import de.danoeh.antennapod.core.event.QueueEvent;
 import de.danoeh.antennapod.core.feed.EventDistributor;
 import de.danoeh.antennapod.core.feed.Feed;
-import de.danoeh.antennapod.core.feed.FeedImage;
 import de.danoeh.antennapod.core.feed.FeedItem;
 import de.danoeh.antennapod.core.feed.FeedMedia;
-import de.danoeh.antennapod.core.event.QueueEvent;
 import de.danoeh.antennapod.core.storage.PodDBAdapter;
 import de.danoeh.antennapod.core.util.playback.PlaybackController;
 import de.danoeh.antennapod.fragment.ExternalPlayerFragment;
@@ -39,27 +35,25 @@ import de.test.antennapod.util.syndication.feedgenerator.RSS2Generator;
  * Utility methods for UI tests.
  * Starts a web server that hosts feeds, episodes and images.
  */
-@TargetApi(Build.VERSION_CODES.HONEYCOMB)
-public class UITestUtils {
+class UITestUtils {
 
     private static final String TAG = UITestUtils.class.getSimpleName();
 
     private static final String DATA_FOLDER = "test/UITestUtils";
 
-    public static final int NUM_FEEDS = 5;
-    public static final int NUM_ITEMS_PER_FEED = 10;
+    private static final int NUM_FEEDS = 5;
+    private static final int NUM_ITEMS_PER_FEED = 10;
 
-    public static final int HOME_VIEW = (Build.VERSION.SDK_INT >= 11) ? android.R.id.home : R.id.home;
-    public static final String TEST_FILE_NAME = "3sec.mp3";
+    private static final String TEST_FILE_NAME = "3sec.mp3";
 
 
-    private Context context;
-    private HTTPBin server = new HTTPBin();
+    private final Context context;
+    private final HTTPBin server = new HTTPBin();
     private File destDir;
     private File hostedFeedDir;
     private File hostedMediaDir;
 
-    public List<Feed> hostedFeeds = new ArrayList<>();
+    public final List<Feed> hostedFeeds = new ArrayList<>();
 
     public UITestUtils(Context context) {
         this.context = context;
@@ -141,12 +135,9 @@ public class UITestUtils {
     public void addHostedFeedData() throws IOException {
         if (feedDataHosted) throw new IllegalStateException("addHostedFeedData was called twice on the same instance");
         for (int i = 0; i < NUM_FEEDS; i++) {
-            File bitmapFile = newBitmapFile("image" + i);
-            FeedImage image = new FeedImage(0, "image " + i, null, hostFile(bitmapFile), false);
             Feed feed = new Feed(0, null, "Title " + i, "http://example.com/" + i, "Description of feed " + i,
-                    "http://example.com/pay/feed" + i, "author " + i, "en", Feed.TYPE_RSS2, "feed" + i, image, null,
+                    "http://example.com/pay/feed" + i, "author " + i, "en", Feed.TYPE_RSS2, "feed" + i, null, null,
                     "http://example.com/feed/src/" + i, false);
-            image.setOwner(feed);
 
             // create items
             List<FeedItem> items = new ArrayList<>();
@@ -192,12 +183,6 @@ public class UITestUtils {
         List<FeedItem> queue = new ArrayList<>();
         for (Feed feed : hostedFeeds) {
             feed.setDownloaded(true);
-            if (feed.getImage() != null) {
-                FeedImage image = feed.getImage();
-                int fileId = Integer.parseInt(StringUtils.substringAfter(image.getDownload_url(), "files/"));
-                image.setFile_url(server.accessFile(fileId).getAbsolutePath());
-                image.setDownloaded(true);
-            }
             if (downloadEpisodes) {
                 for (FeedItem item : feed.getItems()) {
                     if (item.hasMedia()) {
diff --git a/app/src/androidTest/java/de/test/antennapod/ui/UITestUtilsTest.java b/app/src/androidTest/java/de/test/antennapod/ui/UITestUtilsTest.java
index 53fd7d7fd..45ba472ff 100644
--- a/app/src/androidTest/java/de/test/antennapod/ui/UITestUtilsTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/ui/UITestUtilsTest.java
@@ -38,9 +38,6 @@ public class UITestUtilsTest extends InstrumentationTestCase {
 
         for (Feed feed : feeds) {
             testUrlReachable(feed.getDownload_url());
-            if (feed.getImage() != null) {
-                testUrlReachable(feed.getImage().getDownload_url());
-            }
             for (FeedItem item : feed.getItems()) {
                 if (item.hasMedia()) {
                     testUrlReachable(item.getMedia().getDownload_url());
@@ -66,9 +63,6 @@ public class UITestUtilsTest extends InstrumentationTestCase {
 
         for (Feed feed : uiTestUtils.hostedFeeds) {
             assertTrue(feed.getId() != 0);
-            if (feed.getImage() != null) {
-                assertTrue(feed.getImage().getId() != 0);
-            }
             for (FeedItem item : feed.getItems()) {
                 assertTrue(item.getId() != 0);
                 if (item.hasMedia()) {
diff --git a/app/src/androidTest/java/de/test/antennapod/util/FilenameGeneratorTest.java b/app/src/androidTest/java/de/test/antennapod/util/FilenameGeneratorTest.java
index cb2d012e0..a36b3b65a 100644
--- a/app/src/androidTest/java/de/test/antennapod/util/FilenameGeneratorTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/util/FilenameGeneratorTest.java
@@ -1,11 +1,12 @@
 package de.test.antennapod.util;
 
+import android.test.AndroidTestCase;
+import android.text.TextUtils;
+
 import java.io.File;
 import java.io.IOException;
 
 import de.danoeh.antennapod.core.util.FileNameGenerator;
-import android.test.AndroidTestCase;
-import android.text.TextUtils;
 
 public class FilenameGeneratorTest extends AndroidTestCase {
 
diff --git a/app/src/androidTest/java/de/test/antennapod/util/RewindAfterPauseUtilTest.java b/app/src/androidTest/java/de/test/antennapod/util/RewindAfterPauseUtilTest.java
index fcfb16eb4..d564d0492 100644
--- a/app/src/androidTest/java/de/test/antennapod/util/RewindAfterPauseUtilTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/util/RewindAfterPauseUtilTest.java
@@ -1,8 +1,8 @@
 package de.test.antennapod.util;
 
-import junit.framework.*;
+import junit.framework.TestCase;
 
-import de.danoeh.antennapod.core.util.*;
+import de.danoeh.antennapod.core.util.RewindAfterPauseUtils;
 
 /**
  * Tests for {@link RewindAfterPauseUtils}.
diff --git a/app/src/androidTest/java/de/test/antennapod/util/URIUtilTest.java b/app/src/androidTest/java/de/test/antennapod/util/URIUtilTest.java
index 7bdcfb898..2cca6b4dc 100644
--- a/app/src/androidTest/java/de/test/antennapod/util/URIUtilTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/util/URIUtilTest.java
@@ -1,6 +1,7 @@
 package de.test.antennapod.util;
 
 import android.test.AndroidTestCase;
+
 import de.danoeh.antennapod.core.util.URIUtil;
 
 /**
diff --git a/app/src/androidTest/java/de/test/antennapod/util/URLCheckerTest.java b/app/src/androidTest/java/de/test/antennapod/util/URLCheckerTest.java
index aa197b6e1..1b444bfa9 100644
--- a/app/src/androidTest/java/de/test/antennapod/util/URLCheckerTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/util/URLCheckerTest.java
@@ -1,6 +1,7 @@
 package de.test.antennapod.util;
 
 import android.test.AndroidTestCase;
+
 import de.danoeh.antennapod.core.util.URLChecker;
 
 /**
diff --git a/app/src/androidTest/java/de/test/antennapod/util/service/download/HTTPBin.java b/app/src/androidTest/java/de/test/antennapod/util/service/download/HTTPBin.java
index 23be5ad4a..cde93fd7e 100644
--- a/app/src/androidTest/java/de/test/antennapod/util/service/download/HTTPBin.java
+++ b/app/src/androidTest/java/de/test/antennapod/util/service/download/HTTPBin.java
@@ -45,7 +45,7 @@ public class HTTPBin extends NanoHTTPD {
     private static final String MIME_HTML = "text/html";
     private static final String MIME_PLAIN = "text/plain";
 
-    private List<File> servedFiles;
+    private final List<File> servedFiles;
 
     public HTTPBin() {
         super(PORT);
diff --git a/app/src/androidTest/java/de/test/antennapod/util/service/download/NanoHTTPD.java b/app/src/androidTest/java/de/test/antennapod/util/service/download/NanoHTTPD.java
index a728d9afd..61ff65809 100644
--- a/app/src/androidTest/java/de/test/antennapod/util/service/download/NanoHTTPD.java
+++ b/app/src/androidTest/java/de/test/antennapod/util/service/download/NanoHTTPD.java
@@ -88,15 +88,15 @@ public abstract class NanoHTTPD {
      * This is required as the Keep-Alive HTTP connections would otherwise
      * block the socket reading thread forever (or as long the browser is open).
      */
-    public static final int SOCKET_READ_TIMEOUT = 5000;
+    private static final int SOCKET_READ_TIMEOUT = 5000;
     /**
      * Common mime type for dynamic content: plain text
      */
-    public static final String MIME_PLAINTEXT = "text/plain";
+    private static final String MIME_PLAINTEXT = "text/plain";
     /**
      * Common mime type for dynamic content: html
      */
-    public static final String MIME_HTML = "text/html";
+    private static final String MIME_HTML = "text/html";
     /**
      * Pseudo-Parameter to use to store the actual query string in the parameters map for later re-processing.
      */
@@ -104,7 +104,7 @@ public abstract class NanoHTTPD {
     private final String hostname;
     private final int myPort;
     private ServerSocket myServerSocket;
-    private Set<Socket> openConnections = new HashSet<>();
+    private final Set<Socket> openConnections = new HashSet<>();
     private Thread myThread;
     /**
      * Pluggable strategy for asynchronously executing requests.
@@ -118,14 +118,14 @@ public abstract class NanoHTTPD {
     /**
      * Constructs an HTTP server on given port.
      */
-    public NanoHTTPD(int port) {
+    NanoHTTPD(int port) {
         this(null, port);
     }
 
     /**
      * Constructs an HTTP server on given hostname and port.
      */
-    public NanoHTTPD(String hostname, int port) {
+    private NanoHTTPD(String hostname, int port) {
         this.hostname = hostname;
         this.myPort = port;
         setTempFileManagerFactory(new DefaultTempFileManagerFactory());
@@ -168,44 +168,38 @@ public abstract class NanoHTTPD {
         myServerSocket = new ServerSocket();
         myServerSocket.bind((hostname != null) ? new InetSocketAddress(hostname, myPort) : new InetSocketAddress(myPort));
 
-        myThread = new Thread(new Runnable() {
-            @Override
-            public void run() {
-                do {
-                    try {
-                        final Socket finalAccept = myServerSocket.accept();
-                        registerConnection(finalAccept);
-                        finalAccept.setSoTimeout(SOCKET_READ_TIMEOUT);
-                        final InputStream inputStream = finalAccept.getInputStream();
-                        asyncRunner.exec(new Runnable() {
-                            @Override
-                            public void run() {
-                                OutputStream outputStream = null;
-                                try {
-                                    outputStream = finalAccept.getOutputStream();
-                                    TempFileManager tempFileManager = tempFileManagerFactory.create();
-                                    HTTPSession session = new HTTPSession(tempFileManager, inputStream, outputStream, finalAccept.getInetAddress());
-                                    while (!finalAccept.isClosed()) {
-                                        session.execute();
-                                    }
-                                } catch (Exception e) {
-                                    // When the socket is closed by the client, we throw our own SocketException
-                                    // to break the  "keep alive" loop above.
-                                    if (!(e instanceof SocketException && "NanoHttpd Shutdown".equals(e.getMessage()))) {
-                                        e.printStackTrace();
-                                    }
-                                } finally {
-                                    safeClose(outputStream);
-                                    safeClose(inputStream);
-                                    safeClose(finalAccept);
-                                    unRegisterConnection(finalAccept);
-                                }
+        myThread = new Thread(() -> {
+            do {
+                try {
+                    final Socket finalAccept = myServerSocket.accept();
+                    registerConnection(finalAccept);
+                    finalAccept.setSoTimeout(SOCKET_READ_TIMEOUT);
+                    final InputStream inputStream = finalAccept.getInputStream();
+                    asyncRunner.exec(() -> {
+                        OutputStream outputStream = null;
+                        try {
+                            outputStream = finalAccept.getOutputStream();
+                            TempFileManager tempFileManager = tempFileManagerFactory.create();
+                            HTTPSession session = new HTTPSession(tempFileManager, inputStream, outputStream, finalAccept.getInetAddress());
+                            while (!finalAccept.isClosed()) {
+                                session.execute();
                             }
-                        });
-                    } catch (IOException e) {
-                    }
-                } while (!myServerSocket.isClosed());
-            }
+                        } catch (Exception e) {
+                            // When the socket is closed by the client, we throw our own SocketException
+                            // to break the  "keep alive" loop above.
+                            if (!(e instanceof SocketException && "NanoHttpd Shutdown".equals(e.getMessage()))) {
+                                e.printStackTrace();
+                            }
+                        } finally {
+                            safeClose(outputStream);
+                            safeClose(inputStream);
+                            safeClose(finalAccept);
+                            unRegisterConnection(finalAccept);
+                        }
+                    });
+                } catch (IOException e) {
+                }
+            } while (!myServerSocket.isClosed());
         });
         myThread.setDaemon(true);
         myThread.setName("NanoHttpd Main Listener");
@@ -232,7 +226,7 @@ public abstract class NanoHTTPD {
      *
      * @param socket the {@link Socket} for the connection.
      */
-    public synchronized void registerConnection(Socket socket) {
+    private synchronized void registerConnection(Socket socket) {
         openConnections.add(socket);
     }
 
@@ -242,14 +236,14 @@ public abstract class NanoHTTPD {
      * @param socket
      *            the {@link Socket} for the connection.
      */
-    public synchronized void unRegisterConnection(Socket socket) {
+    private synchronized void unRegisterConnection(Socket socket) {
         openConnections.remove(socket);
     }
 
     /**
      * Forcibly closes all connections that are open.
      */
-    public synchronized void closeAllConnections() {
+    private synchronized void closeAllConnections() {
         for (Socket socket : openConnections) {
             safeClose(socket);
         }
@@ -259,7 +253,7 @@ public abstract class NanoHTTPD {
         return myServerSocket == null ? -1 : myServerSocket.getLocalPort();
     }
 
-    public final boolean wasStarted() {
+    private boolean wasStarted() {
         return myServerSocket != null && myThread != null;
     }
 
@@ -294,7 +288,7 @@ public abstract class NanoHTTPD {
      * @param session The HTTP session
      * @return HTTP response, see class Response for details
      */
-    public Response serve(IHTTPSession session) {
+    Response serve(IHTTPSession session) {
         Map<String, String> files = new ArrayMap<>();
         Method method = session.getMethod();
         if (Method.PUT.equals(method) || Method.POST.equals(method)) {
@@ -318,7 +312,7 @@ public abstract class NanoHTTPD {
      * @param str the percent encoded <code>String</code>
      * @return expanded form of the input, for example "foo%20bar" becomes "foo bar"
      */
-    protected String decodePercent(String str) {
+    private String decodePercent(String str) {
         String decoded = null;
         try {
             decoded = URLDecoder.decode(str, "UTF8");
@@ -347,7 +341,7 @@ public abstract class NanoHTTPD {
      * @param queryString a query string pulled from the URL.
      * @return a map of <code>String</code> (parameter name) to <code>List&lt;String&gt;</code> (a list of the values supplied).
      */
-    protected Map<String, List<String>> decodeParameters(String queryString) {
+    private Map<String, List<String>> decodeParameters(String queryString) {
         Map<String, List<String>> parms = new ArrayMap<>();
         if (queryString != null) {
             StringTokenizer st = new StringTokenizer(queryString, "&");
@@ -378,7 +372,7 @@ public abstract class NanoHTTPD {
      *
      * @param asyncRunner new strategy for handling threads.
      */
-    public void setAsyncRunner(AsyncRunner asyncRunner) {
+    private void setAsyncRunner(AsyncRunner asyncRunner) {
         this.asyncRunner = asyncRunner;
     }
 
@@ -393,7 +387,7 @@ public abstract class NanoHTTPD {
      *
      * @param tempFileManagerFactory new strategy for handling temp files.
      */
-    public void setTempFileManagerFactory(TempFileManagerFactory tempFileManagerFactory) {
+    private void setTempFileManagerFactory(TempFileManagerFactory tempFileManagerFactory) {
         this.tempFileManagerFactory = tempFileManagerFactory;
     }
 
@@ -448,9 +442,9 @@ public abstract class NanoHTTPD {
      * themselves up when no longer needed.</p>
      */
     public interface TempFile {
-        OutputStream open() throws Exception;
+        OutputStream open();
 
-        void delete() throws Exception;
+        void delete();
 
         String getName();
     }
@@ -528,12 +522,12 @@ public abstract class NanoHTTPD {
         }
 
         @Override
-        public OutputStream open() throws Exception {
+        public OutputStream open() {
             return fstream;
         }
 
         @Override
-        public void delete() throws Exception {
+        public void delete() {
             safeClose(fstream);
             file.delete();
         }
@@ -563,7 +557,7 @@ public abstract class NanoHTTPD {
         /**
          * Headers for the HTTP response. Use addHeader() to add lines.
          */
-        private Map<String, String> header = new ArrayMap<>();
+        private final Map<String, String> header = new ArrayMap<>();
         /**
          * The request method that spawned this response.
          */
@@ -616,7 +610,7 @@ public abstract class NanoHTTPD {
         /**
          * Sends given response to the socket.
          */
-        protected void send(OutputStream outputStream) {
+        void send(OutputStream outputStream) {
             String mime = mimeType;
             SimpleDateFormat gmtFrmt = new SimpleDateFormat("E, d MMM yyyy HH:mm:ss 'GMT'", Locale.US);
             gmtFrmt.setTimeZone(TimeZone.getTimeZone("GMT"));
@@ -661,13 +655,13 @@ public abstract class NanoHTTPD {
             }
         }
 
-        protected void sendContentLengthHeaderIfNotAlreadyPresent(PrintWriter pw, Map<String, String> header, int size) {
+        void sendContentLengthHeaderIfNotAlreadyPresent(PrintWriter pw, Map<String, String> header, int size) {
             if (!headerAlreadySent(header, "content-length")) {
                 pw.print("Content-Length: "+ size +"\r\n");
             }
         }
 
-        protected void sendConnectionHeaderIfNotAlreadyPresent(PrintWriter pw, Map<String, String> header) {
+        void sendConnectionHeaderIfNotAlreadyPresent(PrintWriter pw, Map<String, String> header) {
             if (!headerAlreadySent(header, "connection")) {
                 pw.print("Connection: keep-alive\r\n");
             }
@@ -694,7 +688,7 @@ public abstract class NanoHTTPD {
                 outputStream.write(buff, 0, read);
                 outputStream.write(CRLF);
             }
-            outputStream.write(String.format("0\r\n\r\n").getBytes());
+            outputStream.write("0\r\n\r\n".getBytes());
         }
 
         private void sendAsFixedLength(OutputStream outputStream, int pending) throws IOException {
@@ -844,7 +838,7 @@ public abstract class NanoHTTPD {
         public static final int BUFSIZE = 8192;
         private final TempFileManager tempFileManager;
         private final OutputStream outputStream;
-        private PushbackInputStream inputStream;
+        private final PushbackInputStream inputStream;
         private int splitbyte;
         private int rlen;
         private String uri;
@@ -1144,17 +1138,19 @@ public abstract class NanoHTTPD {
 
                         String value = "";
                         if (item.get("content-type") == null) {
+                            StringBuilder tmp = new StringBuilder();
                             while (mpline != null && !mpline.contains(boundary)) {
                                 mpline = in.readLine();
                                 if (mpline != null) {
                                     int d = mpline.indexOf(boundary);
                                     if (d == -1) {
-                                        value += mpline;
+                                        tmp.append(mpline);
                                     } else {
-                                        value += mpline.substring(0, d - 2);
+                                        tmp.append(mpline.substring(0, d - 2));
                                     }
                                 }
                             }
+                            value = tmp.toString();
                         } else {
                             if (boundarycount > bpositions.length) {
                                 throw new ResponseException(Response.Status.INTERNAL_ERROR, "Error processing request");
@@ -1326,7 +1322,9 @@ public abstract class NanoHTTPD {
     }
 
     public static class Cookie {
-        private String n, v, e;
+        private final String n;
+        private final String v;
+        private final String e;
 
         public Cookie(String name, String value, String expires) {
             n = name;
@@ -1366,8 +1364,8 @@ public abstract class NanoHTTPD {
      * @author LordFokas
      */
     public class CookieHandler implements Iterable<String> {
-        private ArrayMap<String, String> cookies = new ArrayMap<>();
-        private ArrayList<Cookie> queue = new ArrayList<>();
+        private final ArrayMap<String, String> cookies = new ArrayMap<>();
+        private final ArrayList<Cookie> queue = new ArrayList<>();
 
         public CookieHandler(Map<String, String> httpHeaders) {
             String raw = httpHeaders.get("cookie");
diff --git a/app/src/androidTest/java/de/test/antennapod/util/syndication/FeedDiscovererTest.java b/app/src/androidTest/java/de/test/antennapod/util/syndication/FeedDiscovererTest.java
index 4e5d0297f..809b9769a 100644
--- a/app/src/androidTest/java/de/test/antennapod/util/syndication/FeedDiscovererTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/util/syndication/FeedDiscovererTest.java
@@ -1,7 +1,7 @@
 package de.test.antennapod.util.syndication;
 
 import android.test.InstrumentationTestCase;
-import de.danoeh.antennapod.core.util.syndication.FeedDiscoverer;
+
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 
@@ -9,6 +9,8 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.util.Map;
 
+import de.danoeh.antennapod.core.util.syndication.FeedDiscoverer;
+
 /**
  * Test class for FeedDiscoverer
  */
diff --git a/app/src/androidTest/java/de/test/antennapod/util/syndication/feedgenerator/AtomGenerator.java b/app/src/androidTest/java/de/test/antennapod/util/syndication/feedgenerator/AtomGenerator.java
index bd3df0f9d..afe15f1b2 100644
--- a/app/src/androidTest/java/de/test/antennapod/util/syndication/feedgenerator/AtomGenerator.java
+++ b/app/src/androidTest/java/de/test/antennapod/util/syndication/feedgenerator/AtomGenerator.java
@@ -19,7 +19,7 @@ public class AtomGenerator implements FeedGenerator{
 
     private static final String NS_ATOM = "http://www.w3.org/2005/Atom";
 
-    public static final long FEATURE_USE_RFC3339LOCAL = 1;
+    private static final long FEATURE_USE_RFC3339LOCAL = 1;
 
     @Override
     public void writeFeed(Feed feed, OutputStream outputStream, String encoding, long flags) throws IOException {
diff --git a/app/src/androidTest/java/de/test/antennapod/util/syndication/feedgenerator/FeedGenerator.java b/app/src/androidTest/java/de/test/antennapod/util/syndication/feedgenerator/FeedGenerator.java
index fe5afd847..b63159384 100644
--- a/app/src/androidTest/java/de/test/antennapod/util/syndication/feedgenerator/FeedGenerator.java
+++ b/app/src/androidTest/java/de/test/antennapod/util/syndication/feedgenerator/FeedGenerator.java
@@ -1,10 +1,10 @@
 package de.test.antennapod.util.syndication.feedgenerator;
 
-import de.danoeh.antennapod.core.feed.Feed;
-
 import java.io.IOException;
 import java.io.OutputStream;
 
+import de.danoeh.antennapod.core.feed.Feed;
+
 /**
  * Generates a machine-readable, platform-independent representation of a Feed object.
  */
@@ -24,5 +24,5 @@ public interface FeedGenerator {
      * @param encoding     The encoding to use. Must not be null.
      * @param flags        Optional argument for enabling implementation-dependent features.
      */
-    public void writeFeed(Feed feed, OutputStream outputStream, String encoding, long flags) throws IOException;
+    void writeFeed(Feed feed, OutputStream outputStream, String encoding, long flags) throws IOException;
 }
diff --git a/app/src/androidTest/java/de/test/antennapod/util/syndication/feedgenerator/GeneratorUtil.java b/app/src/androidTest/java/de/test/antennapod/util/syndication/feedgenerator/GeneratorUtil.java
index ba924d637..89542d222 100644
--- a/app/src/androidTest/java/de/test/antennapod/util/syndication/feedgenerator/GeneratorUtil.java
+++ b/app/src/androidTest/java/de/test/antennapod/util/syndication/feedgenerator/GeneratorUtil.java
@@ -7,7 +7,7 @@ import java.io.IOException;
 /**
  * Utility methods for FeedGenerator
  */
-public class GeneratorUtil {
+class GeneratorUtil {
     private GeneratorUtil(){}
 
     public static void addPaymentLink(XmlSerializer xml, String paymentLink, boolean withNamespace) throws IOException {
diff --git a/app/src/androidTest/java/de/test/antennapod/util/syndication/feedgenerator/RSS2Generator.java b/app/src/androidTest/java/de/test/antennapod/util/syndication/feedgenerator/RSS2Generator.java
index 27e89620d..f2d53799d 100644
--- a/app/src/androidTest/java/de/test/antennapod/util/syndication/feedgenerator/RSS2Generator.java
+++ b/app/src/androidTest/java/de/test/antennapod/util/syndication/feedgenerator/RSS2Generator.java
@@ -1,14 +1,16 @@
 package de.test.antennapod.util.syndication.feedgenerator;
 
 import android.util.Xml;
-import de.danoeh.antennapod.core.feed.Feed;
-import de.danoeh.antennapod.core.feed.FeedItem;
-import de.danoeh.antennapod.core.util.DateUtils;
+
 import org.xmlpull.v1.XmlSerializer;
 
 import java.io.IOException;
 import java.io.OutputStream;
 
+import de.danoeh.antennapod.core.feed.Feed;
+import de.danoeh.antennapod.core.feed.FeedItem;
+import de.danoeh.antennapod.core.util.DateUtils;
+
 /**
  * Creates RSS 2.0 feeds. See FeedGenerator for more information.
  */