From 4f75b386f28362883d31f587a6f82646199191e5 Mon Sep 17 00:00:00 2001
From: Oliver Zimmerman <oezimmerman@gmail.com>
Date: Thu, 30 Jul 2020 15:12:45 +0100
Subject: [PATCH] Fix - Adjusted isBackgroundJobEnabled to consider battery
optimization (#951)
* Check for battery saver mode
added a check for battery saver mode in connectivity helper
created sample dialog to appear if battery saver is enabled - string values to be confirmed.
* Implemented the energy saving warning dialog in main screen
- Created a Dialog in MainFragment that shows once (shared pref boolean check), and if energy saver mode is enabled
- Created a shared pref in local data to store if the energy saving warning has been shown
- Added strings required for dialog (Only DE confirmed)
- Added a method in ExternalActionHelper that will open energy saver settings
- Adjusted existing dialog in onboarding process
* Change from battery saver check to battery optimized check
- Change from battery saver check to battery optimized check
- Added second dialog explaining manual checks
* Update strings.xml
Text changes as provided on JIRA ticket
* Dialog will now only appear once in tracing settings.
* removed unused imports
* Update SettingsTracingFragment.kt
* Update SettingsTracingFragment.kt
* code formatting
* formatting
* Update ConnectivityHelper.kt
* Update SettingsTracingFragment.kt
* Lint and string file changes
1. Small corrections of brackets and lines
2. Keeping order of the elements in string files uniform across languages
* Update strings.xml
* Update strings.xml
* Update ConnectivityHelper.kt
Co-authored-by: Rituraj Sambherao <git.rituraj.sambherao@gmail.com>
---
.../main/java/de/rki/coronawarnapp/util/ConnectivityHelper.kt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/ConnectivityHelper.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/ConnectivityHelper.kt
index 907cfc76a..b111fec8a 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/ConnectivityHelper.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/ConnectivityHelper.kt
@@ -197,7 +197,7 @@ object ConnectivityHelper {
fun isBackgroundJobEnabled(context: Context): Boolean {
val activityManager = context.getSystemService(Context.ACTIVITY_SERVICE) as ActivityManager
return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
- !activityManager.isBackgroundRestricted
+ !activityManager.isBackgroundRestricted && PowerManagementHelper.isIgnoringBatteryOptimizations(context)
} else true
}
--
GitLab