Merge remote-tracking branch 'origin/remove-exif-data' into remove-ex…

…if-data

CHANGELOG.md

@@ -1,5 +1,19 @@
 # Wikimedia Commons for Android
 
+## v4.2.0
+- Dark mode colour improvements
+- Enhancements done to address location metadata loss including the metadata loss that occurs in
+  latest Android versions
+- Enhancements done to address the issue where uploads get stuck in queued state
+- Fix the inability to upload via the in-app camera option
+- Provide the ability to optionally include location metadata for in-app camera uploads in case the
+  device camera app does not provide location metadata
+- Use geo location URL that works consistently across all map applications
+- Fix crash when clicking on location target icon while trying to edit the location of an upload
+- Fix crash that occurs randomly while returning to the app after leaving it in the background
+- Fix crash in Sign up activity on Android version 5.0 and 5.1
+- Android 13 compatibility changes
+
 ## v4.1.0
 - Location of pictures uploaded via custom picture selector are now recognized
 - Improvements to the custom picture selector

app/build.gradle

@@ -142,7 +142,7 @@ dependencies {
 
     implementation "androidx.multidex:multidex:$MULTIDEX_VERSION"
 
-    def work_version = "2.8.0"
+    def work_version = "2.8.1"
     // Kotlin + coroutines
     implementation "androidx.work:work-runtime-ktx:$work_version"
     implementation("androidx.work:work-runtime:$work_version")
@@ -168,17 +168,17 @@ project.gradle.taskGraph.whenReady {
 }
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion 33
 
     defaultConfig {
         //applicationId 'fr.free.nrw.commons'
 
-        versionCode 1034
-        versionName '4.1.0'
+        versionCode 1035
+        versionName '4.2.0'
         setProperty("archivesBaseName", "app-commons-v$versionName-" + getBranchName())
 
         minSdkVersion 21
-        targetSdkVersion 31
+        targetSdkVersion 33
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         testInstrumentationRunnerArguments clearPackageData: 'true'
 
@@ -223,6 +223,7 @@ android {
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
             testProguardFile 'test-proguard-rules.txt'
+            signingConfig signingConfigs.debug
             if (isRunningOnTravisAndIsNotPRBuild) {
                 signingConfig signingConfigs.release
             }

app/src/main/AndroidManifest.xml

@@ -14,6 +14,8 @@
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />
     <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
+    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES"/>
     <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" />

app/src/main/java/fr/free/nrw/commons/LocationPicker/LocationPickerActivity.java

@@ -10,6 +10,7 @@
 import static fr.free.nrw.commons.upload.mediaDetails.UploadMediaDetailFragment.LAST_ZOOM;
 
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.graphics.BitmapFactory;
 import android.location.Location;
 import android.os.Bundle;
@@ -21,7 +22,6 @@
 import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.TextView;
-import android.widget.Toast;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.ActionBar;
@@ -56,7 +56,12 @@
 import fr.free.nrw.commons.MapStyle;
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.Utils;
+import fr.free.nrw.commons.filepicker.Constants;
 import fr.free.nrw.commons.kvstore.JsonKvStore;
+import fr.free.nrw.commons.location.LocationPermissionsHelper;
+import fr.free.nrw.commons.location.LocationPermissionsHelper.Dialog;
+import fr.free.nrw.commons.location.LocationPermissionsHelper.LocationPermissionCallback;
+import fr.free.nrw.commons.location.LocationServiceManager;
 import fr.free.nrw.commons.theme.BaseActivity;
 import fr.free.nrw.commons.utils.DialogUtil;
 import fr.free.nrw.commons.utils.SystemThemeUtils;
@@ -69,7 +74,7 @@
  * Helps to pick location and return the result with an intent
  */
 public class LocationPickerActivity extends BaseActivity implements OnMapReadyCallback,
-    OnCameraMoveStartedListener, OnCameraIdleListener, Observer<CameraPosition> {
+    OnCameraMoveStartedListener, OnCameraIdleListener, Observer<CameraPosition>, LocationPermissionCallback {
 
     /**
      * DROPPED_MARKER_LAYER_ID : id for layer
@@ -157,6 +162,9 @@ public class LocationPickerActivity extends BaseActivity implements OnMapReadyCa
     SystemThemeUtils systemThemeUtils;
     private boolean isDarkTheme;
 
+    @Inject
+    LocationServiceManager locationManager;
+
     @Override
     protected void onCreate(@Nullable final Bundle savedInstanceState) {
         getWindow().requestFeature(Window.FEATURE_ACTION_BAR);
@@ -340,7 +348,7 @@ private void removeLocationFromPicture() {
     /**
      * Show the location in map app
      */
-    public void showInMap(){
+    public void showInMap() {
         Utils.handleGeoCoordinates(this,
             new fr.free.nrw.commons.location.LatLng(cameraPosition.target.getLatitude(),
                 cameraPosition.target.getLongitude(), 0.0f));
@@ -413,6 +421,8 @@ public void onFailure(@NonNull Exception exception) {
                 });
 
 
+        } else {
+            requestLocationPermissions();
         }
     }
 
@@ -484,13 +494,36 @@ void placeSelected() {
      */
     private void addCenterOnGPSButton(){
         fabCenterOnLocation = findViewById(R.id.center_on_gps);
-        fabCenterOnLocation.setOnClickListener(view -> getCenter());
+        fabCenterOnLocation.setOnClickListener(view -> requestLocationPermissions());
     }
+
     /**
-     * Animate map to move to desired Latitude and Longitude
+     * Center the map at user's current location
      */
-    void getCenter() {
-        mapboxMap.animateCamera(CameraUpdateFactory.newLatLngZoom(new LatLng(location.getLatitude(),location.getLongitude()),15.0));
+    private void requestLocationPermissions() {
+        LocationPermissionsHelper.Dialog locationAccessDialog = new Dialog(
+            R.string.location_permission_title,
+            R.string.upload_map_location_access
+        );
+
+        LocationPermissionsHelper.Dialog locationOffDialog = new Dialog(
+            R.string.ask_to_turn_location_on,
+            R.string.upload_map_location_access
+        );
+        LocationPermissionsHelper locationPermissionsHelper = new LocationPermissionsHelper(
+            this, locationManager, this);
+        locationPermissionsHelper.handleLocationPermissions(locationAccessDialog, locationOffDialog);
+    }
+
+    @Override
+    public void onRequestPermissionsResult(final int requestCode, @NonNull final String[] permissions,
+        @NonNull final int[] grantResults) {
+        if (requestCode == Constants.RequestCodes.LOCATION && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+            onLocationPermissionGranted();
+        } else {
+            onLocationPermissionDenied("");
+        }
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
     }
 
     @Override
@@ -534,4 +567,27 @@ public void onLowMemory() {
         super.onLowMemory();
         mapView.onLowMemory();
     }
+
+    @Override
+    public void onLocationPermissionDenied(String toastMessage) {
+        //do nothing
+    }
+
+    @Override
+    public void onLocationPermissionGranted() {
+        if (mapboxMap.getStyle() != null) {
+            enableLocationComponent(mapboxMap.getStyle());
+        }
+        fr.free.nrw.commons.location.LatLng currLocation = locationManager.getLastLocation();
+        if (currLocation != null) {
+            final CameraPosition position;
+            position = new CameraPosition.Builder()
+                .target(new com.mapbox.mapboxsdk.geometry.LatLng(currLocation.getLatitude(),
+                    currLocation.getLongitude(), 0)) // Sets the new camera position
+                .zoom(mapboxMap.getCameraPosition().zoom) // Same zoom level
+                .build();
+
+            mapboxMap.animateCamera(CameraUpdateFactory.newCameraPosition(position), 1000);
+        }
+    }
 }

app/src/main/java/fr/free/nrw/commons/auth/SignupActivity.java

@@ -1,5 +1,7 @@
 package fr.free.nrw.commons.auth;
 
+import android.content.res.Configuration;
+import android.os.Build;
 import android.os.Bundle;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
@@ -61,4 +63,20 @@ public void onBackPressed() {
             super.onBackPressed();
         }
     }
+
+    /**
+     * Known bug in androidx.appcompat library version 1.1.0 being tracked here
+     * https://issuetracker.google.com/issues/141132133
+     * App tries to put light/dark theme to webview and crashes in the process
+     * This code tries to prevent applying the theme when sdk is between api 21 to 25
+     * @param overrideConfiguration
+     */
+    @Override
+    public void applyOverrideConfiguration(final Configuration overrideConfiguration) {
+        if (Build.VERSION.SDK_INT <= 25 &&
+            (getResources().getConfiguration().uiMode == getApplicationContext().getResources().getConfiguration().uiMode)) {
+            return;
+        }
+        super.applyOverrideConfiguration(overrideConfiguration);
+    }
 }

app/src/main/java/fr/free/nrw/commons/bookmarks/BookmarkListRootFragment.java

@@ -184,7 +184,7 @@ public Integer getContributionStateAt(int position) {
     public void refreshNominatedMedia(int index) {
         if (mediaDetails != null && !listFragment.isVisible()) {
             removeFragment(mediaDetails);
-            mediaDetails = new MediaDetailPagerFragment(false, true);
+            mediaDetails = MediaDetailPagerFragment.newInstance(false, true);
             ((BookmarkFragment) getParentFragment()).setScroll(false);
             setFragment(mediaDetails, listFragment);
             mediaDetails.showImage(index);
@@ -243,7 +243,7 @@ public void onItemClick(AdapterView<?> parent, View view, int position, long id)
         Log.d("deneme8", "on media clicked");
         container.setVisibility(View.VISIBLE);
         ((BookmarkFragment) getParentFragment()).tabLayout.setVisibility(View.GONE);
-        mediaDetails = new MediaDetailPagerFragment(false, true);
+        mediaDetails = MediaDetailPagerFragment.newInstance(false, true);
         ((BookmarkFragment) getParentFragment()).setScroll(false);
         setFragment(mediaDetails, listFragment);
         mediaDetails.showImage(position);

app/src/main/java/fr/free/nrw/commons/bookmarks/locations/BookmarkLocationsFragment.java

@@ -1,5 +1,6 @@
 package fr.free.nrw.commons.bookmarks.locations;
 
+import android.Manifest.permission;
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -8,6 +9,9 @@
 import android.widget.ProgressBar;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
+import androidx.activity.result.ActivityResultCallback;
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -21,6 +25,7 @@
 import fr.free.nrw.commons.nearby.fragments.CommonPlaceClickActions;
 import fr.free.nrw.commons.nearby.fragments.PlaceAdapter;
 import java.util.List;
+import java.util.Map;
 import javax.inject.Inject;
 import kotlin.Unit;
 
@@ -36,6 +41,25 @@ public class BookmarkLocationsFragment extends DaggerFragment {
     @Inject BookmarkLocationsDao bookmarkLocationDao;
     @Inject CommonPlaceClickActions commonPlaceClickActions;
     private PlaceAdapter adapter;
+    private ActivityResultLauncher<String[]> inAppCameraLocationPermissionLauncher = registerForActivityResult(new ActivityResultContracts.RequestMultiplePermissions(), new ActivityResultCallback<Map<String, Boolean>>() {
+        @Override
+        public void onActivityResult(Map<String, Boolean> result) {
+            boolean areAllGranted = true;
+            for(final boolean b : result.values()) {
+                areAllGranted = areAllGranted && b;
+            }
+
+            if (areAllGranted) {
+                contributionController.locationPermissionCallback.onLocationPermissionGranted();
+            } else {
+                if (shouldShowRequestPermissionRationale(permission.ACCESS_FINE_LOCATION)) {
+                    contributionController.handleShowRationaleFlowCameraLocation(getActivity());
+                } else {
+                    contributionController.locationPermissionCallback.onLocationPermissionDenied(getActivity().getString(R.string.in_app_camera_location_permission_denied));
+                }
+            }
+        }
+    });
 
     /**
      * Create an instance of the fragment with the right bundle parameters
@@ -67,7 +91,8 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
                 adapter.remove(place);
                 return Unit.INSTANCE;
             },
-            commonPlaceClickActions
+            commonPlaceClickActions,
+            inAppCameraLocationPermissionLauncher
         );
         recyclerView.setAdapter(adapter);
     }

app/src/main/java/fr/free/nrw/commons/category/CategoriesModel.kt

@@ -136,7 +136,11 @@ class CategoriesModel @Inject constructor(
         return Observable.fromIterable(categoryNames)
             .map { categoryName ->
                 buildCategories(categoryName)
-            }.toList().toObservable()
+            }
+            .filter { categoryItem ->
+                categoryItem.name != "Hidden"
+            }
+            .toList().toObservable()
     }
 
     /**

app/src/main/java/fr/free/nrw/commons/category/CategoryDetailsActivity.java

@@ -115,7 +115,7 @@ public void onMediaClicked(int position) {
         mediaContainer.setVisibility(View.VISIBLE);
         if (mediaDetails == null || !mediaDetails.isVisible()) {
             // set isFeaturedImage true for featured images, to include author field on media detail
-            mediaDetails = new MediaDetailPagerFragment(false, true);
+            mediaDetails = MediaDetailPagerFragment.newInstance(false, true);
             FragmentManager supportFragmentManager = getSupportFragmentManager();
             supportFragmentManager
                     .beginTransaction()

app/src/main/java/fr/free/nrw/commons/contributions/Contribution.kt

@@ -43,7 +43,11 @@ data class Contribution constructor(
     var hasInvalidLocation : Int =  0,
     var contentUri: Uri? = null,
     var countryCode : String? = null,
-    var imageSHA1 : String? = null
+    var imageSHA1 : String? = null,
+    /**
+     * Number of times a contribution has been retried after a failure
+     */
+    var retries: Int = 0
 ) : Parcelable {
 
     fun completeWith(media: Media): Contribution {