5 files changed, 16 insertions, 20 deletions
diff --git a/src/de/danoeh/antennapod/feed/EventDistributor.java b/src/de/danoeh/antennapod/feed/EventDistributor.java
index 56333da52..85a9b5727 100644
--- a/src/de/danoeh/antennapod/feed/EventDistributor.java
+++ b/src/de/danoeh/antennapod/feed/EventDistributor.java
@@ -1,14 +1,14 @@
 package de.danoeh.antennapod.feed;
 
+import android.os.Handler;
+import android.util.Log;
+import de.danoeh.antennapod.BuildConfig;
+
 import java.util.AbstractQueue;
 import java.util.Observable;
 import java.util.Observer;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
-import android.os.Handler;
-import android.util.Log;
-import de.danoeh.antennapod.AppConfig;
-
 /**
  * Notifies its observers about changes in the feed database. Observers can
  * register by retrieving an instance of this class and registering an
@@ -67,7 +67,7 @@ public class EventDistributor extends Observable {
 
 	private void processEventQueue() {
 		Integer result = 0;
-		if (AppConfig.DEBUG)
+		if (BuildConfig.DEBUG)
 			Log.d(TAG,
 					"Processing event queue. Number of events: "
 							+ events.size());
@@ -76,12 +76,12 @@ public class EventDistributor extends Observable {
 			result |= current;
 		}
 		if (result != 0) {
-			if (AppConfig.DEBUG)
+			if (BuildConfig.DEBUG)
 				Log.d(TAG, "Notifying observers. Data: " + result);
 			setChanged();
 			notifyObservers(result);
 		} else {
-			if (AppConfig.DEBUG)
+			if (BuildConfig.DEBUG)
 				Log.d(TAG,
 						"Event queue didn't contain any new events. Observers will not be notified.");
 		}
diff --git a/src/de/danoeh/antennapod/feed/Feed.java b/src/de/danoeh/antennapod/feed/Feed.java
index 19030d73e..9e423ff8b 100644
--- a/src/de/danoeh/antennapod/feed/Feed.java
+++ b/src/de/danoeh/antennapod/feed/Feed.java
@@ -1,18 +1,16 @@
 package de.danoeh.antennapod.feed;
 
 import android.content.Context;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
-
 import de.danoeh.antennapod.preferences.UserPreferences;
 import de.danoeh.antennapod.storage.DBWriter;
 import de.danoeh.antennapod.util.EpisodeFilter;
 import de.danoeh.antennapod.util.flattr.FlattrStatus;
 import de.danoeh.antennapod.util.flattr.FlattrThing;
 
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
 /**
  * Data Object for a whole feed
  *
diff --git a/src/de/danoeh/antennapod/feed/FeedImage.java b/src/de/danoeh/antennapod/feed/FeedImage.java
index c50ea8514..9c9170294 100644
--- a/src/de/danoeh/antennapod/feed/FeedImage.java
+++ b/src/de/danoeh/antennapod/feed/FeedImage.java
@@ -1,14 +1,13 @@
 package de.danoeh.antennapod.feed;
 
+import de.danoeh.antennapod.asynctask.ImageLoader;
+import org.apache.commons.io.IOUtils;
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.InputStream;
 
-import org.apache.commons.io.IOUtils;
-
-import de.danoeh.antennapod.asynctask.ImageLoader;
-
 
 
 public class FeedImage extends FeedFile implements
diff --git a/src/de/danoeh/antennapod/feed/FeedItem.java b/src/de/danoeh/antennapod/feed/FeedItem.java
index 27fd0dc2c..921a03bff 100644
--- a/src/de/danoeh/antennapod/feed/FeedItem.java
+++ b/src/de/danoeh/antennapod/feed/FeedItem.java
@@ -6,7 +6,6 @@ import de.danoeh.antennapod.storage.DBReader;
 import de.danoeh.antennapod.util.ShownotesProvider;
 import de.danoeh.antennapod.util.flattr.FlattrStatus;
 import de.danoeh.antennapod.util.flattr.FlattrThing;
-import org.apache.commons.lang3.StringUtils;
 
 import java.io.InputStream;
 import java.util.Date;
diff --git a/src/de/danoeh/antennapod/feed/VorbisCommentChapter.java b/src/de/danoeh/antennapod/feed/VorbisCommentChapter.java
index 544e762d3..59844ae1f 100644
--- a/src/de/danoeh/antennapod/feed/VorbisCommentChapter.java
+++ b/src/de/danoeh/antennapod/feed/VorbisCommentChapter.java
@@ -1,9 +1,9 @@
 package de.danoeh.antennapod.feed;
 
-import java.util.concurrent.TimeUnit;
-
 import de.danoeh.antennapod.util.vorbiscommentreader.VorbisCommentReaderException;
 
+import java.util.concurrent.TimeUnit;
+
 public class VorbisCommentChapter extends Chapter {
 	public static final int CHAPTERTYPE_VORBISCOMMENT_CHAPTER = 3;