From e0cb5de9f0c164f79254eb289d22bfb3d2a35d20 Mon Sep 17 00:00:00 2001 From: Mark Adamson Date: Tue, 14 Jan 2014 22:40:01 +0000 Subject: Added optional "local network SSID" to server settings --- res/values/strings.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'res/values/strings.xml') 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 @@ Unused Name Server address - Internal network address + Local network + Local network address Username Password Open in browser -- cgit v1.2.3 From 7eedd18dec1c7613c035d9daab780bb515840f1d Mon Sep 17 00:00:00 2001 From: Scott Jackson 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/values/strings.xml') 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 @@ Wrong username or password. Not authorized. Check user permissions in Subsonic server. Got %d artists. + Server error: %s Refresh Select folder 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 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/values/strings.xml') 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 @@ Unused Name Server address - Local network + Local network SSID Local network address Username Password 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 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/values/strings.xml') 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 @@ Name Server address Local network SSID + Current SSID: %s Local network address Username Password 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