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

Close connection on boundary end

This commit is contained in:
M66B 2020-07-27 15:52:50 +02:00
parent 0234827b41
commit 7460f960c3
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
View File

@ -133,7 +133,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
executor.submit(new Runnable() { executor.submit(new Runnable() {
@Override @Override
public void run() { public void run() {
close(state); close(state, true);
} }
}); });
queue_load(state); queue_load(state);
@ -162,7 +162,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
throw ex; throw ex;
Log.w("Boundary", ex); Log.w("Boundary", ex);
close(state); close(state, true);
// Retry // Retry
load_server(state); load_server(state);
@ -529,6 +529,11 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
} }
} }
if (state.index < 0) {
Log.i("Boundary server end");
close(state, false);
}
Log.i("Boundary server done"); Log.i("Boundary server done");
return found; return found;
} }
@ -579,29 +584,30 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
executor.submit(new Runnable() { executor.submit(new Runnable() {
@Override @Override
public void run() { public void run() {
close(old); close(old, true);
} }
}); });
} }
private void close(State state) { private void close(State state, boolean reset) {
Log.i("Boundary close"); Log.i("Boundary close");
try { try {
if (state.ifolder != null) if (state.ifolder != null && state.ifolder.isOpen())
state.ifolder.close(); state.ifolder.close();
} catch (Throwable ex) { } catch (Throwable ex) {
Log.e("Boundary", ex); Log.e("Boundary", ex);
} }
try { try {
if (state.iservice != null) if (state.iservice != null && state.iservice.isOpen())
state.iservice.close(); state.iservice.close();
} catch (Throwable ex) { } catch (Throwable ex) {
Log.e("Boundary", ex); Log.e("Boundary", ex);
} }
state.reset(); if (reset)
state.reset();
} }
private class State { private class State {

4
app/src/main/java/eu/faircode/email/EmailService.java
View File

@ -674,6 +674,10 @@ public class EmailService implements AutoCloseable {
return false; return false;
} }
public boolean isOpen() {
return (iservice != null && iservice.isConnected());
}
public void close() throws MessagingException { public void close() throws MessagingException {
try { try {
if (iservice != null && iservice.isConnected()) if (iservice != null && iservice.isConnected())