#519 Synchronize on WiFi only

- Simplify setting

3 files changed, 2 insertions, 14 deletions

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/PreferencesFragment.java b/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/PreferencesFragment.java
index a3050733..91fc45f8 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/PreferencesFragment.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/PreferencesFragment.java
@@ -42,18 +42,8 @@ public class PreferencesFragment extends PreferenceFragment {
         });
 
         final SwitchPreference wifiOnlyPref = (SwitchPreference) findPreference(getString(R.string.pref_key_wifi_only));
-        wifiOnlyPref.setSummary(
-                sp.getBoolean(getString(R.string.pref_key_wifi_only), false)
-                        ? getString(R.string.pref_value_wifi_only)
-                        : getString(R.string.pref_value_wifi_and_mobile)
-        );
         wifiOnlyPref.setOnPreferenceChangeListener((Preference preference, Object newValue) -> {
             Boolean syncOnWifiOnly = (Boolean) newValue;
-            wifiOnlyPref.setSummary(
-                    syncOnWifiOnly
-                            ? getString(R.string.pref_value_wifi_only)
-                            : getString(R.string.pref_value_wifi_and_mobile)
-            );
             Log.v("Notes", "syncOnWifiOnly: " + syncOnWifiOnly);
             return true;
         });
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9eb4dad8..9ac79674 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -56,7 +56,7 @@
     <string name="settings_note_mode">Display mode for notes</string>
     <string name="settings_theme_title">Theme</string>
     <string name="settings_font_title">Monospace font</string>
-    <string name="settings_theme_wifi_only">Sync</string>
+    <string name="settings_theme_wifi_only">Sync only on Wi-Fi</string>
     <string name="settings_cert_category">Manage certificates</string>
     <string name="settings_cert_trust_system">Trust system certificates</string>
     <string name="settings_cert_trust_system_on">System and user-added CAs will be trusted (recommended)</string>
@@ -151,7 +151,6 @@
     <string name="pref_value_theme_light">Light</string>
     <string name="pref_value_theme_dark">Dark</string>
     <string name="pref_value_font_normal">Normal</string>
-    <string name="pref_value_wifi_only">Sync only on Wi-Fi</string>
     <string name="pref_value_wifi_and_mobile">Sync on Wi-Fi and mobile data</string>
 
     <!-- Array: note modes -->
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 46870cae..fed4986a 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -22,7 +22,6 @@
         android:defaultValue="@string/pref_value_wifi_and_mobile"
         android:icon="@drawable/ic_sync_black_24dp"
         android:key="@string/pref_key_wifi_only"
-        android:summary="%s"
         android:title="@string/settings_theme_wifi_only" />
 
     <SwitchPreference
@@ -31,13 +30,13 @@
         android:key="@string/pref_key_theme"
         android:summary="%s"
         android:title="@string/settings_theme_title" />
+
     <SwitchPreference
         android:defaultValue="@string/pref_value_font_normal"
         android:icon="@drawable/ic_text_fields_black_24dp"
         android:key="@string/pref_key_font"
         android:title="@string/settings_font_title" />
 
-
     <PreferenceScreen
         android:key="@string/pref_key_certs"
         android:persistent="false"