mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2024-12-29 11:15:51 +00:00
Code Issues Releases Wiki Activity

Use semaphore to check connection

Browse source
This commit is contained in:
M66B 2018-11-19 15:35:04 +01:00
parent d594d39d14
commit dfc1c9071e
1 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
app/src/main/java/eu/faircode/email/ServiceSynchronize.java
View file

@ -79,6 +79,7 @@ import java.util.Properties;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
import java.util.concurrent.Semaphore; import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException; import java.util.concurrent.TimeoutException;
import javax.mail.Address; import javax.mail.Address;
@ -693,7 +694,7 @@ public class ServiceSynchronize extends LifecycleService {
Log.i(Helper.TAG, account.name + " event: " + e.getMessage()); Log.i(Helper.TAG, account.name + " event: " + e.getMessage());
if (BuildConfig.DEBUG) if (BuildConfig.DEBUG)
db.account().setAccountError(account.id, e.getMessage()); db.account().setAccountError(account.id, e.getMessage());
state.thread.interrupt(); state.semaphore.release();
yieldWakelock(); yieldWakelock();
} finally { } finally {
wl.release(); wl.release();
@ -712,7 +713,7 @@ public class ServiceSynchronize extends LifecycleService {
try { try {
wl.acquire(); wl.acquire();
Log.i(Helper.TAG, "Folder created=" + e.getFolder().getFullName()); Log.i(Helper.TAG, "Folder created=" + e.getFolder().getFullName());
state.thread.interrupt(); reload(ServiceSynchronize.this, "folder created");
yieldWakelock(); yieldWakelock();
} finally { } finally {
wl.release(); wl.release();
@ -730,7 +731,7 @@ public class ServiceSynchronize extends LifecycleService {
int count = db.folder().renameFolder(account.id, old, name); int count = db.folder().renameFolder(account.id, old, name);
Log.i(Helper.TAG, "Renamed to " + name + " count=" + count); Log.i(Helper.TAG, "Renamed to " + name + " count=" + count);
state.thread.interrupt(); reload(ServiceSynchronize.this, "folder renamed");
yieldWakelock(); yieldWakelock();
} finally { } finally {
wl.release(); wl.release();
@ -742,7 +743,7 @@ public class ServiceSynchronize extends LifecycleService {
try { try {
wl.acquire(); wl.acquire();
Log.i(Helper.TAG, "Folder deleted=" + e.getFolder().getFullName()); Log.i(Helper.TAG, "Folder deleted=" + e.getFolder().getFullName());
state.thread.interrupt(); reload(ServiceSynchronize.this, "folder deleted");
yieldWakelock(); yieldWakelock();
} finally { } finally {
wl.release(); wl.release();
@ -869,7 +870,7 @@ public class ServiceSynchronize extends LifecycleService {
db.folder().setFolderError(folder.id, Helper.formatThrowable(ex)); db.folder().setFolderError(folder.id, Helper.formatThrowable(ex));
state.thread.interrupt(); state.semaphore.release();
yieldWakelock(); yieldWakelock();
} finally { } finally {
wl.release(); wl.release();
@ -900,7 +901,7 @@ public class ServiceSynchronize extends LifecycleService {
db.folder().setFolderError(folder.id, Helper.formatThrowable(ex)); db.folder().setFolderError(folder.id, Helper.formatThrowable(ex));
state.thread.interrupt(); state.semaphore.release();
} finally { } finally {
wl.release(); wl.release();
} }
@ -951,7 +952,7 @@ public class ServiceSynchronize extends LifecycleService {
db.folder().setFolderError(folder.id, Helper.formatThrowable(ex)); db.folder().setFolderError(folder.id, Helper.formatThrowable(ex));
state.thread.interrupt(); state.semaphore.release();
yieldWakelock(); yieldWakelock();
} finally { } finally {
wl.release(); wl.release();
@ -965,7 +966,7 @@ public class ServiceSynchronize extends LifecycleService {
db.folder().setFolderError(folder.id, Helper.formatThrowable(ex)); db.folder().setFolderError(folder.id, Helper.formatThrowable(ex));
state.thread.interrupt(); state.semaphore.release();
yieldWakelock(); yieldWakelock();
} finally { } finally {
wl.release(); wl.release();
@ -994,7 +995,7 @@ public class ServiceSynchronize extends LifecycleService {
db.folder().setFolderError(folder.id, Helper.formatThrowable(ex)); db.folder().setFolderError(folder.id, Helper.formatThrowable(ex));
state.thread.interrupt(); state.semaphore.release();
yieldWakelock(); yieldWakelock();
} finally { } finally {
Log.i(Helper.TAG, folder.name + " end idle"); Log.i(Helper.TAG, folder.name + " end idle");
@ -1117,7 +1118,7 @@ public class ServiceSynchronize extends LifecycleService {
// Receiver runs on main thread // Receiver runs on main thread
// Receiver has a wake lock for ~10 seconds // Receiver has a wake lock for ~10 seconds
EntityLog.log(context, account.name + " keep alive wake lock=" + wl0.isHeld()); EntityLog.log(context, account.name + " keep alive wake lock=" + wl0.isHeld());
state.thread.interrupt(); state.semaphore.release();
yieldWakelock(); yieldWakelock();
} }
}; };
@ -1237,7 +1238,7 @@ public class ServiceSynchronize extends LifecycleService {
if (backoff <= CONNECT_BACKOFF_MAX) { if (backoff <= CONNECT_BACKOFF_MAX) {
// Short back-off period, keep device awake // Short back-off period, keep device awake
EntityLog.log(this, account.name + " backoff=" + backoff); EntityLog.log(this, account.name + " backoff=" + backoff);
Thread.sleep(backoff * 1000L); state.semaphore.tryAcquire(backoff, TimeUnit.SECONDS);
} else { } else {
// Long back-off period, let device sleep // Long back-off period, let device sleep
EntityLog.log(this, account.name + " backoff alarm=" + CONNECT_BACKOFF_AlARM); EntityLog.log(this, account.name + " backoff alarm=" + CONNECT_BACKOFF_AlARM);
@ -1245,7 +1246,7 @@ public class ServiceSynchronize extends LifecycleService {
BroadcastReceiver alarm = new BroadcastReceiver() { BroadcastReceiver alarm = new BroadcastReceiver() {
@Override @Override
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
state.thread.interrupt(); state.semaphore.release();
yieldWakelock(); yieldWakelock();
} }
}; };
@ -1263,7 +1264,7 @@ public class ServiceSynchronize extends LifecycleService {
try { try {
wl0.release(); wl0.release();
Thread.sleep(2 * CONNECT_BACKOFF_AlARM * 60 * 1000L); state.semaphore.tryAcquire(2 * CONNECT_BACKOFF_AlARM, TimeUnit.MINUTES);
} finally { } finally {
wl0.acquire(); wl0.acquire();
} }
@ -1274,7 +1275,7 @@ public class ServiceSynchronize extends LifecycleService {
} }
} }
if (backoff < CONNECT_BACKOFF_MAX) if (backoff <= CONNECT_BACKOFF_MAX)
backoff *= 2; backoff *= 2;
} catch (InterruptedException ex) { } catch (InterruptedException ex) {
Log.w(Helper.TAG, account.name + " backoff " + ex.toString()); Log.w(Helper.TAG, account.name + " backoff " + ex.toString());
@ -2198,7 +2199,7 @@ public class ServiceSynchronize extends LifecycleService {
try { try {
long backoff = RECONNECT_BACKOFF - ago; long backoff = RECONNECT_BACKOFF - ago;
EntityLog.log(ServiceSynchronize.this, "Main backoff=" + (backoff / 1000)); EntityLog.log(ServiceSynchronize.this, "Main backoff=" + (backoff / 1000));
Thread.sleep(backoff); state.semaphore.tryAcquire(backoff, TimeUnit.MILLISECONDS);
} catch (InterruptedException ex) { } catch (InterruptedException ex) {
Log.w(Helper.TAG, "main backoff " + ex.toString()); Log.w(Helper.TAG, "main backoff " + ex.toString());
return; return;