Merge branch 'master' into auto

4 files changed, 20 insertions, 11 deletions

diff --git a/app/app-release.apk b/app/app-release.apk
deleted file mode 100644
index eac41b21..00000000
--- a/app/app-release.apk
+++ /dev/null
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index efaf4ecc..edd354d6 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="github.daneren2005.dsub"
           android:installLocation="internalOnly"
-          android:versionCode="159"
+          android:versionCode="162"
           android:versionName="5.0.4">
           
     <instrumentation android:name="android.test.InstrumentationTestRunner"
diff --git a/app/src/main/java/github/daneren2005/dsub/provider/DSubWidgetProvider.java b/app/src/main/java/github/daneren2005/dsub/provider/DSubWidgetProvider.java
index 83733618..18660fa2 100644
--- a/app/src/main/java/github/daneren2005/dsub/provider/DSubWidgetProvider.java
+++ b/app/src/main/java/github/daneren2005/dsub/provider/DSubWidgetProvider.java
@@ -165,10 +165,14 @@ public class DSubWidgetProvider extends AppWidgetProvider {
         MusicDirectory.Entry currentPlaying = null;
         if(service == null) {
         	// Deserialize from playling list to setup
-			PlayerQueue state = FileUtil.deserialize(context, DownloadServiceLifecycleSupport.FILENAME_DOWNLOADS_SER, PlayerQueue.class);
-        	if(state != null && state.currentPlayingIndex != -1) {
-        		currentPlaying = state.songs.get(state.currentPlayingIndex);
-        	}
+            try {
+                PlayerQueue state = FileUtil.deserialize(context, DownloadServiceLifecycleSupport.FILENAME_DOWNLOADS_SER, PlayerQueue.class);
+                if (state != null && state.currentPlayingIndex != -1) {
+                    currentPlaying = state.songs.get(state.currentPlayingIndex);
+                }
+            } catch(Exception e) {
+                Log.e(TAG, "Failed to grab current playing", e);
+            }
         } else {
 			currentPlaying = service.getCurrentPlaying() == null ? null : service.getCurrentPlaying().getSong();
         }
diff --git a/app/src/main/java/github/daneren2005/dsub/service/DownloadServiceLifecycleSupport.java b/app/src/main/java/github/daneren2005/dsub/service/DownloadServiceLifecycleSupport.java
index d057c7fd..4c8ac586 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/DownloadServiceLifecycleSupport.java
+++ b/app/src/main/java/github/daneren2005/dsub/service/DownloadServiceLifecycleSupport.java
@@ -286,10 +286,7 @@ public class DownloadServiceLifecycleSupport {
 	public void serializeDownloadQueueNow(List<DownloadFile> songs, boolean serializeRemote) {
 		final PlayerQueue state = new PlayerQueue();
 		for (DownloadFile downloadFile : songs) {
-			MusicDirectory.Entry song = downloadFile.getSong();
-			if(song.isOnlineId(downloadService)) {
-				state.songs.add(downloadFile.getSong());
-			}
+			state.songs.add(downloadFile.getSong());
 		}
 		for (DownloadFile downloadFile : downloadService.getToDelete()) {
 			state.toDelete.add(downloadFile.getSong());
@@ -324,11 +321,19 @@ public class DownloadServiceLifecycleSupport {
 							position = 0;
 						}
 
+						MusicDirectory.Entry currentPlaying = state.songs.get(index);
+						List<MusicDirectory.Entry> songs = new ArrayList<>();
+						for(MusicDirectory.Entry song: state.songs) {
+							if(song.isOnlineId(downloadService)) {
+								songs.add(song);
+							}
+						}
+
 						MusicService musicService = MusicServiceFactory.getMusicService(downloadService);
-						musicService.savePlayQueue(state.songs, state.songs.get(index), position, downloadService, null);
-						currentSavePlayQueueTask = null;
+						musicService.savePlayQueue(songs, currentPlaying, position, downloadService, null);
 					} catch (Exception e) {
 						Log.e(TAG, "Failed to save playing queue to server", e);
+					} finally {
 						currentSavePlayQueueTask = null;
 					}