From 537f7a859f6ae7aacadcc42eb6db28571a20eea1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebasti=C3=A1n=20Katzer?= <katzer.sebastian@googlemail.com>
Date: Fri, 8 Feb 2019 18:45:03 +0100
Subject: [PATCH] New "disableBatteryOptimizations" function for Android

---
 plugin.xml                         |  1 +
 src/android/BackgroundExt.java     | 29 ++++++++++++++++++++++++++++-
 src/android/BackgroundMode.java    |  4 ++--
 src/android/ForegroundService.java |  1 -
 www/background-mode.js             | 15 ++++++++++++++-
 5 files changed, 45 insertions(+), 5 deletions(-)

diff --git a/plugin.xml b/plugin.xml
index 52bd90e..004c203 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -75,6 +75,7 @@
 
         <config-file target="AndroidManifest.xml" parent="/manifest">
             <uses-permission android:name="android.permission.WAKE_LOCK" />
+            <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
         </config-file>
 
         <source-file
diff --git a/src/android/BackgroundExt.java b/src/android/BackgroundExt.java
index 4c34a46..3fe0657 100644
--- a/src/android/BackgroundExt.java
+++ b/src/android/BackgroundExt.java
@@ -21,12 +21,14 @@
 
 package de.appplant.cordova.plugin.background;
 
+import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.ActivityManager;
 import android.app.ActivityManager.AppTask;
 import android.content.Context;
 import android.content.Intent;
+import android.net.Uri;
 import android.os.Build;
 import android.os.PowerManager;
 import android.view.View;
@@ -43,6 +45,8 @@ import java.util.List;
 import static android.content.Context.ACTIVITY_SERVICE;
 import static android.content.Context.POWER_SERVICE;
 import static android.os.Build.VERSION.SDK_INT;
+import static android.os.Build.VERSION_CODES.M;
+import static android.provider.Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS;
 import static android.view.WindowManager.LayoutParams.FLAG_ALLOW_LOCK_WHILE_SCREEN_ON;
 import static android.view.WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD;
 import static android.view.WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED;
@@ -97,7 +101,10 @@ class BackgroundExt {
     {
         switch (action)
         {
-            case "optimizations":
+            case "batteryoptimizations":
+                disableBatteryOptimizations();
+                break;
+            case "webviewoptimizations":
                 disableWebViewOptimizations();
                 break;
             case "background":
@@ -179,6 +186,26 @@ class BackgroundExt {
         thread.start();
     }
 
+    @SuppressLint("BatteryLife")
+    private void disableBatteryOptimizations()
+    {
+        Activity activity = cordova.getActivity();
+        Intent intent     = new Intent();
+        String pkgName    = activity.getPackageName();
+        PowerManager pm   = (PowerManager)getService(POWER_SERVICE);
+
+        if (SDK_INT < M)
+            return;
+
+        if (pm.isIgnoringBatteryOptimizations(pkgName))
+            return;
+
+        intent.setAction(ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS);
+        intent.setData(Uri.parse("package:" + pkgName));
+
+        cordova.getActivity().startActivity(intent);
+    }
+
     /**
      * Excludes the app from the recent tasks list.
      */
diff --git a/src/android/BackgroundMode.java b/src/android/BackgroundMode.java
index 5279e28..8278901 100644
--- a/src/android/BackgroundMode.java
+++ b/src/android/BackgroundMode.java
@@ -104,7 +104,8 @@ public class BackgroundMode extends CordovaPlugin {
             case "disable":
                 disableMode();
                 break;
-            case "optimizations":
+            case "webviewoptimizations":
+            case "batteryoptimizations":
             case "background":
             case "foreground":
             case "tasklist":
@@ -303,5 +304,4 @@ public class BackgroundMode extends CordovaPlugin {
 
         cordova.getActivity().runOnUiThread(() -> webView.loadUrl("javascript:" + js));
     }
-
 }
diff --git a/src/android/ForegroundService.java b/src/android/ForegroundService.java
index 0544192..4e4aa8f 100644
--- a/src/android/ForegroundService.java
+++ b/src/android/ForegroundService.java
@@ -320,5 +320,4 @@ public class ForegroundService extends Service {
     {
         return (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
     }
-
 }
diff --git a/www/background-mode.js b/www/background-mode.js
index 85f9b50..37e6a18 100644
--- a/www/background-mode.js
+++ b/www/background-mode.js
@@ -160,7 +160,20 @@ exports.disableWebViewOptimizations = function()
 {
     if (this._isAndroid)
     {
-        cordova.exec(null, null, 'BackgroundMode', 'optimizations', []);
+        cordova.exec(null, null, 'BackgroundMode', 'webviewoptimizations', []);
+    }
+};
+
+/**
+ * Disables battery optimazation mode for the app.
+ *
+ * @return [ Void ]
+ */
+exports.disableBatteryOptimizations = function()
+{
+    if (this._isAndroid)
+    {
+        cordova.exec(null, null, 'BackgroundMode', 'batteryoptimizations', []);
     }
 };