2 files changed, 6 insertions, 15 deletions
diff --git a/src/main/java/de/pixart/messenger/services/ExportLogsService.java b/src/main/java/de/pixart/messenger/services/ExportLogsService.java
index 12a211e54..17cb11562 100644
--- a/src/main/java/de/pixart/messenger/services/ExportLogsService.java
+++ b/src/main/java/de/pixart/messenger/services/ExportLogsService.java
@@ -36,6 +36,7 @@ import de.pixart.messenger.entities.Message;
 import de.pixart.messenger.persistance.DatabaseBackend;
 import de.pixart.messenger.persistance.FileBackend;
 import de.pixart.messenger.utils.EncryptDecryptFile;
+import de.pixart.messenger.utils.WakeLockHelper;
 import rocks.xmpp.addr.Jid;
 
 import static de.pixart.messenger.ui.SettingsActivity.USE_MULTI_ACCOUNTS;
@@ -72,13 +73,7 @@ public class ExportLogsService extends Service {
                 public void run() {
                     export();
                     stopForeground(true);
-                    if (wakeLock.isHeld()) {
-                        try {
-                            wakeLock.release();
-                        } catch (final RuntimeException ignored) {
-                            //ignored
-                        }
-                    }
+                    WakeLockHelper.release(wakeLock);
                     running.set(false);
                     stopSelf();
                 }
@@ -88,7 +83,7 @@ public class ExportLogsService extends Service {
     }
 
     private void export() {
-        wakeLock.acquire();
+        WakeLockHelper.acquire(wakeLock);
         List<Conversation> conversations = mDatabaseBackend.getConversations(Conversation.STATUS_AVAILABLE);
         conversations.addAll(mDatabaseBackend.getConversations(Conversation.STATUS_ARCHIVED));
         NotificationManager mNotifyManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
diff --git a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
index ef98b6aa6..9fc322646 100644
--- a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
+++ b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
@@ -122,6 +122,7 @@ import de.pixart.messenger.utils.ReplacingSerialSingleThreadExecutor;
 import de.pixart.messenger.utils.ReplacingTaskManager;
 import de.pixart.messenger.utils.Resolver;
 import de.pixart.messenger.utils.SerialSingleThreadExecutor;
+import de.pixart.messenger.utils.WakeLockHelper;
 import de.pixart.messenger.utils.XmppUri;
 import de.pixart.messenger.xml.Element;
 import de.pixart.messenger.xmpp.OnBindListener;
@@ -684,7 +685,7 @@ public class XmppConnectionService extends Service {
             }
         }
         synchronized (this) {
-            this.wakeLock.acquire();
+            WakeLockHelper.acquire(wakeLock);
             boolean pingNow = ConnectivityManager.CONNECTIVITY_ACTION.equals(action);
             HashSet<Account> pingCandidates = new HashSet<>();
             for (Account account : accounts) {
@@ -708,12 +709,7 @@ public class XmppConnectionService extends Service {
                     scheduleWakeUpCall(lowTimeout ? Config.LOW_PING_TIMEOUT : Config.PING_TIMEOUT, account.getUuid().hashCode());
                 }
             }
-            if (wakeLock.isHeld()) {
-                try {
-                    wakeLock.release();
-                } catch (final RuntimeException ignored) {
-                }
-            }
+            WakeLockHelper.release(wakeLock);
         }
         if (SystemClock.elapsedRealtime() - mLastExpiryRun.get() >= Config.EXPIRY_INTERVAL) {
             expireOldMessages();