From b51ec53e330bf00e7f814d7346ba31b4e167b0e9 Mon Sep 17 00:00:00 2001
From: Clark <clark@signal.org>
Date: Wed, 9 Aug 2023 10:54:52 -0400
Subject: [PATCH] Light battery optimizations cleanup.

---
 .../securesms/components/reminder/DozeReminder.java  |  5 ++---
 .../securesms/util/PowerManagerCompat.java           | 12 ++++++++++++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/reminder/DozeReminder.java b/app/src/main/java/org/thoughtcrime/securesms/components/reminder/DozeReminder.java
index 48b192adca..6d5dcf3e1d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/reminder/DozeReminder.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/reminder/DozeReminder.java
@@ -14,6 +14,7 @@ import androidx.annotation.RequiresApi;
 
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
+import org.thoughtcrime.securesms.util.PowerManagerCompat;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 
 @SuppressLint("BatteryLife")
@@ -25,9 +26,7 @@ public class DozeReminder extends Reminder {
 
     setOkListener(v -> {
       TextSecurePreferences.setPromptedOptimizeDoze(context, true);
-      Intent intent = new Intent(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS,
-                                 Uri.parse("package:" + context.getPackageName()));
-      context.startActivity(intent);
+      PowerManagerCompat.requestIgnoreBatteryOptimizations(context);
     });
 
     setDismissListener(v -> TextSecurePreferences.setPromptedOptimizeDoze(context, true));
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/PowerManagerCompat.java b/app/src/main/java/org/thoughtcrime/securesms/util/PowerManagerCompat.java
index 312278d151..e5f8273f3d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/PowerManagerCompat.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/PowerManagerCompat.java
@@ -1,9 +1,14 @@
 package org.thoughtcrime.securesms.util;
 
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
 import android.os.Build;
 import android.os.PowerManager;
+import android.provider.Settings;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
 
 public class PowerManagerCompat {
 
@@ -13,4 +18,11 @@ public class PowerManagerCompat {
     }
     return false;
   }
+
+  @RequiresApi(api = 23)
+  public static void requestIgnoreBatteryOptimizations(@NonNull Context context) {
+    Intent intent = new Intent(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS,
+                               Uri.parse("package:" + context.getPackageName()));
+    context.startActivity(intent);
+  }
 }