mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-02-21 21:57:19 +00:00
Code Issues Releases Wiki Activity

Reduced logging

Browse source
This commit is contained in:
M66B 2022-04-23 13:03:51 +02:00
parent f457849a78
commit 8f12a20041
4 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/java/eu/faircode/email/FragmentAccount.java
View file

@ -1161,6 +1161,8 @@ public class FragmentAccount extends FragmentBase {
}
}
boolean reschedule = (ignore_schedule != jconditions.optBoolean("ignore_schedule"));
try {
db.beginTransaction();
@ -1340,7 +1342,10 @@ public class FragmentAccount extends FragmentBase {
db.endTransaction();
}
ServiceSynchronize.eval(context, "save account");
if (reschedule)
ServiceSynchronize.reschedule(context);
else
ServiceSynchronize.eval(context, "save account");
if (!synchronize) {
NotificationManager nm = Helper.getSystemService(context, NotificationManager.class);

7
app/src/main/java/eu/faircode/email/FragmentPop.java
View file

@ -518,6 +518,8 @@ public class FragmentPop extends FragmentBase {
}
}
boolean reschedule = (ignore_schedule != jconditions.optBoolean("ignore_schedule"));
try {
db.beginTransaction();
@ -608,7 +610,10 @@ public class FragmentPop extends FragmentBase {
db.endTransaction();
}
ServiceSynchronize.eval(context, "POP3");
if (reschedule)
ServiceSynchronize.reschedule(context);
else
ServiceSynchronize.eval(context, "POP3");
if (!synchronize) {
NotificationManager nm = Helper.getSystemService(context, NotificationManager.class);

6
app/src/main/java/eu/faircode/email/ServiceSynchronize.java
View file

@ -1224,7 +1224,7 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
public void delegate() {
try {
long now = new Date().getTime();
long[] schedule = ServiceSynchronize.getSchedule(ServiceSynchronize.this);
long[] schedule = getSchedule(ServiceSynchronize.this);
boolean scheduled = (schedule == null || (now >= schedule[0] && now < schedule[1]));
boolean work = false;
@ -2350,7 +2350,7 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
try {
latch.await(5000L, TimeUnit.MILLISECONDS);
} catch (InterruptedException ex) {
Log.w(ex);
Log.i(ex);
}
// Stop executing operations
@ -2915,7 +2915,7 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
am.cancel(pi);
long now = new Date().getTime();
long[] schedule = ServiceSynchronize.getSchedule(context);
long[] schedule = getSchedule(context);
boolean scheduled = (schedule == null || (now >= schedule[0] && now < schedule[1]));
if (schedule != null) {

2
app/src/main/res/values/strings.xml
View file

@ -951,7 +951,7 @@
<string name="title_date_header">Use \'Date\' header (sent time)</string>
<string name="title_date_remark">Changes will be applied to new messages only</string>
<string name="title_unmetered_only">Connect only via unmetered networks</string>
<string name="title_ignore_schedule">Sync outside the schedule</string>
<string name="title_ignore_schedule">Synchronize outside the schedule too</string>
<string name="title_related_identity">Add related identity (SMTP server)</string>
<string name="title_check">Check</string>
<string name="title_trust">Trust server certificate with fingerprint %1$s</string>