aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Jackson <daneren2005@gmail.com>2016-03-14 17:54:48 -0700
committerScott Jackson <daneren2005@gmail.com>2016-03-14 17:54:48 -0700
commitd7806c61e528d5752fa335ea2bc8c818c586f3b9 (patch)
treee1ce3d6646d4fe2a16e81ff7fb1830d4c2bc6087
parent102b34b6007059f5595926f390c298e85f200913 (diff)
downloaddsub-d7806c61e528d5752fa335ea2bc8c818c586f3b9.tar.gz
dsub-d7806c61e528d5752fa335ea2bc8c818c586f3b9.tar.bz2
dsub-d7806c61e528d5752fa335ea2bc8c818c586f3b9.zip
Fix clearing queue during radio not cancelling it
-rw-r--r--app/src/main/java/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java1
-rw-r--r--app/src/main/java/github/daneren2005/dsub/service/DownloadService.java2
-rw-r--r--app/src/main/java/github/daneren2005/dsub/util/ArtistRadioBuffer.java1
3 files changed, 3 insertions, 1 deletions
diff --git a/app/src/main/java/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java b/app/src/main/java/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java
index ba2807ec..67dcc6a2 100644
--- a/app/src/main/java/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java
+++ b/app/src/main/java/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java
@@ -1082,6 +1082,7 @@ public class SelectDirectoryFragment extends SubsonicFragment implements Section
@Override
protected Void doInBackground() throws Throwable {
DownloadService downloadService = getDownloadService();
+ downloadService.clear();
downloadService.setArtistRadio(artistId);
return null;
}
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 8ea7538b..47ffa8d9 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/DownloadService.java
+++ b/app/src/main/java/github/daneren2005/dsub/service/DownloadService.java
@@ -786,6 +786,8 @@ public class DownloadService extends Service {
suggestedPlaylistName = null;
suggestedPlaylistId = null;
+ setShufflePlayEnabled(false);
+ setArtistRadio(null);
checkDownloads();
}
diff --git a/app/src/main/java/github/daneren2005/dsub/util/ArtistRadioBuffer.java b/app/src/main/java/github/daneren2005/dsub/util/ArtistRadioBuffer.java
index 2af468f6..b42fa066 100644
--- a/app/src/main/java/github/daneren2005/dsub/util/ArtistRadioBuffer.java
+++ b/app/src/main/java/github/daneren2005/dsub/util/ArtistRadioBuffer.java
@@ -66,7 +66,6 @@ public class ArtistRadioBuffer {
buffer.clear();
}
- context.clear();
this.artistId = artistId;
awaitingResults = true;
refill();