diff --git a/app/src/main/assets/agent/dd-gh-login b/app/src/main/assets/agent/dd-gh-login index 86ff4707e0..d3c7517e55 100644 --- a/app/src/main/assets/agent/dd-gh-login +++ b/app/src/main/assets/agent/dd-gh-login @@ -1,27 +1,17 @@ #!/bin/bash -# GitHub sign-in through Android's browser, with the one-time code typed in for the person. -serial=${ADB_SERIAL:-127.0.0.1:5555} -display=${DD_BROWSER_DISPLAY:-0} -adb connect "$serial" >/dev/null 2>&1 +# Starts GitHub's device login and opens its approval page in Android. coproc GH { BROWSER=true gh auth login --hostname github.com --git-protocol https --web 2>&1; } -# bash drops GH and GH_PID once gh exits, which can be before the loop reads its last line. -ghpid=$GH_PID +gh_pid=$GH_PID exec {ghout}<&"${GH[0]}" {ghin}>&"${GH[1]}" -typed= +shown= while IFS= read -r line <&"$ghout"; do printf '%s\n' "$line" code=$(grep -oE '[A-Z0-9]{4}-[A-Z0-9]{4}' <<<"$line" | head -1) - if [ -n "$code" ] && [ -z "$typed" ]; then - typed=1 + if [ -n "$code" ] && [ -z "$shown" ]; then + shown=1 echo >&"$ghin" - adb -s "$serial" shell "am start --display $display -a android.intent.action.VIEW -d https://github.com/login/device" >/dev/null 2>&1 - # Chrome drops characters from `input text` and from fast key events on this page. - keys= - for ((i = 0; i < ${#code}; i++)); do - c=${code:i:1} - [ "$c" = - ] || keys+="input -d $display keyevent KEYCODE_$c; sleep 0.4; " - done - (sleep 7; adb -s "$serial" shell "$keys" >/dev/null 2>&1) & + printf 'GitHub device code: %s · github.com/login/device\n' "$code" + android-open https://github.com/login/device fi done -wait "$ghpid" +wait "$gh_pid" diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentHostService.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentHostService.kt index e8f3036d16..66fed326ee 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentHostService.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentHostService.kt @@ -77,6 +77,9 @@ class AgentHostService : Service() { private fun describe(context: Context): String { val lab = AgentHost.lab?.takeIf { it.running } if (lab != null) return context.getString(R.string.agent_lab_progress, lab.permille / 10, minutes(lab.etaSeconds.toLong().coerceAtLeast(0))) + AgentSetup.detail[AgentSetup.Step.GITHUB]?.takeIf { + AgentSetup.status[AgentSetup.Step.GITHUB] == AgentSetup.Status.WORKING && it.startsWith("GitHub device code:") + }?.let { return it } if (AgentHost.state != AgentHost.State.WORKING) return context.getString(R.string.agent_setting_up) val tool = AgentHost.running() val elapsed = minutes((SystemClock.elapsedRealtime() - AgentHost.turnStarted) / 1000) diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentSetup.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentSetup.kt index f5c080a060..754dfa2ea9 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentSetup.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentSetup.kt @@ -106,7 +106,10 @@ object AgentSetup { child.inputStream.bufferedReader().forEachLine { line -> log.appendLine(line) val text = line.trim() - if (text.isNotEmpty() && !noise(text)) main.post { detail[step] = text.take(160) } + if (text.isNotEmpty() && !noise(text)) main.post { + detail[step] = text.take(160) + if (step == Step.GITHUB && text.startsWith("GitHub device code:")) AgentHostService.update(app) + } } child.waitFor().also { log.appendLine("exit $it") } } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AgentPet.kt b/app/src/main/java/com/droiddeck/launcher/ui/AgentPet.kt index f154295450..8adadcab9c 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/AgentPet.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/AgentPet.kt @@ -116,6 +116,10 @@ internal object AgentPet { fun set(context: Context, on: Boolean) { enabled = on AgentHost.prefs(context).edit().putBoolean(KEY, on).apply() + if (on) { + allowed = PetWindows.allowed(context) + if (!allowed) requestFloating(context) + } } /** Opens the system page where the user lets DroidDeck draw over other apps. */ diff --git a/tools/agent/dd-gh-login b/tools/agent/dd-gh-login index adf816a247..d3c7517e55 100755 --- a/tools/agent/dd-gh-login +++ b/tools/agent/dd-gh-login @@ -1,24 +1,17 @@ #!/bin/bash -# GitHub sign-in through Android's browser on the bottom screen, with the one-time code typed in. -serial=${ADB_SERIAL:-127.0.0.1:5555} -adb connect "$serial" >/dev/null 2>&1 +# Starts GitHub's device login and opens its approval page in Android. coproc GH { BROWSER=true gh auth login --hostname github.com --git-protocol https --web 2>&1; } gh_pid=$GH_PID -typed= -while IFS= read -r line <&"${GH[0]}"; do +exec {ghout}<&"${GH[0]}" {ghin}>&"${GH[1]}" +shown= +while IFS= read -r line <&"$ghout"; do printf '%s\n' "$line" code=$(grep -oE '[A-Z0-9]{4}-[A-Z0-9]{4}' <<<"$line" | head -1) - if [ -n "$code" ] && [ -z "$typed" ]; then - typed=1 - echo >&"${GH[1]}" - adb -s "$serial" shell "am start --display 2 -a android.intent.action.VIEW -d https://github.com/login/device" >/dev/null 2>&1 - # Chrome drops characters from `input text` and from fast key events on this page. - keys= - for ((i = 0; i < ${#code}; i++)); do - c=${code:i:1} - [ "$c" = - ] || keys+="input -d 2 keyevent KEYCODE_$c; sleep 0.4; " - done - (sleep 7; adb -s "$serial" shell "$keys" >/dev/null 2>&1) & + if [ -n "$code" ] && [ -z "$shown" ]; then + shown=1 + echo >&"$ghin" + printf 'GitHub device code: %s · github.com/login/device\n' "$code" + android-open https://github.com/login/device fi done wait "$gh_pid"