🔥 Get rid of try catch when toggling favorite on Darwin (#1209)

To avoid crashes on specific Xcode versions, typically Xcode 15.0.x. Fixes #1208
fluttercandies · Oct 22, 2024 · a8d92ad · a8d92ad
1 parent bd48e50
commit a8d92ad
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,12 @@ To know more about breaking changes, see the [Migration Guide][].
 
 *None.*
 
+## 3.5.2
+
+### Improvements
+
+- Get rid of `@try` `@catch` when toggling favorite on Darwin.
+
 ## 3.5.1
 
 ### Improvements

diff --git a/example/pubspec.yaml b/example/pubspec.yaml
@@ -1,6 +1,6 @@
 name: photo_manager_example
 description: Demonstrates how to use the photo_manager plugin.
-version: 3.5.1+34
+version: 3.5.2+35
 publish_to: none
 
 environment:

diff --git a/example_ohos/pubspec.yaml b/example_ohos/pubspec.yaml
@@ -1,6 +1,6 @@
 name: photo_manager_example_ohos
 description: Demonstrates how to use the photo_manager plugin.
-version: 3.5.1+34
+version: 3.5.2+35
 publish_to: none
 
 environment:

diff --git a/ios/Classes/PMPlugin.m b/ios/Classes/PMPlugin.m
@@ -613,12 +613,13 @@ - (void)handleMethodResultHandler:(ResultHandler *)handler manager:(PMManager *)
     } else if ([@"favoriteAsset" isEqualToString:call.method]) {
         NSString *id = call.arguments[@"id"];
         BOOL favorite = [call.arguments[@"favorite"] boolValue];
-        @try {
-            BOOL favoriteResult = [manager favoriteWithId:id favorite:favorite];
-            [handler reply:@(favoriteResult)];
-        } @catch (NSObject *error) {
-            [handler replyError:error];
-        }
+        [manager favoriteWithId:id favorite:favorite block:^(BOOL result, NSObject *error) {
+            if (error) {
+                [handler replyError:error];
+            } else {
+                [handler reply:@(result)];
+            }
+        }];
     } else if ([@"requestCacheAssetsThumb" isEqualToString:call.method]) {
         NSArray *ids = call.arguments[@"ids"];
         PMThumbLoadOption *option = [PMThumbLoadOption optionDict:call.arguments[@"option"]];

diff --git a/ios/Classes/core/PMManager.h b/ios/Classes/core/PMManager.h
@@ -111,7 +111,7 @@ typedef void (^AssetBlockResult)(PMAssetEntity *, NSObject *);
 
 - (void)removeCollectionWithId:(NSString *)id type:(int)type block:(void (^)(NSObject *))block;
 
-- (BOOL)favoriteWithId:(NSString *)id favorite:(BOOL)favorite;
+- (void)favoriteWithId:(NSString *)id favorite:(BOOL)favorite block:(void (^)(BOOL result, NSObject *))block;
 
 - (void)clearFileCache;
 

diff --git a/ios/Classes/core/PMManager.m b/ios/Classes/core/PMManager.m
@@ -1625,30 +1625,33 @@ - (void)removeCollectionWithId:(NSString *)id type:(int)type block:(void (^)(NSO
     }
 }
 
-- (BOOL)favoriteWithId:(NSString *)id favorite:(BOOL)favorite {
+- (void)favoriteWithId:(NSString *)id favorite:(BOOL)favorite block:(void (^)(BOOL result, NSObject *error))block {
     PHFetchResult *fetchResult = [PHAsset fetchAssetsWithLocalIdentifiers:@[id] options:nil];
     PHAsset *asset = [self getFirstObjFromFetchResult:fetchResult];
     if (!asset) {
-        @throw [NSString stringWithFormat:@"Asset %@ not found.", id];
+        block(NO, [NSString stringWithFormat:@"Asset %@ not found.", id]);
+        return;
     }
 
     if (![asset canPerformEditOperation:PHAssetEditOperationProperties]) {
-        @throw [NSString stringWithFormat:@"The asset %@ cannot perform edit operation.", id];
+        block(NO, [NSString stringWithFormat:@"The asset %@ cannot perform edit operation.", id]);
+        return;
     }
 
     NSError *error;
-    BOOL succeed = [PHPhotoLibrary.sharedPhotoLibrary
-                    performChangesAndWait:^{
+    BOOL succeed = [PHPhotoLibrary.sharedPhotoLibrary performChangesAndWait:^{
         PHAssetChangeRequest *request = [PHAssetChangeRequest changeRequestForAsset:asset];
         request.favorite = favorite;
     } error:&error];
     if (!succeed) {
-        @throw [NSString stringWithFormat:@"Favouring asset %@ failed: Request not succeed.", id];
+        block(NO, [NSString stringWithFormat:@"Favouring asset %@ failed: Request not succeed.", id]);
+        return;
     }
     if (error) {
-        @throw error;
+        block(NO, error);
+        return;
     }
-    return YES;
+    block(YES, nil);
 }
 
 - (NSString *)getCachePath:(NSString *)type {

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: photo_manager
 description: A Flutter plugin that provides album assets abstraction management APIs on Android, iOS, macOS, and OpenHarmony.
 repository: https://github.com/fluttercandies/flutter_photo_manager
-version: 3.5.1
+version: 3.5.2
 
 environment:
   sdk: ">=2.13.0 <4.0.0"