Compare commits

...
118 Commits
Author SHA1 Message Date
GitHub Actions 000d6158ae chore: bump version to 4.11.190 [skip ci] 2026-10-31 12:55:45 +00:00
GitHub Actions bb1586001a Bump cinny: Revert reporting the activity bar against the message in the viewport.
Build / increment-version (push) Successful in 4s
Build / build-android (push) Successful in 5m20s
2026-10-31 12:55:38 +00:00
GitHub Actions 56463d5147 chore: bump version to 4.11.189 [skip ci] 2026-10-15 12:13:19 +00:00
GitHub Actions 1ebaa165bd Bump cinny: Fetch the TikTok oEmbed through the main process in Electron and drop the thumbnail crossOrigin.
Build / increment-version (push) Successful in 5s
Build / build-android (push) Successful in 2m33s
2026-10-15 12:13:11 +00:00
GitHub Actions 55899d9cab chore: bump version to 4.11.188 [skip ci] 2026-10-13 09:11:50 +00:00
litruv 0d2e6c73a7 docs: add plugin development instructions (AGENTS.md)
Build / increment-version (push) Successful in 5s
Build / build-android (push) Successful in 2m30s
2026-10-13 20:11:43 +11:00
GitHub Actions 3067b88ecc chore: bump version to 4.11.187 [skip ci] 2026-10-13 08:44:39 +00:00
GitHub Actions c6e9c82ae5 Bump cinny: Remove the Paarrot delivery receipt.
Build / increment-version (push) Successful in 4s
Build / build-android (push) Successful in 2m29s
2026-10-13 08:44:33 +00:00
GitHub Actions 3787b55ca5 chore: bump version to 4.11.186 [skip ci] 2026-10-13 05:54:05 +00:00
litruv 1f16f5dd44 fix: provide ctx.lucide to plugins; resolve submodule gitdir in apply-overlay
Build / increment-version (push) Successful in 4s
Build / build-android (push) Successful in 2m29s
2026-10-13 16:53:56 +11:00
GitHub Actions e7cfb3dbd9 chore: bump version to 4.11.185 [skip ci] 2026-10-13 03:34:41 +00:00
GitHub Actions b21e74307e Bump cinny: Report the activity bar against the message in the viewport.
Build / increment-version (push) Successful in 5s
Build / build-android (push) Successful in 2m31s
2026-10-13 03:34:35 +00:00
GitHub Actions aebf253226 chore: bump version to 4.11.184 [skip ci] 2026-10-12 21:01:29 +00:00
GitHub Actions b7f354cd12 Bump cinny: Add Telegram-style delivery receipt to Paarrot.
Build / increment-version (push) Successful in 4s
Build / build-android (push) Successful in 2m31s
2026-10-12 21:01:22 +00:00
GitHub Actions 5f93ad815e chore: bump version to 4.11.183 [skip ci] 2026-10-12 16:11:46 +00:00
GitHub Actions 39945c5e99 Bump cinny: Apply the flat composer chrome to all themes instead of stationery only.
Build / increment-version (push) Successful in 4s
Build / build-android (push) Successful in 2m32s
2026-10-12 16:11:25 +00:00
GitHub Actions 9be4ee4225 chore: bump version to 4.11.182 [skip ci] 2026-10-06 00:11:46 +00:00
GitHub Actions 8c20c3d3a6 Bump cinny: Show cached spaces on the loading splash until the chats are ready
Build / increment-version (push) Successful in 5s
Build / build-android (push) Successful in 2m30s
2026-10-06 00:11:41 +00:00
GitHub Actions 9b97fb8c32 chore: bump version to 4.11.181 [skip ci] 2026-10-05 23:44:15 +00:00
litruv cef9f28dfd notifications: show reaction emoji as icon + quoted message snippet
Build / increment-version (push) Successful in 5s
Build / build-android (push) Successful in 4m47s
Reaction notifications previously had no icon and a generic body. Now the
reaction emoji is rendered as the notification icon and the body quotes the
reacted-to message. Applied to both the web/Electron/Tauri path and the
Android background sync service.
2026-10-06 10:43:12 +11:00
GitHub Actions 96d5ae40e1 chore: bump version to 4.11.180 [skip ci] 2026-10-05 21:04:21 +00:00
GitHub Actions 8f64937367 Bump cinny: Skip sourcemap generation in CI builds
Build / increment-version (push) Successful in 4s
Build / build-android (push) Successful in 6m24s
2026-10-05 21:04:14 +00:00
GitHub Actions 441de85b82 chore: bump version to 4.11.179 [skip ci] 2026-10-05 20:50:06 +00:00
GitHub Actions 7277ecf589 Bump cinny: Add 4.11.193 update notes for the shared profile cache.
Build / increment-version (push) Successful in 6s
Build / build-android (push) Successful in 6m59s
2026-10-05 20:49:57 +00:00
GitHub Actions 2a8cc22ff9 chore: bump version to 4.11.178 [skip ci] 2026-10-05 20:43:07 +00:00
GitHub Actions 72c933ca61 Bump cinny: Cache profile fields and assets behind one shared store.
Build / increment-version (push) Successful in 4s
Build / build-android (push) Canceled after 6m50s
2026-10-05 20:43:02 +00:00
GitHub Actions 68d834cd72 chore: bump version to 4.11.177 [skip ci] 2026-10-05 13:38:15 +00:00
GitHub Actions e6adb35e5b Bump cinny: Open the last seen channel on startup.
Build / increment-version (push) Successful in 4s
Build / build-android (push) Successful in 6m56s
2026-10-05 13:38:10 +00:00
GitHub Actions d03e9493f0 chore: bump version to 4.11.176 [skip ci] 2026-10-05 13:05:09 +00:00
litruv dc01018105 Remove left/right composer padding and side/bottom borders, keep top border only
Build / increment-version (push) Successful in 5s
Build / build-android (push) Successful in 6m15s
2026-10-06 00:05:00 +11:00
litruv 8efd06d2b5 feat: add push script for automated git commit and push workflow 2026-10-06 00:05:00 +11:00
GitHub Actions ac6321aa3e chore: bump version to 4.11.175 [skip ci] 2026-10-05 03:04:30 +00:00
litruv e54429fa3b ci: add build concurrency + npm/gradle caching to build.yml
Build / increment-version (push) Successful in 5s
Build / build-android (push) Successful in 7m3s
2026-10-05 14:04:23 +11:00
GitHub Actions 47f6e5a890 chore: bump version to 4.11.174 [skip ci] 2026-10-05 03:00:01 +00:00
litruv dd89b87aea notifications: fix Kotlin null-safety in resolveInlineImage (?.takeIf on nullable receivers)
Build / increment-version (push) Successful in 5s
Build / build-android (push) Successful in 4m37s
2026-10-05 13:59:53 +11:00
GitHub Actions d47e42401c chore: bump version to 4.11.173 [skip ci] 2026-10-05 02:54:58 +00:00
litruv 39511a3224 chore: bump cinny submodule to b16263b4 (native HTTP for Capacitor)
Build / increment-version (push) Successful in 6s
Build / build-android (push) Failing after 4m0s
2026-10-05 13:54:51 +11:00
GitHub Actions 1b7bbe4b8a chore: bump version to 4.11.172 [skip ci] 2026-10-05 02:53:36 +00:00
litruv 00c221a805 notifications: fetch inline image preview for m.image/sticker events in background listener
Build / increment-version (push) Successful in 4s
Build / build-android (push) Canceled after 1m41s
2026-10-05 13:53:29 +11:00
GitHub Actions b37189e798 chore: bump version to 4.11.171 [skip ci] 2026-10-05 02:36:19 +00:00
litruv 4b3c1042fc notifications: no-ntfy persistent listener + rich MessagingStyle (multi-sender, image support, group summary)
Build / increment-version (push) Successful in 4s
Build / build-android (push) Successful in 4m44s
2026-10-05 13:36:10 +11:00
GitHub Actions 2856d1f107 chore: bump version to 4.11.170 [skip ci] 2026-10-03 16:20:37 +00:00
litruv 6ed5417ba1 Fix CI Android SDK setup after Google removed tools package.
Build / increment-version (push) Successful in 5s
Build / build-android (push) Successful in 4m58s
Bump android-actions/setup-android to v4 and install platform-tools only.
2026-10-04 03:20:30 +11:00
GitHub Actions 43212d3cdc chore: bump version to 4.11.169 [skip ci] 2026-10-03 16:15:29 +00:00
litruv ff3bcd91f1 Restore original message avatar and seen indicator on Android.
Build / increment-version (push) Successful in 32s
Build / build-android (push) Failing after 24s
Stop the overlay from stripping collectible avatars/nameplates and from placing read receipts under the composer.
2026-10-04 03:14:50 +11:00
GitHub Actions 7a1ff2e11d chore: bump version to 4.11.168 [skip ci] 2026-08-24 14:03:35 +00:00
GitHub Actions d0802e96d9 Bump cinny: Fix responsive message images
Build / increment-version (push) Successful in 6s
Build / build-android (push) Successful in 6m9s
2026-08-24 14:03:20 +00:00
GitHub Actions 04caae7725 chore: bump version to 4.11.167 [skip ci] 2026-08-24 13:58:50 +00:00
GitHub Actions 230418ca76 Bump cinny: Add TikTok player iframe
Build / increment-version (push) Successful in 5s
Build / build-android (push) Has been cancelled
2026-08-24 13:58:44 +00:00
GitHub Actions 0270e46f4b chore: bump version to 4.11.166 [skip ci] 2026-08-24 10:06:54 +00:00
litruv a4593f723b Enable collectibles in the Capacitor overlay.
Build / increment-version (push) Successful in 5s
Build / build-android (push) Successful in 6m35s
Update cinny for mobile collectibles and route catalog downloads through Capacitor native HTTP.
2026-08-24 20:06:48 +10:00
GitHub Actions 58926a4a05 chore: bump version to 4.11.165 [skip ci] 2026-08-24 10:06:43 +00:00
GitHub Actions a831c0612b Bump cinny: Enable native HTTP for Capacitor.
Build / increment-version (push) Successful in 5s
Build / build-android (push) Has been cancelled
2026-08-24 10:06:37 +00:00
GitHub Actions 04798614fb chore: bump version to 4.11.164 [skip ci] 2026-08-24 09:53:05 +00:00
GitHub Actions fc12cb3467 Bump cinny: Enable collectibles on mobile clients.
Build / increment-version (push) Successful in 5s
Build / build-android (push) Successful in 6m18s
2026-08-24 09:52:59 +00:00
GitHub Actions d00ea1e80b chore: bump version to 4.11.163 [skip ci] 2026-08-24 09:30:05 +00:00
GitHub Actions 0867048106 Bump cinny: Use public Discord collectibles catalog.
Build / increment-version (push) Successful in 5s
Build / build-android (push) Successful in 6m33s
2026-08-24 09:29:58 +00:00
GitHub Actions 6d90f5f716 chore: bump version to 4.11.162 [skip ci] 2026-08-24 08:49:07 +00:00
GitHub Actions beb5442a9a Bump cinny: Add configurable sidebar nameplate background.
Build / increment-version (push) Successful in 5s
Build / build-android (push) Successful in 6m17s
2026-08-24 08:48:59 +00:00
GitHub Actions 58725ea57f chore: bump version to 4.11.161 [skip ci] 2026-08-23 14:55:12 +00:00
GitHub Actions e68d348355 Bump cinny: Add Discord collectibles to profiles, messages, and settings.
Build / increment-version (push) Successful in 5s
Build / build-android (push) Successful in 6m13s
2026-08-23 14:55:04 +00:00
GitHub Actions eb8cea132e chore: bump version to 4.11.160 [skip ci] 2026-08-23 06:55:17 +00:00
GitHub Actions 5da90f708d Bump cinny: Fix What's New dialog layout and improve dev styling/debugging.
Build / increment-version (push) Successful in 5s
Build / build-android (push) Successful in 6m30s
2026-08-23 06:55:09 +00:00
GitHub Actions 492c93400c chore: bump version to 4.11.159 [skip ci] 2026-08-23 06:19:12 +00:00
litruv 2fa800e4d6 Fix useOtherUserColor crash when sender has an avatar MXC URL.
Build / increment-version (push) Successful in 5s
Build / build-android (push) Successful in 6m42s
Pass the Matrix room to useOtherUserColor in overlay Message.tsx instead of
senderAvatarMxc, and bump cinny for Android About/updates fixes.
2026-08-23 16:19:03 +10:00
GitHub Actions e817b4e608 chore: bump version to 4.11.158 [skip ci] 2026-08-23 06:18:55 +00:00
GitHub Actions b1b2d916fe Bump cinny: Fix Android updates dialog, mobile About page, and user color crash guard.
Build / increment-version (push) Successful in 5s
Build / build-android (push) Has been cancelled
2026-08-23 06:18:49 +00:00
GitHub Actions 28430b6f2e chore: bump version to 4.11.157 [skip ci] 2026-08-22 22:38:40 +00:00
GitHub Actions 0bbc371603 Bump cinny: Fix View updates on Android: bundled notes, portal stack, tap handling.
Build / increment-version (push) Successful in 6s
Build / build-android (push) Successful in 6m16s
2026-08-22 22:38:34 +00:00
GitHub Actions aa86414532 chore: bump version to 4.11.156 [skip ci] 2026-08-22 22:26:55 +00:00
GitHub Actions 83c42d7985 Bump cinny: Move update manifest generator into cinny for standalone Android builds.
Build / increment-version (push) Successful in 5s
Build / build-android (push) Successful in 6m34s
2026-08-22 22:26:49 +00:00
GitHub Actions 898e674160 chore: bump version to 4.11.155 [skip ci] 2026-08-22 22:23:48 +00:00
GitHub Actions 0133505baf Bump cinny: Fix auto-show of What's New on first launch after an app update.
Build / increment-version (push) Successful in 5s
Build / build-android (push) Failing after 1m36s
2026-08-22 22:23:40 +00:00
GitHub Actions 0ca65c5a13 chore: bump version to 4.11.154 [skip ci] 2026-08-22 22:20:07 +00:00
GitHub Actions ec2c7634bb Bump cinny: Fix updates dialog on Android by portaling above Settings and resolving Capacitor asset URLs.
Build / increment-version (push) Successful in 5s
Build / build-android (push) Failing after 1m14s
2026-08-22 22:20:01 +00:00
GitHub Actions 9a4bb60942 chore: bump version to 4.11.153 [skip ci] 2026-08-22 22:07:13 +00:00
GitHub Actions 6b35927612 Bump cinny: Add MSC4522 username colors, release notes dialog, and profile layout fixes.
Build / increment-version (push) Successful in 5s
Build / build-android (push) Successful in 6m16s
2026-08-22 22:07:05 +00:00
GitHub Actions aada77f30f chore: bump version to 4.11.152 [skip ci] 2026-08-09 10:49:13 +00:00
litruv bb768911ef Wire Android SSO Custom Tabs, carousel-safe swipes, and core saveMedia.
Build / increment-version (push) Successful in 6s
Build / build-android (push) Successful in 5m41s
Open SSO in Capacitor Browser with paarrot://android return; stop swipe-to-reply stealing carousel scrolls; bump cinny for shared save helpers and register MediaStore from the overlay.
2026-08-09 20:49:05 +10:00
GitHub Actions a1c6015772 chore: bump version to 4.11.151 [skip ci] 2026-08-09 09:42:28 +00:00
litruv d7d7d183c5 Stop Android overlay from replacing the image shadowbox.
Build / increment-version (push) Successful in 5s
Build / build-android (push) Successful in 5m36s
2026-08-09 19:42:20 +10:00
GitHub Actions a5ddd10ff4 chore: bump version to 4.11.150 [skip ci] 2026-08-09 08:35:33 +00:00
GitHub Actions 2921d3a547 Bump cinny: Make sick emoji confetti a fullscreen downward spew with morph.
Build / increment-version (push) Successful in 5s
Build / build-android (push) Successful in 7m20s
2026-08-09 08:35:27 +00:00
GitHub Actions 2be4c66b4a chore: bump version to 4.11.149 [skip ci] 2026-08-09 05:59:09 +00:00
GitHub Actions f180f4ab7c Bump cinny: Replace image lightbox with slate-style shadowbox.
Build / increment-version (push) Successful in 5s
Build / build-android (push) Successful in 6m48s
2026-08-09 05:59:01 +00:00
GitHub Actions b1167c3eb6 chore: bump version to 4.11.148 [skip ci] 2026-08-09 05:50:36 +00:00
GitHub Actions 16bdf92f77 Bump cinny: Add fullscreen firework emoji confetti and fix Linux URL paste.
Build / increment-version (push) Successful in 5s
Build / build-android (push) Successful in 7m16s
2026-08-09 05:50:28 +00:00
GitHub Actions 2ebe97c5a4 chore: bump version to 4.11.147 [skip ci] 2026-08-09 03:17:01 +00:00
GitHub Actions 1aef7812a1 Bump cinny: Add bot-driven room app UI via im.paarrot.ui state.
Build / increment-version (push) Successful in 5s
Build / build-android (push) Successful in 7m55s
2026-08-09 03:16:55 +00:00
GitHub Actions 4f61a31f28 chore: bump version to 4.11.146 [skip ci] 2026-08-03 06:32:44 +00:00
litruv 491a5845f0 Trigger builds from PAT submodule bumps and allow manual dispatch.
Build / increment-version (push) Successful in 5s
Build / build-android (push) Successful in 5m8s
2026-08-03 16:32:38 +10:00
GitHub Actions bd25ce8e1d Bump cinny: Use ACTIONS_TOKEN secret to dispatch cinny-mobile builds. 2026-08-03 06:31:00 +00:00
litruv a5d44e191b Fix update-submodule workflow_dispatch input YAML quoting. [skip ci] 2026-08-03 16:30:49 +10:00
litruv 5f4bf191fc Add workflow to bump cinny submodule from workflow_dispatch. [skip ci] 2026-08-03 16:28:44 +10:00
GitHub Actions cfcec87cd9 chore: bump version to 4.11.145 [skip ci] 2026-07-29 10:41:28 +00:00
litruv 2c9bcca344 Bump cinny: emoji confetti bursts and component playground.
Build / increment-version (push) Successful in 5s
Build / build-android (push) Successful in 5m35s
2026-07-29 20:41:21 +10:00
GitHub Actions 9bb7adafd0 chore: bump version to 4.11.144 [skip ci] 2026-07-27 16:39:51 +00:00
litruv c9c7bdb48d Keep stacked notification images and warn when OEM AUTO_START blocks UnifiedPush.
Build / increment-version (push) Successful in 5s
Build / build-android (push) Successful in 4m35s
Attach image thumbnails via MessagingStyle message data so they survive multi-message history, drop useless image filenames, and surface TCL App Boot blocks in settings.
2026-07-28 02:39:44 +10:00
GitHub Actions f3d4dcb67e chore: bump version to 4.11.143 [skip ci] 2026-07-27 15:38:12 +00:00
litruv a744e36fb1 Fix UnifiedPush register race where a late UNREGISTER wiped the new endpoint.
Build / increment-version (push) Successful in 4s
Build / build-android (push) Successful in 5m8s
2026-07-28 01:38:04 +10:00
GitHub Actions 725b3467d3 chore: bump version to 4.11.142 [skip ci] 2026-07-27 14:40:17 +00:00
litruv c28b786948 Show an in-app UnifiedPush distributor picker instead of a silent OS default.
Build / increment-version (push) Successful in 6s
Build / build-android (push) Successful in 4m42s
2026-07-28 00:40:09 +10:00
GitHub Actions 19d85dbb2d chore: bump version to 4.11.141 [skip ci] 2026-07-27 14:18:44 +00:00
litruv fbff6b9738 Fix UnifiedPush distributor reset and native Matrix gateway discovery.
Build / increment-version (push) Successful in 5s
Build / build-android (push) Successful in 4m35s
2026-07-28 00:18:37 +10:00
GitHub Actions 52e0fddcf1 chore: bump version to 4.11.140 [skip ci] 2026-07-25 10:16:53 +00:00
litruv 2ed3b0e9c8 Bump cinny: fix avatar upload for JPEG/WebP/GIF without profile color.
Build / increment-version (push) Successful in 4s
Build / build-android (push) Successful in 6m37s
2026-07-25 20:16:46 +10:00
GitHub Actions 5f7af04a57 chore: bump version to 4.11.139 [skip ci] 2026-07-24 05:41:58 +00:00
litruv 62b9c48fa1 Accumulate multi-message Android notifications per room.
Build / increment-version (push) Successful in 5s
Build / build-android (push) Successful in 4m43s
Use MessagingStyle with persisted history so rapid messages append instead of each update wiping the previous body.
2026-07-24 15:41:50 +10:00
GitHub Actions 19a46c4d95 chore: bump version to 4.11.138 [skip ci] 2026-07-24 05:26:41 +00:00
litruv 8cf31b929d Fix Android media downloads and dismiss notifs when read elsewhere.
Build / increment-version (push) Successful in 5s
Build / build-android (push) Successful in 5m5s
FileSaver fails in Capacitor WebView, so save via MediaStore; clear tray notifications when sync reports rooms as read on another device, and improve collapsed notification avatars with conversation shortcuts.
2026-07-24 15:26:35 +10:00
GitHub Actions a4d56e095e chore: bump version to 4.11.137 [skip ci] 2026-07-24 05:09:02 +00:00
litruv 86dc7f849a Expose appInForeground to Java for MainActivity lifecycle updates.
Build / increment-version (push) Successful in 5s
Build / build-android (push) Successful in 4m43s
2026-07-24 15:08:55 +10:00
GitHub Actions ca889f2eec chore: bump version to 4.11.136 [skip ci] 2026-07-24 05:03:10 +00:00
litruv 157d707581 Fix Android notification avatars, E2EE wake alerts, and tap navigation.
Build / increment-version (push) Successful in 5s
Build / build-android (push) Failing after 5m3s
Show circular sender avatars with MessagingStyle, notify on encrypted background sync events, deep-link tray taps into the right room, and suppress Firefox open-link contextual actions.
2026-07-24 15:03:03 +10:00
GitHub Actions 3940441d9b chore: bump version to 4.11.135 [skip ci] 2026-07-24 04:47:38 +00:00
litruv cfabcc5fbf Show decrypted notification bodies and authenticated sender avatars.
Build / increment-version (push) Successful in 5s
Build / build-android (push) Successful in 5m8s
Wait for E2EE cleartext before building tray text, and post Android notifications natively so dynamic avatars fetched with secure media auth can appear as large icons.
2026-07-24 14:47:32 +10:00
GitHub Actions a40319e8c8 chore: bump version to 4.11.134 [skip ci] 2026-07-24 04:36:18 +00:00
litruv 45bc475340 Group Android notifications by space and clear them on read.
Build / increment-version (push) Successful in 5s
Build / build-android (push) Successful in 4m52s
Use stable per-room notification IDs with Directs/Spaces/Home channels and space group summaries so the shade nests deeper than a flat Messages list, and dismiss those tray entries when a room is marked read.
2026-07-24 14:36:11 +10:00
38 changed files with 3851 additions and 1111 deletions
+25 -1
View File
@@ -7,6 +7,11 @@ on:
- dev
tags:
- 'v*'
workflow_dispatch:
concurrency:
group: build
cancel-in-progress: true
jobs:
increment-version:
@@ -74,6 +79,13 @@ jobs:
uses: actions/setup-node@v4
with:
node-version: '22'
- name: Cache npm packages
uses: actions/cache@v4
with:
path: ~/.npm
key: ${{ runner.os }}-npm-${{ hashFiles('package-lock.json', 'cinny/package-lock.json') }}
restore-keys: ${{ runner.os }}-npm-
- name: Setup Java
uses: actions/setup-java@v4
@@ -82,7 +94,19 @@ jobs:
java-version: '21'
- name: Setup Android SDK
uses: android-actions/setup-android@v3
uses: android-actions/setup-android@v4
with:
# Google removed the legacy `tools` package; v3 still tries to install it.
packages: platform-tools
- name: Cache Gradle
uses: actions/cache@v4
with:
path: |
~/.gradle/caches
~/.gradle/wrapper/dists
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
restore-keys: ${{ runner.os }}-gradle-
- name: Install dependencies (root)
run: npm ci --prefer-offline
+95
View File
@@ -0,0 +1,95 @@
name: Update cinny submodule
on:
workflow_dispatch:
inputs:
cinny_sha:
description: "cinny commit SHA to pin (defaults to origin/main)"
required: false
type: string
concurrency:
group: update-cinny-submodule
cancel-in-progress: true
jobs:
bump:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4
with:
fetch-depth: 0
submodules: false
# PAT so the submodule bump push can trigger build.yml
# (GITHUB_TOKEN pushes do not start new workflows).
token: ${{ secrets.ACTIONS_TOKEN }}
ref: master
- name: Update cinny submodule
id: bump
run: |
set -euo pipefail
ORIGIN_URL=$(git remote get-url origin)
ORIGIN_URL=${ORIGIN_URL%/}
ORIGIN_URL=${ORIGIN_URL%.git}
BASE_URL=${ORIGIN_URL%/*}
CINNY_URL="${BASE_URL}/cinny.git"
echo "Rewriting submodule URL to ${CINNY_URL}"
git config submodule.cinny.url "${CINNY_URL}"
git submodule sync --recursive
git submodule update --init --recursive
TARGET_SHA="${{ inputs.cinny_sha }}"
git -C cinny fetch origin main
if [ -n "${TARGET_SHA}" ]; then
git -C cinny checkout --detach "${TARGET_SHA}"
else
git -C cinny checkout --detach origin/main
fi
NEW_SHA=$(git -C cinny rev-parse HEAD)
OLD_SHA=$(git rev-parse HEAD:cinny)
SUBJECT=$(git -C cinny log -1 --pretty=%s)
echo "old=${OLD_SHA}"
echo "new=${NEW_SHA}"
echo "subject=${SUBJECT}"
if [ "${OLD_SHA}" = "${NEW_SHA}" ]; then
echo "changed=false" >> "$GITHUB_OUTPUT"
echo "cinny already at ${NEW_SHA}; nothing to do"
exit 0
fi
git add cinny
git config user.name "GitHub Actions"
git config user.email "actions@github.com"
git commit -m "Bump cinny: ${SUBJECT}"
{
echo "changed=true"
echo "sha=${NEW_SHA}"
} >> "$GITHUB_OUTPUT"
- name: Push submodule bump
if: steps.bump.outputs.changed == 'true'
run: |
set -euo pipefail
for attempt in 1 2 3; do
git fetch origin master
git rebase origin/master || {
git rebase --abort || true
echo "Failed to rebase submodule bump onto latest master"
exit 1
}
if git push origin HEAD:master; then
echo "Pushed cinny bump (${{ steps.bump.outputs.sha }})"
exit 0
fi
echo "Push rejected on attempt ${attempt}, retrying"
done
echo "Failed to push submodule bump after 3 attempts"
exit 1
+48
View File
@@ -0,0 +1,48 @@
# Plugin development instructions
Instructions for opencode agents working on the Paarrot plugin system in this repo.
## Architecture
- Plugin host: `overlay/src/app/utils/pluginHost.ts`. Electron uses `window.electron.plugins`, Android uses the Capacitor `PluginStorage` plugin, web returns null.
- Native Android host: `android/app/src/main/java/com/paarrot/app/PluginStoragePlugin.kt` (download zip, unzip with zip-slip guard, list, uninstall, readPluginCode). Registered in `MainActivity.java`.
- Loader: `cinny/src/app/features/settings/plugins/PluginLoader.tsx`, mounted in `ClientRoot.tsx`. It evaluates `index.js` with `new Function` for CommonJS and falls back to a data-URL import for ESM.
- Registry and marketplace: `PluginAPI.ts` persists both to `localStorage`. Enabled state survives restarts. Plugins load at app start, so enabling a plugin requires an app restart.
## Plugin context contract
- `createPluginContext` from `@paarrot/plugin-manager` provides: `commands`, `messages`, `ui`, `settings`, `themes`, `events`, `timers`, `log`, `warn`, `error`.
- `PluginLoader` adds compat fields on top: `matrixClient`, `matrix`, `React`, `lucide`. Plugins destructure these directly (for example `const { Link } = ctx.lucide`), so a missing field throws at `onLoad` and the plugin never runs. Keep the compat fields in sync between `cinny` and `overlay`. A missing `lucide` caused silent plugin failure on mobile, fixed in commit `1f16f5d`.
## UI locations
- Valid `UILocation` values: `room-header`, `message-actions`, `user-menu`, `room-menu`, `composer-actions`, `channel-list`, `direct-messages`, `home-section`, `search-notification-section`, `text-composer-toolbar`, `sidebar-actions`.
- Button slots render at all screen sizes. Nav-only locations (`channel-list`, `direct-messages`, `home-section`, `sidebar-actions`) have no surface in the single-column mobile UI, so plugins that only register there are invisible on phones.
## Mobile quirks
- Capacitor injects plugins on `Capacitor.Plugins` after the bridge is ready, and `registerPlugin` is often missing on Android. The `waitForBridge` fallback pattern in `overlay/src/app/utils/backgroundSync.ts` is the reference.
- No CSP is configured in `capacitor.config.json`, so `new Function` and data-URL imports work. Adding CSP would break plugin evaluation.
- WebView console logs reach logcat under the tag `Capacitor/Console`.
## Debugging on device
- Wireless adb: `adb connect <ip>:<port>`. The `adb tcpip` port persists until reboot, then resets to 5555. Android 11+ wireless debugging randomizes the port per reboot by design. Pinning needs root (`persist.adb.tcp.port`).
- Plugin files: `adb shell run-as com.paarrot.app cat files/plugins/<id>/index.js` works on debuggable builds.
- Enabled state: localStorage lives in `app_webview/Local Storage/leveldb`. Search for `plugin-manager:installed-plugins`.
- Live eval: the WebView devtools socket is `@webview_devtools_remote_<pid>`. Forward with `adb forward tcp:9222 localsocket:webview_devtools_remote_<pid>`. The socket may refuse HTTP and WebSocket requests from non-localhost hosts.
- To trigger plugin load logs: force-stop, start, then `logcat -d | grep PluginLoader`.
- Hotpatching the installed copy with `run-as` plus an app restart tests plugin changes without reinstalling.
## Marketplace
- Directory: `Paarrot/Plugin-Directory`. Entries are static JSON files. The `version` field is a manual snapshot and is never synced from the plugin repo.
- Updates go through PRs. `validate-pr.yml` validates and auto-merges. `update-index.yml` regenerates `index.json` from committed entries only.
- A plugin repo needs `index.js` and `plugin-metadata.json`. The directory `downloadUrl` is the GitHub archive zip.
- Bump the version in both the plugin repo metadata and the directory entry when shipping changes.
## Repo conventions
- Edit `overlay/` files, not `cinny` directly. `scripts/apply-overlay.mjs` layers the overlay onto the cinny submodule before every Android build.
- `android/gradlew` is not executable. Run it as `sh gradlew`.
- Use `scripts/push.sh` for commits. It skips the cinny submodule pointer and `gradlew`.
+3
View File
@@ -9,7 +9,10 @@ android {
apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
dependencies {
implementation project(':capacitor-app')
implementation project(':capacitor-browser')
implementation project(':capacitor-local-notifications')
implementation project(':capacitor-status-bar')
}
+36 -10
View File
@@ -40,6 +40,14 @@
<data android:mimeType="*/*" />
</intent-filter>
<!-- SSO / deep link return: paarrot://android/login/...?loginToken=... -->
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="paarrot" />
</intent-filter>
</activity>
<provider
@@ -54,23 +62,36 @@
<service
android:name=".MatrixSyncService"
android:foregroundServiceType="dataSync"
android:process=":listener"
android:foregroundServiceType="specialUse|dataSync"
android:exported="false"
android:stopWithTask="false" />
<service
android:name=".UnifiedPushService"
android:exported="false">
<intent-filter>
<action android:name="org.unifiedpush.android.connector.PUSH_EVENT" />
</intent-filter>
android:stopWithTask="false">
<property
android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE"
android:value="matrix_message_listener" />
</service>
<receiver
android:name=".BootReceiver"
android:exported="true">
android:exported="true"
android:enabled="true">
<intent-filter>
<action android:name="android.intent.action.BOOT_COMPLETED" />
<action android:name="android.intent.action.LOCKED_BOOT_COMPLETED" />
<action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
<action android:name="android.intent.action.QUICKBOOT_POWERON" />
<action android:name="com.htc.intent.action.QUICKBOOT_POWERON" />
</intent-filter>
</receiver>
<receiver
android:name=".ListenerWatchdogReceiver"
android:process=":listener"
android:exported="false"
android:enabled="true">
<intent-filter>
<action android:name="com.paarrot.app.LISTENER_WATCHDOG" />
<action android:name="com.paarrot.app.LISTENER_RESTART" />
</intent-filter>
</receiver>
</application>
@@ -78,9 +99,14 @@
<!-- Permissions -->
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
<uses-permission android:name="android.permission.VIBRATE" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
<uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
<uses-permission android:name="android.permission.RECORD_AUDIO" />
<uses-permission android:name="android.permission.CAMERA" />
@@ -5,17 +5,23 @@ import android.content.Context
import android.content.Intent
/**
* Re-registers UnifiedPush after boot when credentials still exist.
* Starts the message listener again after boot / update when credentials still exist.
*/
class BootReceiver : BroadcastReceiver() {
override fun onReceive(context: Context, intent: Intent) {
if (intent.action != Intent.ACTION_BOOT_COMPLETED) return
val prefs = context.getSharedPreferences(SyncServicePlugin.PREFS, Context.MODE_PRIVATE)
prefs.getString(MatrixSyncService.EXTRA_HOMESERVER, null) ?: return
prefs.getString(MatrixSyncService.EXTRA_TOKEN, null) ?: return
UnifiedPushManager.register(context, activity = null)
val action = intent.action ?: return
when (action) {
Intent.ACTION_BOOT_COMPLETED,
Intent.ACTION_LOCKED_BOOT_COMPLETED,
Intent.ACTION_MY_PACKAGE_REPLACED,
"android.intent.action.QUICKBOOT_POWERON",
"com.htc.intent.action.QUICKBOOT_POWERON",
-> {
if (!MatrixSyncService.hasCredentials(context)) return
MatrixSyncService.scheduleKeepAlive(context)
MatrixSyncService.requestSyncFetch(context, "boot:$action")
}
}
}
}
@@ -0,0 +1,45 @@
package com.paarrot.app
import android.content.BroadcastReceiver
import android.content.Context
import android.content.Intent
import android.util.Log
/**
* Keeps the Matrix message listener alive after OEM kills, idle, or package update.
* Each fire re-chains the next one-shot watchdog alarm.
*
* Health is the persisted sync heartbeat (works across UI vs `:listener` processes).
*/
class ListenerWatchdogReceiver : BroadcastReceiver() {
override fun onReceive(context: Context, intent: Intent?) {
val action = intent?.action ?: ACTION_WATCHDOG
val healthy = MatrixSyncService.isListenerHealthy(context)
val ageMs = MatrixSyncService.heartbeatAgeMs(context)
val inProc = MatrixSyncService.isListenerRunning()
Log.i(
TAG,
"watchdog fired action=$action healthy=$healthy heartbeatAgeMs=$ageMs inProcAlive=$inProc",
)
if (!MatrixSyncService.hasCredentials(context)) {
Log.w(TAG, "watchdog skip — no credentials")
return
}
// Always re-arm the chain first — even if start fails under OEM limits.
MatrixSyncService.scheduleKeepAlive(context)
val needsRestart = action == ACTION_RESTART || !healthy
if (needsRestart) {
Log.w(TAG, "watchdog restarting reason=${if (action == ACTION_RESTART) "explicit" else "stale-or-missing-heartbeat"}")
MatrixSyncService.requestSyncFetch(context, "watchdog:$action")
} else {
Log.i(TAG, "watchdog ok — listener healthy, no restart")
}
}
companion object {
private const val TAG = "PaarrotWatchdog"
const val ACTION_WATCHDOG = "com.paarrot.app.LISTENER_WATCHDOG"
const val ACTION_RESTART = "com.paarrot.app.LISTENER_RESTART"
}
}
@@ -1,11 +1,18 @@
package com.paarrot.app;
import android.Manifest;
import android.content.pm.PackageManager;
import android.os.Build;
import android.os.Bundle;
import android.webkit.WebView;
import androidx.core.app.ActivityCompat;
import androidx.core.content.ContextCompat;
import androidx.core.view.ViewCompat;
import com.getcapacitor.BridgeActivity;
public class MainActivity extends BridgeActivity {
private boolean askedNotifications = false;
@Override
protected void onCreate(Bundle savedInstanceState) {
registerPlugin(SyncServicePlugin.class);
@@ -13,6 +20,48 @@ public class MainActivity extends BridgeActivity {
registerPlugin(PluginStoragePlugin.class);
super.onCreate(savedInstanceState);
setupImageKeyboardSupport();
ensureListener();
}
@Override
public void onResume() {
super.onResume();
MatrixSyncService.setAppInForeground(this, true);
ensureListener();
}
@Override
public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
super.onRequestPermissionsResult(requestCode, permissions, grantResults);
if (requestCode == REQUEST_NOTIFICATIONS
&& grantResults.length > 0
&& grantResults[0] == PackageManager.PERMISSION_GRANTED) {
MatrixSyncService.requestSyncFetch(this, MatrixSyncService.MODE_LISTENER);
}
}
/** Keep the foreground listener up once this phone has a saved login. */
private void ensureListener() {
if (Build.VERSION.SDK_INT >= 33
&& ContextCompat.checkSelfPermission(this, Manifest.permission.POST_NOTIFICATIONS)
!= PackageManager.PERMISSION_GRANTED) {
if (!askedNotifications) {
askedNotifications = true;
ActivityCompat.requestPermissions(
this,
new String[] {Manifest.permission.POST_NOTIFICATIONS},
REQUEST_NOTIFICATIONS
);
}
return;
}
MatrixSyncService.requestSyncFetch(this, MatrixSyncService.MODE_LISTENER);
}
@Override
public void onPause() {
MatrixSyncService.setAppInForeground(this, false);
super.onPause();
}
/** Advertise image MIME types and receive Gboard / paste / drag-drop media. */
@@ -26,4 +75,6 @@ public class MainActivity extends BridgeActivity {
new ImageKeyboardContentReceiver()
);
}
private static final int REQUEST_NOTIFICATIONS = 4101;
}
File diff suppressed because it is too large Load Diff
@@ -0,0 +1,42 @@
package com.paarrot.app
import android.content.Intent
/**
* Bridges notification tap intents into the Capacitor JS layer so we can
* navigate to the correct room when a tray notification is opened.
*/
object NotificationNavStore {
const val EXTRA_NAV_PATH = "paarrot_nav_path"
const val ACTION_OPEN_NOTIFICATION = "com.paarrot.app.OPEN_NOTIFICATION"
@Volatile
var pendingPath: String? = null
@Volatile
var pendingRoomId: String? = null
@Volatile
var plugin: SyncServicePlugin? = null
/** Read navigation extras from a notification tap [intent] and notify JS. */
fun handleIntent(intent: Intent?) {
if (intent == null) return
val path = intent.getStringExtra(EXTRA_NAV_PATH)?.takeIf { it.isNotBlank() }
val roomId = intent.getStringExtra(MatrixSyncService.EXTRA_ROOM_ID)?.takeIf { it.isNotBlank() }
if (path == null && roomId == null) return
pendingPath = path
pendingRoomId = roomId
plugin?.emitNotificationOpened(path, roomId)
}
/** Consume and clear the pending navigation target. */
fun consume(): Pair<String?, String?> {
val path = pendingPath
val roomId = pendingRoomId
pendingPath = null
pendingRoomId = null
return path to roomId
}
}
@@ -1,10 +1,14 @@
package com.paarrot.app
import android.app.Activity
import android.content.ContentValues
import android.content.Context
import android.content.Intent
import android.net.Uri
import android.os.Build
import android.provider.MediaStore
import android.util.Base64
import android.webkit.MimeTypeMap
import androidx.core.content.FileProvider
import com.getcapacitor.JSArray
import com.getcapacitor.JSObject
import com.getcapacitor.Plugin
@@ -213,4 +217,168 @@ class ShareHandlerPlugin : Plugin() {
ShareIntentStore.clearIntent(ShareIntentStore.pendingShare?.receivedAt)
call.resolve()
}
/**
* Save a base64-encoded file to the device gallery / Downloads.
* Capacitor WebView cannot use FileSaver / `<a download>`, so downloads go through MediaStore.
* Images → Pictures/Paarrot, videos → Movies/Paarrot, other → Download/Paarrot (API 29+).
* On older APIs or MediaStore failure, falls back to the system share sheet.
*/
@PluginMethod
fun saveFile(call: PluginCall) {
val filename = call.getString("filename") ?: run {
call.reject("filename required")
return
}
val mimeType = call.getString("mimeType")
?: guessMime(filename)
?: "application/octet-stream"
val base64 = call.getString("base64") ?: run {
call.reject("base64 required")
return
}
try {
val cleaned = base64.substringAfter("base64,", base64).trim()
val bytes = Base64.decode(cleaned, Base64.DEFAULT)
if (bytes.isEmpty()) {
call.reject("empty file data")
return
}
val uri = saveBytes(bytes, filename, mimeType)
if (uri != null) {
android.widget.Toast.makeText(
context,
"Saved $filename",
android.widget.Toast.LENGTH_SHORT
).show()
call.resolve(
JSObject()
.put("saved", true)
.put("uri", uri.toString())
)
} else {
shareBytes(bytes, filename, mimeType)
call.resolve(JSObject().put("saved", false).put("shared", true))
}
} catch (e: Exception) {
android.util.Log.e(TAG, "saveFile failed", e)
call.reject("Failed to save file: ${e.message}", e)
}
}
/**
* Open the system share sheet for a base64 file (Save to Files, Drive, etc.).
*/
@PluginMethod
fun shareFile(call: PluginCall) {
val filename = call.getString("filename") ?: run {
call.reject("filename required")
return
}
val mimeType = call.getString("mimeType")
?: guessMime(filename)
?: "application/octet-stream"
val base64 = call.getString("base64") ?: run {
call.reject("base64 required")
return
}
try {
val cleaned = base64.substringAfter("base64,", base64).trim()
val bytes = Base64.decode(cleaned, Base64.DEFAULT)
shareBytes(bytes, filename, mimeType)
call.resolve(JSObject().put("shared", true))
} catch (e: Exception) {
android.util.Log.e(TAG, "shareFile failed", e)
call.reject("Failed to share file: ${e.message}", e)
}
}
private fun saveBytes(bytes: ByteArray, filename: String, mimeType: String): Uri? {
return when {
mimeType.startsWith("image/") ->
insertMedia(bytes, filename, mimeType, MediaStore.Images.Media.EXTERNAL_CONTENT_URI, "Pictures/Paarrot")
mimeType.startsWith("video/") ->
insertMedia(bytes, filename, mimeType, MediaStore.Video.Media.EXTERNAL_CONTENT_URI, "Movies/Paarrot")
mimeType.startsWith("audio/") ->
insertMedia(bytes, filename, mimeType, MediaStore.Audio.Media.EXTERNAL_CONTENT_URI, "Music/Paarrot")
Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q ->
insertMedia(bytes, filename, mimeType, MediaStore.Downloads.EXTERNAL_CONTENT_URI, "Download/Paarrot")
else -> null // share-sheet fallback (avoids WRITE_EXTERNAL_STORAGE on API < 29)
}
}
private fun insertMedia(
bytes: ByteArray,
filename: String,
mimeType: String,
collection: Uri,
relativePath: String
): Uri? {
val values = ContentValues().apply {
put(MediaStore.MediaColumns.DISPLAY_NAME, filename)
put(MediaStore.MediaColumns.MIME_TYPE, mimeType)
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
put(MediaStore.MediaColumns.RELATIVE_PATH, relativePath)
put(MediaStore.MediaColumns.IS_PENDING, 1)
}
}
val resolver = context.contentResolver
val uri = resolver.insert(collection, values) ?: return null
try {
resolver.openOutputStream(uri)?.use { it.write(bytes) }
?: run {
resolver.delete(uri, null, null)
return null
}
} catch (e: Exception) {
resolver.delete(uri, null, null)
throw e
}
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
values.clear()
values.put(MediaStore.MediaColumns.IS_PENDING, 0)
resolver.update(uri, values, null, null)
}
return uri
}
private fun shareBytes(bytes: ByteArray, filename: String, mimeType: String) {
val cacheDir = File(context.cacheDir, "shares").apply { mkdirs() }
val safeName = filename.replace(Regex("[^a-zA-Z0-9._\\-]"), "_").take(128).ifEmpty { "file" }
val file = File(cacheDir, safeName)
FileOutputStream(file).use { it.write(bytes) }
val uri = FileProvider.getUriForFile(
context,
"${context.packageName}.fileprovider",
file
)
val intent = Intent(Intent.ACTION_SEND).apply {
type = mimeType
putExtra(Intent.EXTRA_STREAM, uri)
putExtra(Intent.EXTRA_SUBJECT, filename)
addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
}
val chooser = Intent.createChooser(intent, "Save or share").apply {
addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
}
context.startActivity(chooser)
}
private fun guessMime(filename: String): String? {
val ext = filename.substringAfterLast('.', "").lowercase()
if (ext.isEmpty()) return null
return MimeTypeMap.getSingleton().getMimeTypeFromExtension(ext)
}
companion object {
private const val TAG = "ShareHandlerPlugin"
}
}
@@ -1,7 +1,16 @@
package com.paarrot.app
import android.Manifest
import android.app.Activity
import android.content.Context
import android.content.Intent
import android.content.pm.PackageManager
import android.net.Uri
import android.os.Build
import android.os.PowerManager
import android.provider.Settings
import androidx.core.app.ActivityCompat
import androidx.core.content.ContextCompat
import com.getcapacitor.JSObject
import com.getcapacitor.Plugin
import com.getcapacitor.PluginCall
@@ -12,30 +21,59 @@ import com.getcapacitor.annotation.CapacitorPlugin
* Capacitor plugin that controls [MatrixSyncService] from JS.
*
* JS API:
* - `start({ homeserverUrl, accessToken, userId, deviceId })` — persist credentials and register UnifiedPush
* - `triggerPing({ reason })` — force a one-shot fetch (for testing/manual wake)
* - `stop()` — clear persisted credentials and unregister UnifiedPush
* - `start({ homeserverUrl, accessToken, userId, deviceId })` — persist credentials and keep the listener running
* - `triggerPing({ reason })` — make sure the listener is running
* - `stop()` — clear persisted credentials and stop the listener
* - `setAppForeground({ foreground })` — tell the service whether the app UI is visible
* - `getStatus()` — returns current fetch and UnifiedPush state
* - `getStatus()` — returns whether the listener is running and battery is unrestricted
* - `requestBatteryExemption()` — ask Android to leave the listener unrestricted
* - `clearRoomNotifications({ roomId })` — dismiss native tray notifs for a room
* - `setNotificationGroups({ rooms })` — persist space/DM grouping for tray nesting
* - `showNotification({ title, body, roomId, groupId, groupName, kind, largeIconBase64 })`
*/
@CapacitorPlugin(name = "MatrixBackgroundSync")
class SyncServicePlugin : Plugin() {
fun emitUnifiedPushEvent(eventName: String, payload: JSObject) {
notifyListeners(eventName, payload, true)
}
override fun load() {
super.load()
UnifiedPushManager.setPlugin(this)
NotificationNavStore.plugin = this
NotificationNavStore.handleIntent(activity?.intent)
}
override fun handleOnNewIntent(intent: Intent?) {
super.handleOnNewIntent(intent)
if (intent != null) {
activity?.intent = intent
}
NotificationNavStore.handleIntent(intent)
}
override fun handleOnDestroy() {
UnifiedPushManager.clearPlugin(this)
if (NotificationNavStore.plugin === this) {
NotificationNavStore.plugin = null
}
super.handleOnDestroy()
}
/** Persists Matrix credentials and starts UnifiedPush registration. */
/** Emit a notificationOpened event toward the JS layer. */
fun emitNotificationOpened(path: String?, roomId: String?) {
val payload = JSObject()
if (path != null) payload.put("path", path)
if (roomId != null) payload.put("roomId", roomId)
notifyListeners("notificationOpened", payload, true)
}
/** Returns any pending notification navigation target from a tray tap. */
@PluginMethod
fun getPendingNotificationNav(call: PluginCall) {
val (path, roomId) = NotificationNavStore.consume()
val result = JSObject()
result.put("path", path)
result.put("roomId", roomId)
call.resolve(result)
}
/** Persists Matrix credentials and keeps the message listener in the foreground. */
@PluginMethod
fun start(call: PluginCall) {
val homeserver = call.getString("homeserverUrl")
@@ -50,11 +88,13 @@ class SyncServicePlugin : Plugin() {
.putString(MatrixSyncService.EXTRA_TOKEN, token)
.putString(MatrixSyncService.EXTRA_USER_ID, userId)
.putString(MatrixSyncService.EXTRA_DEVICE_ID, deviceId)
.apply()
.commit()
UnifiedPushManager.register(context, activity)
call.resolve()
askNotificationPermission()
MatrixSyncService.scheduleKeepAlive(context)
MatrixSyncService.requestSyncFetch(context, MatrixSyncService.MODE_LISTENER)
val ignored = askBatteryExemption(context, activity)
call.resolve(JSObject().put("batteryIgnored", ignored))
}
/** Manually triggers a one-shot sync fetch (mainly for diagnostics/testing). */
@@ -68,9 +108,9 @@ class SyncServicePlugin : Plugin() {
/** Stops the sync service and erases persisted credentials. */
@PluginMethod
fun stop(call: PluginCall) {
MatrixSyncService.cancelKeepAlive(context)
context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).edit().clear().apply()
context.stopService(Intent(context, MatrixSyncService::class.java))
UnifiedPushManager.unregister(context)
call.resolve()
}
@@ -81,23 +121,140 @@ class SyncServicePlugin : Plugin() {
*/
@PluginMethod
fun setAppForeground(call: PluginCall) {
MatrixSyncService.appInForeground = call.getBoolean("foreground", false) ?: false
val foreground = call.getBoolean("foreground", false) ?: false
MatrixSyncService.setAppInForeground(context, foreground)
call.resolve()
}
/** Returns whether the sync service is currently running. */
@PluginMethod
fun getStatus(call: PluginCall) {
val am = context.getSystemService(Context.ACTIVITY_SERVICE)
as android.app.ActivityManager
@Suppress("DEPRECATION")
val running = am.getRunningServices(Int.MAX_VALUE)
.any { it.service.className == MatrixSyncService::class.java.name }
val result = UnifiedPushManager.getStatus(context).apply { put("running", running) }
call.resolve(result)
try {
val result = JSObject()
// The service runs in :listener, so its in-memory flag is not shared with this plugin process.
val running =
MatrixSyncService.hasCredentials(context) && MatrixSyncService.isListenerHealthy(context)
result.put("running", running)
result.put("listening", running)
result.put("batteryIgnored", isBatteryIgnored(context))
val notificationsAllowed =
Build.VERSION.SDK_INT < 33 ||
ContextCompat.checkSelfPermission(
context,
Manifest.permission.POST_NOTIFICATIONS,
) == PackageManager.PERMISSION_GRANTED
result.put("notificationsAllowed", notificationsAllowed)
call.resolve(result)
} catch (e: Exception) {
call.reject("getStatus failed: ${e.message}", e)
}
}
/** Asks Android to leave Paarrot out of battery optimization so the listener stays up. */
@PluginMethod
fun requestBatteryExemption(call: PluginCall) {
val ignored = askBatteryExemption(context, activity)
call.resolve(JSObject().put("ignored", ignored))
}
/**
* Cancels native tray notifications for a Matrix room after it has been marked as read.
*/
@PluginMethod
fun clearRoomNotifications(call: PluginCall) {
val roomId = call.getString("roomId")
?: return call.reject("roomId required")
MatrixSyncService.clearRoomNotifications(context, roomId)
call.resolve(JSObject().put("cleared", true))
}
/**
* Persists room → space/group metadata from the JS layer so background
* notifications can nest under Direct messages / Space name / Home.
*/
@PluginMethod
fun setNotificationGroups(call: PluginCall) {
val rooms = call.getObject("rooms")
?: return call.reject("rooms required")
context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).edit()
.putString(MatrixSyncService.KEY_NOTIFICATION_GROUPS, rooms.toString())
.apply()
call.resolve(JSObject().put("success", true))
}
/**
* Shows a message notification from the JS layer (supports dynamic avatar icons).
* Capacitor LocalNotifications cannot load authenticated/dynamic large icons, so
* we post through the same native NotificationManager path as background sync.
*/
@PluginMethod
fun showNotification(call: PluginCall) {
val roomId = call.getString("roomId") ?: return call.reject("roomId required")
val groupId = call.getString("groupId") ?: "paarrot_home"
val groupName = call.getString("groupName") ?: "Home"
val kind = call.getString("kind") ?: "home"
val senderName = call.getString("senderName")
?: call.getString("title")
?: "Someone"
val messageText = call.getString("messageText")
?: call.getString("body")
?: "New message"
val conversationTitle = call.getString("conversationTitle")
val path = call.getString("path")
val largeIconBase64 = call.getString("largeIconBase64")
val bigPictureBase64 = call.getString("bigPictureBase64")
MatrixSyncService.postMessageNotification(
context = context,
roomId = roomId,
senderName = senderName,
messageText = messageText,
conversationTitle = conversationTitle,
groupId = groupId,
groupName = groupName,
kind = kind,
largeIcon = MatrixSyncService.decodeBase64Bitmap(largeIconBase64),
inlineImage = MatrixSyncService.decodeBase64Bitmap(bigPictureBase64),
path = path,
)
call.resolve(JSObject().put("shown", true))
}
companion object {
const val PREFS = "sync_service_prefs"
fun isBatteryIgnored(context: Context): Boolean {
val pm = context.getSystemService(Context.POWER_SERVICE) as PowerManager
return pm.isIgnoringBatteryOptimizations(context.packageName)
}
fun askBatteryExemption(context: Context, activity: Activity?): Boolean {
if (isBatteryIgnored(context)) return true
val intent = Intent(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS).apply {
data = Uri.parse("package:${context.packageName}")
}
if (activity != null) {
activity.startActivity(intent)
} else {
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
context.startActivity(intent)
}
return false
}
}
private fun askNotificationPermission() {
if (Build.VERSION.SDK_INT < 33) return
val act = activity ?: return
if (ContextCompat.checkSelfPermission(act, Manifest.permission.POST_NOTIFICATIONS)
== PackageManager.PERMISSION_GRANTED
) {
return
}
ActivityCompat.requestPermissions(
act,
arrayOf(Manifest.permission.POST_NOTIFICATIONS),
4101,
)
}
}
@@ -1,149 +0,0 @@
package com.paarrot.app
import android.app.Activity
import android.content.Context
import android.util.Log
import com.getcapacitor.JSObject
import org.unifiedpush.android.connector.FailedReason
import org.unifiedpush.android.connector.INSTANCE_DEFAULT
import org.unifiedpush.android.connector.UnifiedPush
/** Coordinates UnifiedPush registration state and bridges events back to JS. */
object UnifiedPushManager {
private const val TAG = "UnifiedPushManager"
private const val PREFS = "unifiedpush_prefs"
private const val KEY_ENDPOINT = "endpoint"
private const val KEY_INSTANCE = "instance"
private const val EVENT_NEW_ENDPOINT = "unifiedPushNewEndpoint"
private const val EVENT_UNREGISTERED = "unifiedPushUnregistered"
private const val EVENT_REGISTRATION_FAILED = "unifiedPushRegistrationFailed"
private const val DEFAULT_MESSAGE = "Paarrot notifications"
@Volatile
private var plugin: SyncServicePlugin? = null
fun setPlugin(plugin: SyncServicePlugin) {
this.plugin = plugin
}
fun clearPlugin(plugin: SyncServicePlugin) {
if (this.plugin === plugin) {
this.plugin = null
}
}
fun register(context: Context, activity: Activity?) {
val savedDistributor = runCatching { UnifiedPush.getSavedDistributor(context) }.getOrNull().orEmpty()
if (savedDistributor.isNotBlank()) {
requestRegistration(context)
return
}
if (activity == null) {
dispatchRegistrationFailed(FailedReason.ACTION_REQUIRED.name, INSTANCE_DEFAULT)
return
}
UnifiedPush.tryUseCurrentOrDefaultDistributor(activity) { success ->
if (success) {
requestRegistration(context)
} else {
dispatchRegistrationFailed(FailedReason.ACTION_REQUIRED.name, INSTANCE_DEFAULT)
}
}
}
fun unregister(context: Context) {
runCatching {
UnifiedPush.unregister(context, INSTANCE_DEFAULT)
}.onFailure {
Log.w(TAG, "Failed to unregister UnifiedPush: ${it.message}")
}
val previousEndpoint = getEndpoint(context)
clearEndpoint(context)
dispatchUnregistered(previousEndpoint, INSTANCE_DEFAULT)
}
fun getStatus(context: Context): JSObject {
val status = JSObject()
status.put("endpoint", getEndpoint(context) ?: "")
status.put("instance", getInstance(context) ?: INSTANCE_DEFAULT)
status.put("registered", !getEndpoint(context).isNullOrBlank())
status.put("distributor", runCatching { UnifiedPush.getSavedDistributor(context) }.getOrDefault(""))
status.put(
"distributors",
runCatching { UnifiedPush.getDistributors(context) }.getOrDefault(emptyList<String>())
)
return status
}
fun onNewEndpoint(context: Context, endpoint: String, instance: String) {
val previousEndpoint = getEndpoint(context)
persistEndpoint(context, endpoint, instance)
val payload = JSObject().apply {
put("endpoint", endpoint)
put("instance", instance)
put("previousEndpoint", previousEndpoint ?: "")
}
dispatch(EVENT_NEW_ENDPOINT, payload)
}
fun onRegistrationFailed(reason: String, instance: String) {
dispatchRegistrationFailed(reason, instance)
}
fun onUnregistered(context: Context, instance: String) {
val previousEndpoint = getEndpoint(context)
clearEndpoint(context)
dispatchUnregistered(previousEndpoint, instance)
}
private fun requestRegistration(context: Context) {
runCatching {
UnifiedPush.register(context, INSTANCE_DEFAULT, DEFAULT_MESSAGE, null)
}.onFailure {
Log.w(TAG, "UnifiedPush register failed: ${it.message}")
dispatchRegistrationFailed(FailedReason.INTERNAL_ERROR.name, INSTANCE_DEFAULT)
}
}
private fun dispatchUnregistered(previousEndpoint: String?, instance: String) {
val payload = JSObject().apply {
put("previousEndpoint", previousEndpoint ?: "")
put("instance", instance)
}
dispatch(EVENT_UNREGISTERED, payload)
}
private fun dispatchRegistrationFailed(reason: String, instance: String) {
val payload = JSObject().apply {
put("reason", reason)
put("instance", instance)
}
dispatch(EVENT_REGISTRATION_FAILED, payload)
}
private fun dispatch(eventName: String, payload: JSObject) {
plugin?.emitUnifiedPushEvent(eventName, payload)
}
private fun persistEndpoint(context: Context, endpoint: String, instance: String) {
context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).edit()
.putString(KEY_ENDPOINT, endpoint)
.putString(KEY_INSTANCE, instance)
.apply()
}
private fun clearEndpoint(context: Context) {
context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).edit()
.remove(KEY_ENDPOINT)
.remove(KEY_INSTANCE)
.apply()
}
private fun getEndpoint(context: Context): String? =
context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).getString(KEY_ENDPOINT, null)
private fun getInstance(context: Context): String? =
context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).getString(KEY_INSTANCE, null)
}
@@ -1,35 +0,0 @@
package com.paarrot.app
import android.util.Log
import org.unifiedpush.android.connector.FailedReason
import org.unifiedpush.android.connector.PushService
import org.unifiedpush.android.connector.data.PushEndpoint
import org.unifiedpush.android.connector.data.PushMessage
/** Receives UnifiedPush events and turns push messages into Matrix fetch wakes. */
class UnifiedPushService : PushService() {
override fun onNewEndpoint(endpoint: PushEndpoint, instance: String) {
Log.i(TAG, "UnifiedPush endpoint updated for instance=$instance")
UnifiedPushManager.onNewEndpoint(applicationContext, endpoint.url, instance)
}
override fun onMessage(message: PushMessage, instance: String) {
Log.d(TAG, "UnifiedPush wake ping received for instance=$instance, bytes=${message.content.size}")
MatrixSyncService.requestSyncFetch(applicationContext, "unifiedpush_message")
}
override fun onRegistrationFailed(reason: FailedReason, instance: String) {
Log.w(TAG, "UnifiedPush registration failed: $reason")
UnifiedPushManager.onRegistrationFailed(reason.name, instance)
}
override fun onUnregistered(instance: String) {
Log.i(TAG, "UnifiedPush unregistered for instance=$instance")
UnifiedPushManager.onUnregistered(applicationContext, instance)
}
private companion object {
const val TAG = "UnifiedPushService"
}
}
+9
View File
@@ -2,5 +2,14 @@
include ':capacitor-android'
project(':capacitor-android').projectDir = new File('../node_modules/@capacitor/android/capacitor')
include ':capacitor-app'
project(':capacitor-app').projectDir = new File('../node_modules/@capacitor/app/android')
include ':capacitor-browser'
project(':capacitor-browser').projectDir = new File('../node_modules/@capacitor/browser/android')
include ':capacitor-local-notifications'
project(':capacitor-local-notifications').projectDir = new File('../node_modules/@capacitor/local-notifications/android')
include ':capacitor-status-bar'
project(':capacitor-status-bar').projectDir = new File('../node_modules/@capacitor/status-bar/android')
+3
View File
@@ -7,6 +7,9 @@
"LocalNotifications": {
"smallIcon": "ic_stat_paarrot",
"iconColor": "#FF8A00"
},
"CapacitorHttp": {
"enabled": true
}
}
}
+1 -1
Submodule cinny updated: b52926f7d8...b294bb0c06
+2
View File
@@ -1,5 +1,7 @@
{
"dependencies": {
"@capacitor/app": "8.0.1",
"@capacitor/browser": "8.0.1",
"@capacitor/status-bar": "8.0.1"
}
}
@@ -6,16 +6,8 @@ export const Editor = style([
{
backgroundColor: color.SurfaceVariant.Container,
color: color.SurfaceVariant.OnContainer,
boxShadow: `inset 0 0 0 ${config.borderWidth.B300} ${color.SurfaceVariant.ContainerLine}`,
borderRadius: config.radii.R400,
borderTop: `${config.borderWidth.B300} solid ${color.SurfaceVariant.ContainerLine}`,
overflow: 'hidden',
selectors: {
// Keyboard-flush dock: only a top edge so the input can sit on the IME.
'[data-composer-flush="true"] &': {
borderRadius: 0,
boxShadow: `inset 0 ${config.borderWidth.B300} 0 0 ${color.SurfaceVariant.ContainerLine}`,
},
},
},
]);
@@ -45,22 +45,42 @@ type MobileSwipeGestureHostProps = {
children: ReactNode;
};
const IGNORE_BACK_SELECTOR =
'input, textarea, [contenteditable="true"], [data-allow-text-selection="true"], [data-carousel-scroller], [data-disable-swipe-back="true"]';
const IGNORE_REPLY_SELECTOR =
'input, textarea, [contenteditable="true"], [data-allow-text-selection="true"], [data-carousel-scroller], [data-disable-swipe-reply="true"]';
/** True when the touch starts on (or inside) a horizontally scrollable region like an image carousel. */
const isInsideHorizontalScroller = (target: EventTarget | null): boolean => {
if (!(target instanceof Element)) return false;
let el: Element | null = target;
while (el && el !== document.documentElement) {
if (el instanceof HTMLElement) {
const style = window.getComputedStyle(el);
const overflowX = style.overflowX;
if (
(overflowX === 'auto' || overflowX === 'scroll' || overflowX === 'overlay') &&
el.scrollWidth > el.clientWidth + 1
) {
return true;
}
}
el = el.parentElement;
}
return false;
};
const shouldIgnoreBackTarget = (target: EventTarget | null): boolean => {
if (!(target instanceof Element)) return true;
return Boolean(
target.closest(
'input, textarea, [contenteditable="true"], [data-allow-text-selection="true"], [data-carousel-scroller], [data-disable-swipe-back="true"]'
)
);
return Boolean(target.closest(IGNORE_BACK_SELECTOR)) || isInsideHorizontalScroller(target);
};
const shouldIgnoreReplyTarget = (target: EventTarget | null): boolean => {
if (!(target instanceof Element)) return true;
return Boolean(
target.closest(
'input, textarea, [contenteditable="true"], [data-allow-text-selection="true"], [data-carousel-scroller], [data-disable-swipe-reply="true"]'
)
);
return Boolean(target.closest(IGNORE_REPLY_SELECTOR)) || isInsideHorizontalScroller(target);
};
const findMessageElement = (target: EventTarget | null): HTMLElement | null => {
+8 -17
View File
@@ -14,7 +14,8 @@ import { RoomTimeline } from './RoomTimeline';
import { RoomViewTyping } from './RoomViewTyping';
import { RoomTombstone } from './RoomTombstone';
import { RoomInput } from './RoomInput';
import { RoomViewFollowing, RoomViewFollowingPlaceholder } from './RoomViewFollowing';
import { RoomViewFollowing } from './RoomViewFollowing';
import * as roomViewCss from './RoomViewFollowing.css';
import { Page } from '../../components/page';
import { RoomViewHeader } from './RoomViewHeader';
import { useKeyDown } from '../../hooks/useKeyDown';
@@ -105,7 +106,7 @@ export function RoomView({ room, eventId }: { room: Room; eventId?: string }) {
);
const flushComposer = immersive;
const composerPadding = flushComposer ? '0' : `0 ${config.space.S400}`;
const composerPadding = '0';
const showHeader = !immersive;
return (
@@ -116,7 +117,7 @@ export function RoomView({ room, eventId }: { room: Room; eventId?: string }) {
) : (
<>
<MobileSwipeToReplyLayer room={room} editor={editor}>
<Box grow="Yes" direction="Column">
<Box grow="Yes" direction="Column" style={{ position: 'relative', minHeight: 0 }}>
<RoomTimeline
key={roomId}
room={room}
@@ -124,7 +125,10 @@ export function RoomView({ room, eventId }: { room: Room; eventId?: string }) {
roomInputRef={roomInputRef}
editor={editor}
/>
<RoomViewTyping room={room} />
<div className={roomViewCss.RoomViewBottomFloat}>
<RoomViewTyping room={room} />
{!hideActivity && <RoomViewFollowing room={room} />}
</div>
</Box>
</MobileSwipeToReplyLayer>
<Box
@@ -134,13 +138,6 @@ export function RoomView({ room, eventId }: { room: Room; eventId?: string }) {
data-composer-flush={flushComposer ? 'true' : undefined}
className={composerCss.ComposerDock}
>
{immersive && !hideActivity && (
<div className={composerCss.FollowingFloat}>
<div className={composerCss.FollowingFloatHit}>
<RoomViewFollowing room={room} />
</div>
</div>
)}
<div style={{ padding: composerPadding }}>
{tombstoneEvent ? (
<RoomTombstone
@@ -171,12 +168,6 @@ export function RoomView({ room, eventId }: { room: Room; eventId?: string }) {
</>
)}
</div>
{!immersive &&
(hideActivity ? (
<RoomViewFollowingPlaceholder />
) : (
<RoomViewFollowing room={room} />
))}
</Box>
</>
)}
@@ -2,6 +2,20 @@ import { style } from '@vanilla-extract/css';
import { recipe } from '@vanilla-extract/recipes';
import { DefaultReset, color, config, toRem } from 'folds';
/** Floats typing + read receipts over the bottom of the timeline. */
export const RoomViewBottomFloat = style({
position: 'absolute',
bottom: 0,
left: 0,
right: 0,
zIndex: 1,
display: 'flex',
flexDirection: 'row',
alignItems: 'center',
gap: config.space.S200,
pointerEvents: 'none',
});
export const RoomViewFollowingPlaceholder = style([
DefaultReset,
{
@@ -15,20 +29,12 @@ export const RoomViewFollowing = recipe({
{
minHeight: toRem(28),
padding: `0 ${config.space.S400}`,
width: '100%',
backgroundColor: color.Surface.Container,
marginLeft: 'auto',
maxWidth: '50%',
backgroundColor: 'transparent',
color: color.Surface.OnContainer,
outline: 'none',
selectors: {
// Compact floating chip while the keyboard is open.
'[data-composer-flush="true"] &': {
minHeight: 0,
width: 'auto',
maxWidth: '100%',
padding: `${config.space.S100} ${config.space.S200}`,
backgroundColor: 'transparent',
},
},
pointerEvents: 'auto',
},
],
variants: {
@@ -62,6 +62,10 @@ import colorMXID from '../../../../util/colorMXID';
import { getPowerTagIconSrc } from '../../../hooks/useMemberPowerTag';
import { Presence, useUserPresence } from '../../../hooks/useUserPresence';
import { useOtherUserColor } from '../../../hooks/useUserColor';
import { useIsDirectRoom } from '../../../hooks/useRoom';
import { useOtherUserCollectibles } from '../../../hooks/useUserCollectibles';
import { pickAvatarDecorationUrl, pickNameplateUrl } from '../../../utils/collectibleAssets';
import * as avatarDecorationCss from '../../../styles/AvatarDecoration.css';
export type ReactionHandler = (keyOrMxc: string, shortcode: string) => void;
@@ -754,8 +758,15 @@ export const Message = as<'div', MessageProps>(
) => {
const mx = useMatrixClient();
const useAuthentication = useMediaAuthentication();
const direct = useIsDirectRoom();
const senderId = mEvent.getSender() ?? '';
const senderPresence = useUserPresence(senderId);
const { assetUrls } = useOtherUserCollectibles(senderId);
const nameplateUrl = pickNameplateUrl(assetUrls);
const nameplateIsVideo = Boolean(
assetUrls['nameplate:animated'] || assetUrls['nameplate:asset.webm']
);
const avatarDecorationUrl = pickAvatarDecorationUrl(assetUrls);
const [hover, setHover] = useState(false);
const { hoverProps } = useHover({ onHoverChange: setHover });
@@ -785,7 +796,7 @@ export const Message = as<'div', MessageProps>(
const senderAvatarMxc = getMemberAvatarMxc(room, senderId);
// Get custom user color from avatar metadata (takes priority)
const customUserColor = useOtherUserColor(senderId, senderAvatarMxc);
const customUserColor = useOtherUserColor(senderId, room);
const tagColor = memberPowerTag?.color
? accessibleTagColors?.get(memberPowerTag.color)
@@ -796,6 +807,7 @@ export const Message = as<'div', MessageProps>(
// Priority: custom user color > tag color (non-legacy) > colorMXID (legacy)
const usernameColor = customUserColor ?? (legacyUsernameColor ? colorMXID(senderId) : tagColor);
const showNameplate = direct && hover && Boolean(nameplateUrl);
const headerJSX = !collapse && (
<Box
@@ -824,23 +836,41 @@ export const Message = as<'div', MessageProps>(
</Username>
{tagIconSrc && <PowerIcon size="100" iconSrc={tagIconSrc} />}
</Box>
<Box shrink="No" gap="100">
{messageLayout === MessageLayout.Modern && hover && (
<>
<Text as="span" size="T200" priority="300">
{senderId}
</Text>
<Text as="span" size="T200" priority="300">
|
</Text>
</>
<Box shrink="No" className={css.MessageNameplateAnchor}>
<Box shrink="No" gap="100" alignItems="Center">
{messageLayout === MessageLayout.Modern && hover && (
<>
<Text as="span" size="T200" priority="300">
{senderId}
</Text>
<Text as="span" size="T200" priority="300">
|
</Text>
</>
)}
<Time
ts={mEvent.getTs()}
compact={messageLayout === MessageLayout.Compact}
hour24Clock={hour24Clock}
dateFormatString={dateFormatString}
/>
</Box>
{showNameplate && (
<div className={css.MessageNameplateWrap}>
{nameplateIsVideo ? (
<video
className={css.MessageNameplateOverlay}
src={nameplateUrl}
autoPlay
loop
muted
playsInline
/>
) : (
<img className={css.MessageNameplateOverlay} src={nameplateUrl} alt="" draggable={false} />
)}
</div>
)}
<Time
ts={mEvent.getTs()}
compact={messageLayout === MessageLayout.Compact}
hour24Clock={hour24Clock}
dateFormatString={dateFormatString}
/>
</Box>
</Box>
);
@@ -857,24 +887,38 @@ export const Message = as<'div', MessageProps>(
<AvatarBase
className={messageLayout === MessageLayout.Bubble ? css.BubbleAvatarBase : undefined}
>
<Avatar
className={classNames(css.MessageAvatar, presenceClass)}
as="button"
size="300"
data-user-id={senderId}
onClick={onUserClick}
>
<UserAvatar
userId={senderId}
src={
senderAvatarMxc
? mxcUrlToHttp(mx, senderAvatarMxc, useAuthentication, 48, 48, 'crop') ?? undefined
: undefined
}
alt={senderDisplayName}
renderFallback={() => <Icon size="200" src={Icons.User} filled />}
/>
</Avatar>
<div className={css.MessageAvatarStack}>
<Avatar
className={classNames(
avatarDecorationUrl ? css.MessageAvatarCircular : css.MessageAvatar,
!avatarDecorationUrl && presenceClass
)}
radii={avatarDecorationUrl ? 'Pill' : undefined}
as="button"
size="300"
data-user-id={senderId}
onClick={onUserClick}
>
<UserAvatar
userId={senderId}
src={
senderAvatarMxc
? mxcUrlToHttp(mx, senderAvatarMxc, useAuthentication, 48, 48, 'crop') ?? undefined
: undefined
}
alt={senderDisplayName}
renderFallback={() => <Icon size="200" src={Icons.User} filled />}
/>
</Avatar>
{avatarDecorationUrl && (
<img
className={avatarDecorationCss.AvatarDecorationOverlay}
src={avatarDecorationUrl}
alt=""
draggable={false}
/>
)}
</div>
</AvatarBase>
);
@@ -959,6 +1003,10 @@ export const Message = as<'div', MessageProps>(
{...focusWithinProps}
ref={ref}
>
<div
className={css.MessageContentLayer}
data-message-nameplate-readable={showNameplate ? '' : undefined}
>
{!edit && (hover || !!menuAnchor || !!emojiBoardAnchor) && (
<div className={css.MessageOptionsBase}>
<Menu className={css.MessageOptionsBar} variant="SurfaceVariant">
@@ -1247,6 +1295,7 @@ export const Message = as<'div', MessageProps>(
{msgContentJSX}
</ModernLayout>
)}
</div>
</MessageBase>
);
}
@@ -1,63 +1,5 @@
import { style } from '@vanilla-extract/css';
import { recipe } from '@vanilla-extract/recipes';
import { DefaultReset, color, config } from 'folds';
export const ComposerDock = style({
position: 'relative',
});
/** Read receipts float above the input so they don't reserve layout height. */
export const FollowingFloat = style({
position: 'absolute',
bottom: '100%',
left: 0,
right: 0,
zIndex: 2,
display: 'flex',
justifyContent: 'flex-end',
pointerEvents: 'none',
padding: `0 ${config.space.S200}`,
});
export const FollowingFloatHit = style({
pointerEvents: 'auto',
maxWidth: '100%',
});
export const RoomViewFollowingPlaceholder = style([
DefaultReset,
{
display: 'none',
height: 0,
},
]);
export const RoomViewFollowing = recipe({
base: [
DefaultReset,
{
minHeight: 0,
padding: `${config.space.S100} ${config.space.S200}`,
width: 'auto',
maxWidth: '100%',
backgroundColor: 'transparent',
color: color.Surface.OnContainer,
outline: 'none',
},
],
variants: {
clickable: {
true: {
cursor: 'pointer',
selectors: {
'&:hover, &:focus-visible': {
color: color.Primary.Main,
},
'&:active': {
color: color.Primary.Main,
},
},
},
},
},
});
@@ -14,8 +14,10 @@ import { isCapacitorNative, requestSystemNotificationPermission } from '../../..
import {
isBackgroundSyncSupported,
getBackgroundSyncStatus,
requestResetPushRegistration,
requestBatteryExemption,
startBackgroundSync,
triggerBackgroundSyncPing,
type ListenerStatus,
} from '../../../utils/backgroundSync';
function EmailNotification() {
@@ -166,57 +168,107 @@ export function SystemNotification() {
);
}
type PushStatus = {
registered: boolean;
distributor: string;
endpoint: string;
};
/** Android-only section showing UnifiedPush registration status and controls. */
/** Android-only controls for Paarrot's persistent message listener. */
function AndroidPushNotifications() {
const [status, setStatus] = useState<PushStatus | undefined>(undefined);
const mx = useMatrixClient();
const [status, setStatus] = useState<ListenerStatus | undefined>(undefined);
const [loading, setLoading] = useState(true);
const refresh = useCallback(async () => {
setLoading(true);
const s = await getBackgroundSyncStatus();
setStatus(
s
? {
registered: s.registered,
distributor: s.distributor || '',
endpoint: s.endpoint || '',
}
: undefined
);
setStatus(await getBackgroundSyncStatus());
setLoading(false);
}, []);
useEffect(() => {
void refresh();
const id = window.setInterval(() => void refresh(), 4000);
return () => window.clearInterval(id);
}, [refresh]);
const [resetState, reset] = useAsyncCallback(
const [batteryState, allowBattery] = useAsyncCallback(
useCallback(async () => {
await requestResetPushRegistration();
await requestBatteryExemption();
await refresh();
}, [refresh])
);
const [startState, startListener] = useAsyncCallback(
useCallback(async () => {
await requestSystemNotificationPermission();
await startBackgroundSync(mx);
await refresh();
}, [mx, refresh])
);
const [pingState, ping] = useAsyncCallback(
useCallback(async () => {
await triggerBackgroundSyncPing('manual-test');
}, [])
await refresh();
}, [refresh])
);
const isBusy =
loading ||
resetState.status === AsyncStatus.Loading ||
batteryState.status === AsyncStatus.Loading ||
startState.status === AsyncStatus.Loading ||
pingState.status === AsyncStatus.Loading;
const actionError =
startState.status === AsyncStatus.Error
? startState.error
: batteryState.status === AsyncStatus.Error
? batteryState.error
: pingState.status === AsyncStatus.Error
? pingState.error
: undefined;
const statusDescription = (() => {
if (loading) return 'Loading status…';
if (status === undefined) {
return (
<Text as="span" style={{ color: color.Critical.Main }} size="T200">
Failed to read the message listener status.
</Text>
);
}
if (status.error) {
return (
<Text as="span" style={{ color: color.Critical.Main }} size="T200">
{status.error}
</Text>
);
}
if (status.notificationsAllowed === false) {
return (
<Text as="span" style={{ color: color.Critical.Main }} size="T200">
Allow notifications for Paarrot, then tap Start.
</Text>
);
}
if (status.listening && status.batteryIgnored) {
return (
<Text as="span" size="T200">
Paarrot is listening for messages.
</Text>
);
}
if (status.listening) {
return (
<Text as="span" size="T200">
Paarrot is listening. Allow unrestricted battery so Android leaves it running.
</Text>
);
}
return (
<Text as="span" style={{ color: color.Critical.Main }} size="T200">
The message listener is stopped. Tap Start.
</Text>
);
})();
return (
<Box direction="Column" gap="100">
<Text size="L400">Android Push (UnifiedPush)</Text>
<Text size="L400">Android Notifications</Text>
<SequenceCard
className={SequenceCardStyle}
variant="SurfaceVariant"
@@ -224,57 +276,78 @@ function AndroidPushNotifications() {
gap="400"
>
<SettingTile
title="Background Notifications"
title="Message listener"
description={
loading ? (
'Loading status…'
) : status === undefined ? (
<Text as="span" style={{ color: color.Critical.Main }} size="T200">
Failed to read push status.
</Text>
) : status.registered ? (
<>
<Text as="span" size="T200">
{`Distributor: ${status.distributor || 'unknown'}`}
<>
{statusDescription}
{actionError !== undefined && (
<Text as="span" style={{ color: color.Critical.Main, display: 'block' }} size="T200">
{actionError instanceof Error ? actionError.message : String(actionError)}
</Text>
</>
)}
</>
}
after={
loading ? (
<Spinner variant="Secondary" />
) : (
<Text as="span" style={{ color: color.Warning?.Main ?? color.Critical.Main }} size="T200">
Not registered. Tap &quot;Reset&quot; to choose a distributor app.
</Text>
<Button
size="300"
radii="300"
variant="Secondary"
disabled={isBusy || Boolean(status?.listening)}
onClick={() =>
void startListener().catch((err) =>
console.error('[AndroidNotifications] Failed to start listener:', err)
)
}
>
{startState.status === AsyncStatus.Loading ? (
<Spinner variant="Secondary" size="200" />
) : (
<Text size="B300">{status?.listening ? 'Running' : 'Start'}</Text>
)}
</Button>
)
}
after={loading ? <Spinner variant="Secondary" /> : undefined}
/>
<SettingTile
title="Change Distributor"
description="Re-open the UnifiedPush distributor selection dialog."
title="Unrestricted battery"
description="Lets the listener stay awake when the screen is off."
after={
<Button
size="300"
radii="300"
variant="Secondary"
disabled={isBusy}
onClick={() => void reset()}
disabled={isBusy || Boolean(status?.batteryIgnored)}
onClick={() =>
void allowBattery().catch((err) =>
console.error('[AndroidNotifications] Failed to request battery exemption:', err)
)
}
>
{resetState.status === AsyncStatus.Loading ? (
{batteryState.status === AsyncStatus.Loading ? (
<Spinner variant="Secondary" size="200" />
) : (
<Text size="B300">Reset</Text>
<Text size="B300">{status?.batteryIgnored ? 'Allowed' : 'Allow'}</Text>
)}
</Button>
}
/>
<SettingTile
title="Test Notification"
description="Trigger a test push ping to verify the pipeline works."
description="Ask the listener to check for messages now."
after={
<Button
size="300"
radii="300"
variant="Secondary"
disabled={isBusy}
onClick={() => void ping()}
onClick={() =>
void ping().catch((err) =>
console.error('[AndroidNotifications] Failed to trigger listener sync:', err)
)
}
>
{pingState.status === AsyncStatus.Loading ? (
<Spinner variant="Secondary" size="200" />
@@ -1,5 +1,6 @@
import React, { useEffect } from 'react';
import { MatrixClient } from 'matrix-js-sdk';
import * as lucide from 'lucide-react';
import { Plugin, createPluginContext } from '@paarrot/plugin-manager';
import { pluginMarketplaceManager, pluginRegistry } from './PluginAPI';
import { sendNotification } from '../../../utils/tauri';
@@ -80,6 +81,7 @@ export function PluginLoader({ matrixClient, children }: PluginLoaderProps) {
matrixClient.off(eventType as any, handler as any),
},
React,
lucide,
});
console.log('[PluginLoader] compatContext.React:', !!compatContext.React);
@@ -0,0 +1,49 @@
import { useMemo } from 'react';
import { useClientConfig } from './useClientConfig';
import { trimLeadingSlash, trimSlash, trimTrailingSlash } from '../utils/common';
import { isCapacitorNative, isElectron } from '../utils/tauri';
/** Authority shown on Matrix SSO consent ("Continue to paarrot://desktop"). */
export const ELECTRON_PROTOCOL_HOST = 'desktop';
/** Authority shown on Matrix SSO consent for the Android Capacitor app. */
export const ANDROID_PROTOCOL_HOST = 'android';
/**
* Build an absolute URL for the given in-app path.
*
* In Electron / Capacitor, SSO (and other browser handoffs) must return via
* paarrot://{host}/... — a named host so consent UI identifies the app, and a
* real pathname (not a hash) because browsers strip fragments when launching
* custom protocols.
*/
export const usePathWithOrigin = (path: string): string => {
const { hashRouter } = useClientConfig();
const { origin } = window.location;
const pathWithOrigin = useMemo(() => {
if (isElectron() || isCapacitorNative()) {
const host = isElectron() ? ELECTRON_PROTOCOL_HOST : ANDROID_PROTOCOL_HOST;
const basename = trimSlash(hashRouter?.basename ?? '');
const routeParts = [basename, trimLeadingSlash(path)].filter(Boolean);
const route = `/${routeParts.join('/')}`.replace(/\/{2,}/g, '/');
return `paarrot://${host}${route}`;
}
let url: string = trimSlash(origin);
url += `/${trimSlash(import.meta.env.BASE_URL ?? '')}`;
url = trimTrailingSlash(url);
if (hashRouter?.enabled) {
url += `/#/${trimSlash(hashRouter.basename ?? '')}`;
url = trimTrailingSlash(url);
}
url += `/${trimLeadingSlash(path)}`;
return url;
}, [path, hashRouter, origin]);
return pathWithOrigin;
};
@@ -1,7 +1,7 @@
import { useAtomValue, useStore } from 'jotai';
import React, { ReactNode, useCallback, useEffect, useRef, useState, Fragment } from 'react';
import { useNavigate } from 'react-router-dom';
import { RoomEvent, RoomEventHandlerMap } from 'matrix-js-sdk';
import { RoomEvent, RoomEventHandlerMap, MatrixClient, MatrixEvent, MatrixEventEvent } from 'matrix-js-sdk';
import { roomToUnreadAtom, unreadEqual, unreadInfoToUnread } from '../../state/room/roomToUnread';
import LogoSVG from '../../../../public/res/svg/paarrot.svg';
import LogoUnreadSVG from '../../../../public/res/svg/paarrot-unread.svg';
@@ -15,6 +15,7 @@ import { useMatrixClient } from '../../hooks/useMatrixClient';
import { getDirectRoomPath, getHomeRoomPath, getSpaceRoomPath, getInboxInvitesPath } from '../pathUtils';
import {
getMemberDisplayName,
getMemberAvatarMxc,
getNotificationType,
getUnreadInfo,
isNotificationEvent,
@@ -22,7 +23,15 @@ import {
guessPerfectParent,
} from '../../utils/room';
import { NotificationType, UnreadInfo } from '../../../types/matrix/room';
import { getMxIdLocalPart, mxcUrlToHttp, getCanonicalAliasOrRoomId, encryptFile } from '../../utils/matrix';
import {
getMxIdLocalPart,
mxcUrlToHttp,
getCanonicalAliasOrRoomId,
encryptFile,
downloadMedia,
downloadEncryptedMedia,
decryptFile,
} from '../../utils/matrix';
import { mDirectAtom } from '../../state/mDirectList';
import { roomToParentsAtom } from '../../state/room/roomToParents';
import { useSelectedRoom } from '../../hooks/router/useSelectedRoom';
@@ -35,12 +44,17 @@ import {
isCapacitorNative,
sendNotification,
setupNotificationTapListener,
clearNotificationsForRoom,
NOTIF_GROUP_DIRECTS,
NOTIF_GROUP_HOME,
type NotificationGroupInfo,
} from '../../utils/tauri';
import { setPaarrotNavigate, initPaarrotAPI } from '../../paarrot-api';
import {
startBackgroundSync,
stopBackgroundSync,
setAppForegroundState,
syncNotificationGroupMap,
} from '../../utils/backgroundSync';
import {
TUploadItem,
@@ -57,6 +71,201 @@ import {
materializeSharedFile,
} from '../../utils/androidShare';
/** Wait briefly for an encrypted event to decrypt before reading its body. */
async function waitForEventDecryption(mx: MatrixClient, mEvent: MatrixEvent) {
if (!mEvent.isEncrypted() || mEvent.getClearContent() || mEvent.isDecryptionFailure()) {
return;
}
const crypto = mx.getCrypto();
if (crypto) {
try {
await mEvent.attemptDecryption(crypto as any, { isRetry: true });
} catch {
// Decryption may complete asynchronously via the Decrypted listener below.
}
}
if (mEvent.getClearContent() || mEvent.isDecryptionFailure()) return;
await new Promise<void>((resolve) => {
const timeout = window.setTimeout(() => {
mEvent.removeListener(MatrixEventEvent.Decrypted, onDecrypted);
resolve();
}, 2000);
const onDecrypted = () => {
window.clearTimeout(timeout);
mEvent.removeListener(MatrixEventEvent.Decrypted, onDecrypted);
resolve();
};
mEvent.once(MatrixEventEvent.Decrypted, onDecrypted);
});
}
/** Short, single-line snippet of an event's body for use inside a notification. */
function eventBodySnippet(mEvent: MatrixEvent, maxLength = 60): string {
const content = mEvent.getClearContent() ?? mEvent.getContent();
const rawBody = typeof content.body === 'string' ? content.body : '';
if (!rawBody) return '';
const trimmed = rawBody.replace(/\s+/g, ' ').trim();
return trimmed.length > maxLength ? `${trimmed.slice(0, maxLength)}…` : trimmed;
}
/** Render a reaction emoji to a PNG base64 string so it can be used as the notification icon. */
async function renderEmojiToBase64(emoji: string): Promise<string | undefined> {
try {
const size = 128;
const canvas = document.createElement('canvas');
canvas.width = size;
canvas.height = size;
const ctx = canvas.getContext('2d');
if (!ctx) return undefined;
ctx.font = `${Math.floor(size * 0.7)}px "Apple Color Emoji","Segoe UI Emoji","Noto Color Emoji",sans-serif`;
ctx.textBaseline = 'middle';
ctx.textAlign = 'center';
ctx.fillText(emoji, size / 2, size / 2);
const dataUrl = canvas.toDataURL('image/png');
return dataUrl.split(',')[1];
} catch (err) {
console.warn('[Notifications] Failed to render emoji icon:', err);
return undefined;
}
}
/** Build a human-readable notification body from (possibly decrypted) event content. */
function notificationBodyFromEvent(mx: MatrixClient, mEvent: MatrixEvent): string | undefined {
const content = mEvent.getClearContent() ?? mEvent.getContent();
const eventType = mEvent.getType();
if (eventType === 'm.reaction') {
const relates = content['m.relates_to'];
const reactionKey = relates?.key;
const parent = relates?.event_id ? mx.getCachedEventById(relates.event_id) : undefined;
const snippet = parent ? eventBodySnippet(parent) : '';
if (reactionKey && snippet) return `reacted with ${reactionKey} to "${snippet}"`;
if (reactionKey) return `reacted with ${reactionKey}`;
return 'reacted to a message';
}
if (eventType === 'm.room.encrypted' || mEvent.isDecryptionFailure()) {
return 'Encrypted message';
}
const rawBody = typeof content.body === 'string' ? content.body : undefined;
switch (content.msgtype) {
case 'm.image':
// Matrix body is usually a filename — skip it in the shade.
return '📷 Photo';
case 'm.video':
return rawBody ? `🎥 ${rawBody}` : '🎥 Video';
case 'm.audio':
return rawBody ? `🎵 ${rawBody}` : '🎵 Audio';
case 'm.file':
return rawBody ? `📎 ${rawBody}` : '📎 File';
case 'm.sticker':
return '🖼️ Sticker';
default:
return rawBody;
}
}
/** Download an authenticated media URL to a base64 string for native notification icons. */
async function mediaUrlToBase64(
url: string,
accessToken: string | null | undefined
): Promise<string | undefined> {
try {
const blob = await downloadMedia(url, accessToken);
return blobToBase64(blob);
} catch (err) {
console.warn('[Notifications] Failed to fetch media for notification:', err);
return undefined;
}
}
async function blobToBase64(blob: Blob): Promise<string | undefined> {
try {
const buffer = await blob.arrayBuffer();
const bytes = new Uint8Array(buffer);
let binary = '';
const chunk = 0x8000;
for (let i = 0; i < bytes.length; i += chunk) {
binary += String.fromCharCode(...bytes.subarray(i, i + chunk));
}
const mime = blob.type || 'image/jpeg';
return `data:${mime};base64,${btoa(binary)}`;
} catch {
return undefined;
}
}
/** Resolve a sender display name from room membership, user directory, then MXID. */
function resolveSenderDisplayName(mx: MatrixClient, room: { roomId: string }, sender: string): string {
return (
getMemberDisplayName(room as any, sender) ??
mx.getUser(sender)?.displayName ??
getMxIdLocalPart(sender) ??
sender
);
}
/** Fetch image attachment preview (plaintext or encrypted) for the notification shade. */
async function fetchNotificationImageBase64(
mx: MatrixClient,
mEvent: MatrixEvent,
useAuthentication: boolean
): Promise<string | undefined> {
const content = (mEvent.getClearContent() ?? mEvent.getContent()) as Record<string, any>;
if (content.msgtype !== 'm.image' && mEvent.getType() !== 'm.sticker') return undefined;
const accessToken = mx.getAccessToken();
const info = content.info ?? {};
try {
// Prefer a smaller thumbnail when available.
if (info.thumbnail_file?.url) {
const mediaUrl =
mxcUrlToHttp(mx, info.thumbnail_file.url, useAuthentication) ?? info.thumbnail_file.url;
const blob = await downloadEncryptedMedia(
mediaUrl,
(encBuf) =>
decryptFile(encBuf, info.thumbnail_info?.mimetype ?? 'image/jpeg', info.thumbnail_file),
accessToken
);
return blobToBase64(blob);
}
if (typeof info.thumbnail_url === 'string') {
const mediaUrl =
mxcUrlToHttp(mx, info.thumbnail_url, useAuthentication, 512, 512, 'scale') ??
mxcUrlToHttp(mx, info.thumbnail_url, useAuthentication);
if (mediaUrl) return mediaUrlToBase64(mediaUrl, accessToken);
}
if (content.file?.url) {
const mediaUrl = mxcUrlToHttp(mx, content.file.url, useAuthentication) ?? content.file.url;
const blob = await downloadEncryptedMedia(
mediaUrl,
(encBuf) => decryptFile(encBuf, info.mimetype ?? 'image/jpeg', content.file),
accessToken
);
return blobToBase64(blob);
}
if (typeof content.url === 'string') {
const mediaUrl =
mxcUrlToHttp(mx, content.url, useAuthentication, 512, 512, 'scale') ??
mxcUrlToHttp(mx, content.url, useAuthentication);
if (mediaUrl) return mediaUrlToBase64(mediaUrl, accessToken);
}
} catch (err) {
console.warn('[Notifications] Failed to fetch image attachment for notification:', err);
}
return undefined;
}
/**
* Applies the selected emoji style font to the document.
* - System: Uses the native OS emoji font
@@ -221,15 +430,72 @@ function MessageNotifications() {
// Set up notification tap listener for mobile
useEffect(() => {
setupNotificationTapListener((path) => {
navigate(path);
const openFromNotification = (target: string) => {
if (!target) return;
if (target.startsWith('__room__:')) {
const roomId = target.slice('__room__:'.length);
if (!mx || !roomId) return;
try {
const roomIdOrAlias = getCanonicalAliasOrRoomId(mx, roomId);
if (mDirects.has(roomId)) {
navigate(getDirectRoomPath(roomIdOrAlias));
return;
}
const orphanParents = getOrphanParents(roomToParents, roomId);
if (orphanParents.length > 0) {
const parentSpace = guessPerfectParent(mx, roomId, orphanParents) ?? orphanParents[0];
const pSpaceIdOrAlias = getCanonicalAliasOrRoomId(mx, parentSpace);
navigate(getSpaceRoomPath(pSpaceIdOrAlias, roomIdOrAlias));
return;
}
navigate(getHomeRoomPath(roomIdOrAlias));
} catch (err) {
console.error('[Notifications] Navigate from roomId error:', err);
}
return;
}
navigate(target);
};
setupNotificationTapListener(openFromNotification);
}, [navigate, mx, mDirects, roomToParents]);
const roomToUnread = useAtomValue(roomToUnreadAtom);
const previousUnreadRoomsRef = useRef<Set<string>>(new Set());
const previousUnreadTotalsRef = useRef<Map<string, number>>(new Map());
// Dismiss OS notifications when a room's unread is cleared
// (local mark-as-read, or our receipt syncing from another device).
useEffect(() => {
const currentRooms = new Set(roomToUnread.keys());
const nextTotals = new Map<string, number>();
roomToUnread.forEach((unread, roomId) => {
nextTotals.set(roomId, unread.total);
const prevTotal = previousUnreadTotalsRef.current.get(roomId);
if (prevTotal !== undefined && prevTotal > 0 && unread.total === 0) {
void clearNotificationsForRoom(roomId);
}
});
}, [navigate]);
for (const roomId of previousUnreadRoomsRef.current) {
if (!currentRooms.has(roomId)) {
void clearNotificationsForRoom(roomId);
}
}
previousUnreadRoomsRef.current = currentRooms;
previousUnreadTotalsRef.current = nextTotals;
}, [roomToUnread]);
const notify = useCallback(
({
roomName,
roomAvatar,
iconBase64,
bigPictureBase64,
username,
messageBody,
roomId,
@@ -238,14 +504,52 @@ function MessageNotifications() {
}: {
roomName: string;
roomAvatar?: string;
iconBase64?: string;
bigPictureBase64?: string;
username: string;
messageBody?: string;
roomId: string;
eventId: string;
isDm: boolean;
}) => {
const notificationTitle = username;
const notificationBody = messageBody || 'New message';
let group: NotificationGroupInfo;
if (isDm) {
group = {
groupId: NOTIF_GROUP_DIRECTS,
groupName: 'Direct messages',
kind: 'direct',
roomName,
};
} else {
const orphanParents = getOrphanParents(roomToParents, roomId);
if (orphanParents.length > 0 && mx) {
const parentSpace = guessPerfectParent(mx, roomId, orphanParents) ?? orphanParents[0];
const spaceRoom = mx.getRoom(parentSpace);
group = {
groupId: parentSpace,
groupName: spaceRoom?.name || 'Space',
kind: 'space',
roomName,
};
} else {
group = {
groupId: NOTIF_GROUP_HOME,
groupName: 'Home',
kind: 'home',
roomName,
};
}
}
// DMs: sender as title. Rooms: room name as title, sender in body.
const notificationTitle = isDm ? username : roomName || username;
const notificationBody = isDm
? messageBody || 'New message'
: messageBody
? `${username}: ${messageBody}`
: `${username} sent a message`;
const messageText = messageBody || 'New message';
const conversationTitle = isDm ? undefined : roomName || undefined;
/** Replicates TitleBar click navigation logic */
const navigateToRoom = () => {
@@ -290,7 +594,15 @@ function MessageNotifications() {
sendNotification({
title: notificationTitle,
body: notificationBody,
senderName: username,
messageText,
conversationTitle,
path: roomPath,
roomId,
group,
icon: roomAvatar,
iconBase64,
bigPictureBase64,
onClick: () => {
if (!window.closed) navigate(roomPath);
},
@@ -388,34 +700,56 @@ function MessageNotifications() {
showNotifications &&
((isTauri() && !isElectron()) || isCapacitorNative() || notificationPermission('granted'))
) {
const avatarMxc =
room.getAvatarFallbackMember()?.getMxcAvatarUrl() ?? room.getMxcAvatarUrl();
const content = mEvent.getContent();
let messageBody: string | undefined;
if (mEvent.getType() === 'm.reaction') {
// For reactions, show "reacted with {emoji}"
const reactionKey = content['m.relates_to']?.key;
if (reactionKey) {
messageBody = `reacted with ${reactionKey}`;
} else {
messageBody = 'reacted to a message';
}
} else {
messageBody = typeof content.body === 'string' ? content.body : undefined;
}
notify({
roomName: room.name ?? 'Unknown',
roomAvatar: avatarMxc
void (async () => {
await waitForEventDecryption(mx, mEvent);
const avatarMxc =
getMemberAvatarMxc(room, sender) ??
room.getAvatarFallbackMember()?.getMxcAvatarUrl() ??
room.getMxcAvatarUrl();
const roomAvatar = avatarMxc
? mxcUrlToHttp(mx, avatarMxc, useAuthentication, 96, 96, 'crop') ?? undefined
: undefined,
username: getMemberDisplayName(room, sender) ?? getMxIdLocalPart(sender) ?? sender,
messageBody,
roomId: room.roomId,
eventId,
isDm,
});
: undefined;
const username = resolveSenderDisplayName(mx, room, sender);
const [iconBase64, bigPictureBase64] = await Promise.all([
roomAvatar && isCapacitorNative()
? mediaUrlToBase64(roomAvatar, mx.getAccessToken())
: Promise.resolve(undefined),
isCapacitorNative()
? fetchNotificationImageBase64(mx, mEvent, useAuthentication)
: Promise.resolve(undefined),
]);
// Reactions have no media, so render the reaction emoji as the notification icon.
let finalIconBase64 = iconBase64;
let finalRoomAvatar = roomAvatar;
if (mEvent.getType() === 'm.reaction') {
const emoji = (mEvent.getClearContent() ?? mEvent.getContent())['m.relates_to']?.key;
if (emoji) {
const emojiBase64 = await renderEmojiToBase64(emoji);
if (emojiBase64) {
finalIconBase64 = emojiBase64;
finalRoomAvatar = `data:image/png;base64,${emojiBase64}`;
}
}
}
const messageBody = notificationBodyFromEvent(mx, mEvent);
notify({
roomName: room.name ?? 'Unknown',
roomAvatar: finalRoomAvatar,
iconBase64: finalIconBase64,
bigPictureBase64,
username,
messageBody,
roomId: room.roomId,
eventId,
isDm,
});
})();
}
if (notificationSound) {
@@ -442,13 +776,16 @@ function MessageNotifications() {
}
/**
* Configures native Android push-ping background sync on login, keeps it
* Configures the native Android message listener on login, keeps it
* informed of foreground state so it doesn't double-fire notifications,
* and clears it cleanly on unmount (logout).
* Only active on Android Capacitor builds.
*/
function BackgroundSyncSetup() {
const mx = useMatrixClient();
const mDirects = useAtomValue(mDirectAtom);
const roomToParents = useAtomValue(roomToParentsAtom);
// Try to make a simple fetch to verify component is rendering
try {
fetch('/_matrix/client/v3/sync', { method: 'HEAD' }).catch(() => {});
@@ -456,18 +793,71 @@ function BackgroundSyncSetup() {
useEffect(() => {
console.log('BackgroundSyncSetup: Starting background sync for', mx.getUserId());
startBackgroundSync(mx);
void startBackgroundSync(mx).catch((err) => {
console.error('[BackgroundSyncSetup] Failed to start message listener:', err);
});
const onVisibility = () => setAppForegroundState(!document.hidden);
const onVisibility = () => {
void setAppForegroundState(!document.hidden).catch((err) => {
console.error('[BackgroundSyncSetup] Failed to update foreground state:', err);
});
};
document.addEventListener('visibilitychange', onVisibility);
setAppForegroundState(!document.hidden);
void setAppForegroundState(!document.hidden).catch((err) => {
console.error('[BackgroundSyncSetup] Failed to set initial foreground state:', err);
});
return () => {
document.removeEventListener('visibilitychange', onVisibility);
stopBackgroundSync();
void stopBackgroundSync().catch((err) => {
console.error('[BackgroundSyncSetup] Failed to stop message listener:', err);
});
};
}, [mx]);
// Keep native background notifier informed of space → room grouping.
useEffect(() => {
const rooms: Record<
string,
{ groupId: string; groupName: string; roomName: string; kind: 'direct' | 'space' | 'home' }
> = {};
for (const room of mx.getRooms()) {
if (room.isSpaceRoom()) continue;
const roomId = room.roomId;
const roomName = room.name || roomId;
if (mDirects.has(roomId)) {
rooms[roomId] = {
groupId: NOTIF_GROUP_DIRECTS,
groupName: 'Direct messages',
roomName,
kind: 'direct',
};
continue;
}
const orphanParents = getOrphanParents(roomToParents, roomId);
if (orphanParents.length > 0) {
const parentSpace = guessPerfectParent(mx, roomId, orphanParents) ?? orphanParents[0];
const spaceRoom = mx.getRoom(parentSpace);
rooms[roomId] = {
groupId: parentSpace,
groupName: spaceRoom?.name || 'Space',
roomName,
kind: 'space',
};
} else {
rooms[roomId] = {
groupId: NOTIF_GROUP_HOME,
groupName: 'Home',
roomName,
kind: 'home',
};
}
}
void syncNotificationGroupMap(rooms);
}, [mx, mDirects, roomToParents]);
return null;
}
+127
View File
@@ -0,0 +1,127 @@
import { App } from '@capacitor/app';
import { Browser } from '@capacitor/browser';
import { isCapacitorNative } from './tauri';
const PROTOCOL_SCHEME = 'paarrot';
/**
* Converts a paarrot:// deep link into an in-app hash route.
* Supports:
* - Hash routes: paarrot://anything/#/login/server/
* - Path routes (SSO-safe): paarrot://android/login/server/?loginToken=...
* Preserves SSO loginToken from the URL query (Synapse inserts it before `#`).
*/
export function deepLinkToHashRoute(deepLink: string): string | null {
if (!deepLink) {
return null;
}
if (!deepLink.toLowerCase().startsWith(`${PROTOCOL_SCHEME}://`)) {
return null;
}
let hashRoute: string | null = null;
let loginToken: string | null = null;
try {
const parsed = new URL(deepLink);
loginToken = parsed.searchParams.get('loginToken');
if (parsed.hash && parsed.hash.length > 1) {
const hashValue = parsed.hash.slice(1);
hashRoute = hashValue.startsWith('/') ? hashValue : `/${hashValue}`;
} else if (parsed.pathname && parsed.pathname !== '/') {
// paarrot://android/login/... → /login/...
hashRoute = parsed.pathname;
if (parsed.search && parsed.search.length > 1) {
const params = new URLSearchParams(parsed.search);
params.delete('loginToken');
const rest = params.toString();
if (rest) {
hashRoute += `?${rest}`;
}
}
}
} catch {
const hashIndex = deepLink.indexOf('#');
if (hashIndex !== -1) {
const hashValue = deepLink.slice(hashIndex + 1);
if (hashValue) {
hashRoute = hashValue.startsWith('/') ? hashValue : `/${hashValue}`;
}
}
const match = deepLink.match(/[?&]loginToken=([^&#]+)/i);
if (match) {
try {
loginToken = decodeURIComponent(match[1]);
} catch {
loginToken = match[1];
}
}
}
if (loginToken) {
if (!hashRoute) {
hashRoute = '/';
}
const queryIndex = hashRoute.indexOf('?');
const pathPart = queryIndex === -1 ? hashRoute : hashRoute.slice(0, queryIndex);
const params = new URLSearchParams(queryIndex === -1 ? '' : hashRoute.slice(queryIndex + 1));
if (!params.has('loginToken')) {
params.set('loginToken', loginToken);
}
const query = params.toString();
hashRoute = query ? `${pathPart}?${query}` : pathPart;
}
return hashRoute;
}
async function applyDeepLink(deepLink: string): Promise<void> {
const hashRoute = deepLinkToHashRoute(deepLink);
if (!hashRoute) {
return;
}
try {
await Browser.close();
} catch {
// Browser may already be closed or never opened.
}
const nextHash = hashRoute.startsWith('/') ? `#${hashRoute}` : `#/${hashRoute}`;
if (window.location.hash === nextHash) {
// Force TokenLogin to re-run if we land on the same route again.
window.location.hash = '#/';
window.setTimeout(() => {
window.location.hash = nextHash;
}, 0);
return;
}
window.location.hash = nextHash;
}
/**
* Listen for paarrot:// SSO returns (and cold-start launch URLs) on Capacitor Android.
*/
export async function initAndroidDeepLinks(): Promise<void> {
if (!isCapacitorNative()) {
return;
}
try {
const launch = await App.getLaunchUrl();
if (launch?.url) {
await applyDeepLink(launch.url);
}
} catch (error) {
console.warn('[androidDeepLink] Failed to read launch URL:', error);
}
await App.addListener('appUrlOpen', ({ url }) => {
if (!url) return;
void applyDeepLink(url);
});
}
+12
View File
@@ -21,6 +21,18 @@ interface AndroidShareHandlerPlugin {
getPendingShare(): Promise<{ share: AndroidSharePayload | null }>;
/** Clears the last pending share payload after it has been consumed. */
clearPendingShare(): Promise<void>;
/** Save a base64 file to gallery / Downloads (MediaStore), or share-sheet fallback. */
saveFile(options: {
filename: string;
mimeType?: string;
base64: string;
}): Promise<{ saved: boolean; shared?: boolean; uri?: string }>;
/** Open the system share sheet for a base64 file. */
shareFile(options: {
filename: string;
mimeType?: string;
base64: string;
}): Promise<{ shared: boolean }>;
addListener(
eventName: 'shareReceived',
listenerFunc: (payload: AndroidSharePayload) => void
+266 -465
View File
@@ -1,518 +1,319 @@
import { Capacitor, registerPlugin, type PluginListenerHandle } from '@capacitor/core';
import type { IPusherRequest, MatrixClient } from 'matrix-js-sdk';
type UnifiedPushStatus = {
export type ListenerStatus = {
running: boolean;
endpoint: string;
instance: string;
registered: boolean;
distributor: string;
distributors: string[] | string;
};
type UnifiedPushEndpointEvent = {
endpoint: string;
previousEndpoint: string;
instance: string;
};
type UnifiedPushUnregisteredEvent = {
previousEndpoint: string;
instance: string;
};
type UnifiedPushRegistrationFailedEvent = {
reason: string;
instance: string;
listening: boolean;
batteryIgnored: boolean;
notificationsAllowed?: boolean;
error?: string;
};
interface MatrixBackgroundSyncPlugin {
/** Persist credentials and request UnifiedPush registration. */
start(options: {
homeserverUrl: string;
accessToken: string;
userId: string;
deviceId: string;
}): Promise<void>;
/** Trigger a one-shot fetch as if a push ping arrived. */
}): Promise<{ batteryIgnored?: boolean }>;
triggerPing(options: { reason?: string }): Promise<void>;
/** Re-open distributor setup flow and retry registration. */
requestDistributorSetup(): Promise<{ success: boolean }>;
/** Stop any in-flight fetch, clear credentials, and unregister UnifiedPush. */
stop(): Promise<void>;
/**
* Notify the service whether the app UI is visible.
* When foreground is true, the service suppresses native notifications
* because the JS layer handles them via LocalNotifications.
*/
setAppForeground(options: { foreground: boolean }): Promise<void>;
/** Returns fetch state and current UnifiedPush registration details. */
getStatus(): Promise<UnifiedPushStatus>;
addListener(
eventName: 'unifiedPushNewEndpoint',
listenerFunc: (event: UnifiedPushEndpointEvent) => void
): Promise<PluginListenerHandle>;
addListener(
eventName: 'unifiedPushUnregistered',
listenerFunc: (event: UnifiedPushUnregisteredEvent) => void
): Promise<PluginListenerHandle>;
addListener(
eventName: 'unifiedPushRegistrationFailed',
listenerFunc: (event: UnifiedPushRegistrationFailedEvent) => void
): Promise<PluginListenerHandle>;
getStatus(): Promise<ListenerStatus>;
requestBatteryExemption(): Promise<{ ignored: boolean }>;
getPendingNotificationNav(): Promise<NotificationNavTarget>;
clearRoomNotifications(options: { roomId: string }): Promise<void>;
setNotificationGroups(options: {
rooms: Record<string, { groupId: string; groupName: string; roomName: string; kind: string }>;
}): Promise<void>;
showNotification(options: NativeNotificationOptions): Promise<{ shown: boolean }>;
addListener?(
eventName: 'notificationOpened',
listener: (target: NotificationNavTarget) => void
): Promise<{ remove: () => void }>;
}
type StoredPusherState = {
endpoint: string;
appId: string;
type CapacitorGlobal = {
isNativePlatform?: () => boolean;
getPlatform?: () => string;
isPluginAvailable?: (name: string) => boolean;
registerPlugin?: <T>(name: string) => T;
nativePromise?: (plugin: string, method: string, options?: unknown) => Promise<unknown>;
Plugins?: Record<string, Partial<MatrixBackgroundSyncPlugin> | undefined>;
};
const MatrixBackgroundSync = registerPlugin<MatrixBackgroundSyncPlugin>('MatrixBackgroundSync');
const DEFAULT_UNIFIED_PUSH_GATEWAY = 'https://matrix.gateway.unifiedpush.org/_matrix/push/v1/notify';
const PUSHER_APP_ID_BASE = 'com.paarrot.app.android';
const PUSHER_STORAGE_PREFIX = 'paarrot.unifiedpush';
const PLUGIN = 'MatrixBackgroundSync';
const LEGACY_PUSHER_APP_ID = 'com.paarrot.app.android';
const LEGACY_PUSHER_STORAGE_PREFIX = 'paarrot.unifiedpush';
const capacitor = (): CapacitorGlobal | undefined =>
(window as typeof window & { Capacitor?: CapacitorGlobal }).Capacitor;
/** Returns true when the current platform is Android Capacitor. */
export const isBackgroundSyncSupported = (): boolean =>
Capacitor.isNativePlatform() && Capacitor.getPlatform() === 'android';
const getStoredPusherKey = (userId: string | null, deviceId: string | null): string =>
`${PUSHER_STORAGE_PREFIX}:${userId ?? 'unknown'}:${deviceId ?? 'unknown'}`;
const buildPusherAppId = (deviceId: string | null): string => {
const raw = deviceId ? `${PUSHER_APP_ID_BASE}.${deviceId}` : PUSHER_APP_ID_BASE;
return raw.length > 64 ? raw.slice(0, 64) : raw;
export const isBackgroundSyncSupported = (): boolean => {
const cap = capacitor();
return Boolean(cap?.isNativePlatform?.() && cap.getPlatform?.() === 'android');
};
const loadStoredPusherState = (
userId: string | null,
deviceId: string | null
): StoredPusherState | undefined => {
if (typeof window === 'undefined' || !window.localStorage) return undefined;
const raw = window.localStorage.getItem(getStoredPusherKey(userId, deviceId));
if (!raw) return undefined;
try {
return JSON.parse(raw) as StoredPusherState;
} catch {
return undefined;
const waitForBridge = async (tries = 50): Promise<CapacitorGlobal> => {
for (let i = 0; i < tries; i += 1) {
const cap = capacitor();
if (
cap?.isNativePlatform?.() &&
(cap.Plugins?.[PLUGIN] || cap.nativePromise || cap.registerPlugin)
) {
return cap;
}
await new Promise((resolve) => window.setTimeout(resolve, 100));
}
throw new Error('Capacitor bridge did not become ready');
};
const saveStoredPusherState = (
userId: string | null,
deviceId: string | null,
state: StoredPusherState
): void => {
if (typeof window === 'undefined' || !window.localStorage) return;
window.localStorage.setItem(getStoredPusherKey(userId, deviceId), JSON.stringify(state));
};
const clearStoredPusherState = (userId: string | null, deviceId: string | null): void => {
if (typeof window === 'undefined' || !window.localStorage) return;
window.localStorage.removeItem(getStoredPusherKey(userId, deviceId));
};
const normalizeDistributors = (raw: UnifiedPushStatus['distributors']): string[] => {
if (Array.isArray(raw)) return raw;
if (typeof raw !== 'string') return [];
const trimmed = raw.trim();
if (!trimmed || trimmed === '[]') return [];
if (trimmed.startsWith('[') && trimmed.endsWith(']')) {
return trimmed
.slice(1, -1)
.split(',')
.map((entry) => entry.trim())
.filter(Boolean);
/** Android injects plugins on Capacitor.Plugins — registerPlugin is often missing. */
const plugin = async (): Promise<MatrixBackgroundSyncPlugin> => {
const cap = await waitForBridge();
const existing = cap.Plugins?.[PLUGIN];
if (existing?.getStatus && existing.start) {
return existing as MatrixBackgroundSyncPlugin;
}
return [trimmed];
};
const resolveUnifiedPushGateway = async (endpoint: string): Promise<string> => {
try {
const discoveryUrl = new URL(endpoint);
discoveryUrl.pathname = '/_matrix/push/v1/notify';
discoveryUrl.search = '';
const response = await fetch(discoveryUrl.toString(), { method: 'GET' });
if (!response.ok) return DEFAULT_UNIFIED_PUSH_GATEWAY;
const body = (await response.json()) as {
gateway?: string;
unifiedpush?: { gateway?: string };
if (typeof cap.nativePromise === 'function') {
const call = <T>(method: string, options?: unknown) =>
cap.nativePromise!(PLUGIN, method, options ?? {}) as Promise<T>;
return {
start: (options) => call('start', options),
triggerPing: (options) => call('triggerPing', options),
stop: () => call('stop'),
setAppForeground: (options) => call('setAppForeground', options),
getStatus: () => call('getStatus'),
requestBatteryExemption: () => call('requestBatteryExemption'),
getPendingNotificationNav: () => call('getPendingNotificationNav'),
clearRoomNotifications: (options) => call('clearRoomNotifications', options),
setNotificationGroups: (options) => call('setNotificationGroups', options),
showNotification: (options) => call('showNotification', options),
};
}
if (body.gateway === 'matrix' || body.unifiedpush?.gateway === 'matrix') {
return discoveryUrl.toString();
if (cap.registerPlugin) {
return cap.registerPlugin<MatrixBackgroundSyncPlugin>(PLUGIN);
}
throw new Error('MatrixBackgroundSync is unavailable on this Capacitor bridge');
};
/** Keep Paarrot's native message listener running without a push distributor. */
export const startBackgroundSync = async (mx: MatrixClient): Promise<void> => {
if (!isBackgroundSyncSupported()) return;
const homeserverUrl = mx.getHomeserverUrl();
const accessToken = mx.getAccessToken();
const userId = mx.getUserId();
const deviceId = mx.getDeviceId();
if (!homeserverUrl || !accessToken || !userId) return;
const legacyAppId = `${LEGACY_PUSHER_APP_ID}${deviceId ? `.${deviceId}` : ''}`.slice(0, 64);
try {
const pushers = (await mx.getPushers())?.pushers ?? [];
for (const pusher of pushers) {
if (pusher.kind === 'http' && pusher.app_id === legacyAppId) {
await mx.setPusher({
pushkey: pusher.pushkey,
app_id: pusher.app_id,
kind: null,
} as unknown as IPusherRequest);
}
}
} catch (err) {
console.warn('[BackgroundSync] UnifiedPush gateway discovery failed:', err);
console.warn('[BackgroundSync] Failed to remove the previous UnifiedPush pusher:', err);
}
if (typeof window !== 'undefined' && window.localStorage) {
window.localStorage.removeItem(
`${LEGACY_PUSHER_STORAGE_PREFIX}:${userId}:${deviceId ?? 'unknown'}`
);
}
return DEFAULT_UNIFIED_PUSH_GATEWAY;
await (await plugin()).start({
homeserverUrl,
accessToken,
userId,
deviceId: deviceId ?? '',
});
};
class AndroidUnifiedPushManager {
private client: MatrixClient | undefined;
private listenerHandles: PluginListenerHandle[] = [];
private listenersReady = false;
private distributorSetupAttempted = false;
private distributorPromptShown = false;
/** Start native UnifiedPush registration and synchronize the Matrix pusher. */
async start(mx: MatrixClient): Promise<void> {
console.log('[BackgroundSync] start() called, platform:', Capacitor.getPlatform(), 'isNative:', Capacitor.isNativePlatform());
if (!isBackgroundSyncSupported()) {
console.log('[BackgroundSync] Background sync not supported on this platform');
return;
}
const homeserverUrl = mx.getHomeserverUrl();
const accessToken = mx.getAccessToken();
const userId = mx.getUserId();
const deviceId = mx.getDeviceId();
console.log('[BackgroundSync] Credentials check:', { userId, deviceId, hasToken: !!accessToken, hasUrl: !!homeserverUrl });
if (!homeserverUrl || !accessToken || !userId) {
console.warn('[BackgroundSync] Missing credentials, not starting');
return;
}
this.client = mx;
this.distributorSetupAttempted = false;
this.distributorPromptShown = false;
await this.ensureListeners();
try {
console.log('[BackgroundSync] Calling plugin.start()...');
await MatrixBackgroundSync.start({
homeserverUrl,
accessToken,
userId,
deviceId: deviceId ?? '',
});
console.log('[BackgroundSync] plugin.start() completed');
} catch (err) {
console.error('[BackgroundSync] plugin.start() failed:', err);
throw err;
}
await this.syncExistingEndpoint();
await this.ensureDistributorPromptFromStatus();
console.log('[BackgroundSync] UnifiedPush registration requested');
}
/** Stop native UnifiedPush integration and remove the Matrix pusher for this device. */
async stop(): Promise<void> {
if (!isBackgroundSyncSupported()) return;
const client = this.client;
if (client) {
const deviceId = client.getDeviceId();
const userId = client.getUserId();
const status = await this.safeGetStatus();
const stored = loadStoredPusherState(userId, deviceId);
const endpoint = status?.endpoint || stored?.endpoint;
const appId = stored?.appId ?? buildPusherAppId(deviceId);
if (endpoint) {
await this.removePusher(client, endpoint, appId);
}
clearStoredPusherState(userId, deviceId);
}
await MatrixBackgroundSync.stop();
await this.disposeListeners();
this.client = undefined;
console.log('[BackgroundSync] UnifiedPush stopped');
}
/** Update the Matrix pusher when a new native endpoint is published. */
private async handleNewEndpoint(event: UnifiedPushEndpointEvent): Promise<void> {
const client = this.client;
if (!client) return;
if (event.previousEndpoint) {
await this.removePusher(client, event.previousEndpoint);
}
await this.upsertPusher(client, event.endpoint);
}
/** Remove the Matrix pusher when UnifiedPush unregisters this instance. */
private async handleUnregistered(event: UnifiedPushUnregisteredEvent): Promise<void> {
const client = this.client;
if (!client) return;
const stored = loadStoredPusherState(client.getUserId(), client.getDeviceId());
const endpoint = event.previousEndpoint || stored?.endpoint;
const appId = stored?.appId ?? buildPusherAppId(client.getDeviceId());
if (endpoint) {
await this.removePusher(client, endpoint, appId);
}
clearStoredPusherState(client.getUserId(), client.getDeviceId());
}
/** Log native registration failures so the missing distributor path is visible. */
private handleRegistrationFailed(event: UnifiedPushRegistrationFailedEvent): void {
console.warn('[BackgroundSync] UnifiedPush registration failed:', event.reason);
if (event.reason !== 'ACTION_REQUIRED' || this.distributorSetupAttempted) {
return;
}
this.distributorSetupAttempted = true;
void this.tryRequestDistributorSetup();
}
/** Re-opens distributor selection once after ACTION_REQUIRED and logs actionable status. */
private async tryRequestDistributorSetup(): Promise<void> {
try {
const setupResult = await MatrixBackgroundSync.requestDistributorSetup();
console.warn('[BackgroundSync] requestDistributorSetup result:', setupResult);
const status = await this.safeGetStatus();
console.warn('[BackgroundSync] UnifiedPush status after setup attempt:', status);
const distributors = normalizeDistributors(status?.distributors ?? []);
if (distributors.length === 0) {
console.error(
'[BackgroundSync] No UnifiedPush distributor installed. Install one (for example ntfy) to enable Android background notifications.'
);
this.showNoDistributorPrompt();
}
} catch (err) {
console.warn('[BackgroundSync] requestDistributorSetup failed:', err);
}
}
/** Fallback check so users still get prompted even when ACTION_REQUIRED event is missed. */
private async ensureDistributorPromptFromStatus(): Promise<void> {
const status = await this.safeGetStatus();
if (!status) return;
const distributors = normalizeDistributors(status.distributors);
if (!status.registered && distributors.length === 0) {
console.error(
'[BackgroundSync] No UnifiedPush distributor installed. Install one (for example ntfy) to enable Android background notifications.'
);
this.showNoDistributorPrompt();
}
}
/** Show a one-time actionable prompt when no distributor app is installed. */
private showNoDistributorPrompt(): void {
if (this.distributorPromptShown) return;
this.distributorPromptShown = true;
const message =
'Android background notifications need a UnifiedPush distributor app. Install one (for example ntfy), then reopen Paarrot.';
const docsUrl = 'https://unifiedpush.org/users/distributors/';
if (typeof window === 'undefined') return;
try {
const openDocs = window.confirm(`${message}\n\nOpen distributor list now?`);
if (openDocs) {
window.open(docsUrl, '_blank', 'noopener,noreferrer');
}
} catch {
window.alert(message);
}
}
/** Install plugin listeners once for the active Matrix client. */
private async ensureListeners(): Promise<void> {
if (this.listenersReady) return;
this.listenerHandles = [
await MatrixBackgroundSync.addListener('unifiedPushNewEndpoint', (event) => {
void this.handleNewEndpoint(event).catch((err) => {
console.error('[BackgroundSync] handleNewEndpoint failed:', err);
});
}),
await MatrixBackgroundSync.addListener('unifiedPushUnregistered', (event) => {
void this.handleUnregistered(event);
}),
await MatrixBackgroundSync.addListener('unifiedPushRegistrationFailed', (event) => {
this.handleRegistrationFailed(event);
}),
];
this.listenersReady = true;
}
/** Remove all plugin listeners when the manager stops. */
private async disposeListeners(): Promise<void> {
await Promise.all(this.listenerHandles.map((handle) => handle.remove()));
this.listenerHandles = [];
this.listenersReady = false;
}
/** Reconcile an already-persisted native endpoint after app startup. */
private async syncExistingEndpoint(): Promise<void> {
const client = this.client;
if (!client) return;
const status = await this.safeGetStatus();
console.log('[BackgroundSync] Native status before pusher sync:', status);
if (status?.registered && status.endpoint) {
await this.upsertPusher(client, status.endpoint);
}
}
/** Create or refresh the Matrix HTTP pusher for the current device. */
private async upsertPusher(mx: MatrixClient, endpoint: string): Promise<void> {
const deviceId = mx.getDeviceId();
const userId = mx.getUserId();
const appId = buildPusherAppId(deviceId);
const gatewayUrl = await resolveUnifiedPushGateway(endpoint);
console.log('[BackgroundSync] Upserting Matrix pusher', {
appId,
endpoint,
gatewayUrl,
deviceId,
userId,
});
try {
await mx.setPusher({
kind: 'http',
app_id: appId,
pushkey: endpoint,
app_display_name: 'Paarrot',
device_display_name: deviceId ?? 'Android',
lang: 'en',
data: {
url: gatewayUrl,
format: 'event_id_only',
},
append: false,
device_id: deviceId ?? undefined,
} as unknown as IPusherRequest);
const pushers = (await mx.getPushers())?.pushers ?? [];
const thisPusher = pushers.find((p) => p.pushkey === endpoint && p.app_id === appId);
console.log('[BackgroundSync] Matrix pusher upserted successfully', {
totalPushers: pushers.length,
foundThisPusher: Boolean(thisPusher),
});
} catch (err) {
console.error('[BackgroundSync] Matrix pusher upsert failed:', err);
throw err;
}
saveStoredPusherState(userId, deviceId, { endpoint, appId });
}
/** Remove a previously-registered Matrix HTTP pusher for this device. */
private async removePusher(
mx: MatrixClient,
endpoint: string,
appId = buildPusherAppId(mx.getDeviceId())
): Promise<void> {
try {
await mx.setPusher({
pushkey: endpoint,
app_id: appId,
kind: null,
} as unknown as IPusherRequest);
} catch (err) {
console.warn('[BackgroundSync] Failed to remove UnifiedPush pusher:', err);
}
}
/** Read native registration state without failing the caller. */
private async safeGetStatus(): Promise<UnifiedPushStatus | undefined> {
try {
return await MatrixBackgroundSync.getStatus();
} catch (err) {
console.warn('[BackgroundSync] Failed to read UnifiedPush status:', err);
return undefined;
}
}
}
const unifiedPushManager = new AndroidUnifiedPushManager();
/** Start native UnifiedPush registration and sync the Matrix pusher. */
export const startBackgroundSync = async (mx: MatrixClient): Promise<void> => {
await unifiedPushManager.start(mx);
/** Stop the listener and drop saved credentials. Call this on logout. */
export const stopBackgroundSync = async (): Promise<void> => {
if (!isBackgroundSyncSupported()) return;
await (await plugin()).stop();
};
/**
* Manually triggers a one-shot native fetch.
* Useful for diagnostics and bridge testing.
*/
/** Ask the listener to sync now. */
export const triggerBackgroundSyncPing = async (reason?: string): Promise<void> => {
if (!isBackgroundSyncSupported()) return;
try {
await MatrixBackgroundSync.triggerPing({ reason });
} catch (err) {
console.warn('[BackgroundSync] triggerPing failed:', err);
}
await (await plugin()).triggerPing({ reason });
};
/** Stop UnifiedPush integration and remove the Matrix pusher for this session. */
export const stopBackgroundSync = async (): Promise<void> => {
await unifiedPushManager.stop();
};
/**
* Tells the native service whether the app UI is in the foreground.
* Call when document visibility changes so the service can suppress
* duplicate notifications while the JS layer is active.
* @param foreground true if the WebView UI is currently visible
*/
/** Tell the listener whether the chat UI is on screen. */
export const setAppForegroundState = async (foreground: boolean): Promise<void> => {
if (!isBackgroundSyncSupported()) return;
try {
await MatrixBackgroundSync.setAppForeground({ foreground });
} catch (err) {
console.warn('[BackgroundSync] setAppForeground failed:', err);
}
await (await plugin()).setAppForeground({ foreground });
};
/**
* Re-opens the UnifiedPush distributor selection dialog.
* Allows users to re-select or change their push notification distributor without terminal access.
* Useful when the current endpoint becomes unavailable.
*/
export const requestResetPushRegistration = async (): Promise<{ success: boolean }> => {
if (!isBackgroundSyncSupported()) {
console.warn('[BackgroundSync] Background sync not supported on this platform');
return { success: false };
}
try {
const result = await MatrixBackgroundSync.requestDistributorSetup();
console.log('[BackgroundSync] requestDistributorSetup completed:', result);
return result ?? { success: false };
} catch (err) {
console.error('[BackgroundSync] requestDistributorSetup failed:', err);
return { success: false };
}
/** Ask Android to leave the listener out of battery optimization. */
export const requestBatteryExemption = async (): Promise<{ ignored: boolean }> => {
if (!isBackgroundSyncSupported()) return { ignored: false };
return (await plugin()).requestBatteryExemption();
};
/** Returns the current native UnifiedPush status, or undefined if unavailable. */
export const getBackgroundSyncStatus = async (): Promise<UnifiedPushStatus | undefined> => {
/** Returns listener and battery-exemption state. */
export const getBackgroundSyncStatus = async (): Promise<ListenerStatus | undefined> => {
if (!isBackgroundSyncSupported()) return undefined;
try {
return await MatrixBackgroundSync.getStatus();
return await (await plugin()).getStatus();
} catch (err) {
const message = err instanceof Error ? err.message : String(err);
console.warn('[BackgroundSync] getStatus failed:', err);
return undefined;
return {
running: false,
listening: false,
batteryIgnored: false,
error: message,
};
}
};
export type NotificationNavTarget = {
path?: string | null;
roomId?: string | null;
};
export type NativeNotificationOptions = {
title?: string;
body?: string;
senderName?: string;
messageText?: string;
conversationTitle?: string;
path?: string;
roomId: string;
groupId: string;
groupName: string;
kind: string;
largeIconBase64?: string;
bigPictureBase64?: string;
};
/** Read a tray-tap target that opened the app before JS listeners attached. */
export const getPendingNotificationNav = async (): Promise<NotificationNavTarget | undefined> => {
if (!isBackgroundSyncSupported()) return undefined;
try {
const cap = await waitForBridge();
if (typeof cap.nativePromise === 'function') {
return (await cap.nativePromise(
PLUGIN,
'getPendingNotificationNav',
{}
)) as NotificationNavTarget;
}
const existing = cap.Plugins?.[PLUGIN] as
| { getPendingNotificationNav?: () => Promise<NotificationNavTarget> }
| undefined;
if (existing?.getPendingNotificationNav) {
return existing.getPendingNotificationNav();
}
} catch (err) {
console.warn('[BackgroundSync] getPendingNotificationNav failed:', err);
}
return undefined;
};
/** Subscribe to tray notification taps while the app is already running. */
export const subscribeNotificationOpened = async (
callback: (target: NotificationNavTarget) => void
): Promise<() => void> => {
if (!isBackgroundSyncSupported()) return () => undefined;
try {
const cap = await waitForBridge();
const existing = cap.Plugins?.[PLUGIN] as
| {
addListener?: (
event: string,
cb: (data: NotificationNavTarget) => void
) => Promise<{ remove: () => void }> | { remove: () => void };
}
| undefined;
const nativePlugin =
existing?.addListener
? existing
: cap.registerPlugin?.<MatrixBackgroundSyncPlugin>(PLUGIN);
if (!nativePlugin?.addListener) return () => undefined;
const handle = await nativePlugin.addListener('notificationOpened', callback);
return () => {
void handle.remove();
};
} catch (err) {
console.warn('[BackgroundSync] subscribeNotificationOpened failed:', err);
return () => undefined;
}
};
/** Dismiss native tray notifications for a room after it is opened / marked read. */
export const clearRoomNotifications = async (roomId: string): Promise<void> => {
if (!isBackgroundSyncSupported() || !roomId) return;
try {
const cap = await waitForBridge();
if (typeof cap.nativePromise === 'function') {
await cap.nativePromise(PLUGIN, 'clearRoomNotifications', { roomId });
return;
}
const existing = cap.Plugins?.[PLUGIN] as
| { clearRoomNotifications?: (o: { roomId: string }) => Promise<void> }
| undefined;
await existing?.clearRoomNotifications?.({ roomId });
} catch (err) {
console.warn('[BackgroundSync] clearRoomNotifications failed:', err);
}
};
/** Compatibility name used by the notification utility layer. */
export const clearNativeRoomNotifications = clearRoomNotifications;
/** Keep background notification grouping in sync with the active room list. */
export const syncNotificationGroupMap = async (
rooms: Record<string, { groupId: string; groupName: string; roomName: string; kind: string }>
): Promise<void> => {
if (!isBackgroundSyncSupported()) return;
try {
const cap = await waitForBridge();
if (typeof cap.nativePromise === 'function') {
await cap.nativePromise(PLUGIN, 'setNotificationGroups', { rooms });
return;
}
const existing = cap.Plugins?.[PLUGIN] as
| { setNotificationGroups?: (options: { rooms: typeof rooms }) => Promise<void> }
| undefined;
await existing?.setNotificationGroups?.({ rooms });
} catch (err) {
console.warn('[BackgroundSync] setNotificationGroups failed:', err);
}
};
/** Post a notification using Android's native NotificationManager. */
export const showNativeNotification = async (
options: NativeNotificationOptions
): Promise<boolean> => {
if (!isBackgroundSyncSupported()) return false;
try {
const cap = await waitForBridge();
if (typeof cap.nativePromise === 'function') {
const result = (await cap.nativePromise(PLUGIN, 'showNotification', options)) as {
shown?: boolean;
};
return result.shown === true;
}
const existing = cap.Plugins?.[PLUGIN] as
| { showNotification?: (options: NativeNotificationOptions) => Promise<{ shown: boolean }> }
| undefined;
return (await existing?.showNotification?.(options))?.shown === true;
} catch (err) {
console.warn('[BackgroundSync] showNotification failed:', err);
return false;
}
};
@@ -0,0 +1,67 @@
import { Capacitor, registerPlugin } from '@capacitor/core';
import { registerMediaSaver } from './saveMedia';
interface AndroidShareHandlerSavePlugin {
saveFile(options: {
filename: string;
mimeType?: string;
base64: string;
}): Promise<{ saved: boolean; shared?: boolean; uri?: string }>;
}
const AndroidShareHandler = registerPlugin<AndroidShareHandlerSavePlugin>('AndroidShareHandler');
const blobToBase64 = (blob: Blob): Promise<string> =>
new Promise((resolve, reject) => {
const reader = new FileReader();
reader.onload = () => {
const result = reader.result;
if (typeof result !== 'string') {
reject(new Error('Failed to read blob as base64'));
return;
}
resolve(result.includes(',') ? result.split(',')[1] : result);
};
reader.onerror = () => reject(reader.error ?? new Error('FileReader failed'));
reader.readAsDataURL(blob);
});
const guessMimeFromName = (filename: string): string | undefined => {
const ext = filename.split('.').pop()?.toLowerCase();
if (!ext) return undefined;
const map: Record<string, string> = {
jpg: 'image/jpeg',
jpeg: 'image/jpeg',
png: 'image/png',
gif: 'image/gif',
webp: 'image/webp',
bmp: 'image/bmp',
svg: 'image/svg+xml',
mp4: 'video/mp4',
webm: 'video/webm',
mkv: 'video/x-matroska',
mov: 'video/quicktime',
mp3: 'audio/mpeg',
ogg: 'audio/ogg',
wav: 'audio/wav',
pdf: 'application/pdf',
txt: 'text/plain',
};
return map[ext];
};
/**
* Wire Capacitor Android MediaStore saves into the core saveMedia helpers.
* Call once at app startup from the mobile overlay entry.
*/
export function registerAndroidMediaSaver(): void {
if (!(Capacitor.isNativePlatform() && Capacitor.getPlatform() === 'android')) {
return;
}
registerMediaSaver(async (blob, filename) => {
const base64 = await blobToBase64(blob);
const mimeType = blob.type || guessMimeFromName(filename) || 'application/octet-stream';
await AndroidShareHandler.saveFile({ filename, mimeType, base64 });
});
}
+386 -39
View File
@@ -4,7 +4,7 @@
*/
export const openExternalUrl = async (url: string): Promise<void> => {
console.log('[openExternalUrl] called with:', url);
// Use Electron's shell.openExternal if in Electron
if (isElectron()) {
try {
@@ -18,7 +18,20 @@ export const openExternalUrl = async (url: string): Promise<void> => {
console.warn('[openExternalUrl] Electron shell.openExternal failed:', err);
}
}
// Capacitor: SSO (and other handoffs) need Chrome Custom Tabs / in-app Browser
// so paarrot:// redirects return into the app instead of a blank external tab.
if (isCapacitorNative()) {
try {
const { Browser } = await import('@capacitor/browser');
await Browser.open({ url, presentationStyle: 'popover' });
console.log('[openExternalUrl] Capacitor Browser.open succeeded');
return;
} catch (err) {
console.warn('[openExternalUrl] Capacitor Browser.open failed:', err);
}
}
// Use Tauri for actual Tauri builds
if (isTauri() && !isElectron()) {
try {
@@ -30,7 +43,7 @@ export const openExternalUrl = async (url: string): Promise<void> => {
return;
} catch (pluginErr) {
console.warn('[openExternalUrl] Tauri opener plugin failed:', pluginErr);
// Fallback: try the custom command (useful if plugin fails due to ACL)
try {
console.log('[openExternalUrl] trying Tauri invoke command fallback...');
@@ -43,7 +56,7 @@ export const openExternalUrl = async (url: string): Promise<void> => {
}
}
}
console.log('[openExternalUrl] falling back to window.open');
window.open(url, '_blank');
};
@@ -207,6 +220,36 @@ export const setupNotificationTapListener = async (onTap: (path: string) => void
} catch (err) {
console.warn('Failed to set up Capacitor notification tap listener:', err);
}
// Native NotificationManager posts (MatrixBackgroundSync.showNotification) open the
// Activity with extras — LocalNotifications never sees those taps.
try {
const {
getPendingNotificationNav,
subscribeNotificationOpened,
} = await import('./backgroundSync');
const deliver = (path?: string | null, roomId?: string | null) => {
if (path && notificationTapCallback) {
notificationTapCallback(path);
return;
}
if (roomId && notificationTapCallback) {
// Encode a synthetic marker path that ClientNonUIFeatures can resolve.
notificationTapCallback(`__room__:${roomId}`);
}
};
const pending = await getPendingNotificationNav();
deliver(pending?.path, pending?.roomId);
await subscribeNotificationOpened((event) => {
void focusWindow();
deliver(event.path, event.roomId);
});
} catch (err) {
console.warn('Failed to set up native notification open listener:', err);
}
}
};
@@ -351,24 +394,7 @@ const ensureNotificationChannel = async (): Promise<void> => {
};
const ensureCapacitorNotificationChannel = async (): Promise<void> => {
if (notificationChannelCreated || !isAndroid()) return;
try {
const { LocalNotifications } = await import('@capacitor/local-notifications');
await LocalNotifications.createChannel({
id: 'messages',
name: 'Messages',
description: 'Message notifications from Matrix',
importance: 5,
sound: 'default',
visibility: 1,
vibration: true,
lights: true,
});
notificationChannelCreated = true;
} catch (err) {
console.warn('Failed to create Capacitor notification channel:', err);
}
await ensureCapacitorNotificationChannels();
};
/**
@@ -422,6 +448,225 @@ export const getSystemNotificationPermissionState = async (): Promise<Permission
return 'denied';
};
/** Foreground sync status notification — must not collide with room message IDs. */
const ANDROID_STATUS_NOTIFICATION_ID = 1001;
/** Android notification group keys for rooms outside a space. */
export const NOTIF_GROUP_DIRECTS = 'paarrot_directs';
export const NOTIF_GROUP_HOME = 'paarrot_home';
/** Capacitor / native channel ids (under the Paarrot app). */
export const NOTIF_CHANNEL_DIRECTS = 'messages_directs';
export const NOTIF_CHANNEL_SPACES = 'messages_spaces';
export const NOTIF_CHANNEL_HOME = 'messages_home';
/** Legacy channel — kept so older installs still receive. */
export const NOTIF_CHANNEL_MESSAGES_LEGACY = 'messages';
export type NotificationGroupKind = 'direct' | 'space' | 'home';
export type NotificationGroupInfo = {
groupId: string;
groupName: string;
kind: NotificationGroupKind;
roomName?: string;
};
/**
* Stable Android notification id for a Matrix room.
* Re-using the same id replaces the previous tray entry instead of stacking.
*/
export const notificationIdForRoom = (roomId: string): number => {
let hash = 0;
for (let i = 0; i < roomId.length; i += 1) {
hash = (hash << 5) - hash + roomId.charCodeAt(i);
hash |= 0;
}
let id = Math.abs(hash) % 2147483647;
if (id === 0 || id === ANDROID_STATUS_NOTIFICATION_ID) {
id = ANDROID_STATUS_NOTIFICATION_ID + 1;
}
return id;
};
/** Stable id for a space/group summary notification. */
export const notificationIdForGroupSummary = (groupId: string): number =>
notificationIdForRoom(`summary:${groupId}`);
const channelIdForKind = (kind: NotificationGroupKind): string => {
switch (kind) {
case 'direct':
return NOTIF_CHANNEL_DIRECTS;
case 'space':
return NOTIF_CHANNEL_SPACES;
default:
return NOTIF_CHANNEL_HOME;
}
};
const ensureCapacitorNotificationChannels = async (): Promise<void> => {
if (!isAndroid()) return;
try {
const { LocalNotifications } = await import('@capacitor/local-notifications');
const channels: Array<{
id: string;
name: string;
description: string;
}> = [
{
id: NOTIF_CHANNEL_DIRECTS,
name: 'Direct messages',
description: 'One-to-one Matrix conversations',
},
{
id: NOTIF_CHANNEL_SPACES,
name: 'Spaces',
description: 'Messages from rooms inside Spaces',
},
{
id: NOTIF_CHANNEL_HOME,
name: 'Other rooms',
description: 'Rooms that are not in a Space',
},
{
id: NOTIF_CHANNEL_MESSAGES_LEGACY,
name: 'Messages',
description: 'Legacy message channel',
},
];
await Promise.all(
channels.map((channel) =>
LocalNotifications.createChannel({
id: channel.id,
name: channel.name,
description: channel.description,
importance: 5,
sound: 'default',
visibility: 1,
vibration: true,
lights: true,
})
)
);
notificationChannelCreated = true;
} catch (err) {
console.warn('Failed to create Capacitor notification channels:', err);
}
};
const notificationBelongsToRoom = (
notification: { id?: number; extra?: Record<string, unknown> },
roomId: string
): boolean => {
if (notification.id === notificationIdForRoom(roomId)) return true;
const extra = notification.extra;
if (!extra || typeof extra !== 'object') return false;
if (extra.roomId === roomId) return true;
const path = extra.path;
if (typeof path === 'string') {
return path.includes(encodeURIComponent(roomId)) || path.includes(roomId);
}
return false;
};
const clearCapacitorGroupSummaryIfEmpty = async (
LocalNotifications: {
getDeliveredNotifications: () => Promise<{ notifications: Array<{ id?: number; extra?: Record<string, unknown>; group?: string }> }>;
cancel: (opts: { notifications: Array<{ id: number }> }) => Promise<void>;
removeDeliveredNotifications: (opts: { notifications: unknown[] }) => Promise<void>;
},
groupId: string
): Promise<void> => {
const summaryId = notificationIdForGroupSummary(groupId);
const delivered = await LocalNotifications.getDeliveredNotifications().catch(() => null);
if (!delivered?.notifications) return;
const siblings = delivered.notifications.filter((n) => {
if (n.id === summaryId) return false;
if (n.group === groupId) return true;
return n.extra?.groupId === groupId;
});
if (siblings.length > 0) return;
await LocalNotifications.cancel({ notifications: [{ id: summaryId }] }).catch(() => undefined);
const summary = delivered.notifications.find((n) => n.id === summaryId);
if (summary) {
await LocalNotifications.removeDeliveredNotifications({
notifications: [summary],
}).catch(() => undefined);
}
};
/**
* Dismiss system notifications tied to a room (after mark-as-read / receipt).
* Clears Capacitor LocalNotifications and native MatrixSyncService tray entries.
* Also drops the space/group summary when no child notifications remain.
*/
export const clearNotificationsForRoom = async (roomId: string): Promise<void> => {
if (!roomId) return;
if (isCapacitorNative()) {
try {
const { LocalNotifications } = await import('@capacitor/local-notifications');
const id = notificationIdForRoom(roomId);
const deliveredBefore = await LocalNotifications.getDeliveredNotifications().catch(() => null);
const roomNotif = deliveredBefore?.notifications?.find((n: { id?: number; extra?: Record<string, unknown> }) =>
notificationBelongsToRoom(n, roomId)
);
const groupId =
(typeof roomNotif?.extra?.groupId === 'string' && roomNotif.extra.groupId) ||
(typeof (roomNotif as { group?: string } | undefined)?.group === 'string'
? (roomNotif as { group?: string }).group
: undefined);
await LocalNotifications.cancel({ notifications: [{ id }] }).catch(() => undefined);
if (deliveredBefore?.notifications?.length) {
const matching = deliveredBefore.notifications.filter((n: { id?: number; extra?: Record<string, unknown> }) =>
notificationBelongsToRoom(n, roomId)
);
if (matching.length > 0) {
await LocalNotifications.removeDeliveredNotifications({
notifications: matching,
}).catch(() => undefined);
}
}
if (groupId) {
await clearCapacitorGroupSummaryIfEmpty(LocalNotifications, groupId);
}
} catch (err) {
console.warn('Failed to clear Capacitor notifications for room:', err);
}
try {
const { clearNativeRoomNotifications } = await import('./backgroundSync');
await clearNativeRoomNotifications(roomId);
} catch (err) {
console.warn('Failed to clear native room notifications:', err);
}
return;
}
if (isTauri() && !isElectron()) {
try {
const { cancel, removeActive } = await import('@tauri-apps/plugin-notification');
const id = notificationIdForRoom(roomId);
if (typeof cancel === 'function') {
await cancel([id]).catch(() => undefined);
}
if (typeof removeActive === 'function') {
await removeActive([{ id }]).catch(() => undefined);
}
} catch (err) {
console.warn('Failed to clear Tauri notifications for room:', err);
}
}
};
/**
* Send a notification using Tauri's notification plugin
* Falls back to browser Notification API if not in Tauri
@@ -430,10 +675,39 @@ export const sendNotification = async (options: {
title: string;
body: string;
icon?: string;
iconBase64?: string;
bigPictureBase64?: string;
senderName?: string;
messageText?: string;
conversationTitle?: string;
path?: string;
roomId?: string;
group?: NotificationGroupInfo;
onClick?: () => void;
}): Promise<void> => {
const { title, body, icon, path, onClick } = options;
const {
title,
body,
icon,
iconBase64,
bigPictureBase64,
senderName,
messageText,
conversationTitle,
path,
roomId,
group,
onClick,
} = options;
const extra = {
...(path ? { path } : {}),
...(roomId ? { roomId } : {}),
...(group?.groupId ? { groupId: group.groupId, groupName: group.groupName, groupKind: group.kind } : {}),
};
const hasExtra = Object.keys(extra).length > 0;
const channelId = group ? channelIdForKind(group.kind) : NOTIF_CHANNEL_HOME;
const groupId = group?.groupId;
const groupName = group?.groupName;
// Use Electron's native notification API if in Electron
if (isElectron()) {
@@ -475,11 +749,27 @@ export const sendNotification = async (options: {
await tauriSendNotification({
title,
body,
// Stable per-room id replaces prior tray entry instead of stacking
id: roomId ? notificationIdForRoom(roomId) : undefined,
// Use the channel on Android
channelId: isAndroid() ? 'messages' : undefined,
// Store path in extra data for notification tap handling
extra: path ? { path } : undefined,
channelId: isAndroid() ? channelId : undefined,
group: groupId,
icon,
// Store path/roomId in extra data for tap handling + clear-on-read
extra: hasExtra ? extra : undefined,
});
if (isAndroid() && groupId && groupName) {
await tauriSendNotification({
title: groupName,
body: 'New messages',
id: notificationIdForGroupSummary(groupId),
channelId,
group: groupId,
groupSummary: true,
extra: { groupId, groupName, isGroupSummary: true },
}).catch(() => undefined);
}
}
return;
} catch (err) {
@@ -488,6 +778,31 @@ export const sendNotification = async (options: {
}
if (isCapacitorNative()) {
// Prefer native NotificationManager so we can set dynamic/authenticated avatars.
// Capacitor LocalNotifications only supports drawable resource largeIcon names.
if (roomId && groupId && groupName && group) {
try {
const { showNativeNotification } = await import('./backgroundSync');
const shown = await showNativeNotification({
title,
body,
senderName: senderName ?? title,
messageText: messageText ?? body,
conversationTitle,
path,
roomId,
groupId,
groupName,
kind: group.kind,
largeIconBase64: iconBase64,
bigPictureBase64,
});
if (shown) return;
} catch (err) {
console.warn('Native showNotification failed, falling back to LocalNotifications:', err);
}
}
try {
const { LocalNotifications } = await import('@capacitor/local-notifications');
let perm = await LocalNotifications.checkPermissions();
@@ -496,21 +811,53 @@ export const sendNotification = async (options: {
}
if (perm.display === 'granted') {
await ensureCapacitorNotificationChannel();
await ensureCapacitorNotificationChannels();
// One notification per room: same id updates the existing tray entry.
const id = roomId
? notificationIdForRoom(roomId)
: Math.floor(Date.now() % 2147483647);
const roomNotification: Record<string, unknown> = {
id,
title,
body,
channelId: isAndroid() ? channelId : undefined,
smallIcon: isAndroid() ? ANDROID_NOTIFICATION_SMALL_ICON : undefined,
iconColor: isAndroid() ? ANDROID_NOTIFICATION_ICON_COLOR : undefined,
extra: hasExtra ? extra : undefined,
threadIdentifier: groupId,
};
if (isAndroid() && groupId) {
roomNotification.group = groupId;
if (groupName) {
roomNotification.summaryText = groupName;
}
if (group?.roomName && group.roomName !== title) {
roomNotification.largeBody = body;
}
}
const notifications: Array<Record<string, unknown>> = [roomNotification];
// Nest rooms under a space / Directs / Home summary in the shade.
if (isAndroid() && groupId && groupName) {
notifications.push({
id: notificationIdForGroupSummary(groupId),
title: groupName,
body: 'New messages',
channelId,
smallIcon: ANDROID_NOTIFICATION_SMALL_ICON,
iconColor: ANDROID_NOTIFICATION_ICON_COLOR,
group: groupId,
groupSummary: true,
extra: { groupId, groupName, isGroupSummary: true },
});
}
const id = Math.floor(Date.now() % 2147483647);
await LocalNotifications.schedule({
notifications: [
{
id,
title,
body,
channelId: isAndroid() ? 'messages' : undefined,
smallIcon: isAndroid() ? ANDROID_NOTIFICATION_SMALL_ICON : undefined,
iconColor: isAndroid() ? ANDROID_NOTIFICATION_ICON_COLOR : undefined,
extra: path ? { path } : undefined,
},
],
notifications: notifications as any,
});
}
return;
+8
View File
@@ -16,6 +16,8 @@ import { trimTrailingSlash } from './app/utils/common';
import App from './app/pages/App';
import { applySafeAreaInsets, isTauri } from './app/utils/tauri';
import { enableViewTransitionsForNavigation } from './app/utils/viewTransitions';
import { initAndroidDeepLinks } from './app/utils/androidDeepLink';
import { registerAndroidMediaSaver } from './app/utils/registerAndroidMediaSaver';
// import i18n (needs to be bundled ;))
import './app/i18n';
@@ -28,6 +30,12 @@ applySafeAreaInsets();
// Enable View Transitions API for smooth navigation
enableViewTransitionsForNavigation();
// Capacitor: paarrot:// SSO return closes Custom Tabs and lands on loginToken
void initAndroidDeepLinks();
// Capacitor Android: MediaStore saves for images / videos / files
registerAndroidMediaSaver();
// Register Service Worker
if ('serviceWorker' in navigator) {
const swUrl =
+22 -2
View File
@@ -1,15 +1,17 @@
{
"name": "paarrot",
"version": "4.11.121",
"version": "4.11.150",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "paarrot",
"version": "4.11.121",
"version": "4.11.150",
"license": "AGPL-3.0-only",
"dependencies": {
"@capacitor/android": "8.3.0",
"@capacitor/app": "8.0.1",
"@capacitor/browser": "8.0.1",
"@capacitor/cli": "8.3.0",
"@capacitor/core": "8.3.0",
"@capacitor/local-notifications": "8.0.2",
@@ -33,6 +35,24 @@
"@capacitor/core": "^8.3.0"
}
},
"node_modules/@capacitor/app": {
"version": "8.0.1",
"resolved": "https://registry.npmjs.org/@capacitor/app/-/app-8.0.1.tgz",
"integrity": "sha512-yeG3yyA0ETKqvgqexwHMBlmVOF13A1hRXzv/km0Ptv5TrNIZvZJK4MTI3uiqvnbHrzoJGP5DwWAjEXEfi90v3Q==",
"license": "MIT",
"peerDependencies": {
"@capacitor/core": ">=8.0.0"
}
},
"node_modules/@capacitor/browser": {
"version": "8.0.1",
"resolved": "https://registry.npmjs.org/@capacitor/browser/-/browser-8.0.1.tgz",
"integrity": "sha512-cCEYK9DGJvamfCKOh95QP+VafApblySDR/eodOcl1Qt+d/Y+NNPzc8NYm/dztQlRf3aMLJ7ne1HrRCfu2UOMnw==",
"license": "MIT",
"peerDependencies": {
"@capacitor/core": ">=8.0.0"
}
},
"node_modules/@capacitor/cli": {
"version": "8.3.0",
"resolved": "https://registry.npmjs.org/@capacitor/cli/-/cli-8.3.0.tgz",
+4 -1
View File
@@ -1,12 +1,13 @@
{
"name": "paarrot",
"version": "4.11.133",
"version": "4.11.190",
"description": "Paarrot - A Matrix client based on Cinny",
"engines": {
"node": ">=18.0.0"
},
"scripts": {
"apply-overlay": "node scripts/apply-overlay.mjs",
"push": "bash scripts/push.sh",
"android:prepare": "cd cinny && npm run build && cd .. && npx cap sync android",
"android:open": "npx cap open android",
"android:run": "npx cap run android",
@@ -23,6 +24,8 @@
"license": "AGPL-3.0-only",
"dependencies": {
"@capacitor/android": "8.3.0",
"@capacitor/app": "8.0.1",
"@capacitor/browser": "8.0.1",
"@capacitor/cli": "8.3.0",
"@capacitor/core": "8.3.0",
"@capacitor/local-notifications": "8.0.2",
+2 -1
View File
@@ -33,7 +33,8 @@ if (cinnyStatus.trim()) {
// Ensure android/ junction is excluded from the cinny git view — otherwise
// `git stash -u` would traverse the junction into the root android/ directory
// and delete files there when the stash is created.
const cinnyExclude = join(CINNY, '.git', 'info', 'exclude');
const gitDir = resolve(CINNY, execSync('git rev-parse --git-dir', { cwd: CINNY, encoding: 'utf8' }).trim());
const cinnyExclude = join(gitDir, 'info', 'exclude');
const excludeContent = existsSync(cinnyExclude) ? readFileSync(cinnyExclude, 'utf8') : '';
if (!excludeContent.includes('android/')) {
writeFileSync(cinnyExclude, excludeContent + (excludeContent.endsWith('\n') || !excludeContent ? '' : '\n') + 'android/\n', 'utf8');
+197
View File
@@ -0,0 +1,197 @@
#!/usr/bin/env bash
# Commit working changes, rebase onto the tracked remote branch, and push.
# Stashes leftover dirty files (common: cinny submodule pointer, gradlew +x)
# around the pull/push so they don't block rebase.
#
# Usage:
# scripts/push.sh -m "commit message" [path ...]
# scripts/push.sh "commit message" [path ...]
#
# If no paths are given:
# - uses already-staged files, or
# - auto-stages modified tracked files + overlay/android/scripts/config changes
# (skips cinny submodule + android/gradlew unless -a)
#
# Flags:
# -m MSG Commit message
# -a Include noisy paths (cinny, android/gradlew) when auto-staging
# -n Dry run: show what would be committed, then exit
# -h Help
set -euo pipefail
ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
cd "$ROOT"
MSG=""
INCLUDE_NOISE=0
DRY_RUN=0
PATHS=()
STAGED_PATHS=()
NOISE_PATHS=(
"cinny"
"android/gradlew"
)
usage() {
awk '
NR == 1 { next }
/^#/ { sub(/^# ?/, ""); print; next }
{ exit }
' "$0"
exit "${1:-0}"
}
is_noise() {
local p="$1"
for n in "${NOISE_PATHS[@]}"; do
[[ "$p" == "$n" || "$p" == "./$n" ]] && return 0
done
return 1
}
should_autostage() {
local p="$1"
case "$p" in
overlay/*|android/*|scripts/*|package.json|package-lock.json|.gitea/*|config.json|capacitor.config.json)
return 0
;;
esac
# Modified tracked files outside those dirs are fine; skip random untracked junk.
git ls-files --error-unmatch -- "$p" >/dev/null 2>&1
}
while [[ $# -gt 0 ]]; do
case "$1" in
-m)
[[ $# -ge 2 ]] || { echo "error: -m needs a message" >&2; exit 1; }
MSG="$2"
shift 2
;;
-a)
INCLUDE_NOISE=1
shift
;;
-n)
DRY_RUN=1
shift
;;
-h|--help)
usage 0
;;
--)
shift
PATHS+=("$@")
break
;;
-*)
echo "error: unknown flag: $1" >&2
usage 1
;;
*)
if [[ -z "$MSG" ]]; then
MSG="$1"
else
PATHS+=("$1")
fi
shift
;;
esac
done
if [[ -z "$MSG" ]]; then
echo "error: commit message required" >&2
usage 1
fi
if ! git rev-parse --is-inside-work-tree >/dev/null 2>&1; then
echo "error: not a git repo" >&2
exit 1
fi
BRANCH="$(git rev-parse --abbrev-ref HEAD)"
if [[ "$BRANCH" == "HEAD" ]]; then
echo "error: detached HEAD — check out a branch first" >&2
exit 1
fi
REMOTE="$(git rev-parse --abbrev-ref --symbolic-full-name @{u} 2>/dev/null || true)"
if [[ -n "$REMOTE" ]]; then
REMOTE_NAME="${REMOTE%%/*}"
REMOTE_BRANCH="${REMOTE#*/}"
else
REMOTE_NAME="origin"
REMOTE_BRANCH="$BRANCH"
fi
if [[ ${#PATHS[@]} -gt 0 ]]; then
STAGED_PATHS=("${PATHS[@]}")
git add -- "${STAGED_PATHS[@]}"
elif git diff --cached --quiet; then
mapfile -t candidates < <({
git diff --name-only --diff-filter=ACMRD
git ls-files --others --exclude-standard
} | awk 'NF && !seen[$0]++')
for p in "${candidates[@]}"; do
[[ -z "$p" ]] && continue
if [[ "$INCLUDE_NOISE" -eq 0 ]] && is_noise "$p"; then
continue
fi
if should_autostage "$p"; then
STAGED_PATHS+=("$p")
fi
done
if [[ ${#STAGED_PATHS[@]} -eq 0 ]]; then
echo "error: nothing to commit (pass paths, or stage files first)" >&2
git status -sb
exit 1
fi
git add -- "${STAGED_PATHS[@]}"
fi
if git diff --cached --quiet; then
echo "error: nothing staged to commit" >&2
git status -sb
exit 1
fi
echo "==> branch $BRANCH (tracking ${REMOTE_NAME}/${REMOTE_BRANCH})"
echo "==> staged:"
git diff --cached --stat
if [[ "$DRY_RUN" -eq 1 ]]; then
if [[ ${#STAGED_PATHS[@]} -gt 0 ]]; then
git reset -q HEAD -- "${STAGED_PATHS[@]}"
fi
echo "==> dry run; not committing or pushing"
exit 0
fi
STASHED=0
if [[ -n "$(git diff --name-only)" || -n "$(git ls-files --others --exclude-standard)" ]]; then
echo "==> stashing leftover dirty files"
git stash push --keep-index -u -m "push.sh leftover before ${BRANCH} push"
STASHED=1
fi
echo "==> commit"
git commit -m "$MSG"
echo "==> pull --rebase ${REMOTE_NAME}/${REMOTE_BRANCH}"
git pull --rebase "$REMOTE_NAME" "$REMOTE_BRANCH"
echo "==> push ${REMOTE_NAME} HEAD"
git push "$REMOTE_NAME" HEAD
if [[ "$STASHED" -eq 1 ]]; then
echo "==> restoring stash"
git stash pop
fi
echo "==> done"
git status -sb
git log -1 --oneline