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

Improved logging

This commit is contained in:
M66B 2022-08-24 20:18:31 +02:00
parent d49f1ac728
commit 6c4be22c38
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2245,7 +2245,7 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
if (!account.isTransient(this)) { if (!account.isTransient(this)) {
Long expirationTime = iservice.getAccessTokenExpirationTime(); Long expirationTime = iservice.getAccessTokenExpirationTime();
if (expirationTime != null && expirationTime < new Date().getTime()) { if (expirationTime != null && expirationTime < new Date().getTime()) {
EntityLog.log(this, EntityLog.Type.Debug, "Token" + EntityLog.log(this, "### " + account.name + " token expired" +
" expired=" + new Date(expirationTime) + " expired=" + new Date(expirationTime) +
" user=" + account.provider + ":" + account.user); " user=" + account.provider + ":" + account.user);
throw new IllegalStateException(Log.TOKEN_REFRESH_REQUIRED); throw new IllegalStateException(Log.TOKEN_REFRESH_REQUIRED);
@ -2367,13 +2367,14 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
long duration = account.poll_interval * 60 * 1000L; long duration = account.poll_interval * 60 * 1000L;
long trigger = System.currentTimeMillis() + duration; long trigger = System.currentTimeMillis() + duration;
Long expirationTime = null;
if (!account.isTransient(this)) { if (!account.isTransient(this)) {
Long expirationTime = iservice.getAccessTokenExpirationTime(); expirationTime = iservice.getAccessTokenExpirationTime();
if (expirationTime != null && if (expirationTime != null &&
expirationTime < trigger && expirationTime < trigger &&
expirationTime > new Date().getTime()) { expirationTime > new Date().getTime()) {
expirationTime += AuthState.EXPIRY_TIME_TOLERANCE_MS; expirationTime += AuthState.EXPIRY_TIME_TOLERANCE_MS;
EntityLog.log(this, EntityLog.Type.Debug, "Expedite keep alive" + EntityLog.log(this, "### " + account.name + " expedite keep alive" +
" from " + new Date(trigger) + " to " + new Date(expirationTime)); " from " + new Date(trigger) + " to " + new Date(expirationTime));
trigger = expirationTime; trigger = expirationTime;
} }
@ -2381,7 +2382,9 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
EntityLog.log(this, EntityLog.Type.Account, account, EntityLog.log(this, EntityLog.Type.Account, account,
"### " + account.name + " keep alive" + "### " + account.name + " keep alive" +
" wait=" + account.poll_interval + " until=" + new Date(trigger)); " wait=" + account.poll_interval +
" until=" + new Date(trigger) +
" expiration=" + (expirationTime == null ? null : new Date(expirationTime)));
AlarmManagerCompatEx.setAndAllowWhileIdle(ServiceSynchronize.this, am, AlarmManager.RTC_WAKEUP, trigger, pi); AlarmManagerCompatEx.setAndAllowWhileIdle(ServiceSynchronize.this, am, AlarmManager.RTC_WAKEUP, trigger, pi);
try { try {