mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2024-12-25 17:27:00 +00:00
Code Issues Releases Wiki Activity

Use executor instead of thread

Browse source
This commit is contained in:
M66B 2018-09-02 08:55:06 +00:00
parent 0dc45a8d1b
commit f9fe3621a6
1 changed files with 68 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

135
app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
View file

@ -10,6 +10,8 @@ import com.sun.mail.imap.IMAPStore;
import java.util.Date; import java.util.Date;
import java.util.Properties; import java.util.Properties;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import javax.mail.Folder; import javax.mail.Folder;
import javax.mail.Message; import javax.mail.Message;
@ -33,6 +35,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
private String search; private String search;
private Handler mainHandler; private Handler mainHandler;
private IBoundaryCallbackMessages intf; private IBoundaryCallbackMessages intf;
private ExecutorService executor = Executors.newSingleThreadExecutor();
private boolean enabled = false; private boolean enabled = false;
private IMAPStore istore = null; private IMAPStore istore = null;
@ -91,82 +94,80 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
} }
void load(final long before) { void load(final long before) {
new Thread(new Runnable() { executor.submit(new Runnable() {
@Override @Override
public void run() { public void run() {
synchronized (context.getApplicationContext()) { try {
try { mainHandler.post(new Runnable() {
mainHandler.post(new Runnable() { @Override
@Override public void run() {
public void run() { intf.onLoading();
intf.onLoading(); }
} });
});
DB db = DB.getInstance(context); DB db = DB.getInstance(context);
EntityFolder folder = db.folder().getFolder(fid); EntityFolder folder = db.folder().getFolder(fid);
EntityAccount account = db.account().getAccount(folder.account); EntityAccount account = db.account().getAccount(folder.account);
if (imessages == null) { if (imessages == null) {
// Refresh token // Refresh token
if (account.auth_type == Helper.AUTH_TYPE_GMAIL) { if (account.auth_type == Helper.AUTH_TYPE_GMAIL) {
account.password = Helper.refreshToken(context, "com.google", account.user, account.password); account.password = Helper.refreshToken(context, "com.google", account.user, account.password);
db.account().setAccountPassword(account.id, account.password); db.account().setAccountPassword(account.id, account.password);
}
Properties props = MessageHelper.getSessionProperties(context, account.auth_type);
props.setProperty("mail.imap.throwsearchexception", "true");
Session isession = Session.getInstance(props, null);
Log.i(Helper.TAG, "Boundary connecting account=" + account.name);
istore = (IMAPStore) isession.getStore("imaps");
istore.connect(account.host, account.port, account.user, account.password);
Log.i(Helper.TAG, "Boundary opening folder=" + folder.name);
ifolder = (IMAPFolder) istore.getFolder(folder.name);
ifolder.open(Folder.READ_WRITE);
Log.i(Helper.TAG, "Boundary searching=" + search + " before=" + new Date(before));
imessages = ifolder.search(
new AndTerm(
new ReceivedDateTerm(ComparisonTerm.LT, new Date(before)),
new OrTerm(
new FromStringTerm(search),
new OrTerm(
new SubjectTerm(search),
new BodyTerm(search)))));
Log.i(Helper.TAG, "Boundary found messages=" + imessages.length);
} }
int index = imessages.length - 1; Properties props = MessageHelper.getSessionProperties(context, account.auth_type);
while (index >= 0) { props.setProperty("mail.imap.throwsearchexception", "true");
if (imessages[index].getReceivedDate().getTime() < before) { Session isession = Session.getInstance(props, null);
Log.i(Helper.TAG, "Boundary sync uid=" + ifolder.getUID(imessages[index]));
ServiceSynchronize.synchronizeMessage(context, folder, ifolder, (IMAPMessage) imessages[index], true);
break;
}
index--;
}
Log.i(Helper.TAG, "Boundary done"); Log.i(Helper.TAG, "Boundary connecting account=" + account.name);
} catch (final Throwable ex) { istore = (IMAPStore) isession.getStore("imaps");
Log.e(Helper.TAG, "Boundary " + ex + "\n" + Log.getStackTraceString(ex)); istore.connect(account.host, account.port, account.user, account.password);
mainHandler.post(new Runnable() {
@Override Log.i(Helper.TAG, "Boundary opening folder=" + folder.name);
public void run() { ifolder = (IMAPFolder) istore.getFolder(folder.name);
intf.onError(ex); ifolder.open(Folder.READ_WRITE);
}
}); Log.i(Helper.TAG, "Boundary searching=" + search + " before=" + new Date(before));
} finally { imessages = ifolder.search(
mainHandler.post(new Runnable() { new AndTerm(
@Override new ReceivedDateTerm(ComparisonTerm.LT, new Date(before)),
public void run() { new OrTerm(
intf.onLoaded(); new FromStringTerm(search),
} new OrTerm(
}); new SubjectTerm(search),
new BodyTerm(search)))));
Log.i(Helper.TAG, "Boundary found messages=" + imessages.length);
} }
int index = imessages.length - 1;
while (index >= 0) {
if (imessages[index].getReceivedDate().getTime() < before) {
Log.i(Helper.TAG, "Boundary sync uid=" + ifolder.getUID(imessages[index]));
ServiceSynchronize.synchronizeMessage(context, folder, ifolder, (IMAPMessage) imessages[index], true);
break;
}
index--;
}
Log.i(Helper.TAG, "Boundary done");
} catch (final Throwable ex) {
Log.e(Helper.TAG, "Boundary " + ex + "\n" + Log.getStackTraceString(ex));
mainHandler.post(new Runnable() {
@Override
public void run() {
intf.onError(ex);
}
});
} finally {
mainHandler.post(new Runnable() {
@Override
public void run() {
intf.onLoaded();
}
});
} }
} }
}).start(); });
} }
} }