cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bug with KeyserverSyncManager updates in SettingsActivity

Browse Source
This commit is contained in:
Vincent Breitmoser
2018-07-13 14:32:58 +02:00
parent 4f4be8ed47
commit c7bef6efda
2 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keysync/KeyserverSyncManager.java
View File

@@ -55,8 +55,6 @@ public class KeyserverSyncManager {
return; return;
} }
/* Periodic syncs can't be unique, so we just use this to launch a uniquely queued worker */
Builder constraints = new Builder() Builder constraints = new Builder()
.setRequiredNetworkType(prefs.getWifiOnlySync() ? NetworkType.UNMETERED : NetworkType.CONNECTED) .setRequiredNetworkType(prefs.getWifiOnlySync() ? NetworkType.UNMETERED : NetworkType.CONNECTED)
.setRequiresBatteryNotLow(true); .setRequiresBatteryNotLow(true);

13
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SettingsActivity.java
View File

@@ -399,8 +399,6 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
* This fragment shows the keyserver/wifi-only-sync/contacts sync preferences * This fragment shows the keyserver/wifi-only-sync/contacts sync preferences
*/ */
public static class SyncPrefsFragment extends PresetPreferenceFragment { public static class SyncPrefsFragment extends PresetPreferenceFragment {
boolean syncPrefChanged = false;
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
@@ -410,19 +408,14 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
findPreference(Constants.Pref.SYNC_KEYSERVER).setOnPreferenceChangeListener( findPreference(Constants.Pref.SYNC_KEYSERVER).setOnPreferenceChangeListener(
(preference, newValue) -> { (preference, newValue) -> {
syncPrefChanged = true;
return true; return true;
}); });
} }
@Override @Override
public void onPause() { public void onStop() {
super.onPause(); super.onStop();
KeyserverSyncManager.updateKeyserverSyncSchedule(getActivity(), true);
if (syncPrefChanged) {
KeyserverSyncManager.updateKeyserverSyncSchedule(getActivity(), true);
syncPrefChanged = false;
}
} }
@Override @Override