Compare commits
21 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2e8a0a164f | ||
|
|
c4713dccbd | ||
|
|
981e94efc3 | ||
|
|
434cb67372 | ||
|
|
10e8139a32 | ||
|
|
f9e465bed5 | ||
|
|
7b13d42930 | ||
|
|
72913c5571 | ||
|
|
dd056c8027 | ||
|
|
16086a593f | ||
|
|
c683f135e3 | ||
|
|
1585d9ee07 | ||
|
|
149d675910 | ||
|
|
0609c73d35 | ||
|
|
79fd148511 | ||
|
|
147cec7c6b | ||
|
|
67968654cb | ||
|
|
fc1cf589a7 | ||
|
|
e2d9810b34 | ||
|
|
db306679d7 | ||
|
|
19837d05bc |
@ -1,4 +1,4 @@
|
||||
name: Gitea Android APK
|
||||
name: Gitea Android Compile Check
|
||||
|
||||
on: [push]
|
||||
|
||||
@ -6,7 +6,7 @@ jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Build APK
|
||||
- name: Compile Android APK
|
||||
env:
|
||||
CLONE_TOKEN: ${{ secrets.TMUX_GITEA_TOKEN }}
|
||||
run: |
|
||||
@ -62,6 +62,8 @@ jobs:
|
||||
|
||||
mkdir -p release
|
||||
APK_PATH="$(find app/build/outputs/apk -name '*.apk' | sort | tail -n 1)"
|
||||
cp "${APK_PATH}" release/tmux-android-gitea.apk
|
||||
ls -lh release/tmux-android-gitea.apk
|
||||
sha256sum release/tmux-android-gitea.apk
|
||||
cp "${APK_PATH}" release/tmux-android-gitea-compile-check.apk
|
||||
ls -lh release/tmux-android-gitea-compile-check.apk
|
||||
sha256sum release/tmux-android-gitea-compile-check.apk
|
||||
echo "Gitea-built APK is a compile check only."
|
||||
echo "Do not publish it as a release asset; release APKs are GitHub-built and mirrored byte-for-byte to Gitea."
|
||||
|
||||
22
.github/workflows/android.yml
vendored
22
.github/workflows/android.yml
vendored
@ -8,15 +8,6 @@ on:
|
||||
- "v*"
|
||||
pull_request:
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
publish_release:
|
||||
description: "Create or update a GitHub Release"
|
||||
required: true
|
||||
default: "false"
|
||||
type: choice
|
||||
options:
|
||||
- "false"
|
||||
- "true"
|
||||
|
||||
permissions:
|
||||
contents: write
|
||||
@ -25,7 +16,7 @@ jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
env:
|
||||
PUBLISH_RELEASE: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') || inputs.publish_release == 'true' }}
|
||||
PUBLISH_RELEASE: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') }}
|
||||
|
||||
steps:
|
||||
- name: Checkout
|
||||
@ -139,15 +130,7 @@ jobs:
|
||||
env:
|
||||
GH_TOKEN: ${{ github.token }}
|
||||
run: |
|
||||
if [[ "${GITHUB_REF}" == refs/tags/v* ]]; then
|
||||
TAG="${GITHUB_REF_NAME}"
|
||||
else
|
||||
TAG="v${VERSION_NAME}"
|
||||
git config user.name "github-actions[bot]"
|
||||
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
|
||||
git tag -f "${TAG}"
|
||||
git push -f origin "${TAG}"
|
||||
fi
|
||||
TAG="${GITHUB_REF_NAME}"
|
||||
|
||||
if gh release view "${TAG}" >/dev/null 2>&1; then
|
||||
gh release upload "${TAG}" release/tmux-android.apk release/latest.json --clobber
|
||||
@ -157,4 +140,3 @@ jobs:
|
||||
--title "tmux Android ${VERSION_NAME}" \
|
||||
--notes "Android APK for tmux-ui remote testing."
|
||||
fi
|
||||
|
||||
|
||||
120
README.md
120
README.md
@ -12,18 +12,28 @@ APIs directly:
|
||||
- one-tap probe for the preset Tailscale APIs, showing health/version and
|
||||
session counts
|
||||
- native tmux session list
|
||||
- Sessions page with current API/server and loaded session count
|
||||
- native Projects page for kanban project grouping, project agents, project
|
||||
messages, add/remove session, create, and delete actions
|
||||
- create, rename, send command, split pane, select pane, kill pane, pin, mute,
|
||||
and kill session through HTTP API
|
||||
- open one live terminal viewer through `/ws/terminal`
|
||||
- native `/ws/events` listener for session invalidation and hook notifications
|
||||
- GitHub and Gitea update manifest mirrors with fallback
|
||||
- native API action center for health, server status, timeline, preferences,
|
||||
kanban projects, group messages, hook events, image file/URL upload, image
|
||||
preview info, and native image preview display
|
||||
- selectable Gitea or GitHub update source, defaulting to Gitea for mobile
|
||||
reachability
|
||||
- native Tools page for health, server status, timeline, preferences, hook
|
||||
events, image file/URL upload, image preview info, and native image preview
|
||||
display
|
||||
- mobile soft-key row for tmux-oriented input, including tmux prefix, detach,
|
||||
new window, previous/next window, Ctrl keys, arrows, page keys, and paste
|
||||
- automatic update checks against a GitHub Release manifest
|
||||
- APK download, SHA-256 verification, and installer handoff
|
||||
- terminal viewport resize based on the phone's visible text area, including
|
||||
keyboard height changes, so tmux output wraps at the same width the user sees
|
||||
- automatic update checks with Gitea first and GitHub fallback, plus manual
|
||||
source-specific checks
|
||||
- one-download-per-version APK cache, SHA-256 verification, and installer
|
||||
handoff
|
||||
- native Update and About pages for version/build type, protocol, permission,
|
||||
selected update source, and release information
|
||||
|
||||
## Server URL
|
||||
|
||||
@ -75,17 +85,31 @@ Create the base64 value from your release keystore:
|
||||
base64 -w 0 tmux-android-release.jks
|
||||
```
|
||||
|
||||
Publish a test build by pushing a `v*` tag. That creates a GitHub Release with:
|
||||
Branch builds and manual workflow runs create Actions artifacts only. Use them
|
||||
to verify grouped changes before publishing.
|
||||
|
||||
Publish a release build by pushing a `v*` tag. A tag should be reserved for a
|
||||
coherent feature/test batch, not every small UI or text change. Tag publishing
|
||||
creates a GitHub Release with:
|
||||
|
||||
```text
|
||||
https://github.com/neatstudio/tmux-browser-android/releases/latest/download/tmux-android.apk
|
||||
https://github.com/neatstudio/tmux-browser-android/releases/latest/download/latest.json
|
||||
```
|
||||
|
||||
Those GitHub links are the primary public install/update channel. Gitea releases
|
||||
are mirrored as a second public source. This Gitea instance does not support the
|
||||
GitHub-style `/releases/latest/download/...` URL, so the app uses the Gitea
|
||||
Release API as the stable Gitea update entrypoint.
|
||||
Gitea is the app's default install/update channel because phones may not be able
|
||||
to reach GitHub reliably. GitHub remains an optional public source. This Gitea
|
||||
instance does not support the GitHub-style `/releases/latest/download/...` URL,
|
||||
so the app uses the Gitea Release API as the stable Gitea update entrypoint.
|
||||
|
||||
Release APKs must be identical on GitHub and Gitea. The canonical APK is the
|
||||
GitHub Release asset built by `.github/workflows/android.yml`; publish to Gitea
|
||||
by mirroring that same `tmux-android.apk` byte-for-byte and uploading a
|
||||
Gitea-specific `latest.json` whose `apkUrl` points at the Gitea asset but whose
|
||||
`versionCode`, `versionName`, and `sha256` match the GitHub manifest. Do not use
|
||||
a separately built Gitea APK as a release asset unless it is proven to have the
|
||||
same SHA-256 as the GitHub APK. This keeps Android signatures and update
|
||||
compatibility identical no matter which platform the phone can reach.
|
||||
|
||||
Plain branch builds only create Actions artifacts; they are useful for CI
|
||||
verification, but releases are the stable download/update channel.
|
||||
@ -99,19 +123,24 @@ incompatible package.
|
||||
|
||||
The terminal screen connects to `/ws/terminal` and sends the upstream protocol
|
||||
messages unchanged: `attach`, `input`, `resize`, `scroll`, and `clear-history`.
|
||||
The first Android UI renders terminal output as basic monospace text with ANSI
|
||||
escape filtering. It is enough for shell-oriented remote testing, but it is not
|
||||
yet a complete xterm-compatible renderer for full-screen TUIs such as `vim` or
|
||||
`top`.
|
||||
The first Android UI renders terminal output as monospace text with basic ANSI
|
||||
SGR color support. The terminal view stays bottom-aligned when output is short,
|
||||
auto-scrolls as data arrives, and adjusts its bottom inset when the soft keyboard
|
||||
opens. Rendering is throttled and the local terminal buffer is capped so opening
|
||||
busy sessions does not block the UI thread. Input typed before the terminal
|
||||
attach message is sent is queued and flushed after the WebSocket client is ready.
|
||||
It is enough for shell-oriented remote testing, but it is not yet a complete
|
||||
xterm-compatible renderer for full-screen TUIs such as `vim` or `top`.
|
||||
|
||||
The terminal toolbar and shortcut row include tmux prefix helpers. The app sends
|
||||
the same control bytes a keyboard would send, for example `Ctrl+B`, `Ctrl+B d`,
|
||||
`Ctrl+B c`, `Ctrl+B n`, and `Ctrl+B p`.
|
||||
|
||||
All app features are native Android controls. Complex server objects such as
|
||||
kanban projects, preferences, timeline events, group messages, and image metadata
|
||||
currently use native forms plus native JSON detail dialogs; image preview uses a
|
||||
native `ImageView`. The app does not load the browser UI.
|
||||
preferences, timeline events, group messages, and image metadata currently use
|
||||
native forms plus native JSON detail dialogs; kanban projects use a native
|
||||
project/agent list; image preview uses a native `ImageView`. The app does not
|
||||
load the browser UI.
|
||||
|
||||
## Permissions
|
||||
|
||||
@ -130,24 +159,33 @@ release manifest automatically, downloads the newer APK, verifies its SHA-256,
|
||||
then opens Android's package installer. The user still has to approve the
|
||||
install, and Android 8+ may require allowing this app to install unknown apps.
|
||||
|
||||
The default update manifest is:
|
||||
The default update source is the Gitea Release API:
|
||||
|
||||
```text
|
||||
https://gitea.neatcn.com/api/v1/repos/tmux/tmux-browser-android/releases/latest
|
||||
```
|
||||
|
||||
The default source resolves `latest.json` and `tmux-android.apk` from Gitea
|
||||
release assets, so APK downloads do not require GitHub. The optional GitHub
|
||||
manifest is:
|
||||
|
||||
```text
|
||||
https://github.com/neatstudio/tmux-browser-android/releases/latest/download/latest.json
|
||||
```
|
||||
|
||||
The public manual APK download is:
|
||||
The app has four update checks on the `Update` page:
|
||||
|
||||
```text
|
||||
https://github.com/neatstudio/tmux-browser-android/releases/latest/download/tmux-android.apk
|
||||
```
|
||||
- `Auto check` tries Gitea first, then tries GitHub only if Gitea cannot be
|
||||
reached.
|
||||
- `Gitea` checks only the public Gitea release API.
|
||||
- `GitHub` checks only the public GitHub manifest.
|
||||
- `Selected` checks the source chosen with `Source`, including a custom
|
||||
manifest/API URL.
|
||||
|
||||
The app tries the selected update source first, then falls back to the GitHub
|
||||
manifest and the Gitea release API. The Gitea API endpoint is:
|
||||
|
||||
```text
|
||||
https://gitea.neatcn.com/api/v1/repos/tmux/tmux-browser-android/releases/latest
|
||||
```
|
||||
Each source retries transient network failures before that source is considered
|
||||
failed. The `APK` and `Release page` buttons still resolve from the selected
|
||||
source, so they can be forced to Gitea on phones that cannot reliably reach
|
||||
GitHub.
|
||||
|
||||
Gitea tag-specific assets are also public, for example:
|
||||
|
||||
@ -158,10 +196,20 @@ https://gitea.neatcn.com/tmux/tmux-browser-android/releases/download/v0.1.7/tmux
|
||||
|
||||
In the app:
|
||||
|
||||
- Tap `Update` on the main screen to check `latest.json`, download the APK,
|
||||
verify SHA-256, and open Android's installer.
|
||||
- Open `More` -> `Open APK download` to download the current public APK in a
|
||||
browser.
|
||||
- Open `More` -> `Permissions / update status` to see the installed version,
|
||||
update manifest, APK URL, install permission state, and a `Check update`
|
||||
button.
|
||||
- Open the `Update` page and tap `Auto check` to check `latest.json`, download
|
||||
the APK, verify SHA-256, and open Android's installer. Use `Gitea`, `GitHub`,
|
||||
or `Selected` to force a single update source.
|
||||
- If the same version APK was already downloaded and its SHA-256 still matches,
|
||||
the app reuses that file instead of downloading it again.
|
||||
- If Android sends you to the unknown-app install permission screen, return to
|
||||
the app after allowing it; the app continues installing the already downloaded
|
||||
APK without another update check or download.
|
||||
- Open the `Update` page and tap `APK` to resolve the APK from the selected
|
||||
update source and open it in a browser.
|
||||
- Open the `Update` page and tap `Details` to see the installed version,
|
||||
selected update source, APK/Release resolver behavior, install permission
|
||||
state, and a `Check update` button.
|
||||
- Open the `Update` page and tap `App settings` for Android's full per-app
|
||||
permission/settings screen.
|
||||
- Open the `About` page to see the app version/build type, package name,
|
||||
API/protocol summary, selected update source, and update policy.
|
||||
|
||||
@ -9,6 +9,8 @@ val repoSlug = providers.gradleProperty("repoSlug")
|
||||
val defaultServerUrl = providers.gradleProperty("defaultServerUrl")
|
||||
.orElse("http://100.89.0.116:3000")
|
||||
val defaultUpdateUrl = providers.gradleProperty("defaultUpdateUrl")
|
||||
.orElse("https://gitea.neatcn.com/api/v1/repos/tmux/tmux-browser-android/releases/latest")
|
||||
val defaultGithubUpdateUrl = providers.gradleProperty("defaultGithubUpdateUrl")
|
||||
.orElse("https://github.com/${repoSlug.get()}/releases/latest/download/latest.json")
|
||||
val defaultGiteaUpdateUrl = providers.gradleProperty("defaultGiteaUpdateUrl")
|
||||
.orElse("https://gitea.neatcn.com/api/v1/repos/tmux/tmux-browser-android/releases/latest")
|
||||
@ -36,6 +38,7 @@ android {
|
||||
|
||||
buildConfigField("String", "DEFAULT_SERVER_URL", "\"${defaultServerUrl.get()}\"")
|
||||
buildConfigField("String", "DEFAULT_UPDATE_URL", "\"${defaultUpdateUrl.get()}\"")
|
||||
buildConfigField("String", "DEFAULT_GITHUB_UPDATE_URL", "\"${defaultGithubUpdateUrl.get()}\"")
|
||||
buildConfigField("String", "DEFAULT_GITEA_UPDATE_URL", "\"${defaultGiteaUpdateUrl.get()}\"")
|
||||
buildConfigField("String", "DEFAULT_APK_URL", "\"${defaultApkUrl.get()}\"")
|
||||
buildConfigField("String", "DEFAULT_RELEASE_PAGE_URL", "\"${defaultReleasePageUrl.get()}\"")
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,615 @@
|
||||
package com.neatstudio.tmuxandroid;
|
||||
|
||||
import android.graphics.Color;
|
||||
import android.graphics.Typeface;
|
||||
import android.text.SpannableStringBuilder;
|
||||
import android.text.Spanned;
|
||||
import android.text.style.BackgroundColorSpan;
|
||||
import android.text.style.ForegroundColorSpan;
|
||||
import android.text.style.StyleSpan;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
final class TerminalScreenBuffer {
|
||||
private static final int DEFAULT_FG = 0xffe6ebf2;
|
||||
private static final int DEFAULT_BG = Color.TRANSPARENT;
|
||||
|
||||
private int cols;
|
||||
private int rows;
|
||||
private Cell[][] cells;
|
||||
private int cursorRow;
|
||||
private int cursorCol;
|
||||
private int savedRow;
|
||||
private int savedCol;
|
||||
private String pendingControl = "";
|
||||
private boolean wrapPending;
|
||||
private int fg = DEFAULT_FG;
|
||||
private int bg = DEFAULT_BG;
|
||||
private boolean bold;
|
||||
|
||||
TerminalScreenBuffer(int cols, int rows) {
|
||||
resize(cols, rows);
|
||||
}
|
||||
|
||||
void resize(int nextCols, int nextRows) {
|
||||
nextCols = Math.max(1, nextCols);
|
||||
nextRows = Math.max(1, nextRows);
|
||||
Cell[][] previous = cells;
|
||||
int previousRows = rows;
|
||||
int previousCols = cols;
|
||||
cols = nextCols;
|
||||
rows = nextRows;
|
||||
cells = new Cell[rows][cols];
|
||||
for (int row = 0; row < rows; row++) {
|
||||
for (int col = 0; col < cols; col++) {
|
||||
cells[row][col] = new Cell();
|
||||
}
|
||||
}
|
||||
if (previous != null) {
|
||||
int copyRows = Math.min(previousRows, rows);
|
||||
int copyCols = Math.min(previousCols, cols);
|
||||
int previousStart = Math.max(0, previousRows - copyRows);
|
||||
int nextStart = Math.max(0, rows - copyRows);
|
||||
for (int row = 0; row < copyRows; row++) {
|
||||
for (int col = 0; col < copyCols; col++) {
|
||||
cells[nextStart + row][col].copyFrom(previous[previousStart + row][col]);
|
||||
}
|
||||
}
|
||||
}
|
||||
cursorRow = clamp(cursorRow, 0, rows - 1);
|
||||
cursorCol = clamp(cursorCol, 0, cols - 1);
|
||||
savedRow = clamp(savedRow, 0, rows - 1);
|
||||
savedCol = clamp(savedCol, 0, cols - 1);
|
||||
}
|
||||
|
||||
void clear() {
|
||||
clearScreen();
|
||||
cursorRow = 0;
|
||||
cursorCol = 0;
|
||||
savedRow = 0;
|
||||
savedCol = 0;
|
||||
pendingControl = "";
|
||||
wrapPending = false;
|
||||
fg = DEFAULT_FG;
|
||||
bg = DEFAULT_BG;
|
||||
bold = false;
|
||||
}
|
||||
|
||||
void write(String text) {
|
||||
if (!pendingControl.isEmpty()) {
|
||||
text = pendingControl + text;
|
||||
pendingControl = "";
|
||||
}
|
||||
int index = 0;
|
||||
while (index < text.length()) {
|
||||
char item = text.charAt(index);
|
||||
if (item == '\u001b') {
|
||||
int next = handleEscape(text, index);
|
||||
if (next < 0) {
|
||||
pendingControl = text.substring(index);
|
||||
return;
|
||||
}
|
||||
index = next;
|
||||
} else if (item == '\r') {
|
||||
wrapPending = false;
|
||||
cursorCol = 0;
|
||||
index++;
|
||||
} else if (item == '\n') {
|
||||
wrapPending = false;
|
||||
newLine();
|
||||
index++;
|
||||
} else if (item == '\b') {
|
||||
wrapPending = false;
|
||||
cursorCol = Math.max(0, cursorCol - 1);
|
||||
index++;
|
||||
} else if (item == '\t') {
|
||||
int nextTab = ((cursorCol / 8) + 1) * 8;
|
||||
while (cursorCol < Math.min(nextTab, cols)) {
|
||||
putChar(' ');
|
||||
}
|
||||
index++;
|
||||
} else if (item >= 0x20 && item != 0x7f) {
|
||||
putChar(item);
|
||||
index++;
|
||||
} else {
|
||||
index++;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
CharSequence render() {
|
||||
SpannableStringBuilder output = new SpannableStringBuilder();
|
||||
for (int row = 0; row < rows; row++) {
|
||||
appendRow(output, row);
|
||||
if (row + 1 < rows) {
|
||||
output.append('\n');
|
||||
}
|
||||
}
|
||||
return output;
|
||||
}
|
||||
|
||||
private int handleEscape(String text, int index) {
|
||||
if (index + 1 >= text.length()) {
|
||||
return -1;
|
||||
}
|
||||
char next = text.charAt(index + 1);
|
||||
wrapPending = false;
|
||||
if (next == '[') {
|
||||
int end = findAnsiEnd(text, index + 2);
|
||||
if (end == -1) {
|
||||
return -1;
|
||||
}
|
||||
applyCsi(text.substring(index + 2, end), text.charAt(end));
|
||||
return end + 1;
|
||||
}
|
||||
if (next == ']') {
|
||||
return skipStringEscape(text, index + 2);
|
||||
}
|
||||
if (next == 'P' || next == '^' || next == '_') {
|
||||
return skipStringEscape(text, index + 2);
|
||||
}
|
||||
if (next == '(' || next == ')' || next == '*' || next == '+' || next == '-' || next == '.') {
|
||||
if (index + 2 >= text.length()) {
|
||||
return -1;
|
||||
}
|
||||
return Math.min(index + 3, text.length());
|
||||
}
|
||||
if (next == '7') {
|
||||
saveCursor();
|
||||
} else if (next == '8') {
|
||||
restoreCursor();
|
||||
} else if (next == 'D') {
|
||||
newLine();
|
||||
} else if (next == 'E') {
|
||||
cursorCol = 0;
|
||||
newLine();
|
||||
} else if (next == 'M') {
|
||||
reverseIndex();
|
||||
} else if (next == 'c') {
|
||||
clear();
|
||||
}
|
||||
return Math.min(index + 2, text.length());
|
||||
}
|
||||
|
||||
private void applyCsi(String rawParams, char command) {
|
||||
wrapPending = false;
|
||||
String params = rawParams;
|
||||
while (!params.isEmpty()) {
|
||||
char first = params.charAt(0);
|
||||
if (first == '?' || first == '>' || first == '!' || first == '=') {
|
||||
params = params.substring(1);
|
||||
} else {
|
||||
break;
|
||||
}
|
||||
}
|
||||
List<Integer> values = parseParams(params);
|
||||
switch (command) {
|
||||
case 'm':
|
||||
applySgr(values);
|
||||
break;
|
||||
case 'H':
|
||||
case 'f':
|
||||
cursorRow = clamp(param(values, 0, 1) - 1, 0, rows - 1);
|
||||
cursorCol = clamp(param(values, 1, 1) - 1, 0, cols - 1);
|
||||
break;
|
||||
case 'A':
|
||||
cursorRow = clamp(cursorRow - param(values, 0, 1), 0, rows - 1);
|
||||
break;
|
||||
case 'B':
|
||||
cursorRow = clamp(cursorRow + param(values, 0, 1), 0, rows - 1);
|
||||
break;
|
||||
case 'C':
|
||||
cursorCol = clamp(cursorCol + param(values, 0, 1), 0, cols - 1);
|
||||
break;
|
||||
case 'D':
|
||||
cursorCol = clamp(cursorCol - param(values, 0, 1), 0, cols - 1);
|
||||
break;
|
||||
case 'G':
|
||||
cursorCol = clamp(param(values, 0, 1) - 1, 0, cols - 1);
|
||||
break;
|
||||
case 'd':
|
||||
cursorRow = clamp(param(values, 0, 1) - 1, 0, rows - 1);
|
||||
break;
|
||||
case 'J':
|
||||
eraseDisplay(param(values, 0, 0));
|
||||
break;
|
||||
case 'K':
|
||||
eraseLine(param(values, 0, 0));
|
||||
break;
|
||||
case 'P':
|
||||
deleteChars(param(values, 0, 1));
|
||||
break;
|
||||
case '@':
|
||||
insertChars(param(values, 0, 1));
|
||||
break;
|
||||
case 'X':
|
||||
eraseChars(param(values, 0, 1));
|
||||
break;
|
||||
case 'L':
|
||||
insertLines(param(values, 0, 1));
|
||||
break;
|
||||
case 'M':
|
||||
deleteLines(param(values, 0, 1));
|
||||
break;
|
||||
case 's':
|
||||
saveCursor();
|
||||
break;
|
||||
case 'u':
|
||||
restoreCursor();
|
||||
break;
|
||||
case 'c':
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
private void applySgr(List<Integer> values) {
|
||||
if (values.isEmpty()) {
|
||||
values.add(0);
|
||||
}
|
||||
for (int index = 0; index < values.size(); index++) {
|
||||
int value = values.get(index);
|
||||
if (value == 0) {
|
||||
fg = DEFAULT_FG;
|
||||
bg = DEFAULT_BG;
|
||||
bold = false;
|
||||
} else if (value == 1) {
|
||||
bold = true;
|
||||
} else if (value == 22) {
|
||||
bold = false;
|
||||
} else if (value == 39) {
|
||||
fg = DEFAULT_FG;
|
||||
} else if (value == 49) {
|
||||
bg = DEFAULT_BG;
|
||||
} else if ((value >= 30 && value <= 37) || (value >= 90 && value <= 97)) {
|
||||
fg = ansiColor(value, false);
|
||||
} else if ((value >= 40 && value <= 47) || (value >= 100 && value <= 107)) {
|
||||
bg = ansiColor(value, true);
|
||||
} else if ((value == 38 || value == 48) && index + 2 < values.size()) {
|
||||
boolean background = value == 48;
|
||||
int mode = values.get(index + 1);
|
||||
if (mode == 5) {
|
||||
int color = xtermColor(values.get(index + 2));
|
||||
if (background) {
|
||||
bg = color;
|
||||
} else {
|
||||
fg = color;
|
||||
}
|
||||
index += 2;
|
||||
} else if (mode == 2 && index + 4 < values.size()) {
|
||||
int color = Color.rgb(
|
||||
clamp(values.get(index + 2), 0, 255),
|
||||
clamp(values.get(index + 3), 0, 255),
|
||||
clamp(values.get(index + 4), 0, 255)
|
||||
);
|
||||
if (background) {
|
||||
bg = color;
|
||||
} else {
|
||||
fg = color;
|
||||
}
|
||||
index += 4;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void putChar(char value) {
|
||||
if (wrapPending) {
|
||||
wrapPending = false;
|
||||
newLine();
|
||||
}
|
||||
cells[cursorRow][cursorCol].set(value, fg, bg, bold);
|
||||
if (cursorCol == cols - 1) {
|
||||
wrapPending = true;
|
||||
} else {
|
||||
cursorCol++;
|
||||
}
|
||||
}
|
||||
|
||||
private void newLine() {
|
||||
wrapPending = false;
|
||||
cursorRow++;
|
||||
if (cursorRow >= rows) {
|
||||
scrollUp(1);
|
||||
cursorRow = rows - 1;
|
||||
}
|
||||
cursorCol = 0;
|
||||
}
|
||||
|
||||
private void reverseIndex() {
|
||||
if (cursorRow == 0) {
|
||||
scrollDown(1);
|
||||
} else {
|
||||
cursorRow--;
|
||||
}
|
||||
}
|
||||
|
||||
private void eraseDisplay(int mode) {
|
||||
if (mode == 2 || mode == 3) {
|
||||
clearScreen();
|
||||
} else if (mode == 1) {
|
||||
for (int row = 0; row < cursorRow; row++) {
|
||||
clearLine(row, 0, cols - 1);
|
||||
}
|
||||
clearLine(cursorRow, 0, cursorCol);
|
||||
} else {
|
||||
clearLine(cursorRow, cursorCol, cols - 1);
|
||||
for (int row = cursorRow + 1; row < rows; row++) {
|
||||
clearLine(row, 0, cols - 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void eraseLine(int mode) {
|
||||
if (mode == 2) {
|
||||
clearLine(cursorRow, 0, cols - 1);
|
||||
} else if (mode == 1) {
|
||||
clearLine(cursorRow, 0, cursorCol);
|
||||
} else {
|
||||
clearLine(cursorRow, cursorCol, cols - 1);
|
||||
}
|
||||
}
|
||||
|
||||
private void eraseChars(int count) {
|
||||
int end = Math.min(cols - 1, cursorCol + Math.max(1, count) - 1);
|
||||
clearLine(cursorRow, cursorCol, end);
|
||||
}
|
||||
|
||||
private void deleteChars(int count) {
|
||||
count = Math.max(1, count);
|
||||
Cell[] line = cells[cursorRow];
|
||||
for (int col = cursorCol; col < cols; col++) {
|
||||
int source = col + count;
|
||||
if (source < cols) {
|
||||
line[col].copyFrom(line[source]);
|
||||
} else {
|
||||
line[col].clear();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void insertChars(int count) {
|
||||
count = Math.max(1, count);
|
||||
Cell[] line = cells[cursorRow];
|
||||
for (int col = cols - 1; col >= cursorCol; col--) {
|
||||
int source = col - count;
|
||||
if (source >= cursorCol) {
|
||||
line[col].copyFrom(line[source]);
|
||||
} else {
|
||||
line[col].clear();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void insertLines(int count) {
|
||||
count = Math.min(Math.max(1, count), rows - cursorRow);
|
||||
for (int row = rows - 1; row >= cursorRow + count; row--) {
|
||||
copyLine(row, row - count);
|
||||
}
|
||||
for (int row = cursorRow; row < cursorRow + count; row++) {
|
||||
clearLine(row, 0, cols - 1);
|
||||
}
|
||||
}
|
||||
|
||||
private void deleteLines(int count) {
|
||||
count = Math.min(Math.max(1, count), rows - cursorRow);
|
||||
for (int row = cursorRow; row + count < rows; row++) {
|
||||
copyLine(row, row + count);
|
||||
}
|
||||
for (int row = rows - count; row < rows; row++) {
|
||||
clearLine(row, 0, cols - 1);
|
||||
}
|
||||
}
|
||||
|
||||
private void clearScreen() {
|
||||
for (int row = 0; row < rows; row++) {
|
||||
clearLine(row, 0, cols - 1);
|
||||
}
|
||||
}
|
||||
|
||||
private void clearLine(int row, int start, int end) {
|
||||
start = clamp(start, 0, cols - 1);
|
||||
end = clamp(end, 0, cols - 1);
|
||||
for (int col = start; col <= end; col++) {
|
||||
cells[row][col].clear();
|
||||
}
|
||||
}
|
||||
|
||||
private void scrollUp(int count) {
|
||||
count = Math.min(Math.max(1, count), rows);
|
||||
for (int row = 0; row + count < rows; row++) {
|
||||
copyLine(row, row + count);
|
||||
}
|
||||
for (int row = rows - count; row < rows; row++) {
|
||||
clearLine(row, 0, cols - 1);
|
||||
}
|
||||
}
|
||||
|
||||
private void scrollDown(int count) {
|
||||
count = Math.min(Math.max(1, count), rows);
|
||||
for (int row = rows - 1; row - count >= 0; row--) {
|
||||
copyLine(row, row - count);
|
||||
}
|
||||
for (int row = 0; row < count; row++) {
|
||||
clearLine(row, 0, cols - 1);
|
||||
}
|
||||
}
|
||||
|
||||
private void copyLine(int target, int source) {
|
||||
for (int col = 0; col < cols; col++) {
|
||||
cells[target][col].copyFrom(cells[source][col]);
|
||||
}
|
||||
}
|
||||
|
||||
private void appendRow(SpannableStringBuilder output, int row) {
|
||||
int col = 0;
|
||||
while (col < cols) {
|
||||
Cell first = cells[row][col];
|
||||
int start = output.length();
|
||||
int fgColor = first.fg;
|
||||
int bgColor = first.bg;
|
||||
boolean isBold = first.bold;
|
||||
while (col < cols) {
|
||||
Cell cell = cells[row][col];
|
||||
if (cell.fg != fgColor || cell.bg != bgColor || cell.bold != isBold) {
|
||||
break;
|
||||
}
|
||||
output.append(cell.value);
|
||||
col++;
|
||||
}
|
||||
int end = output.length();
|
||||
output.setSpan(new ForegroundColorSpan(fgColor), start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
|
||||
if (bgColor != DEFAULT_BG) {
|
||||
output.setSpan(new BackgroundColorSpan(bgColor), start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
|
||||
}
|
||||
if (isBold) {
|
||||
output.setSpan(new StyleSpan(Typeface.BOLD), start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void saveCursor() {
|
||||
savedRow = cursorRow;
|
||||
savedCol = cursorCol;
|
||||
}
|
||||
|
||||
private void restoreCursor() {
|
||||
cursorRow = clamp(savedRow, 0, rows - 1);
|
||||
cursorCol = clamp(savedCol, 0, cols - 1);
|
||||
}
|
||||
|
||||
private int skipStringEscape(String text, int start) {
|
||||
int cursor = start;
|
||||
while (cursor < text.length()) {
|
||||
char item = text.charAt(cursor);
|
||||
if (item == '\u0007') {
|
||||
return cursor + 1;
|
||||
}
|
||||
if (item == '\u001b' && cursor + 1 < text.length() && text.charAt(cursor + 1) == '\\') {
|
||||
return cursor + 2;
|
||||
}
|
||||
cursor++;
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
private int findAnsiEnd(String text, int start) {
|
||||
for (int index = start; index < text.length(); index++) {
|
||||
char item = text.charAt(index);
|
||||
if (item >= '@' && item <= '~') {
|
||||
return index;
|
||||
}
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
private List<Integer> parseParams(String params) {
|
||||
List<Integer> values = new ArrayList<>();
|
||||
if (params.isEmpty()) {
|
||||
return values;
|
||||
}
|
||||
String[] parts = params.split(";", -1);
|
||||
for (String part : parts) {
|
||||
String cleaned = part.trim();
|
||||
if (cleaned.isEmpty()) {
|
||||
values.add(0);
|
||||
continue;
|
||||
}
|
||||
try {
|
||||
values.add(Integer.parseInt(cleaned));
|
||||
} catch (NumberFormatException ignored) {
|
||||
values.add(0);
|
||||
}
|
||||
}
|
||||
return values;
|
||||
}
|
||||
|
||||
private int param(List<Integer> values, int index, int fallback) {
|
||||
if (index >= values.size()) {
|
||||
return fallback;
|
||||
}
|
||||
int value = values.get(index);
|
||||
return value == 0 ? fallback : value;
|
||||
}
|
||||
|
||||
private int ansiColor(int code, boolean background) {
|
||||
int base = background ? (code >= 100 ? code - 100 : code - 40) : (code >= 90 ? code - 90 : code - 30);
|
||||
boolean bright = code >= 90;
|
||||
switch (base) {
|
||||
case 0:
|
||||
return bright ? Color.rgb(80, 88, 100) : Color.rgb(33, 38, 45);
|
||||
case 1:
|
||||
return bright ? Color.rgb(255, 123, 114) : Color.rgb(248, 81, 73);
|
||||
case 2:
|
||||
return bright ? Color.rgb(86, 211, 100) : Color.rgb(63, 185, 80);
|
||||
case 3:
|
||||
return bright ? Color.rgb(234, 179, 8) : Color.rgb(210, 153, 34);
|
||||
case 4:
|
||||
return bright ? Color.rgb(121, 192, 255) : Color.rgb(88, 166, 255);
|
||||
case 5:
|
||||
return bright ? Color.rgb(210, 168, 255) : Color.rgb(188, 140, 255);
|
||||
case 6:
|
||||
return bright ? Color.rgb(86, 211, 219) : Color.rgb(57, 197, 187);
|
||||
case 7:
|
||||
default:
|
||||
return bright ? Color.rgb(240, 246, 252) : Color.rgb(201, 209, 217);
|
||||
}
|
||||
}
|
||||
|
||||
private int xtermColor(int value) {
|
||||
value = clamp(value, 0, 255);
|
||||
if (value < 16) {
|
||||
if (value < 8) {
|
||||
return ansiColor(30 + value, false);
|
||||
}
|
||||
return ansiColor(90 + value - 8, false);
|
||||
}
|
||||
if (value >= 232) {
|
||||
int shade = 8 + (value - 232) * 10;
|
||||
return Color.rgb(shade, shade, shade);
|
||||
}
|
||||
int index = value - 16;
|
||||
int red = xtermComponent(index / 36);
|
||||
int green = xtermComponent((index / 6) % 6);
|
||||
int blue = xtermComponent(index % 6);
|
||||
return Color.rgb(red, green, blue);
|
||||
}
|
||||
|
||||
private int xtermComponent(int value) {
|
||||
return value == 0 ? 0 : 55 + value * 40;
|
||||
}
|
||||
|
||||
private static int clamp(int value, int min, int max) {
|
||||
return Math.max(min, Math.min(max, value));
|
||||
}
|
||||
|
||||
private static final class Cell {
|
||||
char value = ' ';
|
||||
int fg = DEFAULT_FG;
|
||||
int bg = DEFAULT_BG;
|
||||
boolean bold;
|
||||
|
||||
void clear() {
|
||||
value = ' ';
|
||||
fg = DEFAULT_FG;
|
||||
bg = DEFAULT_BG;
|
||||
bold = false;
|
||||
}
|
||||
|
||||
void set(char nextValue, int nextFg, int nextBg, boolean nextBold) {
|
||||
value = nextValue;
|
||||
fg = nextFg;
|
||||
bg = nextBg;
|
||||
bold = nextBold;
|
||||
}
|
||||
|
||||
void copyFrom(Cell other) {
|
||||
value = other.value;
|
||||
fg = other.fg;
|
||||
bg = other.bg;
|
||||
bold = other.bold;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -12,6 +12,9 @@ import java.nio.charset.StandardCharsets;
|
||||
import java.security.MessageDigest;
|
||||
import java.security.SecureRandom;
|
||||
import java.util.Arrays;
|
||||
import java.util.concurrent.ExecutorService;
|
||||
import java.util.concurrent.Executors;
|
||||
import java.util.concurrent.RejectedExecutionException;
|
||||
|
||||
import javax.net.ssl.SSLSocketFactory;
|
||||
|
||||
@ -25,6 +28,8 @@ final class TerminalSocketClient {
|
||||
|
||||
private final Object writeLock = new Object();
|
||||
private final Listener listener;
|
||||
private final ExecutorService writeExecutor = Executors.newSingleThreadExecutor(runnable ->
|
||||
new Thread(runnable, "terminal-ws-write"));
|
||||
private Socket socket;
|
||||
private BufferedInputStream input;
|
||||
private BufferedOutputStream output;
|
||||
@ -42,35 +47,41 @@ final class TerminalSocketClient {
|
||||
}
|
||||
|
||||
void sendInput(String data) {
|
||||
sendMessage("input", "data", data);
|
||||
sendMessageAsync("input", "data", data);
|
||||
}
|
||||
|
||||
void resize(int cols, int rows) {
|
||||
sendMessage("resize", "cols", cols, "rows", rows);
|
||||
sendMessageAsync("resize", "cols", cols, "rows", rows);
|
||||
}
|
||||
|
||||
void scroll(int lines) {
|
||||
sendMessage("scroll", "lines", lines);
|
||||
sendMessageAsync("scroll", "lines", lines);
|
||||
}
|
||||
|
||||
void clearHistory() {
|
||||
sendMessage("clear-history");
|
||||
sendMessageAsync("clear-history");
|
||||
}
|
||||
|
||||
void close() {
|
||||
closed = true;
|
||||
try {
|
||||
sendFrame(8, new byte[0]);
|
||||
} catch (Exception ignored) {
|
||||
}
|
||||
try {
|
||||
if (socket != null) {
|
||||
socket.close();
|
||||
}
|
||||
} catch (Exception ignored) {
|
||||
writeExecutor.execute(() -> {
|
||||
try {
|
||||
sendFrame(8, new byte[0]);
|
||||
} catch (Exception ignored) {
|
||||
}
|
||||
closeSocketQuietly();
|
||||
});
|
||||
writeExecutor.shutdown();
|
||||
} catch (RejectedExecutionException ignored) {
|
||||
closeSocketQuietly();
|
||||
}
|
||||
}
|
||||
|
||||
boolean isClosed() {
|
||||
return closed;
|
||||
}
|
||||
|
||||
private void run(String baseUrl, String sessionName, int cols, int rows) {
|
||||
try {
|
||||
URI uri = buildWsUri(baseUrl);
|
||||
@ -78,14 +89,14 @@ final class TerminalSocketClient {
|
||||
input = new BufferedInputStream(socket.getInputStream());
|
||||
output = new BufferedOutputStream(socket.getOutputStream());
|
||||
handshake(uri);
|
||||
listener.onConnected();
|
||||
sendMessage(
|
||||
sendMessageSync(
|
||||
"attach",
|
||||
"tabId", "android-" + System.currentTimeMillis(),
|
||||
"sessionName", sessionName,
|
||||
"cols", cols,
|
||||
"rows", rows
|
||||
);
|
||||
listener.onConnected();
|
||||
readLoop();
|
||||
} catch (Exception error) {
|
||||
if (!closed) {
|
||||
@ -94,12 +105,8 @@ final class TerminalSocketClient {
|
||||
} finally {
|
||||
closed = true;
|
||||
listener.onClosed();
|
||||
try {
|
||||
if (socket != null) {
|
||||
socket.close();
|
||||
}
|
||||
} catch (Exception ignored) {
|
||||
}
|
||||
closeSocketQuietly();
|
||||
writeExecutor.shutdownNow();
|
||||
}
|
||||
}
|
||||
|
||||
@ -239,7 +246,7 @@ final class TerminalSocketClient {
|
||||
}
|
||||
}
|
||||
|
||||
private void sendJson(JSONObject object) {
|
||||
private void sendJsonSync(JSONObject object) {
|
||||
try {
|
||||
sendFrame(1, object.toString().getBytes(StandardCharsets.UTF_8));
|
||||
} catch (Exception error) {
|
||||
@ -249,14 +256,21 @@ final class TerminalSocketClient {
|
||||
}
|
||||
}
|
||||
|
||||
private void sendMessage(String type, Object... keyValues) {
|
||||
private void sendMessageAsync(String type, Object... keyValues) {
|
||||
try {
|
||||
writeExecutor.execute(() -> sendMessageSync(type, keyValues));
|
||||
} catch (RejectedExecutionException ignored) {
|
||||
}
|
||||
}
|
||||
|
||||
private void sendMessageSync(String type, Object... keyValues) {
|
||||
try {
|
||||
JSONObject object = new JSONObject();
|
||||
object.put("type", type);
|
||||
for (int i = 0; i + 1 < keyValues.length; i += 2) {
|
||||
object.put(String.valueOf(keyValues[i]), keyValues[i + 1]);
|
||||
}
|
||||
sendJson(object);
|
||||
sendJsonSync(object);
|
||||
} catch (Exception error) {
|
||||
if (!closed) {
|
||||
listener.onError(error.getMessage() == null ? error.toString() : error.getMessage());
|
||||
@ -264,6 +278,15 @@ final class TerminalSocketClient {
|
||||
}
|
||||
}
|
||||
|
||||
private void closeSocketQuietly() {
|
||||
try {
|
||||
if (socket != null) {
|
||||
socket.close();
|
||||
}
|
||||
} catch (Exception ignored) {
|
||||
}
|
||||
}
|
||||
|
||||
private void sendFrame(int opcode, byte[] payload) throws Exception {
|
||||
synchronized (writeLock) {
|
||||
if (output == null) {
|
||||
|
||||
@ -20,23 +20,31 @@ import java.io.InputStream;
|
||||
import java.net.HttpURLConnection;
|
||||
import java.net.URL;
|
||||
import java.security.MessageDigest;
|
||||
import java.util.ArrayList;
|
||||
import java.util.LinkedHashSet;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
import java.util.concurrent.ExecutorService;
|
||||
import java.util.concurrent.Executors;
|
||||
|
||||
final class UpdateManager {
|
||||
private static final String PREF_PENDING_INSTALL_APK = "pending_install_apk";
|
||||
private static final int NETWORK_ATTEMPTS = 3;
|
||||
private static final long RETRY_DELAY_MS = 1200L;
|
||||
|
||||
interface Callback {
|
||||
void onChecking(boolean checking);
|
||||
void onMessage(String message);
|
||||
}
|
||||
|
||||
private interface ReleaseUrlPicker {
|
||||
String pick(ReleaseInfo info);
|
||||
}
|
||||
|
||||
private final Activity activity;
|
||||
private final SharedPreferences prefs;
|
||||
private final Callback callback;
|
||||
private final ExecutorService executor = Executors.newSingleThreadExecutor();
|
||||
private volatile boolean checkInProgress;
|
||||
private volatile boolean downloadInProgress;
|
||||
private File pendingInstallApk;
|
||||
|
||||
UpdateManager(Activity activity, SharedPreferences prefs, Callback callback) {
|
||||
this.activity = activity;
|
||||
@ -45,52 +53,124 @@ final class UpdateManager {
|
||||
}
|
||||
|
||||
void check(boolean userInitiated) {
|
||||
List<String> manifestUrls = getUpdateManifestUrls();
|
||||
checkWithFallback(userInitiated);
|
||||
}
|
||||
|
||||
void checkSelected(boolean userInitiated) {
|
||||
startUpdateCheck(
|
||||
userInitiated,
|
||||
"selected source",
|
||||
new String[]{getUpdateManifestUrl()}
|
||||
);
|
||||
}
|
||||
|
||||
void checkGitea(boolean userInitiated) {
|
||||
startUpdateCheck(
|
||||
userInitiated,
|
||||
"Gitea",
|
||||
new String[]{BuildConfig.DEFAULT_GITEA_UPDATE_URL}
|
||||
);
|
||||
}
|
||||
|
||||
void checkGithub(boolean userInitiated) {
|
||||
startUpdateCheck(
|
||||
userInitiated,
|
||||
"GitHub",
|
||||
new String[]{BuildConfig.DEFAULT_GITHUB_UPDATE_URL}
|
||||
);
|
||||
}
|
||||
|
||||
void checkWithFallback(boolean userInitiated) {
|
||||
startUpdateCheck(
|
||||
userInitiated,
|
||||
"Gitea, then GitHub",
|
||||
new String[]{BuildConfig.DEFAULT_GITEA_UPDATE_URL, BuildConfig.DEFAULT_GITHUB_UPDATE_URL}
|
||||
);
|
||||
}
|
||||
|
||||
private void startUpdateCheck(boolean userInitiated, String label, String[] manifestUrls) {
|
||||
if (checkInProgress) {
|
||||
postMessage("Update check already running");
|
||||
return;
|
||||
}
|
||||
checkInProgress = true;
|
||||
callback.onChecking(true);
|
||||
postMessage("Checking update...");
|
||||
postMessage("Checking update: " + label + "...");
|
||||
executor.execute(() -> {
|
||||
Exception lastError = null;
|
||||
try {
|
||||
ReleaseInfo info = fetchFirstReleaseInfo(manifestUrls);
|
||||
if (info.versionCode <= BuildConfig.VERSION_CODE) {
|
||||
postMessage("Already up to date: " + BuildConfig.VERSION_NAME);
|
||||
return;
|
||||
for (int index = 0; index < manifestUrls.length; index++) {
|
||||
String manifestUrl = manifestUrls[index];
|
||||
try {
|
||||
postMessage("Checking " + hostLabel(manifestUrl) + "...");
|
||||
ReleaseInfo info = fetchReleaseInfo(manifestUrl);
|
||||
if (info.versionCode <= BuildConfig.VERSION_CODE) {
|
||||
postMessage("Already up to date: " + BuildConfig.VERSION_NAME + " from " + hostLabel(manifestUrl));
|
||||
return;
|
||||
}
|
||||
postMessage("Update found: " + info.versionName + " from " + hostLabel(manifestUrl));
|
||||
activity.runOnUiThread(() -> showUpdateDialog(info));
|
||||
return;
|
||||
} catch (Exception error) {
|
||||
lastError = error;
|
||||
if (index + 1 < manifestUrls.length) {
|
||||
postMessage(hostLabel(manifestUrl) + " failed; trying " + hostLabel(manifestUrls[index + 1]) + "...");
|
||||
}
|
||||
}
|
||||
}
|
||||
postMessage("Update found: " + info.versionName);
|
||||
activity.runOnUiThread(() -> showUpdateDialog(info));
|
||||
} catch (Exception error) {
|
||||
postMessage(userInitiated ? "Update check failed: " + error.getMessage() : null);
|
||||
if (lastError != null) {
|
||||
throw lastError;
|
||||
}
|
||||
throw new IllegalStateException("No update sources configured");
|
||||
} catch (Exception finalError) {
|
||||
postMessage(userInitiated ? "Update check failed: " + finalError.getMessage() : null);
|
||||
} finally {
|
||||
checkInProgress = false;
|
||||
activity.runOnUiThread(() -> callback.onChecking(false));
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private List<String> getUpdateManifestUrls() {
|
||||
LinkedHashSet<String> urls = new LinkedHashSet<>();
|
||||
addUrl(urls, prefs.getString("update_url", BuildConfig.DEFAULT_UPDATE_URL));
|
||||
addUrl(urls, BuildConfig.DEFAULT_UPDATE_URL);
|
||||
addUrl(urls, BuildConfig.DEFAULT_GITEA_UPDATE_URL);
|
||||
return new ArrayList<>(urls);
|
||||
void openApkDownload() {
|
||||
openSelectedReleaseUrl("APK", info -> info.apkUrl);
|
||||
}
|
||||
|
||||
private void addUrl(LinkedHashSet<String> urls, String url) {
|
||||
if (url != null && !url.trim().isEmpty()) {
|
||||
urls.add(url.trim());
|
||||
void openReleasePage() {
|
||||
openSelectedReleaseUrl("Release page", info -> info.releasePageUrl);
|
||||
}
|
||||
|
||||
private void openSelectedReleaseUrl(String label, ReleaseUrlPicker picker) {
|
||||
if (checkInProgress) {
|
||||
postMessage("Update check already running");
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
private ReleaseInfo fetchFirstReleaseInfo(List<String> manifestUrls) throws Exception {
|
||||
Exception lastError = null;
|
||||
for (String manifestUrl : manifestUrls) {
|
||||
String manifestUrl = getUpdateManifestUrl();
|
||||
checkInProgress = true;
|
||||
callback.onChecking(true);
|
||||
postMessage("Resolving " + label + " from " + hostLabel(manifestUrl) + "...");
|
||||
executor.execute(() -> {
|
||||
try {
|
||||
postMessage("Checking " + hostLabel(manifestUrl) + "...");
|
||||
return fetchReleaseInfo(manifestUrl);
|
||||
ReleaseInfo info = fetchReleaseInfo(manifestUrl);
|
||||
String url = picker.pick(info);
|
||||
if (url == null || url.trim().isEmpty()) {
|
||||
throw new IllegalStateException(label + " URL is missing");
|
||||
}
|
||||
activity.runOnUiThread(() -> openExternalUrl(url.trim(), label));
|
||||
} catch (Exception error) {
|
||||
lastError = error;
|
||||
postMessage(hostLabel(manifestUrl) + " failed");
|
||||
postMessage(label + " failed: " + error.getMessage());
|
||||
} finally {
|
||||
checkInProgress = false;
|
||||
activity.runOnUiThread(() -> callback.onChecking(false));
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private String getUpdateManifestUrl() {
|
||||
String url = prefs.getString("update_url", BuildConfig.DEFAULT_UPDATE_URL);
|
||||
if (url == null || url.trim().isEmpty()) {
|
||||
return BuildConfig.DEFAULT_UPDATE_URL;
|
||||
}
|
||||
throw lastError == null ? new IllegalStateException("No update source configured") : lastError;
|
||||
return url.trim();
|
||||
}
|
||||
|
||||
private String hostLabel(String url) {
|
||||
@ -151,6 +231,22 @@ final class UpdateManager {
|
||||
}
|
||||
|
||||
private String readText(String url) throws Exception {
|
||||
Exception lastError = null;
|
||||
for (int attempt = 1; attempt <= NETWORK_ATTEMPTS; attempt++) {
|
||||
try {
|
||||
return readTextOnce(url);
|
||||
} catch (Exception error) {
|
||||
lastError = error;
|
||||
if (attempt < NETWORK_ATTEMPTS) {
|
||||
postMessage("Retrying " + hostLabel(url) + " (" + (attempt + 1) + "/" + NETWORK_ATTEMPTS + ")...");
|
||||
waitBeforeRetry();
|
||||
}
|
||||
}
|
||||
}
|
||||
throw lastError == null ? new IllegalStateException("Request failed") : lastError;
|
||||
}
|
||||
|
||||
private String readTextOnce(String url) throws Exception {
|
||||
HttpURLConnection connection = (HttpURLConnection) new URL(url).openConnection();
|
||||
connection.setConnectTimeout(12000);
|
||||
connection.setReadTimeout(12000);
|
||||
@ -173,8 +269,13 @@ final class UpdateManager {
|
||||
}
|
||||
|
||||
private void downloadAndInstall(ReleaseInfo info) {
|
||||
if (downloadInProgress) {
|
||||
postMessage("Update download already running");
|
||||
return;
|
||||
}
|
||||
downloadInProgress = true;
|
||||
callback.onChecking(true);
|
||||
postMessage("Downloading " + info.versionName + "...");
|
||||
postMessage("Preparing " + info.versionName + "...");
|
||||
executor.execute(() -> {
|
||||
try {
|
||||
File apk = downloadApk(info);
|
||||
@ -189,6 +290,7 @@ final class UpdateManager {
|
||||
} catch (Exception error) {
|
||||
postMessage("Update download failed: " + error.getMessage());
|
||||
} finally {
|
||||
downloadInProgress = false;
|
||||
activity.runOnUiThread(() -> callback.onChecking(false));
|
||||
}
|
||||
});
|
||||
@ -200,8 +302,42 @@ final class UpdateManager {
|
||||
throw new IllegalStateException("Cannot create update cache");
|
||||
}
|
||||
File apk = new File(dir, "tmux-android-" + info.versionCode + ".apk");
|
||||
if (isCachedApkValid(apk, info)) {
|
||||
postMessage("Using downloaded APK");
|
||||
return apk;
|
||||
}
|
||||
|
||||
HttpURLConnection connection = (HttpURLConnection) new URL(info.apkUrl).openConnection();
|
||||
postMessage("Downloading " + info.versionName + "...");
|
||||
File partial = new File(dir, "tmux-android-" + info.versionCode + ".apk.tmp");
|
||||
if (partial.exists()) {
|
||||
partial.delete();
|
||||
}
|
||||
if (apk.exists()) {
|
||||
apk.delete();
|
||||
}
|
||||
|
||||
Exception lastError = null;
|
||||
for (int attempt = 1; attempt <= NETWORK_ATTEMPTS; attempt++) {
|
||||
try {
|
||||
downloadApkOnce(info.apkUrl, partial);
|
||||
if (!partial.renameTo(apk)) {
|
||||
throw new IllegalStateException("Cannot finalize APK download");
|
||||
}
|
||||
return apk;
|
||||
} catch (Exception error) {
|
||||
lastError = error;
|
||||
partial.delete();
|
||||
if (attempt < NETWORK_ATTEMPTS) {
|
||||
postMessage("Retrying APK download (" + (attempt + 1) + "/" + NETWORK_ATTEMPTS + ")...");
|
||||
waitBeforeRetry();
|
||||
}
|
||||
}
|
||||
}
|
||||
throw lastError == null ? new IllegalStateException("APK download failed") : lastError;
|
||||
}
|
||||
|
||||
private void downloadApkOnce(String apkUrl, File apk) throws Exception {
|
||||
HttpURLConnection connection = (HttpURLConnection) new URL(apkUrl).openConnection();
|
||||
connection.setConnectTimeout(12000);
|
||||
connection.setReadTimeout(60000);
|
||||
try (InputStream input = new BufferedInputStream(connection.getInputStream());
|
||||
@ -214,21 +350,34 @@ final class UpdateManager {
|
||||
} finally {
|
||||
connection.disconnect();
|
||||
}
|
||||
return apk;
|
||||
}
|
||||
|
||||
private boolean isCachedApkValid(File apk, ReleaseInfo info) throws Exception {
|
||||
if (!apk.exists() || apk.length() <= 0) {
|
||||
return false;
|
||||
}
|
||||
if (info.sha256.isEmpty()) {
|
||||
return true;
|
||||
}
|
||||
return sha256(apk).equalsIgnoreCase(info.sha256);
|
||||
}
|
||||
|
||||
private void installApk(File apk) {
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O
|
||||
&& !activity.getPackageManager().canRequestPackageInstalls()) {
|
||||
pendingInstallApk = apk;
|
||||
prefs.edit().putString(PREF_PENDING_INSTALL_APK, apk.getAbsolutePath()).apply();
|
||||
Intent settingsIntent = new Intent(
|
||||
Settings.ACTION_MANAGE_UNKNOWN_APP_SOURCES,
|
||||
Uri.parse("package:" + activity.getPackageName())
|
||||
);
|
||||
activity.startActivity(settingsIntent);
|
||||
Toast.makeText(activity, "Allow installs, then run update again", Toast.LENGTH_LONG).show();
|
||||
Toast.makeText(activity, "Allow installs, then return to continue", Toast.LENGTH_LONG).show();
|
||||
postMessage("Install permission required");
|
||||
return;
|
||||
}
|
||||
pendingInstallApk = null;
|
||||
prefs.edit().remove(PREF_PENDING_INSTALL_APK).apply();
|
||||
|
||||
Uri apkUri = UpdateFileProvider.getUriForFile(
|
||||
activity,
|
||||
@ -247,6 +396,41 @@ final class UpdateManager {
|
||||
}
|
||||
}
|
||||
|
||||
private void openExternalUrl(String url, String label) {
|
||||
try {
|
||||
activity.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url)));
|
||||
postMessage("Opened " + label);
|
||||
} catch (ActivityNotFoundException error) {
|
||||
postMessage("No app can open " + label);
|
||||
}
|
||||
}
|
||||
|
||||
void resumePendingInstall() {
|
||||
File apk = pendingInstallApk;
|
||||
if (apk == null) {
|
||||
String path = prefs.getString(PREF_PENDING_INSTALL_APK, "");
|
||||
if (path != null && !path.isEmpty()) {
|
||||
apk = new File(path);
|
||||
pendingInstallApk = apk;
|
||||
}
|
||||
}
|
||||
if (apk == null) {
|
||||
return;
|
||||
}
|
||||
if (!apk.exists() || apk.length() <= 0) {
|
||||
pendingInstallApk = null;
|
||||
prefs.edit().remove(PREF_PENDING_INSTALL_APK).apply();
|
||||
postMessage("Downloaded APK is no longer available");
|
||||
return;
|
||||
}
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O
|
||||
&& !activity.getPackageManager().canRequestPackageInstalls()) {
|
||||
return;
|
||||
}
|
||||
postMessage("Continuing APK install...");
|
||||
installApk(apk);
|
||||
}
|
||||
|
||||
private static byte[] readAllBytes(InputStream input) throws Exception {
|
||||
java.io.ByteArrayOutputStream output = new java.io.ByteArrayOutputStream();
|
||||
byte[] buffer = new byte[16 * 1024];
|
||||
@ -280,4 +464,8 @@ final class UpdateManager {
|
||||
}
|
||||
activity.runOnUiThread(() -> callback.onMessage(message));
|
||||
}
|
||||
|
||||
private void waitBeforeRetry() throws InterruptedException {
|
||||
Thread.sleep(RETRY_DELAY_MS);
|
||||
}
|
||||
}
|
||||
|
||||
@ -70,6 +70,8 @@ Implemented now:
|
||||
|
||||
- configurable base URL, defaulting to `http://100.89.0.116:3000`
|
||||
- support for Tailscale URLs such as `http://100.x.y.z:3000`
|
||||
- native multi-page shell with `Sessions`, `Projects`, `Tools`, `Update`, and
|
||||
`About`
|
||||
- native session list from `GET /api/sessions`
|
||||
- create, rename, command send, split, pane select, pane kill, pin, mute, and
|
||||
kill session through documented session/preference endpoints
|
||||
@ -78,18 +80,60 @@ Implemented now:
|
||||
- bottom shortcut bar for `Esc`, `Tab`, `Ctrl+C`, `Ctrl+V`, arrows, page keys,
|
||||
tmux prefix actions, and paste
|
||||
- shortcut delivery through the terminal WebSocket `input` message
|
||||
- native action center for health, server status, timeline, preferences, kanban
|
||||
projects, group messages, hook events, image file/URL upload, image preview
|
||||
metadata, and native image preview display
|
||||
- native Projects page for kanban project grouping, project agents, project
|
||||
messages, add/remove session, create, and delete actions
|
||||
- native Tools page for health, server status, timeline, preferences, hook
|
||||
events, image file/URL upload, image preview metadata, and native image
|
||||
preview display
|
||||
- GitHub Actions APK build
|
||||
- release manifest `latest.json`
|
||||
- APK download, SHA-256 verification, and installer handoff
|
||||
- Auto/Gitea/GitHub/Selected update checks, with Auto falling back from Gitea
|
||||
to GitHub
|
||||
- one-download-per-version APK cache, SHA-256 verification, and installer
|
||||
handoff
|
||||
- terminal viewport resize derived from the Android text area, including
|
||||
keyboard height changes, to avoid fixed-width tmux output wrapping on phones
|
||||
- permission/about surfaces for unknown-app install status, notification status,
|
||||
app settings, app version/build type, package name, selected update source, and
|
||||
HTTP/WebSocket API/protocol summary
|
||||
|
||||
## Update And Release Policy
|
||||
|
||||
The Android app cannot silently replace itself. It may download a newer APK and
|
||||
open Android's package installer, but the user must approve the install. On
|
||||
Android 8+, the user may also need to allow this app to install unknown apps.
|
||||
|
||||
The app provides explicit update checks for Auto, Gitea, GitHub, and Selected.
|
||||
Auto checks Gitea first because phones may not reach GitHub reliably, then tries
|
||||
GitHub only if Gitea cannot be reached. The manual Gitea, GitHub, and Selected
|
||||
buttons force one source. Transient network failures are retried against the
|
||||
current source before a source is considered failed.
|
||||
|
||||
Downloaded APKs are cached by `versionCode`. If a cached APK exists and its
|
||||
SHA-256 matches the manifest, the app reuses it instead of downloading the same
|
||||
version again. This matters when Android redirects the user to unknown-app
|
||||
install settings before the installer can run. After the user grants that
|
||||
permission and returns to the app, the app resumes installation of the pending
|
||||
APK instead of asking the user to run update again.
|
||||
|
||||
Only `v*` tags publish GitHub Releases. Main branch builds and manual workflow
|
||||
runs are for CI artifacts and should be used to validate grouped changes. Do not
|
||||
publish a new tag for every small UI copy or layout change; publish when there
|
||||
is a useful feature or test batch for phone-side validation.
|
||||
|
||||
Release APKs must be identical across the public GitHub and Gitea download
|
||||
channels. Treat the GitHub Release APK as the canonical build artifact, then
|
||||
mirror that same APK byte-for-byte to the matching Gitea Release. The Gitea
|
||||
`latest.json` should point to the Gitea APK URL, but it must keep the same
|
||||
`versionCode`, `versionName`, and `sha256` as the GitHub manifest. A Gitea-built
|
||||
APK is only a compile check unless its SHA-256 exactly matches the GitHub
|
||||
release APK.
|
||||
|
||||
## Native Roadmap
|
||||
|
||||
To converge with the upstream mobile design, the next implementation should add
|
||||
native Android modules in this order:
|
||||
|
||||
1. richer native layouts for kanban, group messages, timeline, and preferences
|
||||
1. richer native layouts for group messages, timeline, and preferences
|
||||
2. `TerminalCore` with ANSI parsing, cursor state, colors, and dirty rows
|
||||
3. configurable shortcut bar backed directly by WebSocket `input`
|
||||
|
||||
Loading…
Reference in New Issue
Block a user