Skip to content

armgit / haven

Public Imported from GitHub
0

Haven is for people who need a way to protect their personal spaces and possessions without compromising their own privacy, through an Android app and on-device sensors

work on #111 disable battery opt to allow full background mode

n8fr8a8ef1cc8c0aa
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 7a0a20f..0c0340e 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -21,6 +21,8 @@
<uses-permission android:name="android.permission.READ_PHONE_STATE"/>
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+ <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"/>
+
<application xmlns:tools="http://schemas.android.com/tools"
android:name="org.havenapp.main.HavenApp"
android:icon="@mipmap/ic_launcher"
diff --git a/src/main/java/org/havenapp/main/PreferenceManager.java b/src/main/java/org/havenapp/main/PreferenceManager.java
index dbd16d6..57f98c8 100644
--- a/src/main/java/org/havenapp/main/PreferenceManager.java
+++ b/src/main/java/org/havenapp/main/PreferenceManager.java
@@ -78,6 +78,7 @@ public class PreferenceManager {
public static final String NOTIFICATION_TIME = "notification_time";
+ public static final String DISABLE_BATTERY_OPT = "config_battery_optimizations";
private Context context;
diff --git a/src/main/java/org/havenapp/main/SettingsFragment.java b/src/main/java/org/havenapp/main/SettingsFragment.java
index 149b94a..1846d5b 100644
--- a/src/main/java/org/havenapp/main/SettingsFragment.java
+++ b/src/main/java/org/havenapp/main/SettingsFragment.java
@@ -6,11 +6,16 @@ package org.havenapp.main;
import android.Manifest;
import android.app.Activity;
+import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.content.pm.PackageManager;
+import android.net.Uri;
+import android.os.Build;
import android.os.Bundle;
import android.os.Environment;
+import android.os.PowerManager;
+import android.provider.Settings;
import android.support.annotation.NonNull;
import android.support.v4.app.ActivityCompat;
import android.support.v4.content.ContextCompat;
@@ -138,6 +143,12 @@ public class SettingsFragment extends PreferenceFragmentCompat implements Shared
return true;
});
+ Preference prefDisableBatteryOpt = findPreference(PreferenceManager.DISABLE_BATTERY_OPT);
+ prefDisableBatteryOpt.setOnPreferenceClickListener(preference -> {
+ requestChangeBatteryOptimizations();
+ return true;
+ });
+
checkSignalUsername();
((EditTextPreference) findPreference(PreferenceManager.VERIFY_SIGNAL)).setText("");
askForPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE, 1);
@@ -431,4 +442,20 @@ public class SettingsFragment extends PreferenceFragmentCompat implements Shared
int delaySeconds = second + minute * 60 + hourOfDay * 60 * 60;
preferences.setTimerDelay(delaySeconds);
}
+
+ private void requestChangeBatteryOptimizations ()
+ {
+ if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+ Intent intent = new Intent();
+ String packageName = getActivity().getPackageName();
+ PowerManager pm = (PowerManager) getActivity().getSystemService(Context.POWER_SERVICE);
+ if (pm.isIgnoringBatteryOptimizations(packageName))
+ intent.setAction(Settings.ACTION_IGNORE_BATTERY_OPTIMIZATION_SETTINGS);
+ else {
+ intent.setAction(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS);
+ intent.setData(Uri.parse("package:" + packageName));
+ }
+ getActivity().startActivity(intent);
+ }
+ }
}
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index f5f0d0d..ed64218 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -136,6 +136,8 @@
<string name="minutes">minutes(s)</string>
<string name="keep_watch">Keep Watch!</string>
<string name="camera_sensitivity_tip">Select camera and use the slider to adjust motion detection sensitivity</string>
+ <string name="disable_battery_opt_title">Disable Battery Optimizations</string>
+ <string name="disable_battery_opt_summary">Allow app to run when screen is off</string>
</resources>
diff --git a/src/main/res/xml/settings.xml b/src/main/res/xml/settings.xml
index 14a672e..406fc4d 100644
--- a/src/main/res/xml/settings.xml
+++ b/src/main/res/xml/settings.xml
@@ -5,6 +5,12 @@
android:key="config_delay_time"
android:title="@string/timer_delay_label" />
+
+ <Preference
+ android:key="config_battery_optimizations"
+ android:title="@string/disable_battery_opt_title"
+ android:summary="@string/disable_battery_opt_summary"/>
+
<PreferenceCategory android:title="@string/sensors">
<ListPreference