From 4ddaa45ee3dd1a346da254f2ca9b72c933dc2292 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Sun, 29 Apr 2018 14:22:34 +0200
Subject: catch dead object exceptions when acquiring wake locks

---
 src/main/java/de/pixart/messenger/ui/UpdaterActivity.java | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'src/main/java/de/pixart/messenger/ui')

diff --git a/src/main/java/de/pixart/messenger/ui/UpdaterActivity.java b/src/main/java/de/pixart/messenger/ui/UpdaterActivity.java
index f9b5ef164..562b75313 100644
--- a/src/main/java/de/pixart/messenger/ui/UpdaterActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/UpdaterActivity.java
@@ -33,6 +33,7 @@ import java.util.List;
 import de.pixart.messenger.Config;
 import de.pixart.messenger.R;
 import de.pixart.messenger.persistance.FileBackend;
+import de.pixart.messenger.utils.WakeLockHelper;
 
 public class UpdaterActivity extends XmppActivity {
     static final private String FileName = "update.apk";
@@ -196,7 +197,7 @@ public class UpdaterActivity extends XmppActivity {
             PowerManager pm = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
             if (pm != null) {
                 mWakeLock = pm.newWakeLock(PowerManager.SCREEN_DIM_WAKE_LOCK, getClass().getName());
-                mWakeLock.acquire();
+                WakeLockHelper.acquire(mWakeLock);
             }
             mProgressDialog.show();
         }
@@ -273,9 +274,7 @@ public class UpdaterActivity extends XmppActivity {
 
         @Override
         protected void onPostExecute(String result) {
-            if (mWakeLock.isHeld()) {
-                mWakeLock.release();
-            }
+            WakeLockHelper.release(mWakeLock);
             mProgressDialog.dismiss();
             if (result != null) {
                 Toast.makeText(getApplicationContext(), getString(R.string.failed), Toast.LENGTH_LONG).show();
-- 
cgit v1.2.3