fix missing consent migration

0-Rainer-Stoff-0 · Mar 23, 2021 · 4aaf5a9 · 4aaf5a9
1 parent b3055ba
commit 4aaf5a9
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -45,7 +45,7 @@ android {
         minSdkVersion(14)
         targetSdkVersion(30)
         versionCode = 39
-        versionName = "2.2.8"
+        versionName = "2.2.9-alpha"
     }
     signingConfigs {
         register("release") {

diff --git a/...rc/main/java/org/ostrya/presencepublisher/ui/initialization/EnsureLocationPermission.java b/...rc/main/java/org/ostrya/presencepublisher/ui/initialization/EnsureLocationPermission.java
@@ -27,9 +27,11 @@ protected EnsureLocationPermission(MainActivity activity, Queue<HandlerFactory>
     @Override
     protected void doInitialize() {
         if (activity.isLocationServiceNeeded()
-                && ContextCompat.checkSelfPermission(activity, Manifest.permission.ACCESS_FINE_LOCATION)
-                != PackageManager.PERMISSION_GRANTED) {
-            HyperLog.i(TAG, "Location permission not yet granted, asking user ...");
+                && (ContextCompat.checkSelfPermission(activity, Manifest.permission.ACCESS_FINE_LOCATION)
+                != PackageManager.PERMISSION_GRANTED
+                // for migration of pre-2.2.2 app versions, the consent needs to be confirmed once
+                || !PreferenceManager.getDefaultSharedPreferences(activity).getBoolean(LOCATION_CONSENT, false))) {
+            HyperLog.i(TAG, "Location permission / consent not yet granted, asking user ...");
             FragmentManager fm = activity.getSupportFragmentManager();
 
             ConfirmationDialogFragment fragment = ConfirmationDialogFragment.getInstance(
@@ -51,7 +53,10 @@ private void onResult(Activity parent, boolean ok) {
             PreferenceManager.getDefaultSharedPreferences(parent).edit()
                     .putBoolean(LOCATION_CONSENT, true)
                     .apply();
-            getLauncher().launch(Manifest.permission.ACCESS_FINE_LOCATION);
+            if (ContextCompat.checkSelfPermission(activity, Manifest.permission.ACCESS_FINE_LOCATION)
+                    != PackageManager.PERMISSION_GRANTED) {
+                getLauncher().launch(Manifest.permission.ACCESS_FINE_LOCATION);
+            }
         } else {
             HyperLog.i(getName(), "User did not give consent. Stopping any further actions.");
             PreferenceManager.getDefaultSharedPreferences(parent).edit()

diff --git a/app/src/main/play/release-notes/en-US/default.txt b/app/src/main/play/release-notes/en-US/default.txt
@@ -1,2 +1,3 @@
-v2.2.8
-• Fix activity resume error.
+v2.2.9
+• automatically ask the user for consent to process location data if not set
+• Important: if you have updated from version 2.2.1 and the app no longer publishes, you need to give your consent once by opening the app.