diff --git a/project/app/src/androidTest/java/org/owntracks/android/ui/PreferencesActivityTests.kt b/project/app/src/androidTest/java/org/owntracks/android/ui/PreferencesActivityTests.kt index 0e4e6e3fa5..6b5b457136 100644 --- a/project/app/src/androidTest/java/org/owntracks/android/ui/PreferencesActivityTests.kt +++ b/project/app/src/androidTest/java/org/owntracks/android/ui/PreferencesActivityTests.kt @@ -132,6 +132,7 @@ class PreferencesActivityTests : clickOnAndWait(R.string.preferencesReverseGeocodeProvider) clickOnAndWait("OpenCage") + clickOnAndWait(android.R.id.button1) writeToPreference(R.string.preferencesOpencageGeocoderApiKey, "geocodeAPIKey") diff --git a/project/app/src/main/java/org/owntracks/android/ui/preferences/AdvancedFragment.kt b/project/app/src/main/java/org/owntracks/android/ui/preferences/AdvancedFragment.kt index de9c7d7b83..2e1f656108 100644 --- a/project/app/src/main/java/org/owntracks/android/ui/preferences/AdvancedFragment.kt +++ b/project/app/src/main/java/org/owntracks/android/ui/preferences/AdvancedFragment.kt @@ -1,9 +1,11 @@ package org.owntracks.android.ui.preferences import android.Manifest.permission.ACCESS_BACKGROUND_LOCATION +import android.app.ProgressDialog.show import android.content.Context import android.os.Build import android.os.Bundle +import android.widget.TextView import androidx.core.content.PermissionChecker import androidx.preference.ListPreference import androidx.preference.Preference @@ -72,7 +74,10 @@ class AdvancedFragment @Inject constructor() : (preference as ListPreference).value = newValue.toString() } .setNegativeButton(R.string.preferencesAdvancedOpencagePrivacyDialogCancel, null) - .show() + .create() + .apply { show() } + .findViewById(android.R.id.message) + ?.movementMethod = android.text.method.LinkMovementMethod.getInstance() false } else { true diff --git a/project/app/src/main/res/values/strings.xml b/project/app/src/main/res/values/strings.xml index e5cfb6d6ec..d9e8ea0476 100644 --- a/project/app/src/main/res/values/strings.xml +++ b/project/app/src/main/res/values/strings.xml @@ -134,7 +134,7 @@ To allow this, please enable Location in the device settings." "Google Play Services update is required" "Advanced" "This version of Android restricts OwnTracks from receiving locations when automatically started on device boot until the app is opened." - OpenCage Privacy Policy + OpenCage Privacy Policy To use the OpenCage geocoder, OwnTracks will send every location it processes to OpenCage over a TLS-encrypted connection.\n\nThe OpenCage privacy policy can be found on their website. OpenCage Privacy Policy Accept diff --git a/project/app/src/main/res/values/urls.xml b/project/app/src/main/res/values/urls.xml index 58adaa7cf3..d230823cd7 100644 --- a/project/app/src/main/res/values/urls.xml +++ b/project/app/src/main/res/values/urls.xml @@ -7,4 +7,5 @@ https://poeditor.com/join/project?hash=xe6LPP0Jnx https://opensource.org/licenses/EPL-1.0 https://raw.githubusercontent.com/owntracks/android/master/CHANGELOG.md + https://opencagedata.com/api#privacy diff --git a/project/app/src/main/res/xml/preferences_advanced.xml b/project/app/src/main/res/xml/preferences_advanced.xml index f4376c68b8..bfc23fdf11 100644 --- a/project/app/src/main/res/xml/preferences_advanced.xml +++ b/project/app/src/main/res/xml/preferences_advanced.xml @@ -92,7 +92,11 @@ android:icon="@drawable/baseline_privacy_tip_24" app:iconSpaceReserved="true" app:key="opencagePrivacy" - app:summary="@string/preferencesAdvancedOpencagePrivacy" /> + app:summary="@string/preferencesAdvancedOpencagePrivacy"> + +