diff --git a/app/src/main/java/com/nutomic/syncthingandroid/activities/SettingsActivity.java b/app/src/main/java/com/nutomic/syncthingandroid/activities/SettingsActivity.java index 5baa6f1dc..edcccded8 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/activities/SettingsActivity.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/activities/SettingsActivity.java @@ -126,7 +126,6 @@ public static class SettingsFragment extends PreferenceFragment private CheckBoxPreference mRelaysEnabled; private EditTextPreference mGlobalAnnounceServers; private EditTextPreference mAddress; - private CheckBoxPreference mRestartOnWakeup; private CheckBoxPreference mUrAccepted; private Preference mCategoryBackup; @@ -214,7 +213,6 @@ public void onActivityCreated(Bundle savedInstanceState) { mRelaysEnabled = (CheckBoxPreference) findPreference("relaysEnabled"); mGlobalAnnounceServers = (EditTextPreference) findPreference("globalAnnounceServers"); mAddress = (EditTextPreference) findPreference("address"); - mRestartOnWakeup = (CheckBoxPreference) findPreference("restartOnWakeup"); mUrAccepted = (CheckBoxPreference) findPreference("urAccepted"); mCategoryBackup = findPreference("category_backup"); @@ -352,7 +350,6 @@ public void onServiceStateChange(SyncthingService.State currentState) { mRelaysEnabled.setChecked(mOptions.relaysEnabled); mGlobalAnnounceServers.setText(joiner.join(mOptions.globalAnnounceServers)); mAddress.setText(mGui.address); - mRestartOnWakeup.setChecked(mOptions.restartOnWakeup); mApi.getSystemInfo(systemInfo -> mUrAccepted.setChecked(mOptions.isUsageReportingAccepted(systemInfo.urVersionMax))); } @@ -457,9 +454,6 @@ public boolean onSyncthingPreferenceChange(Preference preference, Object o) { case "address": mGui.address = (String) o; break; - case "restartOnWakeup": - mOptions.restartOnWakeup = (boolean) o; - break; case "urAccepted": mApi.getSystemInfo(systemInfo -> { mOptions.urAccepted = ((boolean) o) diff --git a/app/src/main/java/com/nutomic/syncthingandroid/model/Options.java b/app/src/main/java/com/nutomic/syncthingandroid/model/Options.java index c47900297..c876cc85a 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/model/Options.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/model/Options.java @@ -22,7 +22,6 @@ public class Options { public String urURL; public boolean urPostInsecurely; public int urInitialDelayS; - public boolean restartOnWakeup; public int autoUpgradeIntervalH; public int keepTemporariesH; public boolean cacheIgnoredFiles; diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6dccc15ae..338c9ba62 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -478,10 +478,6 @@ Please report any problems you encounter via Github. Force Syncthing to use legacy hashing package for compatibility purposes - Restart on Wakeup - - Default: Enabled. Disabling this feature may result in folder scans and device reconnects being delayed to save battery. - Do you really want to export your configuration? Existing files will be overwritten.\n\nWARNING! Other applications may be able to read the private key from the backup location and use it to download/modify synchronized files. diff --git a/app/src/main/res/xml/app_settings.xml b/app/src/main/res/xml/app_settings.xml index fcba73bea..f8575d8ed 100644 --- a/app/src/main/res/xml/app_settings.xml +++ b/app/src/main/res/xml/app_settings.xml @@ -166,12 +166,6 @@ android:persistent="false" android:inputType="textNoSuggestions" /> - -