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

Improved browsing/searching

This commit is contained in:
M66B 2019-01-26 17:48:10 +00:00
parent b0a605ce9b
commit 5bcd9ee776
4 changed files with 44 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,14 +33,13 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
private ViewModelBrowse model;
private Handler handler;
private IBoundaryCallbackMessages intf;
private boolean searching = false;
private ExecutorService executor = Executors.newSingleThreadExecutor(Helper.backgroundThreadFactory);
interface IBoundaryCallbackMessages {
void onLoading();
void onLoaded();
void onLoaded(boolean empty);
void onError(Throwable ex);
}
@ -65,10 +64,6 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
});
}
boolean isSearching() {
return searching;
}
@Override
public void onZeroItemsLoaded() {
Log.i("onZeroItemsLoaded");
@ -89,7 +84,6 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
return;
try {
searching = model.isSearching();
handler.post(new Runnable() {
@Override
public void run() {
@ -106,11 +100,10 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
}
});
} finally {
searching = false;
handler.post(new Runnable() {
@Override
public void run() {
intf.onLoaded();
intf.onLoaded(model == null || model.isEmpty());
}
});
}

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

@ -134,7 +134,7 @@ public class FragmentMessages extends FragmentBase {
private LongSparseArray<Spanned> bodies = new LongSparseArray<>();
private LongSparseArray<TupleAccountSwipes> accountSwipes = new LongSparseArray<>();
private BoundaryCallbackMessages searchCallback = null;
private BoundaryCallbackMessages boundaryCallback = null;
private ExecutorService executor = Executors.newSingleThreadExecutor(Helper.backgroundThreadFactory);
@ -1723,6 +1723,32 @@ public class FragmentMessages extends FragmentBase {
ViewModelBrowse modelBrowse = ViewModelProviders.of(getActivity()).get(ViewModelBrowse.class);
modelBrowse.set(getContext(), folder, search, REMOTE_PAGE_SIZE);
if (viewType == AdapterMessage.ViewType.FOLDER || viewType == AdapterMessage.ViewType.SEARCH)
if (boundaryCallback == null)
boundaryCallback = new BoundaryCallbackMessages(this, modelBrowse,
new BoundaryCallbackMessages.IBoundaryCallbackMessages() {
@Override
public void onLoading() {
pbWait.setVisibility(View.VISIBLE);
}
@Override
public void onLoaded(boolean empty) {
pbWait.setVisibility(View.GONE);
tvNoEmail.setVisibility(empty ? View.VISIBLE : View.GONE);
}
@Override
public void onError(Throwable ex) {
if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.RESUMED))
new DialogBuilderLifecycle(getContext(), getViewLifecycleOwner())
.setMessage(Helper.formatThrowable(ex))
.setPositiveButton(android.R.string.cancel, null)
.create()
.show();
}
});
// Observe folder/messages/search
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
String sort = prefs.getString("sort", "time");
@ -1743,37 +1769,13 @@ public class FragmentMessages extends FragmentBase {
break;
case FOLDER:
if (searchCallback == null)
searchCallback = new BoundaryCallbackMessages(this, modelBrowse,
new BoundaryCallbackMessages.IBoundaryCallbackMessages() {
@Override
public void onLoading() {
pbWait.setVisibility(View.VISIBLE);
}
@Override
public void onLoaded() {
pbWait.setVisibility(View.GONE);
}
@Override
public void onError(Throwable ex) {
if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.RESUMED))
new DialogBuilderLifecycle(getContext(), getViewLifecycleOwner())
.setMessage(Helper.formatThrowable(ex))
.setPositiveButton(android.R.string.cancel, null)
.create()
.show();
}
});
PagedList.Config configFolder = new PagedList.Config.Builder()
.setPageSize(LOCAL_PAGE_SIZE)
.setPrefetchDistance(REMOTE_PAGE_SIZE)
.build();
builder = new LivePagedListBuilder<>(
db.message().pagedFolder(folder, threading, sort, snoozed, false, debug), configFolder);
builder.setBoundaryCallback(searchCallback);
builder.setBoundaryCallback(boundaryCallback);
break;
case THREAD:
@ -1782,32 +1784,6 @@ public class FragmentMessages extends FragmentBase {
break;
case SEARCH:
if (searchCallback == null)
searchCallback = new BoundaryCallbackMessages(this, modelBrowse,
new BoundaryCallbackMessages.IBoundaryCallbackMessages() {
@Override
public void onLoading() {
tvNoEmail.setVisibility(View.GONE);
pbWait.setVisibility(View.VISIBLE);
}
@Override
public void onLoaded() {
pbWait.setVisibility(View.GONE);
tvNoEmail.setVisibility(modelMessages.isEmpty(viewType) ? View.VISIBLE : View.GONE);
}
@Override
public void onError(Throwable ex) {
if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.RESUMED))
new DialogBuilderLifecycle(getContext(), getViewLifecycleOwner())
.setMessage(Helper.formatThrowable(ex))
.setPositiveButton(android.R.string.cancel, null)
.create()
.show();
}
});
PagedList.Config configSearch = new PagedList.Config.Builder()
.setPageSize(LOCAL_PAGE_SIZE)
.setPrefetchDistance(REMOTE_PAGE_SIZE)
@ -1818,7 +1794,7 @@ public class FragmentMessages extends FragmentBase {
else
builder = new LivePagedListBuilder<>(
db.message().pagedFolder(folder, threading, "time", snoozed, true, debug), configSearch);
builder.setBoundaryCallback(searchCallback);
builder.setBoundaryCallback(boundaryCallback);
break;
}
@ -1979,18 +1955,11 @@ public class FragmentMessages extends FragmentBase {
Log.i("Submit messages=" + messages.size());
adapter.submitList(messages);
boolean searching = (searchCallback != null && searchCallback.isSearching());
if (!searching)
if (messages.size() > 0 ||
!(viewType == AdapterMessage.ViewType.FOLDER || viewType == AdapterMessage.ViewType.SEARCH)) {
pbWait.setVisibility(View.GONE);
grpReady.setVisibility(View.VISIBLE);
if (messages.size() == 0) {
tvNoEmail.setVisibility(searching ? View.GONE : View.VISIBLE);
rvMessage.setVisibility(View.GONE);
} else {
tvNoEmail.setVisibility(View.GONE);
rvMessage.setVisibility(View.VISIBLE);
tvNoEmail.setVisibility(messages.size() == 0 ? View.VISIBLE : View.GONE);
grpReady.setVisibility(messages.size() > 0 ? View.VISIBLE : View.GONE);
}
}
};

13
app/src/main/java/eu/faircode/email/ViewModelBrowse.java
View File

@ -64,6 +64,7 @@ public class ViewModelBrowse extends ViewModel {
private int pageSize;
int local = 0;
int matched = 0;
List<Long> messages = null;
IMAPStore istore = null;
IMAPFolder ifolder = null;
@ -83,9 +84,11 @@ public class ViewModelBrowse extends ViewModel {
currentState.error = false;
}
boolean isSearching() {
State state = currentState;
return (state != null && state.search != null);
boolean isEmpty() {
final State state = currentState;
if (state == null)
return true;
return (state.matched == 0 && (state.imessages == null || state.imessages.length == 0));
}
void load() throws MessagingException, IOException {
@ -133,8 +136,10 @@ public class ViewModelBrowse extends ViewModel {
if (!match && message.content)
match = body.toLowerCase().contains(find);
if (match)
if (match) {
state.matched++;
db.message().setMessageFound(message.account, message.thread);
}
}
db.setTransactionSuccessful();

6
app/src/main/java/eu/faircode/email/ViewModelMessages.java
View File

@ -70,12 +70,6 @@ public class ViewModelMessages extends ViewModel {
}
}
boolean isEmpty(AdapterMessage.ViewType viewType) {
boolean thread = (viewType == AdapterMessage.ViewType.THREAD);
LiveData<PagedList<TupleMessageEx>> list = messages.get(thread);
return (list == null || list.getValue() == null || list.getValue().size() == 0);
}
@Override
protected void onCleared() {
messages.clear();