From 891edcc0a354e55fd96e84bea93741a78f5c3dde Mon Sep 17 00:00:00 2001
From: Pieter Vander Vennet <pietervdvn@posteo.net>
Date: Tue, 21 Jan 2025 21:07:25 +0100
Subject: [PATCH] Fix login with custom protocol

---
 app/src/main/AndroidManifest.xml                    | 7 +++++++
 app/src/main/java/org/mapcomplete/MainActivity.java | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0412042c..7d899e75 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -35,6 +35,13 @@
                 <data android:host="app.mapcomplete.org" />
                 <data android:path="/passthrough.html" />
             </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="orgmapcomplete" />
+                <data android:path="/passthrough.html" />
+            </intent-filter>
         </activity>
 
         <provider
diff --git a/app/src/main/java/org/mapcomplete/MainActivity.java b/app/src/main/java/org/mapcomplete/MainActivity.java
index 4275f99f..dcbd98c1 100644
--- a/app/src/main/java/org/mapcomplete/MainActivity.java
+++ b/app/src/main/java/org/mapcomplete/MainActivity.java
@@ -87,7 +87,8 @@ public class MainActivity extends BridgeActivity {
             return;
         }
 
-        if (Objects.equals(url.getPath(), "/passthrough.html")) {
+        System.out.println("urlPath: " + url.getPath()+";"+ String.join(", ",url.getQueryParameterNames()));
+        if (url.getQueryParameterNames().contains("oauth_token")) {
             var token = url.getQueryParameter("oauth_token");
             JSObject obj = new JSObject();
             obj.put("oauth_token", token);
@@ -98,7 +99,6 @@ public class MainActivity extends BridgeActivity {
             if (this.authRequest != null) {
                 this.authRequest.resolve(res);
             }
-            return;
         }
 
         System.out.println("Intercepted URL: " + url);