msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Fast fail on folder closed

Browse Source
pull/154/head
M66B 7 years ago
parent 645c843161
commit 3af09b1a7b
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File

12
app/src/main/java/eu/faircode/email/Core.java
Unescape View File

@ -1913,6 +1913,7 @@ class Core {
private Thread thread; private Thread thread;
private Semaphore semaphore = new Semaphore(0); private Semaphore semaphore = new Semaphore(0);
private boolean running = true; private boolean running = true;
private boolean recoverable = true;
State(Helper.NetworkState networkState) { State(Helper.NetworkState networkState) {
this.networkState = networkState; this.networkState = networkState;
@ -1944,11 +1945,16 @@ class Core {
return semaphore.tryAcquire(milliseconds, TimeUnit.MILLISECONDS); return semaphore.tryAcquire(milliseconds, TimeUnit.MILLISECONDS);
} }
void error() { void error(Throwable ex) {
recoverable = !(ex instanceof FolderClosedException);
thread.interrupt(); thread.interrupt();
yield(); yield();
} }
void reset() {
recoverable = true;
}
private void yield() { private void yield() {
try { try {
// Give interrupted thread some time to acquire wake lock // Give interrupted thread some time to acquire wake lock
@ -1974,6 +1980,10 @@ class Core {
return running; return running;
} }
boolean recoverable() {
return recoverable;
}
void join(Thread thread) { void join(Thread thread) {
boolean joined = false; boolean joined = false;
while (!joined) while (!joined)

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

@ -498,6 +498,7 @@ public class ServiceSynchronize extends LifecycleService {
int backoff = CONNECT_BACKOFF_START; int backoff = CONNECT_BACKOFF_START;
while (state.running()) { while (state.running()) {
state.reset();
Log.i(account.name + " run"); Log.i(account.name + " run");
Handler handler = new Handler(getMainLooper()); Handler handler = new Handler(getMainLooper());
@ -535,7 +536,7 @@ public class ServiceSynchronize extends LifecycleService {
(message != null && !message.startsWith("Too many simultaneous connections"))) (message != null && !message.startsWith("Too many simultaneous connections")))
Core.reportError(ServiceSynchronize.this, account, null, Core.reportError(ServiceSynchronize.this, account, null,
new Core.AlertException(message)); new Core.AlertException(message));
state.error(); state.error(null);
} else } else
Log.i(account.name + " notice: " + message); Log.i(account.name + " notice: " + message);
} finally { } finally {
@ -727,7 +728,7 @@ public class ServiceSynchronize extends LifecycleService {
} catch (Throwable ex) { } catch (Throwable ex) {
Log.e(folder.name, ex); Log.e(folder.name, ex);
Core.reportError(ServiceSynchronize.this, account, folder, ex); Core.reportError(ServiceSynchronize.this, account, folder, ex);
state.error(); state.error(ex);
} finally { } finally {
wlAccount.release(); wlAccount.release();
} }
@ -756,7 +757,7 @@ public class ServiceSynchronize extends LifecycleService {
Log.e(folder.name, ex); Log.e(folder.name, ex);
Core.reportError(ServiceSynchronize.this, account, folder, ex); Core.reportError(ServiceSynchronize.this, account, folder, ex);
db.folder().setFolderError(folder.id, Helper.formatThrowable(ex, true)); db.folder().setFolderError(folder.id, Helper.formatThrowable(ex, true));
state.error(); state.error(ex);
} finally { } finally {
wlAccount.release(); wlAccount.release();
} }
@ -807,7 +808,7 @@ public class ServiceSynchronize extends LifecycleService {
} catch (Throwable ex) { } catch (Throwable ex) {
Log.e(folder.name, ex); Log.e(folder.name, ex);
Core.reportError(ServiceSynchronize.this, account, folder, ex); Core.reportError(ServiceSynchronize.this, account, folder, ex);
state.error(); state.error(ex);
} finally { } finally {
wlAccount.release(); wlAccount.release();
} }
@ -828,7 +829,7 @@ public class ServiceSynchronize extends LifecycleService {
Log.e(folder.name, ex); Log.e(folder.name, ex);
Core.reportError(ServiceSynchronize.this, account, folder, ex); Core.reportError(ServiceSynchronize.this, account, folder, ex);
db.folder().setFolderError(folder.id, Helper.formatThrowable(ex, true)); db.folder().setFolderError(folder.id, Helper.formatThrowable(ex, true));
state.error(); state.error(ex);
} finally { } finally {
Log.i(folder.name + " end idle"); Log.i(folder.name + " end idle");
} }
@ -906,7 +907,7 @@ public class ServiceSynchronize extends LifecycleService {
Log.e(folder.name, ex); Log.e(folder.name, ex);
Core.reportError(ServiceSynchronize.this, account, folder, ex); Core.reportError(ServiceSynchronize.this, account, folder, ex);
db.folder().setFolderError(folder.id, Helper.formatThrowable(ex, true)); db.folder().setFolderError(folder.id, Helper.formatThrowable(ex, true));
state.error(); state.error(ex);
} finally { } finally {
if (shouldClose) { if (shouldClose) {
if (ifolder != null && ifolder.isOpen()) { if (ifolder != null && ifolder.isOpen()) {
@ -954,8 +955,10 @@ public class ServiceSynchronize extends LifecycleService {
AlarmManager am = (AlarmManager) getSystemService(Context.ALARM_SERVICE); AlarmManager am = (AlarmManager) getSystemService(Context.ALARM_SERVICE);
try { try {
while (state.running()) { while (state.running()) {
if (!state.recoverable())
throw new StoreClosedException(istore, "Unrecoverable");
if (!istore.isConnected()) // Sends store NOOP if (!istore.isConnected()) // Sends store NOOP
throw new StoreClosedException(istore); throw new StoreClosedException(istore, "NOOP");
for (EntityFolder folder : folders.keySet()) for (EntityFolder folder : folders.keySet())
if (folder.synchronize) if (folder.synchronize)

Write Preview
Loading…
Cancel
Save