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

Serialize account operations, increase IMAP connection pool size to 2

Browse Source
This commit is contained in:
M66B
2019-05-23 16:38:53 +02:00
parent 5f24921230
commit cf189511e3
2 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -119,6 +119,7 @@ public class MessageHelper {
props.put("mail.imaps.timeout", Integer.toString(READ_TIMEOUT));
props.put("mail.imaps.connectionpool.debug", "true");
props.put("mail.imaps.connectionpoolsize", "2");
props.put("mail.imaps.connectionpooltimeout", Integer.toString(POOL_TIMEOUT));
props.put("mail.imaps.finalizecleanclose", "false");
@@ -146,6 +147,7 @@ public class MessageHelper {
props.put("mail.imap.timeout", Integer.toString(READ_TIMEOUT));
props.put("mail.imap.connectionpool.debug", "true");
props.put("mail.imap.connectionpoolsize", "2");
props.put("mail.imap.connectionpooltimeout", Integer.toString(POOL_TIMEOUT));
props.put("mail.imap.finalizecleanclose", "false");

12
app/src/main/java/eu/faircode/email/ServiceSynchronize.java
View File

@@ -96,7 +96,6 @@ public class ServiceSynchronize extends LifecycleService {
private long lastLost = 0;
private TupleAccountStats lastStats = new TupleAccountStats();
private ExecutorService queue = Executors.newSingleThreadExecutor(Helper.backgroundThreadFactory);
private ExecutorService initExecutor = Executors.newSingleThreadExecutor(Helper.backgroundThreadFactory);
private static boolean booted = false;
private static boolean oneshot = false;
@@ -697,7 +696,7 @@ public class ServiceSynchronize extends LifecycleService {
Core.onSynchronizeFolders(this, account, istore, state);
// Open synchronizing folders
final ExecutorService pollExecutor = Executors.newSingleThreadExecutor(Helper.backgroundThreadFactory);
final ExecutorService executor = Executors.newSingleThreadExecutor(Helper.backgroundThreadFactory);
for (final EntityFolder folder : folders) {
if (folder.synchronize && !folder.poll && capIdle) {
Log.i(account.name + " sync folder " + folder.name);
@@ -916,7 +915,6 @@ public class ServiceSynchronize extends LifecycleService {
db.operation().liveOperations(folder.id).observe(cowner, new Observer<List<EntityOperation>>() {
private List<Long> handling = new ArrayList<>();
private final ExecutorService folderExecutor = Executors.newSingleThreadExecutor(Helper.backgroundThreadFactory);
private final PowerManager.WakeLock wlFolder = pm.newWakeLock(
PowerManager.PARTIAL_WAKE_LOCK, BuildConfig.APPLICATION_ID + ":folder." + folder.id);
@@ -935,14 +933,6 @@ public class ServiceSynchronize extends LifecycleService {
Log.i(folder.name + " operations=" + operations.size() +
" init=" + folder.initialize + " poll=" + folder.poll);
ExecutorService executor;
if (folder.initialize)
executor = initExecutor;
else if (folder.poll)
executor = pollExecutor;
else
executor = folderExecutor;
executor.submit(new Runnable() {
@Override
public void run() {