Merge branch 'playback-speed' into develop

Conflicts:
	proguard.cfg
	src/de/danoeh/antennapod/storage/DBTasks.java

1 files changed, 1 insertions, 7 deletions

diff --git a/src/de/danoeh/antennapod/storage/DBTasks.java b/src/de/danoeh/antennapod/storage/DBTasks.java
index 741699bdf..4ce1a0c96 100644
--- a/src/de/danoeh/antennapod/storage/DBTasks.java
+++ b/src/de/danoeh/antennapod/storage/DBTasks.java
@@ -441,13 +441,7 @@ public final class DBTasks {
         }
 
         for (FeedItem item : delete) {
-            try {
-                DBWriter.deleteFeedMediaOfItem(context, item.getId()).get();
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            } catch (ExecutionException e) {
-                e.printStackTrace();
-            }
+            DBWriter.deleteFeedMediaOfItem(context, item.getId());
         }
 
         int counter = delete.size();