catalyst-core 0.0.3-canary.12 → 0.0.3-canary.13

package/changelog.md

@@ -1,5 +1,22 @@
 # Changelog
 
+## [0.0.3-canary.13] - 2025-09-28
+
+-   Multi file support in useFilePicker hook
+-   Android multiple app icon support
+-   Android whitelisting toggle support
+
+## [0.0.3-canary.12] - 2025-09-26
+
+-   Universal App Context: Added comprehensive context support for building universal mobile applications
+-   OpenTelemetry SDK Integration: Built-in support for observability and performance monitoring with Otel SDK
+
+## [0.0.3-canary.11] - 2025-09-26
+
+-   Build organization: Store APKs and iOS builds organized by generation date and time for better tracking and management
+-   Enhanced Android native support: Add support for native keyboard and webview resizing in Android
+-   Device info API web support: Web support in device info API
+
 ## [0.0.3-canary.10] - 2025-09-11
 
 -   **Sentry import bug fix**

package/dist/native/androidProject/.idea/misc.xml

@@ -1,4 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK" />
+  <component name="ProjectType">
+    <option name="id" value="Android" />
+  </component>
 </project>

package/dist/native/androidProject/app/build.gradle.kts

@@ -26,8 +26,6 @@ fun getLocalIpAddress(): String {
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.jetbrains.kotlin.android)
-    alias(libs.plugins.ktlint)
-    alias(libs.plugins.detekt)
 }
 
 android {
@@ -144,18 +142,15 @@ dependencies {
     implementation("androidx.webkit:webkit:1.12.1")
     implementation("org.json:json:20231013")
     implementation("androidx.core:core-splashscreen:1.0.1")
-
+    
     // Ktor Server dependencies for FrameworkServer (~200KB total)
     implementation("io.ktor:ktor-server-core:2.3.7")
     implementation("io.ktor:ktor-server-netty:2.3.7")
     implementation("io.ktor:ktor-server-content-negotiation:2.3.7")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3")
-
+    
     // SLF4J simple logger for Ktor (optional, can be excluded if needed)
     implementation("org.slf4j:slf4j-simple:2.0.9")
-
-    // Detekt plugins for additional checks
-    detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.23.7")
 }
 
 // Task to verify local IP
@@ -325,34 +320,15 @@ tasks.register("createAppBundle") {
         println("""
             =======================================================
             App Bundle created successfully!
-
+            
             Location: ${project.buildDir}/outputs/bundle/release/app-release.aab
-
+            
             Next steps:
-            1. Test your bundle with:
+            1. Test your bundle with: 
                bundletool build-apks --bundle=app/build/outputs/bundle/release/app-release.aab --output=test.apks
-
+            
             2. Upload to Play Console: https://play.google.com/console
             =======================================================
         """.trimIndent())
     }
-}
-
-// ktlint configuration
-ktlint {
-    android.set(true)
-    ignoreFailures.set(false)
-    reporters {
-        reporter(org.jlleitschuh.gradle.ktlint.reporter.ReporterType.PLAIN)
-        reporter(org.jlleitschuh.gradle.ktlint.reporter.ReporterType.CHECKSTYLE)
-        reporter(org.jlleitschuh.gradle.ktlint.reporter.ReporterType.HTML)
-    }
-}
-
-// detekt configuration
-detekt {
-    buildUponDefaultConfig = true
-    allRules = false
-    config.setFrom("$projectDir/detekt-config.yml")
-    baseline = file("$projectDir/detekt-baseline.xml")
 }

package/dist/native/androidProject/app/src/main/java/io/yourname/androidproject/BridgeMessageValidator.kt

@@ -113,9 +113,21 @@ object BridgeMessageValidator {
             properties = mapOf(
                 "mimeType" to PropertySchema(type = "string"),
                 "multiple" to PropertySchema(type = "boolean"),
+                "minFileSize" to PropertySchema(
+                    type = "number",
+                    minimum = 0
+                ),
                 "maxFileSize" to PropertySchema(
                     type = "number",
                     minimum = 0
+                ),
+                "minFiles" to PropertySchema(
+                    type = "number",
+                    minimum = 1
+                ),
+                "maxFiles" to PropertySchema(
+                    type = "number",
+                    minimum = 1
                 )
             ),
             additionalProperties = false
@@ -408,6 +420,30 @@ object BridgeMessageValidator {
             }
         }
 
+        if (commandName == "pickFile") {
+            val minFiles = if (obj.has("minFiles") && !obj.isNull("minFiles")) obj.optInt("minFiles") else null
+            val maxFiles = if (obj.has("maxFiles") && !obj.isNull("maxFiles")) obj.optInt("maxFiles") else null
+            if (minFiles != null && maxFiles != null && minFiles > maxFiles) {
+                BridgeUtils.logError(TAG, "minFiles cannot be greater than maxFiles for pickFile command")
+                return BridgeValidationError(
+                    message = "minFiles cannot be greater than maxFiles",
+                    code = "INVALID_FILE_PICKER_OPTIONS",
+                    eventName = "ON_FILE_PICK_ERROR"
+                )
+            }
+
+            val minFileSize = if (obj.has("minFileSize") && !obj.isNull("minFileSize")) obj.optLong("minFileSize") else null
+            val maxFileSize = if (obj.has("maxFileSize") && !obj.isNull("maxFileSize")) obj.optLong("maxFileSize") else null
+            if (minFileSize != null && maxFileSize != null && minFileSize > maxFileSize) {
+                BridgeUtils.logError(TAG, "minFileSize cannot be greater than maxFileSize for pickFile command")
+                return BridgeValidationError(
+                    message = "minFileSize cannot be greater than maxFileSize",
+                    code = "INVALID_FILE_PICKER_OPTIONS",
+                    eventName = "ON_FILE_PICK_ERROR"
+                )
+            }
+        }
+
         return null
     }
 

package/dist/native/androidProject/app/src/main/java/io/yourname/androidproject/CustomWebview.kt

@@ -45,6 +45,7 @@ class CustomWebView(
     private var buildOptimisation: Boolean = false // Added property for build optimization
     private lateinit var assetLoader: WebViewAssetLoader
     private var allowedUrls: List<String> = emptyList()
+    private var accessControlEnabled: Boolean = false
 
     // Counters for asset loading statistics
     private var assetLoadAttempts = 0
@@ -88,6 +89,11 @@ class CustomWebView(
             .map { it.trim() }
             .filter { it.isNotEmpty() }
 
+        // Access control toggle
+        accessControlEnabled = properties
+            .getProperty("accessControl.enabled", "true")
+            .equals("true", ignoreCase = true)
+
         // Set initial flags based on buildOptimisation
         if (buildOptimisation) {
             isInitialApiCalled = false
@@ -103,6 +109,7 @@ class CustomWebView(
             Log.d(TAG, "Cache Pattern: $cachePatterns")
             Log.d(TAG, "API Base URL: $apiBaseUrl")
             Log.d(TAG, "Build Optimisation: $buildOptimisation")
+            Log.d(TAG, "Access Control Enabled: $accessControlEnabled")
             Log.d(TAG, "Allowed URLs: $allowedUrls")
             Log.d(TAG, "Initial API Called: $isInitialApiCalled")
             Log.d(TAG, "Initial Page Loaded: $isInitialPageLoaded")
@@ -250,7 +257,69 @@ class CustomWebView(
         return shouldCache
     }
 
+    /**
+     * Handle special URL schemes (tel:, mailto:, sms:)
+     */
+    private fun handleSpecialScheme(url: String): Boolean {
+        val uri = Uri.parse(url)
+        val scheme = uri.scheme?.lowercase() ?: return false
+
+        // Only handle tel, mailto, sms
+        if (scheme !in listOf("tel", "mailto", "sms")) {
+            return false
+        }
+
+        try {
+            val intent = when (scheme) {
+                "tel" -> Intent(Intent.ACTION_DIAL, uri)
+                "mailto" -> Intent(Intent.ACTION_SENDTO, uri)
+                "sms" -> Intent(Intent.ACTION_VIEW, uri)
+                else -> return false
+            }
 
+            // For mailto, check if any apps can handle it before showing chooser
+            if (scheme == "mailto") {
+                val packageManager = context.packageManager
+                val activities = packageManager.queryIntentActivities(intent, 0)
+                
+                if (activities.isNotEmpty()) {
+                    // Apps available - show chooser
+                    val chooser = Intent.createChooser(intent, "Send email")
+                    chooser.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                    context.startActivity(chooser)
+                } else {
+                    // No email apps - try Gmail app, then browser
+                    try {
+                        val gmailIntent = Intent(Intent.ACTION_SENDTO, uri).apply {
+                            setPackage("com.google.android.gm")
+                            addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                        }
+                        context.startActivity(gmailIntent)
+                        if (BuildConfig.DEBUG) {
+                            Log.d(TAG, "Opened Gmail app")
+                        }
+                    } catch (e: android.content.ActivityNotFoundException) {
+                        // Gmail app not available, open in browser
+                        openInInAppBrowser("https://mail.google.com")
+                        if (BuildConfig.DEBUG) {
+                            Log.d(TAG, "Opened Gmail in browser")
+                        }
+                    }
+                }
+            } else {
+                context.startActivity(intent)
+            }
+            return true
+        } catch (e: android.content.ActivityNotFoundException) {
+            if (BuildConfig.DEBUG) {
+                Log.d(TAG, "No app to handle $scheme")
+            }
+            return true
+        } catch (e: Exception) {
+            Log.e(TAG, "Error handling $scheme: ${e.message}")
+            return true
+        }
+    }
 
     private fun openInInAppBrowser(url: String) {
         try {
@@ -341,7 +410,7 @@ class CustomWebView(
                     }
 
                     // Check if URL is allowed
-                    if (!isUrlAllowed(url, allowedUrls)) {
+                    if (accessControlEnabled && !isUrlAllowed(url, allowedUrls)) {
                         if (BuildConfig.DEBUG) {
                             Log.w(TAG, "🙫 SERVICE_WORKER: Request blocked by access control: $url")
                         }
@@ -477,6 +546,14 @@ class CustomWebView(
                 request?.url?.let { url ->
                     val urlString = url.toString()
 
+                    // Handle special URL schemes (tel:, mailto:, sms:) HERE to prevent page loading
+                    if (handleSpecialScheme(urlString)) {
+                        if (BuildConfig.DEBUG) {
+                            Log.d(TAG, "📞 Special scheme handled in shouldOverrideUrlLoading: $urlString")
+                        }
+                        return true // Prevent WebView from trying to load the URL
+                    }
+
                     // Check if URL is an external domain
                     if (url.scheme in listOf("http", "https") && isExternalDomain(urlString, allowedUrls)) {
                         if (BuildConfig.DEBUG) {
@@ -487,7 +564,7 @@ class CustomWebView(
                     }
 
                     // Check if URL is allowed for internal navigation
-                    if (!isUrlAllowed(urlString, allowedUrls)) {
+                    if (accessControlEnabled && !isUrlAllowed(urlString, allowedUrls)) {
                         if (BuildConfig.DEBUG) {
                             Log.w(TAG, "🚫 URL blocked by access control: $urlString")
                         }
@@ -519,17 +596,21 @@ class CustomWebView(
                     Log.d(TAG, "🔄 INTERCEPT: isInitialPageLoaded: $isInitialPageLoaded")
                 }
 
-                if (!isUrlAllowed(url, allowedUrls)) {
-                    if (BuildConfig.DEBUG) {
-                        Log.w(TAG, "🚫 STEP_1_FAIL: Network request blocked by access control: $url")
-                        Log.w(TAG, "🚫 STEP_1_FAIL: Allowed URLs: $allowedUrls")
-                    }
-                    // Return an empty response to block the request
-                    return WebResourceResponse("text/plain", "utf-8", null)
-                } else {
-                    if (BuildConfig.DEBUG) {
-                        Log.d(TAG, "✅ STEP_1_PASS: URL allowed by access control: $url")
+                if (accessControlEnabled) {
+                    if (!isUrlAllowed(url, allowedUrls)) {
+                        if (BuildConfig.DEBUG) {
+                            Log.w(TAG, "🚫 STEP_1_FAIL: Network request blocked by access control: $url")
+                            Log.w(TAG, "🚫 STEP_1_FAIL: Allowed URLs: $allowedUrls")
+                        }
+                        // Return an empty response to block the request
+                        return WebResourceResponse("text/plain", "utf-8", null)
+                    } else {
+                        if (BuildConfig.DEBUG) {
+                            Log.d(TAG, "✅ STEP_1_PASS: URL allowed by access control: $url")
+                        }
                     }
+                } else if (BuildConfig.DEBUG) {
+                    Log.d(TAG, "⚙️ STEP_1_SKIP: Access control disabled, allowing URL: $url")
                 }
 
                 // Handle the initial route request - intercept first request regardless of host
@@ -863,4 +944,4 @@ class CustomWebView(
         // Only enable WebView debugging in debug builds
         WebView.setWebContentsDebuggingEnabled(BuildConfig.DEBUG)
     }
-}
+}