From 9dace486bb195dba72fb4449067f8363f9454deb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?He=CC=81ctor=20Abraham?=
 <hector.abraham.morillo.prieto@automattic.com>
Date: Wed, 20 Aug 2025 10:39:36 +0200
Subject: [PATCH] Use Android App link for redirect URI

---
 .configure                              |   2 +-
 .configure-files/secrets.properties.enc | Bin 416 -> 416 bytes
 loginUi/build.gradle.kts                |  10 ++++++----
 loginUi/src/main/AndroidManifest.xml    |   3 ++-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.configure b/.configure
index 626e2924..9d88eb2d 100644
--- a/.configure
+++ b/.configure
@@ -1,7 +1,7 @@
 {
   "project_name": "Gravatar-Android",
   "branch": "trunk",
-  "pinned_hash": "3c8238c6aa7b0098bd4ccf24e0a7b6178e3ee2a7",
+  "pinned_hash": "ef6f012d234d67a5d9bca642ede2c37be9436ff2",
   "files_to_copy": [
     {
       "file": "android/Gravatar-Android/secrets.properties",
diff --git a/.configure-files/secrets.properties.enc b/.configure-files/secrets.properties.enc
index 0b858af603fd5ed1013effafed2e9caf5a5780f7..28aff7ae742757b845f213de519a02fe50946c62 100644
GIT binary patch
delta 297
zcmV+^0oMMY1E2$tfPbcxclhXK2~!DwfKZ~-hci&g83#~KUkTB<;Au7%TS(f#xrD3}
z7wNGW6{8e|$H25ejicAl>!1pGTPU|XOBeV}YEX)M(~bfR9KipYK{J&l{``;cei=9R
zk)7|GVVx3u4>*nQp{;iI(oLtSr?Mlm#v9<%lFW*-tqFl2mw)K8Zy?Gk({a3q)v=>o
zi#>L-NqL@fxfywe1x)lY`RaYG+it#qL-u%NR@n{Z3}yIc#`0^AsR?~|Nu!Z+%h6v;
z)pnAKf_M(!YBt5<V9pe7Ge=gz_NWN4gXq<k52uY{2rzY9yW6c^9Kr$t1LVX?IYC2E
vgqk%{PiNuq%OW)?zJO<-3lc!bS-%i&Xdd>B$<%9`xZVYv13VPqHY&?C+YORf

delta 297
zcmV+^0oMMY1E2$tfPepY6@;s(JrYCZ4E|=P>n>o>J#J>;UTJX5&=(y97i;Gwt9J<4
zPcTJmu23WMNox=Zi6~&#gn;+Y`ke4-J6hZK*3*lSCe+t8Cv!f{HsZkmZZX%OR85Vf
zZFU}Nc1Y$p8Zy*OsTLGO^f?^a#gVOwJP0u@;9%{)Pe>I)zJEce?rInKYjj+Fk~Ixf
zqm%l0)CeGjMm9YwZht0b_dJQr#nme-v2<w#)mIlLw^eFeAO)Z=>La3Ci{G26le-t&
zz{Ab#2<;^H6w`_77}6F69(x^@y9oc|-OCZSw2SdLD?#%rq1QnGM|e29`a{)*Pq7zm
vU;2X5rJ+0mcp^b6<-z_iFGmMhA*o^X1Iq%T^JbRUBo;&Q)yXK28~QbH6N8K}

diff --git a/loginUi/build.gradle.kts b/loginUi/build.gradle.kts
index 41748bfc..98b74344 100644
--- a/loginUi/build.gradle.kts
+++ b/loginUi/build.gradle.kts
@@ -1,3 +1,4 @@
+import java.net.URI
 import java.util.Properties
 
 plugins {
@@ -31,10 +32,11 @@ android {
                 "OAUTH_CLIENT_SECRET",
                 "\"${properties["oauth.clientSecret"]?.toString() ?: ""}\"",
             )
-            manifestPlaceholders["OAUTH_REDIRECT_URI_HOST"] =
-                properties["oauth.redirectUri"]?.toString()?.split("://")?.get(1) ?: ""
-            manifestPlaceholders["OAUTH_REDIRECT_URI_SCHEME"] =
-                properties["oauth.redirectUri"]?.toString()?.split("://")?.first() ?: ""
+
+            val redirectUri = properties["oauth.redirectUri"]?.let { URI(it.toString()) }
+            manifestPlaceholders["OAUTH_REDIRECT_URI_PATH"] = redirectUri?.path.orEmpty()
+            manifestPlaceholders["OAUTH_REDIRECT_URI_HOST"] = redirectUri?.host.orEmpty()
+            manifestPlaceholders["OAUTH_REDIRECT_URI_SCHEME"] = redirectUri?.scheme.orEmpty()
         }
     }
 }
diff --git a/loginUi/src/main/AndroidManifest.xml b/loginUi/src/main/AndroidManifest.xml
index 4be7ab86..80656c10 100644
--- a/loginUi/src/main/AndroidManifest.xml
+++ b/loginUi/src/main/AndroidManifest.xml
@@ -7,13 +7,14 @@
             android:launchMode="singleTask"
             android:theme="@style/GravatarOAuth">
 
-            <intent-filter>
+            <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:path="${OAUTH_REDIRECT_URI_PATH}"
                     android:host="${OAUTH_REDIRECT_URI_HOST}"
                     android:scheme="${OAUTH_REDIRECT_URI_SCHEME}" />
             </intent-filter>