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

Low priority paging

Browse Source
pull/147/head
M66B 7 years ago
parent 5930e5e561
commit c16fa09dab
1 changed files with 92 additions and 87 deletions
Show Stats Download Patch File Download Diff File

37
app/src/main/java/eu/faircode/email/FragmentMessages.java
Unescape View File

@ -50,6 +50,8 @@ import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
@ -125,6 +127,8 @@ public class FragmentMessages extends FragmentEx {
private BoundaryCallbackMessages searchCallback = null; private BoundaryCallbackMessages searchCallback = null;
private ExecutorService executor = Executors.newSingleThreadExecutor(Helper.backgroundThreadFactory);
private static final int LOCAL_PAGE_SIZE = 100; private static final int LOCAL_PAGE_SIZE = 100;
private static final int REMOTE_PAGE_SIZE = 10; private static final int REMOTE_PAGE_SIZE = 10;
private static final int UNDO_TIMEOUT = 5000; // milliseconds private static final int UNDO_TIMEOUT = 5000; // milliseconds
@ -1622,7 +1626,6 @@ public class FragmentMessages extends FragmentEx {
model.set(getContext(), folder, search, REMOTE_PAGE_SIZE); model.set(getContext(), folder, search, REMOTE_PAGE_SIZE);
// Observe folder/messages/search // Observe folder/messages/search
if (TextUtils.isEmpty(search)) {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext()); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
String sort = prefs.getString("sort", "time"); String sort = prefs.getString("sort", "time");
boolean debug = prefs.getBoolean("debug", false); boolean debug = prefs.getBoolean("debug", false);
@ -1631,10 +1634,11 @@ public class FragmentMessages extends FragmentEx {
if (messages != null) if (messages != null)
messages.removeObservers(getViewLifecycleOwner()); messages.removeObservers(getViewLifecycleOwner());
LivePagedListBuilder<Integer, TupleMessageEx> builder = null;
switch (viewType) { switch (viewType) {
case UNIFIED: case UNIFIED:
messages = new LivePagedListBuilder<>( builder = new LivePagedListBuilder<>(
db.message().pagedUnifiedInbox(threading, sort, debug), LOCAL_PAGE_SIZE).build(); db.message().pagedUnifiedInbox(threading, sort, debug), LOCAL_PAGE_SIZE);
break; break;
case FOLDER: case FOLDER:
@ -1662,23 +1666,21 @@ public class FragmentMessages extends FragmentEx {
} }
}); });
PagedList.Config config = new PagedList.Config.Builder() PagedList.Config configFolder = new PagedList.Config.Builder()
.setPageSize(LOCAL_PAGE_SIZE) .setPageSize(LOCAL_PAGE_SIZE)
.setPrefetchDistance(REMOTE_PAGE_SIZE) .setPrefetchDistance(REMOTE_PAGE_SIZE)
.build(); .build();
LivePagedListBuilder<Integer, TupleMessageEx> builder = new LivePagedListBuilder<>( builder = new LivePagedListBuilder<>(
db.message().pagedFolder(folder, threading, sort, false, debug), config); db.message().pagedFolder(folder, threading, sort, false, debug), configFolder);
builder.setBoundaryCallback(searchCallback); builder.setBoundaryCallback(searchCallback);
messages = builder.build();
break; break;
case THREAD: case THREAD:
messages = new LivePagedListBuilder<>( builder = new LivePagedListBuilder<>(
db.message().pagedThread(account, thread, threading ? null : id, debug), LOCAL_PAGE_SIZE).build(); db.message().pagedThread(account, thread, threading ? null : id, debug), LOCAL_PAGE_SIZE);
break; break;
}
} else { case SEARCH:
if (searchCallback == null) if (searchCallback == null)
searchCallback = new BoundaryCallbackMessages(this, model, searchCallback = new BoundaryCallbackMessages(this, model,
new BoundaryCallbackMessages.IBoundaryCallbackMessages() { new BoundaryCallbackMessages.IBoundaryCallbackMessages() {
@ -1706,16 +1708,19 @@ public class FragmentMessages extends FragmentEx {
} }
}); });
PagedList.Config config = new PagedList.Config.Builder() PagedList.Config configSearch = new PagedList.Config.Builder()
.setPageSize(LOCAL_PAGE_SIZE) .setPageSize(LOCAL_PAGE_SIZE)
.setPrefetchDistance(REMOTE_PAGE_SIZE) .setPrefetchDistance(REMOTE_PAGE_SIZE)
.build(); .build();
LivePagedListBuilder<Integer, TupleMessageEx> builder = new LivePagedListBuilder<>( builder = new LivePagedListBuilder<>(
db.message().pagedFolder(folder, threading, "time", true, false), config); db.message().pagedFolder(folder, threading, "time", true, false), configSearch);
builder.setBoundaryCallback(searchCallback); builder.setBoundaryCallback(searchCallback);
messages = builder.build(); break;
} }
builder.setFetchExecutor(executor);
messages = builder.build();
messages.observe(getViewLifecycleOwner(), new Observer<PagedList<TupleMessageEx>>() { messages.observe(getViewLifecycleOwner(), new Observer<PagedList<TupleMessageEx>>() {
@Override @Override
public void onChanged(@Nullable PagedList<TupleMessageEx> messages) { public void onChanged(@Nullable PagedList<TupleMessageEx> messages) {

Write Preview
Loading…
Cancel
Save