5196: Fix in-app camera location loss

app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java

@@ -13,8 +13,13 @@
 import fr.free.nrw.commons.filepicker.FilePicker.ImageSource;
 import fr.free.nrw.commons.filepicker.UploadableFile;
 import fr.free.nrw.commons.kvstore.JsonKvStore;
+import fr.free.nrw.commons.location.LatLng;
+import fr.free.nrw.commons.location.LocationPermissionsHelper;
+import fr.free.nrw.commons.location.LocationPermissionsHelper.Dialog;
+import fr.free.nrw.commons.location.LocationServiceManager;
 import fr.free.nrw.commons.nearby.Place;
 import fr.free.nrw.commons.upload.UploadActivity;
+import fr.free.nrw.commons.utils.DialogUtil;
 import fr.free.nrw.commons.utils.PermissionUtils;
 import fr.free.nrw.commons.utils.ViewUtil;
 import java.util.ArrayList;
@@ -28,7 +33,11 @@ public class ContributionController {
 
     public static final String ACTION_INTERNAL_UPLOADS = "internalImageUploads";
     private final JsonKvStore defaultKvStore;
+    private LatLng locationBeforeImageCapture;
+    private Boolean isInAppCameraUpload;
 
+    @Inject
+    LocationServiceManager locationManager;
     @Inject
     public ContributionController(@Named("default_preferences") JsonKvStore defaultKvStore) {
         this.defaultKvStore = defaultKvStore;
@@ -46,15 +55,90 @@ public void initiateCameraPick(Activity activity) {
 
         PermissionUtils.checkPermissionsAndPerformAction(activity,
                 Manifest.permission.WRITE_EXTERNAL_STORAGE,
-                () -> initiateCameraUpload(activity),
+                () -> {
+                    if (defaultKvStore.getBoolean("inAppCameraFirstRun")) {
+                        defaultKvStore.putBoolean("inAppCameraFirstRun", false);
+                        askUserToAllowLocationAccess(activity);
+                    } else if(!(PermissionUtils.hasPermission(activity,
+                        Manifest.permission.ACCESS_FINE_LOCATION)
+                        && isLocationAccessToAppsTurnedOn())
+                        && defaultKvStore.getBoolean("inAppCameraLocationPref")) {
+                        createDialogsAndHandleLocationPermissions(activity);
+                    } else {
+                        initiateCameraUpload(activity);
+                    }
+                },
                 R.string.storage_permission_title,
                 R.string.write_storage_permission_rationale);
     }
 
+    /**
+     * Asks users to provide location access
+     *
+     * @param activity
+     */
+    private void createDialogsAndHandleLocationPermissions(Activity activity) {
+        LocationPermissionsHelper.Dialog locationAccessDialog = new Dialog(
+            R.string.location_permission_title,
+            R.string.in_app_camera_location_permission_rationale
+        );
+
+        LocationPermissionsHelper.Dialog locationOffDialog = new Dialog(
+            R.string.ask_to_turn_location_on,
+            R.string.in_app_camera_needs_location
+        );
+
+        LocationPermissionsHelper locationPermissionsHelper = new LocationPermissionsHelper(activity, locationManager);
+        locationPermissionsHelper.handleLocationPermissions(
+            locationAccessDialog,
+            locationOffDialog
+        );
+    }
+
+    /**
+     * Suggest user to attach location information with pictures.
+     * If the user selects "Yes", then:
+     *
+     * Location is taken from the EXIF if the default camera application
+     * does not redact location tags.
+     *
+     * Otherwise, if the EXIF metadata does not have location information,
+     * then location captured by the app is used
+     *
+     * @param activity
+     */
+    private void askUserToAllowLocationAccess(Activity activity) {
+        DialogUtil.showAlertDialog(activity,
+            activity.getString(R.string.in_app_camera_location_permission_title),
+            activity.getString(R.string.in_app_camera_location_access_explanation),
+            activity.getString(R.string.option_allow),
+            activity.getString(R.string.option_dismiss),
+            ()-> {
+                defaultKvStore.putBoolean("inAppCameraLocationPref", true);
+                createDialogsAndHandleLocationPermissions(activity);
+            },
+            () -> {
+                defaultKvStore.putBoolean("inAppCameraLocationPref", false);
+                initiateCameraUpload(activity);
+            },
+            null,
+            true);
+    }
+
+    /**
+     * Check if apps have access to location even after having individual access
+     *
+     * @return
+     */
+    private boolean isLocationAccessToAppsTurnedOn() {
+        return (locationManager.isNetworkProviderEnabled() || locationManager.isGPSProviderEnabled());
+    }
+
     /**
      * Initiate gallery picker
      */
     public void initiateGalleryPick(final Activity activity, final boolean allowMultipleUploads) {
+        isInAppCameraUpload = false;
         initiateGalleryUpload(activity, allowMultipleUploads);
     }
 
@@ -67,6 +151,7 @@ public void initiateCustomGalleryPickWithPermission(final Activity activity) {
         PermissionUtils.checkPermissionsAndPerformAction(activity,
             Manifest.permission.WRITE_EXTERNAL_STORAGE,
             () -> {
+                isInAppCameraUpload = false;
                 FilePicker.openCustomSelector(activity, 0);
             },
             R.string.storage_permission_title,
@@ -99,6 +184,10 @@ private void setPickerConfiguration(Activity activity,
      */
     private void initiateCameraUpload(Activity activity) {
         setPickerConfiguration(activity, false);
+        if (defaultKvStore.getBoolean("inAppCameraLocationPref", false)) {
+            locationBeforeImageCapture = locationManager.getLastLocation();
+        }
+        isInAppCameraUpload = true;
         FilePicker.openCameraForImage(activity, 0);
     }
 
@@ -134,7 +223,8 @@ public List<UploadableFile> handleExternalImagesPicked(Activity activity,
 
     /**
      * Returns intent to be passed to upload activity
-     * Attaches place object for nearby uploads
+     * Attaches place object for nearby uploads and
+     * location before image capture if in-app camera is used
      */
     private Intent handleImagesPicked(Context context,
         List<UploadableFile> imagesFiles) {
@@ -148,6 +238,17 @@ private Intent handleImagesPicked(Context context,
             shareIntent.putExtra(PLACE_OBJECT, place);
         }
 
+        if (locationBeforeImageCapture != null) {
+            shareIntent.putExtra(
+                UploadActivity.LOCATION_BEFORE_IMAGE_CAPTURE,
+                locationBeforeImageCapture);
+        }
+
+        shareIntent.putExtra(
+            UploadActivity.IN_APP_CAMERA_UPLOAD,
+            isInAppCameraUpload
+        );
+
         return shareIntent;
     }
 

app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.java

@@ -403,6 +403,7 @@ protected void onResume() {
 
         if ((applicationKvStore.getBoolean("firstrun", true)) &&
             (!applicationKvStore.getBoolean("login_skipped"))) {
+            defaultKvStore.putBoolean("inAppCameraFirstRun", true);
             WelcomeActivity.startYourself(this);
         }
     }

app/src/main/java/fr/free/nrw/commons/location/LocationPermissionsHelper.java

@@ -0,0 +1,98 @@
+package fr.free.nrw.commons.location;
+
+import android.Manifest.permission;
+import android.app.Activity;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.provider.Settings;
+import fr.free.nrw.commons.R;
+import fr.free.nrw.commons.utils.DialogUtil;
+import fr.free.nrw.commons.utils.PermissionUtils;
+
+/**
+ * Helper class to handle location permissions
+ */
+public class LocationPermissionsHelper {
+    Activity activity;
+    LocationServiceManager locationManager;
+    public LocationPermissionsHelper(Activity activity, LocationServiceManager locationManager) {
+        this.activity = activity;
+        this.locationManager = locationManager;
+    }
+    public static class Dialog {
+        int dialogTitleResource;
+        int dialogTextResource;
+
+        public Dialog(int dialogTitle, int dialogText) {
+            dialogTitleResource = dialogTitle;
+            dialogTextResource = dialogText;
+        }
+    }
+
+    public void handleLocationPermissions(Dialog locationAccessDialog,
+                                          Dialog locationOffDialog) {
+        requestForLocationAccess(locationAccessDialog, locationOffDialog);
+    }
+
+    /**
+     * Ask for location permission if the user agrees on attaching location with pictures
+     * and the app does not have the access to location
+     *
+     * @param locationAccessDialog
+     * @param locationOffDialog
+     */
+    private void requestForLocationAccess(
+        Dialog locationAccessDialog,
+        Dialog locationOffDialog
+    ) {
+        PermissionUtils.checkPermissionsAndPerformAction(activity,
+            permission.ACCESS_FINE_LOCATION,
+            () -> {
+                if(!isLocationAccessToAppsTurnedOn()) {
+                    showLocationOffDialog(locationOffDialog);
+                }
+            },
+            () -> {},
+            locationAccessDialog.dialogTitleResource,
+            locationAccessDialog.dialogTextResource);
+    }
+
+    /**
+     * Check if apps have access to location even after having individual access
+     *
+     * @return
+     */
+    private boolean isLocationAccessToAppsTurnedOn() {
+        return (locationManager.isNetworkProviderEnabled() || locationManager.isGPSProviderEnabled());
+    }
+
+    /**
+     * Ask user to grant location access to apps
+     *
+     */
+
+    private void showLocationOffDialog(Dialog locationOffDialog) {
+        DialogUtil
+            .showAlertDialog(activity,
+                activity.getString(locationOffDialog.dialogTitleResource),
+                activity.getString(locationOffDialog.dialogTextResource),
+                activity.getString(R.string.title_app_shortcut_setting),
+                () -> openLocationSettings(),
+                true);
+    }
+
+    /**
+     * Open location source settings so that apps with location access can access it
+     *
+     * TODO: modify it to fix https://github.com/commons-app/apps-android-commons/issues/5255
+     */
+
+    private void openLocationSettings() {
+        final Intent intent = new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS);
+        final PackageManager packageManager = activity.getPackageManager();
+
+        if (intent.resolveActivity(packageManager)!= null) {
+            activity.startActivity(intent);
+        }
+    }
+}

app/src/main/java/fr/free/nrw/commons/repository/UploadRepository.java

@@ -188,9 +188,9 @@ public int getCount() {
      * @return
      */
     public Observable<UploadItem> preProcessImage(UploadableFile uploadableFile, Place place,
-        SimilarImageInterface similarImageInterface) {
+        SimilarImageInterface similarImageInterface, LatLng inAppPictureLocation) {
         return uploadModel.preProcessImage(uploadableFile, place,
-            similarImageInterface);
+            similarImageInterface, inAppPictureLocation);
     }
 
     /**
@@ -199,8 +199,8 @@ public Observable<UploadItem> preProcessImage(UploadableFile uploadableFile, Pla
      * @param uploadItem
      * @return
      */
-    public Single<Integer> getImageQuality(UploadItem uploadItem) {
-        return uploadModel.getImageQuality(uploadItem);
+    public Single<Integer> getImageQuality(UploadItem uploadItem, LatLng location) {
+        return uploadModel.getImageQuality(uploadItem, location);
     }
 
     /**

app/src/main/java/fr/free/nrw/commons/settings/SettingsFragment.java

@@ -30,13 +30,14 @@
 import com.karumi.dexter.Dexter;
 import com.karumi.dexter.listener.PermissionGrantedResponse;
 import com.karumi.dexter.listener.single.BasePermissionListener;
-import com.mapbox.mapboxsdk.Mapbox;
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.Utils;
 import fr.free.nrw.commons.campaigns.CampaignView;
 import fr.free.nrw.commons.contributions.MainActivity;
 import fr.free.nrw.commons.di.ApplicationlessInjection;
 import fr.free.nrw.commons.kvstore.JsonKvStore;
+import fr.free.nrw.commons.location.LocationPermissionsHelper;
+import fr.free.nrw.commons.location.LocationServiceManager;
 import fr.free.nrw.commons.logging.CommonsLogSender;
 import fr.free.nrw.commons.recentlanguages.Language;
 import fr.free.nrw.commons.recentlanguages.RecentLanguagesAdapter;
@@ -65,6 +66,9 @@ public class SettingsFragment extends PreferenceFragmentCompat {
     @Inject
     RecentLanguagesDao recentLanguagesDao;
 
+    @Inject
+    LocationServiceManager locationManager;
+
     private ListPreference themeListPreference;
     private Preference descriptionLanguageListPreference;
     private Preference appUiLanguageListPreference;
@@ -97,6 +101,18 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
             });
         }
 
+        Preference inAppCameraLocationPref = findPreference("inAppCameraLocationPref");
+
+        inAppCameraLocationPref.setOnPreferenceChangeListener(
+            (preference, newValue) -> {
+                boolean isInAppCameraLocationTurnedOn = (boolean) newValue;
+                if (isInAppCameraLocationTurnedOn) {
+                    createDialogsAndHandleLocationPermissions(getActivity());
+                }
+                return true;
+            }
+        );
+
         // Gets current language code from shared preferences
         String languageCode;
 
@@ -175,6 +191,29 @@ public boolean onPreferenceClick(Preference preference) {
         }
     }
 
+    /**
+     * Asks users to provide location access
+     *
+     * @param activity
+     */
+    private void createDialogsAndHandleLocationPermissions(Activity activity) {
+        LocationPermissionsHelper.Dialog locationAccessDialog = new LocationPermissionsHelper.Dialog(
+            R.string.location_permission_title,
+            R.string.in_app_camera_location_permission_rationale
+        );
+
+        LocationPermissionsHelper.Dialog locationOffDialog = new LocationPermissionsHelper.Dialog(
+            R.string.ask_to_turn_location_on,
+            R.string.in_app_camera_needs_location
+        );
+
+        LocationPermissionsHelper locationPermissionsHelper = new LocationPermissionsHelper(activity, locationManager);
+        locationPermissionsHelper.handleLocationPermissions(
+            locationAccessDialog,
+            locationOffDialog
+        );
+    }
+
     /**
      * On some devices, the new Photo Picker with GET_CONTENT takeover
      * redacts location tags from EXIF metadata