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

Fixed settings not being enabled after restart

Browse source
This commit is contained in:
Felix Ableitner 2016-11-10 23:39:24 +09:00
parent 2ecca8f1bd
commit a3c30f4ac6
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -157,16 +157,17 @@ public class SettingsFragment extends PreferenceFragment
@Override @Override
public void onApiChange(SyncthingService.State currentState) { public void onApiChange(SyncthingService.State currentState) {
boolean enabled = currentState == SyncthingService.State.ACTIVE; boolean syncthingActive = currentState == SyncthingService.State.ACTIVE;
if (!enabled || !mSyncthingService.getApi().isConfigLoaded()) { boolean enableAllPrefs = syncthingActive && mSyncthingService.getApi().isConfigLoaded();
PreferenceScreen ps = getPreferenceScreen(); PreferenceScreen ps = getPreferenceScreen();
for (int i = 0; i < ps.getPreferenceCount(); i++) { for (int i = 0; i < ps.getPreferenceCount(); i++) {
Preference p = ps.getPreference(i); Preference p = ps.getPreference(i);
p.setEnabled("category_run_conditions".equals(p.getKey())); p.setEnabled(enableAllPrefs || "category_run_conditions".equals(p.getKey()));
}
return;
} }
if (!enableAllPrefs)
return;
mApi = mSyncthingService.getApi(); mApi = mSyncthingService.getApi();
mSyncthingVersion.setSummary(mApi.getVersion()); mSyncthingVersion.setSummary(mApi.getVersion());
mOptions = mApi.getOptions(); mOptions = mApi.getOptions();