Compare commits
45
Commits
@@ -6,12 +6,6 @@
|
||||
# ExecStart=/usr/local/bin/forgejo-runner daemon --config /etc/forgejo/config.yml
|
||||
FROM ghcr.io/catthehacker/ubuntu:go-24.04
|
||||
|
||||
# Infrastructure tools required by CI workflows
|
||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||
stunnel4 \
|
||||
netcat-openbsd \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Dagger CLI — pinned to match the engine version on the runner host
|
||||
RUN curl -fsSL https://dl.dagger.io/dagger/install.sh \
|
||||
| DAGGER_VERSION=0.20.8 BIN_DIR=/usr/local/bin sh
|
||||
|
||||
+3
-148
@@ -1,159 +1,14 @@
|
||||
name: CI
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [main]
|
||||
paths:
|
||||
- 'lib/**'
|
||||
- 'test/**'
|
||||
- 'integration_test/**'
|
||||
- 'android/**'
|
||||
- 'linux/**'
|
||||
- 'assets/**'
|
||||
- '!assets/changelog.txt'
|
||||
- 'pubspec.yaml'
|
||||
- 'pubspec.lock'
|
||||
- 'analysis_options.yaml'
|
||||
- 'scripts/**'
|
||||
- 'stalwart-dev/**'
|
||||
- 'ci/**'
|
||||
- 'Taskfile.yml'
|
||||
- 'drift_schemas/**'
|
||||
- '.forgejo/workflows/ci.yml'
|
||||
pull_request:
|
||||
paths:
|
||||
- 'lib/**'
|
||||
- 'test/**'
|
||||
- 'integration_test/**'
|
||||
- 'android/**'
|
||||
- 'linux/**'
|
||||
- 'assets/**'
|
||||
- '!assets/changelog.txt'
|
||||
- 'pubspec.yaml'
|
||||
- 'pubspec.lock'
|
||||
- 'analysis_options.yaml'
|
||||
- 'scripts/**'
|
||||
- 'stalwart-dev/**'
|
||||
- 'ci/**'
|
||||
- 'Taskfile.yml'
|
||||
- 'drift_schemas/**'
|
||||
- '.forgejo/workflows/ci.yml'
|
||||
|
||||
on: [push, pull_request]
|
||||
jobs:
|
||||
check:
|
||||
name: Full Project Check
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 60
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
fetch-depth: 50
|
||||
|
||||
- name: Check runner tools
|
||||
run: |
|
||||
command -v dagger >/dev/null 2>&1 || { echo "ERROR: dagger is not installed in the runner image. Add it to .forgejo/Dockerfile."; exit 1; }
|
||||
command -v task >/dev/null 2>&1 || { echo "ERROR: task is not installed in the runner image. Add it to .forgejo/Dockerfile."; exit 1; }
|
||||
dpkg -s stunnel4 netcat-openbsd >/dev/null 2>&1 || { echo "ERROR: stunnel4/netcat-openbsd are not installed in the runner image. Add them to .forgejo/Dockerfile."; exit 1; }
|
||||
|
||||
- name: Setup Dagger Remote Engine (via stunnel)
|
||||
- name: Setup Dagger Remote Engine
|
||||
env:
|
||||
DAGGER_STUNNEL_URL: ${{ secrets.DAGGER_STUNNEL_URL }}
|
||||
DAGGER_CA_CERT: ${{ secrets.DAGGER_CA_CERT }}
|
||||
DAGGER_CLIENT_CERT: ${{ secrets.DAGGER_CLIENT_CERT }}
|
||||
DAGGER_CLIENT_KEY: ${{ secrets.DAGGER_CLIENT_KEY }}
|
||||
SOPS_AGE_KEY: ${{ secrets.SOPS_AGE_KEY }}
|
||||
run: scripts/setup_dagger_remote.sh
|
||||
|
||||
- name: Locate Docker daemon for local Dagger engine
|
||||
run: |
|
||||
# Skip if remote Dagger engine is already configured (preferred path)
|
||||
if [ -n "${_DAGGER_RUNNER_HOST:-}" ]; then
|
||||
echo "Remote Dagger engine configured, no local Docker needed."
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# Try host Docker socket (DooD) if runner mounts it
|
||||
if [ -S /var/run/docker.sock ]; then
|
||||
if DOCKER_HOST=unix:///var/run/docker.sock docker info >/dev/null 2>&1; then
|
||||
echo "Docker available via host socket."
|
||||
echo "DOCKER_HOST=unix:///var/run/docker.sock" >> "$GITHUB_ENV"
|
||||
exit 0
|
||||
fi
|
||||
fi
|
||||
|
||||
echo "WARNING: No remote Dagger engine and no local Docker found." >&2
|
||||
echo " - Remote engine: check DAGGER_STUNNEL_URL secret and that the host proxy is running." >&2
|
||||
echo " - Local Docker: runner does not expose /var/run/docker.sock." >&2
|
||||
echo "CI will likely fail at the Dagger step." >&2
|
||||
|
||||
- name: Prune Dagger cache before check
|
||||
env:
|
||||
DAGGER_NO_NAG: "1"
|
||||
# prune(maxUsedSpace) also reclaims named cache volumes (gradle-cache, go-build-cache, etc.)
|
||||
# when total cache exceeds the limit; without args only unreferenced entries are removed.
|
||||
run: |
|
||||
dagger query '{ engine { localCache { prune(maxUsedSpace: "75gb", targetSpace: "50gb") } } }' || true
|
||||
|
||||
- name: Run Full Check Suite
|
||||
env:
|
||||
DAGGER_NO_NAG: "1"
|
||||
run: task check-dagger
|
||||
|
||||
- name: Prune Dagger cache after check
|
||||
if: always()
|
||||
env:
|
||||
DAGGER_NO_NAG: "1"
|
||||
run: |
|
||||
dagger query '{ engine { localCache { prune(maxUsedSpace: "75gb", targetSpace: "50gb") } } }' || true
|
||||
|
||||
- name: Cleanup TLS credentials
|
||||
if: always()
|
||||
run: rm -rf /tmp/dagger-tls /tmp/stunnel-dagger.conf /tmp/stunnel.pid
|
||||
|
||||
merge-renovate:
|
||||
name: Auto-merge Renovate PR
|
||||
needs: [check]
|
||||
if: github.event_name == 'pull_request' && startsWith(github.head_ref, 'renovate/')
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 5
|
||||
|
||||
steps:
|
||||
- name: Merge if automerge label is set
|
||||
env:
|
||||
FORGEJO_TOKEN: ${{ github.token }}
|
||||
PR_NUMBER: ${{ github.event.pull_request.number }}
|
||||
run: |
|
||||
python3 - << 'PYEOF'
|
||||
import os, json, urllib.request, urllib.error, sys
|
||||
|
||||
token = os.environ["FORGEJO_TOKEN"]
|
||||
url_base = os.environ.get("GITHUB_SERVER_URL", "").rstrip("/")
|
||||
repo = os.environ.get("GITHUB_REPOSITORY", "")
|
||||
pr_number = os.environ["PR_NUMBER"]
|
||||
api = f"{url_base}/api/v1/repos/{repo}"
|
||||
headers = {"Authorization": f"token {token}", "Content-Type": "application/json"}
|
||||
|
||||
req = urllib.request.Request(f"{api}/issues/{pr_number}/labels", headers=headers)
|
||||
with urllib.request.urlopen(req) as r:
|
||||
labels = [l["name"] for l in json.loads(r.read())]
|
||||
|
||||
if "automerge" not in labels:
|
||||
print(f"PR #{pr_number}: no 'automerge' label — major update, skipping")
|
||||
sys.exit(0)
|
||||
|
||||
body = json.dumps({"Do": "merge"}).encode()
|
||||
req = urllib.request.Request(
|
||||
f"{api}/pulls/{pr_number}/merge",
|
||||
data=body, headers=headers, method="POST"
|
||||
)
|
||||
try:
|
||||
with urllib.request.urlopen(req) as r:
|
||||
print(f"PR #{pr_number} merged successfully")
|
||||
except urllib.error.HTTPError as e:
|
||||
err = e.read().decode()
|
||||
if "already been merged" in err or "has been merged" in err:
|
||||
print(f"PR #{pr_number} already merged — OK")
|
||||
else:
|
||||
print(f"Merge failed: {err}")
|
||||
sys.exit(1)
|
||||
PYEOF
|
||||
|
||||
@@ -106,28 +106,17 @@ jobs:
|
||||
run: |
|
||||
command -v dagger >/dev/null 2>&1 || { echo "ERROR: dagger is not installed in the runner image. Add it to .forgejo/Dockerfile."; exit 1; }
|
||||
command -v task >/dev/null 2>&1 || { echo "ERROR: task is not installed in the runner image. Add it to .forgejo/Dockerfile."; exit 1; }
|
||||
dpkg -s stunnel4 netcat-openbsd >/dev/null 2>&1 || { echo "ERROR: stunnel4/netcat-openbsd are not installed in the runner image. Add them to .forgejo/Dockerfile."; exit 1; }
|
||||
|
||||
- name: Setup Dagger Remote Engine (via stunnel)
|
||||
- name: Setup Dagger Remote Engine
|
||||
env:
|
||||
DAGGER_STUNNEL_URL: ${{ secrets.DAGGER_STUNNEL_URL }}
|
||||
DAGGER_CA_CERT: ${{ secrets.DAGGER_CA_CERT }}
|
||||
DAGGER_CLIENT_CERT: ${{ secrets.DAGGER_CLIENT_CERT }}
|
||||
DAGGER_CLIENT_KEY: ${{ secrets.DAGGER_CLIENT_KEY }}
|
||||
SOPS_AGE_KEY: ${{ secrets.SOPS_AGE_KEY }}
|
||||
run: scripts/setup_dagger_remote.sh
|
||||
|
||||
- name: Publish Android to Play Store
|
||||
if: ${{ secrets.PLAY_STORE_CONFIG_JSON != '' }}
|
||||
env:
|
||||
ANDROID_KEYSTORE_BASE64: ${{ secrets.ANDROID_KEYSTORE_BASE64 }}
|
||||
ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
|
||||
PLAY_STORE_CONFIG_JSON: ${{ secrets.PLAY_STORE_CONFIG_JSON }}
|
||||
DAGGER_NO_NAG: "1"
|
||||
run: task publish-android
|
||||
|
||||
- name: Cleanup TLS credentials
|
||||
if: always()
|
||||
run: rm -rf /tmp/dagger-tls /tmp/stunnel-dagger.conf /tmp/stunnel.pid
|
||||
|
||||
deploy-apk:
|
||||
name: Build & Deploy APK to Server
|
||||
@@ -145,31 +134,17 @@ jobs:
|
||||
run: |
|
||||
command -v dagger >/dev/null 2>&1 || { echo "ERROR: dagger is not installed in the runner image. Add it to .forgejo/Dockerfile."; exit 1; }
|
||||
command -v task >/dev/null 2>&1 || { echo "ERROR: task is not installed in the runner image. Add it to .forgejo/Dockerfile."; exit 1; }
|
||||
dpkg -s stunnel4 netcat-openbsd >/dev/null 2>&1 || { echo "ERROR: stunnel4/netcat-openbsd are not installed in the runner image. Add them to .forgejo/Dockerfile."; exit 1; }
|
||||
|
||||
- name: Setup Dagger Remote Engine (via stunnel)
|
||||
- name: Setup Dagger Remote Engine
|
||||
env:
|
||||
DAGGER_STUNNEL_URL: ${{ secrets.DAGGER_STUNNEL_URL }}
|
||||
DAGGER_CA_CERT: ${{ secrets.DAGGER_CA_CERT }}
|
||||
DAGGER_CLIENT_CERT: ${{ secrets.DAGGER_CLIENT_CERT }}
|
||||
DAGGER_CLIENT_KEY: ${{ secrets.DAGGER_CLIENT_KEY }}
|
||||
SOPS_AGE_KEY: ${{ secrets.SOPS_AGE_KEY }}
|
||||
run: scripts/setup_dagger_remote.sh
|
||||
|
||||
- name: Build & Deploy APK to server
|
||||
if: ${{ secrets.SSH_PRIVATE_KEY != '' }}
|
||||
env:
|
||||
SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
|
||||
SSH_KNOWN_HOSTS: ${{ secrets.SSH_KNOWN_HOSTS }}
|
||||
SSH_USER: ${{ secrets.SSH_USER }}
|
||||
SSH_HOST: ${{ secrets.SSH_HOST }}
|
||||
ANDROID_KEYSTORE_BASE64: ${{ secrets.ANDROID_KEYSTORE_BASE64 }}
|
||||
ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
|
||||
DAGGER_NO_NAG: "1"
|
||||
run: task deploy-apk
|
||||
|
||||
- name: Cleanup TLS credentials
|
||||
if: always()
|
||||
run: rm -rf /tmp/dagger-tls /tmp/stunnel-dagger.conf /tmp/stunnel.pid
|
||||
|
||||
build-linux:
|
||||
name: Build Linux Release
|
||||
@@ -187,29 +162,17 @@ jobs:
|
||||
run: |
|
||||
command -v dagger >/dev/null 2>&1 || { echo "ERROR: dagger is not installed in the runner image. Add it to .forgejo/Dockerfile."; exit 1; }
|
||||
command -v task >/dev/null 2>&1 || { echo "ERROR: task is not installed in the runner image. Add it to .forgejo/Dockerfile."; exit 1; }
|
||||
dpkg -s stunnel4 netcat-openbsd >/dev/null 2>&1 || { echo "ERROR: stunnel4/netcat-openbsd are not installed in the runner image. Add them to .forgejo/Dockerfile."; exit 1; }
|
||||
|
||||
- name: Setup Dagger Remote Engine (via stunnel)
|
||||
- name: Setup Dagger Remote Engine
|
||||
env:
|
||||
DAGGER_STUNNEL_URL: ${{ secrets.DAGGER_STUNNEL_URL }}
|
||||
DAGGER_CA_CERT: ${{ secrets.DAGGER_CA_CERT }}
|
||||
DAGGER_CLIENT_CERT: ${{ secrets.DAGGER_CLIENT_CERT }}
|
||||
DAGGER_CLIENT_KEY: ${{ secrets.DAGGER_CLIENT_KEY }}
|
||||
SOPS_AGE_KEY: ${{ secrets.SOPS_AGE_KEY }}
|
||||
run: scripts/setup_dagger_remote.sh
|
||||
|
||||
- name: Build & Deploy Linux to server
|
||||
if: ${{ secrets.SSH_PRIVATE_KEY != '' }}
|
||||
env:
|
||||
SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
|
||||
SSH_KNOWN_HOSTS: ${{ secrets.SSH_KNOWN_HOSTS }}
|
||||
SSH_USER: ${{ secrets.SSH_USER }}
|
||||
SSH_HOST: ${{ secrets.SSH_HOST }}
|
||||
DAGGER_NO_NAG: "1"
|
||||
run: task deploy-linux
|
||||
|
||||
- name: Cleanup TLS credentials
|
||||
if: always()
|
||||
run: rm -rf /tmp/dagger-tls /tmp/stunnel-dagger.conf /tmp/stunnel.pid
|
||||
|
||||
label-deploy-health:
|
||||
name: Update Deploy Health Label
|
||||
|
||||
@@ -58,28 +58,18 @@ jobs:
|
||||
run: |
|
||||
command -v dagger >/dev/null 2>&1 || { echo "ERROR: dagger is not installed in the runner image. Add it to .forgejo/Dockerfile."; exit 1; }
|
||||
command -v task >/dev/null 2>&1 || { echo "ERROR: task is not installed in the runner image. Add it to .forgejo/Dockerfile."; exit 1; }
|
||||
dpkg -s stunnel4 netcat-openbsd >/dev/null 2>&1 || { echo "ERROR: stunnel4/netcat-openbsd are not installed in the runner image. Add them to .forgejo/Dockerfile."; exit 1; }
|
||||
|
||||
- name: Setup Dagger Remote Engine (via stunnel)
|
||||
- name: Setup Dagger Remote Engine
|
||||
env:
|
||||
DAGGER_STUNNEL_URL: ${{ secrets.DAGGER_STUNNEL_URL }}
|
||||
DAGGER_CA_CERT: ${{ secrets.DAGGER_CA_CERT }}
|
||||
DAGGER_CLIENT_CERT: ${{ secrets.DAGGER_CLIENT_CERT }}
|
||||
DAGGER_CLIENT_KEY: ${{ secrets.DAGGER_CLIENT_KEY }}
|
||||
SOPS_AGE_KEY: ${{ secrets.SOPS_AGE_KEY }}
|
||||
run: scripts/setup_dagger_remote.sh
|
||||
|
||||
- name: Run Android Tests on Firebase Test Lab
|
||||
if: ${{ secrets.FIREBASE_TEST_LAB_SERVICE_ACCOUNT_KEY != '' }}
|
||||
env:
|
||||
FIREBASE_TEST_LAB_SERVICE_ACCOUNT_KEY: ${{ secrets.FIREBASE_TEST_LAB_SERVICE_ACCOUNT_KEY }}
|
||||
FIREBASE_PROJECT_ID: ${{ vars.FIREBASE_PROJECT_ID }}
|
||||
DAGGER_NO_NAG: "1"
|
||||
run: task test-android-firebase
|
||||
|
||||
- name: Cleanup TLS credentials
|
||||
if: always()
|
||||
run: rm -rf /tmp/dagger-tls /tmp/stunnel-dagger.conf /tmp/stunnel.pid
|
||||
|
||||
- name: Create issue on test failure
|
||||
if: failure()
|
||||
env:
|
||||
|
||||
@@ -1,18 +0,0 @@
|
||||
name: Monitor Agent Loop
|
||||
|
||||
on:
|
||||
schedule:
|
||||
- cron: '0 */2 * * *' # every 2 hours
|
||||
workflow_dispatch:
|
||||
|
||||
jobs:
|
||||
monitor:
|
||||
name: Check Agent Loop Health
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 5
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
- name: Check agent loop heartbeat
|
||||
run: python3 scripts/agent_loop.py monitor
|
||||
@@ -18,22 +18,13 @@ jobs:
|
||||
run: |
|
||||
command -v dagger >/dev/null 2>&1 || { echo "ERROR: dagger is not installed in the runner image. Add it to .forgejo/Dockerfile."; exit 1; }
|
||||
command -v task >/dev/null 2>&1 || { echo "ERROR: task is not installed in the runner image. Add it to .forgejo/Dockerfile."; exit 1; }
|
||||
dpkg -s stunnel4 netcat-openbsd >/dev/null 2>&1 || { echo "ERROR: stunnel4/netcat-openbsd are not installed in the runner image. Add them to .forgejo/Dockerfile."; exit 1; }
|
||||
|
||||
- name: Setup Dagger Remote Engine (via stunnel)
|
||||
- name: Setup Dagger Remote Engine
|
||||
env:
|
||||
DAGGER_STUNNEL_URL: ${{ secrets.DAGGER_STUNNEL_URL }}
|
||||
DAGGER_CA_CERT: ${{ secrets.DAGGER_CA_CERT }}
|
||||
DAGGER_CLIENT_CERT: ${{ secrets.DAGGER_CLIENT_CERT }}
|
||||
DAGGER_CLIENT_KEY: ${{ secrets.DAGGER_CLIENT_KEY }}
|
||||
SOPS_AGE_KEY: ${{ secrets.SOPS_AGE_KEY }}
|
||||
run: scripts/setup_dagger_remote.sh
|
||||
|
||||
- name: Run Renovate
|
||||
env:
|
||||
DAGGER_NO_NAG: "1"
|
||||
RENOVATE_FORGEJO_TOKEN: ${{ secrets.RENOVATE_FORGEJO_TOKEN }}
|
||||
run: task renovate
|
||||
|
||||
- name: Cleanup TLS credentials
|
||||
if: always()
|
||||
run: rm -rf /tmp/dagger-tls /tmp/stunnel-dagger.conf /tmp/stunnel.pid
|
||||
|
||||
@@ -26,32 +26,18 @@ jobs:
|
||||
run: |
|
||||
command -v dagger >/dev/null 2>&1 || { echo "ERROR: dagger is not installed in the runner image. Add it to .forgejo/Dockerfile."; exit 1; }
|
||||
command -v task >/dev/null 2>&1 || { echo "ERROR: task is not installed in the runner image. Add it to .forgejo/Dockerfile."; exit 1; }
|
||||
dpkg -s stunnel4 netcat-openbsd >/dev/null 2>&1 || { echo "ERROR: stunnel4/netcat-openbsd are not installed in the runner image. Add them to .forgejo/Dockerfile."; exit 1; }
|
||||
|
||||
- name: Setup Dagger Remote Engine (via stunnel)
|
||||
- name: Setup Dagger Remote Engine
|
||||
env:
|
||||
DAGGER_STUNNEL_URL: ${{ secrets.DAGGER_STUNNEL_URL }}
|
||||
DAGGER_CA_CERT: ${{ secrets.DAGGER_CA_CERT }}
|
||||
DAGGER_CLIENT_CERT: ${{ secrets.DAGGER_CLIENT_CERT }}
|
||||
DAGGER_CLIENT_KEY: ${{ secrets.DAGGER_CLIENT_KEY }}
|
||||
SOPS_AGE_KEY: ${{ secrets.SOPS_AGE_KEY }}
|
||||
run: scripts/setup_dagger_remote.sh
|
||||
|
||||
- name: Build & Update Website
|
||||
if: ${{ secrets.SSH_PRIVATE_KEY != '' }}
|
||||
env:
|
||||
SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
|
||||
SSH_KNOWN_HOSTS: ${{ secrets.SSH_KNOWN_HOSTS }}
|
||||
SSH_USER: ${{ secrets.SSH_USER }}
|
||||
SSH_HOST: ${{ secrets.SSH_HOST }}
|
||||
DAGGER_NO_NAG: "1"
|
||||
run: task publish-website
|
||||
|
||||
- name: Verify Website
|
||||
if: ${{ secrets.SSH_PRIVATE_KEY != '' }}
|
||||
env:
|
||||
SSH_HOST: ${{ secrets.WEBSITE_SSH_HOST }}
|
||||
SSH_HOST: ${{ env.WEBSITE_SSH_HOST }}
|
||||
run: scripts/website-verify.sh
|
||||
|
||||
- name: Cleanup TLS credentials
|
||||
if: always()
|
||||
run: rm -rf /tmp/dagger-tls /tmp/stunnel-dagger.conf /tmp/stunnel.pid
|
||||
|
||||
@@ -8,46 +8,41 @@ CLI tool `fgj` is available to query issues/PRs/actions.
|
||||
|
||||
## Issue Label Workflow
|
||||
|
||||
We use issues, follow this label state machine:
|
||||
Automation is handled by [agentloop](https://github.com/guettli/agentloop) running every 5 minutes via cron. Add a label to trigger an agent:
|
||||
|
||||
- **State/ToPlan** — Issue needs a plan written by an agent before implementation
|
||||
- **State/Planned** — Plan has been posted as a comment; awaiting human review
|
||||
- **State/Ready** — Issue is approved and ready for implementation
|
||||
- **State/InProgress** — Set while an agent (or human) is actively working
|
||||
- **State/Question** — Agent hit a blocker or needs clarification
|
||||
| Label | Trigger | Outcome |
|
||||
|---|---|---|
|
||||
| `loop/plan` | Planning agent reads the issue and writes an implementation plan as a comment | Issue moves to `loop/plan-done` |
|
||||
| `loop/code` | Coding agent implements the change, creates a branch + PR | Issue moves to `loop/code-done` |
|
||||
|
||||
Full lifecycle:
|
||||
**State machine:**
|
||||
|
||||
```
|
||||
State/ToPlan → State/Planned (automated: agent_loop.py runs a planning agent)
|
||||
State/Planned → State/Ready (manual: human reviews the plan and approves)
|
||||
State/Ready → State/InProgress (automated: agent_loop.py before starting implementation)
|
||||
State/InProgress → closed (automated: after PR is merged and CI passes)
|
||||
any state → State/Question (automated or manual: when blocked)
|
||||
loop/plan → loop/plan-in-progress → loop/plan-done
|
||||
↘ NeedSupervisor (on failure)
|
||||
|
||||
loop/code → loop/code-in-progress → loop/code-done
|
||||
↘ NeedSupervisor (on failure)
|
||||
```
|
||||
|
||||
List open issues ready to pick up:
|
||||
**Rules:**
|
||||
|
||||
- Only issues authored by allowed users are picked up (guettli, guettlibot, guettlibot2, forgejo-actions).
|
||||
- An issue with `NeedSupervisor` needs human attention — investigate, fix, then re-label.
|
||||
- The coding agent opens a PR but does NOT close the issue. A human reviews the PR and closes the issue after merging.
|
||||
- Planning agents only post a comment — they do NOT write code or open PRs.
|
||||
- `loop/*` labels are managed by agentloop — do not set them manually while an agent is active.
|
||||
|
||||
**Typical lifecycle for a new feature:**
|
||||
|
||||
```bash
|
||||
fgj issue list --json --state open | jq '[.[] | select(.labels[].name == "State/Ready")] | .[] | {number, title, html_url}'
|
||||
```
|
||||
|
||||
Rules:
|
||||
|
||||
- Never start implementation on an issue without `State/Ready`
|
||||
- Planning agents only post a plan comment — they do NOT write code or open PRs
|
||||
- After `State/Planned`, a human must review the plan and manually add `State/Ready`
|
||||
- When working via the agent loop: label transitions are set automatically
|
||||
by `agent_loop.py` — do **not** set them yourself.
|
||||
- When working manually: switch to `State/InProgress` as your **first action**:
|
||||
```bash
|
||||
fgj issue edit <NUMBER> --remove-label "State/Ready" --add-label "State/InProgress"
|
||||
```
|
||||
- If blocked, replace current state label with `State/Question` and leave a comment explaining the blocker
|
||||
- When done and CI is green, close the issue:
|
||||
```bash
|
||||
fgj issue close <NUMBER>
|
||||
```
|
||||
1. Create issue
|
||||
2. Add label loop/plan → agent writes plan as comment
|
||||
3. Review plan, request changes or approve
|
||||
4. Add label loop/code → agent implements + opens PR
|
||||
5. Review PR, merge
|
||||
6. Close issue
|
||||
```
|
||||
|
||||
## Code conventions
|
||||
|
||||
|
||||
@@ -188,3 +188,5 @@ Using SSH to `localhost` is preferred over complex X11/Wayland permission hacks.
|
||||
## Daily Workflow
|
||||
|
||||
Refer to the [README.md](./README.md#daily-workflow) for common development tasks and commands.
|
||||
|
||||
<!-- agentloop code test passed -->
|
||||
|
||||
@@ -216,3 +216,8 @@ test/
|
||||
- **Settings** — list and remove accounts
|
||||
- **Search** — IMAP server-side search (subject + body); results shown inline, no navigation change
|
||||
- **Offline-first** — all reads come from local Drift/SQLite DB; network only for sync and send
|
||||
# CI Trigger
|
||||
# CI Trigger 2
|
||||
# Dummy commit to verify CI fixes
|
||||
# Dummy commit 3
|
||||
# CI Trigger 1780415300
|
||||
|
||||
+11
-2
@@ -298,7 +298,7 @@ tasks:
|
||||
echo "$(_ts) dagger: network error on attempt $attempt/3, retrying..." >&2
|
||||
elif [ "$attempt" -lt 3 ] && grep -q "No space left on device" "$DAGGER_OUT"; then
|
||||
echo "$(_ts) dagger: disk space error on attempt $attempt/3, pruning Dagger cache..." >&2
|
||||
dagger query '{ engine { localCache { prune(targetSpace: "20gb") } } }' 2>/dev/null || true
|
||||
timeout 120 dagger query '{ engine { localCache { prune(targetSpace: "20gb") } } }' 2>/dev/null || true
|
||||
echo "$(_ts) dagger: waiting 90s for freed space to settle..." >&2
|
||||
sleep 90
|
||||
else
|
||||
@@ -319,7 +319,16 @@ tasks:
|
||||
rm -f "$PORTFILE" "$DAGGER_OUT" "$RC_FILE"
|
||||
}
|
||||
trap cleanup EXIT
|
||||
until [ -s "$PORTFILE" ]; do sleep 0.05; done
|
||||
until [ -s "$PORTFILE" ]; do
|
||||
sleep 0.05
|
||||
if ! kill -0 "$RECV_PID" 2>/dev/null; then
|
||||
echo "$(_ts) otel-receiver.py died before writing port file; falling back to plain run" >&2
|
||||
retry_dagger dagger call --progress=plain -q -m ci --source=. check
|
||||
RC=$?
|
||||
rm -f "$PORTFILE" "$DAGGER_OUT" "$RC_FILE"
|
||||
exit $RC
|
||||
fi
|
||||
done
|
||||
PORT=$(cat "$PORTFILE")
|
||||
retry_dagger env \
|
||||
OTEL_EXPORTER_OTLP_ENDPOINT="http://127.0.0.1:$PORT" \
|
||||
|
||||
@@ -16,8 +16,10 @@ android {
|
||||
isCoreLibraryDesugaringEnabled = true
|
||||
}
|
||||
|
||||
kotlinOptions {
|
||||
jvmTarget = JavaVersion.VERSION_17.toString()
|
||||
kotlin {
|
||||
compilerOptions {
|
||||
jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17
|
||||
}
|
||||
}
|
||||
|
||||
signingConfigs {
|
||||
|
||||
@@ -19,8 +19,8 @@ pluginManagement {
|
||||
|
||||
plugins {
|
||||
id("dev.flutter.flutter-plugin-loader") version "1.0.0"
|
||||
id("com.android.application") version "8.11.1" apply false
|
||||
id("org.jetbrains.kotlin.android") version "2.2.20" apply false
|
||||
id("com.android.application") version "8.13.2" apply false
|
||||
id("org.jetbrains.kotlin.android") version "2.3.21" apply false
|
||||
}
|
||||
|
||||
include(":app")
|
||||
|
||||
+1
-1
@@ -181,7 +181,7 @@ func New(
|
||||
// Used as the base for pubGetLayer so flutter pub get is execution-cached between runs.
|
||||
func (m *Ci) toolchain() *dagger.Container {
|
||||
return dag.Container().
|
||||
From("ghcr.io/cirruslabs/flutter:3.41.6").
|
||||
From("ghcr.io/cirruslabs/flutter:3.44.0").
|
||||
WithExec([]string{"apt-get", "-qq", "update"}).
|
||||
WithExec([]string{"apt-get", "install", "-y", "-qq", "clang", "cmake", "ninja-build", "pkg-config", "libgtk-3-dev", "liblzma-dev", "libsecret-1-dev", "libgcrypt20-dev", "libjsoncpp-dev", "sqlite3", "iproute2", "netcat-openbsd", "xvfb", "libosmesa6", "libegl1", "lld"}).
|
||||
WithExec([]string{"useradd", "-m", "-s", "/bin/bash", "ci"}).
|
||||
|
||||
@@ -92,8 +92,9 @@ class ShareEncryptionService {
|
||||
) {
|
||||
if (!s.startsWith(_pubKeyPrefix)) return null;
|
||||
try {
|
||||
final data =
|
||||
Uint8List.fromList(base64.decode(s.substring(_pubKeyPrefix.length)));
|
||||
final data = Uint8List.fromList(
|
||||
base64.decode(s.substring(_pubKeyPrefix.length)),
|
||||
);
|
||||
if (data.length != _keyIdLen + _pubKeyLen) return null;
|
||||
return (
|
||||
keyId: data.sublist(0, _keyIdLen),
|
||||
|
||||
@@ -108,8 +108,9 @@ class SieveInterpreter {
|
||||
}
|
||||
|
||||
bool _globMatch(String value, String pattern) {
|
||||
final regexStr =
|
||||
RegExp.escape(pattern).replaceAll(r'\*', '.*').replaceAll(r'\?', '.');
|
||||
final regexStr = RegExp.escape(
|
||||
pattern,
|
||||
).replaceAll(r'\*', '.*').replaceAll(r'\?', '.');
|
||||
return RegExp('^$regexStr\$').hasMatch(value);
|
||||
}
|
||||
|
||||
|
||||
@@ -466,9 +466,7 @@ class _Scanner {
|
||||
|
||||
String readTaggedArg() {
|
||||
if (!isAtEnd && _src[_pos] == ':') return readWord();
|
||||
throw SieveParseException(
|
||||
'Expected tagged argument at position $_pos',
|
||||
);
|
||||
throw SieveParseException('Expected tagged argument at position $_pos');
|
||||
}
|
||||
|
||||
String? peekSizeUnit() {
|
||||
@@ -480,9 +478,7 @@ class _Scanner {
|
||||
|
||||
String readDigits() {
|
||||
if (isAtEnd || !_isDigit(_src[_pos])) {
|
||||
throw SieveParseException(
|
||||
'Expected number at position $_pos',
|
||||
);
|
||||
throw SieveParseException('Expected number at position $_pos');
|
||||
}
|
||||
final start = _pos;
|
||||
while (!isAtEnd && _isDigit(_src[_pos])) {
|
||||
@@ -493,9 +489,7 @@ class _Scanner {
|
||||
|
||||
String readQuotedString() {
|
||||
if (_src[_pos] != '"') {
|
||||
throw SieveParseException(
|
||||
'Expected " at position $_pos',
|
||||
);
|
||||
throw SieveParseException('Expected " at position $_pos');
|
||||
}
|
||||
_pos++; // skip opening quote
|
||||
final buf = StringBuffer();
|
||||
|
||||
@@ -35,10 +35,7 @@ String injectInlineImages(String html, imap.MimeMessage msg) {
|
||||
.replaceAll('src="cid:$bareCid"', 'src="$dataUri"')
|
||||
.replaceAll("src='cid:$bareCid'", "src='$dataUri'")
|
||||
.replaceAll('src="cid:${bareCid.toLowerCase()}"', 'src="$dataUri"')
|
||||
.replaceAll(
|
||||
"src='cid:${bareCid.toLowerCase()}'",
|
||||
"src='$dataUri'",
|
||||
);
|
||||
.replaceAll("src='cid:${bareCid.toLowerCase()}'", "src='$dataUri'");
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -9,8 +9,9 @@ class LocalSieveRepository {
|
||||
final AppDatabase _db;
|
||||
|
||||
Future<List<SieveScript>> listScripts(String accountId) async {
|
||||
final rows = await (_db.select(_db.localSieveScripts)
|
||||
..where((t) => t.accountId.equals(accountId)))
|
||||
final rows = await (_db.select(
|
||||
_db.localSieveScripts,
|
||||
)..where((t) => t.accountId.equals(accountId)))
|
||||
.get();
|
||||
return rows
|
||||
.map(
|
||||
@@ -26,10 +27,9 @@ class LocalSieveRepository {
|
||||
|
||||
Future<String> getScriptContent(String accountId, String blobId) async {
|
||||
final rowId = int.parse(blobId);
|
||||
final row = await (_db.select(_db.localSieveScripts)
|
||||
..where(
|
||||
(t) => t.id.equals(rowId) & t.accountId.equals(accountId),
|
||||
))
|
||||
final row = await (_db.select(
|
||||
_db.localSieveScripts,
|
||||
)..where((t) => t.id.equals(rowId) & t.accountId.equals(accountId)))
|
||||
.getSingleOrNull();
|
||||
if (row == null) throw Exception('Local script not found: $blobId');
|
||||
return row.content;
|
||||
@@ -44,9 +44,7 @@ class LocalSieveRepository {
|
||||
if (id != null) {
|
||||
final rowId = int.parse(id);
|
||||
await (_db.update(_db.localSieveScripts)
|
||||
..where(
|
||||
(t) => t.id.equals(rowId) & t.accountId.equals(accountId),
|
||||
))
|
||||
..where((t) => t.id.equals(rowId) & t.accountId.equals(accountId)))
|
||||
.write(
|
||||
LocalSieveScriptsCompanion(
|
||||
name: Value(name),
|
||||
@@ -78,10 +76,9 @@ class LocalSieveRepository {
|
||||
|
||||
Future<void> deleteScript(String accountId, String scriptId) async {
|
||||
final rowId = int.parse(scriptId);
|
||||
await (_db.delete(_db.localSieveScripts)
|
||||
..where(
|
||||
(t) => t.id.equals(rowId) & t.accountId.equals(accountId),
|
||||
))
|
||||
await (_db.delete(
|
||||
_db.localSieveScripts,
|
||||
)..where((t) => t.id.equals(rowId) & t.accountId.equals(accountId)))
|
||||
.go();
|
||||
}
|
||||
|
||||
@@ -92,9 +89,7 @@ class LocalSieveRepository {
|
||||
.write(const LocalSieveScriptsCompanion(isActive: Value(false)));
|
||||
final rowId = int.parse(scriptId);
|
||||
await (_db.update(_db.localSieveScripts)
|
||||
..where(
|
||||
(t) => t.id.equals(rowId) & t.accountId.equals(accountId),
|
||||
))
|
||||
..where((t) => t.id.equals(rowId) & t.accountId.equals(accountId)))
|
||||
.write(const LocalSieveScriptsCompanion(isActive: Value(true)));
|
||||
});
|
||||
}
|
||||
|
||||
@@ -9,11 +9,8 @@ import 'package:sharedinbox/data/db/database.dart';
|
||||
import 'package:sharedinbox/data/imap/imap_client_factory.dart';
|
||||
|
||||
class DraftRepositoryImpl implements DraftRepository {
|
||||
DraftRepositoryImpl(
|
||||
this._db,
|
||||
this._accounts, {
|
||||
ImapConnectFn? imapConnect,
|
||||
}) : _imapConnect = imapConnect;
|
||||
DraftRepositoryImpl(this._db, this._accounts, {ImapConnectFn? imapConnect})
|
||||
: _imapConnect = imapConnect;
|
||||
|
||||
final AppDatabase _db;
|
||||
final AccountRepository _accounts;
|
||||
@@ -124,10 +121,7 @@ class DraftRepositoryImpl implements DraftRepository {
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _syncWithServer(
|
||||
imap.ImapClient client,
|
||||
String accountId,
|
||||
) async {
|
||||
Future<void> _syncWithServer(imap.ImapClient client, String accountId) async {
|
||||
// Create/select the Drafts folder.
|
||||
try {
|
||||
await client.createMailbox('Drafts');
|
||||
@@ -162,8 +156,9 @@ class DraftRepositoryImpl implements DraftRepository {
|
||||
? uidList.first.toString()
|
||||
: null;
|
||||
if (uid != null) {
|
||||
await (_db.update(_db.drafts)..where((t) => t.id.equals(row.id)))
|
||||
.write(DraftsCompanion(imapServerId: Value(uid)));
|
||||
await (_db.update(_db.drafts)..where((t) => t.id.equals(row.id))).write(
|
||||
DraftsCompanion(imapServerId: Value(uid)),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -156,6 +156,7 @@ class EmailRepositoryImpl implements EmailRepository {
|
||||
return;
|
||||
}
|
||||
|
||||
if (threadEmails.isEmpty) return;
|
||||
final latest = threadEmails.last;
|
||||
|
||||
// Collect unique participants across the whole thread.
|
||||
@@ -237,7 +238,12 @@ class EmailRepositoryImpl implements EmailRepository {
|
||||
try {
|
||||
await client.selectMailboxByPath(emailRow.mailboxPath);
|
||||
final fetch = await client.uidFetchMessage(emailRow.uid, '(BODY.PEEK[])');
|
||||
final msg = fetch.messages.first;
|
||||
final msg = fetch.messages.firstOrNull;
|
||||
if (msg == null) {
|
||||
throw StateError(
|
||||
'IMAP server returned no message for UID ${emailRow.uid}.',
|
||||
);
|
||||
}
|
||||
final textBody = msg.decodeTextPlainPart();
|
||||
final rawHtml = msg.decodeTextHtmlPart();
|
||||
final htmlBody =
|
||||
@@ -325,13 +331,7 @@ class EmailRepositoryImpl implements EmailRepository {
|
||||
],
|
||||
'fetchHTMLBodyValues': true,
|
||||
'fetchTextBodyValues': true,
|
||||
'bodyProperties': [
|
||||
'partId',
|
||||
'type',
|
||||
'name',
|
||||
'size',
|
||||
'subParts',
|
||||
],
|
||||
'bodyProperties': ['partId', 'type', 'name', 'size', 'subParts'],
|
||||
},
|
||||
'0',
|
||||
],
|
||||
@@ -1949,8 +1949,9 @@ class EmailRepositoryImpl implements EmailRepository {
|
||||
.getSingleOrNull();
|
||||
final inboxPath = inboxMailbox?.path ?? 'INBOX';
|
||||
|
||||
final alreadyApplied = await (_db.select(_db.localSieveApplied)
|
||||
..where((t) => t.accountId.equals(accountId)))
|
||||
final alreadyApplied = await (_db.select(
|
||||
_db.localSieveApplied,
|
||||
)..where((t) => t.accountId.equals(accountId)))
|
||||
.get();
|
||||
final appliedIds = alreadyApplied.map((r) => r.messageId).toSet();
|
||||
|
||||
@@ -2050,7 +2051,9 @@ class EmailRepositoryImpl implements EmailRepository {
|
||||
..limit(1))
|
||||
.getSingleOrNull();
|
||||
if (destMailbox == null) {
|
||||
log('Sieve: JMAP mailbox "$folder" not found for account ${account.id}');
|
||||
log(
|
||||
'Sieve: JMAP mailbox "$folder" not found for account ${account.id}',
|
||||
);
|
||||
return;
|
||||
}
|
||||
destPath = destMailbox.path;
|
||||
@@ -2808,11 +2811,13 @@ class EmailRepositoryImpl implements EmailRepository {
|
||||
// Content-Transfer-Encoding) and getPart() can decode the part correctly.
|
||||
// A partial BODY.PEEK[n] fetch omits those headers, causing
|
||||
// decodeContentBinary() to return raw base64 instead of decoded bytes.
|
||||
final fetch = await client.uidFetchMessage(
|
||||
emailRow.uid,
|
||||
'BODY.PEEK[]',
|
||||
final fetch = await client.uidFetchMessage(emailRow.uid, 'BODY.PEEK[]');
|
||||
final msg = fetch.messages.firstOrNull;
|
||||
if (msg == null) {
|
||||
throw StateError(
|
||||
'IMAP server returned no message for UID ${emailRow.uid}.',
|
||||
);
|
||||
final msg = fetch.messages.first;
|
||||
}
|
||||
final part = msg.getPart(attachment.fetchPartId) ?? msg;
|
||||
final bytes = part.decodeContentBinary();
|
||||
if (bytes == null) {
|
||||
@@ -2874,11 +2879,14 @@ class EmailRepositoryImpl implements EmailRepository {
|
||||
);
|
||||
try {
|
||||
await client.selectMailboxByPath(emailRow.mailboxPath);
|
||||
final fetch = await client.uidFetchMessage(
|
||||
emailRow.uid,
|
||||
'BODY.PEEK[]',
|
||||
final fetch = await client.uidFetchMessage(emailRow.uid, 'BODY.PEEK[]');
|
||||
final msg = fetch.messages.firstOrNull;
|
||||
if (msg == null) {
|
||||
throw StateError(
|
||||
'IMAP server returned no message for UID ${emailRow.uid}.',
|
||||
);
|
||||
return fetch.messages.first.renderMessage();
|
||||
}
|
||||
return msg.renderMessage();
|
||||
} finally {
|
||||
await client.logout();
|
||||
}
|
||||
@@ -3252,14 +3260,17 @@ class EmailRepositoryImpl implements EmailRepository {
|
||||
await _db.customStatement('PRAGMA foreign_keys = OFF');
|
||||
try {
|
||||
await _db.transaction(() async {
|
||||
await (_db.delete(_db.emails)
|
||||
..where((t) => t.accountId.equals(accountId)))
|
||||
await (_db.delete(
|
||||
_db.emails,
|
||||
)..where((t) => t.accountId.equals(accountId)))
|
||||
.go();
|
||||
await (_db.delete(_db.pendingChanges)
|
||||
..where((t) => t.accountId.equals(accountId)))
|
||||
await (_db.delete(
|
||||
_db.pendingChanges,
|
||||
)..where((t) => t.accountId.equals(accountId)))
|
||||
.go();
|
||||
await (_db.delete(_db.syncStates)
|
||||
..where((t) => t.accountId.equals(accountId)))
|
||||
await (_db.delete(
|
||||
_db.syncStates,
|
||||
)..where((t) => t.accountId.equals(accountId)))
|
||||
.go();
|
||||
});
|
||||
} finally {
|
||||
|
||||
@@ -82,8 +82,9 @@ class MailboxRepositoryImpl implements MailboxRepository {
|
||||
|
||||
// Pre-load existing DB roles so we can preserve manually-set roles for
|
||||
// folders the server doesn't tag with a special-use attribute.
|
||||
final existingRows = await (_db.select(_db.mailboxes)
|
||||
..where((t) => t.accountId.equals(account.id)))
|
||||
final existingRows = await (_db.select(
|
||||
_db.mailboxes,
|
||||
)..where((t) => t.accountId.equals(account.id)))
|
||||
.get();
|
||||
final existingRoles = {for (final r in existingRows) r.id: r.role};
|
||||
|
||||
@@ -320,8 +321,9 @@ class MailboxRepositoryImpl implements MailboxRepository {
|
||||
|
||||
@override
|
||||
Future<void> clearForResync(String accountId) async {
|
||||
await (_db.delete(_db.mailboxes)
|
||||
..where((t) => t.accountId.equals(accountId)))
|
||||
await (_db.delete(
|
||||
_db.mailboxes,
|
||||
)..where((t) => t.accountId.equals(accountId)))
|
||||
.go();
|
||||
}
|
||||
|
||||
@@ -367,7 +369,9 @@ class MailboxRepositoryImpl implements MailboxRepository {
|
||||
role: Value(role),
|
||||
),
|
||||
);
|
||||
final row = await (_db.select(_db.mailboxes)..where((t) => t.id.equals(id)))
|
||||
final row = await (_db.select(
|
||||
_db.mailboxes,
|
||||
)..where((t) => t.id.equals(id)))
|
||||
.getSingle();
|
||||
return _toModel(row);
|
||||
}
|
||||
@@ -419,8 +423,9 @@ class MailboxRepositoryImpl implements MailboxRepository {
|
||||
role: Value(role),
|
||||
),
|
||||
);
|
||||
final row = await (_db.select(_db.mailboxes)
|
||||
..where((t) => t.id.equals(dbId)))
|
||||
final row = await (_db.select(
|
||||
_db.mailboxes,
|
||||
)..where((t) => t.id.equals(dbId)))
|
||||
.getSingle();
|
||||
return _toModel(row);
|
||||
}
|
||||
|
||||
@@ -24,8 +24,9 @@ class SearchHistoryRepositoryImpl implements SearchHistoryRepository {
|
||||
|
||||
await _db.transaction(() async {
|
||||
// Remove existing entry for same query (deduplication).
|
||||
await (_db.delete(_db.searchHistoryEntries)
|
||||
..where((t) => t.query.equals(trimmed)))
|
||||
await (_db.delete(
|
||||
_db.searchHistoryEntries,
|
||||
)..where((t) => t.query.equals(trimmed)))
|
||||
.go();
|
||||
|
||||
await _db.into(_db.searchHistoryEntries).insert(
|
||||
@@ -43,8 +44,9 @@ class SearchHistoryRepositoryImpl implements SearchHistoryRepository {
|
||||
.get();
|
||||
|
||||
if (keepIds.isNotEmpty) {
|
||||
await (_db.delete(_db.searchHistoryEntries)
|
||||
..where((t) => t.id.isNotIn(keepIds)))
|
||||
await (_db.delete(
|
||||
_db.searchHistoryEntries,
|
||||
)..where((t) => t.id.isNotIn(keepIds)))
|
||||
.go();
|
||||
}
|
||||
});
|
||||
|
||||
@@ -40,8 +40,9 @@ class ShareKeyRepositoryImpl implements ShareKeyRepository {
|
||||
await _pruneExpired();
|
||||
|
||||
final keyIdHex = _hex(keyId);
|
||||
final row = await (_db.select(_db.shareKeys)
|
||||
..where((t) => t.id.equals(keyIdHex)))
|
||||
final row = await (_db.select(
|
||||
_db.shareKeys,
|
||||
)..where((t) => t.id.equals(keyIdHex)))
|
||||
.getSingleOrNull();
|
||||
|
||||
if (row == null) return null;
|
||||
@@ -55,10 +56,9 @@ class ShareKeyRepositoryImpl implements ShareKeyRepository {
|
||||
}
|
||||
|
||||
Future<void> _pruneExpired() async {
|
||||
await (_db.delete(_db.shareKeys)
|
||||
..where(
|
||||
(t) => t.expiresAt.isSmallerThanValue(DateTime.now().toUtc()),
|
||||
))
|
||||
await (_db.delete(
|
||||
_db.shareKeys,
|
||||
)..where((t) => t.expiresAt.isSmallerThanValue(DateTime.now().toUtc())))
|
||||
.go();
|
||||
}
|
||||
|
||||
|
||||
@@ -11,7 +11,9 @@ class UserPreferencesRepositoryImpl implements UserPreferencesRepository {
|
||||
|
||||
@override
|
||||
Stream<pref.UserPreferences> observePreferences() {
|
||||
return (_db.select(_db.userPreferences)..where((t) => t.id.equals(_rowId)))
|
||||
return (_db.select(
|
||||
_db.userPreferences,
|
||||
)..where((t) => t.id.equals(_rowId)))
|
||||
.watchSingleOrNull()
|
||||
.map(_rowToModel);
|
||||
}
|
||||
|
||||
+16
-10
@@ -101,8 +101,9 @@ final undoRepositoryProvider = Provider<UndoRepository>((ref) {
|
||||
return UndoRepositoryImpl(ref.watch(dbProvider));
|
||||
});
|
||||
|
||||
final searchHistoryRepositoryProvider =
|
||||
Provider<SearchHistoryRepository>((ref) {
|
||||
final searchHistoryRepositoryProvider = Provider<SearchHistoryRepository>((
|
||||
ref,
|
||||
) {
|
||||
return SearchHistoryRepositoryImpl(ref.watch(dbProvider));
|
||||
});
|
||||
|
||||
@@ -135,8 +136,10 @@ final syncHealthProvider =
|
||||
.watchSingleOrNull();
|
||||
});
|
||||
|
||||
final isSyncingProvider =
|
||||
StreamProvider.autoDispose.family<bool, String>((ref, accountId) {
|
||||
final isSyncingProvider = StreamProvider.autoDispose.family<bool, String>((
|
||||
ref,
|
||||
accountId,
|
||||
) {
|
||||
return ref.watch(syncManagerProvider).watchSyncing(accountId);
|
||||
});
|
||||
|
||||
@@ -185,8 +188,9 @@ final manageSieveProbeServiceProvider = Provider<ManageSieveProbeService>((
|
||||
return ManageSieveProbeService(ref.watch(accountRepositoryProvider));
|
||||
});
|
||||
|
||||
final undoServiceProvider =
|
||||
NotifierProvider<UndoService, List<UndoAction>>(UndoService.new);
|
||||
final undoServiceProvider = NotifierProvider<UndoService, List<UndoAction>>(
|
||||
UndoService.new,
|
||||
);
|
||||
|
||||
/// Loads email header + body and marks the email as seen.
|
||||
/// Owned by [EmailDetailScreen]; decouples data loading from the widget tree.
|
||||
@@ -232,12 +236,14 @@ final accountConnectionStatusProvider =
|
||||
.testConnection(account, password);
|
||||
});
|
||||
|
||||
final userPreferencesRepositoryProvider =
|
||||
Provider<UserPreferencesRepository>((ref) {
|
||||
final userPreferencesRepositoryProvider = Provider<UserPreferencesRepository>((
|
||||
ref,
|
||||
) {
|
||||
return UserPreferencesRepositoryImpl(ref.watch(dbProvider));
|
||||
});
|
||||
|
||||
final userPreferencesProvider =
|
||||
StreamProvider.autoDispose<UserPreferences>((ref) {
|
||||
final userPreferencesProvider = StreamProvider.autoDispose<UserPreferences>((
|
||||
ref,
|
||||
) {
|
||||
return ref.watch(userPreferencesRepositoryProvider).observePreferences();
|
||||
});
|
||||
|
||||
@@ -72,8 +72,10 @@ class _AboutScreenState extends ConsumerState<AboutScreen> {
|
||||
|
||||
Future<void> _launchUrl(BuildContext context, Uri url) async {
|
||||
try {
|
||||
final launched =
|
||||
await launchUrl(url, mode: LaunchMode.externalApplication);
|
||||
final launched = await launchUrl(
|
||||
url,
|
||||
mode: LaunchMode.externalApplication,
|
||||
);
|
||||
if (!launched && context.mounted) {
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
const SnackBar(
|
||||
@@ -121,8 +123,10 @@ class _AboutScreenState extends ConsumerState<AboutScreen> {
|
||||
'https://codeberg.org/guettli/sharedinbox/issues/new?body=$body',
|
||||
);
|
||||
try {
|
||||
final launched =
|
||||
await launchUrl(url, mode: LaunchMode.externalApplication);
|
||||
final launched = await launchUrl(
|
||||
url,
|
||||
mode: LaunchMode.externalApplication,
|
||||
);
|
||||
if (!launched && context.mounted) {
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
const SnackBar(
|
||||
@@ -176,9 +180,7 @@ class _AboutScreenState extends ConsumerState<AboutScreen> {
|
||||
selectable: true,
|
||||
onTapLink: (text, href, title) {
|
||||
if (href != null) {
|
||||
unawaited(
|
||||
_launchUrl(context, Uri.parse(href)),
|
||||
);
|
||||
unawaited(_launchUrl(context, Uri.parse(href)));
|
||||
}
|
||||
},
|
||||
);
|
||||
|
||||
@@ -219,11 +219,7 @@ class _AccountReceiveScreenState extends ConsumerState<AccountReceiveScreen> {
|
||||
),
|
||||
),
|
||||
_Step.done => const Center(
|
||||
child: Icon(
|
||||
Icons.check_circle,
|
||||
size: 64,
|
||||
color: Colors.green,
|
||||
),
|
||||
child: Icon(Icons.check_circle, size: 64, color: Colors.green),
|
||||
),
|
||||
_Step.error => Center(
|
||||
child: Padding(
|
||||
|
||||
@@ -158,10 +158,7 @@ class _AccountSendScreenState extends ConsumerState<AccountSendScreen> {
|
||||
for (final account in selected) {
|
||||
final password = await repo.getPassword(account.id);
|
||||
payloads.add(
|
||||
AccountPayload(
|
||||
accountJson: account.toJson(),
|
||||
password: password,
|
||||
),
|
||||
AccountPayload(accountJson: account.toJson(), password: password),
|
||||
);
|
||||
}
|
||||
|
||||
@@ -361,9 +358,7 @@ class _AccountSendScreenState extends ConsumerState<AccountSendScreen> {
|
||||
unawaited(Clipboard.setData(ClipboardData(text: _encryptedQr!)));
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
const SnackBar(
|
||||
content: Text(
|
||||
'Encrypted code copied to clipboard',
|
||||
),
|
||||
content: Text('Encrypted code copied to clipboard'),
|
||||
),
|
||||
);
|
||||
},
|
||||
|
||||
@@ -12,8 +12,9 @@ class ChangeLogScreen extends StatelessWidget {
|
||||
return Scaffold(
|
||||
appBar: AppBar(title: const Text('ChangeLog')),
|
||||
body: FutureBuilder<String>(
|
||||
future:
|
||||
DefaultAssetBundle.of(context).loadString('assets/changelog.txt'),
|
||||
future: DefaultAssetBundle.of(
|
||||
context,
|
||||
).loadString('assets/changelog.txt'),
|
||||
builder: (context, snapshot) {
|
||||
if (snapshot.connectionState == ConnectionState.waiting) {
|
||||
return const Center(child: CircularProgressIndicator());
|
||||
|
||||
@@ -194,9 +194,7 @@ class _ComposeScreenState extends ConsumerState<ComposeScreen> {
|
||||
await OpenFilex.open(path);
|
||||
} catch (e) {
|
||||
if (!mounted) return;
|
||||
ScaffoldMessenger.of(
|
||||
context,
|
||||
).showSnackBar(
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(
|
||||
duration: const Duration(seconds: 5),
|
||||
content: Text('Failed to open file: $e'),
|
||||
@@ -213,9 +211,7 @@ class _ComposeScreenState extends ConsumerState<ComposeScreen> {
|
||||
|
||||
Future<void> _send() async {
|
||||
if (_accountId == null) {
|
||||
ScaffoldMessenger.of(
|
||||
context,
|
||||
).showSnackBar(
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
const SnackBar(
|
||||
duration: Duration(seconds: 5),
|
||||
content: Text('Select an account first'),
|
||||
@@ -255,9 +251,7 @@ class _ComposeScreenState extends ConsumerState<ComposeScreen> {
|
||||
if (mounted) context.pop();
|
||||
} catch (e) {
|
||||
if (!mounted) return;
|
||||
ScaffoldMessenger.of(
|
||||
context,
|
||||
).showSnackBar(
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(
|
||||
duration: const Duration(seconds: 5),
|
||||
content: Text('Send failed: $e'),
|
||||
|
||||
@@ -81,9 +81,9 @@ class CrashScreen extends StatelessWidget {
|
||||
builder: (context, snapshot) => Text(
|
||||
'v${snapshot.data ?? '…'} • $_buildMode • '
|
||||
'${Platform.operatingSystem} ${Platform.operatingSystemVersion}',
|
||||
style: Theme.of(context).textTheme.bodySmall?.copyWith(
|
||||
color: Colors.grey[600],
|
||||
),
|
||||
style: Theme.of(
|
||||
context,
|
||||
).textTheme.bodySmall?.copyWith(color: Colors.grey[600]),
|
||||
textAlign: TextAlign.center,
|
||||
),
|
||||
),
|
||||
|
||||
@@ -54,8 +54,9 @@ Future<Mailbox?> resolveMailboxByRole(
|
||||
style: TextStyle(fontWeight: FontWeight.bold),
|
||||
),
|
||||
),
|
||||
for (final m
|
||||
in mailboxes.where((m) => m.path != currentMailboxPath))
|
||||
for (final m in mailboxes.where(
|
||||
(m) => m.path != currentMailboxPath,
|
||||
))
|
||||
ListTile(
|
||||
leading: const Icon(Icons.folder_outlined),
|
||||
title: Text(m.name),
|
||||
|
||||
@@ -72,9 +72,7 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
|
||||
onPressed: header == null
|
||||
? null
|
||||
: () {
|
||||
unawaited(
|
||||
_replyWithRecipientDialog(context, header, body),
|
||||
);
|
||||
unawaited(_replyWithRecipientDialog(context, header, body));
|
||||
},
|
||||
),
|
||||
IconButton(
|
||||
@@ -126,22 +124,10 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
|
||||
),
|
||||
PopupMenuButton<String>(
|
||||
itemBuilder: (ctx) => [
|
||||
const PopupMenuItem(
|
||||
value: 'forward',
|
||||
child: Text('Forward'),
|
||||
),
|
||||
const PopupMenuItem(
|
||||
value: 'move',
|
||||
child: Text('Move to folder'),
|
||||
),
|
||||
const PopupMenuItem(
|
||||
value: 'snooze',
|
||||
child: Text('Snooze'),
|
||||
),
|
||||
const PopupMenuItem(
|
||||
value: 'spam',
|
||||
child: Text('Mark as spam'),
|
||||
),
|
||||
const PopupMenuItem(value: 'forward', child: Text('Forward')),
|
||||
const PopupMenuItem(value: 'move', child: Text('Move to folder')),
|
||||
const PopupMenuItem(value: 'snooze', child: Text('Snooze')),
|
||||
const PopupMenuItem(value: 'spam', child: Text('Mark as spam')),
|
||||
const PopupMenuItem(
|
||||
value: 'mark_unread',
|
||||
child: Text('Mark as unread'),
|
||||
@@ -155,10 +141,7 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
|
||||
value: 'structure',
|
||||
child: Text('Show Mail Structure'),
|
||||
),
|
||||
const PopupMenuItem(
|
||||
value: 'rfc',
|
||||
child: Text('Show Raw Email'),
|
||||
),
|
||||
const PopupMenuItem(value: 'rfc', child: Text('Show Raw Email')),
|
||||
],
|
||||
onSelected: (value) async {
|
||||
if (value == 'forward' && header != null) {
|
||||
@@ -264,8 +247,9 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
|
||||
.observeThreads(header.accountId, header.mailboxPath)
|
||||
.first;
|
||||
|
||||
final currentIndex =
|
||||
threads.indexWhere((t) => t.emailIds.contains(widget.emailId));
|
||||
final currentIndex = threads.indexWhere(
|
||||
(t) => t.emailIds.contains(widget.emailId),
|
||||
);
|
||||
if (currentIndex >= 0 && currentIndex + 1 < threads.length) {
|
||||
return threads[currentIndex + 1].latestEmailId;
|
||||
}
|
||||
@@ -520,10 +504,7 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
|
||||
unawaited(
|
||||
context.push(
|
||||
'/compose',
|
||||
extra: {
|
||||
'prefillSubject': subject,
|
||||
'prefillBody': quoted,
|
||||
},
|
||||
extra: {'prefillSubject': subject, 'prefillBody': quoted},
|
||||
),
|
||||
);
|
||||
}
|
||||
@@ -625,9 +606,9 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
|
||||
.fetchRawRfc822(widget.emailId);
|
||||
} catch (e) {
|
||||
if (!context.mounted) return;
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(content: Text('Failed to fetch raw email: $e')),
|
||||
);
|
||||
ScaffoldMessenger.of(
|
||||
context,
|
||||
).showSnackBar(SnackBar(content: Text('Failed to fetch raw email: $e')));
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -792,9 +773,7 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
const SnackBar(
|
||||
duration: Duration(seconds: 5),
|
||||
content: Text(
|
||||
'Structure not available. Try re-syncing the email.',
|
||||
),
|
||||
content: Text('Structure not available. Try re-syncing the email.'),
|
||||
),
|
||||
);
|
||||
return;
|
||||
@@ -903,14 +882,8 @@ class _ReplyAllDialogState extends State<_ReplyAllDialog> {
|
||||
SegmentedButton<_Placement>(
|
||||
showSelectedIcon: false,
|
||||
segments: const [
|
||||
ButtonSegment(
|
||||
value: _Placement.to,
|
||||
label: Text('To'),
|
||||
),
|
||||
ButtonSegment(
|
||||
value: _Placement.cc,
|
||||
label: Text('Cc'),
|
||||
),
|
||||
ButtonSegment(value: _Placement.to, label: Text('To')),
|
||||
ButtonSegment(value: _Placement.cc, label: Text('Cc')),
|
||||
ButtonSegment(
|
||||
value: _Placement.skip,
|
||||
label: Text('Skip'),
|
||||
|
||||
@@ -381,11 +381,7 @@ class _EmailListScreenState extends ConsumerState<EmailListScreen> {
|
||||
}
|
||||
return MaterialBanner(
|
||||
padding: const EdgeInsets.fromLTRB(16, 8, 8, 8),
|
||||
content: Text(
|
||||
error,
|
||||
maxLines: 2,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
),
|
||||
content: Text(error, maxLines: 2, overflow: TextOverflow.ellipsis),
|
||||
leading: Icon(
|
||||
Icons.sync_problem,
|
||||
color: Theme.of(context).colorScheme.error,
|
||||
@@ -399,9 +395,8 @@ class _EmailListScreenState extends ConsumerState<EmailListScreen> {
|
||||
child: const Text('Retry'),
|
||||
),
|
||||
TextButton(
|
||||
onPressed: () => context.push(
|
||||
'/accounts/${widget.accountId}/sync-log',
|
||||
),
|
||||
onPressed: () =>
|
||||
context.push('/accounts/${widget.accountId}/sync-log'),
|
||||
child: const Text('View log'),
|
||||
),
|
||||
TextButton(
|
||||
|
||||
@@ -10,8 +10,9 @@ import 'package:sharedinbox/core/utils/logger.dart';
|
||||
import 'package:sharedinbox/di.dart';
|
||||
import 'package:sharedinbox/ui/widgets/email_tile.dart';
|
||||
|
||||
final _searchHistoryProvider =
|
||||
FutureProvider.autoDispose<List<String>>((ref) async {
|
||||
final _searchHistoryProvider = FutureProvider.autoDispose<List<String>>((
|
||||
ref,
|
||||
) async {
|
||||
return ref.watch(searchHistoryRepositoryProvider).getRecentSearches();
|
||||
});
|
||||
|
||||
|
||||
@@ -137,9 +137,7 @@ class _SieveScriptsScreenState extends ConsumerState<SieveScriptsScreen> {
|
||||
Widget build(BuildContext context) {
|
||||
return Scaffold(
|
||||
appBar: AppBar(
|
||||
title: Text(
|
||||
widget.isLocal ? 'Local Filters' : 'Remote Filters',
|
||||
),
|
||||
title: Text(widget.isLocal ? 'Local Filters' : 'Remote Filters'),
|
||||
),
|
||||
body: _buildBody(),
|
||||
floatingActionButton: FloatingActionButton(
|
||||
|
||||
@@ -163,6 +163,17 @@ class _EmailMessageCardState extends ConsumerState<_EmailMessageCard> {
|
||||
FutureBuilder<EmailBody>(
|
||||
future: _bodyFuture,
|
||||
builder: (context, snapshot) {
|
||||
if (snapshot.hasError) {
|
||||
return Padding(
|
||||
padding: const EdgeInsets.all(16),
|
||||
child: Text(
|
||||
'Failed to load email: ${snapshot.error}',
|
||||
style: TextStyle(
|
||||
color: Theme.of(context).colorScheme.error,
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
if (!snapshot.hasData) {
|
||||
return const Center(
|
||||
child: Padding(
|
||||
|
||||
@@ -84,9 +84,7 @@ class _UndoActionTile extends ConsumerWidget {
|
||||
.read(undoServiceProvider.notifier)
|
||||
.undo(actionId: action.id);
|
||||
if (context.mounted) {
|
||||
ScaffoldMessenger.of(
|
||||
context,
|
||||
).showSnackBar(
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
const SnackBar(
|
||||
duration: Duration(seconds: 5),
|
||||
content: Text('Action undone.'),
|
||||
|
||||
@@ -90,9 +90,7 @@ class UserPreferencesScreen extends ConsumerWidget {
|
||||
),
|
||||
RadioListTile<MenuPosition>(
|
||||
title: Text('Top'),
|
||||
subtitle: Text(
|
||||
'Show the back button in the top bar.',
|
||||
),
|
||||
subtitle: Text('Show the back button in the top bar.'),
|
||||
value: MenuPosition.top,
|
||||
),
|
||||
],
|
||||
@@ -122,16 +120,12 @@ class UserPreferencesScreen extends ConsumerWidget {
|
||||
children: [
|
||||
RadioListTile<AfterMailViewAction>(
|
||||
title: Text('Next message (default)'),
|
||||
subtitle: Text(
|
||||
'Show the next message in the mailbox.',
|
||||
),
|
||||
subtitle: Text('Show the next message in the mailbox.'),
|
||||
value: AfterMailViewAction.nextMessage,
|
||||
),
|
||||
RadioListTile<AfterMailViewAction>(
|
||||
title: Text('Return to mailbox'),
|
||||
subtitle: Text(
|
||||
'Return to the message list.',
|
||||
),
|
||||
subtitle: Text('Return to the message list.'),
|
||||
value: AfterMailViewAction.showMailbox,
|
||||
),
|
||||
],
|
||||
|
||||
@@ -26,8 +26,9 @@ String buildAboutMarkdown({
|
||||
final osName = _capitalize(Platform.operatingSystem);
|
||||
final isDark = MediaQuery.of(context).platformBrightness == Brightness.dark;
|
||||
final locale = Localizations.localeOf(context).toString();
|
||||
final textScale =
|
||||
MediaQuery.of(context).textScaler.scale(1.0).toStringAsFixed(1);
|
||||
final textScale = MediaQuery.of(
|
||||
context,
|
||||
).textScaler.scale(1.0).toStringAsFixed(1);
|
||||
|
||||
final gitCommitLine = _gitHash.isNotEmpty
|
||||
? '| Git Commit | [$_gitHash](https://codeberg.org/guettli/sharedinbox/commit/$_gitHash) |\n'
|
||||
|
||||
@@ -111,6 +111,7 @@ class _SecureEmailWebViewState extends State<SecureEmailWebView> {
|
||||
);
|
||||
|
||||
Future<void> _measureHeight(String _) async {
|
||||
try {
|
||||
final result = await _controller!.runJavaScriptReturningResult(
|
||||
'document.documentElement.scrollHeight',
|
||||
);
|
||||
@@ -118,6 +119,9 @@ class _SecureEmailWebViewState extends State<SecureEmailWebView> {
|
||||
if (h != null && h > 0 && mounted) {
|
||||
setState(() => _height = h);
|
||||
}
|
||||
} catch (_) {
|
||||
// WebView not ready yet; height stays at default
|
||||
}
|
||||
}
|
||||
|
||||
NavigationDecision _handleNavigation(NavigationRequest req) {
|
||||
@@ -187,12 +191,14 @@ class _SecureEmailWebViewState extends State<SecureEmailWebView> {
|
||||
);
|
||||
|
||||
if (confirmed == true && mounted) {
|
||||
final launched =
|
||||
await launchUrl(uri, mode: LaunchMode.externalApplication);
|
||||
if (!launched && mounted) {
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(content: Text('Could not open: $url')),
|
||||
final launched = await launchUrl(
|
||||
uri,
|
||||
mode: LaunchMode.externalApplication,
|
||||
);
|
||||
if (!launched && mounted) {
|
||||
ScaffoldMessenger.of(
|
||||
context,
|
||||
).showSnackBar(SnackBar(content: Text('Could not open: $url')));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -33,7 +33,7 @@ dependencies:
|
||||
flutter_secure_storage: ^10.0.0
|
||||
|
||||
# Date formatting
|
||||
intl: any
|
||||
intl: ^0.20.2
|
||||
|
||||
# File picking (compose attachments) and opening downloaded attachments
|
||||
file_picker: ^12.0.0-beta.4
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,108 +1,76 @@
|
||||
#!/usr/bin/env bash
|
||||
# Establishes a secure tunnel to a remote Dagger Engine via stunnel.
|
||||
set -euo pipefail
|
||||
|
||||
if [ -z "${DAGGER_STUNNEL_URL:-}" ]; then
|
||||
echo "Error: DAGGER_STUNNEL_URL must be set."
|
||||
if [ -z "${SOPS_AGE_KEY:-}" ]; then
|
||||
echo "Error: SOPS_AGE_KEY must be set."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Parse host and port (e.g., example.com:8774 or just example.com)
|
||||
host=$(echo "$DAGGER_STUNNEL_URL" | cut -d: -f1)
|
||||
port=$(echo "$DAGGER_STUNNEL_URL" | cut -d: -f2)
|
||||
if [ "$host" == "$port" ]; then
|
||||
port="8774"
|
||||
fi
|
||||
echo "Decrypting secrets with SOPS..."
|
||||
export SOPS_AGE_KEY="$SOPS_AGE_KEY"
|
||||
SECRETS_JSON=$(mktemp)
|
||||
trap "rm -f $SECRETS_JSON" EXIT
|
||||
|
||||
MAX_PROBE_ATTEMPTS=5
|
||||
PROBE_DELAY=30
|
||||
for attempt in $(seq 1 $MAX_PROBE_ATTEMPTS); do
|
||||
echo "Probing $host:$port (attempt $attempt/$MAX_PROBE_ATTEMPTS)..."
|
||||
if nc -zw 5 "$host" "$port" 2>/dev/null; then
|
||||
echo "Found active server on $host:$port"
|
||||
break
|
||||
fi
|
||||
if [ "$attempt" -eq "$MAX_PROBE_ATTEMPTS" ]; then
|
||||
echo "Warning: No Dagger server responded on $host:$port after $MAX_PROBE_ATTEMPTS attempts"
|
||||
if ! docker info >/dev/null 2>&1; then
|
||||
echo "Error: Remote Dagger engine is unavailable AND local Docker daemon is not running."
|
||||
echo "Cannot proceed. Ensure either the remote server at $host:$port is accessible"
|
||||
echo "or that Docker is running locally (check: sudo systemctl start docker)."
|
||||
exit 1
|
||||
fi
|
||||
echo "Remote engine unavailable — CI will use the local Dagger engine."
|
||||
exit 0
|
||||
fi
|
||||
echo "Dagger server not responding, waiting ${PROBE_DELAY}s before retry..."
|
||||
sleep $PROBE_DELAY
|
||||
done
|
||||
sops --decrypt --output-type json secrets.enc.yaml > "$SECRETS_JSON"
|
||||
|
||||
# 2a. Try plain TCP connection first (works when server is a plain TCP proxy, no TLS)
|
||||
echo "Trying plain TCP Dagger connection at tcp://$host:$port..."
|
||||
if _DAGGER_RUNNER_HOST="tcp://$host:$port" \
|
||||
_EXPERIMENTAL_DAGGER_RUNNER_HOST="tcp://$host:$port" \
|
||||
timeout 8 dagger version >/dev/null 2>&1; then
|
||||
echo "Plain TCP Dagger connection succeeded — no TLS stunnel needed."
|
||||
DAGGER_SSH_KEY=$(jq -r '.DAGGER_SSH_KEY' "$SECRETS_JSON")
|
||||
DAGGER_ENGINE_HOST=$(jq -r '.DAGGER_ENGINE_HOST' "$SECRETS_JSON")
|
||||
|
||||
# Export all CI secrets to the GitHub Actions environment so subsequent steps
|
||||
# can use them without referencing Forgejo secrets directly.
|
||||
export_secret() {
|
||||
local name="$1"
|
||||
local value
|
||||
value=$(jq -r --arg k "$name" '.[$k] // empty' "$SECRETS_JSON")
|
||||
if [ -n "${GITHUB_ENV:-}" ]; then
|
||||
echo "_EXPERIMENTAL_DAGGER_RUNNER_HOST=tcp://$host:$port" >> "$GITHUB_ENV"
|
||||
echo "_DAGGER_RUNNER_HOST=tcp://$host:$port" >> "$GITHUB_ENV"
|
||||
else
|
||||
export _EXPERIMENTAL_DAGGER_RUNNER_HOST="tcp://$host:$port"
|
||||
export _DAGGER_RUNNER_HOST="tcp://$host:$port"
|
||||
echo "Dagger configured at tcp://$host:$port (plain TCP)"
|
||||
# Use heredoc syntax for multiline-safe export
|
||||
{
|
||||
printf '%s<<__EOF__\n' "$name"
|
||||
printf '%s\n' "$value"
|
||||
printf '__EOF__\n'
|
||||
} >> "$GITHUB_ENV"
|
||||
fi
|
||||
exit 0
|
||||
printf '[secrets] exported %s (%d chars)\n' "$name" "${#value}"
|
||||
}
|
||||
|
||||
export_secret "SSH_PRIVATE_KEY"
|
||||
export_secret "SSH_KNOWN_HOSTS"
|
||||
export_secret "SSH_USER"
|
||||
export_secret "SSH_HOST"
|
||||
export_secret "WEBSITE_SSH_HOST"
|
||||
export_secret "PLAY_STORE_CONFIG_JSON"
|
||||
export_secret "ANDROID_KEYSTORE_BASE64"
|
||||
export_secret "ANDROID_KEYSTORE_PASSWORD"
|
||||
export_secret "FIREBASE_TEST_LAB_SERVICE_ACCOUNT_KEY"
|
||||
export_secret "RENOVATE_FORGEJO_TOKEN"
|
||||
|
||||
# Setup SSH directory and keys
|
||||
mkdir -p ~/.ssh
|
||||
chmod 700 ~/.ssh
|
||||
echo "$DAGGER_SSH_KEY" > ~/.ssh/dagger_key
|
||||
chmod 600 ~/.ssh/dagger_key
|
||||
|
||||
# Add remote host to known_hosts
|
||||
ssh-keyscan -H "$DAGGER_ENGINE_HOST" >> ~/.ssh/known_hosts 2>/dev/null
|
||||
|
||||
# Create a background SSH tunnel to the Dagger engine.
|
||||
# We map local port 8080 to remote port 1774 (where our socat bridge is listening).
|
||||
echo "Establishing SSH tunnel to $DAGGER_ENGINE_HOST..."
|
||||
ssh -i ~/.ssh/dagger_key -o StrictHostKeyChecking=no -f -N -L 8080:localhost:1774 "dagger@$DAGGER_ENGINE_HOST"
|
||||
|
||||
# Export _EXPERIMENTAL_DAGGER_RUNNER_HOST to use the tunnel.
|
||||
export _EXPERIMENTAL_DAGGER_RUNNER_HOST="tcp://localhost:8080"
|
||||
if [ -n "${GITHUB_ENV:-}" ]; then
|
||||
echo "_EXPERIMENTAL_DAGGER_RUNNER_HOST=tcp://localhost:8080" >> "$GITHUB_ENV"
|
||||
fi
|
||||
echo "Plain TCP connection not available; trying TLS stunnel..."
|
||||
|
||||
# 2b. Setup TLS credentials (passed as env vars from secrets)
|
||||
mkdir -p /tmp/dagger-tls
|
||||
echo "$DAGGER_CA_CERT" > /tmp/dagger-tls/ca.crt
|
||||
echo "$DAGGER_CLIENT_CERT" > /tmp/dagger-tls/client.crt
|
||||
echo "$DAGGER_CLIENT_KEY" > /tmp/dagger-tls/client.key
|
||||
chmod 600 /tmp/dagger-tls/client.key
|
||||
|
||||
# 3. Configure and start stunnel
|
||||
STUNNEL_CONF="/tmp/stunnel-dagger.conf"
|
||||
cat << EOF > "$STUNNEL_CONF"
|
||||
client = yes
|
||||
foreground = yes
|
||||
pid = /tmp/stunnel.pid
|
||||
debug = warning
|
||||
; TCP keepalive on the remote side to prevent NAT/firewall from resetting the connection
|
||||
socket = r:SO_KEEPALIVE=1
|
||||
socket = r:TCP_KEEPIDLE=10
|
||||
socket = r:TCP_KEEPINTVL=5
|
||||
socket = r:TCP_KEEPCNT=3
|
||||
|
||||
[dagger]
|
||||
accept = 127.0.0.1:1774
|
||||
connect = $host:$port
|
||||
CAfile = /tmp/dagger-tls/ca.crt
|
||||
cert = /tmp/dagger-tls/client.crt
|
||||
key = /tmp/dagger-tls/client.key
|
||||
verifyChain = yes
|
||||
EOF
|
||||
|
||||
# Start stunnel in the background
|
||||
stunnel "$STUNNEL_CONF" &
|
||||
TUNNEL_PID=$!
|
||||
|
||||
# Give it a moment to establish
|
||||
sleep 2
|
||||
|
||||
if ! kill -0 "$TUNNEL_PID" 2>/dev/null; then
|
||||
echo "Error: stunnel failed to start"
|
||||
# Verify the connection
|
||||
echo "Verifying connection to Dagger engine via SSH tunnel..."
|
||||
# Use a simple command that doesn't require complex GraphQL operations.
|
||||
if ! timeout 45 dagger core --help >/dev/null 2>&1 ; then
|
||||
echo "Error: Dagger engine unreachable via tunnel at localhost:8080"
|
||||
# Debug
|
||||
ps aux | grep ssh
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# 4. Export environment for subsequent CI steps
|
||||
if [ -n "${GITHUB_ENV:-}" ]; then
|
||||
echo "_EXPERIMENTAL_DAGGER_RUNNER_HOST=tcp://127.0.0.1:1774" >> "$GITHUB_ENV"
|
||||
echo "_DAGGER_RUNNER_HOST=tcp://127.0.0.1:1774" >> "$GITHUB_ENV"
|
||||
echo "Tunnel established. Dagger is configured to use the remote engine."
|
||||
else
|
||||
export _EXPERIMENTAL_DAGGER_RUNNER_HOST=tcp://127.0.0.1:1774
|
||||
export _DAGGER_RUNNER_HOST=tcp://127.0.0.1:1774
|
||||
echo "Tunnel established. Run: export _DAGGER_RUNNER_HOST=tcp://127.0.0.1:1774"
|
||||
fi
|
||||
echo "Dagger connection verified successfully."
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
@@ -20,7 +20,8 @@ Future<imap.ImapClient> _fakeImapConnect(
|
||||
throw const SocketException('fake — no real IMAP server in tests');
|
||||
|
||||
void main() {
|
||||
test('AccountSyncManager schedules IMAP sync for multiple accounts',
|
||||
test(
|
||||
'AccountSyncManager schedules IMAP sync for multiple accounts',
|
||||
() async {
|
||||
final accounts = _FakeAccounts('pw');
|
||||
final mailboxes = _FakeMailboxes();
|
||||
@@ -48,9 +49,11 @@ void main() {
|
||||
expect(emails.syncCounts['2'], greaterThanOrEqualTo(1));
|
||||
|
||||
manager.dispose();
|
||||
});
|
||||
},
|
||||
);
|
||||
|
||||
test('AccountSyncManager schedules JMAP sync for multiple accounts',
|
||||
test(
|
||||
'AccountSyncManager schedules JMAP sync for multiple accounts',
|
||||
() async {
|
||||
final accounts = _FakeAccounts('pw');
|
||||
final mailboxes = _FakeMailboxes();
|
||||
@@ -76,7 +79,8 @@ void main() {
|
||||
expect(emails.syncCounts['2'], greaterThanOrEqualTo(1));
|
||||
|
||||
manager.dispose();
|
||||
});
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
Account _account(String id) => Account(
|
||||
@@ -171,11 +175,7 @@ class _FakeEmails implements EmailRepository {
|
||||
final syncCounts = <String, int>{};
|
||||
|
||||
@override
|
||||
Stream<List<Email>> observeEmails(
|
||||
String a,
|
||||
String m, {
|
||||
int limit = 50,
|
||||
}) =>
|
||||
Stream<List<Email>> observeEmails(String a, String m, {int limit = 50}) =>
|
||||
Stream.value([]);
|
||||
|
||||
@override
|
||||
|
||||
@@ -566,7 +566,8 @@ void main() {
|
||||
expect(pending.first.changeType, 'delete');
|
||||
});
|
||||
|
||||
test('downloadAttachment fetches binary attachment bytes from IMAP',
|
||||
test(
|
||||
'downloadAttachment fetches binary attachment bytes from IMAP',
|
||||
() async {
|
||||
final attachmentBytes = Uint8List.fromList(
|
||||
List.generate(32, (i) => i + 1),
|
||||
@@ -620,5 +621,6 @@ void main() {
|
||||
);
|
||||
final downloaded = await File(path).readAsBytes();
|
||||
expect(downloaded, equals(attachmentBytes));
|
||||
});
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
@@ -73,13 +73,15 @@ abstract class AccountRepositoryContract {
|
||||
expect(await repo.getPassword(_a.id), 'new');
|
||||
});
|
||||
|
||||
test('removeAccount makes account disappear from observeAccounts',
|
||||
test(
|
||||
'removeAccount makes account disappear from observeAccounts',
|
||||
() async {
|
||||
final repo = makeRepo();
|
||||
await repo.addAccount(_a, 'pw');
|
||||
await repo.removeAccount(_a.id);
|
||||
expect(await repo.observeAccounts().first, isEmpty);
|
||||
});
|
||||
},
|
||||
);
|
||||
|
||||
test('getAccount returns null after removeAccount', () async {
|
||||
final repo = makeRepo();
|
||||
|
||||
@@ -65,16 +65,13 @@ void main() {
|
||||
expect(syncLog.logs, hasLength(1));
|
||||
|
||||
m.dispose();
|
||||
});
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
class FakeEmailRepository implements EmailRepository {
|
||||
@override
|
||||
Stream<List<Email>> observeEmails(
|
||||
String a,
|
||||
String m, {
|
||||
int limit = 50,
|
||||
}) =>
|
||||
Stream<List<Email>> observeEmails(String a, String m, {int limit = 50}) =>
|
||||
Stream.value([]);
|
||||
@override
|
||||
Stream<List<EmailThread>> observeThreads(
|
||||
|
||||
@@ -16,5 +16,6 @@ void main() {
|
||||
// MissingPluginException. The fix catches it. This test fails before the
|
||||
// fix (exception propagates) and passes after it (exception is swallowed).
|
||||
await expectLater(registerBackgroundSync(), completes);
|
||||
});
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
@@ -86,8 +86,9 @@ void main() {
|
||||
final result = injectInlineImages(html, msg);
|
||||
|
||||
// Extract base64 payload from the data URI.
|
||||
final match =
|
||||
RegExp(r'data:image/png;base64,([A-Za-z0-9+/=]+)').firstMatch(result);
|
||||
final match = RegExp(
|
||||
r'data:image/png;base64,([A-Za-z0-9+/=]+)',
|
||||
).firstMatch(result);
|
||||
expect(match, isNotNull);
|
||||
final decoded = base64.decode(match!.group(1)!);
|
||||
expect(decoded.length, greaterThan(0));
|
||||
|
||||
@@ -44,10 +44,7 @@ abstract class EmailRepositoryContract {
|
||||
void run() {
|
||||
test('observeEmails starts empty', () async {
|
||||
final repo = await makeRepo();
|
||||
expect(
|
||||
await repo.observeEmails(_account.id, 'INBOX').first,
|
||||
isEmpty,
|
||||
);
|
||||
expect(await repo.observeEmails(_account.id, 'INBOX').first, isEmpty);
|
||||
});
|
||||
|
||||
test('observeEmails emits inserted email', () async {
|
||||
@@ -61,10 +58,7 @@ abstract class EmailRepositoryContract {
|
||||
test('observeEmails only returns emails for the given mailbox', () async {
|
||||
final repo = await makeRepo();
|
||||
await insertEmail(repo, id: 'er-acc:1', mailboxPath: 'INBOX');
|
||||
expect(
|
||||
await repo.observeEmails(_account.id, 'Sent').first,
|
||||
isEmpty,
|
||||
);
|
||||
expect(await repo.observeEmails(_account.id, 'Sent').first, isEmpty);
|
||||
});
|
||||
|
||||
test('observeEmails orders by receivedAt descending', () async {
|
||||
@@ -116,11 +110,7 @@ abstract class EmailRepositoryContract {
|
||||
|
||||
test('setFlag flagged updates isFlagged', () async {
|
||||
final repo = await makeRepo();
|
||||
await insertEmail(
|
||||
repo,
|
||||
id: 'er-acc:11',
|
||||
mailboxPath: 'INBOX',
|
||||
);
|
||||
await insertEmail(repo, id: 'er-acc:11', mailboxPath: 'INBOX');
|
||||
await repo.setFlag('er-acc:11', flagged: true);
|
||||
final email = await repo.getEmail('er-acc:11');
|
||||
expect(email!.isFlagged, isTrue);
|
||||
@@ -157,10 +147,7 @@ abstract class EmailRepositoryContract {
|
||||
|
||||
test('observeThreads starts empty', () async {
|
||||
final repo = await makeRepo();
|
||||
expect(
|
||||
await repo.observeThreads(_account.id, 'INBOX').first,
|
||||
isEmpty,
|
||||
);
|
||||
expect(await repo.observeThreads(_account.id, 'INBOX').first, isEmpty);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@@ -453,7 +453,8 @@ void main() {
|
||||
expect(results.first.subject, 'foobar baz');
|
||||
});
|
||||
|
||||
test('searchAddresses returns results sorted by most recently used',
|
||||
test(
|
||||
'searchAddresses returns results sorted by most recently used',
|
||||
() async {
|
||||
final r = _makeRepos();
|
||||
await r.accounts.addAccount(_account, 'pw');
|
||||
@@ -489,11 +490,12 @@ void main() {
|
||||
|
||||
// Query matching both; newer (bob) should come first.
|
||||
final results = await r.emails.searchAddresses(null, 'example');
|
||||
expect(
|
||||
results.map((a) => a.email).toList(),
|
||||
['bob@example.com', 'alice@example.com'],
|
||||
expect(results.map((a) => a.email).toList(), [
|
||||
'bob@example.com',
|
||||
'alice@example.com',
|
||||
]);
|
||||
},
|
||||
);
|
||||
});
|
||||
|
||||
// ── IMAP method tests ────────────────────────────────────────────────────
|
||||
|
||||
@@ -697,12 +699,11 @@ void main() {
|
||||
expect(await r.db.select(r.db.pendingChanges).get(), isEmpty);
|
||||
});
|
||||
|
||||
test('snooze flush selects src mailbox and moves email to Snoozed',
|
||||
test(
|
||||
'snooze flush selects src mailbox and moves email to Snoozed',
|
||||
() async {
|
||||
final spy = SnoozeSpyImapClient();
|
||||
final r = _makeRepos(
|
||||
imapConnect: (_, __, ___) async => spy,
|
||||
);
|
||||
final r = _makeRepos(imapConnect: (_, __, ___) async => spy);
|
||||
await r.accounts.addAccount(_account, 'pw');
|
||||
await r.db.into(r.db.emails).insert(
|
||||
EmailsCompanion.insert(
|
||||
@@ -737,7 +738,8 @@ void main() {
|
||||
expect(spy.selectedMailbox, 'INBOX');
|
||||
expect(spy.createdMailbox, 'Snoozed');
|
||||
expect(spy.movedToMailbox, 'Snoozed');
|
||||
});
|
||||
},
|
||||
);
|
||||
});
|
||||
|
||||
group('Snooze', () {
|
||||
@@ -1640,7 +1642,8 @@ void main() {
|
||||
expect(await r.db.select(r.db.pendingChanges).get(), isEmpty);
|
||||
});
|
||||
|
||||
test('snooze creates Snoozed folder via Mailbox/set when dest is Snoozed',
|
||||
test(
|
||||
'snooze creates Snoozed folder via Mailbox/set when dest is Snoozed',
|
||||
() async {
|
||||
final List<Map<String, dynamic>> capturedBodies = [];
|
||||
final client = MockClient((req) async {
|
||||
@@ -1731,9 +1734,11 @@ void main() {
|
||||
final update = (secondCallArgs['update'] as Map<String, dynamic>)['e1']
|
||||
as Map<String, dynamic>;
|
||||
expect(update['mailboxIds/mbx-snoozed'], true);
|
||||
});
|
||||
},
|
||||
);
|
||||
|
||||
test('snooze uses existing mailbox ID when dest is already a JMAP ID',
|
||||
test(
|
||||
'snooze uses existing mailbox ID when dest is already a JMAP ID',
|
||||
() async {
|
||||
final r = _makeRepos(httpClient: mockFlush(200));
|
||||
await seedChange(
|
||||
@@ -1752,7 +1757,8 @@ void main() {
|
||||
|
||||
// Change applied without needing Mailbox/set (dest was already a valid ID).
|
||||
expect(await r.db.select(r.db.pendingChanges).get(), isEmpty);
|
||||
});
|
||||
},
|
||||
);
|
||||
});
|
||||
|
||||
group('JMAP syncEmails body caching', () {
|
||||
@@ -2316,7 +2322,8 @@ void main() {
|
||||
reason:
|
||||
'email must be optimistically moved to one of the two destinations',
|
||||
);
|
||||
});
|
||||
},
|
||||
);
|
||||
});
|
||||
|
||||
group('IMAP SMTP auth failure', () {
|
||||
|
||||
@@ -61,10 +61,7 @@ abstract class MailboxRepositoryContract {
|
||||
|
||||
test('findMailboxByRole returns null when no match', () async {
|
||||
final repo = await makeRepo();
|
||||
expect(
|
||||
await repo.findMailboxByRole(_account.id, 'archive'),
|
||||
isNull,
|
||||
);
|
||||
expect(await repo.findMailboxByRole(_account.id, 'archive'), isNull);
|
||||
});
|
||||
|
||||
test('findMailboxByRole returns the matching mailbox', () async {
|
||||
|
||||
@@ -486,8 +486,11 @@ void main() {
|
||||
);
|
||||
await r.accounts.addAccount(_jmapAccount, 'pw');
|
||||
|
||||
final result = await r.mailboxes
|
||||
.createMailboxWithRole('jmap-1', 'Archive', 'archive');
|
||||
final result = await r.mailboxes.createMailboxWithRole(
|
||||
'jmap-1',
|
||||
'Archive',
|
||||
'archive',
|
||||
);
|
||||
|
||||
expect(result.name, 'Archive');
|
||||
expect(result.role, 'archive');
|
||||
@@ -498,9 +501,7 @@ void main() {
|
||||
expect(found!.name, 'Archive');
|
||||
});
|
||||
|
||||
test(
|
||||
'JMAP: throws when server returns no created ID',
|
||||
() async {
|
||||
test('JMAP: throws when server returns no created ID', () async {
|
||||
final r = _makeRepos(
|
||||
httpClient: _mockJmap(
|
||||
apiResponses: [
|
||||
@@ -529,12 +530,12 @@ void main() {
|
||||
r.mailboxes.createMailboxWithRole('jmap-1', 'Archive', 'archive'),
|
||||
throwsA(isA<Exception>()),
|
||||
);
|
||||
},
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
group('syncMailboxes IMAP preserves manually-set role', () {
|
||||
test('existing role is kept when server returns no special-use flag',
|
||||
test(
|
||||
'existing role is kept when server returns no special-use flag',
|
||||
() async {
|
||||
final spy = SnoozeSpyImapClient();
|
||||
// Make listMailboxes return a plain folder without \Archive.
|
||||
@@ -572,7 +573,8 @@ void main() {
|
||||
expect(found!.path, 'Archive');
|
||||
// Suppress unused warning on spy.
|
||||
expect(spy, isNotNull);
|
||||
});
|
||||
},
|
||||
);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
@@ -178,17 +178,17 @@ void main() {
|
||||
|
||||
// v28: mime_tree_json column on email_bodies.
|
||||
await db
|
||||
.customSelect(
|
||||
'SELECT mime_tree_json FROM email_bodies LIMIT 0',
|
||||
)
|
||||
.customSelect('SELECT mime_tree_json FROM email_bodies LIMIT 0')
|
||||
.get();
|
||||
|
||||
// v29: local_sieve_scripts table.
|
||||
await db.customSelect('SELECT count(*) FROM local_sieve_scripts').get();
|
||||
|
||||
// v30: duration_ms column on sync_log_mailboxes.
|
||||
final syncLogMailboxColumns =
|
||||
await _tableColumns(db, 'sync_log_mailboxes');
|
||||
final syncLogMailboxColumns = await _tableColumns(
|
||||
db,
|
||||
'sync_log_mailboxes',
|
||||
);
|
||||
expect(syncLogMailboxColumns, contains('duration_ms'));
|
||||
|
||||
// v32: local_sieve_applied table.
|
||||
@@ -360,7 +360,8 @@ void main() {
|
||||
final allIndexes = await db
|
||||
.customSelect("SELECT name FROM sqlite_master WHERE type='index'")
|
||||
.get();
|
||||
final indexNames = allIndexes.map((r) => r.read<String>('name')).toSet();
|
||||
final indexNames =
|
||||
allIndexes.map((r) => r.read<String>('name')).toSet();
|
||||
expect(indexNames, contains('mailboxes_account_id'));
|
||||
expect(indexNames, contains('threads_latest_date'));
|
||||
|
||||
@@ -383,17 +384,17 @@ void main() {
|
||||
|
||||
// v28: mime_tree_json column on email_bodies.
|
||||
await db
|
||||
.customSelect(
|
||||
'SELECT mime_tree_json FROM email_bodies LIMIT 0',
|
||||
)
|
||||
.customSelect('SELECT mime_tree_json FROM email_bodies LIMIT 0')
|
||||
.get();
|
||||
|
||||
// v29: local_sieve_scripts table.
|
||||
await db.customSelect('SELECT count(*) FROM local_sieve_scripts').get();
|
||||
|
||||
// v30: duration_ms column on sync_log_mailboxes.
|
||||
final syncLogMailboxColumns =
|
||||
await _tableColumns(db, 'sync_log_mailboxes');
|
||||
final syncLogMailboxColumns = await _tableColumns(
|
||||
db,
|
||||
'sync_log_mailboxes',
|
||||
);
|
||||
expect(syncLogMailboxColumns, contains('duration_ms'));
|
||||
|
||||
// v33: error_stack_trace and is_permanent columns on sync_logs.
|
||||
@@ -413,7 +414,8 @@ void main() {
|
||||
|
||||
await db.close();
|
||||
if (dbFile.existsSync()) dbFile.deleteSync();
|
||||
});
|
||||
},
|
||||
);
|
||||
|
||||
test('fresh install creates all tables at schemaVersion 36', () async {
|
||||
final db = AppDatabase(NativeDatabase.memory());
|
||||
@@ -453,8 +455,10 @@ void main() {
|
||||
expect(draftColumns, contains('imap_server_id'));
|
||||
|
||||
// v30: duration_ms column on sync_log_mailboxes.
|
||||
final syncLogMailboxColumns =
|
||||
await _tableColumns(db, 'sync_log_mailboxes');
|
||||
final syncLogMailboxColumns = await _tableColumns(
|
||||
db,
|
||||
'sync_log_mailboxes',
|
||||
);
|
||||
expect(syncLogMailboxColumns, contains('duration_ms'));
|
||||
|
||||
// v33: error_stack_trace and is_permanent columns on sync_logs.
|
||||
|
||||
@@ -16,7 +16,8 @@ void main() {
|
||||
// false. This test fails before the fix (exception propagates) and passes
|
||||
// after it (exception is swallowed).
|
||||
await expectLater(initNotifications(), completes);
|
||||
});
|
||||
},
|
||||
);
|
||||
|
||||
test('showNewMailNotification completes without throwing', () async {
|
||||
// Platform.isAndroid is false in tests, so this returns early without
|
||||
|
||||
@@ -26,11 +26,9 @@ class _FakeAccounts implements AccountRepository {
|
||||
@override
|
||||
Stream<List<Account>> observeAccounts() => Stream.value(accounts);
|
||||
@override
|
||||
Future<Account?> getAccount(String id) async =>
|
||||
accounts.cast<Account?>().firstWhere(
|
||||
(a) => a?.id == id,
|
||||
orElse: () => null,
|
||||
);
|
||||
Future<Account?> getAccount(String id) async => accounts
|
||||
.cast<Account?>()
|
||||
.firstWhere((a) => a?.id == id, orElse: () => null);
|
||||
@override
|
||||
Future<void> addAccount(Account account, String password) async {}
|
||||
@override
|
||||
@@ -94,11 +92,7 @@ class _CountingEmails implements EmailRepository {
|
||||
@override
|
||||
Future<int> flushPendingChanges(String accountId, String password) async => 0;
|
||||
@override
|
||||
Stream<List<Email>> observeEmails(
|
||||
String a,
|
||||
String m, {
|
||||
int limit = 50,
|
||||
}) =>
|
||||
Stream<List<Email>> observeEmails(String a, String m, {int limit = 50}) =>
|
||||
Stream.value([]);
|
||||
@override
|
||||
Stream<List<EmailThread>> observeThreads(
|
||||
|
||||
@@ -47,9 +47,7 @@ void main() {
|
||||
test('parsePublicKeyQr returns null for invalid input', () {
|
||||
expect(ShareEncryptionService.parsePublicKeyQr('not-valid'), isNull);
|
||||
expect(
|
||||
ShareEncryptionService.parsePublicKeyQr(
|
||||
'sharedinbox.de:pubkey:v1:!!!',
|
||||
),
|
||||
ShareEncryptionService.parsePublicKeyQr('sharedinbox.de:pubkey:v1:!!!'),
|
||||
isNull,
|
||||
);
|
||||
expect(
|
||||
|
||||
@@ -73,11 +73,7 @@ void main() {
|
||||
SieveRule(
|
||||
joinType: 'single',
|
||||
conditions: [
|
||||
HeaderCondition(
|
||||
['from', 'reply-to'],
|
||||
':is',
|
||||
['boss@work.com'],
|
||||
),
|
||||
HeaderCondition(['from', 'reply-to'], ':is', ['boss@work.com']),
|
||||
],
|
||||
actions: [
|
||||
FlagAction([r'\Important']),
|
||||
@@ -121,8 +117,10 @@ void main() {
|
||||
),
|
||||
];
|
||||
|
||||
final ctx =
|
||||
interp.execute(rules, _email(subject: 'Weekly Newsletter Issue'));
|
||||
final ctx = interp.execute(
|
||||
rules,
|
||||
_email(subject: 'Weekly Newsletter Issue'),
|
||||
);
|
||||
expect(ctx.targetFolders, contains('Bulk'));
|
||||
});
|
||||
});
|
||||
|
||||
@@ -261,8 +261,9 @@ if exists "X-Spam-Flag" {
|
||||
|
||||
group('SieveParser — rule model', () {
|
||||
test('simple if produces one rule with branchGroupId', () {
|
||||
final rules =
|
||||
parser.parse('if header :contains "Subject" "x" { discard; }');
|
||||
final rules = parser.parse(
|
||||
'if header :contains "Subject" "x" { discard; }',
|
||||
);
|
||||
expect(rules, hasLength(1));
|
||||
expect(rules.first.branchGroupId, isNotNull);
|
||||
expect(rules.first.conditions, hasLength(1));
|
||||
|
||||
@@ -127,7 +127,8 @@ void main() {
|
||||
expect(rows.first.errorMessage, 'Connection refused');
|
||||
});
|
||||
|
||||
test('stores and retrieves stackTrace and isPermanent on error entries',
|
||||
test(
|
||||
'stores and retrieves stackTrace and isPermanent on error entries',
|
||||
() async {
|
||||
final repo = SyncLogRepositoryImpl(db);
|
||||
final start = DateTime(2024, 3, 1, 9);
|
||||
@@ -155,5 +156,6 @@ void main() {
|
||||
expect(entry.stackTrace, fakeTrace);
|
||||
expect(entry.isPermanent, true);
|
||||
expect(entry.errorMessage, 'MissingPluginException');
|
||||
});
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
@@ -260,8 +260,9 @@ void main() {
|
||||
expect(original!.messageId, isNull); // set a messageId so lookup works
|
||||
|
||||
// Seed a messageId so undo can find the email after UID change.
|
||||
await (db.update(db.emails)..where((t) => t.id.equals(oldEmailId)))
|
||||
.write(const EmailsCompanion(messageId: Value('msg-101@test')));
|
||||
await (db.update(db.emails)..where((t) => t.id.equals(oldEmailId))).write(
|
||||
const EmailsCompanion(messageId: Value('msg-101@test')),
|
||||
);
|
||||
|
||||
final originalWithMsgId = await repo.getEmail(oldEmailId);
|
||||
|
||||
@@ -303,8 +304,9 @@ void main() {
|
||||
await container.read(undoServiceProvider.notifier).undo();
|
||||
|
||||
// 4. Verify the current email row is now in INBOX.
|
||||
final inInbox = await (db.select(db.emails)
|
||||
..where((t) => t.mailboxPath.equals('INBOX')))
|
||||
final inInbox = await (db.select(
|
||||
db.emails,
|
||||
)..where((t) => t.mailboxPath.equals('INBOX')))
|
||||
.get();
|
||||
expect(
|
||||
inInbox,
|
||||
|
||||
@@ -122,7 +122,8 @@ void main() {
|
||||
verify(mockEmailRepo.moveEmail('e1', 'INBOX')).called(1);
|
||||
});
|
||||
|
||||
test('undo pushes inverse action into log when destinationMailboxPath is set',
|
||||
test(
|
||||
'undo pushes inverse action into log when destinationMailboxPath is set',
|
||||
() async {
|
||||
final action = UndoAction(
|
||||
id: 'del1',
|
||||
@@ -158,9 +159,11 @@ void main() {
|
||||
argThat(predicate<UndoAction>((a) => a.id == 'del1-inv')),
|
||||
),
|
||||
).called(1);
|
||||
});
|
||||
},
|
||||
);
|
||||
|
||||
test('undo without destinationMailboxPath does not push inverse action',
|
||||
test(
|
||||
'undo without destinationMailboxPath does not push inverse action',
|
||||
() async {
|
||||
final action = UndoAction(
|
||||
id: 'mv1',
|
||||
@@ -185,7 +188,8 @@ void main() {
|
||||
final log = container.read(undoServiceProvider);
|
||||
expect(log.length, 1);
|
||||
expect(log.first.id, 'mv1');
|
||||
});
|
||||
},
|
||||
);
|
||||
|
||||
test('undo with actionId removes and undos specific action', () async {
|
||||
// action1 has no destination → no inverse action
|
||||
@@ -350,13 +354,9 @@ void main() {
|
||||
);
|
||||
|
||||
// Simulate slow DB load
|
||||
when(
|
||||
mockUndoRepo.getHistory(limit: anyNamed('limit')),
|
||||
).thenAnswer(
|
||||
(_) => Future.delayed(
|
||||
const Duration(milliseconds: 10),
|
||||
() => [persisted],
|
||||
),
|
||||
when(mockUndoRepo.getHistory(limit: anyNamed('limit'))).thenAnswer(
|
||||
(_) =>
|
||||
Future.delayed(const Duration(milliseconds: 10), () => [persisted]),
|
||||
);
|
||||
|
||||
final notifier = container.read(undoServiceProvider.notifier);
|
||||
|
||||
@@ -46,8 +46,9 @@ class ThrowingUrlLauncher extends Mock
|
||||
Widget _buildScreen({List<Account> accounts = const []}) {
|
||||
return ProviderScope(
|
||||
overrides: [
|
||||
accountRepositoryProvider
|
||||
.overrideWithValue(FakeAccountRepository(accounts)),
|
||||
accountRepositoryProvider.overrideWithValue(
|
||||
FakeAccountRepository(accounts),
|
||||
),
|
||||
],
|
||||
child: const MaterialApp(home: AboutScreen()),
|
||||
);
|
||||
@@ -151,8 +152,10 @@ void main() {
|
||||
},
|
||||
);
|
||||
addTearDown(
|
||||
() => tester.binding.defaultBinaryMessenger
|
||||
.setMockMethodCallHandler(SystemChannels.platform, null),
|
||||
() => tester.binding.defaultBinaryMessenger.setMockMethodCallHandler(
|
||||
SystemChannels.platform,
|
||||
null,
|
||||
),
|
||||
);
|
||||
|
||||
await tester.pumpWidget(_buildScreen());
|
||||
@@ -173,10 +176,7 @@ void main() {
|
||||
expect(clipboardText, contains('Locale'));
|
||||
expect(clipboardText, contains('Text Scale'));
|
||||
expect(clipboardText, contains('DB Schema Version'));
|
||||
expect(
|
||||
clipboardText,
|
||||
contains('[sharedinbox.de](https://sharedinbox.de)'),
|
||||
);
|
||||
expect(clipboardText, contains('[sharedinbox.de](https://sharedinbox.de)'));
|
||||
});
|
||||
|
||||
testWidgets('AboutScreen create-issue button opens Codeberg URL', (
|
||||
|
||||
@@ -74,10 +74,7 @@ void main() {
|
||||
recipientKeyId: material.keyId,
|
||||
recipientPublicKeyBytes: material.publicKeyBytes,
|
||||
accounts: [
|
||||
AccountPayload(
|
||||
accountJson: account.toJson(),
|
||||
password: 'secret',
|
||||
),
|
||||
AccountPayload(accountJson: account.toJson(), password: 'secret'),
|
||||
],
|
||||
);
|
||||
|
||||
@@ -99,10 +96,7 @@ void main() {
|
||||
await tester.tap(find.text('Import'));
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
expect(
|
||||
find.text('Imported 1 account successfully.'),
|
||||
findsOneWidget,
|
||||
);
|
||||
expect(find.text('Imported 1 account successfully.'), findsOneWidget);
|
||||
},
|
||||
);
|
||||
|
||||
|
||||
@@ -227,9 +227,10 @@ void main() {
|
||||
expect(find.textContaining('Healthy'), findsOneWidget);
|
||||
});
|
||||
|
||||
testWidgets(
|
||||
'shows discrepancy details when sync health has discrepancies',
|
||||
(tester) async {
|
||||
testWidgets('shows discrepancy details when sync health has discrepancies',
|
||||
(
|
||||
tester,
|
||||
) async {
|
||||
const summary =
|
||||
'{"INBOX":{"missingLocally":3,"missingOnServer":0,"flagMismatches":1}}';
|
||||
await tester.pumpWidget(
|
||||
@@ -250,12 +251,11 @@ void main() {
|
||||
|
||||
expect(find.textContaining('missing locally: 3'), findsOneWidget);
|
||||
expect(find.textContaining('flag mismatches: 1'), findsOneWidget);
|
||||
},
|
||||
);
|
||||
});
|
||||
|
||||
testWidgets(
|
||||
'sync health row is positioned below the account name row',
|
||||
(tester) async {
|
||||
testWidgets('sync health row is positioned below the account name row', (
|
||||
tester,
|
||||
) async {
|
||||
await tester.pumpWidget(
|
||||
buildApp(
|
||||
initialLocation: '/accounts',
|
||||
@@ -274,7 +274,6 @@ void main() {
|
||||
final namePos = tester.getTopLeft(find.text('Alice')).dy;
|
||||
final healthPos = tester.getTopLeft(find.textContaining('Healthy')).dy;
|
||||
expect(healthPos, greaterThan(namePos));
|
||||
},
|
||||
);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
@@ -96,8 +96,10 @@ void main() {
|
||||
},
|
||||
);
|
||||
addTearDown(
|
||||
() => tester.binding.defaultBinaryMessenger
|
||||
.setMockMethodCallHandler(SystemChannels.platform, null),
|
||||
() => tester.binding.defaultBinaryMessenger.setMockMethodCallHandler(
|
||||
SystemChannels.platform,
|
||||
null,
|
||||
),
|
||||
);
|
||||
|
||||
const exception = 'TestException: clipboard test';
|
||||
@@ -126,9 +128,9 @@ void main() {
|
||||
},
|
||||
);
|
||||
|
||||
testWidgets(
|
||||
'CrashScreen shows git hash as clickable link above stacktrace',
|
||||
(tester) async {
|
||||
testWidgets('CrashScreen shows git hash as clickable link above stacktrace', (
|
||||
tester,
|
||||
) async {
|
||||
tester.view.physicalSize = const Size(800, 1200);
|
||||
tester.view.devicePixelRatio = 1.0;
|
||||
addTearDown(() => tester.view.resetPhysicalSize());
|
||||
@@ -168,12 +170,11 @@ void main() {
|
||||
mock.launchedUrl,
|
||||
equals('https://codeberg.org/guettli/sharedinbox/commit/abc1234'),
|
||||
);
|
||||
},
|
||||
);
|
||||
});
|
||||
|
||||
testWidgets(
|
||||
'CrashScreen shows version, build mode, and platform in the UI',
|
||||
(tester) async {
|
||||
testWidgets('CrashScreen shows version, build mode, and platform in the UI', (
|
||||
tester,
|
||||
) async {
|
||||
tester.view.physicalSize = const Size(800, 1200);
|
||||
tester.view.devicePixelRatio = 1.0;
|
||||
addTearDown(() => tester.view.resetPhysicalSize());
|
||||
@@ -197,8 +198,7 @@ void main() {
|
||||
find.textContaining(RegExp(r'linux|android|ios|windows|macos')),
|
||||
findsWidgets,
|
||||
);
|
||||
},
|
||||
);
|
||||
});
|
||||
|
||||
testWidgets(
|
||||
'CrashScreen shows app version as clickable link when git hash is set',
|
||||
@@ -264,8 +264,10 @@ void main() {
|
||||
},
|
||||
);
|
||||
addTearDown(
|
||||
() => tester.binding.defaultBinaryMessenger
|
||||
.setMockMethodCallHandler(SystemChannels.platform, null),
|
||||
() => tester.binding.defaultBinaryMessenger.setMockMethodCallHandler(
|
||||
SystemChannels.platform,
|
||||
null,
|
||||
),
|
||||
);
|
||||
|
||||
const exception = 'TestException: version link clipboard test';
|
||||
|
||||
@@ -107,9 +107,7 @@ void main() {
|
||||
|
||||
testWidgets(
|
||||
'try connection button is disabled when no password stored or entered',
|
||||
(
|
||||
tester,
|
||||
) async {
|
||||
(tester) async {
|
||||
tester.view.physicalSize = const Size(800, 1400);
|
||||
tester.view.devicePixelRatio = 1.0;
|
||||
addTearDown(tester.view.resetPhysicalSize);
|
||||
@@ -130,7 +128,8 @@ void main() {
|
||||
find.byKey(const Key('editTryConnectionButton')),
|
||||
);
|
||||
expect(button.onPressed, isNull);
|
||||
});
|
||||
},
|
||||
);
|
||||
|
||||
testWidgets(
|
||||
'try connection button is enabled after typing password with no stored password',
|
||||
@@ -161,7 +160,8 @@ void main() {
|
||||
find.byKey(const Key('editTryConnectionButton')),
|
||||
);
|
||||
expect(button.onPressed, isNotNull);
|
||||
});
|
||||
},
|
||||
);
|
||||
|
||||
testWidgets('save button is disabled when no password stored or entered', (
|
||||
tester,
|
||||
@@ -182,8 +182,9 @@ void main() {
|
||||
);
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
final button = tester
|
||||
.widget<FilledButton>(find.widgetWithText(FilledButton, 'Save'));
|
||||
final button = tester.widget<FilledButton>(
|
||||
find.widgetWithText(FilledButton, 'Save'),
|
||||
);
|
||||
expect(button.onPressed, isNull);
|
||||
});
|
||||
|
||||
|
||||
@@ -52,10 +52,7 @@ List<Override> _overrides({required EmailBody body, Email? email}) => [
|
||||
),
|
||||
mailboxRepositoryProvider.overrideWithValue(FakeMailboxRepository()),
|
||||
emailRepositoryProvider.overrideWithValue(
|
||||
FakeEmailRepository(
|
||||
emailDetail: email ?? testEmail(),
|
||||
emailBody: body,
|
||||
),
|
||||
FakeEmailRepository(emailDetail: email ?? testEmail(), emailBody: body),
|
||||
),
|
||||
];
|
||||
|
||||
@@ -191,21 +188,21 @@ void main() {
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
expect(
|
||||
find.byWidgetPredicate(
|
||||
(w) => w is Tooltip && w.message == 'Reply all',
|
||||
),
|
||||
find.byWidgetPredicate((w) => w is Tooltip && w.message == 'Reply all'),
|
||||
findsNothing,
|
||||
);
|
||||
});
|
||||
|
||||
testWidgets('Reply on single-recipient email navigates directly to compose',
|
||||
testWidgets(
|
||||
'Reply on single-recipient email navigates directly to compose',
|
||||
(tester) async {
|
||||
// testEmail has from=[bob], to=[alice]. After removing alice (own),
|
||||
// only bob remains → no dialog, navigate straight to compose.
|
||||
final email = testEmail();
|
||||
await tester.pumpWidget(
|
||||
buildApp(
|
||||
initialLocation: '/accounts/acc-1/mailboxes/INBOX/emails/acc-1%3A42',
|
||||
initialLocation:
|
||||
'/accounts/acc-1/mailboxes/INBOX/emails/acc-1%3A42',
|
||||
overrides: [
|
||||
..._overrides(
|
||||
body: const EmailBody(emailId: 'acc-1:42', attachments: []),
|
||||
@@ -218,18 +215,18 @@ void main() {
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
await tester.tap(
|
||||
find.byWidgetPredicate(
|
||||
(w) => w is Tooltip && w.message == 'Reply',
|
||||
),
|
||||
find.byWidgetPredicate((w) => w is Tooltip && w.message == 'Reply'),
|
||||
);
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
// No dialog shown — straight navigation to compose.
|
||||
expect(find.text('Reply All'), findsNothing);
|
||||
});
|
||||
},
|
||||
);
|
||||
|
||||
testWidgets('Reply on multi-recipient email shows Reply All dialog',
|
||||
(tester) async {
|
||||
testWidgets('Reply on multi-recipient email shows Reply All dialog', (
|
||||
tester,
|
||||
) async {
|
||||
// Email with an extra Cc recipient so the dialog is triggered.
|
||||
final email = Email(
|
||||
id: 'acc-1:42',
|
||||
@@ -258,9 +255,7 @@ void main() {
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
await tester.tap(
|
||||
find.byWidgetPredicate(
|
||||
(w) => w is Tooltip && w.message == 'Reply',
|
||||
),
|
||||
find.byWidgetPredicate((w) => w is Tooltip && w.message == 'Reply'),
|
||||
);
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
@@ -271,8 +266,9 @@ void main() {
|
||||
expect(find.textContaining('carol@example.com'), findsAtLeastNWidgets(1));
|
||||
});
|
||||
|
||||
testWidgets('Mark as spam is in popup menu, not a standalone button',
|
||||
(tester) async {
|
||||
testWidgets('Mark as spam is in popup menu, not a standalone button', (
|
||||
tester,
|
||||
) async {
|
||||
await tester.pumpWidget(
|
||||
buildApp(
|
||||
initialLocation: '/accounts/acc-1/mailboxes/INBOX/emails/acc-1%3A42',
|
||||
@@ -298,8 +294,9 @@ void main() {
|
||||
expect(find.text('Mark as spam'), findsOneWidget);
|
||||
});
|
||||
|
||||
testWidgets('Mark as spam shows dialog when no junk folder',
|
||||
(tester) async {
|
||||
testWidgets('Mark as spam shows dialog when no junk folder', (
|
||||
tester,
|
||||
) async {
|
||||
// FakeMailboxRepository has no mailboxes by default → findMailboxByRole
|
||||
// returns null → dialog shown.
|
||||
await tester.pumpWidget(
|
||||
@@ -334,9 +331,7 @@ void main() {
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
expect(
|
||||
find.byWidgetPredicate(
|
||||
(w) => w is Tooltip && w.message == 'Archive',
|
||||
),
|
||||
find.byWidgetPredicate((w) => w is Tooltip && w.message == 'Archive'),
|
||||
findsOneWidget,
|
||||
);
|
||||
});
|
||||
@@ -355,17 +350,16 @@ void main() {
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
await tester.tap(
|
||||
find.byWidgetPredicate(
|
||||
(w) => w is Tooltip && w.message == 'Archive',
|
||||
),
|
||||
find.byWidgetPredicate((w) => w is Tooltip && w.message == 'Archive'),
|
||||
);
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
expect(find.text('No archive folder found'), findsOneWidget);
|
||||
});
|
||||
|
||||
testWidgets('Mark as unread is in popup menu, not a standalone button',
|
||||
(tester) async {
|
||||
testWidgets('Mark as unread is in popup menu, not a standalone button', (
|
||||
tester,
|
||||
) async {
|
||||
await tester.pumpWidget(
|
||||
buildApp(
|
||||
initialLocation: '/accounts/acc-1/mailboxes/INBOX/emails/acc-1%3A42',
|
||||
@@ -401,13 +395,16 @@ void main() {
|
||||
accountRepositoryProvider.overrideWithValue(
|
||||
FakeAccountRepository([kTestAccount]),
|
||||
),
|
||||
mailboxRepositoryProvider
|
||||
.overrideWithValue(FakeMailboxRepository()),
|
||||
mailboxRepositoryProvider.overrideWithValue(
|
||||
FakeMailboxRepository(),
|
||||
),
|
||||
emailRepositoryProvider.overrideWithValue(
|
||||
FakeEmailRepository(
|
||||
emailDetail: testEmail(),
|
||||
emailBody:
|
||||
const EmailBody(emailId: 'acc-1:42', attachments: []),
|
||||
emailBody: const EmailBody(
|
||||
emailId: 'acc-1:42',
|
||||
attachments: [],
|
||||
),
|
||||
rawRfc822: rawContent,
|
||||
),
|
||||
),
|
||||
@@ -436,13 +433,16 @@ void main() {
|
||||
accountRepositoryProvider.overrideWithValue(
|
||||
FakeAccountRepository([kTestAccount]),
|
||||
),
|
||||
mailboxRepositoryProvider
|
||||
.overrideWithValue(FakeMailboxRepository()),
|
||||
mailboxRepositoryProvider.overrideWithValue(
|
||||
FakeMailboxRepository(),
|
||||
),
|
||||
emailRepositoryProvider.overrideWithValue(
|
||||
FakeEmailRepository(
|
||||
emailDetail: testEmail(),
|
||||
emailBody:
|
||||
const EmailBody(emailId: 'acc-1:42', attachments: []),
|
||||
emailBody: const EmailBody(
|
||||
emailId: 'acc-1:42',
|
||||
attachments: [],
|
||||
),
|
||||
rawRfc822: 'Subject: test\r\n\r\nBody',
|
||||
),
|
||||
),
|
||||
@@ -483,16 +483,15 @@ void main() {
|
||||
expect(find.text('Share'), findsOneWidget);
|
||||
});
|
||||
|
||||
testWidgets(
|
||||
'long-press on unsubscribe chip shows URL tooltip',
|
||||
(tester) async {
|
||||
testWidgets('long-press on unsubscribe chip shows URL tooltip', (
|
||||
tester,
|
||||
) async {
|
||||
final email = testEmail(
|
||||
listUnsubscribeHeader: '<https://example.com/unsubscribe>',
|
||||
);
|
||||
await tester.pumpWidget(
|
||||
buildApp(
|
||||
initialLocation:
|
||||
'/accounts/acc-1/mailboxes/INBOX/emails/acc-1%3A42',
|
||||
initialLocation: '/accounts/acc-1/mailboxes/INBOX/emails/acc-1%3A42',
|
||||
overrides: _overrides(
|
||||
body: const EmailBody(emailId: 'acc-1:42', attachments: []),
|
||||
email: email,
|
||||
@@ -505,8 +504,7 @@ void main() {
|
||||
|
||||
expect(
|
||||
find.byWidgetPredicate(
|
||||
(w) =>
|
||||
w is Tooltip && w.message == 'https://example.com/unsubscribe',
|
||||
(w) => w is Tooltip && w.message == 'https://example.com/unsubscribe',
|
||||
),
|
||||
findsOneWidget,
|
||||
);
|
||||
@@ -514,12 +512,8 @@ void main() {
|
||||
await tester.longPress(find.text('Unsubscribe'));
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
expect(
|
||||
find.text('https://example.com/unsubscribe'),
|
||||
findsOneWidget,
|
||||
);
|
||||
},
|
||||
);
|
||||
expect(find.text('https://example.com/unsubscribe'), findsOneWidget);
|
||||
});
|
||||
|
||||
testWidgets('Show Mail Structure opens dialog with MIME parts', (
|
||||
tester,
|
||||
@@ -563,9 +557,9 @@ void main() {
|
||||
expect(find.textContaining('application/pdf'), findsOneWidget);
|
||||
});
|
||||
|
||||
testWidgets(
|
||||
'Show Mail Structure shows snackbar when mimeTree is absent',
|
||||
(tester) async {
|
||||
testWidgets('Show Mail Structure shows snackbar when mimeTree is absent', (
|
||||
tester,
|
||||
) async {
|
||||
const body = EmailBody(
|
||||
emailId: 'acc-1:42',
|
||||
textBody: 'Hello',
|
||||
@@ -574,8 +568,7 @@ void main() {
|
||||
);
|
||||
await tester.pumpWidget(
|
||||
buildApp(
|
||||
initialLocation:
|
||||
'/accounts/acc-1/mailboxes/INBOX/emails/acc-1%3A42',
|
||||
initialLocation: '/accounts/acc-1/mailboxes/INBOX/emails/acc-1%3A42',
|
||||
overrides: _overrides(body: body),
|
||||
),
|
||||
);
|
||||
@@ -587,12 +580,8 @@ void main() {
|
||||
await tester.tap(find.text('Show Mail Structure'));
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
expect(
|
||||
find.textContaining('Structure not available'),
|
||||
findsOneWidget,
|
||||
);
|
||||
},
|
||||
);
|
||||
expect(find.textContaining('Structure not available'), findsOneWidget);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@@ -51,9 +51,7 @@ List<Override> _overrides({
|
||||
searchHistoryRepositoryProvider.overrideWithValue(
|
||||
FakeSearchHistoryRepository(),
|
||||
),
|
||||
syncLastErrorProvider.overrideWith(
|
||||
(ref, _) => Stream.value(syncError),
|
||||
),
|
||||
syncLastErrorProvider.overrideWith((ref, _) => Stream.value(syncError)),
|
||||
];
|
||||
|
||||
void main() {
|
||||
@@ -122,9 +120,7 @@ void main() {
|
||||
buildApp(
|
||||
initialLocation: '/accounts/acc-1/mailboxes/INBOX/emails',
|
||||
overrides: _overrides(
|
||||
searchResults: [
|
||||
_email(id: 'acc-1:5', subject: 'Project proposal'),
|
||||
],
|
||||
searchResults: [_email(id: 'acc-1:5', subject: 'Project proposal')],
|
||||
),
|
||||
),
|
||||
);
|
||||
|
||||
@@ -430,9 +430,9 @@ void main() {
|
||||
expect(find.text('Result email'), findsWidgets);
|
||||
});
|
||||
|
||||
testWidgets(
|
||||
'deleting all search results pops back to previous screen',
|
||||
(tester) async {
|
||||
testWidgets('deleting all search results pops back to previous screen', (
|
||||
tester,
|
||||
) async {
|
||||
final email = testEmail(subject: 'Needle');
|
||||
|
||||
// Start at the mailbox list so the email list is pushed on top of it,
|
||||
@@ -485,8 +485,7 @@ void main() {
|
||||
// Should have popped back to the mailbox list.
|
||||
expect(find.byType(EmailListScreen), findsNothing);
|
||||
expect(find.byType(MailboxListScreen), findsOneWidget);
|
||||
},
|
||||
);
|
||||
});
|
||||
|
||||
testWidgets(
|
||||
'deleting some search results updates the list without popping',
|
||||
|
||||
@@ -89,9 +89,7 @@ void main() {
|
||||
expect(find.text('No results'), findsOneWidget);
|
||||
});
|
||||
|
||||
testWidgets('shows email results under "Messages" section', (
|
||||
tester,
|
||||
) async {
|
||||
testWidgets('shows email results under "Messages" section', (tester) async {
|
||||
final email = testEmail(subject: 'Invoice Q3');
|
||||
await tester.pumpWidget(
|
||||
buildApp(
|
||||
@@ -122,9 +120,7 @@ void main() {
|
||||
expect(find.text('Invoice Q3'), findsOneWidget);
|
||||
});
|
||||
|
||||
testWidgets('shows folder results under "Folders" section', (
|
||||
tester,
|
||||
) async {
|
||||
testWidgets('shows folder results under "Folders" section', (tester) async {
|
||||
const archiveMailbox = Mailbox(
|
||||
id: 'acc-1:Archive',
|
||||
accountId: 'acc-1',
|
||||
|
||||
@@ -20,10 +20,12 @@ Widget _wrap(Widget child) => MaterialApp(
|
||||
|
||||
void main() {
|
||||
group('buildEmailHtml', () {
|
||||
test('forces light color-scheme to prevent black-on-black in dark mode',
|
||||
test(
|
||||
'forces light color-scheme to prevent black-on-black in dark mode',
|
||||
() {
|
||||
_expectLightMode(buildEmailHtml('<p>Hello</p>'));
|
||||
});
|
||||
},
|
||||
);
|
||||
|
||||
test('includes email body content', () {
|
||||
final html = buildEmailHtml('<p>Test body</p>');
|
||||
@@ -44,8 +46,9 @@ void main() {
|
||||
|
||||
test('prevents horizontal overflow so wide HTML emails are not cut off',
|
||||
() {
|
||||
final html =
|
||||
buildEmailHtml('<table width="600"><tr><td>x</td></tr></table>');
|
||||
final html = buildEmailHtml(
|
||||
'<table width="600"><tr><td>x</td></tr></table>',
|
||||
);
|
||||
// Body clips overflow so fixed-width email tables don't escape the viewport.
|
||||
expect(html, contains('overflow-x: hidden'));
|
||||
// Tables are forced to full viewport width so fixed pixel widths don't overflow.
|
||||
@@ -62,11 +65,7 @@ void main() {
|
||||
group('SecureEmailWebView (Linux plain-text fallback)', () {
|
||||
testWidgets('renders extracted text from HTML', (tester) async {
|
||||
await tester.pumpWidget(
|
||||
_wrap(
|
||||
const SecureEmailWebView(
|
||||
htmlBody: '<p>Hello <b>world</b></p>',
|
||||
),
|
||||
),
|
||||
_wrap(const SecureEmailWebView(htmlBody: '<p>Hello <b>world</b></p>')),
|
||||
);
|
||||
expect(find.textContaining('Hello'), findsOneWidget);
|
||||
expect(find.textContaining('world'), findsOneWidget);
|
||||
@@ -92,12 +91,11 @@ void main() {
|
||||
expect(find.byType(SelectableText), findsOneWidget);
|
||||
});
|
||||
|
||||
testWidgets('toggling loadRemoteImages rebuilds without error',
|
||||
(tester) async {
|
||||
testWidgets('toggling loadRemoteImages rebuilds without error', (
|
||||
tester,
|
||||
) async {
|
||||
await tester.pumpWidget(
|
||||
_wrap(
|
||||
const SecureEmailWebView(htmlBody: '<p>Body</p>'),
|
||||
),
|
||||
_wrap(const SecureEmailWebView(htmlBody: '<p>Body</p>')),
|
||||
);
|
||||
await tester.pumpWidget(
|
||||
_wrap(
|
||||
@@ -111,9 +109,7 @@ void main() {
|
||||
});
|
||||
|
||||
testWidgets('handles empty HTML body', (tester) async {
|
||||
await tester.pumpWidget(
|
||||
_wrap(const SecureEmailWebView(htmlBody: '')),
|
||||
);
|
||||
await tester.pumpWidget(_wrap(const SecureEmailWebView(htmlBody: '')));
|
||||
expect(find.byType(SelectableText), findsOneWidget);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -27,13 +27,9 @@ void main() {
|
||||
await tester.pumpWidget(
|
||||
ProviderScope(
|
||||
overrides: [
|
||||
sieveRepositoryProvider.overrideWith(
|
||||
(ref) => _FakeSieveRepository(),
|
||||
),
|
||||
sieveRepositoryProvider.overrideWith((ref) => _FakeSieveRepository()),
|
||||
],
|
||||
child: const MaterialApp(
|
||||
home: SieveScriptsScreen(accountId: 'acc-1'),
|
||||
),
|
||||
child: const MaterialApp(home: SieveScriptsScreen(accountId: 'acc-1')),
|
||||
),
|
||||
);
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
@@ -38,8 +38,9 @@ void main() {
|
||||
sourceMailboxPath: 'INBOX',
|
||||
timestamp: DateTime.now().subtract(const Duration(hours: 1)),
|
||||
);
|
||||
when(mockUndoRepo.getHistory(limit: anyNamed('limit')))
|
||||
.thenAnswer((_) async => [staleAction]);
|
||||
when(
|
||||
mockUndoRepo.getHistory(limit: anyNamed('limit')),
|
||||
).thenAnswer((_) async => [staleAction]);
|
||||
|
||||
await tester.pumpWidget(buildShell(mockUndoRepo));
|
||||
await tester.pumpAndSettle();
|
||||
@@ -48,10 +49,12 @@ void main() {
|
||||
},
|
||||
);
|
||||
|
||||
testWidgets('shows snackbar for fresh action pushed in current session',
|
||||
(tester) async {
|
||||
when(mockUndoRepo.getHistory(limit: anyNamed('limit')))
|
||||
.thenAnswer((_) async => []);
|
||||
testWidgets('shows snackbar for fresh action pushed in current session', (
|
||||
tester,
|
||||
) async {
|
||||
when(
|
||||
mockUndoRepo.getHistory(limit: anyNamed('limit')),
|
||||
).thenAnswer((_) async => []);
|
||||
|
||||
await tester.pumpWidget(buildShell(mockUndoRepo));
|
||||
await tester.pumpAndSettle();
|
||||
@@ -64,18 +67,20 @@ void main() {
|
||||
emailIds: ['e1'],
|
||||
sourceMailboxPath: 'INBOX',
|
||||
);
|
||||
await ProviderScope.containerOf(context)
|
||||
.read(undoServiceProvider.notifier)
|
||||
.pushAction(freshAction);
|
||||
await ProviderScope.containerOf(
|
||||
context,
|
||||
).read(undoServiceProvider.notifier).pushAction(freshAction);
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
expect(find.text('1 email(s) moved'), findsOneWidget);
|
||||
});
|
||||
|
||||
testWidgets('shows correct text for delete action (moved to Trash)',
|
||||
(tester) async {
|
||||
when(mockUndoRepo.getHistory(limit: anyNamed('limit')))
|
||||
.thenAnswer((_) async => []);
|
||||
testWidgets('shows correct text for delete action (moved to Trash)', (
|
||||
tester,
|
||||
) async {
|
||||
when(
|
||||
mockUndoRepo.getHistory(limit: anyNamed('limit')),
|
||||
).thenAnswer((_) async => []);
|
||||
|
||||
await tester.pumpWidget(buildShell(mockUndoRepo));
|
||||
await tester.pumpAndSettle();
|
||||
@@ -88,9 +93,9 @@ void main() {
|
||||
emailIds: ['e1', 'e2'],
|
||||
sourceMailboxPath: 'INBOX',
|
||||
);
|
||||
await ProviderScope.containerOf(context)
|
||||
.read(undoServiceProvider.notifier)
|
||||
.pushAction(deleteAction);
|
||||
await ProviderScope.containerOf(
|
||||
context,
|
||||
).read(undoServiceProvider.notifier).pushAction(deleteAction);
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
expect(find.text('2 email(s) moved to Trash'), findsOneWidget);
|
||||
|
||||
@@ -35,10 +35,7 @@ void main() {
|
||||
);
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
expect(
|
||||
find.text('Single mail view button position'),
|
||||
findsOneWidget,
|
||||
);
|
||||
expect(find.text('Single mail view button position'), findsOneWidget);
|
||||
});
|
||||
|
||||
testWidgets('menu position bottom option is selected by default', (
|
||||
@@ -53,8 +50,9 @@ void main() {
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
final radioGroups = find.byType(RadioGroup<MenuPosition>);
|
||||
final menuGroup =
|
||||
tester.widget<RadioGroup<MenuPosition>>(radioGroups.first);
|
||||
final menuGroup = tester.widget<RadioGroup<MenuPosition>>(
|
||||
radioGroups.first,
|
||||
);
|
||||
expect(menuGroup.groupValue, MenuPosition.bottom);
|
||||
});
|
||||
|
||||
@@ -70,8 +68,9 @@ void main() {
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
final radioGroups = find.byType(RadioGroup<MenuPosition>);
|
||||
final mailViewGroup =
|
||||
tester.widget<RadioGroup<MenuPosition>>(radioGroups.last);
|
||||
final mailViewGroup = tester.widget<RadioGroup<MenuPosition>>(
|
||||
radioGroups.last,
|
||||
);
|
||||
expect(mailViewGroup.groupValue, MenuPosition.bottom);
|
||||
});
|
||||
|
||||
@@ -98,9 +97,8 @@ void main() {
|
||||
});
|
||||
|
||||
testWidgets(
|
||||
'tapping Top in mail view button position section updates the repo', (
|
||||
tester,
|
||||
) async {
|
||||
'tapping Top in mail view button position section updates the repo',
|
||||
(tester) async {
|
||||
await tester.pumpWidget(
|
||||
buildApp(
|
||||
initialLocation: '/accounts/preferences',
|
||||
@@ -118,7 +116,8 @@ void main() {
|
||||
as FakeUserPreferencesRepository;
|
||||
|
||||
expect(repo.mailViewButtonPosition, MenuPosition.top);
|
||||
});
|
||||
},
|
||||
);
|
||||
|
||||
testWidgets('shows after mail action section', (tester) async {
|
||||
await tester.pumpWidget(
|
||||
@@ -153,14 +152,13 @@ void main() {
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
final radioGroups = find.byType(RadioGroup<AfterMailViewAction>);
|
||||
final group =
|
||||
tester.widget<RadioGroup<AfterMailViewAction>>(radioGroups.first);
|
||||
final group = tester.widget<RadioGroup<AfterMailViewAction>>(
|
||||
radioGroups.first,
|
||||
);
|
||||
expect(group.groupValue, AfterMailViewAction.nextMessage);
|
||||
});
|
||||
|
||||
testWidgets('tapping Return to mailbox updates the repo', (
|
||||
tester,
|
||||
) async {
|
||||
testWidgets('tapping Return to mailbox updates the repo', (tester) async {
|
||||
await tester.pumpWidget(
|
||||
buildApp(
|
||||
initialLocation: '/accounts/preferences',
|
||||
|
||||
Reference in New Issue
Block a user