From d11f2dd06b3794caca6a4e1ad4b94f9d93ab6e18 Mon Sep 17 00:00:00 2001 From: parneet-guraya Date: Thu, 17 Oct 2024 21:47:53 +0530 Subject: [PATCH] remove old method of refactoring for file picker Signed-off-by: parneet-guraya --- .../contributions/ContributionController.java | 23 ------- .../nrw/commons/filepicker/Constants.java | 7 -- .../nrw/commons/filepicker/FilePicker.java | 50 +------------- .../nrw/commons/filepicker/FilePickerTest.kt | 65 ++++++++++--------- 4 files changed, 35 insertions(+), 110 deletions(-) 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 index 85f09bbd5..82503b9cb 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java +++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java @@ -307,29 +307,6 @@ public class ContributionController { activity.startActivity(intent); } }); - -// FilePicker.handleActivityResult(requestCode, resultCode, data, activity, -// new DefaultCallback() { -// -// @Override -// public void onCanceled(final ImageSource source, final int type) { -// super.onCanceled(source, type); -// defaultKvStore.remove(PLACE_OBJECT); -// } -// -// @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 imagesFiles, -// FilePicker.ImageSource source, int type) { -// Intent intent = handleImagesPicked(activity, imagesFiles); -// activity.startActivity(intent); -// } -// }); } public List handleExternalImagesPicked(Activity activity, diff --git a/app/src/main/java/fr/free/nrw/commons/filepicker/Constants.java b/app/src/main/java/fr/free/nrw/commons/filepicker/Constants.java index f907f0a01..cb750d0fc 100644 --- a/app/src/main/java/fr/free/nrw/commons/filepicker/Constants.java +++ b/app/src/main/java/fr/free/nrw/commons/filepicker/Constants.java @@ -9,13 +9,6 @@ public interface Constants { interface RequestCodes { int LOCATION = 1; int STORAGE = 2; - int FILE_PICKER_IMAGE_IDENTIFICATOR = 0b1101101100; //876 - int SOURCE_CHOOSER = 1 << 15; - - int PICK_PICTURE_FROM_CUSTOM_SELECTOR = FILE_PICKER_IMAGE_IDENTIFICATOR + (1 << 10); - int PICK_PICTURE_FROM_DOCUMENTS = FILE_PICKER_IMAGE_IDENTIFICATOR + (1 << 11); - int PICK_PICTURE_FROM_GALLERY = FILE_PICKER_IMAGE_IDENTIFICATOR + (1 << 12); - int TAKE_PICTURE = FILE_PICKER_IMAGE_IDENTIFICATOR + (1 << 13); int RECEIVE_DATA_FROM_FULL_SCREEN_MODE = 1 << 9; } diff --git a/app/src/main/java/fr/free/nrw/commons/filepicker/FilePicker.java b/app/src/main/java/fr/free/nrw/commons/filepicker/FilePicker.java index cc709db61..96d70606b 100644 --- a/app/src/main/java/fr/free/nrw/commons/filepicker/FilePicker.java +++ b/app/src/main/java/fr/free/nrw/commons/filepicker/FilePicker.java @@ -111,13 +111,6 @@ public class FilePicker implements Constants { */ public static void openGallery(Activity activity,ActivityResultLauncher resultLauncher,int type, boolean openDocumentIntentPreferred) { Intent intent = createGalleryIntent(activity, type, openDocumentIntentPreferred); -// int requestCode = RequestCodes.PICK_PICTURE_FROM_GALLERY; -// -// if(openDocumentIntentPreferred){ -// requestCode = RequestCodes.PICK_PICTURE_FROM_DOCUMENTS; -// } -// -// activity.startActivityForResult(intent, requestCode); resultLauncher.launch(intent); } @@ -126,7 +119,6 @@ public class FilePicker implements Constants { */ public static void openCustomSelector(Activity activity,ActivityResultLauncher resultLauncher,int type) { Intent intent = createCustomSelectorIntent(activity, type); -// activity.startActivityForResult(intent, RequestCodes.PICK_PICTURE_FROM_CUSTOM_SELECTOR); resultLauncher.launch(intent); } @@ -135,7 +127,6 @@ public class FilePicker implements Constants { */ public static void openCameraForImage(Activity activity, ActivityResultLauncher resultLauncher, int type) { Intent intent = createCameraForImageIntent(activity, type); -// activity.startActivityForResult(intent, RequestCodes.TAKE_PICTURE); resultLauncher.launch(intent); } @@ -159,43 +150,6 @@ public class FilePicker implements Constants { } } - /** - * Any activity can use this method to attach their callback to the file picker - */ - public static void handleActivityResult(int requestCode, int resultCode, Intent data, Activity activity, @NonNull FilePicker.Callbacks callbacks) { - boolean isHandledPickedFile = (requestCode & RequestCodes.FILE_PICKER_IMAGE_IDENTIFICATOR) > 0; - if (isHandledPickedFile) { - requestCode &= ~RequestCodes.SOURCE_CHOOSER; - if (requestCode == RequestCodes.PICK_PICTURE_FROM_GALLERY || - requestCode == RequestCodes.TAKE_PICTURE || - requestCode == RequestCodes.PICK_PICTURE_FROM_DOCUMENTS || - requestCode == RequestCodes.PICK_PICTURE_FROM_CUSTOM_SELECTOR) { - if (resultCode == Activity.RESULT_OK) { - if (requestCode == RequestCodes.PICK_PICTURE_FROM_DOCUMENTS && !isPhoto(data)) { -// onPictureReturnedFromDocuments(data, activity, callbacks); - } else if (requestCode == RequestCodes.PICK_PICTURE_FROM_GALLERY && !isPhoto(data)) { -// onPictureReturnedFromGallery(data, activity, callbacks); - } else if (requestCode == RequestCodes.PICK_PICTURE_FROM_CUSTOM_SELECTOR) { -// onPictureReturnedFromCustomSelector(data, activity, callbacks); - } else if (requestCode == RequestCodes.TAKE_PICTURE) { -// onPictureReturnedFromCamera(activity, callbacks); - } - } else { - if (requestCode == RequestCodes.PICK_PICTURE_FROM_DOCUMENTS) { - callbacks.onCanceled(FilePicker.ImageSource.DOCUMENTS, restoreType(activity)); - } else if (requestCode == RequestCodes.PICK_PICTURE_FROM_GALLERY) { - callbacks.onCanceled(FilePicker.ImageSource.GALLERY, restoreType(activity)); - } else if (requestCode == RequestCodes.PICK_PICTURE_FROM_CUSTOM_SELECTOR){ - callbacks.onCanceled(ImageSource.CUSTOM_SELECTOR, restoreType(activity)); - } - else { - callbacks.onCanceled(FilePicker.ImageSource.CAMERA_IMAGE, restoreType(activity)); - } - } - } - } - } - public static List handleExternalImagesPicked(Intent data, Activity activity) { try { return getFilesFromGalleryPictures(data, activity); @@ -249,7 +203,7 @@ public class FilePicker implements Constants { } public static void onPictureReturnedFromDocuments(ActivityResult result, Activity activity, @NonNull FilePicker.Callbacks callbacks) { - if(result.getResultCode() == Activity.RESULT_OK){ + if(result.getResultCode() == Activity.RESULT_OK && !isPhoto(result.getData())){ try { Uri photoPath = result.getData().getData(); UploadableFile photoFile = PickedFiles.pickedExistingPicture(activity, photoPath); @@ -306,7 +260,7 @@ public class FilePicker implements Constants { } public static void onPictureReturnedFromGallery(ActivityResult result, Activity activity, @NonNull FilePicker.Callbacks callbacks) { - if(result.getResultCode() == Activity.RESULT_OK){ + if(result.getResultCode() == Activity.RESULT_OK && !isPhoto(result.getData())){ try { List files = getFilesFromGalleryPictures(result.getData(), activity); callbacks.onImagesPicked(files, FilePicker.ImageSource.GALLERY, restoreType(activity)); diff --git a/app/src/test/kotlin/fr/free/nrw/commons/filepicker/FilePickerTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/filepicker/FilePickerTest.kt index 365af27f0..b10accd31 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/filepicker/FilePickerTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/filepicker/FilePickerTest.kt @@ -183,38 +183,39 @@ class FilePickerTest { method.invoke(mockFilePicker, mockIntent) } - @Test - fun testHandleActivityResultCaseOne() { - val mockIntent = mock(Intent::class.java) - FilePicker.handleActivityResult( - RequestCodes.FILE_PICKER_IMAGE_IDENTIFICATOR, - Activity.RESULT_OK, - mockIntent, - activity, - object : DefaultCallback() { - override fun onCanceled( - source: FilePicker.ImageSource, - type: Int, - ) { - super.onCanceled(source, type) - } - - override fun onImagePickerError( - e: Exception, - source: FilePicker.ImageSource, - type: Int, - ) { - } - - override fun onImagesPicked( - imagesFiles: List, - source: FilePicker.ImageSource, - type: Int, - ) { - } - }, - ) - } + //TODO [Parry] adapt tests +// @Test +// fun testHandleActivityResultCaseOne() { +// val mockIntent = mock(Intent::class.java) +// FilePicker.handleActivityResult( +// RequestCodes.FILE_PICKER_IMAGE_IDENTIFICATOR, +// Activity.RESULT_OK, +// mockIntent, +// activity, +// object : DefaultCallback() { +// override fun onCanceled( +// source: FilePicker.ImageSource, +// type: Int, +// ) { +// super.onCanceled(source, type) +// } +// +// override fun onImagePickerError( +// e: Exception, +// source: FilePicker.ImageSource, +// type: Int, +// ) { +// } +// +// override fun onImagesPicked( +// imagesFiles: List, +// source: FilePicker.ImageSource, +// type: Int, +// ) { +// } +// }, +// ) +// } @Test fun testOpenCustomSelectorRequestCode() {