Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3067b88ecc | ||
|
|
c6e9c82ae5 | ||
|
|
3787b55ca5 | ||
|
|
1f16f5dd44 | ||
|
|
e7cfb3dbd9 | ||
|
|
b21e74307e | ||
|
|
aebf253226 | ||
|
|
b7f354cd12 | ||
|
|
5f93ad815e | ||
|
|
39945c5e99 | ||
|
|
9be4ee4225 | ||
|
|
8c20c3d3a6 | ||
|
|
9b97fb8c32 | ||
|
|
cef9f28dfd | ||
|
|
96d5ae40e1 | ||
|
|
8f64937367 | ||
|
|
441de85b82 | ||
|
|
7277ecf589 | ||
|
|
2a8cc22ff9 | ||
|
|
72c933ca61 | ||
|
|
68d834cd72 | ||
|
|
e6adb35e5b | ||
|
|
d03e9493f0 | ||
|
|
dc01018105 | ||
|
|
8efd06d2b5 | ||
|
|
ac6321aa3e | ||
|
|
e54429fa3b | ||
|
|
47f6e5a890 | ||
|
|
dd89b87aea | ||
|
|
d47e42401c | ||
|
|
39511a3224 | ||
|
|
1b7bbe4b8a | ||
|
|
00c221a805 | ||
|
|
b37189e798 | ||
|
|
4b3c1042fc | ||
|
|
2856d1f107 | ||
|
|
6ed5417ba1 | ||
|
|
43212d3cdc | ||
|
|
ff3bcd91f1 | ||
|
|
7a1ff2e11d | ||
|
|
d0802e96d9 | ||
|
|
04caae7725 | ||
|
|
230418ca76 | ||
|
|
0270e46f4b | ||
|
|
a4593f723b | ||
|
|
58926a4a05 | ||
|
|
a831c0612b | ||
|
|
04798614fb | ||
|
|
fc12cb3467 | ||
|
|
d00ea1e80b | ||
|
|
0867048106 | ||
|
|
6d90f5f716 | ||
|
|
beb5442a9a | ||
|
|
58725ea57f | ||
|
|
e68d348355 | ||
|
|
eb8cea132e | ||
|
|
5da90f708d | ||
|
|
492c93400c | ||
|
|
2fa800e4d6 | ||
|
|
e817b4e608 | ||
|
|
b1b2d916fe | ||
|
|
28430b6f2e | ||
|
|
0bbc371603 | ||
|
|
aa86414532 | ||
|
|
83c42d7985 | ||
|
|
898e674160 | ||
|
|
0133505baf | ||
|
|
0ca65c5a13 | ||
|
|
ec2c7634bb | ||
|
|
9a4bb60942 | ||
|
|
6b35927612 | ||
|
|
aada77f30f | ||
|
|
bb768911ef | ||
|
|
a1c6015772 | ||
|
|
d7d7d183c5 | ||
|
|
a5ddd10ff4 | ||
|
|
2921d3a547 | ||
|
|
2be4c66b4a | ||
|
|
f180f4ab7c | ||
|
|
b1167c3eb6 | ||
|
|
16bdf92f77 | ||
|
|
2ebe97c5a4 | ||
|
|
1aef7812a1 | ||
|
|
4f61a31f28 | ||
|
|
491a5845f0 | ||
|
|
bd25ce8e1d | ||
|
|
a5d44e191b | ||
|
|
5f4bf191fc | ||
|
|
cfcec87cd9 | ||
|
|
2c9bcca344 | ||
|
|
9bb7adafd0 | ||
|
|
c9c7bdb48d | ||
|
|
f3d4dcb67e | ||
|
|
a744e36fb1 | ||
|
|
725b3467d3 | ||
|
|
c28b786948 | ||
|
|
19d85dbb2d | ||
|
|
fbff6b9738 | ||
|
|
52e0fddcf1 | ||
|
|
2ed3b0e9c8 | ||
|
|
5f7af04a57 | ||
|
|
62b9c48fa1 | ||
|
|
19a46c4d95 | ||
|
|
8cf31b929d | ||
|
|
a4d56e095e | ||
|
|
86dc7f849a | ||
|
|
ca889f2eec | ||
|
|
157d707581 | ||
|
|
3940441d9b | ||
|
|
cfabcc5fbf | ||
|
|
a40319e8c8 | ||
|
|
45bc475340 | ||
|
|
60edb063dd | ||
|
|
0c85c36838 | ||
|
|
d59646c630 | ||
|
|
c1985eda15 | ||
|
|
2e018b0367 | ||
|
|
8046474b8a | ||
|
|
9821b16968 | ||
|
|
a887cd39f1 | ||
|
|
ac863b3c1a | ||
|
|
a889b67c2e | ||
|
|
4618d59605 | ||
|
|
697f03bc51 | ||
|
|
670aaf6a20 | ||
|
|
c4a6b4b175 | ||
|
|
a5efb1f337 | ||
|
|
8cacf555e5 | ||
|
|
5a1579dd01 | ||
|
|
792c735ffe | ||
|
|
32af57d9f1 | ||
|
|
197474a049 | ||
|
|
19252fdbb0 |
+34
-34
@@ -7,6 +7,11 @@ on:
|
|||||||
- dev
|
- dev
|
||||||
tags:
|
tags:
|
||||||
- 'v*'
|
- 'v*'
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
|
concurrency:
|
||||||
|
group: build
|
||||||
|
cancel-in-progress: true
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
increment-version:
|
increment-version:
|
||||||
@@ -75,6 +80,13 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
node-version: '22'
|
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
|
- name: Setup Java
|
||||||
uses: actions/setup-java@v4
|
uses: actions/setup-java@v4
|
||||||
with:
|
with:
|
||||||
@@ -82,7 +94,19 @@ jobs:
|
|||||||
java-version: '21'
|
java-version: '21'
|
||||||
|
|
||||||
- name: Setup Android SDK
|
- 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)
|
- name: Install dependencies (root)
|
||||||
run: npm ci --prefer-offline
|
run: npm ci --prefer-offline
|
||||||
@@ -103,28 +127,6 @@ jobs:
|
|||||||
- name: Build Android APK
|
- name: Build Android APK
|
||||||
run: npm run android:apk:linux
|
run: npm run android:apk:linux
|
||||||
|
|
||||||
- name: Upload APK
|
|
||||||
uses: actions/upload-artifact@v3
|
|
||||||
with:
|
|
||||||
name: Paarrot-Android.apk
|
|
||||||
path: android/app/build/outputs/apk/debug/Paarrot-*.apk
|
|
||||||
|
|
||||||
create-release:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
needs: [increment-version, build-android]
|
|
||||||
if: always() && needs.build-android.result == 'success'
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Checkout repository
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
with:
|
|
||||||
fetch-depth: 0
|
|
||||||
ref: ${{ github.ref_name }}
|
|
||||||
|
|
||||||
- name: Pull latest (after version bump)
|
|
||||||
if: github.ref == 'refs/heads/master'
|
|
||||||
run: git pull origin master
|
|
||||||
|
|
||||||
- name: Get version
|
- name: Get version
|
||||||
id: version
|
id: version
|
||||||
run: |
|
run: |
|
||||||
@@ -136,6 +138,13 @@ jobs:
|
|||||||
echo "VERSION=$VERSION" >> $GITHUB_OUTPUT
|
echo "VERSION=$VERSION" >> $GITHUB_OUTPUT
|
||||||
echo "Version: $VERSION"
|
echo "Version: $VERSION"
|
||||||
|
|
||||||
|
- name: Prepare release files
|
||||||
|
run: |
|
||||||
|
mkdir -p release-files
|
||||||
|
find android/app/build/outputs/apk/debug -type f -name "Paarrot-*.apk" -exec cp {} release-files/ \;
|
||||||
|
ls -la release-files/
|
||||||
|
test -n "$(ls -A release-files/*.apk 2>/dev/null)"
|
||||||
|
|
||||||
- name: Check if tag exists
|
- name: Check if tag exists
|
||||||
id: tag_check
|
id: tag_check
|
||||||
run: |
|
run: |
|
||||||
@@ -156,17 +165,8 @@ jobs:
|
|||||||
git tag -a "v${{ steps.version.outputs.VERSION }}" -m "Release v${{ steps.version.outputs.VERSION }}"
|
git tag -a "v${{ steps.version.outputs.VERSION }}" -m "Release v${{ steps.version.outputs.VERSION }}"
|
||||||
git push origin "v${{ steps.version.outputs.VERSION }}"
|
git push origin "v${{ steps.version.outputs.VERSION }}"
|
||||||
|
|
||||||
- name: Download all artifacts
|
# Upload via the internal Gitea API. actions/upload-artifact times out against
|
||||||
uses: actions/download-artifact@v3
|
# git.ruv.wtf:443 from this runner; synbox:8418 is reachable on the LAN.
|
||||||
with:
|
|
||||||
path: artifacts
|
|
||||||
|
|
||||||
- name: Prepare release files
|
|
||||||
run: |
|
|
||||||
mkdir -p release-files
|
|
||||||
find artifacts -type f -name "*.apk" -exec cp {} release-files/ \;
|
|
||||||
ls -la release-files/
|
|
||||||
|
|
||||||
- name: Create or Update Gitea Release
|
- name: Create or Update Gitea Release
|
||||||
env:
|
env:
|
||||||
GITEA_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITEA_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
|||||||
@@ -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
|
||||||
+1
-1
@@ -1,3 +1,3 @@
|
|||||||
[submodule "cinny"]
|
[submodule "cinny"]
|
||||||
path = cinny
|
path = cinny
|
||||||
url = http://synbox.ruv.wtf:8418/litruv/cinny.git
|
url = ../cinny.git
|
||||||
|
|||||||
@@ -9,7 +9,10 @@ android {
|
|||||||
|
|
||||||
apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
|
apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
|
||||||
dependencies {
|
dependencies {
|
||||||
|
implementation project(':capacitor-app')
|
||||||
|
implementation project(':capacitor-browser')
|
||||||
implementation project(':capacitor-local-notifications')
|
implementation project(':capacitor-local-notifications')
|
||||||
|
implementation project(':capacitor-status-bar')
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -40,6 +40,14 @@
|
|||||||
<data android:mimeType="*/*" />
|
<data android:mimeType="*/*" />
|
||||||
</intent-filter>
|
</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>
|
</activity>
|
||||||
|
|
||||||
<provider
|
<provider
|
||||||
@@ -54,23 +62,36 @@
|
|||||||
|
|
||||||
<service
|
<service
|
||||||
android:name=".MatrixSyncService"
|
android:name=".MatrixSyncService"
|
||||||
android:foregroundServiceType="dataSync"
|
android:process=":listener"
|
||||||
|
android:foregroundServiceType="specialUse|dataSync"
|
||||||
android:exported="false"
|
android:exported="false"
|
||||||
android:stopWithTask="false" />
|
android:stopWithTask="false">
|
||||||
|
<property
|
||||||
<service
|
android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE"
|
||||||
android:name=".UnifiedPushService"
|
android:value="matrix_message_listener" />
|
||||||
android:exported="false">
|
|
||||||
<intent-filter>
|
|
||||||
<action android:name="org.unifiedpush.android.connector.PUSH_EVENT" />
|
|
||||||
</intent-filter>
|
|
||||||
</service>
|
</service>
|
||||||
|
|
||||||
<receiver
|
<receiver
|
||||||
android:name=".BootReceiver"
|
android:name=".BootReceiver"
|
||||||
android:exported="true">
|
android:exported="true"
|
||||||
|
android:enabled="true">
|
||||||
<intent-filter>
|
<intent-filter>
|
||||||
<action android:name="android.intent.action.BOOT_COMPLETED" />
|
<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>
|
</intent-filter>
|
||||||
</receiver>
|
</receiver>
|
||||||
</application>
|
</application>
|
||||||
@@ -78,9 +99,14 @@
|
|||||||
<!-- Permissions -->
|
<!-- Permissions -->
|
||||||
|
|
||||||
<uses-permission android:name="android.permission.INTERNET" />
|
<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.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" />
|
||||||
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
|
<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.RECEIVE_BOOT_COMPLETED" />
|
||||||
<uses-permission android:name="android.permission.RECORD_AUDIO" />
|
<uses-permission android:name="android.permission.RECORD_AUDIO" />
|
||||||
<uses-permission android:name="android.permission.CAMERA" />
|
<uses-permission android:name="android.permission.CAMERA" />
|
||||||
|
|||||||
@@ -5,17 +5,23 @@ import android.content.Context
|
|||||||
import android.content.Intent
|
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() {
|
class BootReceiver : BroadcastReceiver() {
|
||||||
|
|
||||||
override fun onReceive(context: Context, intent: Intent) {
|
override fun onReceive(context: Context, intent: Intent) {
|
||||||
if (intent.action != Intent.ACTION_BOOT_COMPLETED) return
|
val action = intent.action ?: return
|
||||||
|
when (action) {
|
||||||
val prefs = context.getSharedPreferences(SyncServicePlugin.PREFS, Context.MODE_PRIVATE)
|
Intent.ACTION_BOOT_COMPLETED,
|
||||||
prefs.getString(MatrixSyncService.EXTRA_HOMESERVER, null) ?: return
|
Intent.ACTION_LOCKED_BOOT_COMPLETED,
|
||||||
prefs.getString(MatrixSyncService.EXTRA_TOKEN, null) ?: return
|
Intent.ACTION_MY_PACKAGE_REPLACED,
|
||||||
|
"android.intent.action.QUICKBOOT_POWERON",
|
||||||
UnifiedPushManager.register(context, activity = null)
|
"com.htc.intent.action.QUICKBOOT_POWERON",
|
||||||
|
-> {
|
||||||
|
if (!MatrixSyncService.hasCredentials(context)) return
|
||||||
|
MatrixSyncService.scheduleKeepAlive(context)
|
||||||
|
MatrixSyncService.requestSyncFetch(context, "boot:$action")
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,32 @@
|
|||||||
|
package com.paarrot.app
|
||||||
|
|
||||||
|
import android.net.Uri
|
||||||
|
import android.view.View
|
||||||
|
import androidx.core.view.ContentInfoCompat
|
||||||
|
import androidx.core.view.OnReceiveContentListener
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Receives rich content from the IME (Gboard GIF), clipboard paste, and drag-drop,
|
||||||
|
* then forwards file URIs through [ShareIntentStore] so JS can attach them in-room.
|
||||||
|
*/
|
||||||
|
class ImageKeyboardContentReceiver : OnReceiveContentListener {
|
||||||
|
|
||||||
|
override fun onReceiveContent(view: View, payload: ContentInfoCompat): ContentInfoCompat? {
|
||||||
|
val split = payload.partition { item -> item.uri != null }
|
||||||
|
val uriContent = split.first
|
||||||
|
val remaining = split.second
|
||||||
|
|
||||||
|
if (uriContent != null) {
|
||||||
|
val uris = mutableListOf<Uri>()
|
||||||
|
val clip = uriContent.clip
|
||||||
|
for (i in 0 until clip.itemCount) {
|
||||||
|
clip.getItemAt(i).uri?.let { uris.add(it) }
|
||||||
|
}
|
||||||
|
if (uris.isNotEmpty()) {
|
||||||
|
ShareIntentStore.handleContentUris(view.context, uris)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return remaining
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,38 @@
|
|||||||
|
package com.paarrot.app
|
||||||
|
|
||||||
|
import android.content.Context
|
||||||
|
import android.util.AttributeSet
|
||||||
|
import android.view.inputmethod.EditorInfo
|
||||||
|
import android.view.inputmethod.InputConnection
|
||||||
|
import androidx.core.view.inputmethod.EditorInfoCompat
|
||||||
|
import androidx.core.view.inputmethod.InputConnectionCompat
|
||||||
|
import com.getcapacitor.CapacitorWebView
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Capacitor WebView that advertises image/video MIME types to the IME
|
||||||
|
* (Gboard GIF/sticker keyboard) and routes commit-content through
|
||||||
|
* [androidx.core.view.ViewCompat.setOnReceiveContentListener].
|
||||||
|
*/
|
||||||
|
class ImageKeyboardWebView(
|
||||||
|
context: Context,
|
||||||
|
attrs: AttributeSet?,
|
||||||
|
) : CapacitorWebView(context, attrs) {
|
||||||
|
|
||||||
|
override fun onCreateInputConnection(outAttrs: EditorInfo): InputConnection? {
|
||||||
|
val inputConnection = super.onCreateInputConnection(outAttrs) ?: return null
|
||||||
|
EditorInfoCompat.setContentMimeTypes(outAttrs, MIME_TYPES)
|
||||||
|
return InputConnectionCompat.createWrapper(this, inputConnection, outAttrs)
|
||||||
|
}
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
@JvmField
|
||||||
|
val MIME_TYPES: Array<String> = arrayOf(
|
||||||
|
"image/*",
|
||||||
|
"image/png",
|
||||||
|
"image/gif",
|
||||||
|
"image/jpeg",
|
||||||
|
"image/webp",
|
||||||
|
"video/*",
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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,14 +1,80 @@
|
|||||||
package com.paarrot.app;
|
package com.paarrot.app;
|
||||||
|
|
||||||
|
import android.Manifest;
|
||||||
|
import android.content.pm.PackageManager;
|
||||||
|
import android.os.Build;
|
||||||
import android.os.Bundle;
|
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;
|
import com.getcapacitor.BridgeActivity;
|
||||||
|
|
||||||
public class MainActivity extends BridgeActivity {
|
public class MainActivity extends BridgeActivity {
|
||||||
|
private boolean askedNotifications = false;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onCreate(Bundle savedInstanceState) {
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
registerPlugin(SyncServicePlugin.class);
|
registerPlugin(SyncServicePlugin.class);
|
||||||
registerPlugin(ShareHandlerPlugin.class);
|
registerPlugin(ShareHandlerPlugin.class);
|
||||||
registerPlugin(PluginStoragePlugin.class);
|
registerPlugin(PluginStoragePlugin.class);
|
||||||
super.onCreate(savedInstanceState);
|
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. */
|
||||||
|
private void setupImageKeyboardSupport() {
|
||||||
|
if (bridge == null) return;
|
||||||
|
WebView webView = bridge.getWebView();
|
||||||
|
if (webView == null) return;
|
||||||
|
ViewCompat.setOnReceiveContentListener(
|
||||||
|
webView,
|
||||||
|
ImageKeyboardWebView.MIME_TYPES,
|
||||||
|
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
|
package com.paarrot.app
|
||||||
|
|
||||||
import android.app.Activity
|
import android.content.ContentValues
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.content.Intent
|
import android.content.Intent
|
||||||
import android.net.Uri
|
import android.net.Uri
|
||||||
import android.os.Build
|
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.JSArray
|
||||||
import com.getcapacitor.JSObject
|
import com.getcapacitor.JSObject
|
||||||
import com.getcapacitor.Plugin
|
import com.getcapacitor.Plugin
|
||||||
@@ -62,7 +66,6 @@ object ShareIntentStore {
|
|||||||
|
|
||||||
if (action != Intent.ACTION_SEND && action != Intent.ACTION_SEND_MULTIPLE) return
|
if (action != Intent.ACTION_SEND && action != Intent.ACTION_SEND_MULTIPLE) return
|
||||||
|
|
||||||
val receivedAt = System.currentTimeMillis()
|
|
||||||
val text = intent.getStringExtra(Intent.EXTRA_TEXT)
|
val text = intent.getStringExtra(Intent.EXTRA_TEXT)
|
||||||
val subject = intent.getStringExtra(Intent.EXTRA_SUBJECT)
|
val subject = intent.getStringExtra(Intent.EXTRA_SUBJECT)
|
||||||
|
|
||||||
@@ -86,8 +89,29 @@ object ShareIntentStore {
|
|||||||
uri?.let { uris.add(it) }
|
uri?.let { uris.add(it) }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
deliverShare(context, uris, text, subject)
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Deliver content URIs from the IME (Gboard GIF), clipboard paste, or drag-drop
|
||||||
|
* into the same share pipeline used by ACTION_SEND.
|
||||||
|
*/
|
||||||
|
fun handleContentUris(context: Context, uris: List<Uri>) {
|
||||||
|
if (uris.isEmpty()) return
|
||||||
|
deliverShare(context, uris, text = null, subject = null)
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun deliverShare(
|
||||||
|
context: Context,
|
||||||
|
uris: List<Uri>,
|
||||||
|
text: String?,
|
||||||
|
subject: String?,
|
||||||
|
) {
|
||||||
|
val receivedAt = System.currentTimeMillis()
|
||||||
val copiedFiles = uris.mapNotNull { copySharedUri(context, it, receivedAt) }
|
val copiedFiles = uris.mapNotNull { copySharedUri(context, it, receivedAt) }
|
||||||
|
|
||||||
|
if (copiedFiles.isEmpty() && text.isNullOrBlank() && subject.isNullOrBlank()) return
|
||||||
|
|
||||||
val payload = SharePayload(
|
val payload = SharePayload(
|
||||||
text = text,
|
text = text,
|
||||||
subject = subject,
|
subject = subject,
|
||||||
@@ -193,4 +217,168 @@ class ShareHandlerPlugin : Plugin() {
|
|||||||
ShareIntentStore.clearIntent(ShareIntentStore.pendingShare?.receivedAt)
|
ShareIntentStore.clearIntent(ShareIntentStore.pendingShare?.receivedAt)
|
||||||
call.resolve()
|
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
|
package com.paarrot.app
|
||||||
|
|
||||||
|
import android.Manifest
|
||||||
|
import android.app.Activity
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.content.Intent
|
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.JSObject
|
||||||
import com.getcapacitor.Plugin
|
import com.getcapacitor.Plugin
|
||||||
import com.getcapacitor.PluginCall
|
import com.getcapacitor.PluginCall
|
||||||
@@ -12,30 +21,59 @@ import com.getcapacitor.annotation.CapacitorPlugin
|
|||||||
* Capacitor plugin that controls [MatrixSyncService] from JS.
|
* Capacitor plugin that controls [MatrixSyncService] from JS.
|
||||||
*
|
*
|
||||||
* JS API:
|
* JS API:
|
||||||
* - `start({ homeserverUrl, accessToken, userId, deviceId })` — persist credentials and register UnifiedPush
|
* - `start({ homeserverUrl, accessToken, userId, deviceId })` — persist credentials and keep the listener running
|
||||||
* - `triggerPing({ reason })` — force a one-shot fetch (for testing/manual wake)
|
* - `triggerPing({ reason })` — make sure the listener is running
|
||||||
* - `stop()` — clear persisted credentials and unregister UnifiedPush
|
* - `stop()` — clear persisted credentials and stop the listener
|
||||||
* - `setAppForeground({ foreground })` — tell the service whether the app UI is visible
|
* - `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")
|
@CapacitorPlugin(name = "MatrixBackgroundSync")
|
||||||
class SyncServicePlugin : Plugin() {
|
class SyncServicePlugin : Plugin() {
|
||||||
|
|
||||||
fun emitUnifiedPushEvent(eventName: String, payload: JSObject) {
|
|
||||||
notifyListeners(eventName, payload, true)
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun load() {
|
override fun load() {
|
||||||
super.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() {
|
override fun handleOnDestroy() {
|
||||||
UnifiedPushManager.clearPlugin(this)
|
if (NotificationNavStore.plugin === this) {
|
||||||
|
NotificationNavStore.plugin = null
|
||||||
|
}
|
||||||
super.handleOnDestroy()
|
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
|
@PluginMethod
|
||||||
fun start(call: PluginCall) {
|
fun start(call: PluginCall) {
|
||||||
val homeserver = call.getString("homeserverUrl")
|
val homeserver = call.getString("homeserverUrl")
|
||||||
@@ -50,11 +88,13 @@ class SyncServicePlugin : Plugin() {
|
|||||||
.putString(MatrixSyncService.EXTRA_TOKEN, token)
|
.putString(MatrixSyncService.EXTRA_TOKEN, token)
|
||||||
.putString(MatrixSyncService.EXTRA_USER_ID, userId)
|
.putString(MatrixSyncService.EXTRA_USER_ID, userId)
|
||||||
.putString(MatrixSyncService.EXTRA_DEVICE_ID, deviceId)
|
.putString(MatrixSyncService.EXTRA_DEVICE_ID, deviceId)
|
||||||
.apply()
|
.commit()
|
||||||
|
|
||||||
UnifiedPushManager.register(context, activity)
|
askNotificationPermission()
|
||||||
|
MatrixSyncService.scheduleKeepAlive(context)
|
||||||
call.resolve()
|
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). */
|
/** 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. */
|
/** Stops the sync service and erases persisted credentials. */
|
||||||
@PluginMethod
|
@PluginMethod
|
||||||
fun stop(call: PluginCall) {
|
fun stop(call: PluginCall) {
|
||||||
|
MatrixSyncService.cancelKeepAlive(context)
|
||||||
context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).edit().clear().apply()
|
context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).edit().clear().apply()
|
||||||
context.stopService(Intent(context, MatrixSyncService::class.java))
|
context.stopService(Intent(context, MatrixSyncService::class.java))
|
||||||
UnifiedPushManager.unregister(context)
|
|
||||||
call.resolve()
|
call.resolve()
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -81,23 +121,140 @@ class SyncServicePlugin : Plugin() {
|
|||||||
*/
|
*/
|
||||||
@PluginMethod
|
@PluginMethod
|
||||||
fun setAppForeground(call: PluginCall) {
|
fun setAppForeground(call: PluginCall) {
|
||||||
MatrixSyncService.appInForeground = call.getBoolean("foreground", false) ?: false
|
val foreground = call.getBoolean("foreground", false) ?: false
|
||||||
|
MatrixSyncService.setAppInForeground(context, foreground)
|
||||||
call.resolve()
|
call.resolve()
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Returns whether the sync service is currently running. */
|
/** Returns whether the sync service is currently running. */
|
||||||
@PluginMethod
|
@PluginMethod
|
||||||
fun getStatus(call: PluginCall) {
|
fun getStatus(call: PluginCall) {
|
||||||
val am = context.getSystemService(Context.ACTIVITY_SERVICE)
|
try {
|
||||||
as android.app.ActivityManager
|
val result = JSObject()
|
||||||
@Suppress("DEPRECATION")
|
// The service runs in :listener, so its in-memory flag is not shared with this plugin process.
|
||||||
val running = am.getRunningServices(Int.MAX_VALUE)
|
val running =
|
||||||
.any { it.service.className == MatrixSyncService::class.java.name }
|
MatrixSyncService.hasCredentials(context) && MatrixSyncService.isListenerHealthy(context)
|
||||||
val result = UnifiedPushManager.getStatus(context).apply { put("running", running) }
|
result.put("running", running)
|
||||||
call.resolve(result)
|
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 {
|
companion object {
|
||||||
const val PREFS = "sync_service_prefs"
|
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"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
tools:context="com.getcapacitor.BridgeActivity">
|
||||||
|
|
||||||
|
<com.paarrot.app.ImageKeyboardWebView
|
||||||
|
android:id="@+id/webview"
|
||||||
|
android:layout_width="fill_parent"
|
||||||
|
android:layout_height="fill_parent" />
|
||||||
|
|
||||||
|
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
||||||
@@ -2,5 +2,14 @@
|
|||||||
include ':capacitor-android'
|
include ':capacitor-android'
|
||||||
project(':capacitor-android').projectDir = new File('../node_modules/@capacitor/android/capacitor')
|
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'
|
include ':capacitor-local-notifications'
|
||||||
project(':capacitor-local-notifications').projectDir = new File('../node_modules/@capacitor/local-notifications/android')
|
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')
|
||||||
|
|||||||
@@ -7,6 +7,9 @@
|
|||||||
"LocalNotifications": {
|
"LocalNotifications": {
|
||||||
"smallIcon": "ic_stat_paarrot",
|
"smallIcon": "ic_stat_paarrot",
|
||||||
"iconColor": "#FF8A00"
|
"iconColor": "#FF8A00"
|
||||||
|
},
|
||||||
|
"CapacitorHttp": {
|
||||||
|
"enabled": true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
Submodule cinny updated: 9c7f71896c...a4e96dd01f
@@ -1,5 +1,7 @@
|
|||||||
{
|
{
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
"@capacitor/app": "8.0.1",
|
||||||
|
"@capacitor/browser": "8.0.1",
|
||||||
"@capacitor/status-bar": "8.0.1"
|
"@capacitor/status-bar": "8.0.1"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,16 +6,8 @@ export const Editor = style([
|
|||||||
{
|
{
|
||||||
backgroundColor: color.SurfaceVariant.Container,
|
backgroundColor: color.SurfaceVariant.Container,
|
||||||
color: color.SurfaceVariant.OnContainer,
|
color: color.SurfaceVariant.OnContainer,
|
||||||
boxShadow: `inset 0 0 0 ${config.borderWidth.B300} ${color.SurfaceVariant.ContainerLine}`,
|
borderTop: `${config.borderWidth.B300} solid ${color.SurfaceVariant.ContainerLine}`,
|
||||||
borderRadius: config.radii.R400,
|
|
||||||
overflow: 'hidden',
|
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;
|
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 => {
|
const shouldIgnoreBackTarget = (target: EventTarget | null): boolean => {
|
||||||
if (!(target instanceof Element)) return true;
|
if (!(target instanceof Element)) return true;
|
||||||
return Boolean(
|
return Boolean(target.closest(IGNORE_BACK_SELECTOR)) || isInsideHorizontalScroller(target);
|
||||||
target.closest(
|
|
||||||
'input, textarea, [contenteditable="true"], [data-allow-text-selection="true"], [data-carousel-scroller], [data-disable-swipe-back="true"]'
|
|
||||||
)
|
|
||||||
);
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const shouldIgnoreReplyTarget = (target: EventTarget | null): boolean => {
|
const shouldIgnoreReplyTarget = (target: EventTarget | null): boolean => {
|
||||||
if (!(target instanceof Element)) return true;
|
if (!(target instanceof Element)) return true;
|
||||||
return Boolean(
|
return Boolean(target.closest(IGNORE_REPLY_SELECTOR)) || isInsideHorizontalScroller(target);
|
||||||
target.closest(
|
|
||||||
'input, textarea, [contenteditable="true"], [data-allow-text-selection="true"], [data-carousel-scroller], [data-disable-swipe-reply="true"]'
|
|
||||||
)
|
|
||||||
);
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const findMessageElement = (target: EventTarget | null): HTMLElement | null => {
|
const findMessageElement = (target: EventTarget | null): HTMLElement | null => {
|
||||||
@@ -220,6 +240,12 @@ export function MobileSwipeGestureHost({ children }: MobileSwipeGestureHostProps
|
|||||||
const getEndedTouch = (evt: TouchEvent, touchId: number) =>
|
const getEndedTouch = (evt: TouchEvent, touchId: number) =>
|
||||||
Array.from(evt.changedTouches).find((touch) => touch.identifier === touchId);
|
Array.from(evt.changedTouches).find((touch) => touch.identifier === touchId);
|
||||||
|
|
||||||
|
const isInsideSwipeHost = (target: EventTarget | null): boolean => {
|
||||||
|
const root = rootRef.current;
|
||||||
|
if (!root || !(target instanceof Node)) return false;
|
||||||
|
return root.contains(target);
|
||||||
|
};
|
||||||
|
|
||||||
const handleTouchStart = (evt: TouchEvent) => {
|
const handleTouchStart = (evt: TouchEvent) => {
|
||||||
if (gestureRef.current.phase !== 'idle') return;
|
if (gestureRef.current.phase !== 'idle') return;
|
||||||
|
|
||||||
@@ -232,7 +258,12 @@ export function MobileSwipeGestureHost({ children }: MobileSwipeGestureHostProps
|
|||||||
const messageEl = findMessageElement(target);
|
const messageEl = findMessageElement(target);
|
||||||
const messageId = messageEl?.getAttribute('data-message-id') ?? null;
|
const messageId = messageEl?.getAttribute('data-message-id') ?? null;
|
||||||
|
|
||||||
const canStartBack = backEnabled && !shouldIgnoreBackTarget(target);
|
// Only steal touches that start inside the detail/swipe host. Document-level
|
||||||
|
// listeners otherwise fight the always-visible sidebar (space icons sit in the
|
||||||
|
// former screen-left EDGE_WIDTH zone and lost clicks to preventDefault).
|
||||||
|
const insideHost = isInsideSwipeHost(target);
|
||||||
|
const canStartBack =
|
||||||
|
backEnabled && insideHost && !shouldIgnoreBackTarget(target);
|
||||||
const canStartReply =
|
const canStartReply =
|
||||||
replyEnabled &&
|
replyEnabled &&
|
||||||
messageEl &&
|
messageEl &&
|
||||||
@@ -242,23 +273,11 @@ export function MobileSwipeGestureHost({ children }: MobileSwipeGestureHostProps
|
|||||||
|
|
||||||
if (!canStartBack && !canStartReply) return;
|
if (!canStartBack && !canStartReply) return;
|
||||||
|
|
||||||
if (touch.clientX <= EDGE_WIDTH && canStartBack) {
|
const contentLeft = rootRef.current?.getBoundingClientRect().left ?? 0;
|
||||||
evt.preventDefault();
|
const nearContentLeftEdge =
|
||||||
gestureRef.current = {
|
touch.clientX >= contentLeft && touch.clientX <= contentLeft + EDGE_WIDTH;
|
||||||
phase: 'back',
|
|
||||||
touchId: touch.identifier,
|
|
||||||
startX: touch.clientX,
|
|
||||||
startY: touch.clientY,
|
|
||||||
messageEl: null,
|
|
||||||
transformEl: null,
|
|
||||||
messageId: null,
|
|
||||||
edgeBack: true,
|
|
||||||
offset: 0,
|
|
||||||
};
|
|
||||||
document.documentElement.classList.add('mobile-gesture-lock');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
// Prefer pending over immediate back+preventDefault so a tap still clicks.
|
||||||
gestureRef.current = {
|
gestureRef.current = {
|
||||||
phase: 'pending',
|
phase: 'pending',
|
||||||
touchId: touch.identifier,
|
touchId: touch.identifier,
|
||||||
@@ -267,7 +286,7 @@ export function MobileSwipeGestureHost({ children }: MobileSwipeGestureHostProps
|
|||||||
messageEl: canStartReply ? messageEl : null,
|
messageEl: canStartReply ? messageEl : null,
|
||||||
transformEl: canStartReply && messageEl ? findReplyTransformTarget(messageEl) : null,
|
transformEl: canStartReply && messageEl ? findReplyTransformTarget(messageEl) : null,
|
||||||
messageId: canStartReply ? messageId : null,
|
messageId: canStartReply ? messageId : null,
|
||||||
edgeBack: false,
|
edgeBack: nearContentLeftEdge && canStartBack,
|
||||||
offset: 0,
|
offset: 0,
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ import * as swipeCss from '../mobile/mobile-gestures.css';
|
|||||||
import { ScreenSize, useScreenSizeContext } from '../../hooks/useScreenSize';
|
import { ScreenSize, useScreenSizeContext } from '../../hooks/useScreenSize';
|
||||||
import { SidebarDockedCallPanel } from '../../features/call/SidebarDockedCallPanel';
|
import { SidebarDockedCallPanel } from '../../features/call/SidebarDockedCallPanel';
|
||||||
import { useShowCompactMasterView } from '../../hooks/useCompactNav';
|
import { useShowCompactMasterView } from '../../hooks/useCompactNav';
|
||||||
|
import { isStationeryTheme, useTheme } from '../../hooks/useTheme';
|
||||||
|
|
||||||
type PageRootProps = {
|
type PageRootProps = {
|
||||||
nav: ReactNode;
|
nav: ReactNode;
|
||||||
@@ -74,6 +75,7 @@ export function PageNav({
|
|||||||
grow={isMobile ? 'Yes' : undefined}
|
grow={isMobile ? 'Yes' : undefined}
|
||||||
className={classNames(css.PageNav({ size }), className)}
|
className={classNames(css.PageNav({ size }), className)}
|
||||||
shrink={isMobile ? 'Yes' : 'No'}
|
shrink={isMobile ? 'Yes' : 'No'}
|
||||||
|
data-page-nav=""
|
||||||
>
|
>
|
||||||
<Box grow="Yes" direction="Column">
|
<Box grow="Yes" direction="Column">
|
||||||
{children}
|
{children}
|
||||||
@@ -89,6 +91,7 @@ export const PageNavHeader = as<'header', css.PageNavHeaderVariants>(
|
|||||||
className={classNames(css.PageNavHeader({ outlined }), className)}
|
className={classNames(css.PageNavHeader({ outlined }), className)}
|
||||||
variant="Background"
|
variant="Background"
|
||||||
size="600"
|
size="600"
|
||||||
|
data-folder-tab="nav"
|
||||||
{...props}
|
{...props}
|
||||||
ref={ref}
|
ref={ref}
|
||||||
/>
|
/>
|
||||||
@@ -104,13 +107,16 @@ export function PageNavContent({
|
|||||||
scrollRef?: MutableRefObject<HTMLDivElement | null>;
|
scrollRef?: MutableRefObject<HTMLDivElement | null>;
|
||||||
scrollProps?: React.ComponentProps<typeof Scroll>;
|
scrollProps?: React.ComponentProps<typeof Scroll>;
|
||||||
}) {
|
}) {
|
||||||
|
const theme = useTheme();
|
||||||
|
const hideScrollbar = isStationeryTheme(theme);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Box grow="Yes" direction="Column">
|
<Box grow="Yes" direction="Column">
|
||||||
<Scroll
|
<Scroll
|
||||||
ref={scrollRef}
|
ref={scrollRef}
|
||||||
variant="Background"
|
variant="Background"
|
||||||
direction="Vertical"
|
direction="Vertical"
|
||||||
size="300"
|
size={hideScrollbar ? '0' : '300'}
|
||||||
hideTrack
|
hideTrack
|
||||||
visibility="Hover"
|
visibility="Hover"
|
||||||
{...scrollProps}
|
{...scrollProps}
|
||||||
@@ -126,6 +132,7 @@ export const Page = as<'div'>(({ className, ...props }, ref) => (
|
|||||||
grow="Yes"
|
grow="Yes"
|
||||||
direction="Column"
|
direction="Column"
|
||||||
className={classNames(ContainerColor({ variant: 'Surface' }), className)}
|
className={classNames(ContainerColor({ variant: 'Surface' }), className)}
|
||||||
|
data-page=""
|
||||||
{...props}
|
{...props}
|
||||||
ref={ref}
|
ref={ref}
|
||||||
/>
|
/>
|
||||||
@@ -137,6 +144,7 @@ export const PageHeader = as<'div', css.PageHeaderVariants>(
|
|||||||
as="header"
|
as="header"
|
||||||
size="600"
|
size="600"
|
||||||
className={classNames(css.PageHeader({ balance, outlined }), className)}
|
className={classNames(css.PageHeader({ balance, outlined }), className)}
|
||||||
|
data-folder-tab-bar=""
|
||||||
{...props}
|
{...props}
|
||||||
ref={ref}
|
ref={ref}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@@ -0,0 +1,136 @@
|
|||||||
|
import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
|
||||||
|
import { Box, Scroll, Text, color } from 'folds';
|
||||||
|
import { Icon, Icons } from '../../components/icons';
|
||||||
|
import classNames from 'classnames';
|
||||||
|
import { useSetAtom } from 'jotai';
|
||||||
|
import { useNavigate } from 'react-router-dom';
|
||||||
|
import { useMatrixClient } from '../../hooks/useMatrixClient';
|
||||||
|
import { useCompactNav } from '../../hooks/useCompactNav';
|
||||||
|
import { Page, PageContent } from '../../components/page';
|
||||||
|
import { ContainerColor } from '../../styles/ContainerColor.css';
|
||||||
|
import { activeThreadIdAtomFamily } from '../../state/activeThread';
|
||||||
|
import { getCanonicalAliasOrRoomId } from '../../utils/matrix';
|
||||||
|
import { getSpacePath } from '../../pages/pathUtils';
|
||||||
|
import { useForumBoardContext } from './ForumBoardContext';
|
||||||
|
import { ForumThreadDetail } from './ForumThreadDetail';
|
||||||
|
import type { ForumPost } from './types';
|
||||||
|
import * as theme from './forumTheme.css';
|
||||||
|
|
||||||
|
/** Thread detail in the main pane; post list lives in ForumFeedSidebar. */
|
||||||
|
export function ForumBoardDetail() {
|
||||||
|
const mx = useMatrixClient();
|
||||||
|
const navigate = useNavigate();
|
||||||
|
const compact = useCompactNav();
|
||||||
|
const [optimisticPost, setOptimisticPost] = useState<ForumPost | null>(null);
|
||||||
|
|
||||||
|
const {
|
||||||
|
forumSpace,
|
||||||
|
query,
|
||||||
|
error,
|
||||||
|
selectedPostId,
|
||||||
|
activeTopicRoomId,
|
||||||
|
threads,
|
||||||
|
recordThreadReply,
|
||||||
|
} = useForumBoardContext();
|
||||||
|
|
||||||
|
// Compact: /feed/ without a selected post has no detail content — return to the list
|
||||||
|
// so an empty detail layer cannot cover the forum sidebar.
|
||||||
|
useEffect(() => {
|
||||||
|
if (!compact || selectedPostId) return;
|
||||||
|
navigate(getSpacePath(getCanonicalAliasOrRoomId(mx, forumSpace.roomId)), { replace: true });
|
||||||
|
}, [compact, selectedPostId, navigate, mx, forumSpace.roomId]);
|
||||||
|
|
||||||
|
const activeTopicRoom = activeTopicRoomId ? mx.getRoom(activeTopicRoomId) : null;
|
||||||
|
const topicSelected = Boolean(query.topic);
|
||||||
|
|
||||||
|
const setActiveThreadId = useSetAtom(
|
||||||
|
activeThreadIdAtomFamily(activeTopicRoomId ?? forumSpace.roomId)
|
||||||
|
);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (selectedPostId && activeTopicRoomId) {
|
||||||
|
setActiveThreadId(selectedPostId);
|
||||||
|
return () => setActiveThreadId(undefined);
|
||||||
|
}
|
||||||
|
setActiveThreadId(undefined);
|
||||||
|
return undefined;
|
||||||
|
}, [selectedPostId, activeTopicRoomId, setActiveThreadId]);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (optimisticPost && optimisticPost.eventId !== selectedPostId) {
|
||||||
|
setOptimisticPost(null);
|
||||||
|
}
|
||||||
|
}, [optimisticPost, selectedPostId]);
|
||||||
|
|
||||||
|
const selectedThread = useMemo(
|
||||||
|
() => threads.find((t) => t.eventId === selectedPostId),
|
||||||
|
[threads, selectedPostId]
|
||||||
|
);
|
||||||
|
|
||||||
|
const handleReplySent = useCallback(
|
||||||
|
(_reply: ForumPost) => {
|
||||||
|
if (selectedPostId) {
|
||||||
|
recordThreadReply(selectedPostId);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
[recordThreadReply, selectedPostId]
|
||||||
|
);
|
||||||
|
|
||||||
|
const showThread = Boolean(selectedPostId && activeTopicRoom);
|
||||||
|
const threadInitialPost =
|
||||||
|
optimisticPost?.eventId === selectedPostId ? optimisticPost : null;
|
||||||
|
const detailDropRef = useRef<HTMLDivElement>(null);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Page className={classNames(ContainerColor({ variant: 'Background' }), theme.ForumAppRoot)}>
|
||||||
|
<PageContent className={theme.ForumPageContent}>
|
||||||
|
{error && (
|
||||||
|
<Text as="p" style={{ color: color.Critical.Main, padding: '0.5rem 1rem' }}>
|
||||||
|
{error}
|
||||||
|
</Text>
|
||||||
|
)}
|
||||||
|
<aside className={theme.ForumDetailPane}>
|
||||||
|
{showThread && activeTopicRoom ? (
|
||||||
|
<div ref={detailDropRef} className={theme.ForumTopicPostDetailThreadLayout}>
|
||||||
|
<ForumThreadDetail
|
||||||
|
roomId={activeTopicRoom.roomId}
|
||||||
|
rootEventId={selectedPostId!}
|
||||||
|
titleHint={selectedThread?.title}
|
||||||
|
initialPost={threadInitialPost}
|
||||||
|
fileDropContainerRef={detailDropRef}
|
||||||
|
onReplySent={handleReplySent}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
) : (
|
||||||
|
<Scroll
|
||||||
|
id="topicPostDetail"
|
||||||
|
className={theme.ForumTopicPostDetailScroll}
|
||||||
|
variant="Surface"
|
||||||
|
direction="Vertical"
|
||||||
|
size="300"
|
||||||
|
hideTrack
|
||||||
|
visibility="Hover"
|
||||||
|
>
|
||||||
|
<div className={theme.ForumTopicPostDetailInner}>
|
||||||
|
<Box
|
||||||
|
className={theme.ForumEmptyDetail}
|
||||||
|
direction="Column"
|
||||||
|
alignItems="Center"
|
||||||
|
justifyContent="Center"
|
||||||
|
gap="300"
|
||||||
|
>
|
||||||
|
<Icon src={Icons.Thread} size="600" />
|
||||||
|
<Text size="T300" priority="300">
|
||||||
|
{topicSelected
|
||||||
|
? 'Select a post to read the thread'
|
||||||
|
: 'Pick a category and topic, then choose a post'}
|
||||||
|
</Text>
|
||||||
|
</Box>
|
||||||
|
</div>
|
||||||
|
</Scroll>
|
||||||
|
)}
|
||||||
|
</aside>
|
||||||
|
</PageContent>
|
||||||
|
</Page>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,431 @@
|
|||||||
|
import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
|
||||||
|
import { useLocation, useNavigate } from 'react-router-dom';
|
||||||
|
import { MatrixEvent, Room, RoomStateEvent } from 'matrix-js-sdk';
|
||||||
|
import { useAtomValue } from 'jotai';
|
||||||
|
import { useMatrixClient } from '../../hooks/useMatrixClient';
|
||||||
|
import { useSelectedRoom } from '../../hooks/router/useSelectedRoom';
|
||||||
|
import { useCompactNav } from '../../hooks/useCompactNav';
|
||||||
|
import { getCanonicalAliasOrRoomId } from '../../utils/matrix';
|
||||||
|
import { getSpaceFeedPath, getSpaceLobbyPath, getSpacePath } from '../../pages/pathUtils';
|
||||||
|
import { createRoomModalAtom } from '../../state/createRoomModal';
|
||||||
|
import { createSpaceModalAtom } from '../../state/createSpaceModal';
|
||||||
|
import { StateEvent } from '../../../types/matrix/room';
|
||||||
|
import {
|
||||||
|
buildForumSections,
|
||||||
|
buildTopicThreads,
|
||||||
|
buildThreadSummaries,
|
||||||
|
} from './forumTopicHelpers';
|
||||||
|
import { applyTopicStatusSort } from './topicSearch';
|
||||||
|
import {
|
||||||
|
createForumPostFromPayload,
|
||||||
|
listForumTopics,
|
||||||
|
listTopicFeedPosts,
|
||||||
|
loadAggregatedTopicFeed,
|
||||||
|
} from './forumFeed';
|
||||||
|
import type {
|
||||||
|
ForumBoardQuery,
|
||||||
|
ForumPost,
|
||||||
|
ForumPublishedPost,
|
||||||
|
ForumSection,
|
||||||
|
ForumThreadSummary,
|
||||||
|
} from './types';
|
||||||
|
import { useForumRoomLiveUpdates } from './useForumRoomLiveUpdates';
|
||||||
|
|
||||||
|
export type ForumBoardScope = {
|
||||||
|
forumSpaceId: string;
|
||||||
|
/** When set, only show posts from this topic room. */
|
||||||
|
topicRoomId?: string;
|
||||||
|
};
|
||||||
|
|
||||||
|
function scopesFromSelection(
|
||||||
|
sections: ForumSection[],
|
||||||
|
category?: string,
|
||||||
|
topic?: string
|
||||||
|
): Array<{ roomId: string; sectionTitle?: string; topicName?: string }> {
|
||||||
|
if (topic) {
|
||||||
|
for (const section of sections) {
|
||||||
|
const match = section.topics.find((t) => t.roomId === topic);
|
||||||
|
if (match) {
|
||||||
|
return [{ roomId: match.roomId, sectionTitle: section.title, topicName: match.name }];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return [{ roomId: topic }];
|
||||||
|
}
|
||||||
|
|
||||||
|
if (category) {
|
||||||
|
const section = sections.find((s) => s.title === category);
|
||||||
|
if (!section) return [];
|
||||||
|
return section.topics.map((t) => ({
|
||||||
|
roomId: t.roomId,
|
||||||
|
sectionTitle: section.title,
|
||||||
|
topicName: t.name,
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
|
return sections.flatMap((section) =>
|
||||||
|
section.topics.map((t) => ({
|
||||||
|
roomId: t.roomId,
|
||||||
|
sectionTitle: section.title,
|
||||||
|
topicName: t.name,
|
||||||
|
}))
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function useForumBoard(scope: ForumBoardScope, forumSpace: Room) {
|
||||||
|
const mx = useMatrixClient();
|
||||||
|
const location = useLocation();
|
||||||
|
const navigate = useNavigate();
|
||||||
|
const selectedRoomId = useSelectedRoom();
|
||||||
|
const compact = useCompactNav();
|
||||||
|
|
||||||
|
const searchParams = useMemo(
|
||||||
|
() => new URLSearchParams(location.search),
|
||||||
|
[location.search]
|
||||||
|
);
|
||||||
|
|
||||||
|
const filterQuery: ForumBoardQuery = useMemo(
|
||||||
|
() => ({
|
||||||
|
category: searchParams.get('category') || undefined,
|
||||||
|
topic: searchParams.get('topic') || undefined,
|
||||||
|
q: searchParams.get('q') || undefined,
|
||||||
|
status: (searchParams.get('status') as ForumBoardQuery['status']) || 'all',
|
||||||
|
sort: (searchParams.get('sort') as ForumBoardQuery['sort']) || 'hot',
|
||||||
|
}),
|
||||||
|
[searchParams]
|
||||||
|
);
|
||||||
|
|
||||||
|
const query: ForumBoardQuery = useMemo(
|
||||||
|
() => ({
|
||||||
|
...filterQuery,
|
||||||
|
post: searchParams.get('post') || undefined,
|
||||||
|
postRoom: searchParams.get('postRoom') || undefined,
|
||||||
|
}),
|
||||||
|
[filterQuery, searchParams]
|
||||||
|
);
|
||||||
|
|
||||||
|
const [sections, setSections] = useState<ForumSection[]>([]);
|
||||||
|
const [threads, setThreads] = useState<ForumThreadSummary[]>([]);
|
||||||
|
const [loadingSections, setLoadingSections] = useState(true);
|
||||||
|
const [loadingThreads, setLoadingThreads] = useState(true);
|
||||||
|
const [loadingMore, setLoadingMore] = useState(false);
|
||||||
|
const [postsNextBatch, setPostsNextBatch] = useState<string | null>(null);
|
||||||
|
const [error, setError] = useState<string | null>(null);
|
||||||
|
|
||||||
|
const applyForumSearchParams = useCallback(
|
||||||
|
(mutate: (next: URLSearchParams) => void) => {
|
||||||
|
const next = new URLSearchParams(location.search);
|
||||||
|
mutate(next);
|
||||||
|
const search = next.toString();
|
||||||
|
const spaceIdOrAlias = getCanonicalAliasOrRoomId(mx, forumSpace.roomId);
|
||||||
|
|
||||||
|
const onTopicRoomRoute =
|
||||||
|
Boolean(selectedRoomId) && selectedRoomId !== forumSpace.roomId;
|
||||||
|
|
||||||
|
// Compact master view only mounts the post list on /:spaceId/. Opening a post
|
||||||
|
// must switch to /feed/ so ForumFeedPage mounts as the detail pane.
|
||||||
|
let pathname = location.pathname;
|
||||||
|
if (onTopicRoomRoute) {
|
||||||
|
pathname = getSpaceLobbyPath(spaceIdOrAlias);
|
||||||
|
} else if (next.get('post')) {
|
||||||
|
pathname = getSpaceFeedPath(spaceIdOrAlias);
|
||||||
|
} else if (compact) {
|
||||||
|
pathname = getSpacePath(spaceIdOrAlias);
|
||||||
|
}
|
||||||
|
|
||||||
|
navigate(
|
||||||
|
{
|
||||||
|
pathname,
|
||||||
|
search: search ? `?${search}` : '',
|
||||||
|
},
|
||||||
|
{ replace: true }
|
||||||
|
);
|
||||||
|
},
|
||||||
|
[
|
||||||
|
location.pathname,
|
||||||
|
location.search,
|
||||||
|
navigate,
|
||||||
|
mx,
|
||||||
|
forumSpace.roomId,
|
||||||
|
selectedRoomId,
|
||||||
|
compact,
|
||||||
|
]
|
||||||
|
);
|
||||||
|
|
||||||
|
const setQueryParam = useCallback(
|
||||||
|
(key: string, value: string | null) => {
|
||||||
|
applyForumSearchParams((next) => {
|
||||||
|
if (!value) next.delete(key);
|
||||||
|
else next.set(key, value);
|
||||||
|
if (key !== 'post') {
|
||||||
|
next.delete('post');
|
||||||
|
next.delete('postRoom');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
},
|
||||||
|
[applyForumSearchParams]
|
||||||
|
);
|
||||||
|
|
||||||
|
const setCategory = useCallback(
|
||||||
|
(category: string | null) => {
|
||||||
|
applyForumSearchParams((next) => {
|
||||||
|
if (!category) next.delete('category');
|
||||||
|
else next.set('category', category);
|
||||||
|
next.delete('topic');
|
||||||
|
next.delete('post');
|
||||||
|
next.delete('postRoom');
|
||||||
|
});
|
||||||
|
},
|
||||||
|
[applyForumSearchParams]
|
||||||
|
);
|
||||||
|
|
||||||
|
const loadSections = useCallback(async () => {
|
||||||
|
setLoadingSections(true);
|
||||||
|
setError(null);
|
||||||
|
try {
|
||||||
|
const topics = await listForumTopics(mx, scope.forumSpaceId);
|
||||||
|
setSections(buildForumSections(topics));
|
||||||
|
} catch (err) {
|
||||||
|
setError(err instanceof Error ? err.message : 'Failed to load forum categories');
|
||||||
|
} finally {
|
||||||
|
setLoadingSections(false);
|
||||||
|
}
|
||||||
|
}, [mx, scope.forumSpaceId]);
|
||||||
|
|
||||||
|
const refreshThreads = useCallback(async (options?: { silent?: boolean }) => {
|
||||||
|
if (!options?.silent) setLoadingThreads(true);
|
||||||
|
setError(null);
|
||||||
|
try {
|
||||||
|
const roomScopes = scopesFromSelection(sections, filterQuery.category, filterQuery.topic);
|
||||||
|
if (roomScopes.length === 0) {
|
||||||
|
setThreads([]);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
let posts;
|
||||||
|
if (roomScopes.length === 1) {
|
||||||
|
const result = await listTopicFeedPosts(mx, roomScopes[0].roomId);
|
||||||
|
posts = result.posts;
|
||||||
|
setPostsNextBatch(result.nextBatch);
|
||||||
|
const scopeMeta = roomScopes[0];
|
||||||
|
posts.forEach((post) => {
|
||||||
|
post.topicRoomId = scopeMeta.roomId;
|
||||||
|
if (scopeMeta.sectionTitle) post.sectionTitle = scopeMeta.sectionTitle;
|
||||||
|
if (scopeMeta.topicName) post.topicName = scopeMeta.topicName;
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
posts = await loadAggregatedTopicFeed(mx, roomScopes);
|
||||||
|
setPostsNextBatch(null);
|
||||||
|
}
|
||||||
|
|
||||||
|
setThreads(buildTopicThreads(posts, filterQuery));
|
||||||
|
} catch (err) {
|
||||||
|
setError(err instanceof Error ? err.message : 'Failed to load forum posts');
|
||||||
|
} finally {
|
||||||
|
if (!options?.silent) setLoadingThreads(false);
|
||||||
|
}
|
||||||
|
}, [mx, sections, filterQuery]);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
loadSections();
|
||||||
|
}, [loadSections]);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
const handleSpaceChild = (event: MatrixEvent) => {
|
||||||
|
if (event.getType() !== StateEvent.SpaceChild) return;
|
||||||
|
const roomId = event.getRoomId();
|
||||||
|
if (!roomId) return;
|
||||||
|
if (
|
||||||
|
roomId === forumSpace.roomId ||
|
||||||
|
sections.some((section) => section.spaceId === roomId)
|
||||||
|
) {
|
||||||
|
loadSections();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
mx.on(RoomStateEvent.Events, handleSpaceChild);
|
||||||
|
return () => {
|
||||||
|
mx.removeListener(RoomStateEvent.Events, handleSpaceChild);
|
||||||
|
};
|
||||||
|
}, [mx, forumSpace.roomId, sections, loadSections]);
|
||||||
|
|
||||||
|
const createSpaceModal = useAtomValue(createSpaceModalAtom);
|
||||||
|
const createRoomModal = useAtomValue(createRoomModalAtom);
|
||||||
|
const prevCreateSpaceModal = useRef(createSpaceModal);
|
||||||
|
const prevCreateRoomModal = useRef(createRoomModal);
|
||||||
|
useEffect(() => {
|
||||||
|
if (prevCreateSpaceModal.current && !createSpaceModal) {
|
||||||
|
loadSections();
|
||||||
|
}
|
||||||
|
if (prevCreateRoomModal.current && !createRoomModal) {
|
||||||
|
loadSections();
|
||||||
|
}
|
||||||
|
prevCreateSpaceModal.current = createSpaceModal;
|
||||||
|
prevCreateRoomModal.current = createRoomModal;
|
||||||
|
}, [createSpaceModal, createRoomModal, loadSections]);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (loadingSections) return;
|
||||||
|
void refreshThreads();
|
||||||
|
}, [
|
||||||
|
loadingSections,
|
||||||
|
refreshThreads,
|
||||||
|
filterQuery.category,
|
||||||
|
filterQuery.topic,
|
||||||
|
filterQuery.q,
|
||||||
|
filterQuery.status,
|
||||||
|
filterQuery.sort,
|
||||||
|
]);
|
||||||
|
|
||||||
|
const scopedRooms = useMemo(() => {
|
||||||
|
if (loadingSections) return [];
|
||||||
|
const roomScopes = scopesFromSelection(sections, filterQuery.category, filterQuery.topic);
|
||||||
|
return roomScopes
|
||||||
|
.map((scope) => mx.getRoom(scope.roomId))
|
||||||
|
.filter((room): room is Room => room !== null);
|
||||||
|
}, [loadingSections, sections, filterQuery.category, filterQuery.topic, mx]);
|
||||||
|
|
||||||
|
useForumRoomLiveUpdates(scopedRooms, () => {
|
||||||
|
void refreshThreads({ silent: true });
|
||||||
|
});
|
||||||
|
|
||||||
|
const selectedPostId = query.post ?? null;
|
||||||
|
const selectedThread = threads.find((t) => t.eventId === selectedPostId);
|
||||||
|
const activeTopicRoomId =
|
||||||
|
query.postRoom || selectedThread?.topicRoomId || query.topic || scope.topicRoomId || null;
|
||||||
|
|
||||||
|
const selectPost = useCallback(
|
||||||
|
(eventId: string | null, topicRoomId?: string) => {
|
||||||
|
applyForumSearchParams((next) => {
|
||||||
|
if (!eventId) {
|
||||||
|
next.delete('post');
|
||||||
|
next.delete('postRoom');
|
||||||
|
} else {
|
||||||
|
next.set('post', eventId);
|
||||||
|
if (topicRoomId) next.set('postRoom', topicRoomId);
|
||||||
|
else next.delete('postRoom');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
},
|
||||||
|
[applyForumSearchParams]
|
||||||
|
);
|
||||||
|
|
||||||
|
const insertThreadFromNewPost = useCallback(
|
||||||
|
(published: ForumPublishedPost): ForumPost | null => {
|
||||||
|
const roomScopes = scopesFromSelection(sections, filterQuery.category, filterQuery.topic);
|
||||||
|
const inScope =
|
||||||
|
filterQuery.topic === published.topicRoomId ||
|
||||||
|
(!filterQuery.topic &&
|
||||||
|
(filterQuery.category
|
||||||
|
? roomScopes.some((s) => s.roomId === published.topicRoomId)
|
||||||
|
: true));
|
||||||
|
|
||||||
|
const scopeMeta = roomScopes.find((s) => s.roomId === published.topicRoomId);
|
||||||
|
const post = createForumPostFromPayload(
|
||||||
|
mx,
|
||||||
|
published.topicRoomId,
|
||||||
|
published.eventId,
|
||||||
|
{
|
||||||
|
title: published.title,
|
||||||
|
plainText: published.plainText,
|
||||||
|
formattedHtml: published.formattedHtml,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
topicRoomId: published.topicRoomId,
|
||||||
|
sectionTitle: scopeMeta?.sectionTitle,
|
||||||
|
topicName: scopeMeta?.topicName,
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
if (inScope) {
|
||||||
|
const [summary] = buildThreadSummaries([post]);
|
||||||
|
if (summary) {
|
||||||
|
setThreads((prev) => {
|
||||||
|
const without = prev.filter((t) => t.eventId !== summary.eventId);
|
||||||
|
const merged = [summary, ...without];
|
||||||
|
return applyTopicStatusSort(merged, filterQuery.status || 'all', filterQuery.sort || 'hot');
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return post;
|
||||||
|
},
|
||||||
|
[mx, sections, filterQuery]
|
||||||
|
);
|
||||||
|
|
||||||
|
const recordThreadReply = useCallback((rootEventId: string) => {
|
||||||
|
setThreads((prev) =>
|
||||||
|
prev.map((t) =>
|
||||||
|
t.eventId === rootEventId
|
||||||
|
? {
|
||||||
|
...t,
|
||||||
|
totalReplies: t.totalReplies + 1,
|
||||||
|
lastActivityTs: Date.now(),
|
||||||
|
}
|
||||||
|
: t
|
||||||
|
)
|
||||||
|
);
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
const loadMorePosts = useCallback(async () => {
|
||||||
|
if (!postsNextBatch || loadingMore) return;
|
||||||
|
const roomScopes = scopesFromSelection(sections, filterQuery.category, filterQuery.topic);
|
||||||
|
if (roomScopes.length !== 1) return;
|
||||||
|
|
||||||
|
setLoadingMore(true);
|
||||||
|
setError(null);
|
||||||
|
try {
|
||||||
|
const scopeMeta = roomScopes[0];
|
||||||
|
const result = await listTopicFeedPosts(mx, scopeMeta.roomId, {
|
||||||
|
from: postsNextBatch,
|
||||||
|
minRoots: 1,
|
||||||
|
});
|
||||||
|
setPostsNextBatch(result.nextBatch);
|
||||||
|
result.posts.forEach((post) => {
|
||||||
|
post.topicRoomId = scopeMeta.roomId;
|
||||||
|
if (scopeMeta.sectionTitle) post.sectionTitle = scopeMeta.sectionTitle;
|
||||||
|
if (scopeMeta.topicName) post.topicName = scopeMeta.topicName;
|
||||||
|
});
|
||||||
|
setThreads((prev) => {
|
||||||
|
const existingIds = new Set(prev.map((t) => t.eventId));
|
||||||
|
const added = buildTopicThreads(result.posts, filterQuery).filter(
|
||||||
|
(t) => !existingIds.has(t.eventId)
|
||||||
|
);
|
||||||
|
const merged = [...prev, ...added];
|
||||||
|
const sort = filterQuery.sort || 'hot';
|
||||||
|
merged.sort((a, b) => {
|
||||||
|
if (sort === 'new') return b.timestamp - a.timestamp;
|
||||||
|
if (sort === 'top') return b.totalReplies - a.totalReplies;
|
||||||
|
const hotA = a.totalReplies * 4 + Math.floor((a.lastActivityTs - a.timestamp) / 3600000);
|
||||||
|
const hotB = b.totalReplies * 4 + Math.floor((b.lastActivityTs - b.timestamp) / 3600000);
|
||||||
|
return hotB - hotA;
|
||||||
|
});
|
||||||
|
return merged;
|
||||||
|
});
|
||||||
|
} catch (err) {
|
||||||
|
setError(err instanceof Error ? err.message : 'Failed to load older posts');
|
||||||
|
} finally {
|
||||||
|
setLoadingMore(false);
|
||||||
|
}
|
||||||
|
}, [postsNextBatch, loadingMore, sections, filterQuery, mx]);
|
||||||
|
|
||||||
|
return {
|
||||||
|
forumSpace,
|
||||||
|
sections,
|
||||||
|
threads,
|
||||||
|
query,
|
||||||
|
loadingSections,
|
||||||
|
loadingThreads,
|
||||||
|
error,
|
||||||
|
selectedPostId,
|
||||||
|
selectedThread,
|
||||||
|
activeTopicRoomId,
|
||||||
|
setQueryParam,
|
||||||
|
setCategory,
|
||||||
|
selectPost,
|
||||||
|
refreshThreads,
|
||||||
|
insertThreadFromNewPost,
|
||||||
|
recordThreadReply,
|
||||||
|
loadMorePosts,
|
||||||
|
hasMorePosts: Boolean(postsNextBatch),
|
||||||
|
loadingMore,
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -14,7 +14,8 @@ import { RoomTimeline } from './RoomTimeline';
|
|||||||
import { RoomViewTyping } from './RoomViewTyping';
|
import { RoomViewTyping } from './RoomViewTyping';
|
||||||
import { RoomTombstone } from './RoomTombstone';
|
import { RoomTombstone } from './RoomTombstone';
|
||||||
import { RoomInput } from './RoomInput';
|
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 { Page } from '../../components/page';
|
||||||
import { RoomViewHeader } from './RoomViewHeader';
|
import { RoomViewHeader } from './RoomViewHeader';
|
||||||
import { useKeyDown } from '../../hooks/useKeyDown';
|
import { useKeyDown } from '../../hooks/useKeyDown';
|
||||||
@@ -105,7 +106,7 @@ export function RoomView({ room, eventId }: { room: Room; eventId?: string }) {
|
|||||||
);
|
);
|
||||||
|
|
||||||
const flushComposer = immersive;
|
const flushComposer = immersive;
|
||||||
const composerPadding = flushComposer ? '0' : `0 ${config.space.S400}`;
|
const composerPadding = '0';
|
||||||
const showHeader = !immersive;
|
const showHeader = !immersive;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@@ -116,7 +117,7 @@ export function RoomView({ room, eventId }: { room: Room; eventId?: string }) {
|
|||||||
) : (
|
) : (
|
||||||
<>
|
<>
|
||||||
<MobileSwipeToReplyLayer room={room} editor={editor}>
|
<MobileSwipeToReplyLayer room={room} editor={editor}>
|
||||||
<Box grow="Yes" direction="Column">
|
<Box grow="Yes" direction="Column" style={{ position: 'relative', minHeight: 0 }}>
|
||||||
<RoomTimeline
|
<RoomTimeline
|
||||||
key={roomId}
|
key={roomId}
|
||||||
room={room}
|
room={room}
|
||||||
@@ -124,7 +125,10 @@ export function RoomView({ room, eventId }: { room: Room; eventId?: string }) {
|
|||||||
roomInputRef={roomInputRef}
|
roomInputRef={roomInputRef}
|
||||||
editor={editor}
|
editor={editor}
|
||||||
/>
|
/>
|
||||||
<RoomViewTyping room={room} />
|
<div className={roomViewCss.RoomViewBottomFloat}>
|
||||||
|
<RoomViewTyping room={room} />
|
||||||
|
{!hideActivity && <RoomViewFollowing room={room} />}
|
||||||
|
</div>
|
||||||
</Box>
|
</Box>
|
||||||
</MobileSwipeToReplyLayer>
|
</MobileSwipeToReplyLayer>
|
||||||
<Box
|
<Box
|
||||||
@@ -134,13 +138,6 @@ export function RoomView({ room, eventId }: { room: Room; eventId?: string }) {
|
|||||||
data-composer-flush={flushComposer ? 'true' : undefined}
|
data-composer-flush={flushComposer ? 'true' : undefined}
|
||||||
className={composerCss.ComposerDock}
|
className={composerCss.ComposerDock}
|
||||||
>
|
>
|
||||||
{immersive && !hideActivity && (
|
|
||||||
<div className={composerCss.FollowingFloat}>
|
|
||||||
<div className={composerCss.FollowingFloatHit}>
|
|
||||||
<RoomViewFollowing room={room} />
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
<div style={{ padding: composerPadding }}>
|
<div style={{ padding: composerPadding }}>
|
||||||
{tombstoneEvent ? (
|
{tombstoneEvent ? (
|
||||||
<RoomTombstone
|
<RoomTombstone
|
||||||
@@ -171,12 +168,6 @@ export function RoomView({ room, eventId }: { room: Room; eventId?: string }) {
|
|||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
{!immersive &&
|
|
||||||
(hideActivity ? (
|
|
||||||
<RoomViewFollowingPlaceholder />
|
|
||||||
) : (
|
|
||||||
<RoomViewFollowing room={room} />
|
|
||||||
))}
|
|
||||||
</Box>
|
</Box>
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
|
|||||||
@@ -2,6 +2,20 @@ import { style } from '@vanilla-extract/css';
|
|||||||
import { recipe } from '@vanilla-extract/recipes';
|
import { recipe } from '@vanilla-extract/recipes';
|
||||||
import { DefaultReset, color, config, toRem } from 'folds';
|
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([
|
export const RoomViewFollowingPlaceholder = style([
|
||||||
DefaultReset,
|
DefaultReset,
|
||||||
{
|
{
|
||||||
@@ -15,20 +29,12 @@ export const RoomViewFollowing = recipe({
|
|||||||
{
|
{
|
||||||
minHeight: toRem(28),
|
minHeight: toRem(28),
|
||||||
padding: `0 ${config.space.S400}`,
|
padding: `0 ${config.space.S400}`,
|
||||||
width: '100%',
|
marginLeft: 'auto',
|
||||||
backgroundColor: color.Surface.Container,
|
maxWidth: '50%',
|
||||||
|
backgroundColor: 'transparent',
|
||||||
color: color.Surface.OnContainer,
|
color: color.Surface.OnContainer,
|
||||||
outline: 'none',
|
outline: 'none',
|
||||||
selectors: {
|
pointerEvents: 'auto',
|
||||||
// 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',
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
variants: {
|
variants: {
|
||||||
|
|||||||
@@ -62,6 +62,10 @@ import colorMXID from '../../../../util/colorMXID';
|
|||||||
import { getPowerTagIconSrc } from '../../../hooks/useMemberPowerTag';
|
import { getPowerTagIconSrc } from '../../../hooks/useMemberPowerTag';
|
||||||
import { Presence, useUserPresence } from '../../../hooks/useUserPresence';
|
import { Presence, useUserPresence } from '../../../hooks/useUserPresence';
|
||||||
import { useOtherUserColor } from '../../../hooks/useUserColor';
|
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;
|
export type ReactionHandler = (keyOrMxc: string, shortcode: string) => void;
|
||||||
|
|
||||||
@@ -754,8 +758,15 @@ export const Message = as<'div', MessageProps>(
|
|||||||
) => {
|
) => {
|
||||||
const mx = useMatrixClient();
|
const mx = useMatrixClient();
|
||||||
const useAuthentication = useMediaAuthentication();
|
const useAuthentication = useMediaAuthentication();
|
||||||
|
const direct = useIsDirectRoom();
|
||||||
const senderId = mEvent.getSender() ?? '';
|
const senderId = mEvent.getSender() ?? '';
|
||||||
const senderPresence = useUserPresence(senderId);
|
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 [hover, setHover] = useState(false);
|
||||||
const { hoverProps } = useHover({ onHoverChange: setHover });
|
const { hoverProps } = useHover({ onHoverChange: setHover });
|
||||||
@@ -785,7 +796,7 @@ export const Message = as<'div', MessageProps>(
|
|||||||
const senderAvatarMxc = getMemberAvatarMxc(room, senderId);
|
const senderAvatarMxc = getMemberAvatarMxc(room, senderId);
|
||||||
|
|
||||||
// Get custom user color from avatar metadata (takes priority)
|
// Get custom user color from avatar metadata (takes priority)
|
||||||
const customUserColor = useOtherUserColor(senderId, senderAvatarMxc);
|
const customUserColor = useOtherUserColor(senderId, room);
|
||||||
|
|
||||||
const tagColor = memberPowerTag?.color
|
const tagColor = memberPowerTag?.color
|
||||||
? accessibleTagColors?.get(memberPowerTag.color)
|
? accessibleTagColors?.get(memberPowerTag.color)
|
||||||
@@ -796,14 +807,16 @@ export const Message = as<'div', MessageProps>(
|
|||||||
|
|
||||||
// Priority: custom user color > tag color (non-legacy) > colorMXID (legacy)
|
// Priority: custom user color > tag color (non-legacy) > colorMXID (legacy)
|
||||||
const usernameColor = customUserColor ?? (legacyUsernameColor ? colorMXID(senderId) : tagColor);
|
const usernameColor = customUserColor ?? (legacyUsernameColor ? colorMXID(senderId) : tagColor);
|
||||||
|
const showNameplate = direct && hover && Boolean(nameplateUrl);
|
||||||
|
|
||||||
const headerJSX = !collapse && (
|
const headerJSX = !collapse && (
|
||||||
<Box
|
<Box
|
||||||
gap="300"
|
gap="300"
|
||||||
direction={messageLayout === MessageLayout.Compact ? 'RowReverse' : 'Row'}
|
direction={messageLayout === MessageLayout.Compact ? 'RowReverse' : 'Row'}
|
||||||
justifyContent="SpaceBetween"
|
justifyContent="SpaceBetween"
|
||||||
alignItems="Baseline"
|
alignItems="Center"
|
||||||
grow="Yes"
|
grow="Yes"
|
||||||
|
data-message-header=""
|
||||||
>
|
>
|
||||||
<Box alignItems="Center" gap="200">
|
<Box alignItems="Center" gap="200">
|
||||||
<Username
|
<Username
|
||||||
@@ -823,23 +836,41 @@ export const Message = as<'div', MessageProps>(
|
|||||||
</Username>
|
</Username>
|
||||||
{tagIconSrc && <PowerIcon size="100" iconSrc={tagIconSrc} />}
|
{tagIconSrc && <PowerIcon size="100" iconSrc={tagIconSrc} />}
|
||||||
</Box>
|
</Box>
|
||||||
<Box shrink="No" gap="100">
|
<Box shrink="No" className={css.MessageNameplateAnchor}>
|
||||||
{messageLayout === MessageLayout.Modern && hover && (
|
<Box shrink="No" gap="100" alignItems="Center">
|
||||||
<>
|
{messageLayout === MessageLayout.Modern && hover && (
|
||||||
<Text as="span" size="T200" priority="300">
|
<>
|
||||||
{senderId}
|
<Text as="span" size="T200" priority="300">
|
||||||
</Text>
|
{senderId}
|
||||||
<Text as="span" size="T200" priority="300">
|
</Text>
|
||||||
|
|
<Text as="span" size="T200" priority="300">
|
||||||
</Text>
|
|
|
||||||
</>
|
</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>
|
||||||
</Box>
|
</Box>
|
||||||
);
|
);
|
||||||
@@ -856,24 +887,38 @@ export const Message = as<'div', MessageProps>(
|
|||||||
<AvatarBase
|
<AvatarBase
|
||||||
className={messageLayout === MessageLayout.Bubble ? css.BubbleAvatarBase : undefined}
|
className={messageLayout === MessageLayout.Bubble ? css.BubbleAvatarBase : undefined}
|
||||||
>
|
>
|
||||||
<Avatar
|
<div className={css.MessageAvatarStack}>
|
||||||
className={classNames(css.MessageAvatar, presenceClass)}
|
<Avatar
|
||||||
as="button"
|
className={classNames(
|
||||||
size="300"
|
avatarDecorationUrl ? css.MessageAvatarCircular : css.MessageAvatar,
|
||||||
data-user-id={senderId}
|
!avatarDecorationUrl && presenceClass
|
||||||
onClick={onUserClick}
|
)}
|
||||||
>
|
radii={avatarDecorationUrl ? 'Pill' : undefined}
|
||||||
<UserAvatar
|
as="button"
|
||||||
userId={senderId}
|
size="300"
|
||||||
src={
|
data-user-id={senderId}
|
||||||
senderAvatarMxc
|
onClick={onUserClick}
|
||||||
? mxcUrlToHttp(mx, senderAvatarMxc, useAuthentication, 48, 48, 'crop') ?? undefined
|
>
|
||||||
: undefined
|
<UserAvatar
|
||||||
}
|
userId={senderId}
|
||||||
alt={senderDisplayName}
|
src={
|
||||||
renderFallback={() => <Icon size="200" src={Icons.User} filled />}
|
senderAvatarMxc
|
||||||
/>
|
? mxcUrlToHttp(mx, senderAvatarMxc, useAuthentication, 48, 48, 'crop') ?? undefined
|
||||||
</Avatar>
|
: undefined
|
||||||
|
}
|
||||||
|
alt={senderDisplayName}
|
||||||
|
renderFallback={() => <Icon size="200" src={Icons.User} filled />}
|
||||||
|
/>
|
||||||
|
</Avatar>
|
||||||
|
{avatarDecorationUrl && (
|
||||||
|
<img
|
||||||
|
className={avatarDecorationCss.AvatarDecorationOverlay}
|
||||||
|
src={avatarDecorationUrl}
|
||||||
|
alt=""
|
||||||
|
draggable={false}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
</AvatarBase>
|
</AvatarBase>
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -958,6 +1003,10 @@ export const Message = as<'div', MessageProps>(
|
|||||||
{...focusWithinProps}
|
{...focusWithinProps}
|
||||||
ref={ref}
|
ref={ref}
|
||||||
>
|
>
|
||||||
|
<div
|
||||||
|
className={css.MessageContentLayer}
|
||||||
|
data-message-nameplate-readable={showNameplate ? '' : undefined}
|
||||||
|
>
|
||||||
{!edit && (hover || !!menuAnchor || !!emojiBoardAnchor) && (
|
{!edit && (hover || !!menuAnchor || !!emojiBoardAnchor) && (
|
||||||
<div className={css.MessageOptionsBase}>
|
<div className={css.MessageOptionsBase}>
|
||||||
<Menu className={css.MessageOptionsBar} variant="SurfaceVariant">
|
<Menu className={css.MessageOptionsBar} variant="SurfaceVariant">
|
||||||
@@ -1246,6 +1295,7 @@ export const Message = as<'div', MessageProps>(
|
|||||||
{msgContentJSX}
|
{msgContentJSX}
|
||||||
</ModernLayout>
|
</ModernLayout>
|
||||||
)}
|
)}
|
||||||
|
</div>
|
||||||
</MessageBase>
|
</MessageBase>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,63 +1,5 @@
|
|||||||
import { style } from '@vanilla-extract/css';
|
import { style } from '@vanilla-extract/css';
|
||||||
import { recipe } from '@vanilla-extract/recipes';
|
|
||||||
import { DefaultReset, color, config } from 'folds';
|
|
||||||
|
|
||||||
export const ComposerDock = style({
|
export const ComposerDock = style({
|
||||||
position: 'relative',
|
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 {
|
import {
|
||||||
isBackgroundSyncSupported,
|
isBackgroundSyncSupported,
|
||||||
getBackgroundSyncStatus,
|
getBackgroundSyncStatus,
|
||||||
requestResetPushRegistration,
|
requestBatteryExemption,
|
||||||
|
startBackgroundSync,
|
||||||
triggerBackgroundSyncPing,
|
triggerBackgroundSyncPing,
|
||||||
|
type ListenerStatus,
|
||||||
} from '../../../utils/backgroundSync';
|
} from '../../../utils/backgroundSync';
|
||||||
|
|
||||||
function EmailNotification() {
|
function EmailNotification() {
|
||||||
@@ -166,57 +168,107 @@ export function SystemNotification() {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
type PushStatus = {
|
/** Android-only controls for Paarrot's persistent message listener. */
|
||||||
registered: boolean;
|
|
||||||
distributor: string;
|
|
||||||
endpoint: string;
|
|
||||||
};
|
|
||||||
|
|
||||||
/** Android-only section showing UnifiedPush registration status and controls. */
|
|
||||||
function AndroidPushNotifications() {
|
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 [loading, setLoading] = useState(true);
|
||||||
|
|
||||||
const refresh = useCallback(async () => {
|
const refresh = useCallback(async () => {
|
||||||
setLoading(true);
|
setStatus(await getBackgroundSyncStatus());
|
||||||
const s = await getBackgroundSyncStatus();
|
|
||||||
setStatus(
|
|
||||||
s
|
|
||||||
? {
|
|
||||||
registered: s.registered,
|
|
||||||
distributor: s.distributor || '',
|
|
||||||
endpoint: s.endpoint || '',
|
|
||||||
}
|
|
||||||
: undefined
|
|
||||||
);
|
|
||||||
setLoading(false);
|
setLoading(false);
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
void refresh();
|
void refresh();
|
||||||
|
const id = window.setInterval(() => void refresh(), 4000);
|
||||||
|
return () => window.clearInterval(id);
|
||||||
}, [refresh]);
|
}, [refresh]);
|
||||||
|
|
||||||
const [resetState, reset] = useAsyncCallback(
|
const [batteryState, allowBattery] = useAsyncCallback(
|
||||||
useCallback(async () => {
|
useCallback(async () => {
|
||||||
await requestResetPushRegistration();
|
await requestBatteryExemption();
|
||||||
await refresh();
|
await refresh();
|
||||||
}, [refresh])
|
}, [refresh])
|
||||||
);
|
);
|
||||||
|
|
||||||
|
const [startState, startListener] = useAsyncCallback(
|
||||||
|
useCallback(async () => {
|
||||||
|
await requestSystemNotificationPermission();
|
||||||
|
await startBackgroundSync(mx);
|
||||||
|
await refresh();
|
||||||
|
}, [mx, refresh])
|
||||||
|
);
|
||||||
|
|
||||||
const [pingState, ping] = useAsyncCallback(
|
const [pingState, ping] = useAsyncCallback(
|
||||||
useCallback(async () => {
|
useCallback(async () => {
|
||||||
await triggerBackgroundSyncPing('manual-test');
|
await triggerBackgroundSyncPing('manual-test');
|
||||||
}, [])
|
await refresh();
|
||||||
|
}, [refresh])
|
||||||
);
|
);
|
||||||
|
|
||||||
const isBusy =
|
const isBusy =
|
||||||
loading ||
|
loading ||
|
||||||
resetState.status === AsyncStatus.Loading ||
|
batteryState.status === AsyncStatus.Loading ||
|
||||||
|
startState.status === AsyncStatus.Loading ||
|
||||||
pingState.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 (
|
return (
|
||||||
<Box direction="Column" gap="100">
|
<Box direction="Column" gap="100">
|
||||||
<Text size="L400">Android Push (UnifiedPush)</Text>
|
<Text size="L400">Android Notifications</Text>
|
||||||
<SequenceCard
|
<SequenceCard
|
||||||
className={SequenceCardStyle}
|
className={SequenceCardStyle}
|
||||||
variant="SurfaceVariant"
|
variant="SurfaceVariant"
|
||||||
@@ -224,57 +276,78 @@ function AndroidPushNotifications() {
|
|||||||
gap="400"
|
gap="400"
|
||||||
>
|
>
|
||||||
<SettingTile
|
<SettingTile
|
||||||
title="Background Notifications"
|
title="Message listener"
|
||||||
description={
|
description={
|
||||||
loading ? (
|
<>
|
||||||
'Loading status…'
|
{statusDescription}
|
||||||
) : status === undefined ? (
|
{actionError !== undefined && (
|
||||||
<Text as="span" style={{ color: color.Critical.Main }} size="T200">
|
<Text as="span" style={{ color: color.Critical.Main, display: 'block' }} size="T200">
|
||||||
Failed to read push status.
|
{actionError instanceof Error ? actionError.message : String(actionError)}
|
||||||
</Text>
|
|
||||||
) : status.registered ? (
|
|
||||||
<>
|
|
||||||
<Text as="span" size="T200">
|
|
||||||
{`Distributor: ${status.distributor || 'unknown'}`}
|
|
||||||
</Text>
|
</Text>
|
||||||
</>
|
)}
|
||||||
|
</>
|
||||||
|
}
|
||||||
|
after={
|
||||||
|
loading ? (
|
||||||
|
<Spinner variant="Secondary" />
|
||||||
) : (
|
) : (
|
||||||
<Text as="span" style={{ color: color.Warning?.Main ?? color.Critical.Main }} size="T200">
|
<Button
|
||||||
Not registered. Tap "Reset" to choose a distributor app.
|
size="300"
|
||||||
</Text>
|
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
|
<SettingTile
|
||||||
title="Change Distributor"
|
title="Unrestricted battery"
|
||||||
description="Re-open the UnifiedPush distributor selection dialog."
|
description="Lets the listener stay awake when the screen is off."
|
||||||
after={
|
after={
|
||||||
<Button
|
<Button
|
||||||
size="300"
|
size="300"
|
||||||
radii="300"
|
radii="300"
|
||||||
variant="Secondary"
|
variant="Secondary"
|
||||||
disabled={isBusy}
|
disabled={isBusy || Boolean(status?.batteryIgnored)}
|
||||||
onClick={() => void reset()}
|
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" />
|
<Spinner variant="Secondary" size="200" />
|
||||||
) : (
|
) : (
|
||||||
<Text size="B300">Reset</Text>
|
<Text size="B300">{status?.batteryIgnored ? 'Allowed' : 'Allow'}</Text>
|
||||||
)}
|
)}
|
||||||
</Button>
|
</Button>
|
||||||
}
|
}
|
||||||
/>
|
/>
|
||||||
<SettingTile
|
<SettingTile
|
||||||
title="Test Notification"
|
title="Test Notification"
|
||||||
description="Trigger a test push ping to verify the pipeline works."
|
description="Ask the listener to check for messages now."
|
||||||
after={
|
after={
|
||||||
<Button
|
<Button
|
||||||
size="300"
|
size="300"
|
||||||
radii="300"
|
radii="300"
|
||||||
variant="Secondary"
|
variant="Secondary"
|
||||||
disabled={isBusy}
|
disabled={isBusy}
|
||||||
onClick={() => void ping()}
|
onClick={() =>
|
||||||
|
void ping().catch((err) =>
|
||||||
|
console.error('[AndroidNotifications] Failed to trigger listener sync:', err)
|
||||||
|
)
|
||||||
|
}
|
||||||
>
|
>
|
||||||
{pingState.status === AsyncStatus.Loading ? (
|
{pingState.status === AsyncStatus.Loading ? (
|
||||||
<Spinner variant="Secondary" size="200" />
|
<Spinner variant="Secondary" size="200" />
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
import React, { useEffect } from 'react';
|
import React, { useEffect } from 'react';
|
||||||
import { MatrixClient } from 'matrix-js-sdk';
|
import { MatrixClient } from 'matrix-js-sdk';
|
||||||
|
import * as lucide from 'lucide-react';
|
||||||
import { Plugin, createPluginContext } from '@paarrot/plugin-manager';
|
import { Plugin, createPluginContext } from '@paarrot/plugin-manager';
|
||||||
import { pluginMarketplaceManager, pluginRegistry } from './PluginAPI';
|
import { pluginMarketplaceManager, pluginRegistry } from './PluginAPI';
|
||||||
import { sendNotification } from '../../../utils/tauri';
|
import { sendNotification } from '../../../utils/tauri';
|
||||||
@@ -80,6 +81,7 @@ export function PluginLoader({ matrixClient, children }: PluginLoaderProps) {
|
|||||||
matrixClient.off(eventType as any, handler as any),
|
matrixClient.off(eventType as any, handler as any),
|
||||||
},
|
},
|
||||||
React,
|
React,
|
||||||
|
lucide,
|
||||||
});
|
});
|
||||||
|
|
||||||
console.log('[PluginLoader] compatContext.React:', !!compatContext.React);
|
console.log('[PluginLoader] compatContext.React:', !!compatContext.React);
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import { useCallback, ClipboardEventHandler } from 'react';
|
import { useCallback, ClipboardEventHandler } from 'react';
|
||||||
import { getDataTransferFiles } from '../utils/dom';
|
import { getDataTransferFiles } from '../utils/dom';
|
||||||
import { readClipboardImage, isTauri, isLinux } from '../utils/tauri';
|
import { readClipboardImage, isTauri, isLinux, isCapacitorNative } from '../utils/tauri';
|
||||||
|
|
||||||
const filesFromClipboardItems = (data: DataTransfer | null): File[] => {
|
const filesFromClipboardItems = (data: DataTransfer | null): File[] => {
|
||||||
if (!data?.items) return [];
|
if (!data?.items) return [];
|
||||||
@@ -50,9 +50,30 @@ const getClipboardFiles = (data: DataTransfer | null): File[] => {
|
|||||||
return filesFromHtmlImage(data);
|
return filesFromHtmlImage(data);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/** Async Clipboard API fallback (when paste event has no file payload). */
|
||||||
|
const filesFromClipboardApi = async (): Promise<File[]> => {
|
||||||
|
if (!navigator.clipboard?.read) return [];
|
||||||
|
try {
|
||||||
|
const items = await navigator.clipboard.read();
|
||||||
|
const files: File[] = [];
|
||||||
|
for (const item of items) {
|
||||||
|
for (const type of item.types) {
|
||||||
|
if (!type.startsWith('image/')) continue;
|
||||||
|
const blob = await item.getType(type);
|
||||||
|
const ext = type.split('/')[1]?.replace('+xml', '') || 'png';
|
||||||
|
files.push(new File([blob], `clipboard-image.${ext}`, { type }));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return files;
|
||||||
|
} catch {
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Paste handler for RoomInput. Supports clipboard images via files, DataTransferItem
|
* Paste handler for RoomInput. Supports clipboard images via files, DataTransferItem
|
||||||
* list, and HTML data-URL fallbacks (common on mobile WebViews).
|
* list, HTML data-URL fallbacks, and Clipboard API (common on mobile WebViews).
|
||||||
|
* On Capacitor Android, native OnReceiveContent also routes images into the share pipeline.
|
||||||
*/
|
*/
|
||||||
export const useFilePasteHandler = (onPaste: (file: File[]) => void): ClipboardEventHandler =>
|
export const useFilePasteHandler = (onPaste: (file: File[]) => void): ClipboardEventHandler =>
|
||||||
useCallback(
|
useCallback(
|
||||||
@@ -72,6 +93,17 @@ export const useFilePasteHandler = (onPaste: (file: File[]) => void): ClipboardE
|
|||||||
evt.preventDefault();
|
evt.preventDefault();
|
||||||
evt.stopPropagation();
|
evt.stopPropagation();
|
||||||
onPaste([clipboardImage]);
|
onPaste([clipboardImage]);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Mobile WebView / Capacitor: paste events often omit file payloads.
|
||||||
|
if (isCapacitorNative()) {
|
||||||
|
const apiFiles = await filesFromClipboardApi();
|
||||||
|
if (apiFiles.length > 0) {
|
||||||
|
evt.preventDefault();
|
||||||
|
evt.stopPropagation();
|
||||||
|
onPaste(apiFiles);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -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,8 +1,7 @@
|
|||||||
import { useAtomValue } from 'jotai';
|
import { useAtomValue, useStore } from 'jotai';
|
||||||
import { useAtom, useSetAtom } from 'jotai';
|
|
||||||
import React, { ReactNode, useCallback, useEffect, useRef, useState, Fragment } from 'react';
|
import React, { ReactNode, useCallback, useEffect, useRef, useState, Fragment } from 'react';
|
||||||
import { useNavigate } from 'react-router-dom';
|
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 { roomToUnreadAtom, unreadEqual, unreadInfoToUnread } from '../../state/room/roomToUnread';
|
||||||
import LogoSVG from '../../../../public/res/svg/paarrot.svg';
|
import LogoSVG from '../../../../public/res/svg/paarrot.svg';
|
||||||
import LogoUnreadSVG from '../../../../public/res/svg/paarrot-unread.svg';
|
import LogoUnreadSVG from '../../../../public/res/svg/paarrot-unread.svg';
|
||||||
@@ -16,6 +15,7 @@ import { useMatrixClient } from '../../hooks/useMatrixClient';
|
|||||||
import { getDirectRoomPath, getHomeRoomPath, getSpaceRoomPath, getInboxInvitesPath } from '../pathUtils';
|
import { getDirectRoomPath, getHomeRoomPath, getSpaceRoomPath, getInboxInvitesPath } from '../pathUtils';
|
||||||
import {
|
import {
|
||||||
getMemberDisplayName,
|
getMemberDisplayName,
|
||||||
|
getMemberAvatarMxc,
|
||||||
getNotificationType,
|
getNotificationType,
|
||||||
getUnreadInfo,
|
getUnreadInfo,
|
||||||
isNotificationEvent,
|
isNotificationEvent,
|
||||||
@@ -23,13 +23,20 @@ import {
|
|||||||
guessPerfectParent,
|
guessPerfectParent,
|
||||||
} from '../../utils/room';
|
} from '../../utils/room';
|
||||||
import { NotificationType, UnreadInfo } from '../../../types/matrix/room';
|
import { NotificationType, UnreadInfo } from '../../../types/matrix/room';
|
||||||
import { getMxIdLocalPart, mxcUrlToHttp, getCanonicalAliasOrRoomId } from '../../utils/matrix';
|
import {
|
||||||
|
getMxIdLocalPart,
|
||||||
|
mxcUrlToHttp,
|
||||||
|
getCanonicalAliasOrRoomId,
|
||||||
|
encryptFile,
|
||||||
|
downloadMedia,
|
||||||
|
downloadEncryptedMedia,
|
||||||
|
decryptFile,
|
||||||
|
} from '../../utils/matrix';
|
||||||
import { mDirectAtom } from '../../state/mDirectList';
|
import { mDirectAtom } from '../../state/mDirectList';
|
||||||
import { roomToParentsAtom } from '../../state/room/roomToParents';
|
import { roomToParentsAtom } from '../../state/room/roomToParents';
|
||||||
import { useSelectedRoom } from '../../hooks/router/useSelectedRoom';
|
import { useSelectedRoom } from '../../hooks/router/useSelectedRoom';
|
||||||
import { useInboxNotificationsSelected } from '../../hooks/router/useInbox';
|
import { useInboxNotificationsSelected } from '../../hooks/router/useInbox';
|
||||||
import { useMediaAuthentication } from '../../hooks/useMediaAuthentication';
|
import { useMediaAuthentication } from '../../hooks/useMediaAuthentication';
|
||||||
import { plainToEditorInput, toPlainText } from '../../components/editor';
|
|
||||||
import { ShareRoomPicker } from '../../features/ShareRoomPicker';
|
import { ShareRoomPicker } from '../../features/ShareRoomPicker';
|
||||||
import {
|
import {
|
||||||
isTauri,
|
isTauri,
|
||||||
@@ -37,19 +44,24 @@ import {
|
|||||||
isCapacitorNative,
|
isCapacitorNative,
|
||||||
sendNotification,
|
sendNotification,
|
||||||
setupNotificationTapListener,
|
setupNotificationTapListener,
|
||||||
|
clearNotificationsForRoom,
|
||||||
|
NOTIF_GROUP_DIRECTS,
|
||||||
|
NOTIF_GROUP_HOME,
|
||||||
|
type NotificationGroupInfo,
|
||||||
} from '../../utils/tauri';
|
} from '../../utils/tauri';
|
||||||
import { setPaarrotNavigate, initPaarrotAPI } from '../../paarrot-api';
|
import { setPaarrotNavigate, initPaarrotAPI } from '../../paarrot-api';
|
||||||
import {
|
import {
|
||||||
startBackgroundSync,
|
startBackgroundSync,
|
||||||
stopBackgroundSync,
|
stopBackgroundSync,
|
||||||
setAppForegroundState,
|
setAppForegroundState,
|
||||||
|
syncNotificationGroupMap,
|
||||||
} from '../../utils/backgroundSync';
|
} from '../../utils/backgroundSync';
|
||||||
import {
|
import {
|
||||||
TUploadItem,
|
TUploadItem,
|
||||||
roomIdToMsgDraftAtomFamily,
|
|
||||||
roomIdToUploadItemsAtomFamily,
|
roomIdToUploadItemsAtomFamily,
|
||||||
} from '../../state/room/roomInputDrafts';
|
} from '../../state/room/roomInputDrafts';
|
||||||
import { encryptFile } from '../../utils/matrix';
|
import { fulfilledPromiseSettledResult } from '../../utils/common';
|
||||||
|
import { safeFile } from '../../utils/mimeTypes';
|
||||||
import {
|
import {
|
||||||
AndroidSharePayload,
|
AndroidSharePayload,
|
||||||
clearPendingAndroidShare,
|
clearPendingAndroidShare,
|
||||||
@@ -59,6 +71,201 @@ import {
|
|||||||
materializeSharedFile,
|
materializeSharedFile,
|
||||||
} from '../../utils/androidShare';
|
} 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.
|
* Applies the selected emoji style font to the document.
|
||||||
* - System: Uses the native OS emoji font
|
* - System: Uses the native OS emoji font
|
||||||
@@ -223,15 +430,72 @@ function MessageNotifications() {
|
|||||||
|
|
||||||
// Set up notification tap listener for mobile
|
// Set up notification tap listener for mobile
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
setupNotificationTapListener((path) => {
|
const openFromNotification = (target: string) => {
|
||||||
navigate(path);
|
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(
|
const notify = useCallback(
|
||||||
({
|
({
|
||||||
roomName,
|
roomName,
|
||||||
roomAvatar,
|
roomAvatar,
|
||||||
|
iconBase64,
|
||||||
|
bigPictureBase64,
|
||||||
username,
|
username,
|
||||||
messageBody,
|
messageBody,
|
||||||
roomId,
|
roomId,
|
||||||
@@ -240,14 +504,52 @@ function MessageNotifications() {
|
|||||||
}: {
|
}: {
|
||||||
roomName: string;
|
roomName: string;
|
||||||
roomAvatar?: string;
|
roomAvatar?: string;
|
||||||
|
iconBase64?: string;
|
||||||
|
bigPictureBase64?: string;
|
||||||
username: string;
|
username: string;
|
||||||
messageBody?: string;
|
messageBody?: string;
|
||||||
roomId: string;
|
roomId: string;
|
||||||
eventId: string;
|
eventId: string;
|
||||||
isDm: boolean;
|
isDm: boolean;
|
||||||
}) => {
|
}) => {
|
||||||
const notificationTitle = username;
|
let group: NotificationGroupInfo;
|
||||||
const notificationBody = messageBody || 'New message';
|
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 */
|
/** Replicates TitleBar click navigation logic */
|
||||||
const navigateToRoom = () => {
|
const navigateToRoom = () => {
|
||||||
@@ -292,7 +594,15 @@ function MessageNotifications() {
|
|||||||
sendNotification({
|
sendNotification({
|
||||||
title: notificationTitle,
|
title: notificationTitle,
|
||||||
body: notificationBody,
|
body: notificationBody,
|
||||||
|
senderName: username,
|
||||||
|
messageText,
|
||||||
|
conversationTitle,
|
||||||
path: roomPath,
|
path: roomPath,
|
||||||
|
roomId,
|
||||||
|
group,
|
||||||
|
icon: roomAvatar,
|
||||||
|
iconBase64,
|
||||||
|
bigPictureBase64,
|
||||||
onClick: () => {
|
onClick: () => {
|
||||||
if (!window.closed) navigate(roomPath);
|
if (!window.closed) navigate(roomPath);
|
||||||
},
|
},
|
||||||
@@ -378,39 +688,68 @@ function MessageNotifications() {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Match TitleBar / room bell settings: Default and Mentions rooms only notify on highlights.
|
||||||
|
const notificationType = getNotificationType(mx, room.roomId);
|
||||||
|
const isDm = mDirects.has(room.roomId);
|
||||||
|
const mentionsOnly =
|
||||||
|
notificationType === NotificationType.MentionsAndKeywords ||
|
||||||
|
(notificationType === NotificationType.Default && !isDm);
|
||||||
|
if (mentionsOnly && unreadInfo.highlight === 0) return;
|
||||||
|
|
||||||
if (
|
if (
|
||||||
showNotifications &&
|
showNotifications &&
|
||||||
((isTauri() && !isElectron()) || isCapacitorNative() || notificationPermission('granted'))
|
((isTauri() && !isElectron()) || isCapacitorNative() || notificationPermission('granted'))
|
||||||
) {
|
) {
|
||||||
const avatarMxc =
|
void (async () => {
|
||||||
room.getAvatarFallbackMember()?.getMxcAvatarUrl() ?? room.getMxcAvatarUrl();
|
await waitForEventDecryption(mx, mEvent);
|
||||||
const content = mEvent.getContent();
|
|
||||||
|
|
||||||
let messageBody: string | undefined;
|
const avatarMxc =
|
||||||
if (mEvent.getType() === 'm.reaction') {
|
getMemberAvatarMxc(room, sender) ??
|
||||||
// For reactions, show "reacted with {emoji}"
|
room.getAvatarFallbackMember()?.getMxcAvatarUrl() ??
|
||||||
const reactionKey = content['m.relates_to']?.key;
|
room.getMxcAvatarUrl();
|
||||||
if (reactionKey) {
|
const roomAvatar = avatarMxc
|
||||||
messageBody = `reacted with ${reactionKey}`;
|
|
||||||
} else {
|
|
||||||
messageBody = 'reacted to a message';
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
messageBody = typeof content.body === 'string' ? content.body : undefined;
|
|
||||||
}
|
|
||||||
|
|
||||||
const isDm = room.getJoinedMemberCount() === 2 && !room.isSpaceRoom();
|
|
||||||
notify({
|
|
||||||
roomName: room.name ?? 'Unknown',
|
|
||||||
roomAvatar: avatarMxc
|
|
||||||
? mxcUrlToHttp(mx, avatarMxc, useAuthentication, 96, 96, 'crop') ?? undefined
|
? mxcUrlToHttp(mx, avatarMxc, useAuthentication, 96, 96, 'crop') ?? undefined
|
||||||
: undefined,
|
: undefined;
|
||||||
username: getMemberDisplayName(room, sender) ?? getMxIdLocalPart(sender) ?? sender,
|
|
||||||
messageBody,
|
const username = resolveSenderDisplayName(mx, room, sender);
|
||||||
roomId: room.roomId,
|
|
||||||
eventId,
|
const [iconBase64, bigPictureBase64] = await Promise.all([
|
||||||
isDm,
|
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) {
|
if (notificationSound) {
|
||||||
@@ -430,19 +769,23 @@ function MessageNotifications() {
|
|||||||
notify,
|
notify,
|
||||||
selectedRoomId,
|
selectedRoomId,
|
||||||
useAuthentication,
|
useAuthentication,
|
||||||
|
mDirects,
|
||||||
]);
|
]);
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 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,
|
* informed of foreground state so it doesn't double-fire notifications,
|
||||||
* and clears it cleanly on unmount (logout).
|
* and clears it cleanly on unmount (logout).
|
||||||
* Only active on Android Capacitor builds.
|
* Only active on Android Capacitor builds.
|
||||||
*/
|
*/
|
||||||
function BackgroundSyncSetup() {
|
function BackgroundSyncSetup() {
|
||||||
const mx = useMatrixClient();
|
const mx = useMatrixClient();
|
||||||
|
const mDirects = useAtomValue(mDirectAtom);
|
||||||
|
const roomToParents = useAtomValue(roomToParentsAtom);
|
||||||
|
|
||||||
// Try to make a simple fetch to verify component is rendering
|
// Try to make a simple fetch to verify component is rendering
|
||||||
try {
|
try {
|
||||||
fetch('/_matrix/client/v3/sync', { method: 'HEAD' }).catch(() => {});
|
fetch('/_matrix/client/v3/sync', { method: 'HEAD' }).catch(() => {});
|
||||||
@@ -450,18 +793,71 @@ function BackgroundSyncSetup() {
|
|||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
console.log('BackgroundSyncSetup: Starting background sync for', mx.getUserId());
|
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);
|
document.addEventListener('visibilitychange', onVisibility);
|
||||||
setAppForegroundState(!document.hidden);
|
void setAppForegroundState(!document.hidden).catch((err) => {
|
||||||
|
console.error('[BackgroundSyncSetup] Failed to set initial foreground state:', err);
|
||||||
|
});
|
||||||
|
|
||||||
return () => {
|
return () => {
|
||||||
document.removeEventListener('visibilitychange', onVisibility);
|
document.removeEventListener('visibilitychange', onVisibility);
|
||||||
stopBackgroundSync();
|
void stopBackgroundSync().catch((err) => {
|
||||||
|
console.error('[BackgroundSyncSetup] Failed to stop message listener:', err);
|
||||||
|
});
|
||||||
};
|
};
|
||||||
}, [mx]);
|
}, [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;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -517,10 +913,71 @@ function TaskbarFlashStopper() {
|
|||||||
|
|
||||||
function AndroidShareIntentHandler() {
|
function AndroidShareIntentHandler() {
|
||||||
const mx = useMatrixClient();
|
const mx = useMatrixClient();
|
||||||
|
const store = useStore();
|
||||||
const navigate = useNavigate();
|
const navigate = useNavigate();
|
||||||
const [pendingShare, setPendingShare] = useState<AndroidSharePayload | null>(null);
|
const [pendingShare, setPendingShare] = useState<AndroidSharePayload | null>(null);
|
||||||
const mDirects = useAtomValue(mDirectAtom);
|
const mDirects = useAtomValue(mDirectAtom);
|
||||||
const roomToParents = useAtomValue(roomToParentsAtom);
|
const roomToParents = useAtomValue(roomToParentsAtom);
|
||||||
|
const selectedRoomId = useSelectedRoom();
|
||||||
|
const selectedRoomIdRef = useRef(selectedRoomId);
|
||||||
|
selectedRoomIdRef.current = selectedRoomId;
|
||||||
|
|
||||||
|
/** Queue shared files into the open room's composer upload board (Gboard / paste / share). */
|
||||||
|
const queueShareAsDrafts = useCallback(
|
||||||
|
async (share: AndroidSharePayload, roomId: string) => {
|
||||||
|
const room = mx.getRoom(roomId);
|
||||||
|
if (!room) return false;
|
||||||
|
|
||||||
|
if (share.files.length > 0) {
|
||||||
|
const originalFiles: File[] = [];
|
||||||
|
for (const sharedFile of share.files) {
|
||||||
|
originalFiles.push(await materializeSharedFile(sharedFile, share.receivedAt));
|
||||||
|
}
|
||||||
|
const safeFiles = originalFiles.map(safeFile);
|
||||||
|
const fileItems: TUploadItem[] = [];
|
||||||
|
|
||||||
|
if (room.hasEncryptionStateEvent()) {
|
||||||
|
const encryptFiles = fulfilledPromiseSettledResult(
|
||||||
|
await Promise.allSettled(safeFiles.map((f) => encryptFile(f)))
|
||||||
|
);
|
||||||
|
encryptFiles.forEach((ef) =>
|
||||||
|
fileItems.push({
|
||||||
|
...ef,
|
||||||
|
metadata: { markedAsSpoiler: false },
|
||||||
|
})
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
safeFiles.forEach((f) =>
|
||||||
|
fileItems.push({
|
||||||
|
file: f,
|
||||||
|
originalFile: f,
|
||||||
|
encInfo: undefined,
|
||||||
|
metadata: { markedAsSpoiler: false },
|
||||||
|
})
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
store.set(roomIdToUploadItemsAtomFamily(roomId), {
|
||||||
|
type: 'PUT',
|
||||||
|
item: fileItems,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
const nextParts = [share.subject?.trim(), share.text?.trim()].filter(
|
||||||
|
(value): value is string => !!value
|
||||||
|
);
|
||||||
|
if (nextParts.length > 0) {
|
||||||
|
await mx.sendMessage(roomId, {
|
||||||
|
msgtype: 'm.text' as const,
|
||||||
|
body: nextParts.join('\n'),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
await clearPendingAndroidShare();
|
||||||
|
return true;
|
||||||
|
},
|
||||||
|
[mx, store]
|
||||||
|
);
|
||||||
|
|
||||||
const applyPendingShare = useCallback(
|
const applyPendingShare = useCallback(
|
||||||
async (share: AndroidSharePayload, roomId: string) => {
|
async (share: AndroidSharePayload, roomId: string) => {
|
||||||
@@ -594,6 +1051,22 @@ function AndroidShareIntentHandler() {
|
|||||||
[mx]
|
[mx]
|
||||||
);
|
);
|
||||||
|
|
||||||
|
const ingestShare = useCallback(
|
||||||
|
(share: AndroidSharePayload) => {
|
||||||
|
const roomId = selectedRoomIdRef.current;
|
||||||
|
// Already in a room: attach to composer (Gboard GIF / paste / in-app share).
|
||||||
|
if (roomId && share.files.length > 0) {
|
||||||
|
queueShareAsDrafts(share, roomId).catch((err) => {
|
||||||
|
console.error('[AndroidShare] Failed to queue share into room:', err);
|
||||||
|
setPendingShare(share);
|
||||||
|
});
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
setPendingShare(share);
|
||||||
|
},
|
||||||
|
[queueShareAsDrafts]
|
||||||
|
);
|
||||||
|
|
||||||
const handlePickRoom = useCallback(
|
const handlePickRoom = useCallback(
|
||||||
(roomId: string) => {
|
(roomId: string) => {
|
||||||
if (!pendingShare) return;
|
if (!pendingShare) return;
|
||||||
@@ -640,7 +1113,7 @@ function AndroidShareIntentHandler() {
|
|||||||
getPendingAndroidShare()
|
getPendingAndroidShare()
|
||||||
.then((share) => {
|
.then((share) => {
|
||||||
if (mounted && share) {
|
if (mounted && share) {
|
||||||
setPendingShare(share);
|
ingestShare(share);
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.catch((err) => {
|
.catch((err) => {
|
||||||
@@ -649,7 +1122,7 @@ function AndroidShareIntentHandler() {
|
|||||||
|
|
||||||
listenForAndroidShares((share) => {
|
listenForAndroidShares((share) => {
|
||||||
if (mounted) {
|
if (mounted) {
|
||||||
setPendingShare(share);
|
ingestShare(share);
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.then((handle) => {
|
.then((handle) => {
|
||||||
@@ -663,7 +1136,7 @@ function AndroidShareIntentHandler() {
|
|||||||
mounted = false;
|
mounted = false;
|
||||||
void listenerHandle?.remove();
|
void listenerHandle?.remove();
|
||||||
};
|
};
|
||||||
}, []);
|
}, [ingestShare]);
|
||||||
|
|
||||||
if (!pendingShare) return null;
|
if (!pendingShare) return null;
|
||||||
|
|
||||||
|
|||||||
@@ -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);
|
||||||
|
});
|
||||||
|
}
|
||||||
@@ -21,6 +21,18 @@ interface AndroidShareHandlerPlugin {
|
|||||||
getPendingShare(): Promise<{ share: AndroidSharePayload | null }>;
|
getPendingShare(): Promise<{ share: AndroidSharePayload | null }>;
|
||||||
/** Clears the last pending share payload after it has been consumed. */
|
/** Clears the last pending share payload after it has been consumed. */
|
||||||
clearPendingShare(): Promise<void>;
|
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(
|
addListener(
|
||||||
eventName: 'shareReceived',
|
eventName: 'shareReceived',
|
||||||
listenerFunc: (payload: AndroidSharePayload) => void
|
listenerFunc: (payload: AndroidSharePayload) => void
|
||||||
|
|||||||
@@ -1,518 +1,319 @@
|
|||||||
import { Capacitor, registerPlugin, type PluginListenerHandle } from '@capacitor/core';
|
|
||||||
import type { IPusherRequest, MatrixClient } from 'matrix-js-sdk';
|
import type { IPusherRequest, MatrixClient } from 'matrix-js-sdk';
|
||||||
|
|
||||||
type UnifiedPushStatus = {
|
export type ListenerStatus = {
|
||||||
running: boolean;
|
running: boolean;
|
||||||
endpoint: string;
|
listening: boolean;
|
||||||
instance: string;
|
batteryIgnored: boolean;
|
||||||
registered: boolean;
|
notificationsAllowed?: boolean;
|
||||||
distributor: string;
|
error?: string;
|
||||||
distributors: string[] | string;
|
|
||||||
};
|
|
||||||
|
|
||||||
type UnifiedPushEndpointEvent = {
|
|
||||||
endpoint: string;
|
|
||||||
previousEndpoint: string;
|
|
||||||
instance: string;
|
|
||||||
};
|
|
||||||
|
|
||||||
type UnifiedPushUnregisteredEvent = {
|
|
||||||
previousEndpoint: string;
|
|
||||||
instance: string;
|
|
||||||
};
|
|
||||||
|
|
||||||
type UnifiedPushRegistrationFailedEvent = {
|
|
||||||
reason: string;
|
|
||||||
instance: string;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
interface MatrixBackgroundSyncPlugin {
|
interface MatrixBackgroundSyncPlugin {
|
||||||
/** Persist credentials and request UnifiedPush registration. */
|
|
||||||
start(options: {
|
start(options: {
|
||||||
homeserverUrl: string;
|
homeserverUrl: string;
|
||||||
accessToken: string;
|
accessToken: string;
|
||||||
userId: string;
|
userId: string;
|
||||||
deviceId: string;
|
deviceId: string;
|
||||||
}): Promise<void>;
|
}): Promise<{ batteryIgnored?: boolean }>;
|
||||||
/** Trigger a one-shot fetch as if a push ping arrived. */
|
|
||||||
triggerPing(options: { reason?: string }): Promise<void>;
|
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>;
|
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>;
|
setAppForeground(options: { foreground: boolean }): Promise<void>;
|
||||||
/** Returns fetch state and current UnifiedPush registration details. */
|
getStatus(): Promise<ListenerStatus>;
|
||||||
getStatus(): Promise<UnifiedPushStatus>;
|
requestBatteryExemption(): Promise<{ ignored: boolean }>;
|
||||||
addListener(
|
getPendingNotificationNav(): Promise<NotificationNavTarget>;
|
||||||
eventName: 'unifiedPushNewEndpoint',
|
clearRoomNotifications(options: { roomId: string }): Promise<void>;
|
||||||
listenerFunc: (event: UnifiedPushEndpointEvent) => void
|
setNotificationGroups(options: {
|
||||||
): Promise<PluginListenerHandle>;
|
rooms: Record<string, { groupId: string; groupName: string; roomName: string; kind: string }>;
|
||||||
addListener(
|
}): Promise<void>;
|
||||||
eventName: 'unifiedPushUnregistered',
|
showNotification(options: NativeNotificationOptions): Promise<{ shown: boolean }>;
|
||||||
listenerFunc: (event: UnifiedPushUnregisteredEvent) => void
|
addListener?(
|
||||||
): Promise<PluginListenerHandle>;
|
eventName: 'notificationOpened',
|
||||||
addListener(
|
listener: (target: NotificationNavTarget) => void
|
||||||
eventName: 'unifiedPushRegistrationFailed',
|
): Promise<{ remove: () => void }>;
|
||||||
listenerFunc: (event: UnifiedPushRegistrationFailedEvent) => void
|
|
||||||
): Promise<PluginListenerHandle>;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type StoredPusherState = {
|
type CapacitorGlobal = {
|
||||||
endpoint: string;
|
isNativePlatform?: () => boolean;
|
||||||
appId: string;
|
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 PLUGIN = 'MatrixBackgroundSync';
|
||||||
const DEFAULT_UNIFIED_PUSH_GATEWAY = 'https://matrix.gateway.unifiedpush.org/_matrix/push/v1/notify';
|
const LEGACY_PUSHER_APP_ID = 'com.paarrot.app.android';
|
||||||
const PUSHER_APP_ID_BASE = 'com.paarrot.app.android';
|
const LEGACY_PUSHER_STORAGE_PREFIX = 'paarrot.unifiedpush';
|
||||||
const 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. */
|
/** Returns true when the current platform is Android Capacitor. */
|
||||||
export const isBackgroundSyncSupported = (): boolean =>
|
export const isBackgroundSyncSupported = (): boolean => {
|
||||||
Capacitor.isNativePlatform() && Capacitor.getPlatform() === 'android';
|
const cap = capacitor();
|
||||||
|
return Boolean(cap?.isNativePlatform?.() && cap.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;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const loadStoredPusherState = (
|
const waitForBridge = async (tries = 50): Promise<CapacitorGlobal> => {
|
||||||
userId: string | null,
|
for (let i = 0; i < tries; i += 1) {
|
||||||
deviceId: string | null
|
const cap = capacitor();
|
||||||
): StoredPusherState | undefined => {
|
if (
|
||||||
if (typeof window === 'undefined' || !window.localStorage) return undefined;
|
cap?.isNativePlatform?.() &&
|
||||||
|
(cap.Plugins?.[PLUGIN] || cap.nativePromise || cap.registerPlugin)
|
||||||
const raw = window.localStorage.getItem(getStoredPusherKey(userId, deviceId));
|
) {
|
||||||
if (!raw) return undefined;
|
return cap;
|
||||||
|
}
|
||||||
try {
|
await new Promise((resolve) => window.setTimeout(resolve, 100));
|
||||||
return JSON.parse(raw) as StoredPusherState;
|
|
||||||
} catch {
|
|
||||||
return undefined;
|
|
||||||
}
|
}
|
||||||
|
throw new Error('Capacitor bridge did not become ready');
|
||||||
};
|
};
|
||||||
|
|
||||||
const saveStoredPusherState = (
|
/** Android injects plugins on Capacitor.Plugins — registerPlugin is often missing. */
|
||||||
userId: string | null,
|
const plugin = async (): Promise<MatrixBackgroundSyncPlugin> => {
|
||||||
deviceId: string | null,
|
const cap = await waitForBridge();
|
||||||
state: StoredPusherState
|
const existing = cap.Plugins?.[PLUGIN];
|
||||||
): void => {
|
if (existing?.getStatus && existing.start) {
|
||||||
if (typeof window === 'undefined' || !window.localStorage) return;
|
return existing as MatrixBackgroundSyncPlugin;
|
||||||
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);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return [trimmed];
|
if (typeof cap.nativePromise === 'function') {
|
||||||
};
|
const call = <T>(method: string, options?: unknown) =>
|
||||||
|
cap.nativePromise!(PLUGIN, method, options ?? {}) as Promise<T>;
|
||||||
const resolveUnifiedPushGateway = async (endpoint: string): Promise<string> => {
|
return {
|
||||||
try {
|
start: (options) => call('start', options),
|
||||||
const discoveryUrl = new URL(endpoint);
|
triggerPing: (options) => call('triggerPing', options),
|
||||||
discoveryUrl.pathname = '/_matrix/push/v1/notify';
|
stop: () => call('stop'),
|
||||||
discoveryUrl.search = '';
|
setAppForeground: (options) => call('setAppForeground', options),
|
||||||
|
getStatus: () => call('getStatus'),
|
||||||
const response = await fetch(discoveryUrl.toString(), { method: 'GET' });
|
requestBatteryExemption: () => call('requestBatteryExemption'),
|
||||||
if (!response.ok) return DEFAULT_UNIFIED_PUSH_GATEWAY;
|
getPendingNotificationNav: () => call('getPendingNotificationNav'),
|
||||||
|
clearRoomNotifications: (options) => call('clearRoomNotifications', options),
|
||||||
const body = (await response.json()) as {
|
setNotificationGroups: (options) => call('setNotificationGroups', options),
|
||||||
gateway?: string;
|
showNotification: (options) => call('showNotification', options),
|
||||||
unifiedpush?: { gateway?: string };
|
|
||||||
};
|
};
|
||||||
|
}
|
||||||
|
|
||||||
if (body.gateway === 'matrix' || body.unifiedpush?.gateway === 'matrix') {
|
if (cap.registerPlugin) {
|
||||||
return discoveryUrl.toString();
|
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) {
|
} 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 {
|
/** Stop the listener and drop saved credentials. Call this on logout. */
|
||||||
private client: MatrixClient | undefined;
|
export const stopBackgroundSync = async (): Promise<void> => {
|
||||||
|
if (!isBackgroundSyncSupported()) return;
|
||||||
private listenerHandles: PluginListenerHandle[] = [];
|
await (await plugin()).stop();
|
||||||
|
|
||||||
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);
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/** Ask the listener to sync now. */
|
||||||
* Manually triggers a one-shot native fetch.
|
|
||||||
* Useful for diagnostics and bridge testing.
|
|
||||||
*/
|
|
||||||
export const triggerBackgroundSyncPing = async (reason?: string): Promise<void> => {
|
export const triggerBackgroundSyncPing = async (reason?: string): Promise<void> => {
|
||||||
if (!isBackgroundSyncSupported()) return;
|
if (!isBackgroundSyncSupported()) return;
|
||||||
|
await (await plugin()).triggerPing({ reason });
|
||||||
try {
|
|
||||||
await MatrixBackgroundSync.triggerPing({ reason });
|
|
||||||
} catch (err) {
|
|
||||||
console.warn('[BackgroundSync] triggerPing failed:', err);
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/** Stop UnifiedPush integration and remove the Matrix pusher for this session. */
|
/** Tell the listener whether the chat UI is on screen. */
|
||||||
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
|
|
||||||
*/
|
|
||||||
export const setAppForegroundState = async (foreground: boolean): Promise<void> => {
|
export const setAppForegroundState = async (foreground: boolean): Promise<void> => {
|
||||||
if (!isBackgroundSyncSupported()) return;
|
if (!isBackgroundSyncSupported()) return;
|
||||||
|
await (await plugin()).setAppForeground({ foreground });
|
||||||
try {
|
|
||||||
await MatrixBackgroundSync.setAppForeground({ foreground });
|
|
||||||
} catch (err) {
|
|
||||||
console.warn('[BackgroundSync] setAppForeground failed:', err);
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/** Ask Android to leave the listener out of battery optimization. */
|
||||||
* Re-opens the UnifiedPush distributor selection dialog.
|
export const requestBatteryExemption = async (): Promise<{ ignored: boolean }> => {
|
||||||
* Allows users to re-select or change their push notification distributor without terminal access.
|
if (!isBackgroundSyncSupported()) return { ignored: false };
|
||||||
* Useful when the current endpoint becomes unavailable.
|
return (await plugin()).requestBatteryExemption();
|
||||||
*/
|
|
||||||
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 };
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/** Returns the current native UnifiedPush status, or undefined if unavailable. */
|
/** Returns listener and battery-exemption state. */
|
||||||
export const getBackgroundSyncStatus = async (): Promise<UnifiedPushStatus | undefined> => {
|
export const getBackgroundSyncStatus = async (): Promise<ListenerStatus | undefined> => {
|
||||||
if (!isBackgroundSyncSupported()) return undefined;
|
if (!isBackgroundSyncSupported()) return undefined;
|
||||||
try {
|
try {
|
||||||
return await MatrixBackgroundSync.getStatus();
|
return await (await plugin()).getStatus();
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
|
const message = err instanceof Error ? err.message : String(err);
|
||||||
console.warn('[BackgroundSync] getStatus failed:', 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 });
|
||||||
|
});
|
||||||
|
}
|
||||||
+382
-35
@@ -19,6 +19,19 @@ export const openExternalUrl = async (url: string): Promise<void> => {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 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
|
// Use Tauri for actual Tauri builds
|
||||||
if (isTauri() && !isElectron()) {
|
if (isTauri() && !isElectron()) {
|
||||||
try {
|
try {
|
||||||
@@ -207,6 +220,36 @@ export const setupNotificationTapListener = async (onTap: (path: string) => void
|
|||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.warn('Failed to set up Capacitor notification tap listener:', 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> => {
|
const ensureCapacitorNotificationChannel = async (): Promise<void> => {
|
||||||
if (notificationChannelCreated || !isAndroid()) return;
|
await ensureCapacitorNotificationChannels();
|
||||||
|
|
||||||
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);
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -422,6 +448,225 @@ export const getSystemNotificationPermissionState = async (): Promise<Permission
|
|||||||
return 'denied';
|
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
|
* Send a notification using Tauri's notification plugin
|
||||||
* Falls back to browser Notification API if not in Tauri
|
* Falls back to browser Notification API if not in Tauri
|
||||||
@@ -430,10 +675,39 @@ export const sendNotification = async (options: {
|
|||||||
title: string;
|
title: string;
|
||||||
body: string;
|
body: string;
|
||||||
icon?: string;
|
icon?: string;
|
||||||
|
iconBase64?: string;
|
||||||
|
bigPictureBase64?: string;
|
||||||
|
senderName?: string;
|
||||||
|
messageText?: string;
|
||||||
|
conversationTitle?: string;
|
||||||
path?: string;
|
path?: string;
|
||||||
|
roomId?: string;
|
||||||
|
group?: NotificationGroupInfo;
|
||||||
onClick?: () => void;
|
onClick?: () => void;
|
||||||
}): Promise<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
|
// Use Electron's native notification API if in Electron
|
||||||
if (isElectron()) {
|
if (isElectron()) {
|
||||||
@@ -475,11 +749,27 @@ export const sendNotification = async (options: {
|
|||||||
await tauriSendNotification({
|
await tauriSendNotification({
|
||||||
title,
|
title,
|
||||||
body,
|
body,
|
||||||
|
// Stable per-room id replaces prior tray entry instead of stacking
|
||||||
|
id: roomId ? notificationIdForRoom(roomId) : undefined,
|
||||||
// Use the channel on Android
|
// Use the channel on Android
|
||||||
channelId: isAndroid() ? 'messages' : undefined,
|
channelId: isAndroid() ? channelId : undefined,
|
||||||
// Store path in extra data for notification tap handling
|
group: groupId,
|
||||||
extra: path ? { path } : undefined,
|
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;
|
return;
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
@@ -488,6 +778,31 @@ export const sendNotification = async (options: {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (isCapacitorNative()) {
|
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 {
|
try {
|
||||||
const { LocalNotifications } = await import('@capacitor/local-notifications');
|
const { LocalNotifications } = await import('@capacitor/local-notifications');
|
||||||
let perm = await LocalNotifications.checkPermissions();
|
let perm = await LocalNotifications.checkPermissions();
|
||||||
@@ -496,21 +811,53 @@ export const sendNotification = async (options: {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (perm.display === 'granted') {
|
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({
|
await LocalNotifications.schedule({
|
||||||
notifications: [
|
notifications: notifications as any,
|
||||||
{
|
|
||||||
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,
|
|
||||||
},
|
|
||||||
],
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
|
|||||||
@@ -7,6 +7,11 @@ export const isCapacitorAndroid = Boolean(
|
|||||||
cap?.isNativePlatform?.() && cap?.getPlatform?.() === 'android'
|
cap?.isNativePlatform?.() && cap?.getPlatform?.() === 'android'
|
||||||
);
|
);
|
||||||
|
|
||||||
|
// Stationery signatures use Caveat on all platforms (including Android WebView).
|
||||||
|
await import('@fontsource/caveat/500.css');
|
||||||
|
await import('@fontsource/caveat/600.css');
|
||||||
|
await import('@fontsource/caveat/700.css');
|
||||||
|
|
||||||
if (isCapacitorAndroid) {
|
if (isCapacitorAndroid) {
|
||||||
document.documentElement.classList.add('android-capacitor');
|
document.documentElement.classList.add('android-capacitor');
|
||||||
document.documentElement.style.setProperty(
|
document.documentElement.style.setProperty(
|
||||||
|
|||||||
+1456
-3
File diff suppressed because it is too large
Load Diff
@@ -16,6 +16,8 @@ import { trimTrailingSlash } from './app/utils/common';
|
|||||||
import App from './app/pages/App';
|
import App from './app/pages/App';
|
||||||
import { applySafeAreaInsets, isTauri } from './app/utils/tauri';
|
import { applySafeAreaInsets, isTauri } from './app/utils/tauri';
|
||||||
import { enableViewTransitionsForNavigation } from './app/utils/viewTransitions';
|
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 i18n (needs to be bundled ;))
|
||||||
import './app/i18n';
|
import './app/i18n';
|
||||||
@@ -28,6 +30,12 @@ applySafeAreaInsets();
|
|||||||
// Enable View Transitions API for smooth navigation
|
// Enable View Transitions API for smooth navigation
|
||||||
enableViewTransitionsForNavigation();
|
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
|
// Register Service Worker
|
||||||
if ('serviceWorker' in navigator) {
|
if ('serviceWorker' in navigator) {
|
||||||
const swUrl =
|
const swUrl =
|
||||||
|
|||||||
Generated
+22
-2
@@ -1,15 +1,17 @@
|
|||||||
{
|
{
|
||||||
"name": "paarrot",
|
"name": "paarrot",
|
||||||
"version": "4.11.121",
|
"version": "4.11.150",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "paarrot",
|
"name": "paarrot",
|
||||||
"version": "4.11.121",
|
"version": "4.11.150",
|
||||||
"license": "AGPL-3.0-only",
|
"license": "AGPL-3.0-only",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@capacitor/android": "8.3.0",
|
"@capacitor/android": "8.3.0",
|
||||||
|
"@capacitor/app": "8.0.1",
|
||||||
|
"@capacitor/browser": "8.0.1",
|
||||||
"@capacitor/cli": "8.3.0",
|
"@capacitor/cli": "8.3.0",
|
||||||
"@capacitor/core": "8.3.0",
|
"@capacitor/core": "8.3.0",
|
||||||
"@capacitor/local-notifications": "8.0.2",
|
"@capacitor/local-notifications": "8.0.2",
|
||||||
@@ -33,6 +35,24 @@
|
|||||||
"@capacitor/core": "^8.3.0"
|
"@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": {
|
"node_modules/@capacitor/cli": {
|
||||||
"version": "8.3.0",
|
"version": "8.3.0",
|
||||||
"resolved": "https://registry.npmjs.org/@capacitor/cli/-/cli-8.3.0.tgz",
|
"resolved": "https://registry.npmjs.org/@capacitor/cli/-/cli-8.3.0.tgz",
|
||||||
|
|||||||
+4
-1
@@ -1,12 +1,13 @@
|
|||||||
{
|
{
|
||||||
"name": "paarrot",
|
"name": "paarrot",
|
||||||
"version": "4.11.124",
|
"version": "4.11.187",
|
||||||
"description": "Paarrot - A Matrix client based on Cinny",
|
"description": "Paarrot - A Matrix client based on Cinny",
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=18.0.0"
|
"node": ">=18.0.0"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"apply-overlay": "node scripts/apply-overlay.mjs",
|
"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:prepare": "cd cinny && npm run build && cd .. && npx cap sync android",
|
||||||
"android:open": "npx cap open android",
|
"android:open": "npx cap open android",
|
||||||
"android:run": "npx cap run android",
|
"android:run": "npx cap run android",
|
||||||
@@ -23,6 +24,8 @@
|
|||||||
"license": "AGPL-3.0-only",
|
"license": "AGPL-3.0-only",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@capacitor/android": "8.3.0",
|
"@capacitor/android": "8.3.0",
|
||||||
|
"@capacitor/app": "8.0.1",
|
||||||
|
"@capacitor/browser": "8.0.1",
|
||||||
"@capacitor/cli": "8.3.0",
|
"@capacitor/cli": "8.3.0",
|
||||||
"@capacitor/core": "8.3.0",
|
"@capacitor/core": "8.3.0",
|
||||||
"@capacitor/local-notifications": "8.0.2",
|
"@capacitor/local-notifications": "8.0.2",
|
||||||
|
|||||||
@@ -33,7 +33,8 @@ if (cinnyStatus.trim()) {
|
|||||||
// Ensure android/ junction is excluded from the cinny git view — otherwise
|
// Ensure android/ junction is excluded from the cinny git view — otherwise
|
||||||
// `git stash -u` would traverse the junction into the root android/ directory
|
// `git stash -u` would traverse the junction into the root android/ directory
|
||||||
// and delete files there when the stash is created.
|
// 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') : '';
|
const excludeContent = existsSync(cinnyExclude) ? readFileSync(cinnyExclude, 'utf8') : '';
|
||||||
if (!excludeContent.includes('android/')) {
|
if (!excludeContent.includes('android/')) {
|
||||||
writeFileSync(cinnyExclude, excludeContent + (excludeContent.endsWith('\n') || !excludeContent ? '' : '\n') + 'android/\n', 'utf8');
|
writeFileSync(cinnyExclude, excludeContent + (excludeContent.endsWith('\n') || !excludeContent ? '' : '\n') + 'android/\n', 'utf8');
|
||||||
|
|||||||
Executable
+197
@@ -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
|
||||||
Reference in New Issue
Block a user