@craft-native/android 0.0.90 → 0.0.92

package/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/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/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/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/templates/CraftBridgeExtensions.kt.template

@@ -1,383 +0,0 @@
-package {{PACKAGE_NAME}}
-
-import android.app.Activity
-import android.content.Context
-import androidx.compose.foundation.layout.*
-import androidx.compose.material3.*
-import androidx.compose.runtime.*
-import androidx.compose.ui.Modifier
-import androidx.work.*
-import com.google.android.material.color.DynamicColors
-import com.google.firebase.analytics.FirebaseAnalytics
-import com.google.firebase.crashlytics.FirebaseCrashlytics
-import com.google.firebase.messaging.FirebaseMessaging
-import com.google.firebase.remoteconfig.FirebaseRemoteConfig
-import java.util.concurrent.TimeUnit
-
-/// Android 13+ Advanced Features
-
-// MARK: - Jetpack Compose Integration
-
-@Composable
-fun CraftComposeApp(content: @Composable () -> Unit) {
-    MaterialTheme(
-        colorScheme = dynamicColorScheme(),
-        typography = Typography(),
-        content = content
-    )
-}
-
-@Composable
-fun dynamicColorScheme(): ColorScheme {
-    return if (DynamicColors.isDynamicColorAvailable()) {
-        dynamicDarkColorScheme()
-    } else {
-        darkColorScheme()
-    }
-}
-
-@Composable
-fun CraftWebViewComposable(
-    url: String,
-    modifier: Modifier = Modifier
-) {
-    AndroidView(
-        factory = { context ->
-            android.webkit.WebView(context).apply {
-                settings.javaScriptEnabled = true
-                loadUrl(url)
-            }
-        },
-        modifier = modifier.fillMaxSize()
-    )
-}
-
-// MARK: - Material You Dynamic Colors
-
-class DynamicColorManager(private val activity: Activity) {
-
-    fun applyDynamicColors() {
-        if (DynamicColors.isDynamicColorAvailable()) {
-            DynamicColors.applyToActivityIfAvailable(activity)
-        }
-    }
-
-    fun isDynamicColorAvailable(): Boolean {
-        return DynamicColors.isDynamicColorAvailable()
-    }
-}
-
-// MARK: - Predictive Back Gesture (Android 13+)
-
-class PredictiveBackHandler(private val activity: Activity) {
-
-    fun enablePredictiveBack() {
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.TIRAMISU) {
-            activity.onBackPressedDispatcher.addCallback(activity, object : androidx.activity.OnBackPressedCallback(true) {
-                override fun handleOnBackPressed() {
-                    // Handle predictive back gesture
-                    // Can animate the exit transition
-                    isEnabled = false
-                    activity.onBackPressedDispatcher.onBackPressed()
-                }
-            })
-        }
-    }
-}
-
-// MARK: - Per-App Language Preferences (Android 13+)
-
-class LanguageManager(private val context: Context) {
-
-    fun setAppLanguage(languageCode: String) {
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.TIRAMISU) {
-            val localeList = android.os.LocaleList(java.util.Locale.forLanguageTag(languageCode))
-            context.getSystemService(android.app.LocaleManager::class.java)
-                ?.applicationLocales = localeList
-        }
-    }
-
-    fun getAppLanguage(): String? {
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.TIRAMISU) {
-            val locales = context.getSystemService(android.app.LocaleManager::class.java)
-                ?.applicationLocales
-            return locales?.get(0)?.toLanguageTag()
-        }
-        return null
-    }
-}
-
-// MARK: - Photo Picker (Android 13+)
-
-class PhotoPickerManager(private val activity: Activity) {
-
-    fun launchPhotoPicker(maxItems: Int = 1, callback: (List<android.net.Uri>) -> Unit) {
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.TIRAMISU) {
-            val intent = android.content.Intent(android.provider.MediaStore.ACTION_PICK_IMAGES).apply {
-                putExtra(android.provider.MediaStore.EXTRA_PICK_IMAGES_MAX, maxItems)
-            }
-            // Launch intent and handle result
-        }
-    }
-}
-
-// MARK: - Notification Permission (Android 13+)
-
-class NotificationPermissionManager(private val activity: Activity) {
-
-    fun requestNotificationPermission(callback: (Boolean) -> Unit) {
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.TIRAMISU) {
-            if (androidx.core.app.ActivityCompat.checkSelfPermission(
-                    activity,
-                    android.Manifest.permission.POST_NOTIFICATIONS
-                ) != android.content.pm.PackageManager.PERMISSION_GRANTED
-            ) {
-                androidx.core.app.ActivityCompat.requestPermissions(
-                    activity,
-                    arrayOf(android.Manifest.permission.POST_NOTIFICATIONS),
-                    100
-                )
-            } else {
-                callback(true)
-            }
-        } else {
-            callback(true)
-        }
-    }
-
-    fun hasNotificationPermission(): Boolean {
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.TIRAMISU) {
-            return androidx.core.app.ActivityCompat.checkSelfPermission(
-                activity,
-                android.Manifest.permission.POST_NOTIFICATIONS
-            ) == android.content.pm.PackageManager.PERMISSION_GRANTED
-        }
-        return true
-    }
-}
-
-// MARK: - Foreground Services
-
-class ForegroundServiceManager(private val context: Context) {
-
-    fun startForegroundService(
-        serviceClass: Class<*>,
-        notificationTitle: String,
-        notificationText: String
-    ) {
-        val intent = android.content.Intent(context, serviceClass)
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
-            context.startForegroundService(intent)
-        } else {
-            context.startService(intent)
-        }
-    }
-
-    fun stopForegroundService(serviceClass: Class<*>) {
-        val intent = android.content.Intent(context, serviceClass)
-        context.stopService(intent)
-    }
-}
-
-// MARK: - WorkManager for Background Tasks
-
-class BackgroundTaskManager(private val context: Context) {
-
-    fun scheduleOneTimeWork(
-        tag: String,
-        initialDelay: Long = 0,
-        requiresCharging: Boolean = false,
-        requiresWifi: Boolean = false
-    ) {
-        val constraints = Constraints.Builder()
-            .setRequiresCharging(requiresCharging)
-            .setRequiredNetworkType(if (requiresWifi) NetworkType.UNMETERED else NetworkType.CONNECTED)
-            .build()
-
-        val workRequest = OneTimeWorkRequestBuilder<CraftWorker>()
-            .setConstraints(constraints)
-            .setInitialDelay(initialDelay, TimeUnit.MILLISECONDS)
-            .addTag(tag)
-            .build()
-
-        WorkManager.getInstance(context).enqueue(workRequest)
-    }
-
-    fun schedulePeriodicWork(
-        tag: String,
-        intervalMinutes: Long,
-        requiresCharging: Boolean = false
-    ) {
-        val constraints = Constraints.Builder()
-            .setRequiresCharging(requiresCharging)
-            .build()
-
-        val workRequest = PeriodicWorkRequestBuilder<CraftWorker>(
-            intervalMinutes, TimeUnit.MINUTES
-        )
-            .setConstraints(constraints)
-            .addTag(tag)
-            .build()
-
-        WorkManager.getInstance(context).enqueue(workRequest)
-    }
-
-    fun cancelWork(tag: String) {
-        WorkManager.getInstance(context).cancelAllWorkByTag(tag)
-    }
-
-    class CraftWorker(context: Context, params: WorkerParameters) : Worker(context, params) {
-        override fun doWork(): Result {
-            // Perform background task
-            return Result.success()
-        }
-    }
-}
-
-// MARK: - Firebase Integration
-
-class FirebaseManager(private val context: Context) {
-
-    private val analytics: FirebaseAnalytics by lazy {
-        FirebaseAnalytics.getInstance(context)
-    }
-
-    private val crashlytics: FirebaseCrashlytics by lazy {
-        FirebaseCrashlytics.getInstance()
-    }
-
-    private val remoteConfig: FirebaseRemoteConfig by lazy {
-        FirebaseRemoteConfig.getInstance()
-    }
-
-    // Analytics
-    fun logEvent(eventName: String, params: Map<String, Any>) {
-        val bundle = android.os.Bundle().apply {
-            params.forEach { (key, value) ->
-                when (value) {
-                    is String -> putString(key, value)
-                    is Int -> putInt(key, value)
-                    is Long -> putLong(key, value)
-                    is Double -> putDouble(key, value)
-                    is Boolean -> putBoolean(key, value)
-                }
-            }
-        }
-        analytics.logEvent(eventName, bundle)
-    }
-
-    fun setUserProperty(name: String, value: String) {
-        analytics.setUserProperty(name, value)
-    }
-
-    // Crashlytics
-    fun logCrash(message: String) {
-        crashlytics.log(message)
-    }
-
-    fun recordException(throwable: Throwable) {
-        crashlytics.recordException(throwable)
-    }
-
-    fun setUserId(userId: String) {
-        crashlytics.setUserId(userId)
-    }
-
-    // Remote Config
-    fun fetchRemoteConfig(callback: (Boolean) -> Unit) {
-        remoteConfig.fetchAndActivate()
-            .addOnCompleteListener { task ->
-                callback(task.isSuccessful)
-            }
-    }
-
-    fun getString(key: String): String {
-        return remoteConfig.getString(key)
-    }
-
-    fun getBoolean(key: String): Boolean {
-        return remoteConfig.getBoolean(key)
-    }
-
-    fun getLong(key: String): Long {
-        return remoteConfig.getLong(key)
-    }
-
-    // FCM
-    fun getFirebaseToken(callback: (String?) -> Unit) {
-        FirebaseMessaging.getInstance().token
-            .addOnCompleteListener { task ->
-                if (task.isSuccessful) {
-                    callback(task.result)
-                } else {
-                    callback(null)
-                }
-            }
-    }
-
-    fun subscribeToTopic(topic: String) {
-        FirebaseMessaging.getInstance().subscribeToTopic(topic)
-    }
-
-    fun unsubscribeFromTopic(topic: String) {
-        FirebaseMessaging.getInstance().unsubscribeFromTopic(topic)
-    }
-}
-
-// MARK: - Bottom Sheet
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun CraftBottomSheet(
-    sheetContent: @Composable ColumnScope.() -> Unit,
-    content: @Composable () -> Unit
-) {
-    val sheetState = rememberModalBottomSheetState()
-    var showBottomSheet by remember { mutableStateOf(false) }
-
-    if (showBottomSheet) {
-        ModalBottomSheet(
-            onDismissRequest = { showBottomSheet = false },
-            sheetState = sheetState
-        ) {
-            sheetContent()
-        }
-    }
-
-    content()
-}
-
-// MARK: - Navigation Drawer
-
-@Composable
-fun CraftNavigationDrawer(
-    drawerContent: @Composable ColumnScope.() -> Unit,
-    content: @Composable () -> Unit
-) {
-    val drawerState = rememberDrawerState(DrawerValue.Closed)
-    val scope = rememberCoroutineScope()
-
-    ModalNavigationDrawer(
-        drawerState = drawerState,
-        drawerContent = {
-            ModalDrawerSheet {
-                drawerContent()
-            }
-        }
-    ) {
-        content()
-    }
-}
-
-// MARK: - Bridge Integration
-
-fun CraftBridge.initializeAdvancedFeatures() {
-    // Initialize all advanced Android features
-    DynamicColorManager(activity).applyDynamicColors()
-    PredictiveBackHandler(activity).enablePredictiveBack()
-}
-
-fun CraftBridge.setupFirebase() {
-    // Setup Firebase services
-    // Called from MainActivity onCreate
-}