diff options
| author | Scott Jackson <daneren2005@gmail.com> | 2016-03-18 18:02:11 -0700 |
|---|---|---|
| committer | Scott Jackson <daneren2005@gmail.com> | 2016-03-18 18:02:11 -0700 |
| commit | 0dae5a9cf533211f0915fc08aa91c6bc4893ebaf (patch) | |
| tree | d0b5410ec878d81ac4a9b65cd2efda0e6d3943af | |
| parent | 13ccd02becd0c66044464855b7cd59df4d3bcc53 (diff) | |
| parent | 8ce76d9c8324153107b1b568890533ad1ba5a7f4 (diff) | |
| download | dsub-0dae5a9cf533211f0915fc08aa91c6bc4893ebaf.tar.gz dsub-0dae5a9cf533211f0915fc08aa91c6bc4893ebaf.tar.bz2 dsub-0dae5a9cf533211f0915fc08aa91c6bc4893ebaf.zip | |
Merge branch 'emergency-fixes'
5 files changed, 7 insertions, 2 deletions
diff --git a/app/build.gradle b/app/build.gradle index a6bbfc7f..b4f6154b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,7 +8,7 @@ android { applicationId "github.daneren2005.dsub" minSdkVersion 14 targetSdkVersion 22 - versionCode 175 + versionCode 176 versionName '5.1.6' setProperty("archivesBaseName", "DSub $versionName") } diff --git a/app/src/main/java/github/daneren2005/dsub/fragments/SubsonicFragment.java b/app/src/main/java/github/daneren2005/dsub/fragments/SubsonicFragment.java index 606c79e6..42b6fce6 100644 --- a/app/src/main/java/github/daneren2005/dsub/fragments/SubsonicFragment.java +++ b/app/src/main/java/github/daneren2005/dsub/fragments/SubsonicFragment.java @@ -735,6 +735,7 @@ public class SubsonicFragment extends Fragment implements SwipeRefreshLayout.OnR if(downloadService == null) { return; } + downloadService.clear(); downloadService.setShufflePlayEnabled(true); context.openNowPlaying(); return; @@ -838,6 +839,8 @@ public class SubsonicFragment extends Fragment implements SwipeRefreshLayout.OnR if (downloadService == null) { return; } + + downloadService.clear(); downloadService.setShufflePlayEnabled(true); context.openNowPlaying(); } 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 47ffa8d9..ae6e46ee 100644 --- a/app/src/main/java/github/daneren2005/dsub/service/DownloadService.java +++ b/app/src/main/java/github/daneren2005/dsub/service/DownloadService.java @@ -574,7 +574,6 @@ public class DownloadService extends Service { public synchronized void setShufflePlayEnabled(boolean enabled) { shufflePlay = enabled; if (shufflePlay) { - clear(); checkDownloads(); } SharedPreferences.Editor editor = Util.getPreferences(this).edit(); 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 4989db40..fe75e248 100644 --- a/app/src/main/java/github/daneren2005/dsub/service/DownloadServiceLifecycleSupport.java +++ b/app/src/main/java/github/daneren2005/dsub/service/DownloadServiceLifecycleSupport.java @@ -225,6 +225,7 @@ public class DownloadServiceLifecycleSupport { } editor.commit(); + downloadService.clear(); downloadService.setShufflePlayEnabled(true); } else { downloadService.start(); diff --git a/app/src/main/java/github/daneren2005/dsub/util/compat/RemoteControlClientLP.java b/app/src/main/java/github/daneren2005/dsub/util/compat/RemoteControlClientLP.java index 47c77cac..03ada494 100644 --- a/app/src/main/java/github/daneren2005/dsub/util/compat/RemoteControlClientLP.java +++ b/app/src/main/java/github/daneren2005/dsub/util/compat/RemoteControlClientLP.java @@ -468,6 +468,7 @@ public class RemoteControlClientLP extends RemoteControlClientBase { public void onPlayFromSearch (String query, Bundle extras) { // User just asked to playing something if("".equals(query)) { + downloadService.clear(); downloadService.setShufflePlayEnabled(true); } else { String mediaFocus = extras.getString(MediaStore.EXTRA_MEDIA_FOCUS); @@ -488,6 +489,7 @@ public class RemoteControlClientLP extends RemoteControlClientBase { editor.putString(Constants.PREFERENCES_KEY_SHUFFLE_GENRE, genre); editor.commit(); + downloadService.clear(); downloadService.setShufflePlayEnabled(true); } else { |