fix(mobile): deeplinks

plugins/deep-link/Cargo.toml

@@ -27,6 +27,9 @@ serde_json = { workspace = true }
 tauri-utils = { workspace = true }
 tauri-plugin = { workspace = true, features = ["build"] }
 
+[target."cfg(target_os = \"macos\")".build-dependencies]
+plist = "1"
+
 [dependencies]
 serde = { workspace = true }
 serde_json = { workspace = true }

plugins/deep-link/build.rs

@@ -10,50 +10,64 @@ const COMMANDS: &[&str] = &["get_current", "register", "unregister", "is_registe
 
 // TODO: Consider using activity-alias in case users may have multiple activities in their app.
 fn intent_filter(domain: &AssociatedDomain) -> String {
+    let host = domain
+        .host
+        .as_ref()
+        .map(|h| format!(r#"<data android:host="{h}" />"#))
+        .unwrap_or_default();
+
+    let auto_verify = if domain.is_app_link() {
+        r#"android:autoVerify="true" "#.to_string()
+    } else {
+        String::new()
+    };
+
     format!(
-        r#"<intent-filter android:autoVerify="true">
+        r#"<intent-filter {auto_verify}>
     <action android:name="android.intent.action.VIEW" />
     <category android:name="android.intent.category.DEFAULT" />
     <category android:name="android.intent.category.BROWSABLE" />
-    {}
-    <data android:host="{}" />
-    {}
-    {}
-    {}
-    {}
+    {schemes}
+    {host}
+    {domains}
+    {path_patterns}
+    {path_prefixes}
+    {path_suffixes}
 </intent-filter>"#,
-        domain
+        schemes = domain
             .scheme
             .iter()
             .map(|scheme| format!(r#"<data android:scheme="{scheme}" />"#))
             .collect::<Vec<_>>()
             .join("\n    "),
-        domain.host,
-        domain
+        host = host,
+        domains = domain
             .path
             .iter()
             .map(|path| format!(r#"<data android:path="{path}" />"#))
             .collect::<Vec<_>>()
             .join("\n    "),
-        domain
+        path_patterns = domain
             .path_pattern
             .iter()
             .map(|pattern| format!(r#"<data android:pathPattern="{pattern}" />"#))
             .collect::<Vec<_>>()
             .join("\n    "),
-        domain
+        path_prefixes = domain
             .path_prefix
             .iter()
             .map(|prefix| format!(r#"<data android:pathPrefix="{prefix}" />"#))
             .collect::<Vec<_>>()
             .join("\n    "),
-        domain
+        path_suffixes = domain
             .path_suffix
             .iter()
             .map(|suffix| format!(r#"<data android:pathSuffix="{suffix}" />"#))
             .collect::<Vec<_>>()
             .join("\n    "),
     )
+    .trim()
+    .to_string()
 }
 
 fn main() {
@@ -68,6 +82,16 @@ fn main() {
     }
 
     if let Some(config) = tauri_plugin::plugin_config::<Config>("deep-link") {
+        let errors: Vec<String> = config
+            .mobile
+            .iter()
+            .filter_map(|d| d.validate().err())
+            .collect();
+
+        if !errors.is_empty() {
+            panic!("Deep link config validation failed:\n{}", errors.join("\n"));
+        }
+
         tauri_plugin::mobile::update_android_manifest(
             "DEEP LINK PLUGIN",
             "activity",
@@ -80,20 +104,89 @@ fn main() {
         )
         .expect("failed to rewrite AndroidManifest.xml");
 
-        #[cfg(target_os = "macos")]
+        #[cfg(any(target_os = "macos", target_os = "ios"))]
         {
-            tauri_plugin::mobile::update_entitlements(|entitlements| {
-                entitlements.insert(
-                    "com.apple.developer.associated-domains".into(),
-                    config
-                        .mobile
-                        .into_iter()
-                        .map(|d| format!("applinks:{}", d.host).into())
-                        .collect::<Vec<_>>()
-                        .into(),
-                );
-            })
-            .expect("failed to update entitlements");
+            // we need to ensure that the entitlements are only
+            // generated for explicit app links and not
+            // other deep links because then they
+            // are just going to complain and not be built or signed
+            let has_app_links = config.mobile.iter().any(|d| d.is_app_link());
+
+            if !has_app_links {
+                tauri_plugin::mobile::update_entitlements(|entitlements| {
+                    entitlements.remove("com.apple.developer.associated-domains");
+                })
+                .expect("failed to update entitlements");
+            } else {
+                tauri_plugin::mobile::update_entitlements(|entitlements| {
+                    entitlements.insert(
+                        "com.apple.developer.associated-domains".into(),
+                        config
+                            .mobile
+                            .iter()
+                            .filter(|d| d.is_app_link())
+                            .filter_map(|d| d.host.as_ref())
+                            .map(|host| format!("applinks:{}", host).into())
+                            .collect::<Vec<_>>()
+                            .into(),
+                    );
+                })
+                .expect("failed to update entitlements");
+            }
+
+            let deep_link_domains = config
+                .mobile
+                .iter()
+                .filter_map(|domain| {
+                    if domain.is_app_link() {
+                        return None;
+                    }
+
+                    Some(domain)
+                })
+                .collect::<Vec<_>>();
+
+            if deep_link_domains.is_empty() {
+                tauri_plugin::mobile::update_info_plist(|info_plist| {
+                    info_plist.remove("CFBundleURLTypes");
+                })
+                .expect("failed to update Info.plist");
+            } else {
+                tauri_plugin::mobile::update_info_plist(|info_plist| {
+                    info_plist.insert(
+                        "CFBundleURLTypes".into(),
+                        deep_link_domains
+                            .iter()
+                            .map(|domain| {
+                                let schemes = domain
+                                    .scheme
+                                    .iter()
+                                    .filter(|scheme| {
+                                        scheme.as_str() != "https" && scheme.as_str() != "http"
+                                    })
+                                    .collect::<Vec<_>>();
+
+                                let mut dict = plist::Dictionary::new();
+                                dict.insert(
+                                    "CFBundleURLSchemes".into(),
+                                    schemes
+                                        .iter()
+                                        .map(|s| s.to_string().into())
+                                        .collect::<Vec<_>>()
+                                        .into(),
+                                );
+                                dict.insert(
+                                    "CFBundleURLName".into(),
+                                    format!("{}", domain.scheme[0]).into(),
+                                );
+                                plist::Value::Dictionary(dict)
+                            })
+                            .collect::<Vec<_>>()
+                            .into(),
+                    );
+                })
+                .expect("failed to update Info.plist");
+            }
         }
     }
 }

plugins/deep-link/examples/app/package.json

@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "@tauri-apps/api": "2.8.0",
-    "@tauri-apps/plugin-deep-link": "2.4.1"
+    "@tauri-apps/plugin-deep-link": "link:../.."
   },
   "devDependencies": {
     "@tauri-apps/cli": "2.8.0",

plugins/deep-link/examples/app/src-tauri/gen/android/app/build.gradle.kts

@@ -14,13 +14,13 @@ val tauriProperties = Properties().apply {
 }
 
 android {
-    compileSdk = 34
+    compileSdk = 36
     namespace = "com.tauri.deep_link_example"
     defaultConfig {
         manifestPlaceholders["usesCleartextTraffic"] = "false"
         applicationId = "com.tauri.deep_link_example"
         minSdk = 24
-        targetSdk = 34
+        targetSdk = 36
         versionCode = tauriProperties.getProperty("tauri.android.versionCode", "1").toInt()
         versionName = tauriProperties.getProperty("tauri.android.versionName", "1.0")
     }
@@ -58,9 +58,10 @@ rust {
 }
 
 dependencies {
-    implementation("androidx.webkit:webkit:1.6.1")
-    implementation("androidx.appcompat:appcompat:1.6.1")
-    implementation("com.google.android.material:material:1.8.0")
+    implementation("androidx.webkit:webkit:1.14.0")
+    implementation("androidx.appcompat:appcompat:1.7.1")
+    implementation("androidx.activity:activity-ktx:1.10.1")
+    implementation("com.google.android.material:material:1.12.0")
     testImplementation("junit:junit:4.13.2")
     androidTestImplementation("androidx.test.ext:junit:1.1.4")
     androidTestImplementation("androidx.test.espresso:espresso-core:3.5.0")

plugins/deep-link/examples/app/src-tauri/gen/android/app/src/main/AndroidManifest.xml

@@ -23,23 +23,40 @@
                 <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
             </intent-filter>
             <!-- DEEP LINK PLUGIN. AUTO-GENERATED. DO NOT REMOVE. -->
-            <intent-filter android:autoVerify="true">
+            <intent-filter android:autoVerify="true" >
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="http" />
                 <data android:scheme="https" />
+                <data android:scheme="http" />
                 <data android:host="fabianlars.de" />
+
+
                 <data android:pathPrefix="/intent" />
+
             </intent-filter>
-            <intent-filter android:autoVerify="true">
+            <intent-filter android:autoVerify="true" >
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="http" />
                 <data android:scheme="https" />
+                <data android:scheme="http" />
                 <data android:host="tauri.app" />
 
+
+
+
+            </intent-filter>
+            <intent-filter >
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="taurideeplink" />
+
+
+
+
+
             </intent-filter>
             <!-- DEEP LINK PLUGIN. AUTO-GENERATED. DO NOT REMOVE. -->
         </activity>

plugins/deep-link/examples/app/src-tauri/gen/android/app/src/main/java/com/tauri/deep_link_example/MainActivity.kt

@@ -1,7 +1,11 @@
-// Copyright 2019-2023 Tauri Programme within The Commons Conservancy
-// SPDX-License-Identifier: Apache-2.0
-// SPDX-License-Identifier: MIT
-
 package com.tauri.deep_link_example
 
-class MainActivity : TauriActivity()
+import android.os.Bundle
+import androidx.activity.enableEdgeToEdge
+
+class MainActivity : TauriActivity() {
+  override fun onCreate(savedInstanceState: Bundle?) {
+    enableEdgeToEdge()
+    super.onCreate(savedInstanceState)
+  }
+}

plugins/deep-link/examples/app/src-tauri/gen/android/build.gradle.kts

@@ -4,7 +4,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:8.5.1")
+        classpath("com.android.tools.build:gradle:8.11.0")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.25")
     }
 }

plugins/deep-link/examples/app/src-tauri/gen/android/buildSrc/build.gradle.kts

@@ -18,6 +18,6 @@ repositories {
 
 dependencies {
     compileOnly(gradleApi())
-    implementation("com.android.tools.build:gradle:8.5.1")
+    implementation("com.android.tools.build:gradle:8.11.0")
 }
 

plugins/deep-link/examples/app/src-tauri/gen/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Tue May 10 19:22:52 CST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME