Remove bespoke code that handled blocking callbacks (#1450)

dart-lang · Jan 21, 2025 · 27184eb · 27184eb
1 parent 7271367
commit 27184eb
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 5,184 deletions.
diff --git a/pkgs/cupertino_http/CHANGELOG.md b/pkgs/cupertino_http/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.0.3-wip
+
+* Remove some unnecessary native code.
+
 ## 2.0.2
 
 * Upgrade to `package:objective_c` 4.1.

diff --git a/pkgs/cupertino_http/darwin/cupertino_http/Sources/cupertino_http/native_cupertino_bindings.m b/pkgs/cupertino_http/darwin/cupertino_http/Sources/cupertino_http/native_cupertino_bindings.m
diff --git a/pkgs/cupertino_http/darwin/cupertino_http/Sources/cupertino_http/utils.h b/pkgs/cupertino_http/darwin/cupertino_http/Sources/cupertino_http/utils.h
diff --git a/pkgs/cupertino_http/darwin/cupertino_http/Sources/cupertino_http/utils.m b/pkgs/cupertino_http/darwin/cupertino_http/Sources/cupertino_http/utils.m
diff --git a/pkgs/cupertino_http/ffigen.yaml b/pkgs/cupertino_http/ffigen.yaml
@@ -21,7 +21,6 @@ headers:
     - '/System/Volumes/Data/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/Foundation.framework/Versions/C/Headers/NSOperation.h'
     - '/System/Volumes/Data/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/Foundation.framework/Versions/C/Headers/NSError.h'
     - '/System/Volumes/Data/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/Foundation.framework/Versions/C/Headers/NSDictionary.h'
-    - 'darwin/cupertino_http/Sources/cupertino_http/utils.h'
 preamble: |
   // ignore_for_file: always_specify_types
   // ignore_for_file: camel_case_types

diff --git a/pkgs/cupertino_http/lib/src/cupertino_api.dart b/pkgs/cupertino_http/lib/src/cupertino_api.dart
@@ -919,29 +919,15 @@ class URLSession extends _ObjectHolder<ncb.NSURLSession> {
     }
 
     if (onFinishedDownloading != null) {
-      final asyncFinishDownloading =
-          // ignore: lines_longer_than_80_chars
-          ncb.ObjCBlock_ffiVoid_NSCondition_NSURLSession_NSURLSessionDownloadTask_NSURL
-              .listener((nsCondition, nsSession, nsTask, nsUrl) {
-        try {
-          onFinishedDownloading(
-              URLSession._(nsSession,
-                  isBackground: isBackground, hasDelegate: true),
-              URLSessionDownloadTask._(nsTask),
-              nsurlToUri(nsUrl));
-        } finally {
-          nsCondition.unlock();
-        }
+      ncb.NSURLSessionDownloadDelegate
+          .URLSession_downloadTask_didFinishDownloadingToURL_
+          .implementAsBlocking(protoBuilder, (nsSession, nsTask, nsUrl) {
+        onFinishedDownloading(
+            URLSession._(nsSession,
+                isBackground: isBackground, hasDelegate: true),
+            URLSessionDownloadTask._(nsTask),
+            nsurlToUri(nsUrl));
       });
-
-      final downloadDelegate = objc.getProtocol('NSURLSessionDownloadDelegate');
-      final didFinishDownloadingToURL = objc
-          .registerName('URLSession:downloadTask:didFinishDownloadingToURL:');
-      final signature = objc.getProtocolMethodSignature(
-          downloadDelegate, didFinishDownloadingToURL,
-          isRequired: true, isInstanceMethod: true)!;
-      protoBuilder.implementMethod(didFinishDownloadingToURL, signature,
-          linkedLibs.adaptFinishWithLock(asyncFinishDownloading));
     }
 
     if (onWebSocketTaskOpened != null) {