@livx.cc/appwrap 0.39.4 → 0.39.8

package/runtime/app/shell/handlers-extended.ts

@@ -7,116 +7,128 @@ import { maskForLock, setIosOrientationMask } from './orientation';
 
 interface GeoResult { lat: number; lng: number; accuracy: number; }
 
-// CLLocationManager delegate. Closure-captured callbacks (resolve/reject/cleanup) are assigned as
-// instance fields after new() — same pattern as handlers-speech/oauth.
-@NativeClass()
-class GeoDelegate extends NSObject implements CLLocationManagerDelegate {
-  static ObjCProtocols = [CLLocationManagerDelegate];
-  onResult?: (r: GeoResult) => void;
-  onError?: (e: Error) => void;
-  onCleanup?: () => void;
-  static new(): GeoDelegate {
-    return <GeoDelegate>super.new();
-  }
-  locationManagerDidUpdateLocations(_m: CLLocationManager, locations: NSArray<CLLocation>): void {
-    const loc = locations.lastObject;
-    if (!loc) return;
-    const result = {
-      lat: loc.coordinate.latitude,
-      lng: loc.coordinate.longitude,
-      accuracy: loc.horizontalAccuracy,
-    };
-    this.onCleanup?.();
-    this.onResult?.(result);
-  }
-  locationManagerDidFailWithError(_m: CLLocationManager, error: NSError): void {
-    this.onCleanup?.();
-    this.onError?.(Object.assign(new Error(error.localizedDescription), { code: 'DENIED' }));
-  }
-  locationManagerDidChangeAuthorization(m: CLLocationManager): void {
-    const st = m.authorizationStatus;
-    if (st === CLAuthorizationStatus.kCLAuthorizationStatusAuthorizedWhenInUse ||
-        st === CLAuthorizationStatus.kCLAuthorizationStatusAuthorizedAlways) {
-      m.startUpdatingLocation();
-    } else if (st === CLAuthorizationStatus.kCLAuthorizationStatusDenied) {
+// iOS-only native delegates. Defined lazily inside an isIOS-gated factory (mirrors banner.ts) so the
+// shared module can instantiate on Android — NSObject/CL*/PH*/UN* are iOS globals, and a top-level
+// `extends NSObject` would evaluate at ES-module load and crash the Android shell (ReferenceError).
+// any: module-level holders for runtime-built ObjC subclasses; each class BODY stays fully typed.
+let GeoDelegate: any, PhotoPickerDelegate: any, ForegroundNotificationDelegate: any;
+function ensureIosDelegates(): void {
+  if (!isIOS || GeoDelegate) return;
+
+  // CLLocationManager delegate. Closure-captured callbacks (resolve/reject/cleanup) are assigned as
+  // instance fields after new() — same pattern as handlers-speech/oauth.
+  @NativeClass()
+  class GeoDelegateImpl extends NSObject implements CLLocationManagerDelegate {
+    static ObjCProtocols = [CLLocationManagerDelegate];
+    onResult?: (r: GeoResult) => void;
+    onError?: (e: Error) => void;
+    onCleanup?: () => void;
+    static new(): GeoDelegateImpl {
+      return <GeoDelegateImpl>super.new();
+    }
+    locationManagerDidUpdateLocations(_m: CLLocationManager, locations: NSArray<CLLocation>): void {
+      const loc = locations.lastObject;
+      if (!loc) return;
+      const result = {
+        lat: loc.coordinate.latitude,
+        lng: loc.coordinate.longitude,
+        accuracy: loc.horizontalAccuracy,
+      };
       this.onCleanup?.();
-      this.onError?.(Object.assign(new Error('location permission denied'), { code: 'DENIED' }));
+      this.onResult?.(result);
+    }
+    locationManagerDidFailWithError(_m: CLLocationManager, error: NSError): void {
+      this.onCleanup?.();
+      this.onError?.(Object.assign(new Error(error.localizedDescription), { code: 'DENIED' }));
+    }
+    locationManagerDidChangeAuthorization(m: CLLocationManager): void {
+      const st = m.authorizationStatus;
+      if (st === CLAuthorizationStatus.kCLAuthorizationStatusAuthorizedWhenInUse ||
+          st === CLAuthorizationStatus.kCLAuthorizationStatusAuthorizedAlways) {
+        m.startUpdatingLocation();
+      } else if (st === CLAuthorizationStatus.kCLAuthorizationStatusDenied) {
+        this.onCleanup?.();
+        this.onError?.(Object.assign(new Error('location permission denied'), { code: 'DENIED' }));
+      }
     }
   }
-}
+  GeoDelegate = GeoDelegateImpl;
 
-// PHPickerViewController delegate. Closure-captured opts (dataUrl/maxSize) + resolve assigned post-new().
-@NativeClass()
-class PhotoPickerDelegate extends NSObject implements PHPickerViewControllerDelegate {
-  static ObjCProtocols = [PHPickerViewControllerDelegate];
-  wantDataUrl?: boolean;
-  maxSize?: number;
-  onResult?: (r: { picked: boolean; width?: number; height?: number; dataUrl?: string }) => void;
-  static new(): PhotoPickerDelegate {
-    return <PhotoPickerDelegate>super.new();
-  }
-  pickerDidFinishPicking(picker: PHPickerViewController, results: NSArray<PHPickerResult>): void {
-    picker.dismissViewControllerAnimatedCompletion(true, null);
-    // Recover the WebView after the picker dismisses (orphaned-window / renderer-throttle guard).
-    bridge.getWebView()?.recoverAfterNativeSurface();
-    const result = results.count > 0 ? results.objectAtIndex(0) : null;
-    if (!result) return this.onResult?.({ picked: false });
-    result.itemProvider.loadObjectOfClassCompletionHandler(UIImage.class(), (img: UIImage) => {
-      if (!img) return this.onResult?.({ picked: true });
-      const out: { picked: boolean; width?: number; height?: number; dataUrl?: string } =
-        { picked: true, width: img.size.width, height: img.size.height };
-      if (this.wantDataUrl) out.dataUrl = uiImageToDataUrl(img, this.maxSize ?? 1024);
-      this.onResult?.(out);
-    });
+  // PHPickerViewController delegate. Closure-captured opts (dataUrl/maxSize) + resolve assigned post-new().
+  @NativeClass()
+  class PhotoPickerDelegateImpl extends NSObject implements PHPickerViewControllerDelegate {
+    static ObjCProtocols = [PHPickerViewControllerDelegate];
+    wantDataUrl?: boolean;
+    maxSize?: number;
+    onResult?: (r: { picked: boolean; width?: number; height?: number; dataUrl?: string }) => void;
+    static new(): PhotoPickerDelegateImpl {
+      return <PhotoPickerDelegateImpl>super.new();
+    }
+    pickerDidFinishPicking(picker: PHPickerViewController, results: NSArray<PHPickerResult>): void {
+      picker.dismissViewControllerAnimatedCompletion(true, null);
+      // Recover the WebView after the picker dismisses (orphaned-window / renderer-throttle guard).
+      bridge.getWebView()?.recoverAfterNativeSurface();
+      const result = results.count > 0 ? results.objectAtIndex(0) : null;
+      if (!result) return this.onResult?.({ picked: false });
+      result.itemProvider.loadObjectOfClassCompletionHandler(UIImage.class(), (img: UIImage) => {
+        if (!img) return this.onResult?.({ picked: true });
+        const out: { picked: boolean; width?: number; height?: number; dataUrl?: string } =
+          { picked: true, width: img.size.width, height: img.size.height };
+        if (this.wantDataUrl) out.dataUrl = uiImageToDataUrl(img, this.maxSize ?? 1024);
+        this.onResult?.(out);
+      });
+    }
   }
-}
+  PhotoPickerDelegate = PhotoPickerDelegateImpl;
 
-// UNUserNotificationCenter delegate — foreground present + tap routing. Idempotent singleton (notifDelegate).
-@NativeClass()
-class ForegroundNotificationDelegate extends NSObject implements UNUserNotificationCenterDelegate {
-  static ObjCProtocols = [UNUserNotificationCenterDelegate];
-  static new(): ForegroundNotificationDelegate {
-    return <ForegroundNotificationDelegate>super.new();
-  }
-  userNotificationCenterWillPresentNotificationWithCompletionHandler(
-    _center: UNUserNotificationCenter,
-    notification: UNNotification,
-    completionHandler: (opts: UNNotificationPresentationOptions) => void
-  ): void {
-    // Foreground REMOTE push (push trigger) → surface to kit.push.onMessage.
-    if (isRemotePush(notification)) onRemoteMessage(notification.request.content.userInfo, false);
-    // Present banner + list + sound + badge even while foreground (min target iOS 16).
-    completionHandler(
-      UNNotificationPresentationOptions.Banner |
-        UNNotificationPresentationOptions.List |
-        UNNotificationPresentationOptions.Sound |
-        UNNotificationPresentationOptions.Badge
-    );
-  }
-  // Notification tapped → route its deep link through the same path as an external open.
-  userNotificationCenterDidReceiveNotificationResponseWithCompletionHandler(
-    _center: UNUserNotificationCenter,
-    response: UNNotificationResponse,
-    completionHandler: () => void
-  ): void {
-    // Tapped REMOTE push → kit.push.onTap (with payload). Local notifs keep the deep-link path below.
-    if (isRemotePush(response.notification)) onRemoteMessage(response.notification.request.content.userInfo, true);
-    // userInfo may come back as an NSDictionary or an auto-marshalled JS object.
-    // any: dual-path payload (NSDictionary vs marshalled JS object) probed dynamically.
-    const info: any = response.notification.request.content.userInfo;
-    const url = info ? (typeof info.objectForKey === 'function' ? info.objectForKey('url') : info.url) : null;
-    // Diagnostic breadcrumb (persists across the cold relaunch) — surfaced in the handshake's debug field.
-    try {
-      ApplicationSettings.setString(
-        'kit:__notifTap',
-        JSON.stringify({ at: Date.now(), url: url ? String(url) : null, hadInfo: !!info })
+  // UNUserNotificationCenter delegate — foreground present + tap routing. Idempotent singleton (notifDelegate).
+  @NativeClass()
+  class ForegroundNotificationDelegateImpl extends NSObject implements UNUserNotificationCenterDelegate {
+    static ObjCProtocols = [UNUserNotificationCenterDelegate];
+    static new(): ForegroundNotificationDelegateImpl {
+      return <ForegroundNotificationDelegateImpl>super.new();
+    }
+    userNotificationCenterWillPresentNotificationWithCompletionHandler(
+      _center: UNUserNotificationCenter,
+      notification: UNNotification,
+      completionHandler: (opts: UNNotificationPresentationOptions) => void
+    ): void {
+      // Foreground REMOTE push (push trigger) → surface to kit.push.onMessage.
+      if (isRemotePush(notification)) onRemoteMessage(notification.request.content.userInfo, false);
+      // Present banner + list + sound + badge even while foreground (min target iOS 16).
+      completionHandler(
+        UNNotificationPresentationOptions.Banner |
+          UNNotificationPresentationOptions.List |
+          UNNotificationPresentationOptions.Sound |
+          UNNotificationPresentationOptions.Badge
       );
-    } catch {
-      /* diagnostic only */
     }
-    if (url) onDeepLink(String(url));
-    completionHandler();
+    // Notification tapped → route its deep link through the same path as an external open.
+    userNotificationCenterDidReceiveNotificationResponseWithCompletionHandler(
+      _center: UNUserNotificationCenter,
+      response: UNNotificationResponse,
+      completionHandler: () => void
+    ): void {
+      // Tapped REMOTE push → kit.push.onTap (with payload). Local notifs keep the deep-link path below.
+      if (isRemotePush(response.notification)) onRemoteMessage(response.notification.request.content.userInfo, true);
+      // userInfo may come back as an NSDictionary or an auto-marshalled JS object.
+      // any: dual-path payload (NSDictionary vs marshalled JS object) probed dynamically.
+      const info: any = response.notification.request.content.userInfo;
+      const url = info ? (typeof info.objectForKey === 'function' ? info.objectForKey('url') : info.url) : null;
+      // Diagnostic breadcrumb (persists across the cold relaunch) — surfaced in the handshake's debug field.
+      try {
+        ApplicationSettings.setString(
+          'kit:__notifTap',
+          JSON.stringify({ at: Date.now(), url: url ? String(url) : null, hadInfo: !!info })
+        );
+      } catch {
+        /* diagnostic only */
+      }
+      if (url) onDeepLink(String(url));
+      completionHandler();
+    }
   }
+  ForegroundNotificationDelegate = ForegroundNotificationDelegateImpl;
 }
 
 /**
@@ -124,6 +136,7 @@ class ForegroundNotificationDelegate extends NSObject implements UNUserNotificat
  * Each handler is small and self-contained; heavy domains (push, files) come later.
  */
 export function registerExtendedHandlers(): void {
+  ensureIosDelegates(); // no-op on Android; defines the iOS delegate classes used by the handlers below
   // ── device ─────────────────────────────────────────────────────────
   bridge.register('device.info', () => {
     let battery: { level: number; charging: boolean } | undefined;
@@ -298,7 +311,7 @@ export function registerExtendedHandlers(): void {
       }, 15000);
 
       let manager: CLLocationManager | null = null;
-      let delegate: GeoDelegate | null = null;
+      let delegate: any = null;
       const cleanup = () => {
         clearTimeout(timer);
         manager?.stopUpdatingLocation();
@@ -406,7 +419,7 @@ function applyIosOrientation(mask: number): void {
   });
 }
 
-let notifDelegate: ForegroundNotificationDelegate | null = null; // retained for the app's lifetime
+let notifDelegate: any = null; // retained for the app's lifetime
 /**
  * Install the UNUserNotificationCenter delegate. MUST run before
  * `didFinishLaunching` returns, else a tap that COLD-LAUNCHES the app never
@@ -416,6 +429,7 @@ let notifDelegate: ForegroundNotificationDelegate | null = null; // retained for
  */
 export function installForegroundNotificationDelegate(): void {
   if (!isIOS || notifDelegate) return;
+  ensureIosDelegates();
   notifDelegate = ForegroundNotificationDelegate.new();
   UNUserNotificationCenter.currentNotificationCenter().delegate = notifDelegate;
 }

package/runtime/app/shell/handlers-fs.ts

@@ -152,42 +152,52 @@ function iosStat(full: string, name: string): any {
 
 /**
  * Delegate for UIDocumentPickerViewController. Captures the resolve callback as an instance field
- * (the original closed over `resolve`); both selectors funnel into it.
+ * (the original closed over `resolve`); both selectors funnel into it. Built lazily INSIDE the
+ * iOS-only path (mirrors banner.ts): NSObject/UI* are iOS globals and this file is imported on Android
+ * too, so a top-level `@NativeClass extends NSObject` would crash at module load.
  */
-@NativeClass()
-class DocumentPickerDelegate extends NSObject implements UIDocumentPickerDelegate {
-  static ObjCProtocols = [UIDocumentPickerDelegate];
-  onPick!: (out: any[]) => void;
-
-  static new(): DocumentPickerDelegate {
-    return <DocumentPickerDelegate>super.new();
-  }
+// any: runtime-built ObjC subclass holder; the class BODY stays fully typed.
+let DocumentPickerDelegate: any;
+function documentPickerDelegateClass(): any {
+  if (!DocumentPickerDelegate) {
+    @NativeClass()
+    class DocumentPickerDelegateImpl extends NSObject implements UIDocumentPickerDelegate {
+      static ObjCProtocols = [UIDocumentPickerDelegate];
+      onPick!: (out: any[]) => void;
+
+      static new(): DocumentPickerDelegateImpl {
+        return <DocumentPickerDelegateImpl>super.new();
+      }
 
-  documentPickerDidPickDocumentsAtURLs(_controller: UIDocumentPickerViewController, urls: NSArray<NSURL>): void {
-    const out: any[] = [];
-    for (let i = 0; i < urls.count; i++) {
-      const url = urls.objectAtIndex(i);
-      const scoped = url.startAccessingSecurityScopedResource?.();
-      try {
-        const data = NSData.dataWithContentsOfURL(url);
-        if (data) {
-          out.push({
-            name: url.lastPathComponent,
-            mimeType: mimeForUrlIos(url),
-            size: data.length,
-            base64: data.base64EncodedStringWithOptions(0 as unknown as NSDataBase64EncodingOptions),
-          });
+      documentPickerDidPickDocumentsAtURLs(_controller: UIDocumentPickerViewController, urls: NSArray<NSURL>): void {
+        const out: any[] = [];
+        for (let i = 0; i < urls.count; i++) {
+          const url = urls.objectAtIndex(i);
+          const scoped = url.startAccessingSecurityScopedResource?.();
+          try {
+            const data = NSData.dataWithContentsOfURL(url);
+            if (data) {
+              out.push({
+                name: url.lastPathComponent,
+                mimeType: mimeForUrlIos(url),
+                size: data.length,
+                base64: data.base64EncodedStringWithOptions(0 as unknown as NSDataBase64EncodingOptions),
+              });
+            }
+          } finally {
+            if (scoped) url.stopAccessingSecurityScopedResource?.();
+          }
         }
-      } finally {
-        if (scoped) url.stopAccessingSecurityScopedResource?.();
+        this.onPick(out);
       }
-    }
-    this.onPick(out);
-  }
 
-  documentPickerWasCancelled(_controller: UIDocumentPickerViewController): void {
-    this.onPick([]);
+      documentPickerWasCancelled(_controller: UIDocumentPickerViewController): void {
+        this.onPick([]);
+      }
+    }
+    DocumentPickerDelegate = DocumentPickerDelegateImpl;
   }
+  return DocumentPickerDelegate;
 }
 
 /**
@@ -211,7 +221,7 @@ function pickFileIos(types: string[] | undefined, multiple: boolean): Promise<an
         const picker = UIDocumentPickerViewController.alloc().initForOpeningContentTypes(utis as any);
         picker.allowsMultipleSelection = multiple;
 
-        const delegate = DocumentPickerDelegate.new();
+        const delegate = documentPickerDelegateClass().new();
         delegate.onPick = resolve;
         (picker as any)._appwrapDelegate = delegate; // interop: retain delegate past the present call (no typed slot)
         picker.delegate = delegate;

package/runtime/app/shell/handlers-oauth.ts

@@ -11,18 +11,28 @@ const err = (code: string, message: string) => Object.assign(new Error(message),
 let activeSession: ASWebAuthenticationSession | null = null;
 let activeProvider: ASWebAuthenticationPresentationContextProviding | null = null;
 
-@NativeClass()
-class OAuthPresentationContextProvider extends NSObject implements ASWebAuthenticationPresentationContextProviding {
-  static ObjCProtocols = [ASWebAuthenticationPresentationContextProviding];
-  static new(): OAuthPresentationContextProvider {
-    return <OAuthPresentationContextProvider>super.new();
-  }
-  presentationAnchorForWebAuthenticationSession(_session: ASWebAuthenticationSession): UIWindow {
-    return (
-      Utils.ios.getRootViewController()?.view?.window ??
-      UIApplication.sharedApplication.keyWindow
-    );
+// Built lazily INSIDE the iOS-only path (mirrors banner.ts): NSObject/AS* are iOS globals and this file
+// is imported on Android too, so a top-level `@NativeClass extends NSObject` would crash at module load.
+// any: runtime-built ObjC subclass holder; the class BODY stays fully typed.
+let OAuthPresentationContextProvider: any;
+function oauthContextProviderClass(): any {
+  if (!OAuthPresentationContextProvider) {
+    @NativeClass()
+    class OAuthPresentationContextProviderImpl extends NSObject implements ASWebAuthenticationPresentationContextProviding {
+      static ObjCProtocols = [ASWebAuthenticationPresentationContextProviding];
+      static new(): OAuthPresentationContextProviderImpl {
+        return <OAuthPresentationContextProviderImpl>super.new();
+      }
+      presentationAnchorForWebAuthenticationSession(_session: ASWebAuthenticationSession): UIWindow {
+        return (
+          Utils.ios.getRootViewController()?.view?.window ??
+          UIApplication.sharedApplication.keyWindow
+        );
+      }
+    }
+    OAuthPresentationContextProvider = OAuthPresentationContextProviderImpl;
   }
+  return OAuthPresentationContextProvider;
 }
 
 /**
@@ -64,7 +74,7 @@ export function registerOAuthHandlers(): void {
             }
           );
 
-          activeProvider = OAuthPresentationContextProvider.new();
+          activeProvider = oauthContextProviderClass().new();
           session.presentationContextProvider = activeProvider;
           session.prefersEphemeralWebBrowserSession = !!ephemeral;
           activeSession = session;

package/runtime/app/shell/handlers-parity.ts

@@ -20,77 +20,89 @@ function readContact(contact: CNContact): { name: string; phones: string[]; emai
   };
 }
 
-// CLLocationManager delegate for the persistent geo.watch stream. Callbacks are wired via instance
-// fields so the closure-captured behavior of the old (NSObject).extend(...) is preserved.
-@NativeClass()
-class GeoWatchDelegate extends NSObject implements CLLocationManagerDelegate {
-  static ObjCProtocols = [CLLocationManagerDelegate];
-  static new(): GeoWatchDelegate {
-    return <GeoWatchDelegate>super.new();
-  }
-  locationManagerDidUpdateLocations(_m: CLLocationManager, locations: NSArray<CLLocation>): void {
-    const loc = locations.lastObject;
-    if (!loc) return;
-    bridge.emit('geo.position', {
-      lat: loc.coordinate.latitude,
-      lng: loc.coordinate.longitude,
-      accuracy: loc.horizontalAccuracy,
-    });
-  }
-  locationManagerDidFailWithError(_m: CLLocationManager, error: NSError): void {
-    console.warn('AppWrap: geo.watch error', error.localizedDescription);
-  }
-  locationManagerDidChangeAuthorization(m: CLLocationManager): void {
-    const st = m.authorizationStatus;
-    if (st === CLAuthorizationStatus.kCLAuthorizationStatusAuthorizedWhenInUse ||
-        st === CLAuthorizationStatus.kCLAuthorizationStatusAuthorizedAlways) {
-      m.startUpdatingLocation();
+// iOS-only native delegates. Defined lazily inside an isIOS-gated factory (mirrors banner.ts) so the
+// shared module can instantiate on Android — NSObject/CL*/CN*/UIImagePicker* are iOS globals, and a
+// top-level `extends NSObject` would evaluate at ES-module load and crash the Android shell.
+// any: module-level holders for runtime-built ObjC subclasses; each class BODY stays fully typed.
+let GeoWatchDelegate: any, ContactPickerDelegate: any, CameraCaptureDelegate: any;
+function ensureIosDelegates(): void {
+  if (!isIOS || GeoWatchDelegate) return;
+
+  // CLLocationManager delegate for the persistent geo.watch stream. Callbacks are wired via instance
+  // fields so the closure-captured behavior of the old (NSObject).extend(...) is preserved.
+  @NativeClass()
+  class GeoWatchDelegateImpl extends NSObject implements CLLocationManagerDelegate {
+    static ObjCProtocols = [CLLocationManagerDelegate];
+    static new(): GeoWatchDelegateImpl {
+      return <GeoWatchDelegateImpl>super.new();
+    }
+    locationManagerDidUpdateLocations(_m: CLLocationManager, locations: NSArray<CLLocation>): void {
+      const loc = locations.lastObject;
+      if (!loc) return;
+      bridge.emit('geo.position', {
+        lat: loc.coordinate.latitude,
+        lng: loc.coordinate.longitude,
+        accuracy: loc.horizontalAccuracy,
+      });
+    }
+    locationManagerDidFailWithError(_m: CLLocationManager, error: NSError): void {
+      console.warn('AppWrap: geo.watch error', error.localizedDescription);
+    }
+    locationManagerDidChangeAuthorization(m: CLLocationManager): void {
+      const st = m.authorizationStatus;
+      if (st === CLAuthorizationStatus.kCLAuthorizationStatusAuthorizedWhenInUse ||
+          st === CLAuthorizationStatus.kCLAuthorizationStatusAuthorizedAlways) {
+        m.startUpdatingLocation();
+      }
     }
   }
-}
+  GeoWatchDelegate = GeoWatchDelegateImpl;
 
-// CNContactPickerViewController delegate. The picker resolution callbacks are set as instance fields
-// after construction (replacing the old closure-captured `resolve`).
-@NativeClass()
-class ContactPickerDelegate extends NSObject implements CNContactPickerDelegate {
-  static ObjCProtocols = [CNContactPickerDelegate];
-  static new(): ContactPickerDelegate {
-    return <ContactPickerDelegate>super.new();
-  }
-  onSelect?: (contact: CNContact) => void;
-  onCancel?: (picker: CNContactPickerViewController) => void;
-  contactPickerDidSelectContact(_picker: CNContactPickerViewController, contact: CNContact): void {
-    this.onSelect?.(contact);
-  }
-  contactPickerDidCancel(picker: CNContactPickerViewController): void {
-    this.onCancel?.(picker);
+  // CNContactPickerViewController delegate. The picker resolution callbacks are set as instance fields
+  // after construction (replacing the old closure-captured `resolve`).
+  @NativeClass()
+  class ContactPickerDelegateImpl extends NSObject implements CNContactPickerDelegate {
+    static ObjCProtocols = [CNContactPickerDelegate];
+    static new(): ContactPickerDelegateImpl {
+      return <ContactPickerDelegateImpl>super.new();
+    }
+    onSelect?: (contact: CNContact) => void;
+    onCancel?: (picker: CNContactPickerViewController) => void;
+    contactPickerDidSelectContact(_picker: CNContactPickerViewController, contact: CNContact): void {
+      this.onSelect?.(contact);
+    }
+    contactPickerDidCancel(picker: CNContactPickerViewController): void {
+      this.onCancel?.(picker);
+    }
   }
-}
+  ContactPickerDelegate = ContactPickerDelegateImpl;
 
-// UIImagePickerController delegate (camera.capture). Result/options are set as instance fields after
-// construction, replacing the old closure-captured `resolve`/`dataUrl`/`maxSize`.
-@NativeClass()
-class CameraCaptureDelegate extends NSObject implements UIImagePickerControllerDelegate, UINavigationControllerDelegate {
-  static ObjCProtocols = [UIImagePickerControllerDelegate, UINavigationControllerDelegate];
-  static new(): CameraCaptureDelegate {
-    return <CameraCaptureDelegate>super.new();
-  }
-  wantDataUrl = false;
-  maxSize = 1024;
-  onResult?: (out: { picked: boolean; width?: number; height?: number; dataUrl?: string }) => void;
-  imagePickerControllerDidFinishPickingMediaWithInfo(picker: UIImagePickerController, info: NSDictionary<string, any>): void {
-    picker.dismissViewControllerAnimatedCompletion(true, null);
-    const img = info.objectForKey(UIImagePickerControllerOriginalImage) as UIImage | null;
-    if (!img) return this.onResult?.({ picked: true });
-    const out: { picked: boolean; width?: number; height?: number; dataUrl?: string } =
-      { picked: true, width: img.size.width, height: img.size.height };
-    if (this.wantDataUrl) out.dataUrl = uiImageToDataUrl(img, this.maxSize);
-    this.onResult?.(out);
-  }
-  imagePickerControllerDidCancel(picker: UIImagePickerController): void {
-    picker.dismissViewControllerAnimatedCompletion(true, null);
-    this.onResult?.({ picked: false });
+  // UIImagePickerController delegate (camera.capture). Result/options are set as instance fields after
+  // construction, replacing the old closure-captured `resolve`/`dataUrl`/`maxSize`.
+  @NativeClass()
+  class CameraCaptureDelegateImpl extends NSObject implements UIImagePickerControllerDelegate, UINavigationControllerDelegate {
+    static ObjCProtocols = [UIImagePickerControllerDelegate, UINavigationControllerDelegate];
+    static new(): CameraCaptureDelegateImpl {
+      return <CameraCaptureDelegateImpl>super.new();
+    }
+    wantDataUrl = false;
+    maxSize = 1024;
+    onResult?: (out: { picked: boolean; width?: number; height?: number; dataUrl?: string }) => void;
+    imagePickerControllerDidFinishPickingMediaWithInfo(picker: UIImagePickerController, info: NSDictionary<string, any>): void {
+      picker.dismissViewControllerAnimatedCompletion(true, null);
+      const img = info.objectForKey(UIImagePickerControllerOriginalImage) as UIImage | null;
+      if (!img) return this.onResult?.({ picked: true });
+      const out: { picked: boolean; width?: number; height?: number; dataUrl?: string } =
+        { picked: true, width: img.size.width, height: img.size.height };
+      if (this.wantDataUrl) out.dataUrl = uiImageToDataUrl(img, this.maxSize);
+      this.onResult?.(out);
+    }
+    imagePickerControllerDidCancel(picker: UIImagePickerController): void {
+      picker.dismissViewControllerAnimatedCompletion(true, null);
+      this.onResult?.({ picked: false });
+    }
   }
+  CameraCaptureDelegate = CameraCaptureDelegateImpl;
 }
 
 /**
@@ -98,6 +110,7 @@ class CameraCaptureDelegate extends NSObject implements UIImagePickerControllerD
  * motion, contacts, calendar, camera. iOS-first like handlers-extended.
  */
 export function registerParityHandlers(): void {
+  ensureIosDelegates(); // no-op on Android; defines the iOS delegate classes used by the handlers below
   // ── dialogs (NS Dialogs — cross-platform) ──────────────────────────
   bridge.register('ui.alert', ({ title, message, ok }: any) =>
     Dialogs.alert({ title, message: String(message ?? ''), okButtonText: ok ?? 'OK' }).then(() => undefined)
@@ -139,7 +152,7 @@ export function registerParityHandlers(): void {
 
   // ── geo.watch (persistent CLLocationManager) ───────────────────────
   let geoManager: CLLocationManager | null = null;
-  let geoDelegate: GeoWatchDelegate | null = null;
+  let geoDelegate: any = null;
 
   bridge.register('geo.watch.start', () => {
     if (!isIOS) throw iosOnly();
@@ -213,10 +226,10 @@ export function registerParityHandlers(): void {
     return new Promise((resolve) => {
       Utils.dispatchToMainThread(() => {
         const delegate = ContactPickerDelegate.new();
-        delegate.onSelect = (contact) => {
+        delegate.onSelect = (contact: CNContact) => {
           resolve({ picked: true, ...readContact(contact) });
         };
-        delegate.onCancel = (picker) => {
+        delegate.onCancel = (picker: CNContactPickerViewController) => {
           picker.dismissViewControllerAnimatedCompletion(true, null);
           resolve({ picked: false });
         };