Use new result API

app/src/main/java/fr/free/nrw/commons/CommonsApplication.java

@@ -107,7 +107,6 @@ public class CommonsApplication extends MultiDexApplication {
     /**
      * Constants begin
      */
-    public static final int OPEN_APPLICATION_DETAIL_SETTINGS = 1001;
 
     public static final String DEFAULT_EDIT_SUMMARY = "Uploaded using [[COM:MOA|Commons Mobile App]]";
 

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

@@ -9,6 +9,7 @@
 import androidx.activity.result.ActivityResultCallback;
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
+import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -33,6 +34,21 @@ public class BookmarkLocationsFragment extends DaggerFragment {
     @Inject BookmarkLocationsDao bookmarkLocationDao;
     @Inject CommonPlaceClickActions commonPlaceClickActions;
     private PlaceAdapter adapter;
+
+    private ActivityResultLauncher<Intent> cameraPickLauncherForResult = registerForActivityResult(new StartActivityForResult(),
+        result -> {
+            contributionController.handleActivityResultWithCallback(requireActivity(),callbacks -> {
+                contributionController.onPictureReturnedFromCamera(result,requireActivity(),callbacks);
+            });
+        });
+
+      private ActivityResultLauncher<Intent> galleryPickLauncherForResult = registerForActivityResult(new StartActivityForResult(),
+        result -> {
+            contributionController.handleActivityResultWithCallback(requireActivity(),callbacks -> {
+                contributionController.onPictureReturnedFromGallery(result,requireActivity(),callbacks);
+            });
+        });
+
     private ActivityResultLauncher<String[]> inAppCameraLocationPermissionLauncher = registerForActivityResult(new ActivityResultContracts.RequestMultiplePermissions(), new ActivityResultCallback<Map<String, Boolean>>() {
         @Override
         public void onActivityResult(Map<String, Boolean> result) {
@@ -45,7 +61,7 @@ public void onActivityResult(Map<String, Boolean> result) {
                 contributionController.locationPermissionCallback.onLocationPermissionGranted();
             } else {
                 if (shouldShowRequestPermissionRationale(permission.ACCESS_FINE_LOCATION)) {
-                    contributionController.handleShowRationaleFlowCameraLocation(getActivity(), inAppCameraLocationPermissionLauncher);
+                    contributionController.handleShowRationaleFlowCameraLocation(getActivity(), inAppCameraLocationPermissionLauncher,cameraPickLauncherForResult);
                 } else {
                     contributionController.locationPermissionCallback.onLocationPermissionDenied(getActivity().getString(R.string.in_app_camera_location_permission_denied));
                 }
@@ -83,7 +99,10 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
                 return Unit.INSTANCE;
             },
             commonPlaceClickActions,
-            inAppCameraLocationPermissionLauncher
+            inAppCameraLocationPermissionLauncher,
+            galleryPickLauncherForResult,
+            cameraPickLauncherForResult
+
         );
         binding.listView.setAdapter(adapter);
     }
@@ -109,11 +128,6 @@ private void initList() {
         }
     }
 
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        contributionController.handleActivityResult(getActivity(), requestCode, resultCode, data);
-    }
-
     @Override
     public void onDestroy() {
         super.onDestroy();

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

@@ -7,6 +7,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.widget.Toast;
+import androidx.activity.result.ActivityResult;
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.annotation.NonNull;
 import androidx.lifecycle.LiveData;
@@ -64,23 +65,24 @@ public ContributionController(@Named("default_preferences") JsonKvStore defaultK
      * Check for permissions and initiate camera click
      */
     public void initiateCameraPick(Activity activity,
-        ActivityResultLauncher<String[]> inAppCameraLocationPermissionLauncher) {
+        ActivityResultLauncher<String[]> inAppCameraLocationPermissionLauncher,
+        ActivityResultLauncher<Intent> resultLauncher) {
         boolean useExtStorage = defaultKvStore.getBoolean("useExternalStorage", true);
         if (!useExtStorage) {
-            initiateCameraUpload(activity);
+            initiateCameraUpload(activity, resultLauncher);
             return;
         }
 
         PermissionUtils.checkPermissionsAndPerformAction(activity,
             () -> {
                 if (defaultKvStore.getBoolean("inAppCameraFirstRun")) {
                     defaultKvStore.putBoolean("inAppCameraFirstRun", false);
-                    askUserToAllowLocationAccess(activity, inAppCameraLocationPermissionLauncher);
+                    askUserToAllowLocationAccess(activity, inAppCameraLocationPermissionLauncher, resultLauncher);
                 } else if (defaultKvStore.getBoolean("inAppCameraLocationPref")) {
                     createDialogsAndHandleLocationPermissions(activity,
-                        inAppCameraLocationPermissionLauncher);
+                        inAppCameraLocationPermissionLauncher, resultLauncher);
                 } else {
-                    initiateCameraUpload(activity);
+                    initiateCameraUpload(activity,resultLauncher);
                 }
             },
             R.string.storage_permission_title,
@@ -94,7 +96,8 @@ public void initiateCameraPick(Activity activity,
      * @param activity
      */
     private void createDialogsAndHandleLocationPermissions(Activity activity,
-        ActivityResultLauncher<String[]> inAppCameraLocationPermissionLauncher) {
+        ActivityResultLauncher<String[]> inAppCameraLocationPermissionLauncher,
+        ActivityResultLauncher<Intent> resultLauncher) {
         locationPermissionCallback = new LocationPermissionCallback() {
             @Override
             public void onLocationPermissionDenied(String toastMessage) {
@@ -103,16 +106,16 @@ public void onLocationPermissionDenied(String toastMessage) {
                     toastMessage,
                     Toast.LENGTH_LONG
                 ).show();
-                initiateCameraUpload(activity);
+                initiateCameraUpload(activity, resultLauncher);
             }
 
             @Override
             public void onLocationPermissionGranted() {
                 if (!locationPermissionsHelper.isLocationAccessToAppsTurnedOn()) {
                     showLocationOffDialog(activity, R.string.in_app_camera_needs_location,
-                        R.string.in_app_camera_location_unavailable);
+                        R.string.in_app_camera_location_unavailable, resultLauncher);
                 } else {
-                    initiateCameraUpload(activity);
+                    initiateCameraUpload(activity, resultLauncher);
                 }
             }
         };
@@ -135,9 +138,10 @@ public void onLocationPermissionGranted() {
      * @param activity           Activity reference
      * @param dialogTextResource Resource id of text to be shown in dialog
      * @param toastTextResource  Resource id of text to be shown in toast
+     * @param resultLauncher
      */
     private void showLocationOffDialog(Activity activity, int dialogTextResource,
-        int toastTextResource) {
+        int toastTextResource, ActivityResultLauncher<Intent> resultLauncher) {
         DialogUtil
             .showAlertDialog(activity,
                 activity.getString(R.string.ask_to_turn_location_on),
@@ -148,20 +152,21 @@ private void showLocationOffDialog(Activity activity, int dialogTextResource,
                 () -> {
                     Toast.makeText(activity, activity.getString(toastTextResource),
                         Toast.LENGTH_LONG).show();
-                    initiateCameraUpload(activity);
+                    initiateCameraUpload(activity,resultLauncher);
                 }
             );
     }
 
     public void handleShowRationaleFlowCameraLocation(Activity activity,
-        ActivityResultLauncher<String[]> inAppCameraLocationPermissionLauncher) {
+        ActivityResultLauncher<String[]> inAppCameraLocationPermissionLauncher,
+        ActivityResultLauncher<Intent> resultLauncher) {
         DialogUtil.showAlertDialog(activity, activity.getString(R.string.location_permission_title),
             activity.getString(R.string.in_app_camera_location_permission_rationale),
             activity.getString(android.R.string.ok),
             activity.getString(android.R.string.cancel),
             () -> {
                 createDialogsAndHandleLocationPermissions(activity,
-                    inAppCameraLocationPermissionLauncher);
+                    inAppCameraLocationPermissionLauncher, resultLauncher);
             },
             () -> locationPermissionCallback.onLocationPermissionDenied(
                 activity.getString(R.string.in_app_camera_location_permission_denied)),
@@ -181,7 +186,8 @@ public void handleShowRationaleFlowCameraLocation(Activity activity,
      * @param activity
      */
     private void askUserToAllowLocationAccess(Activity activity,
-        ActivityResultLauncher<String[]> inAppCameraLocationPermissionLauncher) {
+        ActivityResultLauncher<String[]> inAppCameraLocationPermissionLauncher,
+        ActivityResultLauncher<Intent> resultLauncher) {
         DialogUtil.showAlertDialog(activity,
             activity.getString(R.string.in_app_camera_location_permission_title),
             activity.getString(R.string.in_app_camera_location_access_explanation),
@@ -190,12 +196,12 @@ private void askUserToAllowLocationAccess(Activity activity,
             () -> {
                 defaultKvStore.putBoolean("inAppCameraLocationPref", true);
                 createDialogsAndHandleLocationPermissions(activity,
-                    inAppCameraLocationPermissionLauncher);
+                    inAppCameraLocationPermissionLauncher, resultLauncher);
             },
             () -> {
                 ViewUtil.showLongToast(activity, R.string.in_app_camera_location_permission_denied);
                 defaultKvStore.putBoolean("inAppCameraLocationPref", false);
-                initiateCameraUpload(activity);
+                initiateCameraUpload(activity, resultLauncher);
             },
             null,
             true);
@@ -204,18 +210,18 @@ private void askUserToAllowLocationAccess(Activity activity,
     /**
      * Initiate gallery picker
      */
-    public void initiateGalleryPick(final Activity activity, final boolean allowMultipleUploads) {
-        initiateGalleryUpload(activity, allowMultipleUploads);
+    public void initiateGalleryPick(final Activity activity,ActivityResultLauncher<Intent> resultLauncher ,final boolean allowMultipleUploads) {
+        initiateGalleryUpload(activity,resultLauncher ,allowMultipleUploads);
     }
 
     /**
      * Initiate gallery picker with permission
      */
-    public void initiateCustomGalleryPickWithPermission(final Activity activity) {
+    public void initiateCustomGalleryPickWithPermission(final Activity activity, ActivityResultLauncher<Intent> resultLauncher) {
         setPickerConfiguration(activity, true);
 
         PermissionUtils.checkPermissionsAndPerformAction(activity,
-            () -> FilePicker.openCustomSelector(activity, 0),
+            () -> FilePicker.openCustomSelector(activity, resultLauncher,0),
             R.string.storage_permission_title,
             R.string.write_storage_permission_rationale,
             PermissionUtils.PERMISSIONS_STORAGE);
@@ -225,12 +231,10 @@ public void initiateCustomGalleryPickWithPermission(final Activity activity) {
     /**
      * Open chooser for gallery uploads
      */
-    private void initiateGalleryUpload(final Activity activity,
+    private void initiateGalleryUpload(final Activity activity, ActivityResultLauncher<Intent> resultLauncher,
         final boolean allowMultipleUploads) {
         setPickerConfiguration(activity, allowMultipleUploads);
-        boolean openDocumentIntentPreferred = defaultKvStore.getBoolean(
-            "openDocumentPhotoPickerPref", true);
-        FilePicker.openGallery(activity, 0, openDocumentIntentPreferred);
+        FilePicker.openGallery(activity, resultLauncher,0, isDocumentPhotoPickerPreferred());
     }
 
     /**
@@ -247,42 +251,62 @@ private void setPickerConfiguration(Activity activity,
     /**
      * Initiate camera upload by opening camera
      */
-    private void initiateCameraUpload(Activity activity) {
+    private void initiateCameraUpload(Activity activity, ActivityResultLauncher<Intent> resultLauncher) {
         setPickerConfiguration(activity, false);
         if (defaultKvStore.getBoolean("inAppCameraLocationPref", false)) {
             locationBeforeImageCapture = locationManager.getLastLocation();
         }
         isInAppCameraUpload = true;
-        FilePicker.openCameraForImage(activity, 0);
+        FilePicker.openCameraForImage(activity, resultLauncher,0);
+    }
+
+    private boolean isDocumentPhotoPickerPreferred(){
+        return defaultKvStore.getBoolean(
+            "openDocumentPhotoPickerPref", true);
+    }
+
+    public void onPictureReturnedFromGallery(ActivityResult result, Activity activity, FilePicker.Callbacks callbacks){
+        if(isDocumentPhotoPickerPreferred()){
+            FilePicker.onPictureReturnedFromDocuments(result, activity, callbacks);
+        } else {
+            FilePicker.onPictureReturnedFromGallery(result,activity,callbacks);
+        }
+    }
+
+    public void onPictureReturnedFromCustomSelector(ActivityResult result, Activity activity, @NonNull FilePicker.Callbacks callbacks) {
+        FilePicker.onPictureReturnedFromCustomSelector(result,activity,callbacks);
+    }
+
+    public void onPictureReturnedFromCamera(ActivityResult result, Activity activity, @NonNull FilePicker.Callbacks callbacks) {
+        FilePicker.onPictureReturnedFromCamera(result,activity,callbacks);
     }
 
     /**
      * Attaches callback for file picker.
      */
-    public void handleActivityResult(Activity activity, int requestCode, int resultCode,
-        Intent data) {
-        FilePicker.handleActivityResult(requestCode, resultCode, data, activity,
-            new DefaultCallback() {
+    public void handleActivityResultWithCallback(Activity activity, FilePicker.HandleActivityResult handleActivityResult) {
 
-                @Override
-                public void onCanceled(final ImageSource source, final int type) {
-                    super.onCanceled(source, type);
-                    defaultKvStore.remove(PLACE_OBJECT);
-                }
+        handleActivityResult.onHandleActivityResult(new DefaultCallback() {
 
-                @Override
-                public void onImagePickerError(Exception e, FilePicker.ImageSource source,
-                    int type) {
-                    ViewUtil.showShortToast(activity, R.string.error_occurred_in_picking_images);
-                }
+            @Override
+            public void onCanceled(final ImageSource source, final int type) {
+                super.onCanceled(source, type);
+                defaultKvStore.remove(PLACE_OBJECT);
+            }
 
-                @Override
-                public void onImagesPicked(@NonNull List<UploadableFile> imagesFiles,
-                    FilePicker.ImageSource source, int type) {
-                    Intent intent = handleImagesPicked(activity, imagesFiles);
-                    activity.startActivity(intent);
-                }
-            });
+            @Override
+            public void onImagePickerError(Exception e, FilePicker.ImageSource source,
+                int type) {
+                ViewUtil.showShortToast(activity, R.string.error_occurred_in_picking_images);
+            }
+
+            @Override
+            public void onImagesPicked(@NonNull List<UploadableFile> imagesFiles,
+                FilePicker.ImageSource source, int type) {
+                Intent intent = handleImagesPicked(activity, imagesFiles);
+                activity.startActivity(intent);
+            }
+        });
     }
 
     public List<UploadableFile> handleExternalImagesPicked(Activity activity,