From 6a24aca3431387524132a87c3ade7098851f1329 Mon Sep 17 00:00:00 2001 From: Jan Berkel Date: Sat, 20 Dec 2014 00:48:02 +0100 Subject: [PATCH] Move TracingPowerManager into mail package --- .../java/com/fsck/k9/activity/FolderList.java | 4 +-- .../k9/controller/MessagingController.java | 4 +-- .../MessagingControllerPushReceiver.java | 2 +- .../java/com/fsck/k9/mail/PushReceiver.java | 2 +- .../power/TracingPowerManager.java | 36 ++++++++++--------- .../fsck/k9/mail/store/imap/ImapStore.java | 4 +-- .../com/fsck/k9/service/CoreReceiver.java | 4 +-- .../java/com/fsck/k9/service/CoreService.java | 4 +-- .../k9/service/DatabaseUpgradeService.java | 4 +-- .../java/com/fsck/k9/service/PollService.java | 4 +-- .../com/fsck/k9/service/SleepService.java | 2 +- 11 files changed, 37 insertions(+), 33 deletions(-) rename k9mail/src/main/java/com/fsck/k9/{helper => mail}/power/TracingPowerManager.java (74%) diff --git a/k9mail/src/main/java/com/fsck/k9/activity/FolderList.java b/k9mail/src/main/java/com/fsck/k9/activity/FolderList.java index 254b87745..ee135b532 100644 --- a/k9mail/src/main/java/com/fsck/k9/activity/FolderList.java +++ b/k9mail/src/main/java/com/fsck/k9/activity/FolderList.java @@ -51,8 +51,8 @@ import com.fsck.k9.activity.setup.Prefs; import com.fsck.k9.controller.MessagingController; import com.fsck.k9.controller.MessagingListener; import com.fsck.k9.helper.SizeFormatter; -import com.fsck.k9.helper.power.TracingPowerManager; -import com.fsck.k9.helper.power.TracingPowerManager.TracingWakeLock; +import com.fsck.k9.mail.power.TracingPowerManager; +import com.fsck.k9.mail.power.TracingPowerManager.TracingWakeLock; import com.fsck.k9.mail.Folder; import com.fsck.k9.mail.Message; import com.fsck.k9.mailstore.LocalFolder; diff --git a/k9mail/src/main/java/com/fsck/k9/controller/MessagingController.java b/k9mail/src/main/java/com/fsck/k9/controller/MessagingController.java index 3fb19d02b..a0d4ef2e3 100644 --- a/k9mail/src/main/java/com/fsck/k9/controller/MessagingController.java +++ b/k9mail/src/main/java/com/fsck/k9/controller/MessagingController.java @@ -61,8 +61,8 @@ import com.fsck.k9.activity.setup.AccountSetupOutgoing; import com.fsck.k9.cache.EmailProviderCache; import com.fsck.k9.helper.Contacts; import com.fsck.k9.helper.MessageHelper; -import com.fsck.k9.helper.power.TracingPowerManager; -import com.fsck.k9.helper.power.TracingPowerManager.TracingWakeLock; +import com.fsck.k9.mail.power.TracingPowerManager; +import com.fsck.k9.mail.power.TracingPowerManager.TracingWakeLock; import com.fsck.k9.mail.Address; import com.fsck.k9.mail.FetchProfile; import com.fsck.k9.mail.Flag; diff --git a/k9mail/src/main/java/com/fsck/k9/controller/MessagingControllerPushReceiver.java b/k9mail/src/main/java/com/fsck/k9/controller/MessagingControllerPushReceiver.java index 7e471068c..897dbc9cd 100644 --- a/k9mail/src/main/java/com/fsck/k9/controller/MessagingControllerPushReceiver.java +++ b/k9mail/src/main/java/com/fsck/k9/controller/MessagingControllerPushReceiver.java @@ -5,7 +5,7 @@ import android.util.Log; import com.fsck.k9.Account; import com.fsck.k9.K9; -import com.fsck.k9.helper.power.TracingPowerManager.TracingWakeLock; +import com.fsck.k9.mail.power.TracingPowerManager.TracingWakeLock; import com.fsck.k9.mail.Folder; import com.fsck.k9.mail.Message; diff --git a/k9mail/src/main/java/com/fsck/k9/mail/PushReceiver.java b/k9mail/src/main/java/com/fsck/k9/mail/PushReceiver.java index 2657c4669..60ad4fe96 100644 --- a/k9mail/src/main/java/com/fsck/k9/mail/PushReceiver.java +++ b/k9mail/src/main/java/com/fsck/k9/mail/PushReceiver.java @@ -2,7 +2,7 @@ package com.fsck.k9.mail; import java.util.List; -import com.fsck.k9.helper.power.TracingPowerManager.TracingWakeLock; +import com.fsck.k9.mail.power.TracingPowerManager.TracingWakeLock; import android.content.Context; diff --git a/k9mail/src/main/java/com/fsck/k9/helper/power/TracingPowerManager.java b/k9mail/src/main/java/com/fsck/k9/mail/power/TracingPowerManager.java similarity index 74% rename from k9mail/src/main/java/com/fsck/k9/helper/power/TracingPowerManager.java rename to k9mail/src/main/java/com/fsck/k9/mail/power/TracingPowerManager.java index 471768f17..bd55fd5b0 100644 --- a/k9mail/src/main/java/com/fsck/k9/helper/power/TracingPowerManager.java +++ b/k9mail/src/main/java/com/fsck/k9/mail/power/TracingPowerManager.java @@ -1,15 +1,19 @@ -package com.fsck.k9.helper.power; +package com.fsck.k9.mail.power; import java.util.Timer; import java.util.TimerTask; import java.util.concurrent.atomic.AtomicInteger; -import com.fsck.k9.K9; +import com.fsck.k9.mail.K9MailLib; + import android.content.Context; import android.os.PowerManager; import android.os.PowerManager.WakeLock; import android.util.Log; +import static com.fsck.k9.mail.K9MailLib.LOG_TAG; + + public class TracingPowerManager { private final static boolean TRACE = false; public static AtomicInteger wakeLockId = new AtomicInteger(0); @@ -20,8 +24,8 @@ public class TracingPowerManager { public static synchronized TracingPowerManager getPowerManager(Context context) { Context appContext = context.getApplicationContext(); if (tracingPowerManager == null) { - if (K9.DEBUG) { - Log.v(K9.LOG_TAG, "Creating TracingPowerManager"); + if (K9MailLib.isDebug()) { + Log.v(LOG_TAG, "Creating TracingPowerManager"); } tracingPowerManager = new TracingPowerManager(appContext); } @@ -50,16 +54,16 @@ public class TracingPowerManager { tag = ntag; wakeLock = pm.newWakeLock(flags, tag); id = wakeLockId.getAndIncrement(); - if (K9.DEBUG) { - Log.v(K9.LOG_TAG, "TracingWakeLock for tag " + tag + " / id " + id + ": Create"); + if (K9MailLib.isDebug()) { + Log.v(LOG_TAG, "TracingWakeLock for tag " + tag + " / id " + id + ": Create"); } } public void acquire(long timeout) { synchronized (wakeLock) { wakeLock.acquire(timeout); } - if (K9.DEBUG) { - Log.v(K9.LOG_TAG, "TracingWakeLock for tag " + tag + " / id " + id + " for " + timeout + " ms: acquired"); + if (K9MailLib.isDebug()) { + Log.v(LOG_TAG, "TracingWakeLock for tag " + tag + " / id " + id + " for " + timeout + " ms: acquired"); } raiseNotification(); if (startTime == null) { @@ -72,8 +76,8 @@ public class TracingPowerManager { wakeLock.acquire(); } raiseNotification(); - if (K9.DEBUG) { - Log.w(K9.LOG_TAG, "TracingWakeLock for tag " + tag + " / id " + id + ": acquired with no timeout. K-9 Mail should not do this"); + if (K9MailLib.isDebug()) { + Log.w(LOG_TAG, "TracingWakeLock for tag " + tag + " / id " + id + ": acquired with no timeout. K-9 Mail should not do this"); } if (startTime == null) { startTime = System.currentTimeMillis(); @@ -88,12 +92,12 @@ public class TracingPowerManager { public void release() { if (startTime != null) { Long endTime = System.currentTimeMillis(); - if (K9.DEBUG) { - Log.v(K9.LOG_TAG, "TracingWakeLock for tag " + tag + " / id " + id + ": releasing after " + (endTime - startTime) + " ms, timeout = " + timeout + " ms"); + if (K9MailLib.isDebug()) { + Log.v(LOG_TAG, "TracingWakeLock for tag " + tag + " / id " + id + ": releasing after " + (endTime - startTime) + " ms, timeout = " + timeout + " ms"); } } else { - if (K9.DEBUG) { - Log.v(K9.LOG_TAG, "TracingWakeLock for tag " + tag + " / id " + id + ", timeout = " + timeout + " ms: releasing"); + if (K9MailLib.isDebug()) { + Log.v(LOG_TAG, "TracingWakeLock for tag " + tag + " / id " + id + ", timeout = " + timeout + " ms: releasing"); } } cancelNotification(); @@ -123,11 +127,11 @@ public class TracingPowerManager { public void run() { if (startTime != null) { Long endTime = System.currentTimeMillis(); - Log.i(K9.LOG_TAG, "TracingWakeLock for tag " + tag + " / id " + id + ": has been active for " + Log.i(LOG_TAG, "TracingWakeLock for tag " + tag + " / id " + id + ": has been active for " + (endTime - startTime) + " ms, timeout = " + timeout + " ms"); } else { - Log.i(K9.LOG_TAG, "TracingWakeLock for tag " + tag + " / id " + id + ": still active, timeout = " + timeout + " ms"); + Log.i(LOG_TAG, "TracingWakeLock for tag " + tag + " / id " + id + ": still active, timeout = " + timeout + " ms"); } } diff --git a/k9mail/src/main/java/com/fsck/k9/mail/store/imap/ImapStore.java b/k9mail/src/main/java/com/fsck/k9/mail/store/imap/ImapStore.java index 6bf42431e..f18a12b41 100644 --- a/k9mail/src/main/java/com/fsck/k9/mail/store/imap/ImapStore.java +++ b/k9mail/src/main/java/com/fsck/k9/mail/store/imap/ImapStore.java @@ -37,8 +37,8 @@ import android.os.PowerManager; import android.text.TextUtils; import android.util.Log; -import com.fsck.k9.helper.power.TracingPowerManager; -import com.fsck.k9.helper.power.TracingPowerManager.TracingWakeLock; +import com.fsck.k9.mail.power.TracingPowerManager; +import com.fsck.k9.mail.power.TracingPowerManager.TracingWakeLock; import com.fsck.k9.mail.AuthType; import com.fsck.k9.mail.Body; import com.fsck.k9.mail.ConnectionSecurity; diff --git a/k9mail/src/main/java/com/fsck/k9/service/CoreReceiver.java b/k9mail/src/main/java/com/fsck/k9/service/CoreReceiver.java index 9d4b4bbdc..ca949f82e 100644 --- a/k9mail/src/main/java/com/fsck/k9/service/CoreReceiver.java +++ b/k9mail/src/main/java/com/fsck/k9/service/CoreReceiver.java @@ -11,8 +11,8 @@ import android.os.PowerManager; import android.util.Log; import com.fsck.k9.K9; -import com.fsck.k9.helper.power.TracingPowerManager; -import com.fsck.k9.helper.power.TracingPowerManager.TracingWakeLock; +import com.fsck.k9.mail.power.TracingPowerManager; +import com.fsck.k9.mail.power.TracingPowerManager.TracingWakeLock; public class CoreReceiver extends BroadcastReceiver { diff --git a/k9mail/src/main/java/com/fsck/k9/service/CoreService.java b/k9mail/src/main/java/com/fsck/k9/service/CoreService.java index 4f1aadd7a..2696b55df 100644 --- a/k9mail/src/main/java/com/fsck/k9/service/CoreService.java +++ b/k9mail/src/main/java/com/fsck/k9/service/CoreService.java @@ -14,8 +14,8 @@ import android.os.PowerManager; import android.util.Log; import com.fsck.k9.K9; import com.fsck.k9.controller.MessagingController; -import com.fsck.k9.helper.power.TracingPowerManager; -import com.fsck.k9.helper.power.TracingPowerManager.TracingWakeLock; +import com.fsck.k9.mail.power.TracingPowerManager; +import com.fsck.k9.mail.power.TracingPowerManager.TracingWakeLock; /** * {@code CoreService} is the base class for all K-9 Services. diff --git a/k9mail/src/main/java/com/fsck/k9/service/DatabaseUpgradeService.java b/k9mail/src/main/java/com/fsck/k9/service/DatabaseUpgradeService.java index d0fe0b5b4..fd89659e8 100644 --- a/k9mail/src/main/java/com/fsck/k9/service/DatabaseUpgradeService.java +++ b/k9mail/src/main/java/com/fsck/k9/service/DatabaseUpgradeService.java @@ -15,8 +15,8 @@ import com.fsck.k9.Account; import com.fsck.k9.K9; import com.fsck.k9.Preferences; import com.fsck.k9.activity.UpgradeDatabases; -import com.fsck.k9.helper.power.TracingPowerManager; -import com.fsck.k9.helper.power.TracingPowerManager.TracingWakeLock; +import com.fsck.k9.mail.power.TracingPowerManager; +import com.fsck.k9.mail.power.TracingPowerManager.TracingWakeLock; import com.fsck.k9.mailstore.UnavailableStorageException; /** diff --git a/k9mail/src/main/java/com/fsck/k9/service/PollService.java b/k9mail/src/main/java/com/fsck/k9/service/PollService.java index 0fbe8d4c0..f47c4e3b8 100644 --- a/k9mail/src/main/java/com/fsck/k9/service/PollService.java +++ b/k9mail/src/main/java/com/fsck/k9/service/PollService.java @@ -8,8 +8,8 @@ import android.util.Log; import com.fsck.k9.*; import com.fsck.k9.controller.MessagingController; import com.fsck.k9.controller.MessagingListener; -import com.fsck.k9.helper.power.TracingPowerManager; -import com.fsck.k9.helper.power.TracingPowerManager.TracingWakeLock; +import com.fsck.k9.mail.power.TracingPowerManager; +import com.fsck.k9.mail.power.TracingPowerManager.TracingWakeLock; import java.util.HashMap; import java.util.Map; diff --git a/k9mail/src/main/java/com/fsck/k9/service/SleepService.java b/k9mail/src/main/java/com/fsck/k9/service/SleepService.java index 07807d737..937f97dc3 100644 --- a/k9mail/src/main/java/com/fsck/k9/service/SleepService.java +++ b/k9mail/src/main/java/com/fsck/k9/service/SleepService.java @@ -4,7 +4,7 @@ import android.content.Context; import android.content.Intent; import android.util.Log; import com.fsck.k9.K9; -import com.fsck.k9.helper.power.TracingPowerManager.TracingWakeLock; +import com.fsck.k9.mail.power.TracingPowerManager.TracingWakeLock; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.CountDownLatch;