Fix iOS/macOS ignoring RequestType when filterOption is nil (#1354)

On iOS/macOS, using `RequestType.video` without an explicit
`filterOption` returns all media types instead of just videos.
Regression from #1313 which made `filterOptionGroup` nullable.

When `filterOption` is `nil`, `[nil getFetchOptions:type]` returns `nil`
in Objective-C, resulting in no predicate on `PHFetchOptions`.

### Changes

- **`PMManager.m: getAssetOptions:filterOption:`** — Create basic
`PHFetchOptions` with media type predicate when `filterOption` is nil
- **`PMManager.m: getAssetCountWithType:option:`** — Route through
`getAssetOptions:filterOption:` instead of calling `getFetchOptions:`
directly
- **`PMManager.m: getAssetsWithType:option:start:end:`** — Same fix,
plus nil-safe `needTitle` access

---------

Co-authored-by: copilot-swe-agent[bot] <[email protected]>
Co-authored-by: AlexV525 <[email protected]>
Co-authored-by: Alex Li <[email protected]>

Author: Copilot

CHANGELOG.md

@@ -8,7 +8,9 @@ To know more about breaking changes, see the [Migration Guide][].
 
 ## Unreleased
 
-*None.*
+**Fixes**
+
+- Fix iOS/macOS returning all media types when `filterOption` is not specified instead of respecting the requested type.
 
 ## 3.8.2
 

darwin/photo_manager/Sources/photo_manager/core/PMManager.m

@@ -11,6 +11,7 @@
 #import "PMManager.h"
 #import "PMMD5Utils.h"
 #import "PMPathFilterOption.h"
+#import "PMRequestTypeUtils.h"
 #import "PMResultHandler.h"
 
 @implementation PMManager {
@@ -130,13 +131,13 @@ - (void)logCollections:(PHFetchResult *)collections option:(PHFetchOptions *)opt
 }
 
 - (NSUInteger)getAssetCountWithType:(int)type option:(NSObject<PMBaseFilter> *)filter {
-    PHFetchOptions *options = [filter getFetchOptions:type];
+    PHFetchOptions *options = [self getAssetOptions:type filterOption:filter];
     PHFetchResult<PHAsset *> *result = [PHAsset fetchAssetsWithOptions:options];
     return result.count;
 }
 
 - (NSArray<PMAssetEntity *> *)getAssetsWithType:(int)type option:(NSObject<PMBaseFilter> *)option start:(int)start end:(int)end {
-    PHFetchOptions *options = [option getFetchOptions:type];
+    PHFetchOptions *options = [self getAssetOptions:type filterOption:option];
     PHFetchResult<PHAsset *> *result = [PHAsset fetchAssetsWithOptions:options];
 
     NSUInteger endOffset = end;
@@ -151,7 +152,8 @@ - (NSUInteger)getAssetCountWithType:(int)type option:(NSObject<PMBaseFilter> *)f
             break;
         }
         PHAsset *asset = result[i];
-        PMAssetEntity *pmAsset = [self convertPHAssetToAssetEntity:asset needTitle:[option needTitle]];
+        BOOL needTitle = option ? [option needTitle] : NO;
+        PMAssetEntity *pmAsset = [self convertPHAssetToAssetEntity:asset needTitle:needTitle];
         [array addObject: pmAsset];
     }
 
@@ -1212,7 +1214,11 @@ - (PMAssetPathEntity *)fetchPathProperties:(NSString *)id type:(int)type filterO
 }
 
 - (PHFetchOptions *)getAssetOptions:(int)type filterOption:(NSObject<PMBaseFilter> *)optionGroup {
-    return [optionGroup getFetchOptions:type];
+    if (optionGroup) {
+        return [optionGroup getFetchOptions:type];
+    }
+    
+    return [PMRequestTypeUtils getFetchOptionsByType:type];
 }
 
 #pragma clang diagnostic push

darwin/photo_manager/Sources/photo_manager/core/PMRequestTypeUtils.h

@@ -1,4 +1,5 @@
 #import <Foundation/Foundation.h>
+#import <Photos/Photos.h>
 
 @interface PMRequestTypeUtils : NSObject
 
@@ -8,4 +9,6 @@
 
 + (BOOL)containsAudio:(int)type;
 
++ (PHFetchOptions *)getFetchOptionsByType:(int)type;
+
 @end

darwin/photo_manager/Sources/photo_manager/core/PMRequestTypeUtils.m

@@ -1,5 +1,8 @@
+#import "NSString+PM_COMMON.h"
 #import "PMRequestTypeUtils.h"
 
+#import <Photos/Photos.h>
+
 #define PM_TYPE_IMAGE 1
 #define PM_TYPE_VIDEO 1<<1
 #define PM_TYPE_AUDIO 1<<2
@@ -24,4 +27,41 @@ + (BOOL)containsAudio:(int)type {
     return [self checkContainsType:type targetType:PM_TYPE_AUDIO];
 }
 
++ (PHFetchOptions *)getFetchOptionsByType:(int)type {
+    // When filterOption is nil, we still need to filter by media type
+    PHFetchOptions *options = [PHFetchOptions new];
+    
+    BOOL containsImage = [PMRequestTypeUtils containsImage:type];
+    BOOL containsVideo = [PMRequestTypeUtils containsVideo:type];
+    BOOL containsAudio = [PMRequestTypeUtils containsAudio:type];
+    
+    NSMutableString *typeWhere = [NSMutableString new];
+    NSMutableArray *args = [NSMutableArray new];
+    
+    if (containsImage) {
+        [typeWhere appendString:@"mediaType == %d"];
+        [args addObject:@(PHAssetMediaTypeImage)];
+    }
+    if (containsVideo) {
+        if (![typeWhere isEmpty]) {
+            [typeWhere appendString:@" OR "];
+        }
+        [typeWhere appendString:@"mediaType == %d"];
+        [args addObject:@(PHAssetMediaTypeVideo)];
+    }
+    if (containsAudio) {
+        if (![typeWhere isEmpty]) {
+            [typeWhere appendString:@" OR "];
+        }
+        [typeWhere appendString:@"mediaType == %d"];
+        [args addObject:@(PHAssetMediaTypeAudio)];
+    }
+    
+    if (![typeWhere isEmpty]) {
+        options.predicate = [NSPredicate predicateWithFormat:typeWhere argumentArray:args];
+    }
+    
+    return options;
+}
+
 @end