craft-native 0.0.90 → 0.0.92

package/dist/android/templates/LocationRecordingService.kt.template

@@ -1,4 +1,4 @@
-package {{PACKAGE_NAME}}
+package com.craft.runtime
 
 import android.Manifest
 import android.app.NotificationChannel
@@ -105,7 +105,7 @@ class LocationRecordingService : Service() {
         val notification = NotificationCompat.Builder(this, CHANNEL)
             .setSmallIcon(android.R.drawable.ic_menu_mylocation)
             .setContentTitle("Recording your activity")
-            .setContentText("WildLoop is securely saving your route")
+            .setContentText("${applicationInfo.loadLabel(packageManager)} is securely saving your route")
             .setOngoing(true)
             .setSilent(true)
             .build()
@@ -119,24 +119,49 @@ class LocationRecordingService : Service() {
                 stopSelf()
                 return START_NOT_STICKY
             }
-            else -> startUpdates()
+            else -> if (!startUpdates()) {
+                stopSelf()
+                return START_NOT_STICKY
+            }
         }
-        return if (CraftLocationRecordingStore.isActive(this)) START_STICKY else START_NOT_STICKY
+        return START_STICKY
     }
 
-    private fun startUpdates() {
-        if (callback != null || !CraftLocationRecordingStore.isActive(this)) return
-        if (ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED) return
+    private fun startUpdates(): Boolean {
+        if (callback != null) return true
+        if (!CraftLocationRecordingStore.isActive(this)) return false
+        val hasForegroundLocation =
+            ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED ||
+                ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION) == PackageManager.PERMISSION_GRANTED
+        if (!hasForegroundLocation) {
+            CraftLocationRecordingStore.stop(this)
+            return false
+        }
         val request = LocationRequest.Builder(Priority.PRIORITY_HIGH_ACCURACY, 5_000)
             .setMinUpdateIntervalMillis(2_000)
             .setMaxUpdateDelayMillis(10_000)
             .build()
-        callback = object : LocationCallback() {
+        val nextCallback = object : LocationCallback() {
             override fun onLocationResult(result: LocationResult) {
                 for (location in result.locations) CraftLocationRecordingStore.append(this@LocationRecordingService, location)
             }
         }
-        client.requestLocationUpdates(request, callback!!, Looper.getMainLooper())
+        callback = nextCallback
+        return try {
+            client.requestLocationUpdates(request, nextCallback, Looper.getMainLooper())
+                .addOnFailureListener {
+                    if (callback === nextCallback) {
+                        CraftLocationRecordingStore.stop(this)
+                        stopUpdates()
+                        stopSelf()
+                    }
+                }
+            true
+        } catch (error: Exception) {
+            callback = null
+            CraftLocationRecordingStore.stop(this)
+            false
+        }
     }
 
     private fun stopUpdates() {

package/dist/android/templates/MainActivity.kt.template

@@ -3,6 +3,7 @@ package {{PACKAGE_NAME}}
 import android.annotation.SuppressLint
 import android.os.Bundle
 import android.content.Intent
+import android.graphics.Bitmap
 import android.net.Uri
 import android.webkit.WebResourceRequest
 import android.webkit.WebResourceError
@@ -43,7 +44,20 @@ class MainActivity : AppCompatActivity() {
 
         webView = findViewById(R.id.webview)
         craftBridge = CraftBridge(this, webView, CraftHealthConnect(this, webView))
-        handleIncomingDeepLink(intent, dispatch = false)
+        // The link that launched the app (#215). Queued until the page's bridge
+        // is injected, then dispatched once with `initial: true`, so a page that
+        // subscribes rather than calling getInitialURL still hears it. A
+        // relaunch from Recents carries the old intent, and was not opened by it.
+        // A recreated activity restores what the bridge saved: its intent may
+        // be a later warm link that onNewIntent set.
+        if (savedInstanceState == null) {
+            val launchLink = intent.data?.toString()
+            val launchedFromHistory = intent.flags and Intent.FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY != 0
+            if (launchLink != null && !launchedFromHistory) craftBridge.receiveDeepLink(launchLink)
+        } else {
+            craftBridge.restoreDeepLinks(savedInstanceState)
+        }
+        if (savedInstanceState == null) handleIncomingShortcut(intent)
 
         setupWebView()
         loadContent()
@@ -67,6 +81,11 @@ class MainActivity : AppCompatActivity() {
         }
 
         webView.webViewClient = object : WebViewClient() {
+            override fun onPageStarted(view: WebView?, url: String?, favicon: Bitmap?) {
+                super.onPageStarted(view, url, favicon)
+                craftBridge.markBridgeLoading()
+            }
+
             override fun onPageFinished(view: WebView?, url: String?) {
                 super.onPageFinished(view, url)
                 if (url != null && isTrustedUrl(url)) craftBridge.injectBridge()
@@ -143,10 +162,8 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
-    private fun handleIncomingDeepLink(source: Intent?, dispatch: Boolean) {
-        val url = source?.data?.toString() ?: return
-        craftBridge.setInitialURL(url)
-        if (dispatch) craftBridge.dispatchDeepLink(url)
+    private fun handleIncomingShortcut(source: Intent?) {
+        source?.getStringExtra(SHORTCUT_TYPE_EXTRA)?.let(craftBridge::dispatchShortcut)
     }
 
     private fun configJson(): JSONObject? {
@@ -181,16 +198,22 @@ class MainActivity : AppCompatActivity() {
 
     private fun isTrustedUrl(value: String): Boolean {
         val uri = Uri.parse(value)
-        if (uri.scheme == "https" && uri.host == BUNDLED_APP_HOST) return true
         val origin = "${uri.scheme}://${uri.authority}"
+        if (origin == BUNDLED_APP_ORIGIN) return true
         val localDevelopment = uri.scheme == "http" && uri.host in setOf("localhost", "127.0.0.1", "10.0.2.2")
         return (uri.scheme == "https" || localDevelopment) && origin in trustedOrigins
     }
 
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        craftBridge.saveDeepLinks(outState)
+    }
+
     override fun onNewIntent(intent: Intent) {
         super.onNewIntent(intent)
         setIntent(intent)
-        handleIncomingDeepLink(intent, dispatch = true)
+        intent.data?.toString()?.let(craftBridge::receiveDeepLink)
+        handleIncomingShortcut(intent)
     }
 
     override fun onBackPressed() {
@@ -223,8 +246,19 @@ class MainActivity : AppCompatActivity() {
         super.onActivityResult(requestCode, resultCode, data)
     }
 
+    override fun onRequestPermissionsResult(
+        requestCode: Int,
+        permissions: Array<out String>,
+        grantResults: IntArray
+    ) {
+        if (craftBridge.onRequestPermissionsResult(requestCode)) return
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
+    }
+
     companion object {
         private const val BUNDLED_APP_HOST = "appassets.androidplatform.net"
-        private const val BUNDLED_APP_URL = "https://appassets.androidplatform.net/"
+        private const val BUNDLED_APP_ORIGIN = "https://appassets.androidplatform.net"
+        private const val BUNDLED_APP_URL = "$BUNDLED_APP_ORIGIN/"
+        private const val SHORTCUT_TYPE_EXTRA = "shortcut_type"
     }
 }

package/dist/android/templates/proguard-rules.pro.template

@@ -6,4 +6,7 @@
 }
 -keep class {{PACKAGE_NAME}}.CraftBridge { *; }
 -keep class {{PACKAGE_NAME}}.CraftHealthConnect { *; }
--keep class {{PACKAGE_NAME}}.LocationRecordingService { *; }
+# libcraft.so finds this exact class and registers its private external methods
+# by their source names during JNI_OnLoad.
+-keep class com.craft.runtime.CraftNative { *; }
+-keep class com.craft.runtime.LocationRecordingService { *; }

package/dist/android/templates/test-bridges.html

@@ -307,9 +307,8 @@
 
   <!-- Voice Assistant -->
   <div class="section">
-    <h2>Siri / Google Assistant</h2>
-    <button class="btn" onclick="testRegisterSiri()">Register Shortcut</button>
-    <button class="btn" onclick="testRemoveSiri()">Remove Shortcut</button>
+    <h2>Google Assistant</h2>
+    <p>App Actions are declared statically in <code>shortcuts.xml</code>.</p>
     <div id="siri-result" class="result">Results will appear here...</div>
   </div>
 
@@ -766,6 +765,9 @@
 
     function testBadge() {
       if (!window.craft) return showResult('system-result', 'Craft not ready');
+      if (!window.craft.capabilities.appBadge) {
+        return showResult('system-result', 'App badges are unavailable on Android');
+      }
       window.craft.setBadge(5);
       setTimeout(() => window.craft.clearBadge(), 3000);
       showResult('system-result', 'Badge set to 5 (will clear in 3s)');
@@ -1255,36 +1257,11 @@
       }
     }
 
-    // Siri / Voice Assistant tests
-    async function testRegisterSiri() {
-      if (!window.craft?.siri) return showResult('siri-result', 'Siri API not available');
-      try {
-        const result = await window.craft.siri.register('Open my app', 'open_app');
-        showResult('siri-result', 'Siri shortcut registered: ' + JSON.stringify(result));
-        log('Siri shortcut registered');
-      } catch (e) {
-        showResult('siri-result', 'Error: ' + e.message);
-      }
-    }
-
-    async function testRemoveSiri() {
-      if (!window.craft?.siri) return showResult('siri-result', 'Siri API not available');
-      try {
-        const result = await window.craft.siri.remove('open_app');
-        showResult('siri-result', 'Siri shortcut removed: ' + JSON.stringify(result));
-        log('Siri shortcut removed');
-      } catch (e) {
-        showResult('siri-result', 'Error: ' + e.message);
-      }
-    }
-
-    // Listen for Siri invocations
-    if (window.craft?.siri) {
-      window.craft.siri.onInvoke((detail) => {
-        log('Siri shortcut invoked: ' + JSON.stringify(detail));
-        showResult('siri-result', 'Siri invoked: ' + JSON.stringify(detail));
-      });
-    }
+    // Listen for Google Assistant invocations declared in shortcuts.xml.
+    window.addEventListener('craftVoiceAction', (event) => {
+      log('Voice action invoked: ' + JSON.stringify(event.detail));
+      showResult('siri-result', 'Voice action invoked: ' + JSON.stringify(event.detail));
+    });
 
     // Watch Connectivity tests
     async function testWatchReachable() {

package/dist/api/index.d.ts

@@ -20,7 +20,7 @@ export type { Platform, SystemInfo, ExecOptions, ExecResult, SpawnOptions } from
 export { device, haptics, permissions, camera, biometrics, secureStorage, location, share, lifecycle, notifications, notifications as notification } from './mobile.js';
 export type { DeviceInfo, DeviceCapabilities, HapticStyle, HapticNotificationType, PermissionType, PermissionStatus, CameraOptions as MobileCameraOptions, PhotoResult, BiometricType, Location, LocationOptions, ShareOptions, AppState, NotificationOptions as MobileNotificationOptions } from './mobile.js';
 export { carplay, appClips, liveActivities, sharePlay, storeKit, appIntents, tipKit, focusFilters } from './ios-advanced.js';
-export type { CarPlayTemplateType, CarPlayListItem, CarPlayGridItem, CarPlayTemplate, AppClipInvocation, LiveActivityContentState, LiveActivityAttributes, LiveActivityConfig, SharePlaySessionState, SharePlayParticipant, SharePlayActivity, ProductType, Product, Transaction, IntentParameterType, IntentParameter, AppIntent, TipDisplayFrequency, Tip, FocusStatus, FocusFilter } from './ios-advanced.js';
+export type { CarPlayTemplateType, CarPlayListItem, CarPlayGridItem, CarPlayTemplate, AppClipInvocation, LiveActivityContentState, LiveActivityAttributes, LiveActivityConfig, LiveActivityHandle, SharePlaySessionState, SharePlayParticipant, SharePlayActivity, ProductType, Product, Transaction, IntentParameterType, IntentParameter, AppIntent, TipDisplayFrequency, Tip, FocusStatus, FocusFilter } from './ios-advanced.js';
 export { materialYou, photoPicker, workManager, foregroundService, predictiveBack, appLanguage, widgets as androidWidgets, playBilling } from './android-advanced.js';
 export type { MaterialYouColors, PhotoPickerMediaType, PhotoPickerResult, WorkConstraints, WorkRequest, WorkInfo, ForegroundServiceType, ForegroundNotification, BackEvent, WidgetSizeClass, WidgetConfig, WidgetData, PlayProduct, PlayPurchase } from './android-advanced.js';
 export { touchBar, desktopWidgets, stageManager, handoff, sidecar, spotlight, quickActions, shareExtension, windowManagement } from './macos-advanced.js';

package/dist/api/ios-advanced.d.ts

@@ -224,6 +224,11 @@ export interface LiveActivityConfig {
     /** Relevance score (0-100) */
     relevanceScore?: number;
 }
+export interface LiveActivityHandle {
+    readonly id: string;
+    update(state: LiveActivityContentState): Promise<void>;
+    end(finalState?: LiveActivityContentState): Promise<void>;
+}
 /**
  * Live Activities API for Dynamic Island and Lock Screen.
  *
@@ -236,14 +241,14 @@ export interface LiveActivityConfig {
  * })
  *
  * // Update the activity
- * await liveActivities.update(activity.id, {
+ * await activity.update({
  *   status: 'on-the-way',
  *   eta: '5 min',
  *   driverName: 'John'
  * })
  *
  * // End the activity
- * await liveActivities.end(activity.id, { status: 'delivered' })
+ * await activity.end({ status: 'delivered' })
  */
 export declare const liveActivities: {
     /**
@@ -257,9 +262,7 @@ export declare const liveActivities: {
     /**
      * Start a new Live Activity.
      */
-    start(config: LiveActivityConfig): Promise<{
-        id: string;
-    }>;
+    start(config: LiveActivityConfig): Promise<LiveActivityHandle>;
     /**
      * Update an existing Live Activity.
      */

package/dist/api/live-activity-handle.d.ts

@@ -0,0 +1,6 @@
+export interface TypedLiveActivityHandle<State> {
+    readonly id: string;
+    update(state: State): Promise<void>;
+    end(finalState?: State): Promise<void>;
+}
+export declare function createLiveActivityHandle<State>(id: string, update: (state: State) => Promise<void>, end: (finalState?: State) => Promise<void>): TypedLiveActivityHandle<State>;

package/dist/api/mobile.d.ts

@@ -550,9 +550,12 @@ export declare const share: {
     /**
      * Open native share dialog.
      *
+     * Resolves `true` when the person shared and `false` when they dismissed the
+     * dialog, on the native bridges and in the browser alike.
+     *
      * @param options - Share options
      */
-    share(options: ShareOptions): Promise<void>;
+    share(options: ShareOptions): Promise<boolean>;
     /**
      * Check if sharing is available.
      */
@@ -670,7 +673,14 @@ export declare const keepAwake: {
 };
 export declare const deepLinks: {
     getInitialURL(): Promise<string | null>;
-    onLink(callback: (url: string) => void): () => void;
+    /**
+     * The second argument says whether this is the link that launched the app.
+     * A page that also calls `getInitialURL()` after an await gets that link
+     * from both, and can skip it here when `initial` is true.
+     */
+    onLink(callback: (url: string, link: {
+        initial: boolean;
+    }) => void): () => void;
 };
 export declare function normalizeDeepLinkURL(value: unknown): string | null;
 export declare const network: {
@@ -729,13 +739,21 @@ export interface LiveActivityOptions extends LiveActivityState {
     activityId: string;
     title: string;
 }
-export declare const liveActivities: {
-    start(options: LiveActivityOptions): Promise<{
-        id: string;
-    }>;
+export interface LiveActivityHandle {
+    readonly id: string;
     update(state: LiveActivityState): Promise<void>;
+    end(finalState?: LiveActivityState): Promise<void>;
+}
+export interface LiveActivitiesApi {
+    start(options: LiveActivityOptions): Promise<LiveActivityHandle>;
+    update(id: string, state: LiveActivityState): Promise<void>;
+    /** @deprecated Pass the activity id returned by start, or use handle.update(state). */
+    update(state: LiveActivityState): Promise<void>;
+    end(id: string, finalState?: LiveActivityState): Promise<void>;
+    /** @deprecated Pass the activity id returned by start, or use handle.end(finalState). */
     end(): Promise<void>;
-};
+}
+export declare const liveActivities: LiveActivitiesApi;
 export declare const watchConnectivity: {
     send(message: Record<string, unknown>): Promise<Record<string, unknown>>;
     updateContext(context: Record<string, unknown>): Promise<void>;

package/dist/api/window.d.ts

@@ -198,6 +198,8 @@ export declare class Window {
     get isClosed(): boolean;
     private _setupEventListeners;
     private _cleanupEventListeners;
+    /** Restore a retained handle after native code has shown it again. */
+    private _markOpen;
     private _emit;
     /**
      * Register an event handler