motorinc-gallery-picker-pro 1.0.7 → 1.0.9

package/android/src/main/java/com/gallerypicker/imagepicker/ImagePickerModule.java

@@ -58,6 +58,7 @@ public class ImagePickerModule extends ReactContextBaseJavaModule {
     private static final String TAG = "ImagePickerModule";
     private static final int CAMERA_REQUEST_CODE = 1001;
     private static final int GALLERY_REQUEST_CODE = 1002;
+    private static final int PHOTO_PICKER_REQUEST_CODE = 1003;
     private static final int CAMERA_PERMISSION_REQUEST_CODE = 2001;
     private static final int STORAGE_PERMISSION_REQUEST_CODE = 2002;
     
@@ -163,15 +164,36 @@ public class ImagePickerModule extends ReactContextBaseJavaModule {
 
     @ReactMethod
     public void managePhotoSelection(Promise promise) {
-        // This method allows users to update their selected photos in limited access mode
-        if (Build.VERSION.SDK_INT >= 34 && isLimitedAccessMode()) {
-            Log.d(TAG, "Opening photo selection management for limited access mode");
-            // Re-request permissions to trigger the photo selection picker
-            requestStoragePermissionInternal();
-            promise.resolve(true);
+        Activity activity = getCurrentActivity();
+        if (activity == null) {
+            promise.reject("ACTIVITY_ERROR", "Activity is null");
+            return;
+        }
+
+        // Android 13+ (API 33+) supports the Photo Picker
+        if (Build.VERSION.SDK_INT >= 33) {
+            try {
+                Log.d(TAG, "Launching Android Photo Picker for photo selection management");
+                
+                // Create intent to launch the system Photo Picker
+                Intent intent = new Intent(MediaStore.ACTION_PICK_IMAGES);
+                
+                // Set multi-select mode with maximum limit
+                intent.putExtra(MediaStore.EXTRA_PICK_IMAGES_MAX, MediaStore.getPickImagesMaxLimit());
+                
+                // Store the promise to resolve after selection
+                currentPromise = promise;
+                
+                // Launch the photo picker
+                activity.startActivityForResult(intent, PHOTO_PICKER_REQUEST_CODE);
+                
+            } catch (Exception e) {
+                Log.e(TAG, "Error launching Photo Picker: " + e.getMessage());
+                promise.reject("PHOTO_PICKER_ERROR", "Failed to launch photo picker: " + e.getMessage());
+            }
         } else {
-            Log.d(TAG, "Not in limited access mode or not Android 14+, opening app settings");
-            // For non-limited mode or older Android, open app permission settings
+            // Android 12 and below - open app settings for permission management
+            Log.d(TAG, "Not Android 13+, opening app settings");
             try {
                 Intent intent = new Intent(android.provider.Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
                 intent.setData(android.net.Uri.parse("package:" + getReactApplicationContext().getPackageName()));
@@ -1098,6 +1120,9 @@ public class ImagePickerModule extends ReactContextBaseJavaModule {
                 case GALLERY_REQUEST_CODE:
                     handleGalleryResult(data);
                     break;
+                case PHOTO_PICKER_REQUEST_CODE:
+                    handlePhotoPickerResult(data);
+                    break;
             }
         } catch (Exception e) {
             rejectPromise("PROCESSING_ERROR", e.getMessage());
@@ -1139,6 +1164,34 @@ public class ImagePickerModule extends ReactContextBaseJavaModule {
         sendEvent("PhotoLibraryChanged");
     }
 
+    private void handlePhotoPickerResult(Intent data) {
+        try {
+            Log.d(TAG, "Processing Photo Picker result");
+            
+            // The Photo Picker was used to allow users to select additional photos
+            // We don't need to return the selected URIs, just notify that the selection changed
+            // and resolve the promise successfully
+            
+            // Send event to notify React Native that photo library changed
+            sendEvent("PhotoLibraryChanged");
+            
+            // Resolve the promise
+            if (currentPromise != null) {
+                currentPromise.resolve(true);
+                currentPromise = null;
+            }
+            
+            Log.d(TAG, "Photo Picker result processed successfully");
+            
+        } catch (Exception e) {
+            Log.e(TAG, "Error processing Photo Picker result: " + e.getMessage());
+            if (currentPromise != null) {
+                currentPromise.reject("PROCESSING_ERROR", "Error processing photo picker result: " + e.getMessage());
+                currentPromise = null;
+            }
+        }
+    }
+
     private void copyUriToFile(Uri uri, File file) throws IOException {
         try (InputStream inputStream = getReactApplicationContext().getContentResolver().openInputStream(uri);
              FileOutputStream outputStream = new FileOutputStream(file)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "motorinc-gallery-picker-pro",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "description": "A comprehensive React Native media gallery picker with smooth animations, multi-select, single-select, crop functionality, and native iOS/Android support",
   "main": "index.js",
   "types": "index.d.ts",
@@ -35,6 +35,7 @@
     "react-native-view-shot": ">=4.0.0"
   },
   "dependencies": {
+    "motorinc-gallery-picker-pro": "^1.0.8",
     "motorinc-global-components": "^3.9.5",
     "react-native-worklets": "^0.4.1"
   },

package/src/components/MainPhotoGallery.tsx

@@ -651,7 +651,11 @@ const MainPhotoGallery = React.forwardRef<MainPhotoGalleryRef, props>(
           });
 
           if (reset) {
-            setAssets(result.assets || []);
+            // When resetting, preserve picker assets by prepending them
+            const currentPickerAssets = assets.filter(asset => 
+              pickerAssetIds.has(asset.id)
+            );
+            setAssets([...currentPickerAssets, ...(result.assets || [])]);
           } else {
             setAssets(prev => [...prev, ...(result.assets || [])]);
           }
@@ -840,8 +844,7 @@ const MainPhotoGallery = React.forwardRef<MainPhotoGalleryRef, props>(
         console.log('📊 Total count:', totalCount);
 
         if (Platform.OS === 'ios') {
-          // Check current permission status first
-
+          // iOS: Use the limited photo library picker
           const currentStatus =
             await ImagePickerModule.getPhotoLibraryPermissionStatus();
 
@@ -861,21 +864,21 @@ const MainPhotoGallery = React.forwardRef<MainPhotoGalleryRef, props>(
           const res = await ImagePickerModule.openPhotoLibraryLimitedPicker();
 
           console.log('✅ Limited photo picker opened successfully:', res);
+          
+          // Refresh gallery after potential selection changes
+          setTimeout(() => {
+            console.log('� Refreshing gallery after photo selection changes');
+            handleRefresh();
+          }, 2000);
         } else {
-          // Use the universal managePhotoSelection method available on both platforms
-          console.log('🚀 Attempting to call managePhotoSelection...');
-          const res = await ImagePickerModule.managePhotoSelection();
-          console.log(
-            '✅ Photo selection management opened successfully:',
-            res,
-          );
+          // Android: Use the multi-select image picker instead
+          console.log('🚀 Opening Android photo picker...');
+          await handleOpenImagePicker();
+          console.log('✅ Android photo picker flow completed');
+          // Note: handleOpenImagePicker already handles the selection and callback
+          // No need to refresh gallery as selected images are passed to onSelectedAssetsChange
+          return;
         }
-
-        // Refresh gallery after potential selection changes
-        setTimeout(() => {
-          console.log('🔄 Refreshing gallery after photo selection changes');
-          handleRefresh();
-        }, 2000);
       } catch (error) {
         console.error('❌ Error managing photo selection:', error);