Modify the titleAsync implementation on iOS. (#740)

On iOS, titleAsync is modified to PHAssetResource.originalFileName.
fluttercandies · Mar 25, 2022 · 98e8f68 · 98e8f68
1 parent a8c193e
commit 98e8f68
Show file tree

Hide file tree

Showing 9 changed files with 48 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 2.0.5
+
+Improvements:
+- Improve `AssetEntity.titleAsync`'s implementation on iOS. (#740)
+
 ## 2.0.4
 
 Fixes:

diff --git a/ios/Classes/PMPlugin.m b/ios/Classes/PMPlugin.m
@@ -386,7 +386,8 @@ - (void)onAuth:(FlutterMethodCall *)call result:(FlutterResult)result {
             [handler reply:@(exists)];
         } else if ([call.method isEqualToString:@"getTitleAsync"]) {
             NSString *assetId = call.arguments[@"id"];
-            NSString *title = [manager getTitleAsyncWithAssetId:assetId];
+            int subtype = [call.arguments[@"subtype"] intValue];
+            NSString *title = [manager getTitleAsyncWithAssetId:assetId subtype:subtype];
             [handler reply:title];
         } else if ([call.method isEqualToString:@"getMimeTypeAsync"]) {
             NSString *assetId = call.arguments[@"id"];

diff --git a/ios/Classes/core/PHAsset+PM_COMMON.h b/ios/Classes/core/PHAsset+PM_COMMON.h
@@ -18,6 +18,9 @@ NS_ASSUME_NONNULL_BEGIN
 - (int)unwrappedSubtype;
 
 - (NSString*)title;
+
+- (NSString *)originalFilenameWithSubtype:(int) subtype;
+
 /**
  Get the MIME type for this asset from UTI (`PHAssetResource.uniformTypeIdentifier`), such as `image/jpeg`, `image/heic`, `video/quicktime`, etc.
  

diff --git a/ios/Classes/core/PHAsset+PM_COMMON.m b/ios/Classes/core/PHAsset+PM_COMMON.m
@@ -94,6 +94,25 @@ - (NSString *)title {
         return @"";
     }
 }
+
+- (NSString *)originalFilenameWithSubtype:(int)subtype {
+    if (@available(iOS 9.1, *)) {
+        if ([self isLivePhoto] && subtype == PHAssetMediaSubtypePhotoLive) {
+            return [self getLivePhotosResource].originalFilename;
+        }
+    }
+    if (@available(macOS 10.11, *)) {
+        if ([self isLivePhoto] && subtype == PHAssetMediaSubtypePhotoLive) {
+            return [self getLivePhotosResource].originalFilename;
+        }
+    }
+    PHAssetResource *resource = [self getAdjustResource];
+    if (resource) {
+        return resource.originalFilename;
+    }
+    return @"";
+}
+
 // UTI: https://developer.apple.com/library/archive/documentation/FileManagement/Conceptual/understanding_utis/understand_utis_intro/understand_utis_intro.html#//apple_ref/doc/uid/TP40001319
 - (NSString *)mimeType {
     PHAssetResource *resource = [[PHAssetResource assetResourcesForAsset:self] firstObject];

diff --git a/ios/Classes/core/PMManager.h b/ios/Classes/core/PMManager.h
@@ -60,7 +60,7 @@ typedef void (^AssetResult)(PMAssetEntity *);
 
 - (BOOL)entityIsLocallyAvailable:(NSString *)assetId resource:(PHAssetResource *)resource isOrigin:(BOOL)isOrigin;
 
-- (NSString*)getTitleAsyncWithAssetId: (NSString *) assetId;
+- (NSString*)getTitleAsyncWithAssetId:(NSString *)assetId subtype:(int)subtype;
 
 - (NSString*)getMimeTypeAsyncWithAssetId: (NSString *) assetId;
 

diff --git a/ios/Classes/core/PMManager.m b/ios/Classes/core/PMManager.m
@@ -1079,10 +1079,10 @@ - (void)saveVideo:(NSString *)path
     }];
 }
 
-- (NSString *)getTitleAsyncWithAssetId:(NSString *)assetId {
+- (NSString *)getTitleAsyncWithAssetId:(NSString *)assetId subtype:(int)subtype {
     PHAsset *asset = [PHAsset fetchAssetsWithLocalIdentifiers:@[assetId] options:nil].firstObject;
     if (asset) {
-        return [asset title];
+        return [asset originalFilenameWithSubtype:subtype];
     }
     return @"";
 }

diff --git a/lib/src/internal/plugin.dart b/lib/src/internal/plugin.dart
@@ -332,15 +332,21 @@ class PhotoManagerPlugin with BasePlugin, IosPlugin, AndroidPlugin {
     return LatLng(latitude: entity.latitude, longitude: entity.longitude);
   }
 
-  Future<String> getTitleAsync(AssetEntity entity) async {
+  Future<String> getTitleAsync(
+    AssetEntity entity, {
+    int subtype = 0,
+  }) async {
     assert(Platform.isAndroid || Platform.isIOS || Platform.isMacOS);
     if (Platform.isAndroid) {
       return entity.title!;
     }
     if (Platform.isIOS || Platform.isMacOS) {
       return await _channel.invokeMethod<String>(
         PMConstants.mGetTitleAsync,
-        <String, dynamic>{'id': entity.id},
+        <String, dynamic>{
+          'id': entity.id,
+          'subtype': subtype,
+        },
       ) as String;
     }
     return '';

diff --git a/lib/src/types/entity.dart b/lib/src/types/entity.dart
@@ -342,10 +342,16 @@ class AssetEntity {
   /// or use the async getter [titleAsync].
   final String? title;
 
+  ///  {@template photo_manager.AssetEntity.titleAsync}
   ///  * Android: `MediaStore.MediaColumns.DISPLAY_NAME`.
-  ///  * iOS/macOS: `PHAssetResource.filename`.
+  ///  * iOS/macOS: `PHAssetResource.originalFilename`.
+  ///  {@endtemplate}
   Future<String> get titleAsync => plugin.getTitleAsync(this);
 
+  /// {@macro photo_manager.AssetEntity.titleAsync}
+  Future<String> get titleAsyncWithSubtype =>
+      plugin.getTitleAsync(this, subtype: subtype);
+
   /// {@macro photo_manager.AssetType}
   AssetType get type => AssetType.values[typeInt];
 

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: photo_manager
 description: A Flutter plugin that provides assets abstraction management APIs on Android, iOS, and macOS.
-version: 2.0.4
+version: 2.0.5
 homepage: https://github.com/fluttercandies/flutter_photo_manager
 
 environment: