From b22539bd5b3899bedfffbb0132ec63f0151d0378 Mon Sep 17 00:00:00 2001
From: Miguel Palhas <mpalhas@gmail.com>
Date: Sun, 13 Sep 2026 00:24:41 +0100
Subject: [PATCH] feat(maestro): wire DaemonLink into MainActivity, allow
 cleartext traffic

Reads the EXTRA_DAEMON_URL intent extra, starts DaemonLink, and shows its
LinkState in the placeholder screen so the connection indicator has
something to bind to. usesCleartextTraffic is required for the daemon's
plain-HTTP LAN endpoint; ACCESS_NETWORK_STATE is required for
ConnectivityManager.registerNetworkCallback.
---
 android/app/src/main/AndroidManifest.xml      |  2 ++
 .../main/java/pt/naps/maestro/MainActivity.kt | 25 +++++++++++++++++--
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 68cf59c..7c98bd3 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -2,6 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
     <application
         android:allowBackup="true"
@@ -9,6 +10,7 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher"
         android:supportsRtl="true"
+        android:usesCleartextTraffic="true"
         android:theme="@style/Theme.Maestro">
         <activity
             android:name=".MainActivity"
diff --git a/android/app/src/main/java/pt/naps/maestro/MainActivity.kt b/android/app/src/main/java/pt/naps/maestro/MainActivity.kt
index 3bbe71b..ed1188a 100644
--- a/android/app/src/main/java/pt/naps/maestro/MainActivity.kt
+++ b/android/app/src/main/java/pt/naps/maestro/MainActivity.kt
@@ -12,29 +12,47 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import pt.naps.maestro.connection.DaemonLink
+import pt.naps.maestro.connection.DaemonPrefs
+import pt.naps.maestro.connection.LinkState
 import pt.naps.maestro.ui.theme.MaestroTheme
 
 class MainActivity : ComponentActivity() {
+    private lateinit var daemonLink: DaemonLink
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         enableEdgeToEdge()
+
+        val prefs = DaemonPrefs(applicationContext)
+        intent?.getStringExtra(DaemonPrefs.EXTRA_DAEMON_URL)?.let { prefs.setBaseUrl(it) }
+        daemonLink = DaemonLink(applicationContext, prefs).also { it.start() }
+
         setContent {
             MaestroTheme {
+                val linkState by daemonLink.state.collectAsState()
                 Scaffold(modifier = Modifier.fillMaxSize()) { innerPadding ->
-                    PlaceholderScreen(modifier = Modifier.padding(innerPadding))
+                    PlaceholderScreen(modifier = Modifier.padding(innerPadding), linkState = linkState)
                 }
             }
         }
     }
+
+    override fun onDestroy() {
+        daemonLink.close()
+        super.onDestroy()
+    }
 }
 
 @Composable
-fun PlaceholderScreen(modifier: Modifier = Modifier) {
+fun PlaceholderScreen(modifier: Modifier = Modifier, linkState: LinkState = LinkState.CONNECTING) {
     Column(
         modifier = modifier
             .fillMaxSize()
@@ -49,6 +67,9 @@ fun PlaceholderScreen(modifier: Modifier = Modifier) {
         Text(
             text = stringResource(id = R.string.placeholder_message),
         )
+        Text(
+            text = "Daemon: ${linkState.name.lowercase()}",
+        )
     }
 }