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

Search improvements

Browse Source
pull/146/head
M66B 6 years ago
parent a234d0f6b5
commit 2a2280c15d
3 changed files with 89 additions and 94 deletions
Show Stats Download Patch File Download Diff File

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

@ -35,6 +35,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
private ViewModelBrowse model; private ViewModelBrowse model;
private Handler handler; private Handler handler;
private IBoundaryCallbackMessages intf; private IBoundaryCallbackMessages intf;
private boolean searching = false;
private static ExecutorService executor = Executors.newSingleThreadExecutor(Helper.backgroundThreadFactory); private static ExecutorService executor = Executors.newSingleThreadExecutor(Helper.backgroundThreadFactory);
@ -66,7 +67,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
} }
boolean isSearching() { boolean isSearching() {
return model.isSearching(); return searching;
} }
int getLoaded() { int getLoaded() {
@ -90,6 +91,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
@Override @Override
public void run() { public void run() {
try { try {
searching = true;
handler.post(new Runnable() { handler.post(new Runnable() {
@Override @Override
public void run() { public void run() {
@ -106,6 +108,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
} }
}); });
} finally { } finally {
searching = false;
handler.post(new Runnable() { handler.post(new Runnable() {
@Override @Override
public void run() { public void run() {

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

@ -650,7 +650,7 @@ public class FragmentMessages extends FragmentEx {
new SimpleTask<Void>() { new SimpleTask<Void>() {
@Override @Override
protected Void onLoad(Context context, Bundle args) throws Throwable { protected Void onLoad(Context context, Bundle args) {
DB.getInstance(context).message().deleteFoundMessages(); DB.getInstance(context).message().deleteFoundMessages();
return null; return null;
} }

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

@ -36,8 +36,8 @@ public class ViewModelBrowse extends ViewModel {
private IMAPStore istore = null; private IMAPStore istore = null;
private IMAPFolder ifolder = null; private IMAPFolder ifolder = null;
private Message[] imessages = null; private Message[] imessages = null;
private int index;
private boolean searching = false; private int index = -1;
private int loaded = 0; private int loaded = 0;
void set(Context context, long folder, String search, int pageSize) { void set(Context context, long folder, String search, int pageSize) {
@ -47,7 +47,6 @@ public class ViewModelBrowse extends ViewModel {
this.pageSize = pageSize; this.pageSize = pageSize;
this.index = -1; this.index = -1;
this.searching = false;
this.loaded = 0; this.loaded = 0;
} }
@ -55,107 +54,100 @@ public class ViewModelBrowse extends ViewModel {
return context; return context;
} }
boolean isSearching() {
return searching;
}
int getLoaded() { int getLoaded() {
return loaded; return loaded;
} }
void load() throws MessagingException, FolderClosedIOException { void load() throws MessagingException, FolderClosedIOException {
try { DB db = DB.getInstance(context);
searching = true; EntityFolder folder = db.folder().getFolder(fid);
if (folder.account == null) // outbox
DB db = DB.getInstance(context); return;
EntityFolder folder = db.folder().getFolder(fid); EntityAccount account = db.account().getAccount(folder.account);
if (folder.account == null) // outbox
return; if (imessages == null) {
EntityAccount account = db.account().getAccount(folder.account); Properties props = MessageHelper.getSessionProperties(account.auth_type);
props.setProperty("mail.imap.throwsearchexception", "true");
if (imessages == null) { Session isession = Session.getInstance(props, null);
Properties props = MessageHelper.getSessionProperties(account.auth_type);
props.setProperty("mail.imap.throwsearchexception", "true"); Log.i(Helper.TAG, "Boundary connecting account=" + account.name);
Session isession = Session.getInstance(props, null); istore = (IMAPStore) isession.getStore("imaps");
Helper.connect(context, istore, account);
Log.i(Helper.TAG, "Boundary connecting account=" + account.name);
istore = (IMAPStore) isession.getStore("imaps"); Log.i(Helper.TAG, "Boundary opening folder=" + folder.name);
Helper.connect(context, istore, account); ifolder = (IMAPFolder) istore.getFolder(folder.name);
ifolder.open(Folder.READ_WRITE);
Log.i(Helper.TAG, "Boundary opening folder=" + folder.name);
ifolder = (IMAPFolder) istore.getFolder(folder.name); Log.i(Helper.TAG, "Boundary searching=" + search);
ifolder.open(Folder.READ_WRITE); if (search == null)
imessages = ifolder.getMessages();
Log.i(Helper.TAG, "Boundary searching=" + search); else
if (search == null) imessages = ifolder.search(
imessages = ifolder.getMessages(); new OrTerm(
else new OrTerm(
imessages = ifolder.search( new FromStringTerm(search),
new OrTerm( new RecipientStringTerm(Message.RecipientType.TO, search)
new OrTerm( ),
new FromStringTerm(search), new OrTerm(
new RecipientStringTerm(Message.RecipientType.TO, search) new SubjectTerm(search),
), new BodyTerm(search)
new OrTerm( )
new SubjectTerm(search), )
new BodyTerm(search) );
) Log.i(Helper.TAG, "Boundary found messages=" + imessages.length);
)
); index = imessages.length - 1;
Log.i(Helper.TAG, "Boundary found messages=" + imessages.length); }
index = imessages.length - 1;
}
int count = 0; int count = 0;
while (index >= 0 && count < pageSize) { while (index >= 0 && count < pageSize) {
Log.i(Helper.TAG, "Boundary index=" + index); Log.i(Helper.TAG, "Boundary index=" + index);
int from = Math.max(0, index - (pageSize - count) + 1); int from = Math.max(0, index - (pageSize - count) + 1);
Message[] isub = Arrays.copyOfRange(imessages, from, index + 1); Message[] isub = Arrays.copyOfRange(imessages, from, index + 1);
index -= (pageSize - count); index -= (pageSize - count);
FetchProfile fp = new FetchProfile(); FetchProfile fp = new FetchProfile();
fp.add(FetchProfile.Item.ENVELOPE); fp.add(FetchProfile.Item.ENVELOPE);
fp.add(FetchProfile.Item.FLAGS); fp.add(FetchProfile.Item.FLAGS);
fp.add(FetchProfile.Item.CONTENT_INFO); // body structure fp.add(FetchProfile.Item.CONTENT_INFO); // body structure
fp.add(UIDFolder.FetchProfileItem.UID); fp.add(UIDFolder.FetchProfileItem.UID);
fp.add(IMAPFolder.FetchProfileItem.HEADERS); fp.add(IMAPFolder.FetchProfileItem.HEADERS);
fp.add(FetchProfile.Item.SIZE); fp.add(FetchProfile.Item.SIZE);
fp.add(IMAPFolder.FetchProfileItem.INTERNALDATE); fp.add(IMAPFolder.FetchProfileItem.INTERNALDATE);
ifolder.fetch(isub, fp); ifolder.fetch(isub, fp);
try { try {
db.beginTransaction(); db.beginTransaction();
for (int j = isub.length - 1; j >= 0; j--) for (int j = isub.length - 1; j >= 0; j--)
try { try {
long uid = ifolder.getUID(isub[j]); long uid = ifolder.getUID(isub[j]);
Log.i(Helper.TAG, "Boundary sync uid=" + uid); Log.i(Helper.TAG, "Boundary sync uid=" + uid);
EntityMessage message = db.message().getMessageByUid(fid, uid, search != null);
if (message == null) {
ServiceSynchronize.synchronizeMessage(context, folder, ifolder, (IMAPMessage) isub[j], search != null); ServiceSynchronize.synchronizeMessage(context, folder, ifolder, (IMAPMessage) isub[j], search != null);
count++; count++;
loaded++; loaded++;
} catch (MessageRemovedException ex) {
Log.w(Helper.TAG, "Boundary " + ex + "\n" + Log.getStackTraceString(ex));
} catch (FolderClosedException ex) {
throw ex;
} catch (FolderClosedIOException ex) {
throw ex;
} catch (Throwable ex) {
Log.e(Helper.TAG, "Boundary " + ex + "\n" + Log.getStackTraceString(ex));
} finally {
((IMAPMessage) isub[j]).invalidateHeaders();
} }
} catch (MessageRemovedException ex) {
db.setTransactionSuccessful(); Log.w(Helper.TAG, "Boundary " + ex + "\n" + Log.getStackTraceString(ex));
} finally { } catch (FolderClosedException ex) {
db.endTransaction(); throw ex;
} } catch (FolderClosedIOException ex) {
throw ex;
} catch (Throwable ex) {
Log.e(Helper.TAG, "Boundary " + ex + "\n" + Log.getStackTraceString(ex));
} finally {
((IMAPMessage) isub[j]).invalidateHeaders();
}
db.setTransactionSuccessful();
} finally {
db.endTransaction();
} }
Log.i(Helper.TAG, "Boundary done");
} finally {
searching = false;
} }
Log.i(Helper.TAG, "Boundary done");
} }
void clear() { void clear() {

Write Preview
Loading…
Cancel
Save