fix issue #5015 - custom image selector not identifying photo location (

#5190) Co-authored-by: Siva <doodsiva@gmail.com>
commons-app · Mar 31, 2023 · 0f1e526 · 0f1e526
1 parent 8f8dcc0
commit 0f1e526
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -17,6 +17,7 @@
     <uses-permission android:name="com.google.android.apps.photos.permission.GOOGLE_PHOTOS" />
     <uses-permission android:name="android.permission.SET_WALLPAPER"/>
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.ACCESS_MEDIA_LOCATION"/>
 
     <queries>
         <!-- Browser -->

diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java
@@ -3,9 +3,12 @@
 import static fr.free.nrw.commons.wikidata.WikidataConstants.PLACE_OBJECT;
 
 import android.Manifest;
+import android.Manifest.permission;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
+import android.os.Build.VERSION;
+import android.os.Build.VERSION_CODES;
 import androidx.annotation.NonNull;
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.filepicker.DefaultCallback;
@@ -66,7 +69,18 @@ public void initiateCustomGalleryPickWithPermission(final Activity activity) {
 
         PermissionUtils.checkPermissionsAndPerformAction(activity,
             Manifest.permission.WRITE_EXTERNAL_STORAGE,
-            () -> FilePicker.openCustomSelector(activity, 0),
+            () -> {
+                if (VERSION.SDK_INT >= VERSION_CODES.Q) {
+                    PermissionUtils.checkPermissionsAndPerformAction(
+                        activity,
+                        permission.ACCESS_MEDIA_LOCATION,
+                        () -> {},
+                        R.string.media_location_permission_denied,
+                        R.string.add_location_manually
+                    );
+                }
+                FilePicker.openCustomSelector(activity, 0);
+            },
             R.string.storage_permission_title,
             R.string.write_storage_permission_rationale);
     }

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -511,6 +511,9 @@ Upload your first media by tapping on the add button.</string>
   <string name="exif_tag_name_serialNumbers">Serial Numbers</string>
   <string name="exif_tag_name_software">Software</string>
 
+  <string name="media_location_permission_denied">Media location access denied</string>
+  <string name="add_location_manually">We may not be able to automatically obtain location data from pictures you upload. Please add the appropriate location for each picture before submitting</string>
+
   <string name="share_text">Upload photos to Wikimedia Commons directly from your phone. Download the Commons App now: %1$s</string>
   <string name="share_via">Share app via...</string>
   <string name="image_info">Image Info</string>