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

Schedule fixes

This commit is contained in:
M66B 2020-03-19 21:36:56 +01:00
parent 2cf36bbaac
commit 10e9362f9e
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1726,7 +1726,7 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
long[] schedule = getSchedule(ServiceSynchronize.this);
long now = new Date().getTime();
boolean scheduled = (schedule == null || now >= schedule[0] && now < schedule[1]);
boolean scheduled = (schedule == null || (now >= schedule[0] && now < schedule[1]));
if (command == null) {
command = new Bundle();
@ -1807,7 +1807,7 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
boolean enabled;
long[] schedule = getSchedule(context);
if (schedule == null)
enabled = true;
enabled = false;
else {
long now = new Date().getTime();
long next = (now < schedule[0] ? schedule[0] : schedule[1]);
@ -1827,7 +1827,10 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
static long[] getSchedule(Context context) {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
if (!prefs.getBoolean("schedule", false))
boolean enabled = prefs.getBoolean("enabled", true);
boolean schedule = prefs.getBoolean("schedule", false);
if (!enabled || !schedule)
return null;
if (!ActivityBilling.isPro(context))

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

@ -468,7 +468,7 @@ public class ServiceUI extends IntentService {
if (reschedule) {
long now = new Date().getTime();
long[] schedule = ServiceSynchronize.getSchedule(this);
boolean enabled = (schedule == null || (now >= schedule[0] && now < schedule[1]));
boolean enabled = (schedule != null && now >= schedule[0] && now < schedule[1]);
schedule(this, enabled);
}
}