Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/bitfireAT/davx5-ose.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRicki Hirner <hirner@bitfire.at>2020-11-07 14:19:27 +0300
committerRicki Hirner <hirner@bitfire.at>2020-11-07 14:31:12 +0300
commitb69ff2380acb1f8c9d6f8cd786c3dca9a26123fc (patch)
tree6c753fb7594db2282cfad01a5e124d21c856e534
parent260c5f928d9b31d9086941a77ead2eae1e812a3d (diff)
Wifi permission activity: add "Allow all the time" string for Android 10v3.3.6-ose
-rw-r--r--app/src/main/java/at/bitfire/davdroid/ui/account/WifiPermissionsActivity.kt5
-rw-r--r--app/src/main/res/values/strings.xml1
2 files changed, 5 insertions, 1 deletions
diff --git a/app/src/main/java/at/bitfire/davdroid/ui/account/WifiPermissionsActivity.kt b/app/src/main/java/at/bitfire/davdroid/ui/account/WifiPermissionsActivity.kt
index 0c06ba2f..08e0a97b 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/account/WifiPermissionsActivity.kt
+++ b/app/src/main/java/at/bitfire/davdroid/ui/account/WifiPermissionsActivity.kt
@@ -57,7 +57,10 @@ class WifiPermissionsActivity: AppCompatActivity() {
}
model.haveBackgroundLocation.observe(this) { status ->
- val label = if (Build.VERSION.SDK_INT >= 30) packageManager.getBackgroundPermissionOptionLabel() else ""
+ val label = if (Build.VERSION.SDK_INT >= 30)
+ packageManager.getBackgroundPermissionOptionLabel()
+ else
+ getString(R.string.wifi_permissions_background_location_permission_label)
binding.backgroundLocationStatus.text = HtmlCompat.fromHtml(getString(
if (status) R.string.wifi_permissions_background_location_permission_on else R.string.wifi_permissions_background_location_permission_off,
label
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ff9be5cb..ffe97661 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -89,6 +89,7 @@
<string name="wifi_permissions_location_permission_on">Location permission granted</string>
<string name="wifi_permissions_location_permission_off">Location permission denied</string>
<string name="wifi_permissions_background_location_permission">Background location permission</string>
+ <string name="wifi_permissions_background_location_permission_label">Allow all the time</string>
<string name="wifi_permissions_background_location_permission_on"><![CDATA[Location permission set to <b>%s</b>]]></string>
<string name="wifi_permissions_background_location_permission_off"><![CDATA[Location permission not set to <b>%s</b>]]></string>
<string name="wifi_permissions_background_location_disclaimer">%s uses the Location permission only to determine the current WiFi\'s SSID for SSID-restricted accounts. This will happen even when the app is in background. No location data are collected, stored, processed or sent anywhere.</string>