mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Revert "Halt early when not enabled" 

This reverts commit 48603f20b6.
This commit is contained in:
M66B 2018-10-13 10:30:56 +00:00
parent 48603f20b6
commit 8efdee1e8a
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/eu/faircode/email/FragmentOptions.java
View File

@ -61,7 +61,7 @@ public class FragmentOptions extends FragmentEx {
@Override
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
prefs.edit().putBoolean("enabled", checked).apply();
ServiceSynchronize.start(getContext());
ServiceSynchronize.reload(getContext(), "enabled");
}
});

14
app/src/main/java/eu/faircode/email/ServiceSynchronize.java
View File

@ -179,13 +179,6 @@ public class ServiceSynchronize extends LifecycleService {
Log.i(Helper.TAG, "Service command intent=" + intent);
super.onStartCommand(intent, flags, startId);
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
if (!prefs.getBoolean("enabled", true)) {
Log.i(Helper.TAG, "Not enabled, halt");
stopSelf();
return START_STICKY;
}
startForeground(NOTIFICATION_SYNCHRONIZE, getNotificationService(0, 0, 0).build());
DB db = DB.getInstance(this);
@ -1944,6 +1937,13 @@ public class ServiceSynchronize extends LifecycleService {
private void start() {
EntityLog.log(ServiceSynchronize.this, "Main start");
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(ServiceSynchronize.this);
if (!prefs.getBoolean("enabled", true)) {
EntityLog.log(ServiceSynchronize.this, "Not enabled, halt");
stopSelf();
return;
}
state = new ServiceState();
state.thread = new Thread(new Runnable() {
private List<ServiceState> threadState = new ArrayList<>();