diff --git a/app/release/app-release-4.1.3c.apk b/app/release/app-release-4.1.3d.apk similarity index 68% rename from app/release/app-release-4.1.3c.apk rename to app/release/app-release-4.1.3d.apk index 74641b5..99e92d0 100644 Binary files a/app/release/app-release-4.1.3c.apk and b/app/release/app-release-4.1.3d.apk differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 5266c93..ec3af00 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -3,7 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" package="uk.org.openseizuredetector" android:versionCode="115" - android:versionName="4.1.3c"> + android:versionName="4.1.3d"> diff --git a/app/src/main/java/uk/org/openseizuredetector/StartupActivity.java b/app/src/main/java/uk/org/openseizuredetector/StartupActivity.java index 62a474a..ec18a8f 100644 --- a/app/src/main/java/uk/org/openseizuredetector/StartupActivity.java +++ b/app/src/main/java/uk/org/openseizuredetector/StartupActivity.java @@ -229,9 +229,14 @@ public class StartupActivity extends AppCompatActivity { Log.i(TAG, "Power Management OK - we are ignoring Battery Optimizations"); mBatteryOptDialogDisplayed = false; } else { - Log.e(TAG, "Power Management Problem - not ignoring Battery Optimisations"); - //mUtil.showToast("WARNING - Phone is Optimising OpenSeizureDetector Battery Usage - this is likely to prevent it working correctly when running on battery!"); - if (!mBatteryOptDialogDisplayed) showBatteryOptimisationWarningDialog(); + boolean preventBatteryOptWarning = SP.getBoolean("PreventBatteryOptWarning", false); + if (preventBatteryOptWarning) { + Log.i(TAG,"PreventBatteryOptWarning is true, so not displaying battery optimisation dialog"); + } else { + Log.e(TAG, "Power Management Problem - not ignoring Battery Optimisations"); + //mUtil.showToast("WARNING - Phone is Optimising OpenSeizureDetector Battery Usage - this is likely to prevent it working correctly when running on battery!"); + if (!mBatteryOptDialogDisplayed) showBatteryOptimisationWarningDialog(); + } } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index dbac5a2..564f041 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -364,7 +364,8 @@ WARNING: The Android System Battery Optimisation Settings are configured to \'Optimise\' OpenSeizureDetector.\n\n This means it is likely to be shutdown when operating on battery power, so will not work correctly\n\n - Please go into the Phone Settings and select Apps->OpenSeizureDetector->Battery->Optimise battery usage and set it so that OpenSeizureDetector is NOT optimised + Please go into the Phone Settings and select Apps->OpenSeizureDetector->Battery->Optimise battery usage and set it so + that OpenSeizureDetector is NOT optimised (on Older versions of Andoroid this option is in Local Data Shared Data Prune Database @@ -467,4 +468,6 @@ notes about event O2 Sat Data Sharing + Do not display the battery optimisation dialog on start-up (some phones report that OpenSeizureDetector is optimised, even if it is not, so the dialog is a nuissance) + Inhibit Battery Optimisation Warning Dialog diff --git a/app/src/main/res/xml/general_prefs.xml b/app/src/main/res/xml/general_prefs.xml index 12fbcef..d8ae61a 100644 --- a/app/src/main/res/xml/general_prefs.xml +++ b/app/src/main/res/xml/general_prefs.xml @@ -69,6 +69,14 @@ android:title="@string/auto_start_title" android:enabled="true" /> + +