Merge remote-tracking branch 'origin/master'

6 files changed, 173 insertions, 3 deletions

diff --git a/app/src/main/java/github/daneren2005/dsub/fragments/SettingsFragment.java b/app/src/main/java/github/daneren2005/dsub/fragments/SettingsFragment.java
index 11de6aee..249b8a93 100644
--- a/app/src/main/java/github/daneren2005/dsub/fragments/SettingsFragment.java
+++ b/app/src/main/java/github/daneren2005/dsub/fragments/SettingsFragment.java
@@ -56,6 +56,7 @@ import github.daneren2005.dsub.util.FileUtil;
 import github.daneren2005.dsub.util.LoadingTask;
 import github.daneren2005.dsub.util.SyncUtil;
 import github.daneren2005.dsub.util.Util;
+import github.daneren2005.dsub.view.CacheLocationPreference;
 import github.daneren2005.dsub.view.ErrorDialog;
 
 public class SettingsFragment extends PreferenceCompatFragment implements SharedPreferences.OnSharedPreferenceChangeListener {
@@ -69,7 +70,7 @@ public class SettingsFragment extends PreferenceCompatFragment implements Shared
 	private ListPreference maxVideoBitrateWifi;
 	private ListPreference maxVideoBitrateMobile;
 	private ListPreference networkTimeout;
-	private EditTextPreference cacheLocation;
+	private CacheLocationPreference cacheLocation;
 	private ListPreference preloadCountWifi;
 	private ListPreference preloadCountMobile;
 	private ListPreference keepPlayedCount;
@@ -205,7 +206,7 @@ public class SettingsFragment extends PreferenceCompatFragment implements Shared
 		maxVideoBitrateWifi = (ListPreference) this.findPreference(Constants.PREFERENCES_KEY_MAX_VIDEO_BITRATE_WIFI);
 		maxVideoBitrateMobile = (ListPreference) this.findPreference(Constants.PREFERENCES_KEY_MAX_VIDEO_BITRATE_MOBILE);
 		networkTimeout = (ListPreference) this.findPreference(Constants.PREFERENCES_KEY_NETWORK_TIMEOUT);
-		cacheLocation = (EditTextPreference) this.findPreference(Constants.PREFERENCES_KEY_CACHE_LOCATION);
+		cacheLocation = (CacheLocationPreference) this.findPreference(Constants.PREFERENCES_KEY_CACHE_LOCATION);
 		preloadCountWifi = (ListPreference) this.findPreference(Constants.PREFERENCES_KEY_PRELOAD_COUNT_WIFI);
 		preloadCountMobile = (ListPreference) this.findPreference(Constants.PREFERENCES_KEY_PRELOAD_COUNT_MOBILE);
 		keepPlayedCount = (ListPreference) this.findPreference(Constants.PREFERENCES_KEY_KEEP_PLAYED_CNT);
diff --git a/app/src/main/java/github/daneren2005/dsub/service/JukeboxController.java b/app/src/main/java/github/daneren2005/dsub/service/JukeboxController.java
index e9d7cbc8..82ef45e1 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/JukeboxController.java
+++ b/app/src/main/java/github/daneren2005/dsub/service/JukeboxController.java
@@ -22,6 +22,7 @@ import github.daneren2005.dsub.R;
 import github.daneren2005.dsub.domain.RemoteStatus;
 import github.daneren2005.dsub.domain.PlayerState;
 import github.daneren2005.dsub.domain.RemoteControlState;
+import github.daneren2005.dsub.domain.RepeatMode;
 import github.daneren2005.dsub.service.parser.SubsonicRESTException;
 import github.daneren2005.dsub.util.Util;
 
@@ -200,11 +201,15 @@ public class JukeboxController extends RemoteController {
 		
 		// Track change?
 		Integer index = jukeboxStatus.getCurrentPlayingIndex();
+		int currentPlayingIndex = downloadService.getCurrentPlayingIndex();
 		if (index != null && index != -1 && index != downloadService.getCurrentPlayingIndex()) {
 			downloadService.setPlayerState(PlayerState.COMPLETED);
 			downloadService.setCurrentPlaying(index, true);
 			if(jukeboxStatus.isPlaying()) {
 				downloadService.setPlayerState(PlayerState.STARTED);
+			} else if(index == 0 && currentPlayingIndex == downloadService.size() - 1 && downloadService.getRepeatMode() == RepeatMode.ALL) {
+				// Jukebox does not support any form of auto repeat
+				start();
 			}
 		}
 	}
diff --git a/app/src/main/java/github/daneren2005/dsub/view/CacheLocationPreference.java b/app/src/main/java/github/daneren2005/dsub/view/CacheLocationPreference.java
new file mode 100644
index 00000000..cc123089
--- /dev/null
+++ b/app/src/main/java/github/daneren2005/dsub/view/CacheLocationPreference.java
@@ -0,0 +1,143 @@
+/*
+  This file is part of Subsonic.
+	Subsonic is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	Subsonic is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	GNU General Public License for more details.
+	You should have received a copy of the GNU General Public License
+	along with Subsonic. If not, see <http://www.gnu.org/licenses/>.
+	Copyright 2015 (C) Scott Jackson
+*/
+package github.daneren2005.dsub.view;
+
+import android.content.Context;
+import android.os.Build;
+import android.os.Environment;
+import android.preference.DialogPreference;
+import android.preference.EditTextPreference;
+import android.support.v4.content.ContextCompat;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import java.io.File;
+
+import github.daneren2005.dsub.R;
+import github.daneren2005.dsub.util.FileUtil;
+
+public class CacheLocationPreference extends EditTextPreference {
+	private static final String TAG = CacheLocationPreference.class.getSimpleName();
+	private Context context;
+
+	public CacheLocationPreference(Context context, AttributeSet attrs, int defStyle) {
+		super(context, attrs, defStyle);
+		this.context = context;
+	}
+	public CacheLocationPreference(Context context, AttributeSet attrs) {
+		super(context, attrs);
+		this.context = context;
+	}
+	public CacheLocationPreference(Context context) {
+		super(context);
+		this.context = context;
+	}
+
+	@Override
+	protected void onBindDialogView(View view) {
+		super.onBindDialogView(view);
+
+		if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+			view.setLayoutParams(new ViewGroup.LayoutParams(android.view.ViewGroup.LayoutParams.WRAP_CONTENT, android.view.ViewGroup.LayoutParams.WRAP_CONTENT));
+
+			final EditText editText = (EditText) view.findViewById(android.R.id.edit);
+			ViewGroup vg = (ViewGroup) editText.getParent();
+
+			LinearLayout cacheButtonsWrapper = (LinearLayout) LayoutInflater.from(context).inflate(R.layout.cache_location_buttons, vg, true);
+			Button internalLocation = (Button) cacheButtonsWrapper.findViewById(R.id.location_internal);
+			Button externalLocation = (Button) cacheButtonsWrapper.findViewById(R.id.location_external);
+
+			File[] dirs;
+			if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+				dirs = context.getExternalMediaDirs();
+			} else {
+				dirs = ContextCompat.getExternalFilesDirs(context, null);
+			}
+
+			// Past 5.0 we can query directly for SD Card
+			File internalDir = null, externalDir = null;
+			if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+				for(int i = 0; i < dirs.length; i++) {
+					try {
+						if (dirs[i] != null) {
+							if(Environment.isExternalStorageRemovable(dirs[i])) {
+								if(externalDir != null) {
+									externalDir = dirs[i];
+								}
+							} else {
+								internalDir = dirs[i];
+							}
+
+							if(internalDir != null && externalDir != null) {
+								break;
+							}
+						}
+					} catch (Exception e) {
+						Log.e(TAG, "Failed to check if is external", e);
+					}
+				}
+			}
+
+			// Before 5.0, we have to guess.  Most of the time the SD card is last
+			if(externalDir == null) {
+				for (int i = dirs.length - 1; i >= 0; i--) {
+					if (dirs[i] != null) {
+						externalDir = dirs[i];
+						break;
+					}
+				}
+			}
+			if(internalDir == null) {
+				for (int i = 0; i < dirs.length; i++) {
+					if (dirs[i] != null) {
+						internalDir = dirs[i];
+						break;
+					}
+				}
+			}
+			final File finalInternalDir = new File(internalDir, "music");
+			final File finalExternalDir = new File(externalDir, "music");
+
+			if(finalInternalDir != null && (finalInternalDir.exists() || finalInternalDir.mkdirs())) {
+				internalLocation.setOnClickListener(new View.OnClickListener() {
+					@Override
+					public void onClick(View v) {
+						setText(finalInternalDir.getPath());
+					}
+				});
+			} else {
+				internalLocation.setEnabled(false);
+			}
+
+			if(finalExternalDir != null && !finalInternalDir.equals(finalExternalDir) && (finalExternalDir.exists() || finalExternalDir.mkdirs())) {
+				externalLocation.setOnClickListener(new View.OnClickListener() {
+					@Override
+					public void onClick(View v) {
+						setText(finalExternalDir.getPath());
+					}
+				});
+			} else {
+				externalLocation.setEnabled(false);
+			}
+		}
+	}
+}
diff --git a/app/src/main/res/layout/cache_location_buttons.xml b/app/src/main/res/layout/cache_location_buttons.xml
new file mode 100644
index 00000000..31e12642
--- /dev/null
+++ b/app/src/main/res/layout/cache_location_buttons.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:orientation="horizontal"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content"
+	android:layout_gravity="center">
+
+	<Button
+		android:id="@+id/location_internal"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:text="@string/settings.cache_location_internal"/>
+
+	<Button
+		android:id="@+id/location_external"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:text="@string/settings.cache_location_external"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3acbff3e..5d0aacd7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -291,6 +291,8 @@
     <string name="settings.cache_location">Cache location</string>
     <string name="settings.cache_location_error">Invalid cache location. Using default.</string>
     <string name="settings.cache_location_reset">The cache location you have set is no longer writable. If you recently upgraded your phone OS to KitKat 4.4, then the way apps write to the SD Card has changed so that they can only write to a specific location.  The location that DSub uses has already been automatically changed to the correct location.  In order to delete all of the old app data, you will need to mount the SD Card on your computer and delete the old folder manually</string>
+	<string name="settings.cache_location_internal">Internal</string>
+	<string name="settings.cache_location_external">External</string>
 	<string name="settings.cache_clear">Clear Cache</string>
 	<string name="settings.cache_clear_complete">Finished clearing cache</string>
     <string name="settings.testing_connection">Testing connection...</string>
diff --git a/app/src/main/res/xml/settings_cache.xml b/app/src/main/res/xml/settings_cache.xml
index bb5710b2..248572ca 100644
--- a/app/src/main/res/xml/settings_cache.xml
+++ b/app/src/main/res/xml/settings_cache.xml
@@ -57,7 +57,7 @@
 			android:defaultValue="2000"
 			android:digits="0123456789"/>
 
-		<EditTextPreference
+		<github.daneren2005.dsub.view.CacheLocationPreference
 			android:title="@string/settings.cache_location"
 			android:key="cacheLocation"/>