diff --git a/.github/workflows/apk.yml b/.github/workflows/apk.yml index 8f844b3..fc0019e 100644 --- a/.github/workflows/apk.yml +++ b/.github/workflows/apk.yml @@ -97,11 +97,11 @@ jobs: "$BT/apksigner" verify --verbose --print-certs "$APK" | tee verify.txt grep -q "Number of signers: 1" verify.txt GOT=$(sed -n 's/.*certificate SHA-256 digest: //p' verify.txt | sed -n 1p) - WANT=$(jq -r '.[].target | select(.package_name=="chat.sune") | .sha256_cert_fingerprints[]' "$GITHUB_WORKSPACE/public/.well-known/assetlinks.json" | tr -d ':' | tr A-F a-f) + WANT=$(jq -r '.[].target | select(.package_name=="chat.sune.app") | .sha256_cert_fingerprints[]' "$GITHUB_WORKSPACE/public/.well-known/assetlinks.json" | tr -d ':' | tr A-F a-f) [ "$GOT" = "$WANT" ] || { echo "::error::signing cert $GOT does not match assetlinks.json ($WANT)"; exit 1; } "$BT/aapt2" dump badging "$APK" > full-badging.txt grep -m1 '^package:' full-badging.txt | tee badging.txt - grep -q "name='chat.sune' versionCode='$CODE' versionName='$VERSION'" badging.txt + grep -q "name='chat.sune.app' versionCode='$CODE' versionName='$VERSION'" badging.txt sha256sum "$APK" | tee "$APK.sha256" echo "SIGNER=$GOT" >> $GITHUB_ENV @@ -126,7 +126,7 @@ jobs: gh attestation verify $APK --repo $GITHUB_REPOSITORY \`\`\` - - Package: \`chat.sune\` + - Package: \`chat.sune.app\` - SHA-256: \`$SHA\` - Signing certificate SHA-256: \`$SIGNER\` EOF diff --git a/android/README.md b/android/README.md index b47f182..96a622d 100644 --- a/android/README.md +++ b/android/README.md @@ -4,7 +4,7 @@ Sune for Android is a [Trusted Web Activity](https://developer.chrome.com/docs/a | | New app | Legacy app (v0.x) | |---|---|---| -| Package | `chat.sune` | `com.planetrenox.sune` | +| Package | `chat.sune.app` | `com.planetrenox.sune` | | Host | `sune.chat` (also trusts `sune.planetrenox.com`) | `sune.planetrenox.com` | | Signing cert SHA-256 | `09:85:1F:7B:BB:40:67:9C:F8:70:1C:7D:9F:65:72:77:78:0E:C0:58:CF:34:09:9A:97:D2:8A:74:FB:CE:87:2A` | `E8:7D:70:60:C2:7D:EF:CB:4D:4D:2B:E2:2E:5E:37:ED:F7:0B:1E:F5:77:D7:04:1F:6B:07:EC:B8:1D:78:6D:43` (**leaked**) | @@ -34,4 +34,4 @@ Never in the repo (`*.jks` is gitignored). Repo secrets, read only by `.github/w | `ANDROID_KEYSTORE_PASS` | keystore password (also used as the key password) | | `ANDROID_KEY_ALIAS` | `sune` | -Losing this key means users can't update `chat.sune` and would have to uninstall and reinstall. Keep an offline copy. +Losing this key means users can't update `chat.sune.app` and would have to uninstall and reinstall. Keep an offline copy. diff --git a/android/twa-manifest.json b/android/twa-manifest.json index f0f9a2a..a6255fa 100644 --- a/android/twa-manifest.json +++ b/android/twa-manifest.json @@ -1,5 +1,5 @@ { - "packageId": "chat.sune", + "packageId": "chat.sune.app", "host": "sune.chat", "name": "Sune", "launcherName": "Sune", diff --git a/dist/.well-known/assetlinks.json b/dist/.well-known/assetlinks.json index 3756bef..18653c5 100644 --- a/dist/.well-known/assetlinks.json +++ b/dist/.well-known/assetlinks.json @@ -13,7 +13,7 @@ "relation": ["delegate_permission/common.handle_all_urls"], "target": { "namespace": "android_app", - "package_name": "chat.sune", + "package_name": "chat.sune.app", "sha256_cert_fingerprints": [ "09:85:1F:7B:BB:40:67:9C:F8:70:1C:7D:9F:65:72:77:78:0E:C0:58:CF:34:09:9A:97:D2:8A:74:FB:CE:87:2A" ] diff --git a/public/.well-known/assetlinks.json b/public/.well-known/assetlinks.json index 3756bef..18653c5 100644 --- a/public/.well-known/assetlinks.json +++ b/public/.well-known/assetlinks.json @@ -13,7 +13,7 @@ "relation": ["delegate_permission/common.handle_all_urls"], "target": { "namespace": "android_app", - "package_name": "chat.sune", + "package_name": "chat.sune.app", "sha256_cert_fingerprints": [ "09:85:1F:7B:BB:40:67:9C:F8:70:1C:7D:9F:65:72:77:78:0E:C0:58:CF:34:09:9A:97:D2:8A:74:FB:CE:87:2A" ]