From c381b17eb25c5fcf5b8dc0980b77d6c5f0d5b525 Mon Sep 17 00:00:00 2001
From: WardPearce <wardpearce@pm.me>
Date: Fri, 3 May 2024 18:21:34 +1200
Subject: [PATCH] Fixed android login

---
 materialious/android/.idea/.gitignore             |  3 +++
 materialious/android/.idea/compiler.xml           |  6 ++++++
 .../android/.idea/deploymentTargetSelector.xml    | 10 ++++++++++
 materialious/android/.idea/migrations.xml         | 10 ++++++++++
 materialious/android/.idea/misc.xml               | 10 ++++++++++
 materialious/android/app/capacitor.build.gradle   |  1 +
 .../android/app/src/main/AndroidManifest.xml      |  7 +++++++
 materialious/android/capacitor.settings.gradle    |  3 +++
 materialious/capacitor.config.ts                  |  2 +-
 materialious/package-lock.json                    |  9 +++++++++
 materialious/package.json                         |  3 ++-
 materialious/src/routes/+layout.svelte            | 15 +++++++++++++++
 materialious/src/routes/auth/+page.svelte         |  1 +
 13 files changed, 78 insertions(+), 2 deletions(-)
 create mode 100644 materialious/android/.idea/.gitignore
 create mode 100644 materialious/android/.idea/compiler.xml
 create mode 100644 materialious/android/.idea/deploymentTargetSelector.xml
 create mode 100644 materialious/android/.idea/migrations.xml
 create mode 100644 materialious/android/.idea/misc.xml

diff --git a/materialious/android/.idea/.gitignore b/materialious/android/.idea/.gitignore
new file mode 100644
index 00000000..26d33521
--- /dev/null
+++ b/materialious/android/.idea/.gitignore
@@ -0,0 +1,3 @@
+# Default ignored files
+/shelf/
+/workspace.xml
diff --git a/materialious/android/.idea/compiler.xml b/materialious/android/.idea/compiler.xml
new file mode 100644
index 00000000..b589d56e
--- /dev/null
+++ b/materialious/android/.idea/compiler.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel target="17" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/materialious/android/.idea/deploymentTargetSelector.xml b/materialious/android/.idea/deploymentTargetSelector.xml
new file mode 100644
index 00000000..b268ef36
--- /dev/null
+++ b/materialious/android/.idea/deploymentTargetSelector.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetSelector">
+    <selectionStates>
+      <SelectionState runConfigName="app">
+        <option name="selectionMode" value="DROPDOWN" />
+      </SelectionState>
+    </selectionStates>
+  </component>
+</project>
\ No newline at end of file
diff --git a/materialious/android/.idea/migrations.xml b/materialious/android/.idea/migrations.xml
new file mode 100644
index 00000000..f8051a6f
--- /dev/null
+++ b/materialious/android/.idea/migrations.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectMigrations">
+    <option name="MigrateToGradleLocalJavaHome">
+      <set>
+        <option value="$PROJECT_DIR$" />
+      </set>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/materialious/android/.idea/misc.xml b/materialious/android/.idea/misc.xml
new file mode 100644
index 00000000..0ad17cbd
--- /dev/null
+++ b/materialious/android/.idea/misc.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/build/classes" />
+  </component>
+  <component name="ProjectType">
+    <option name="id" value="Android" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/materialious/android/app/capacitor.build.gradle b/materialious/android/app/capacitor.build.gradle
index 4a7786f0..e4215d1b 100644
--- a/materialious/android/app/capacitor.build.gradle
+++ b/materialious/android/app/capacitor.build.gradle
@@ -9,6 +9,7 @@ android {
 
 apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
 dependencies {
+    implementation project(':capacitor-app')
     implementation project(':capacitor-browser')
 
 }
diff --git a/materialious/android/app/src/main/AndroidManifest.xml b/materialious/android/app/src/main/AndroidManifest.xml
index 4d7ca380..084fa47e 100644
--- a/materialious/android/app/src/main/AndroidManifest.xml
+++ b/materialious/android/app/src/main/AndroidManifest.xml
@@ -22,6 +22,13 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </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="materialious-auth" />
+            </intent-filter>
+
         </activity>
 
         <provider
diff --git a/materialious/android/capacitor.settings.gradle b/materialious/android/capacitor.settings.gradle
index 9a11f94f..fde830c1 100644
--- a/materialious/android/capacitor.settings.gradle
+++ b/materialious/android/capacitor.settings.gradle
@@ -2,5 +2,8 @@
 include ':capacitor-android'
 project(':capacitor-android').projectDir = new File('../node_modules/@capacitor/android/capacitor')
 
+include ':capacitor-app'
+project(':capacitor-app').projectDir = new File('../node_modules/@capacitor/app/android')
+
 include ':capacitor-browser'
 project(':capacitor-browser').projectDir = new File('../node_modules/@capacitor/browser/android')
diff --git a/materialious/capacitor.config.ts b/materialious/capacitor.config.ts
index bcbca926..22795755 100644
--- a/materialious/capacitor.config.ts
+++ b/materialious/capacitor.config.ts
@@ -9,7 +9,7 @@ const config: CapacitorConfig = {
     CapacitorHttp: {
       enabled: true
     }
-  }
+  },
 };
 
 export default config;
diff --git a/materialious/package-lock.json b/materialious/package-lock.json
index 8fdfb1b4..1e2278da 100644
--- a/materialious/package-lock.json
+++ b/materialious/package-lock.json
@@ -9,6 +9,7 @@
 			"version": "0.0.1",
 			"dependencies": {
 				"@capacitor/android": "^6.0.0",
+				"@capacitor/app": "^6.0.0",
 				"@capacitor/browser": "^6.0.0",
 				"@capacitor/cli": "^6.0.0",
 				"@capacitor/core": "^6.0.0",
@@ -2002,6 +2003,14 @@
 				"@capacitor/core": "^6.0.0"
 			}
 		},
+		"node_modules/@capacitor/app": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/@capacitor/app/-/app-6.0.0.tgz",
+			"integrity": "sha512-X5UGd90Jh5p9rmoPyMqFyFWqOypdJgVJhYcM5X1YyDVJJGzmJ5MuYv1+ajj5DW9Qyh+5a3th9WYptdGby8jidA==",
+			"peerDependencies": {
+				"@capacitor/core": "^6.0.0"
+			}
+		},
 		"node_modules/@capacitor/browser": {
 			"version": "6.0.0",
 			"resolved": "https://registry.npmjs.org/@capacitor/browser/-/browser-6.0.0.tgz",
diff --git a/materialious/package.json b/materialious/package.json
index 238087a8..a925d5a6 100644
--- a/materialious/package.json
+++ b/materialious/package.json
@@ -37,6 +37,7 @@
 	"type": "module",
 	"dependencies": {
 		"@capacitor/android": "^6.0.0",
+		"@capacitor/app": "^6.0.0",
 		"@capacitor/browser": "^6.0.0",
 		"@capacitor/cli": "^6.0.0",
 		"@capacitor/core": "^6.0.0",
@@ -53,4 +54,4 @@
 		"svelte-persisted-store": "^0.9.2",
 		"vidstack": "^1.11.21"
 	}
-}
\ No newline at end of file
+}
diff --git a/materialious/src/routes/+layout.svelte b/materialious/src/routes/+layout.svelte
index 6aeb4177..d05d3fc0 100644
--- a/materialious/src/routes/+layout.svelte
+++ b/materialious/src/routes/+layout.svelte
@@ -11,6 +11,7 @@
 	import SyncParty from '$lib/SyncParty.svelte';
 	import Thumbnail from '$lib/Thumbnail.svelte';
 	import { bookmarkletLoadFromUrl } from '$lib/bookmarklet';
+	import { App } from '@capacitor/app';
 	import { Browser } from '@capacitor/browser';
 	import { Capacitor } from '@capacitor/core';
 	import 'beercss';
@@ -81,6 +82,20 @@
 		}
 	});
 
+	// Auth response handling for Mobile
+	App.addListener('appUrlOpen', (data) => {
+		const authUrl = new URL(data.url);
+		const username = authUrl.searchParams.get('username');
+		const token = authUrl.searchParams.get('token');
+
+		if (username && token) {
+			authStore.set({
+				username: username,
+				token: token
+			});
+		}
+	});
+
 	async function login() {
 		const path = new URL(`${get(instanceStore)}/authorize_token`);
 		const searchParams = new URLSearchParams({
diff --git a/materialious/src/routes/auth/+page.svelte b/materialious/src/routes/auth/+page.svelte
index 01bcb4e6..28141f08 100644
--- a/materialious/src/routes/auth/+page.svelte
+++ b/materialious/src/routes/auth/+page.svelte
@@ -5,6 +5,7 @@
 	import { onMount } from 'svelte';
 	import { authStore } from '../../store';
 
+	// Auth response handling for Desktop
 	onMount(() => {
 		authStore.set({
 			username: $page.url.searchParams.get('username') as string,