From ea358d70f22f57211bda1e255119bf681136ee95 Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Mon, 13 Jan 2014 21:33:46 -0800
Subject: Fix light light themed icons against dark background

---
 res/layout-land/download.xml           | 33 ++++++++++++++++++++++++++++++++-
 res/layout-port/download.xml           | 33 ++++++++++++++++++++++++++++++++-
 res/layout/download_action_buttons.xml | 33 ---------------------------------
 res/values/themes.xml                  | 10 ++++++----
 4 files changed, 70 insertions(+), 39 deletions(-)
 delete mode 100644 res/layout/download_action_buttons.xml

(limited to 'res')

diff --git a/res/layout-land/download.xml b/res/layout-land/download.xml
index b896509e..c71ff4b7 100644
--- a/res/layout-land/download.xml
+++ b/res/layout-land/download.xml
@@ -40,7 +40,38 @@
 				android:layout_weight="1"
 				android:background="@android:color/transparent">
 
-				<include layout="@layout/download_action_buttons"/>
+					<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+						android:id="@+id/download_other_controls_layout"
+						android:orientation="horizontal"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:layout_gravity="center_horizontal">
+
+						<Button
+							android:id="@+id/download_jukebox"
+							android:text="RC"
+							style="@style/DownloadActionButton"/>
+
+						<Button
+							android:id="@+id/download_equalizer"
+							android:text="EQ"
+							style="@style/DownloadActionButton"/>
+
+						<Button
+							android:id="@+id/download_visualizer"
+							android:text="VIS"
+							style="@style/DownloadActionButton"/>
+
+						<ImageButton
+							android:id="@+id/download_star"
+							style="@style/DownloadActionImageButton"
+							android:src="@android:drawable/star_big_off"/>
+
+						<ImageButton
+							android:id="@+id/download_bookmark"
+							style="@style/DownloadActionImageButton"
+							android:src="?attr/bookmark"/>
+					</LinearLayout>
 
 				<LinearLayout
 						android:id="@+id/download_visualizer_view_layout"
diff --git a/res/layout-port/download.xml b/res/layout-port/download.xml
index a70160a1..7d89baf3 100644
--- a/res/layout-port/download.xml
+++ b/res/layout-port/download.xml
@@ -49,7 +49,38 @@
 							android:layout_height="wrap_content"
 							android:layout_centerHorizontal="true">
 
-							<include layout="@layout/download_action_buttons"/>
+							<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+								android:id="@+id/download_other_controls_layout"
+								android:orientation="horizontal"
+								android:layout_width="wrap_content"
+								android:layout_height="wrap_content"
+								android:layout_gravity="center_horizontal">
+
+								<Button
+									android:id="@+id/download_jukebox"
+									android:text="RC"
+									style="@style/DownloadActionButton"/>
+
+								<Button
+									android:id="@+id/download_equalizer"
+									android:text="EQ"
+									style="@style/DownloadActionButton"/>
+
+								<Button
+									android:id="@+id/download_visualizer"
+									android:text="VIS"
+									style="@style/DownloadActionButton"/>
+
+								<ImageButton
+									android:id="@+id/download_star"
+									style="@style/DownloadActionImageButton"
+									android:src="@android:drawable/star_big_off"/>
+
+								<ImageButton
+									android:id="@+id/download_bookmark"
+									style="@style/DownloadActionImageButton"
+									android:src="@drawable/ic_menu_bookmark_dark"/>
+							</LinearLayout>
 						</LinearLayout>
 					</RelativeLayout>
 
diff --git a/res/layout/download_action_buttons.xml b/res/layout/download_action_buttons.xml
deleted file mode 100644
index e3a45151..00000000
--- a/res/layout/download_action_buttons.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:id="@+id/download_other_controls_layout"
-	android:orientation="horizontal"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:layout_gravity="center_horizontal">
-
-	<Button
-		android:id="@+id/download_jukebox"
-		android:text="RC"
-		style="@style/DownloadActionButton"/>
-
-	<Button
-		android:id="@+id/download_equalizer"
-		android:text="EQ"
-		style="@style/DownloadActionButton"/>
-
-	<Button
-		android:id="@+id/download_visualizer"
-		android:text="VIS"
-		style="@style/DownloadActionButton"/>
-
-	<ImageButton
-		android:id="@+id/download_star"
-		style="@style/DownloadActionImageButton"
-		android:src="@android:drawable/star_big_off"/>
-
-	<ImageButton
-		android:id="@+id/download_bookmark"
-		style="@style/DownloadActionImageButton"
-		android:src="?attr/bookmark"/>
-</LinearLayout>
\ No newline at end of file
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 9aa83d2a..8a2bff2c 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -25,7 +25,7 @@
 		<item name="share">@drawable/ic_menu_share_light</item>
 		<item name="drawerItemsIcons">@array/drawerItemIconsLight</item>
 		<item name="android:textViewStyle">@style/DSub.TextViewStyle</item>
-		<item name="android:buttonStyle">@style/DSub.ButtonStyle</item>
+		<item name="android:buttonStyle">@style/DSub.ButtonStyle.Light</item>
 	</style>
 	<style name="Theme.DSub.Dark" parent="@style/Theme.AppCompat">
 		<item name="actionBarStyle">@style/Widget.DSub.ActionBarStyle.Dark</item>
@@ -53,7 +53,7 @@
 		<item name="share">@drawable/ic_menu_share_dark</item>
 		<item name="drawerItemsIcons">@array/drawerItemIconsDark</item>
 		<item name="android:textViewStyle">@style/DSub.TextViewStyle</item>
-		<item name="android:buttonStyle">@style/DSub.ButtonStyle</item>
+		<item name="android:buttonStyle">@style/DSub.ButtonStyle.Dark</item>
 	</style>
 	<style name="Theme.DSub.Black" parent="Theme.DSub.Dark">
 		<item name="android:windowBackground">@android:color/black</item>
@@ -84,7 +84,7 @@
 		<item name="share">@drawable/ic_menu_share_dark</item>
 		<item name="drawerItemsIcons">@array/drawerItemIconsDark</item>
 		<item name="android:textViewStyle">@style/DSub.TextViewStyle</item>
-		<item name="android:buttonStyle">@style/DSub.ButtonStyle</item>
+		<item name="android:buttonStyle">@style/DSub.ButtonStyle.Dark</item>
 	</style>
 	
 	<style name="Widget.DSub.ActionBarStyle.Light" parent="Widget.AppCompat.Light.ActionBar.Solid">
@@ -111,6 +111,8 @@
 	<style name="DSub.TextViewStyle" parent="android:Widget.TextView">
 	</style>
 
-	<style name="DSub.ButtonStyle" parent="android:Widget.Holo.Button">
+	<style name="DSub.ButtonStyle.Dark" parent="android:Widget.Holo.Button">
+	</style>
+	<style name="DSub.ButtonStyle.Light" parent="android:Widget.Holo.Light.Button">
 	</style>
 </resources>
-- 
cgit v1.2.3


From e0cb5de9f0c164f79254eb289d22bfb3d2a35d20 Mon Sep 17 00:00:00 2001
From: Mark Adamson <markadamson83@gmail.com>
Date: Tue, 14 Jan 2014 22:40:01 +0000
Subject: Added optional "local network SSID" to server settings

---
 AndroidManifest.xml                                      |  1 +
 res/values/strings.xml                                   |  3 ++-
 .../daneren2005/dsub/activity/SettingsActivity.java      |  8 ++++++++
 src/github/daneren2005/dsub/util/Constants.java          |  1 +
 src/github/daneren2005/dsub/util/Util.java               | 16 +++++++++++++++-
 5 files changed, 27 insertions(+), 2 deletions(-)

(limited to 'res')

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 5f97baaa..0a7dabbf 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -26,6 +26,7 @@
     <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="19"/>
 
     <supports-screens android:anyDensity="true" android:xlargeScreens="true" android:largeScreens="true" android:normalScreens="true" android:smallScreens="true"/>
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
 
     <application android:label="@string/common.appname"
     	android:backupAgent="github.daneren2005.dsub.util.SettingsBackupAgent"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 33edb30b..9eaccef4 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -244,7 +244,8 @@
     <string name="settings.server_unused">Unused</string>
     <string name="settings.server_name">Name</string>
     <string name="settings.server_address">Server address</string>
-	<string name="settings.server_internal_address">Internal network address</string>
+	<string name="settings.server_local_network_ssid" >Local network</string>
+	<string name="settings.server_internal_address">Local network address</string>
     <string name="settings.server_username">Username</string>
     <string name="settings.server_password">Password</string>
 	<string name="settings.server_open_browser">Open in browser</string>
diff --git a/src/github/daneren2005/dsub/activity/SettingsActivity.java b/src/github/daneren2005/dsub/activity/SettingsActivity.java
index a1a58758..d72430e5 100644
--- a/src/github/daneren2005/dsub/activity/SettingsActivity.java
+++ b/src/github/daneren2005/dsub/activity/SettingsActivity.java
@@ -322,6 +322,10 @@ public class SettingsActivity extends PreferenceActivity implements SharedPrefer
 
 		serverUrlPreference.setSummary(serverUrlPreference.getText());
 		screen.setSummary(serverUrlPreference.getText());
+		
+		final EditTextPreference serverLocalNetworkSSIDPreference = new EditTextPreference(this);
+		serverLocalNetworkSSIDPreference.setKey(Constants.PREFERENCES_KEY_SERVER_LOCAL_NETWORK_SSID + instance);
+		serverLocalNetworkSSIDPreference.setTitle(R.string.settings_server_local_network_ssid);
 
 		final EditTextPreference serverInternalUrlPreference = new EditTextPreference(this);
 		serverInternalUrlPreference.setKey(Constants.PREFERENCES_KEY_SERVER_INTERNAL_URL + instance);
@@ -402,6 +406,7 @@ public class SettingsActivity extends PreferenceActivity implements SharedPrefer
 
 		screen.addPreference(serverNamePreference);
 		screen.addPreference(serverUrlPreference);
+		screen.addPreference(serverLocalNetworkSSIDPreference);
 		screen.addPreference(serverInternalUrlPreference);
 		screen.addPreference(serverUsernamePreference);
 		screen.addPreference(serverPasswordPreference);
@@ -533,6 +538,7 @@ public class SettingsActivity extends PreferenceActivity implements SharedPrefer
     private class ServerSettings {
         private EditTextPreference serverName;
         private EditTextPreference serverUrl;
+        private EditTextPreference serverLocalNetworkSSID;
 		private EditTextPreference serverInternalUrl;
         private EditTextPreference username;
         private PreferenceScreen screen;
@@ -542,6 +548,7 @@ public class SettingsActivity extends PreferenceActivity implements SharedPrefer
             screen = (PreferenceScreen) findPreference("server" + instance);
             serverName = (EditTextPreference) findPreference(Constants.PREFERENCES_KEY_SERVER_NAME + instance);
             serverUrl = (EditTextPreference) findPreference(Constants.PREFERENCES_KEY_SERVER_URL + instance);
+            serverLocalNetworkSSID = (EditTextPreference) findPreference(Constants.PREFERENCES_KEY_SERVER_LOCAL_NETWORK_SSID + instance);
 			serverInternalUrl = (EditTextPreference) findPreference(Constants.PREFERENCES_KEY_SERVER_INTERNAL_URL + instance);
             username = (EditTextPreference) findPreference(Constants.PREFERENCES_KEY_USERNAME + instance);
 
@@ -594,6 +601,7 @@ public class SettingsActivity extends PreferenceActivity implements SharedPrefer
         public void update() {
             serverName.setSummary(serverName.getText());
             serverUrl.setSummary(serverUrl.getText());
+            serverLocalNetworkSSID.setSummary(serverLocalNetworkSSID.getText());
 			serverInternalUrl.setSummary(serverInternalUrl.getText());
             username.setSummary(username.getText());
             screen.setSummary(serverUrl.getText());
diff --git a/src/github/daneren2005/dsub/util/Constants.java b/src/github/daneren2005/dsub/util/Constants.java
index 6eb859a8..1e56fbd4 100644
--- a/src/github/daneren2005/dsub/util/Constants.java
+++ b/src/github/daneren2005/dsub/util/Constants.java
@@ -77,6 +77,7 @@ public final class Constants {
     public static final String PREFERENCES_KEY_SERVER_NAME = "serverName";
     public static final String PREFERENCES_KEY_SERVER_URL = "serverUrl";
 	public static final String PREFERENCES_KEY_SERVER_INTERNAL_URL = "serverInternalUrl";
+	public static final String PREFERENCES_KEY_SERVER_LOCAL_NETWORK_SSID = "serverLocalNetworkSSID";
 	public static final String PREFERENCES_KEY_SERVER_VERSION = "serverVersion";
 	public static final String PREFERENCES_KEY_TEST_CONNECTION = "serverTestConnection";
 	public static final String PREFERENCES_KEY_OPEN_BROWSER = "openBrowser";
diff --git a/src/github/daneren2005/dsub/util/Util.java b/src/github/daneren2005/dsub/util/Util.java
index 51e64686..a6c416ca 100644
--- a/src/github/daneren2005/dsub/util/Util.java
+++ b/src/github/daneren2005/dsub/util/Util.java
@@ -38,6 +38,7 @@ import android.media.AudioManager;
 import android.media.AudioManager.OnAudioFocusChangeListener;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
+import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
 import android.os.Build;
 import android.os.Environment;
@@ -65,6 +66,7 @@ import github.daneren2005.dsub.receiver.MediaButtonIntentReceiver;
 import github.daneren2005.dsub.service.DownloadFile;
 import github.daneren2005.dsub.service.DownloadService;
 import github.daneren2005.dsub.service.DownloadServiceImpl;
+
 import org.apache.http.HttpEntity;
 
 import java.io.ByteArrayOutputStream;
@@ -358,7 +360,9 @@ public final class Util {
 		StringBuilder builder = new StringBuilder();
 
 		String serverUrl = prefs.getString(Constants.PREFERENCES_KEY_SERVER_URL + instance, null);
-		if(allowAltAddress && Util.isWifiConnected(context)) {
+		if(allowAltAddress && 
+				(prefs.getString(Constants.PREFERENCES_KEY_SERVER_LOCAL_NETWORK_SSID + instance, "").equals("") && Util.isWifiConnected(context))
+				|| prefs.getString(Constants.PREFERENCES_KEY_SERVER_LOCAL_NETWORK_SSID + instance, "").equals(Util.getSSID(context))) {
 			String internalUrl = prefs.getString(Constants.PREFERENCES_KEY_SERVER_INTERNAL_URL + instance, null);
 			if(internalUrl != null && !"".equals(internalUrl) && !"http://".equals(internalUrl)) {
 				serverUrl = internalUrl;
@@ -847,6 +851,16 @@ public final class Util {
 		boolean connected = networkInfo != null && networkInfo.isConnected();
 		return connected && (networkInfo.getType() == ConnectivityManager.TYPE_WIFI);
 	}
+	public static String getSSID(Context context) {
+		if (isWifiConnected(context)) {
+			WifiManager wifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
+			if (wifiManager.getConnectionInfo() != null && wifiManager.getConnectionInfo().getSSID() != null) {
+				return wifiManager.getConnectionInfo().getSSID().replace("\"", "");
+			}
+			return null;
+		}
+		return null;
+	}
 
     public static boolean isExternalStoragePresent() {
         return Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState());
-- 
cgit v1.2.3


From d69727a894d32c23fae4e966f98d54634bb252f6 Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Tue, 14 Jan 2014 20:01:00 -0800
Subject: #49 Scroll album title if too long

---
 res/layout/select_album_header.xml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'res')

diff --git a/res/layout/select_album_header.xml b/res/layout/select_album_header.xml
index 14bdf365..8f5883bf 100644
--- a/res/layout/select_album_header.xml
+++ b/res/layout/select_album_header.xml
@@ -30,7 +30,16 @@
 			android:textAppearance="?android:attr/textAppearanceLarge"
 			android:textStyle="bold"
 			android:singleLine="true"
-			android:ellipsize="end"/>
+			android:ellipsize="marquee"
+			android:marqueeRepeatLimit="marquee_forever"
+			android:scrollHorizontally="true"
+			android:focusable="true"
+			android:focusableInTouchMode="true">
+
+			<requestFocus android:focusable="true"
+				android:focusableInTouchMode="true"
+				android:duplicateParentState="true" />
+		</TextView>
 
 		<TextView
 			android:text="This is the artist name"
-- 
cgit v1.2.3


From 7eedd18dec1c7613c035d9daab780bb515840f1d Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Wed, 15 Jan 2014 17:41:53 -0800
Subject: Make it more obvious when it's a server error

---
 res/values/strings.xml                                         | 1 +
 src/github/daneren2005/dsub/service/parser/AbstractParser.java | 3 +++
 2 files changed, 4 insertions(+)

(limited to 'res')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 33edb30b..d62e8ea9 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -436,6 +436,7 @@
     <string name="parser.not_authenticated">Wrong username or password.</string>
     <string name="parser.not_authorized">Not authorized. Check user permissions in Subsonic server.</string>
     <string name="parser.artist_count">Got %d artists.</string>
+	<string name="parser.server_error">Server error: %s</string>
 
     <string name="select_artist.refresh">Refresh</string>
     <string name="select_artist.folder">Select folder</string>
diff --git a/src/github/daneren2005/dsub/service/parser/AbstractParser.java b/src/github/daneren2005/dsub/service/parser/AbstractParser.java
index 1a457754..9db40dad 100644
--- a/src/github/daneren2005/dsub/service/parser/AbstractParser.java
+++ b/src/github/daneren2005/dsub/service/parser/AbstractParser.java
@@ -50,6 +50,9 @@ public abstract class AbstractParser {
         int code = getInteger("code");
         String message;
         switch (code) {
+			case 0:
+				message = context.getResources().getString(R.string.parser_server_error, get("message"));
+				break;
             case 20:
                 message = context.getResources().getString(R.string.parser_upgrade_client);
                 break;
-- 
cgit v1.2.3


From afc140247616764807523c0ea123d8708d9adec3 Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Thu, 16 Jan 2014 07:29:19 -0800
Subject: Minor tweaks to setttings layout

---
 res/values/strings.xml                                     | 2 +-
 src/github/daneren2005/dsub/activity/SettingsActivity.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'res')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index d2b06e3e..0c0623c6 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -244,7 +244,7 @@
     <string name="settings.server_unused">Unused</string>
     <string name="settings.server_name">Name</string>
     <string name="settings.server_address">Server address</string>
-	<string name="settings.server_local_network_ssid" >Local network</string>
+	<string name="settings.server_local_network_ssid" >Local network SSID</string>
 	<string name="settings.server_internal_address">Local network address</string>
     <string name="settings.server_username">Username</string>
     <string name="settings.server_password">Password</string>
diff --git a/src/github/daneren2005/dsub/activity/SettingsActivity.java b/src/github/daneren2005/dsub/activity/SettingsActivity.java
index d72430e5..92cf5d8f 100644
--- a/src/github/daneren2005/dsub/activity/SettingsActivity.java
+++ b/src/github/daneren2005/dsub/activity/SettingsActivity.java
@@ -406,13 +406,13 @@ public class SettingsActivity extends PreferenceActivity implements SharedPrefer
 
 		screen.addPreference(serverNamePreference);
 		screen.addPreference(serverUrlPreference);
-		screen.addPreference(serverLocalNetworkSSIDPreference);
 		screen.addPreference(serverInternalUrlPreference);
+		screen.addPreference(serverLocalNetworkSSIDPreference);
 		screen.addPreference(serverUsernamePreference);
 		screen.addPreference(serverPasswordPreference);
-		screen.addPreference(serverRemoveServerPreference);
 		screen.addPreference(serverTestConnectionPreference);
 		screen.addPreference(serverOpenBrowser);
+		screen.addPreference(serverRemoveServerPreference);
 
 		screen.setOrder(instance);
 
-- 
cgit v1.2.3


From 9f874cf673ee8ed82c70c5ae35b0ab4a0a2aa6ef Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Thu, 16 Jan 2014 08:25:33 -0800
Subject: Set dialog titles, give internal SSID hint

---
 res/values/strings.xml                                     |  1 +
 src/github/daneren2005/dsub/activity/SettingsActivity.java | 14 ++++++++++++++
 2 files changed, 15 insertions(+)

(limited to 'res')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0c0623c6..b1fbb3c3 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -245,6 +245,7 @@
     <string name="settings.server_name">Name</string>
     <string name="settings.server_address">Server address</string>
 	<string name="settings.server_local_network_ssid" >Local network SSID</string>
+	<string name="settings.server_local_network_ssid_hint">Current SSID: %s</string>
 	<string name="settings.server_internal_address">Local network address</string>
     <string name="settings.server_username">Username</string>
     <string name="settings.server_password">Password</string>
diff --git a/src/github/daneren2005/dsub/activity/SettingsActivity.java b/src/github/daneren2005/dsub/activity/SettingsActivity.java
index 92cf5d8f..9d0b5bbd 100644
--- a/src/github/daneren2005/dsub/activity/SettingsActivity.java
+++ b/src/github/daneren2005/dsub/activity/SettingsActivity.java
@@ -82,6 +82,7 @@ public class SettingsActivity extends PreferenceActivity implements SharedPrefer
 	private EditTextPreference chatRefreshRate;
 	private ListPreference videoPlayer;
 	private ListPreference syncInterval;
+	private String internalSSID;
 	
 	private int serverCount = 3;
 	private SharedPreferences settings;
@@ -93,6 +94,12 @@ public class SettingsActivity extends PreferenceActivity implements SharedPrefer
         super.onCreate(savedInstanceState);
         addPreferencesFromResource(R.xml.settings);
 
+		internalSSID = Util.getSSID(this);
+		if(internalSSID == null) {
+			internalSSID = "";
+		}
+		internalSSID = this.getResources().getString(R.string.settings_server_local_network_ssid_hint, internalSSID);
+
         theme = (ListPreference) findPreference(Constants.PREFERENCES_KEY_THEME);
         maxBitrateWifi = (ListPreference) findPreference(Constants.PREFERENCES_KEY_MAX_BITRATE_WIFI);
         maxBitrateMobile = (ListPreference) findPreference(Constants.PREFERENCES_KEY_MAX_BITRATE_MOBILE);
@@ -303,6 +310,7 @@ public class SettingsActivity extends PreferenceActivity implements SharedPrefer
 		serverNamePreference.setKey(Constants.PREFERENCES_KEY_SERVER_NAME + instance);
 		serverNamePreference.setDefaultValue(getResources().getString(R.string.settings_server_unused));
 		serverNamePreference.setTitle(R.string.settings_server_name);
+		serverNamePreference.setDialogTitle(R.string.settings_server_name);
 
 		if (serverNamePreference.getText() == null) {
 			serverNamePreference.setText(getResources().getString(R.string.settings_server_unused));
@@ -315,6 +323,7 @@ public class SettingsActivity extends PreferenceActivity implements SharedPrefer
 		serverUrlPreference.getEditText().setInputType(InputType.TYPE_TEXT_VARIATION_URI);
 		serverUrlPreference.setDefaultValue("http://yourhost");
 		serverUrlPreference.setTitle(R.string.settings_server_address);
+		serverUrlPreference.setDialogTitle(R.string.settings_server_address);
 
 		if (serverUrlPreference.getText() == null) {
 			serverUrlPreference.setText("http://yourhost");
@@ -326,23 +335,28 @@ public class SettingsActivity extends PreferenceActivity implements SharedPrefer
 		final EditTextPreference serverLocalNetworkSSIDPreference = new EditTextPreference(this);
 		serverLocalNetworkSSIDPreference.setKey(Constants.PREFERENCES_KEY_SERVER_LOCAL_NETWORK_SSID + instance);
 		serverLocalNetworkSSIDPreference.setTitle(R.string.settings_server_local_network_ssid);
+		serverLocalNetworkSSIDPreference.setDialogTitle(R.string.settings_server_local_network_ssid);
+		serverLocalNetworkSSIDPreference.setDialogMessage(internalSSID);
 
 		final EditTextPreference serverInternalUrlPreference = new EditTextPreference(this);
 		serverInternalUrlPreference.setKey(Constants.PREFERENCES_KEY_SERVER_INTERNAL_URL + instance);
 		serverInternalUrlPreference.getEditText().setInputType(InputType.TYPE_TEXT_VARIATION_URI);
 		serverInternalUrlPreference.setDefaultValue("http://");
 		serverInternalUrlPreference.setTitle(R.string.settings_server_internal_address);
+		serverInternalUrlPreference.setDialogTitle(R.string.settings_server_internal_address);
 		serverInternalUrlPreference.setSummary(serverInternalUrlPreference.getText());
 
 		final EditTextPreference serverUsernamePreference = new EditTextPreference(this);
 		serverUsernamePreference.setKey(Constants.PREFERENCES_KEY_USERNAME + instance);
 		serverUsernamePreference.setTitle(R.string.settings_server_username);
+		serverUsernamePreference.setDialogTitle(R.string.settings_server_username);
 
 		final EditTextPreference serverPasswordPreference = new EditTextPreference(this);
 		serverPasswordPreference.setKey(Constants.PREFERENCES_KEY_PASSWORD + instance);
 		serverPasswordPreference.getEditText().setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
 		serverPasswordPreference.setSummary("***");
 		serverPasswordPreference.setTitle(R.string.settings_server_password);
+		serverPasswordPreference.setDialogTitle(R.string.settings_server_password);
 		
 		final Preference serverOpenBrowser = new Preference(this);
 		serverOpenBrowser.setKey(Constants.PREFERENCES_KEY_OPEN_BROWSER);
-- 
cgit v1.2.3


From f9612cbea3869b87d52772149d391286aae08640 Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Thu, 16 Jan 2014 20:30:03 -0800
Subject: #244 Move sync to own section, disable when enable is unchecked

---
 res/xml/settings.xml                               | 39 +++++++++++++---------
 .../dsub/activity/SettingsActivity.java            | 28 ++++++++++++++++
 2 files changed, 51 insertions(+), 16 deletions(-)

(limited to 'res')

diff --git a/res/xml/settings.xml b/res/xml/settings.xml
index 5d1a1ce6..30b2e584 100644
--- a/res/xml/settings.xml
+++ b/res/xml/settings.xml
@@ -206,6 +206,25 @@
 				android:persistent="false"/>
 		</PreferenceCategory>
 
+		<PreferenceCategory
+			android:title="@string/settings.other_title">
+
+			<CheckBoxPreference
+				android:title="@string/settings.hide_media_title"
+				android:summary="@string/settings.hide_media_summary"
+				android:key="hideMedia"
+				android:defaultValue="false"/>
+
+			<CheckBoxPreference
+				android:title="@string/settings.screen_lit_title"
+				android:summary="@string/settings.screen_lit_summary"
+				android:key="screenLitOnDownload"
+				android:defaultValue="true"/>
+		</PreferenceCategory>
+	</PreferenceScreen>
+
+	<PreferenceScreen
+		android:title="@string/settings.sync_title">
 		<PreferenceCategory
 			android:title="@string/settings.sync_title">
 
@@ -233,6 +252,10 @@
 				android:summary="@string/settings.sync_notification_summary"
 				android:key="syncNotification"
 				android:defaultValue="true"/>
+		</PreferenceCategory>
+
+		<PreferenceCategory
+			android:title="@string/settings.other_title">
 
 			<CheckBoxPreference
 				android:title="@string/settings.sync_starred"
@@ -246,22 +269,6 @@
 				android:key="syncMostRecent"
 				android:defaultValue="false"/>
 		</PreferenceCategory>
-
-		<PreferenceCategory
-			android:title="@string/settings.other_title">
-
-			<CheckBoxPreference
-				android:title="@string/settings.hide_media_title"
-				android:summary="@string/settings.hide_media_summary"
-				android:key="hideMedia"
-				android:defaultValue="false"/>
-
-			<CheckBoxPreference
-				android:title="@string/settings.screen_lit_title"
-				android:summary="@string/settings.screen_lit_summary"
-				android:key="screenLitOnDownload"
-				android:defaultValue="true"/>
-		</PreferenceCategory>
 	</PreferenceScreen>
 
 	<PreferenceScreen
diff --git a/src/github/daneren2005/dsub/activity/SettingsActivity.java b/src/github/daneren2005/dsub/activity/SettingsActivity.java
index 9d0b5bbd..b5524ccf 100644
--- a/src/github/daneren2005/dsub/activity/SettingsActivity.java
+++ b/src/github/daneren2005/dsub/activity/SettingsActivity.java
@@ -28,6 +28,7 @@ import android.content.SharedPreferences;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
+import android.preference.CheckBoxPreference;
 import android.preference.EditTextPreference;
 import android.preference.ListPreference;
 import android.preference.Preference;
@@ -82,6 +83,11 @@ public class SettingsActivity extends PreferenceActivity implements SharedPrefer
 	private EditTextPreference chatRefreshRate;
 	private ListPreference videoPlayer;
 	private ListPreference syncInterval;
+	private CheckBoxPreference syncEnabled;
+	private CheckBoxPreference syncWifi;
+	private CheckBoxPreference syncNotification;
+	private CheckBoxPreference syncStarred;
+	private CheckBoxPreference syncMostRecent;
 	private String internalSSID;
 	
 	private int serverCount = 3;
@@ -119,6 +125,11 @@ public class SettingsActivity extends PreferenceActivity implements SharedPrefer
 		chatRefreshRate = (EditTextPreference) findPreference(Constants.PREFERENCES_KEY_CHAT_REFRESH);
 		videoPlayer = (ListPreference) findPreference(Constants.PREFERENCES_KEY_VIDEO_PLAYER);
 		syncInterval = (ListPreference) findPreference(Constants.PREFERENCES_KEY_SYNC_INTERVAL);
+		syncEnabled = (CheckBoxPreference) findPreference(Constants.PREFERENCES_KEY_SYNC_ENABLED);
+		syncWifi = (CheckBoxPreference) findPreference(Constants.PREFERENCES_KEY_SYNC_WIFI);
+		syncNotification = (CheckBoxPreference) findPreference(Constants.PREFERENCES_KEY_SYNC_NOTIFICATION);
+		syncStarred = (CheckBoxPreference) findPreference(Constants.PREFERENCES_KEY_SYNC_STARRED);
+		syncMostRecent = (CheckBoxPreference) findPreference(Constants.PREFERENCES_KEY_SYNC_MOST_RECENT);
 		
 		settings = Util.getPreferences(this);
 		serverCount = settings.getInt(Constants.PREFERENCES_KEY_SERVER_COUNT, 3);
@@ -296,6 +307,23 @@ public class SettingsActivity extends PreferenceActivity implements SharedPrefer
 		chatRefreshRate.setSummary(chatRefreshRate.getText());
 		videoPlayer.setSummary(videoPlayer.getEntry());
 		syncInterval.setSummary(syncInterval.getEntry());
+		if(syncEnabled.isChecked()) {
+			if(!syncInterval.isEnabled()) {
+				syncInterval.setEnabled(true);
+				syncWifi.setEnabled(true);
+				syncNotification.setEnabled(true);
+				syncStarred.setEnabled(true);
+				syncMostRecent.setEnabled(true);
+			}
+		} else {
+			if(syncInterval.isEnabled()) {
+				syncInterval.setEnabled(false);
+				syncWifi.setEnabled(false);
+				syncNotification.setEnabled(false);
+				syncStarred.setEnabled(false);
+				syncMostRecent.setEnabled(false);
+			}
+		}
         for (ServerSettings ss : serverSettings.values()) {
             ss.update();
         }
-- 
cgit v1.2.3


From f8cb776d39093ad122089968026cf1056a37d0bb Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Sun, 19 Jan 2014 13:38:19 -0800
Subject: Update 4.3.6

---
 AndroidManifest.xml   | 4 ++--
 res/raw/changelog.xml | 8 ++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'res')

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ab3b9d12..fa422193 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="github.daneren2005.dsub"
           android:installLocation="internalOnly"
-          android:versionCode="80"
-          android:versionName="4.3.5">
+          android:versionCode="81"
+          android:versionName="4.3.6">
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
diff --git a/res/raw/changelog.xml b/res/raw/changelog.xml
index 0f1a0c46..c07419af 100644
--- a/res/raw/changelog.xml
+++ b/res/raw/changelog.xml
@@ -1,5 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog>
+	<release version="4.3.6" versioncode="81" releasedate="1/19/2014">
+		<change>Added optional SSID to use for local network address (requires new permission: ACCESS_WIFI_STATE)</change>
+		<change>Fix not being able to clear local network address</change>
+		<change>Fix Galaxy S3 issues</change>
+		<change>Hide star button on now playing screen if hidden in settings</change>
+		<change>Fix podcasts not being clickable in offline mode</change>
+		<change>Bunch of minor improvements/bugfixes</change>
+	</release>
 	<release version="4.3.5" versioncode="80" releasedate="1/11/2014">
 		<change>Fix downloads not limiting bitrate correctly</change>
 	</release>
-- 
cgit v1.2.3