nutomic/syncthing-android
1
0
Fork 0
mirror of https://github.com/syncthing/syncthing-android.git synced 2024-11-23 04:41:16 +00:00
Code Releases Activity

Don't set preference value as summary

Browse source
This commit is contained in:
Felix Ableitner 2016-08-21 13:36:31 +02:00
parent 926a5a7d21
commit f3abfb15f5
1 changed files with 0 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/main/java/com/nutomic/syncthingandroid/fragments/SettingsFragment.java
View file

@ -108,7 +108,6 @@ public class SettingsFragment extends PreferenceFragment
private void applyPreference(Preference pref, String value) { private void applyPreference(Preference pref, String value) {
if (pref instanceof EditTextPreference) { if (pref instanceof EditTextPreference) {
((EditTextPreference) pref).setText(value); ((EditTextPreference) pref).setText(value);
pref.setSummary(value);
} else if (pref instanceof CheckBoxPreference) { } else if (pref instanceof CheckBoxPreference) {
((CheckBoxPreference) pref).setChecked(Boolean.parseBoolean(value)); ((CheckBoxPreference) pref).setChecked(Boolean.parseBoolean(value));
} }
@ -163,13 +162,6 @@ public class SettingsFragment extends PreferenceFragment
user.setOnPreferenceChangeListener(this); user.setOnPreferenceChangeListener(this);
password.setOnPreferenceChangeListener(this); password.setOnPreferenceChangeListener(this);
sttrace.setOnPreferenceChangeListener(this); sttrace.setOnPreferenceChangeListener(this);
// Force summary update and wifi/charging preferences enable/disable.
SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getActivity());
onPreferenceChange(mAlwaysRunInBackground, mAlwaysRunInBackground.isChecked());
onPreferenceChange(mSyncOnlyOnSSIDs, sp.getStringSet("sync_only_wifi_ssids_set", new TreeSet<String>()));
user.setSummary(sp.getString("gui_user", ""));
sttrace.setSummary(sp.getString("sttrace", ""));
} }
/** /**
@ -225,21 +217,6 @@ public class SettingsFragment extends PreferenceFragment
*/ */
@Override @Override
public boolean onPreferenceChange(Preference preference, Object o) { public boolean onPreferenceChange(Preference preference, Object o) {
// Convert new value to integer if input type is number.
if (preference instanceof EditTextPreference && !preference.getKey().equals(GUI_PASSWORD)) {
EditTextPreference pref = (EditTextPreference) preference;
if ((pref.getEditText().getInputType() & InputType.TYPE_CLASS_NUMBER) > 0) {
try {
o = Integer.parseInt((String) o);
o = o.toString();
} catch (NumberFormatException e) {
Log.w(TAG, "invalid number: " + o);
return false;
}
}
pref.setSummary((String) o);
}
boolean requireRestart = false; boolean requireRestart = false;
if (preference.equals(mAlwaysRunInBackground)) { if (preference.equals(mAlwaysRunInBackground)) {
@ -257,11 +234,6 @@ public class SettingsFragment extends PreferenceFragment
} }
} else if (preference.equals(mSyncOnlyWifi)) { } else if (preference.equals(mSyncOnlyWifi)) {
mSyncOnlyOnSSIDs.setEnabled((Boolean) o); mSyncOnlyOnSSIDs.setEnabled((Boolean) o);
} else if (preference.equals(mSyncOnlyOnSSIDs)) {
String ssids = formatWifiNameList((Set<String>) o);
mSyncOnlyOnSSIDs.setSummary(ssids.isEmpty()
? getString(R.string.sync_only_wifi_ssids_all)
: getString(R.string.sync_only_wifi_ssids_values, ssids));
} else if (preference.getKey().equals(DEVICE_NAME_KEY)) { } else if (preference.getKey().equals(DEVICE_NAME_KEY)) {
RestApi.Device old = mSyncthingService.getApi().getLocalDevice(); RestApi.Device old = mSyncthingService.getApi().getLocalDevice();
RestApi.Device updated = new RestApi.Device(); RestApi.Device updated = new RestApi.Device();