From 168fb6cbafd689d534283245e0a6d884f4660a2a Mon Sep 17 00:00:00 2001
From: Tony Giorgio <101225832+TonyGiorgio@users.noreply.github.com>
Date: Tue, 2 Dec 2025 11:46:15 -0600
Subject: [PATCH 1/2] fix(ci): update Java 17->21 and NDK r25c->r27c to match
 local environment

Local environment uses Java 21 and NDK 29, while CI was using Java 17
and NDK r25c (25). This mismatch may cause different runtime behavior
in the compiled Android native code.

Co-authored-by: factory-droid[bot] <138933559+factory-droid[bot]@users.noreply.github.com>
---
 .github/workflows/android-build.yml | 4 ++--
 .github/workflows/release.yml       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/android-build.yml b/.github/workflows/android-build.yml
index ee13d618b..f53075e0b 100644
--- a/.github/workflows/android-build.yml
+++ b/.github/workflows/android-build.yml
@@ -16,7 +16,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '21'
 
       - name: Setup Android SDK
         uses: android-actions/setup-android@v3
@@ -45,7 +45,7 @@ jobs:
         uses: nttld/setup-ndk@v1
         id: setup-ndk
         with:
-          ndk-version: r25c
+          ndk-version: r27c
           add-to-path: true
 
       - name: Cache Gradle
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index af9817880..246e65b3c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -140,7 +140,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '21'
 
       - name: Setup Android SDK
         uses: android-actions/setup-android@v3
@@ -169,7 +169,7 @@ jobs:
         uses: nttld/setup-ndk@v1
         id: setup-ndk
         with:
-          ndk-version: r25c
+          ndk-version: r27c
           add-to-path: true
 
       - name: Cache Gradle

From 9e6a5a2e8ea56d0f9bc97a0aa8cc74636e178fee Mon Sep 17 00:00:00 2001
From: Tony Giorgio <101225832+TonyGiorgio@users.noreply.github.com>
Date: Tue, 2 Dec 2025 12:31:59 -0600
Subject: [PATCH 2/2] fix(android): specify deep-link pathPrefix to prevent
 OAuth URL interception

The deep-link plugin was generating a generic intent filter for trymaple.ai
without path restrictions. This caused Android to intercept OAuth URLs like
/desktop-auth and handle them as deep links instead of opening Chrome.

Fix: Explicitly specify pathPrefix for only the paths we want to handle
(/payment-success, /payment-canceled, /pricing), so /desktop-auth opens
in the browser correctly.

Co-authored-by: factory-droid[bot] <138933559+factory-droid[bot]@users.noreply.github.com>
---
 frontend/src-tauri/tauri.conf.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/frontend/src-tauri/tauri.conf.json b/frontend/src-tauri/tauri.conf.json
index 8d816ecab..eabb503b0 100644
--- a/frontend/src-tauri/tauri.conf.json
+++ b/frontend/src-tauri/tauri.conf.json
@@ -28,7 +28,10 @@
           "appLink": false
         },
         {
-          "host": "trymaple.ai"
+          "scheme": ["https"],
+          "host": "trymaple.ai",
+          "pathPrefix": ["/payment-success", "/payment-canceled", "/pricing"],
+          "appLink": true
         }
       ]
     }