nutomic/syncthing-android
1
0
Fork 0
mirror of https://github.com/syncthing/syncthing-android.git synced 2025-01-11 04:25:53 +00:00
Code Releases Activity

Implement mPendingRunConditions in SettingsActivity

Browse source 
to queue run condition changes until the user leaves
the preferences screen after making changes. (fixes #1196)
This commit is contained in:
Catfriend1 2018-07-26 12:56:48 +02:00
parent 6579e2ea94
commit 84dfbf9a6b
2 changed files with 36 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
app/src/main/java/com/nutomic/syncthingandroid/activities/SettingsActivity.java
View file

@ -99,6 +99,7 @@ public class SettingsActivity extends SyncthingActivity {
@Inject NotificationHandler mNotificationHandler; @Inject NotificationHandler mNotificationHandler;
@Inject SharedPreferences mPreferences; @Inject SharedPreferences mPreferences;
private Preference mCategoryRunConditions;
private CheckBoxPreference mAlwaysRunInBackground; private CheckBoxPreference mAlwaysRunInBackground;
private ListPreference mPowerSource; private ListPreference mPowerSource;
private CheckBoxPreference mRunOnMobileData; private CheckBoxPreference mRunOnMobileData;
@ -140,6 +141,12 @@ public class SettingsActivity extends SyncthingActivity {
private Boolean mPendingConfig = false; private Boolean mPendingConfig = false;
/**
* Indicates if run conditions were changed and need to be
* re-evaluated when the user leaves the preferences screen.
*/
private Boolean mPendingRunConditions = false;
@Override @Override
public void onCreate(@Nullable Bundle savedInstanceState) { public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
@ -227,10 +234,11 @@ public class SettingsActivity extends SyncthingActivity {
mRunOnMeteredWifi.setEnabled(mRunOnWifi.isChecked()); mRunOnMeteredWifi.setEnabled(mRunOnWifi.isChecked());
mWifiSsidWhitelist.setEnabled(mRunOnWifi.isChecked()); mWifiSsidWhitelist.setEnabled(mRunOnWifi.isChecked());
setPreferenceCategoryChangeListener(findPreference("category_run_conditions"), this);
mCategorySyncthingOptions = findPreference("category_syncthing_options"); mCategorySyncthingOptions = findPreference("category_syncthing_options");
setPreferenceCategoryChangeListener(mCategorySyncthingOptions, this::onSyncthingPreferenceChange); setPreferenceCategoryChangeListener(mCategorySyncthingOptions, this::onSyncthingPreferenceChange);
mCategoryRunConditions = findPreference("category_run_conditions");
setPreferenceCategoryChangeListener(mCategoryRunConditions, this::onRunConditionPreferenceChange);
exportConfig.setOnPreferenceClickListener(this); exportConfig.setOnPreferenceClickListener(this);
importConfig.setOnPreferenceClickListener(this); importConfig.setOnPreferenceClickListener(this);
@ -354,6 +362,28 @@ public class SettingsActivity extends SyncthingActivity {
} }
} }
public boolean onRunConditionPreferenceChange(Preference preference, Object o) {
switch (preference.getKey()) {
case Constants.PREF_POWER_SOURCE:
mPowerSource.setValue(o.toString());
preference.setSummary(mPowerSource.getEntry());
break;
case Constants.PREF_RUN_ON_WIFI:
mRunOnMeteredWifi.setEnabled((Boolean) o);
mWifiSsidWhitelist.setEnabled((Boolean) o);
break;
case Constants.PREF_WIFI_SSID_WHITELIST:
String wifiSsidSummary = TextUtils.join(", ", (Set<String>) o);
preference.setSummary(TextUtils.isEmpty(wifiSsidSummary) ?
getString(R.string.run_on_all_wifi_networks) :
getString(R.string.run_on_whitelisted_wifi_networks, wifiSsidSummary)
);
break;
}
mPendingRunConditions = true;
return true;
}
public boolean onSyncthingPreferenceChange(Preference preference, Object o) { public boolean onSyncthingPreferenceChange(Preference preference, Object o) {
Splitter splitter = Splitter.on(",").trimResults().omitEmptyStrings(); Splitter splitter = Splitter.on(",").trimResults().omitEmptyStrings();
switch (preference.getKey()) { switch (preference.getKey()) {
@ -432,6 +462,11 @@ public class SettingsActivity extends SyncthingActivity {
mPendingConfig = false; mPendingConfig = false;
} }
} }
if (mPendingRunConditions) {
if (mSyncthingService != null) {
mSyncthingService.reEvaluateRunConditions();
}
}
super.onStop(); super.onStop();
} }
@ -442,21 +477,6 @@ public class SettingsActivity extends SyncthingActivity {
@Override @Override
public boolean onPreferenceChange(Preference preference, Object o) { public boolean onPreferenceChange(Preference preference, Object o) {
switch (preference.getKey()) { switch (preference.getKey()) {
case Constants.PREF_POWER_SOURCE:
mPowerSource.setValue(o.toString());
preference.setSummary(mPowerSource.getEntry());
break;
case Constants.PREF_RUN_ON_WIFI:
mRunOnMeteredWifi.setEnabled((Boolean) o);
mWifiSsidWhitelist.setEnabled((Boolean) o);
break;
case Constants.PREF_WIFI_SSID_WHITELIST:
String wifiSsidSummary = TextUtils.join(", ", (Set<String>) o);
preference.setSummary(TextUtils.isEmpty(wifiSsidSummary) ?
getString(R.string.run_on_all_wifi_networks) :
getString(R.string.run_on_whitelisted_wifi_networks, wifiSsidSummary)
);
break;
case Constants.PREF_DEBUG_FACILITIES_ENABLED: case Constants.PREF_DEBUG_FACILITIES_ENABLED:
mPendingConfig = true; mPendingConfig = true;
break; break;

1
app/src/main/java/com/nutomic/syncthingandroid/service/RunConditionMonitor.java
View file

@ -15,7 +15,6 @@ import android.net.wifi.WifiManager;
import android.os.BatteryManager; import android.os.BatteryManager;
import android.os.Build; import android.os.Build;
import android.os.PowerManager; import android.os.PowerManager;
import android.preference.PreferenceManager;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import android.support.v4.content.LocalBroadcastManager; import android.support.v4.content.LocalBroadcastManager;
import android.util.Log; import android.util.Log;