Merge branch 'develop' of github.com:AntennaPod/AntennaPod into develop

CHANGELOG.md

@@ -1,46 +1,62 @@
 Change Log
 ==========
 
+Version 1.6.3
+-------------
+
+* New features:
+   * Support for Android Auto
+   * Sort feeds by number of played episodes
+   * Statistics modes
+   * Setting: Enqueue downloaded
+   * Launch screen
+* Improvements
+   * Chapter duration
+   * Feed title in deletion confirmation
+* Fixes:
+   * Episodes refresh spinner
+   * Publication date parsing
+   * Unknown mime type
 
 Version 1.6.2
 -------------
 
 * New features:
- * Integration of fyyd Podcast Search Engine
- * Export subscriptions as HTML
- * Rename feeds
- * Auto-enable sleep timer
- * "has media" filter
- * Force gpodder full sync
+  * Integration of fyyd Podcast Search Engine
+  * Export subscriptions as HTML
+  * Rename feeds
+  * Auto-enable sleep timer
+  * "has media" filter
+  * Force gpodder full sync
 * Improvements:
- * Better support for Atom feeds, e.g. summary tag
- * Confirmation dialog on mark all as seen
- * Number of downloaded episodes in subscription counter
- * Gpodder sync error optional
- * Search results
- * MRSS support
- * Sanitize HTML from Atom feed
+  * Better support for Atom feeds, e.g. summary tag
+  * Confirmation dialog on mark all as seen
+  * Number of downloaded episodes in subscription counter
+  * Gpodder sync error optional
+  * Search results
+  * MRSS support
+  * Sanitize HTML from Atom feed
 * Fixes:
- * Reset sleep timer on shake to current waiting time
- * Cast dialog image
- * Mini player not showing up
- * Audio player cover fragment
- * Prevent out of memory and casting crashes
+  * Reset sleep timer on shake to current waiting time
+  * Cast dialog image
+  * Mini player not showing up
+  * Audio player cover fragment
+  * Prevent out of memory and casting crashes
 
 Version 1.6.0
 -------------
 * New features:
- * Experimental Chromecast support
- * Subscription overview
- * Proxy support
- * Statistics
- * Manual gpodder.net sync
+  * Experimental Chromecast support
+  * Subscription overview
+  * Proxy support
+  * Statistics
+  * Manual gpodder.net sync
 * Fixes:
- * Audioplayer controls
- * Audio ducking
- * Video control fade-out
- * External media controls
- * Feed parsing
+  * Audioplayer controls
+  * Audio ducking
+  * Video control fade-out
+  * External media controls
+  * Feed parsing
 
 Version 1.5.0
 -------------

core/src/main/java/de/danoeh/antennapod/core/gpoddernet/GpodnetService.java

@@ -568,7 +568,9 @@ public class GpodnetService {
             e.printStackTrace();
             throw new GpodnetServiceException(e);
         } finally {
-            body.close();
+            if (body != null) {
+                body.close();
+            }
         }
         return responseString;
     }

core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java

@@ -387,7 +387,13 @@ public class PlaybackService extends MediaBrowserServiceCompat {
         List<MediaBrowserCompat.MediaItem> mediaItems = new ArrayList<>();
         if (parentId.equals(getResources().getString(R.string.app_name))) {
             // Root List
-            mediaItems.add(createBrowsableMediaItemForRoot());
+            try {
+                if (!(taskManager.getQueue().isEmpty())) {
+                    mediaItems.add(createBrowsableMediaItemForRoot());
+                }
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
             List<Feed> feeds = DBReader.getFeedList();
             for (Feed feed: feeds) {
                 mediaItems.add(createBrowsableMediaItemForFeed(feed));

core/src/main/java/de/danoeh/antennapod/core/storage/PodDBAdapter.java

@@ -1156,7 +1156,9 @@ public class PodDBAdapter {
                         + TABLE_NAME_FEED_IMAGES + " WHERE " + KEY_ID + " IN "
                         + buildInOperator(neededLength), parts);
             }
-            return new MergeCursor(cursors);
+            Cursor result = new MergeCursor(cursors);
+            result.moveToFirst();
+            return result;
         } else {
             return db.query(TABLE_NAME_FEED_IMAGES, null, KEY_ID + " IN "
                     + buildInOperator(length), imageIds, null, null, null);
@@ -1341,7 +1343,9 @@ public class PodDBAdapter {
                         + TABLE_NAME_FEED_MEDIA + " WHERE " + KEY_FEEDITEM + " IN "
                         + buildInOperator(neededLength), parts);
             }
-            return new MergeCursor(cursors);
+            Cursor result = new MergeCursor(cursors);
+            result.moveToFirst();
+            return result;
         } else {
             return db.query(TABLE_NAME_FEED_MEDIA, null, KEY_FEEDITEM + " IN "
                     + buildInOperator(length), itemIds, null, null, null);