@livx.cc/appwrap 0.26.0 → 0.28.1

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

@@ -5,6 +5,118 @@ import { onRemoteMessage } from './handlers-push';
 import { uiImageToDataUrl } from './ios-image';
 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) {
+      this.onCleanup?.();
+      this.onError?.(Object.assign(new Error('location permission denied'), { code: 'DENIED' }));
+    }
+  }
+}
+
+// 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);
+    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);
+    });
+  }
+}
+
+// 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 })
+      );
+    } catch {
+      /* diagnostic only */
+    }
+    if (url) onDeepLink(String(url));
+    completionHandler();
+  }
+}
+
 /**
  * Extended capability handlers — iOS-first (Android arrives with the transport upgrade).
  * Each handler is small and self-contained; heavy domains (push, files) come later.
@@ -62,11 +174,11 @@ export function registerExtendedHandlers(): void {
   bridge.register('storage.secure.get', async ({ key }: { key: string }) =>
     (await secure.get({ key: `kit:${key}` })) ?? null
   );
-  bridge.register('storage.secure.set', ({ key, value }: { key: string; value: string }) =>
-    secure.set({ key: `kit:${key}`, value: String(value ?? '') }).then(() => undefined)
+  bridge.register('storage.secure.set', ({ key, value }: { key: string; value: string }): Promise<void> =>
+    secure.set({ key: `kit:${key}`, value: String(value ?? '') }).then((): void => undefined)
   );
-  bridge.register('storage.secure.remove', ({ key }: { key: string }) =>
-    secure.remove({ key: `kit:${key}` }).then(() => undefined)
+  bridge.register('storage.secure.remove', ({ key }: { key: string }): Promise<void> =>
+    secure.remove({ key: `kit:${key}` }).then((): void => undefined)
   );
 
   // ── notifications (UNUserNotificationCenter, iOS) ──────────────────
@@ -85,7 +197,7 @@ export function registerExtendedHandlers(): void {
     });
   });
 
-  bridge.register('notifications.schedule', ({ id, title, body, delaySec, deepLink }: any) => {
+  bridge.register('notifications.schedule', ({ id, title, body, delaySec, deepLink }: { id?: number; title?: string; body?: string; delaySec?: number; deepLink?: string }) => {
     if (!isIOS) throw Object.assign(new Error('iOS only for now'), { code: 'UNSUPPORTED' });
     const nid = id ?? Math.floor(Math.random() * 100000);
     return new Promise((resolve, reject) => {
@@ -95,6 +207,7 @@ export function registerExtendedHandlers(): void {
       // Carry the deep-link on the notification; the tap delegate re-emits it.
       // Plain JS object → NativeScript marshals it to NSDictionary (more reliable
       // than dictionaryWithObjectForKey across NS versions).
+      // cast: NS marshals a plain JS object → NSDictionary at the interop boundary (typed NSDictionary).
       if (deepLink) content.userInfo = { url: String(deepLink) } as any;
       const trigger = UNTimeIntervalNotificationTrigger.triggerWithTimeIntervalRepeats(
         Math.max(1, delaySec ?? 1),
@@ -130,7 +243,7 @@ export function registerExtendedHandlers(): void {
           // iOS silently ignores the badge unless notification authorization (incl. .badge) was granted —
           // the completion's error is the ONLY signal, so DON'T swallow it (else the badge just never
           // appears with no explanation). Resolve regardless (the JS call itself didn't fail).
-          (error: any) => { if (error) console.warn('[appwrap] setBadge ignored — notifications not authorized?', String(error)); }
+          (error: NSError) => { if (error) console.warn('[appwrap] setBadge ignored — notifications not authorized?', String(error)); }
         );
         resolve();
       });
@@ -152,8 +265,8 @@ export function registerExtendedHandlers(): void {
       LAPolicy.DeviceOwnerAuthenticationWithBiometrics
     );
     const type =
-      ctx.biometryType === LABiometryType.FaceID ? 'face'
-      : ctx.biometryType === LABiometryType.TouchID ? 'touch'
+      ctx.biometryType === LABiometryType.TypeFaceID ? 'face'
+      : ctx.biometryType === LABiometryType.TypeTouchID ? 'touch'
       : 'none';
     return { available, type };
   });
@@ -183,7 +296,7 @@ export function registerExtendedHandlers(): void {
       }, 15000);
 
       let manager: CLLocationManager | null = null;
-      let delegate: any = null;
+      let delegate: GeoDelegate | null = null;
       const cleanup = () => {
         clearTimeout(timer);
         manager?.stopUpdatingLocation();
@@ -191,40 +304,12 @@ export function registerExtendedHandlers(): void {
         delegate = null;
       };
 
-      const DelegateClass = (NSObject as any).extend(
-        {
-          locationManagerDidUpdateLocations(_m: CLLocationManager, locations: NSArray<CLLocation>) {
-            const loc = locations.lastObject;
-            if (!loc) return;
-            const result = {
-              lat: loc.coordinate.latitude,
-              lng: loc.coordinate.longitude,
-              accuracy: loc.horizontalAccuracy,
-            };
-            cleanup();
-            resolve(result);
-          },
-          locationManagerDidFailWithError(_m: CLLocationManager, error: NSError) {
-            cleanup();
-            reject(Object.assign(new Error(error.localizedDescription), { code: 'DENIED' }));
-          },
-          locationManagerDidChangeAuthorization(m: CLLocationManager) {
-            const st = m.authorizationStatus;
-            if (st === CLAuthorizationStatus.kCLAuthorizationStatusAuthorizedWhenInUse ||
-                st === CLAuthorizationStatus.kCLAuthorizationStatusAuthorizedAlways) {
-              m.startUpdatingLocation();
-            } else if (st === CLAuthorizationStatus.kCLAuthorizationStatusDenied) {
-              cleanup();
-              reject(Object.assign(new Error('location permission denied'), { code: 'DENIED' }));
-            }
-          },
-        },
-        { protocols: [CLLocationManagerDelegate] }
-      );
-
       Utils.dispatchToMainThread(() => {
         manager = CLLocationManager.new();
-        delegate = DelegateClass.new();
+        delegate = GeoDelegate.new();
+        delegate.onResult = resolve;
+        delegate.onError = reject;
+        delegate.onCleanup = cleanup;
         manager.delegate = delegate;
         manager.desiredAccuracy = kCLLocationAccuracyHundredMeters;
         const st = manager.authorizationStatus;
@@ -238,31 +323,18 @@ export function registerExtendedHandlers(): void {
   });
 
   // ── photos (PHPickerViewController) ────────────────────────────────
-  bridge.register('photos.pick', ({ dataUrl, maxSize }: any = {}) => {
+  bridge.register('photos.pick', ({ dataUrl, maxSize }: { dataUrl?: boolean; maxSize?: number } = {}) => {
     if (!isIOS) throw Object.assign(new Error('iOS only for now'), { code: 'UNSUPPORTED' });
     return new Promise((resolve) => {
       Utils.dispatchToMainThread(() => {
         const config = PHPickerConfiguration.new();
         config.selectionLimit = 1;
-        const DelegateClass = (NSObject as any).extend(
-          {
-            pickerDidFinishPicking(picker: PHPickerViewController, results: NSArray<PHPickerResult>) {
-              picker.dismissViewControllerAnimatedCompletion(true, null);
-              const result = results.count > 0 ? results.objectAtIndex(0) : null;
-              if (!result) return resolve({ picked: false });
-              result.itemProvider.loadObjectOfClassCompletionHandler(UIImage.class(), (img: UIImage) => {
-                if (!img) return resolve({ picked: true });
-                const out: any = { picked: true, width: img.size.width, height: img.size.height };
-                if (dataUrl) out.dataUrl = uiImageToDataUrl(img, maxSize ?? 1024);
-                resolve(out);
-              });
-            },
-          },
-          { protocols: [PHPickerViewControllerDelegate] }
-        );
         const picker = PHPickerViewController.alloc().initWithConfiguration(config);
-        const delegate = DelegateClass.new();
-        (picker as any)._appwrapDelegate = delegate; // retain
+        const delegate = PhotoPickerDelegate.new();
+        delegate.wantDataUrl = !!dataUrl;
+        delegate.maxSize = maxSize;
+        delegate.onResult = resolve;
+        (picker as any)._appwrapDelegate = delegate; // any: stash extra prop on VC to retain delegate (ARC)
         picker.delegate = delegate;
         Utils.ios.getRootViewController().presentViewControllerAnimatedCompletion(picker, true, null);
       });
@@ -314,14 +386,16 @@ export function registerExtendedHandlers(): void {
 function applyIosOrientation(mask: number): void {
   setIosOrientationMask(mask);
   Utils.dispatchToMainThread(() => {
-    const rootVC: any = Utils.ios.getRootViewController();
+    const rootVC = Utils.ios.getRootViewController();
     rootVC?.setNeedsUpdateOfSupportedInterfaceOrientations?.();
-    const G: any = global as any;
-    const Prefs = G.UIWindowSceneGeometryPreferencesIOS;
-    const scenes: any = UIApplication.sharedApplication.connectedScenes?.allObjects;
+    // any: deliberate runtime probe — reference the iOS-16 geometry class via `global` so PRE-iOS-16
+    // runtimes (where it's absent) hit the early-return instead of a hard symbol miss.
+    const Prefs: any = (global as any).UIWindowSceneGeometryPreferencesIOS;
+    const scenes = UIApplication.sharedApplication.connectedScenes?.allObjects;
     if (!Prefs || !scenes) return; // pre-iOS-16: the mask alone takes effect on next rotation
     for (let i = 0; i < scenes.count; i++) {
-      const scene = scenes.objectAtIndex(i);
+      // any: ObjC errorHandler block is nullable — we pass `null`, which the typed (p1)=>void rejects.
+      const scene: any = scenes.objectAtIndex(i);
       if (scene?.requestGeometryUpdateWithPreferencesErrorHandler) {
         const prefs = Prefs.alloc().initWithInterfaceOrientations(mask);
         scene.requestGeometryUpdateWithPreferencesErrorHandler(prefs, null);
@@ -330,7 +404,7 @@ function applyIosOrientation(mask: number): void {
   });
 }
 
-let notifDelegate: any = null; // retained for the app's lifetime
+let notifDelegate: ForegroundNotificationDelegate | null = 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
@@ -340,50 +414,7 @@ let notifDelegate: any = null; // retained for the app's lifetime
  */
 export function installForegroundNotificationDelegate(): void {
   if (!isIOS || notifDelegate) return;
-  const DelegateClass = (NSObject as any).extend(
-    {
-      userNotificationCenterWillPresentNotificationWithCompletionHandler(
-        _center: UNUserNotificationCenter,
-        notification: UNNotification,
-        completionHandler: (opts: number) => 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.
-        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();
-      },
-    },
-    { protocols: [UNUserNotificationCenterDelegate] }
-  );
-  notifDelegate = DelegateClass.new();
+  notifDelegate = ForegroundNotificationDelegate.new();
   UNUserNotificationCenter.currentNotificationCenter().delegate = notifDelegate;
 }
 

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

@@ -2,8 +2,6 @@ import { Utils, isAndroid, isIOS } from '@nativescript/core';
 import { bridge } from './bridge';
 import { startActivityForResult } from './android-helpers';
 
-declare const android: any, java: any;
-
 const err = (code: string, message: string) => Object.assign(new Error(message), { code });
 
 type Dir = 'documents' | 'data' | 'cache';
@@ -152,6 +150,46 @@ 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.
+ */
+@NativeClass()
+class DocumentPickerDelegate extends NSObject implements UIDocumentPickerDelegate {
+  static ObjCProtocols = [UIDocumentPickerDelegate];
+  onPick!: (out: any[]) => void;
+
+  static new(): DocumentPickerDelegate {
+    return <DocumentPickerDelegate>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),
+          });
+        }
+      } finally {
+        if (scoped) url.stopAccessingSecurityScopedResource?.();
+      }
+    }
+    this.onPick(out);
+  }
+
+  documentPickerWasCancelled(_controller: UIDocumentPickerViewController): void {
+    this.onPick([]);
+  }
+}
+
 /**
  * iOS document picker via UIDocumentPickerViewController. Reads each chosen URL's bytes (under a
  * security-scoped access window) and returns them base64-inline. DEVICE-GATED — the delegate
@@ -163,6 +201,7 @@ function pickFileIos(types: string[] | undefined, multiple: boolean): Promise<an
       try {
         const utis = NSMutableArray.new();
         // Map common MIME/extension hints to UTTypes; default to "any item".
+        // interop: UTType/UTTypeItem live in UniformTypeIdentifiers, not referenced by references.d.ts.
         (types ?? []).forEach((t) => {
           const ut = (UTType as any).typeWithMIMEType?.(t) ?? (UTType as any).typeWithFilenameExtension?.(t.replace(/^\./, ''));
           if (ut) utis.addObject(ut);
@@ -172,37 +211,9 @@ function pickFileIos(types: string[] | undefined, multiple: boolean): Promise<an
         const picker = UIDocumentPickerViewController.alloc().initForOpeningContentTypes(utis as any);
         picker.allowsMultipleSelection = multiple;
 
-        const DelegateClass = (NSObject as any).extend(
-          {
-            documentPickerDidPickDocumentsAtURLs(_p: any, urls: any) {
-              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?.();
-                }
-              }
-              resolve(out);
-            },
-            documentPickerWasCancelled() {
-              resolve([]);
-            },
-          },
-          { protocols: [UIDocumentPickerDelegate] }
-        );
-        const delegate = DelegateClass.new();
-        (picker as any)._appwrapDelegate = delegate; // retain past the present call
+        const delegate = DocumentPickerDelegate.new();
+        delegate.onPick = resolve;
+        (picker as any)._appwrapDelegate = delegate; // interop: retain delegate past the present call (no typed slot)
         picker.delegate = delegate;
         Utils.ios.getRootViewController().presentViewControllerAnimatedCompletion(picker, true, null);
       } catch (e: any) {
@@ -212,25 +223,26 @@ function pickFileIos(types: string[] | undefined, multiple: boolean): Promise<an
   });
 }
 
-function mimeForUrlIos(url: any): string {
+function mimeForUrlIos(url: NSURL): string {
+  // interop: UTType lives in UniformTypeIdentifiers, not referenced by references.d.ts.
   const ut = (UTType as any).typeWithFilenameExtension?.(url.pathExtension);
   return ut?.preferredMIMEType ?? 'application/octet-stream';
 }
 
 // ───────────────────────────── Android ─────────────────────────────
 
-function androidBaseDir(dir: Dir): any {
+function androidBaseDir(dir: Dir): java.io.File {
   const ctx = Utils.android.getApplicationContext();
   if (dir === 'cache') return ctx.getCacheDir();
   if (dir === 'documents') return ctx.getExternalFilesDir(null) ?? ctx.getFilesDir();
   return ctx.getFilesDir(); // 'data'
 }
 
-function androidFile(path: string, dir: Dir): any {
+function androidFile(path: string, dir: Dir): java.io.File {
   return new java.io.File(androidBaseDir(dir), safeRelPath(path));
 }
 
-function readBytesAndroid(file: any): any {
+function readBytesAndroid(file: java.io.File): androidNative.Array<number> {
   const fis = new java.io.FileInputStream(file);
   const baos = new java.io.ByteArrayOutputStream();
   const buf = Array.create('byte', 8192);
@@ -298,7 +310,7 @@ function registerAndroidFs(): void {
   bridge.register('fs.pickFile', ({ types, multiple }: any) => pickFileAndroid(types, !!multiple));
 }
 
-function writeAndroid(file: any, data: string, encoding: string, append: boolean): void {
+function writeAndroid(file: java.io.File, data: string, encoding: string, append: boolean): void {
   const bytes = encoding === 'base64'
     ? android.util.Base64.decode(String(data ?? ''), android.util.Base64.DEFAULT)
     : new java.lang.String(String(data ?? '')).getBytes('UTF-8');
@@ -307,7 +319,7 @@ function writeAndroid(file: any, data: string, encoding: string, append: boolean
   fos.close();
 }
 
-function androidStat(file: any, name: string): any {
+function androidStat(file: java.io.File, name: string): any {
   const isDir = file.isDirectory();
   return {
     name,
@@ -338,7 +350,7 @@ async function pickFileAndroid(types: string[] | undefined, multiple: boolean):
   const { resultCode, intent: result } = await startActivityForResult(intent);
   if (resultCode !== android.app.Activity.RESULT_OK || !result) return [];
 
-  const uris: any[] = [];
+  const uris: android.net.Uri[] = [];
   const clip = result.getClipData?.();
   if (clip) for (let i = 0; i < clip.getItemCount(); i++) uris.push(clip.getItemAt(i).getUri());
   else if (result.getData()) uris.push(result.getData());
@@ -361,7 +373,7 @@ async function pickFileAndroid(types: string[] | undefined, multiple: boolean):
   });
 }
 
-function queryDisplayName(cr: any, uri: any): string {
+function queryDisplayName(cr: android.content.ContentResolver, uri: android.net.Uri): string {
   const cursor = cr.query(uri, [android.provider.OpenableColumns.DISPLAY_NAME], null, null, null);
   let name = 'file';
   if (cursor) {

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

@@ -2,9 +2,7 @@ import { Utils, isAndroid, isIOS } from '@nativescript/core';
 import { bridge } from './bridge';
 import { requestPermissions, startActivityForResult } from './android-helpers';
 
-declare const android: any;
-declare const cc: any; // generated from the HealthConnectBridge.kt shim (overrides/)
-declare const CMPedometer: any; // CoreMotion (already linked via CMMotionManager in handlers-parity)
+declare const cc: any; // no NS types: generated Kotlin HealthConnectBridge (HealthConnectBridge.kt shim, overrides/)
 
 const err = (code: string, message: string) => Object.assign(new Error(message), { code });
 
@@ -39,7 +37,8 @@ function registerIos(): void {
     new Promise((resolve) => {
       if (!HKHealthStore.isHealthDataAvailable()) { resolve(false); return; }
       const readSet = NSSet.setWithObject(stepType);
-      store.requestAuthorizationToShareTypesReadTypesCompletion(null, readSet, (ok: boolean, e: any) => {
+      // null typesToShare (read-only request) — SDK types the param as a non-nullable NSSet.
+      store.requestAuthorizationToShareTypesReadTypesCompletion(null as any, readSet, (ok: boolean, e: NSError) => {
         Utils.dispatchToMainThread(() => resolve(!!ok && !e));
       });
     })
@@ -54,9 +53,12 @@ function registerIos(): void {
   // WKWebView response delivery (evaluateJavaScript) is main-thread.
   bridge.register('health.count', () =>
     new Promise((resolve, reject) => {
-      const predicate = HKQuery.predicateForSamplesWithStartDateEndDateOptions(startOfToday(), NSDate.date(), 0);
+      // NS marshals NSDate→the SDK's `Date` param type; options 0 = HKQueryOptions.None.
+      const predicate = HKQuery.predicateForSamplesWithStartDateEndDateOptions(
+        startOfToday() as unknown as Date, NSDate.date() as unknown as Date, HKQueryOptions.None
+      );
       const q = HKStatisticsQuery.alloc().initWithQuantityTypeQuantitySamplePredicateOptionsCompletionHandler(
-        stepType, predicate, HKStatisticsOptions.CumulativeSum, (_q: any, stats: any, e: any) => {
+        stepType, predicate, HKStatisticsOptions.CumulativeSum, (_q: HKStatisticsQuery, stats: HKStatistics, e: NSError) => {
           Utils.dispatchToMainThread(() => {
             if (e) { reject(err('NATIVE_ERROR', e.localizedDescription ?? 'health query failed')); return; }
             const sum = stats && stats.sumQuantity ? stats.sumQuantity() : null;
@@ -72,17 +74,19 @@ function registerIos(): void {
   // aggregate. Caller uses HealthKit as the periodic source-of-truth and these live deltas in between.
   // Emits `health.liveStep` { steps } (today's pedometer total since local midnight). iPhone-only
   // (no Watch), which is fine: it's the live driver; HealthKit re-anchors the authoritative total.
-  let pedometer: any = null;
+  let pedometer: CMPedometer | null = null;
   let anchorDay = -1; // local day-of-month the current stream is anchored to (for midnight re-anchor)
   const localDay = () => new Date().getDate();
   const startStream = () => {
+    if (!pedometer) return;
     anchorDay = localDay();
-    pedometer.startPedometerUpdatesFromDateWithHandler(startOfToday(), (data: any, e: any) => {
+    // startOfToday() returns an NSDate; the SDK types `start` as JS Date but NativeScript marshals it.
+    pedometer.startPedometerUpdatesFromDateWithHandler(startOfToday() as unknown as Date, (data: CMPedometerData, e: NSError) => {
       if (e || !data) return;
       // Midnight self-heal: CMPedometer counts since the FIXED anchor date, so after local midnight
       // numberOfSteps still includes yesterday. When the day rolls over, restart from the new
       // midnight (re-anchors to 0) so the live count stays "today only".
-      if (localDay() !== anchorDay) { Utils.dispatchToMainThread(() => { pedometer.stopPedometerUpdates(); startStream(); bridge.emit('health.liveStep', { steps: 0 }); }); return; }
+      if (localDay() !== anchorDay) { Utils.dispatchToMainThread(() => { pedometer?.stopPedometerUpdates(); startStream(); bridge.emit('health.liveStep', { steps: 0 }); }); return; }
       const steps = Math.round(num(data.numberOfSteps));
       Utils.dispatchToMainThread(() => bridge.emit('health.liveStep', { steps }));
     });
@@ -91,9 +95,12 @@ function registerIos(): void {
     if (typeof CMPedometer === 'undefined' || !CMPedometer.isStepCountingAvailable())
       throw err('UNSUPPORTED', 'Pedometer (live step counting) unavailable on this device');
     // Motion & Fitness denied/restricted → surface it so the caller can fall back to HealthKit instead
-    // of silently receiving no events. (2 = denied, 1 = restricted per CMAuthorizationStatus.)
-    const auth = typeof CMPedometer.authorizationStatus === 'function' ? CMPedometer.authorizationStatus() : 0;
-    if (auth === 2 || auth === 1) throw err('DENIED', 'Motion & Fitness access is off for live step counting');
+    // of silently receiving no events.
+    const auth = typeof CMPedometer.authorizationStatus === 'function'
+      ? CMPedometer.authorizationStatus()
+      : CMAuthorizationStatus.NotDetermined;
+    if (auth === CMAuthorizationStatus.Denied || auth === CMAuthorizationStatus.Restricted)
+      throw err('DENIED', 'Motion & Fitness access is off for live step counting');
     if (pedometer) return; // already streaming
     pedometer = CMPedometer.new();
     startStream();
@@ -117,29 +124,30 @@ function registerAndroid(): void {
   };
 
   // ── sensor fallback (TYPE_STEP_COUNTER) — when Health Connect isn't available ──
-  let sensorManager: any = null;
-  let listener: any = null;
+  let sensorManager: android.hardware.SensorManager | null = null;
+  let listener: android.hardware.SensorEventListener | null = null;
   let baseline: number | null = null;
   let latest: number | null = null;
   let registered = false;
   const ensureSensor = () => {
-    if (!sensorManager) sensorManager = ctx().getSystemService(android.content.Context.SENSOR_SERVICE);
+    // getSystemService is typed `any` by the SDK; narrow to the concrete manager.
+    if (!sensorManager) sensorManager = ctx().getSystemService(android.content.Context.SENSOR_SERVICE) as android.hardware.SensorManager;
   };
   const stopSensor = () => {
-    if (registered) { sensorManager.unregisterListener(listener); registered = false; }
+    if (registered && sensorManager && listener) { sensorManager.unregisterListener(listener); registered = false; }
   };
   const startSensor = () => {
     ensureSensor();
-    const sensor = sensorManager.getDefaultSensor(android.hardware.Sensor.TYPE_STEP_COUNTER);
+    const sensor = sensorManager!.getDefaultSensor(android.hardware.Sensor.TYPE_STEP_COUNTER);
     if (!sensor) throw err('UNSUPPORTED', 'No step-counter sensor on this device');
     stopSensor();
     baseline = null;
     latest = null;
     listener = new android.hardware.SensorEventListener({
-      onSensorChanged: (ev: any) => { const v = num(ev.values[0]); latest = v; if (baseline == null) baseline = v; },
+      onSensorChanged: (ev: android.hardware.SensorEvent) => { const v = num(ev.values[0]); latest = v; if (baseline == null) baseline = v; },
       onAccuracyChanged: () => {},
     });
-    sensorManager.registerListener(listener, sensor, android.hardware.SensorManager.SENSOR_DELAY_NORMAL);
+    sensorManager!.registerListener(listener, sensor, android.hardware.SensorManager.SENSOR_DELAY_NORMAL);
     registered = true;
   };
   const sensorCount = () => ({ steps: baseline != null && latest != null ? Math.max(0, Math.round(latest - baseline)) : 0 });