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

Differentiate wakelocks

This commit is contained in:
M66B 2018-10-16 12:06:42 +00:00
parent a6c6c1f9e0
commit b16c6b7f56
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -526,11 +526,11 @@ public class ServiceSynchronize extends LifecycleService {
private void monitorAccount(final EntityAccount account, final ServiceState state) throws NoSuchProviderException { private void monitorAccount(final EntityAccount account, final ServiceState state) throws NoSuchProviderException {
final PowerManager pm = getSystemService(PowerManager.class); final PowerManager pm = getSystemService(PowerManager.class);
final PowerManager.WakeLock wl = pm.newWakeLock( final PowerManager.WakeLock wl0 = pm.newWakeLock(
PowerManager.PARTIAL_WAKE_LOCK, PowerManager.PARTIAL_WAKE_LOCK,
BuildConfig.APPLICATION_ID + ":account." + account.id); BuildConfig.APPLICATION_ID + ":account." + account.id + ".monitor");
try { try {
wl.acquire(); wl0.acquire();
final DB db = DB.getInstance(this); final DB db = DB.getInstance(this);
final ExecutorService executor = Executors.newSingleThreadExecutor(Helper.backgroundThreadFactory); final ExecutorService executor = Executors.newSingleThreadExecutor(Helper.backgroundThreadFactory);
@ -557,6 +557,10 @@ public class ServiceSynchronize extends LifecycleService {
try { try {
// Listen for store events // Listen for store events
istore.addStoreListener(new StoreListener() { istore.addStoreListener(new StoreListener() {
PowerManager.WakeLock wl = pm.newWakeLock(
PowerManager.PARTIAL_WAKE_LOCK,
BuildConfig.APPLICATION_ID + ":account." + account.id + ".store");
@Override @Override
public void notification(StoreEvent e) { public void notification(StoreEvent e) {
try { try {
@ -573,6 +577,10 @@ public class ServiceSynchronize extends LifecycleService {
// Listen for folder events // Listen for folder events
istore.addFolderListener(new FolderAdapter() { istore.addFolderListener(new FolderAdapter() {
PowerManager.WakeLock wl = pm.newWakeLock(
PowerManager.PARTIAL_WAKE_LOCK,
BuildConfig.APPLICATION_ID + ":account." + account.id + ".folder");
@Override @Override
public void folderCreated(FolderEvent e) { public void folderCreated(FolderEvent e) {
try { try {
@ -670,6 +678,10 @@ public class ServiceSynchronize extends LifecycleService {
// Synchronize folder // Synchronize folder
Thread sync = new Thread(new Runnable() { Thread sync = new Thread(new Runnable() {
PowerManager.WakeLock wl = pm.newWakeLock(
PowerManager.PARTIAL_WAKE_LOCK,
BuildConfig.APPLICATION_ID + ":account." + account.id + ".sync");
@Override @Override
public void run() { public void run() {
try { try {
@ -869,6 +881,10 @@ public class ServiceSynchronize extends LifecycleService {
@Override @Override
public void onReceive(Context context, final Intent intent) { public void onReceive(Context context, final Intent intent) {
executor.submit(new Runnable() { executor.submit(new Runnable() {
PowerManager.WakeLock wl = pm.newWakeLock(
PowerManager.PARTIAL_WAKE_LOCK,
BuildConfig.APPLICATION_ID + ":account." + account.id + ".process");
@Override @Override
public void run() { public void run() {
long fid = intent.getLongExtra("folder", -1); long fid = intent.getLongExtra("folder", -1);
@ -958,7 +974,7 @@ public class ServiceSynchronize extends LifecycleService {
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
// 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=" + wl.isHeld()); EntityLog.log(context, account.name + " keep alive wake lock=" + wl0.isHeld());
state.thread.interrupt(); state.thread.interrupt();
yieldWakelock(); yieldWakelock();
} }
@ -980,12 +996,12 @@ public class ServiceSynchronize extends LifecycleService {
pi); pi);
try { try {
wl.release(); wl0.release();
Thread.sleep(Long.MAX_VALUE); Thread.sleep(Long.MAX_VALUE);
} catch (InterruptedException ex) { } catch (InterruptedException ex) {
EntityLog.log(this, account.name + " waited running=" + state.running); EntityLog.log(this, account.name + " waited running=" + state.running);
} finally { } finally {
wl.acquire(); wl0.acquire();
} }
if (state.running) { if (state.running) {
@ -1077,7 +1093,7 @@ public class ServiceSynchronize extends LifecycleService {
} }
} finally { } finally {
EntityLog.log(this, account.name + " stopped"); EntityLog.log(this, account.name + " stopped");
wl.release(); wl0.release();
} }
} }