Funkwhale
/
ultrasonic-app-subsonic-android
mirror of https://github.com/ultrasonic/ultrasonic
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #193 from ultrasonic/remove-default-server-settings 

Default server settings removed
This commit is contained in:
Yahor Berdnikau 2018-04-08 15:05:18 +02:00 committed by GitHub
parent d35888213b 8b58691246
commit 89cdb689c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ultrasonic/src/main/java/org/moire/ultrasonic/fragment/ServerSettingsFragment.java
View File

@ -193,20 +193,20 @@ public class ServerSettingsFragment extends PreferenceFragment
private void updatePassword() { private void updatePassword() {
serverPasswordPref.setText(sharedPreferences serverPasswordPref.setText(sharedPreferences
.getString(Constants.PREFERENCES_KEY_PASSWORD + serverId, "***")); .getString(Constants.PREFERENCES_KEY_PASSWORD + serverId,
serverPasswordPref.setSummary("***"); ""));
} }
private void updateUsername() { private void updateUsername() {
serverUsernamePref.setText(sharedPreferences serverUsernamePref.setText(sharedPreferences
.getString(Constants.PREFERENCES_KEY_USERNAME + serverId, .getString(Constants.PREFERENCES_KEY_USERNAME + serverId,
getString(R.string.settings_server_username))); ""));
} }
private void updateUrl() { private void updateUrl() {
final String serverUrl = sharedPreferences final String serverUrl = sharedPreferences
.getString(Constants.PREFERENCES_KEY_SERVER_URL + serverId, .getString(Constants.PREFERENCES_KEY_SERVER_URL + serverId,
getString(R.string.settings_server_address_unset)); "http://");
serverUrlPref.setText(serverUrl); serverUrlPref.setText(serverUrl);
serverUrlPref.setSummary(serverUrl); serverUrlPref.setSummary(serverUrl);
} }
@ -214,7 +214,7 @@ public class ServerSettingsFragment extends PreferenceFragment
private void updateName() { private void updateName() {
final String serverName = sharedPreferences final String serverName = sharedPreferences
.getString(Constants.PREFERENCES_KEY_SERVER_NAME + serverId, .getString(Constants.PREFERENCES_KEY_SERVER_NAME + serverId,
getString(R.string.settings_server_unused)); "");
serverNamePref.setText(serverName); serverNamePref.setText(serverName);
serverNamePref.setSummary(serverName); serverNamePref.setSummary(serverName);
} }

1
ultrasonic/src/main/res/xml/server_settings.xml
View File

@ -29,7 +29,6 @@
android:key="@string/settings.server_password" android:key="@string/settings.server_password"
android:persistent="false" android:persistent="false"
android:inputType="textPassword" android:inputType="textPassword"
android:summary="***"
android:title="@string/settings.server_password" android:title="@string/settings.server_password"
/> />
<CheckBoxPreference <CheckBoxPreference