Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-01-03 11:28:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
M66B
2020-03-24 14:57:51 +01:00
parent 5a5842272f
commit 0ea95b7a3d
2 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -86,7 +86,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
interface IBoundaryCallbackMessages {
void onLoading();
void onLoaded(int fetched);
void onLoaded();
void onException(@NonNull Throwable ex);
}
@@ -109,33 +109,30 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
@Override
public void onZeroItemsLoaded() {
Log.i("Boundary zero loaded");
queue_load(true);
queue_load();
}
@Override
public void onItemAtEndLoaded(@NonNull final TupleMessageEx itemAtEnd) {
Log.i("Boundary at end");
queue_load(false);
queue_load();
}
void retry() {
state.reset();
queue_load(true);
queue_load();
}
private void queue_load(final boolean zero) {
private void queue_load() {
final State state = this.state;
executor.submit(new Runnable() {
private int fetched;
@Override
public void run() {
try {
if (state.destroyed || state.error)
return;
fetched = 0;
if (intf != null)
handler.post(new Runnable() {
@Override
@@ -145,7 +142,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
});
if (server)
try {
fetched = load_server(state);
load_server(state);
} catch (Throwable ex) {
if (state.error || ex instanceof IllegalArgumentException)
throw ex;
@@ -155,10 +152,10 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
state.reset();
// Retry
fetched = load_server(state);
load_server(state);
}
else
fetched = load_device(state);
load_device(state);
} catch (final Throwable ex) {
state.error = true;
Log.e("Boundary", ex);
@@ -174,7 +171,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
handler.post(new Runnable() {
@Override
public void run() {
intf.onLoaded(zero ? fetched : Integer.MAX_VALUE);
intf.onLoaded();
}
});
}
@@ -585,7 +582,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
});
}
void close() {
private void close() {
Log.i("Boundary close");
try {
if (state.ifolder != null)