From 1a7874c4bb995a8ab703cb6bbb02dbab95cb7c45 Mon Sep 17 00:00:00 2001
From: Pieter Vander Vennet <pietervdvn@posteo.net>
Date: Mon, 11 Nov 2024 21:35:55 +0100
Subject: [PATCH] Android: first somewhat working version

---
 .gitignore                               |  3 ++
 android/app/src/main/AndroidManifest.xml | 44 ------------------------
 capacitor.config.ts                      | 10 +++---
 package.json                             |  1 +
 4 files changed, 10 insertions(+), 48 deletions(-)
 delete mode 100644 android/app/src/main/AndroidManifest.xml

diff --git a/.gitignore b/.gitignore
index 073ca92577..d45bdc030a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,3 +49,6 @@ error_changeset_*
 public/*.webmanifest
 public/assets/generated/
 public/assets/langs/*
+android/
+dist-full/
+android/
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
deleted file mode 100644
index b3c537f541..0000000000
--- a/android/app/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <application
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
-        android:supportsRtl="true"
-        android:theme="@style/AppTheme">
-
-        <activity
-            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode"
-            android:name=".MainActivity"
-            android:label="@string/title_activity_main"
-            android:theme="@style/AppTheme.NoActionBarLaunch"
-            android:launchMode="singleTask"
-            android:exported="true">
-
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-
-        </activity>
-
-        <provider
-            android:name="androidx.core.content.FileProvider"
-            android:authorities="${applicationId}.fileprovider"
-            android:exported="false"
-            android:grantUriPermissions="true">
-            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/file_paths"></meta-data>
-        </provider>
-    </application>
-
-    <!-- Permissions -->
-
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-
-</manifest>
diff --git a/capacitor.config.ts b/capacitor.config.ts
index d94e761a59..ea3350695f 100644
--- a/capacitor.config.ts
+++ b/capacitor.config.ts
@@ -1,9 +1,11 @@
-import type { CapacitorConfig } from '@capacitor/cli';
+
+import type { CapacitorConfig } from "@capacitor/cli";
 
 const config: CapacitorConfig = {
-  appId: 'org.mapcomplete',
-  appName: 'MapComplete',
-  webDir: 'dist'
+  appId: "org.mapcomplete",
+  appName: "MapComplete",
+  webDir: "dist-full"
 };
 
 export default config;
+
diff --git a/package.json b/package.json
index 522719cd71..5b8be7f0ef 100644
--- a/package.json
+++ b/package.json
@@ -15,6 +15,7 @@
       "Use `https://<your domain name>/<path to mapcomplete>/land.html` as redirect URIs. You can add `http://127.0.0.1:1234/land.html` too for local development.",
       "Alternatively, you can override the `osm` credentials using the environment variables `VITE_OSM_OAUTH_CLIENT_ID` and `VITE_OSM_OAUTH_SECRET`"
     ],
+    "oauth_landing": null,
     "oauth_credentials": {
       "#": "This client-id is registered by 'MapComplete' on OpenStreetMap.org",
       "oauth_client_id": "K93H1d8ve7p-tVLE1ZwsQ4lAFLQk8INx5vfTLMu5DWk",