aboutsummaryrefslogtreecommitdiff
path: root/app/src/main
diff options
context:
space:
mode:
authorScott Jackson <daneren2005@gmail.com>2015-11-13 16:12:12 -0800
committerScott Jackson <daneren2005@gmail.com>2015-11-13 16:12:12 -0800
commitd4d86f9f0a9a40a834ab180df249a85af0ab2a4d (patch)
tree56fbacd4ef0ee9b7e6e07e8ef629c1a18d4cfbb6 /app/src/main
parentec1b17c7bce3633a59774fd64681dc1f30a04240 (diff)
downloaddsub-d4d86f9f0a9a40a834ab180df249a85af0ab2a4d.tar.gz
dsub-d4d86f9f0a9a40a834ab180df249a85af0ab2a4d.tar.bz2
dsub-d4d86f9f0a9a40a834ab180df249a85af0ab2a4d.zip
DSub 5.1 Final Released
Diffstat (limited to 'app/src/main')
-rw-r--r--app/src/main/AndroidManifest.xml2
-rw-r--r--app/src/main/java/github/daneren2005/dsub/service/DownloadService.java4
-rw-r--r--app/src/main/res/xml/changelog.xml2
3 files changed, 6 insertions, 2 deletions
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 88573542..ae77fc9c 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="164"
+ android:versionCode="165"
android:versionName="5.1">
<instrumentation android:name="android.test.InstrumentationTestRunner"
diff --git a/app/src/main/java/github/daneren2005/dsub/service/DownloadService.java b/app/src/main/java/github/daneren2005/dsub/service/DownloadService.java
index 0ed79d52..8a583630 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/DownloadService.java
+++ b/app/src/main/java/github/daneren2005/dsub/service/DownloadService.java
@@ -406,6 +406,10 @@ public class DownloadService extends Service {
int size = size();
int index = getCurrentPlayingIndex();
for (MusicDirectory.Entry song : songs) {
+ if(song == null) {
+ continue;
+ }
+
DownloadFile downloadFile = new DownloadFile(this, song, save);
addToDownloadList(downloadFile, -1);
if(noNetwork && !warnNetwork) {
diff --git a/app/src/main/res/xml/changelog.xml b/app/src/main/res/xml/changelog.xml
index 8d6471fb..1182c889 100644
--- a/app/src/main/res/xml/changelog.xml
+++ b/app/src/main/res/xml/changelog.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<changelog>
- <release version="5.1" versioncode="163" releasedate="11/5/2015">
+ <release version="5.1" versioncode="163" releasedate="11/13/2015">
<change>Android Auto support</change>
<change>Thumb/Star on Android Wear</change>
<change>Podcast Channel Artwork (Subsonic 5.3+)</change>