From 350e736d0ba0a77f672e7843088ffdcf848a745e Mon Sep 17 00:00:00 2001
From: furyhawk <furyx@hotmail.com>
Date: Fri, 5 Jun 2026 21:24:34 +0800
Subject: [PATCH] feat: update AndroidManifest and capacitor.config for
 cleartext traffic and HTTP scheme

---
 android/app/src/main/AndroidManifest.xml |  1 +
 capacitor.config.json                    |  7 +++++-
 package.json                             |  4 +++-
 scripts/cap-config.mjs                   | 30 ++++++++++++++++++++++++
 src/routes/+page.svelte                  | 22 +++++++++++++++--
 5 files changed, 60 insertions(+), 4 deletions(-)
 create mode 100644 scripts/cap-config.mjs

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index bc19ac8..d30dbcf 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -7,6 +7,7 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
+        android:usesCleartextTraffic="true"
         android:theme="@style/AppTheme">
 
         <activity
diff --git a/capacitor.config.json b/capacitor.config.json
index 45a783f..06cd92a 100644
--- a/capacitor.config.json
+++ b/capacitor.config.json
@@ -4,6 +4,11 @@
   "webDir": "build",
   "bundledWebRuntime": false,
   "server": {
-    "androidScheme": "https"
+    "androidScheme": "http"
+  },
+  "plugins": {
+    "CapacitorHttp": {
+      "enabled": true
+    }
   }
 }
diff --git a/package.json b/package.json
index 23beefd..ad17383 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,9 @@
     "cap:sync": "cap sync",
     "cap:open:android": "cap open android",
     "cap:open:ios": "cap open ios",
-    "mobile:build": "bun run build && cap sync"
+    "mobile:build": "bun run build && cap sync",
+    "android:dev": "node scripts/cap-config.mjs dev && vite build --mode development && cap sync",
+    "android:prod": "node scripts/cap-config.mjs prod && vite build --mode production && cap sync"
   },
   "devDependencies": {
     "@capacitor/cli": "^8.3.4",
diff --git a/scripts/cap-config.mjs b/scripts/cap-config.mjs
new file mode 100644
index 0000000..0d58d22
--- /dev/null
+++ b/scripts/cap-config.mjs
@@ -0,0 +1,30 @@
+/**
+ * Writes capacitor.config.json with the correct androidScheme for the given mode.
+ *   node scripts/cap-config.mjs dev   -> http  (emulator, no mixed-content issues)
+ *   node scripts/cap-config.mjs prod  -> https (production, secure)
+ */
+import { writeFileSync } from "fs";
+
+const mode = process.argv[2];
+if (mode !== "dev" && mode !== "prod") {
+  console.error("Usage: node scripts/cap-config.mjs <dev|prod>");
+  process.exit(1);
+}
+
+const config = {
+  appId: "com.bussg.app",
+  appName: "Bus SG App",
+  webDir: "build",
+  bundledWebRuntime: false,
+  server: {
+    androidScheme: mode === "dev" ? "http" : "https"
+  },
+  plugins: {
+    CapacitorHttp: {
+      enabled: true
+    }
+  }
+};
+
+writeFileSync("capacitor.config.json", JSON.stringify(config, null, 2) + "\n");
+console.log(`capacitor.config.json written for ${mode} (androidScheme: ${config.server.androidScheme})`);
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index 6354016..2031d46 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -1,6 +1,24 @@
 <script>
   import { onDestroy, onMount } from "svelte";
 
+  const RAW_API_BASE = import.meta.env.VITE_API_BASE ?? "";
+
+  function resolveApiBase() {
+    const base = RAW_API_BASE.trim().replace(/\/+$/, "");
+    if (!base) {
+      return "";
+    }
+
+    const platform = globalThis.Capacitor?.getPlatform?.();
+    if (platform === "android") {
+      return base.replace(/^http:\/\/(localhost|127\.0\.0\.1)(?=[:/]|$)/, "http://10.0.2.2");
+    }
+
+    return base;
+  }
+
+  const API_BASE = resolveApiBase();
+
   let statusText = "Idle";
   let statusState = "";
   let responseText = "No request yet.";
@@ -121,7 +139,7 @@
 
     while (true) {
       const query = new URLSearchParams({ $top: String(pageSize), $skip: String(skip) });
-      const response = await fetch(`/api/v1/bus-stops?${query.toString()}`);
+      const response = await fetch(`${API_BASE}/api/v1/bus-stops?${query.toString()}`);
       if (!response.ok) {
         throw new Error(`Unable to load bus stops (${response.status})`);
       }
@@ -340,7 +358,7 @@
     setStatus("Loading", "");
     responseText = "Loading...";
 
-    const url = `/api/v1/bus-arrival?${query.toString()}`;
+    const url = `${API_BASE}/api/v1/bus-arrival?${query.toString()}`;
     const response = await fetch(url);
     const text = await response.text();