Compare commits
132 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 792e55b2ca | |||
| 5462bce9c3 | |||
| ede54d10cd | |||
| e7a99db03b | |||
| e5a119b6bd | |||
| 315db3fa5a | |||
| 19ef38a377 | |||
| 7797a9a562 | |||
| 55e4bfa11e | |||
| ad0fa41bb5 | |||
| 7c91a609da | |||
| 545eb650ca | |||
| 43f86f4559 | |||
| 25f2cd8192 | |||
| 7ae9198a43 | |||
| 8f3a8bd670 | |||
| e0c3642874 | |||
| 25091dbd60 | |||
| fe7847fc08 | |||
| 77b9252577 | |||
| 3364c0d131 | |||
| deabaf7398 | |||
| 9b780d6b7e | |||
| 93727084ec | |||
| ed178f3b5e | |||
| f46f6f38fc | |||
| ae082c1fd0 | |||
| 6b8eb939c3 | |||
| 89f7bd2e2f | |||
| 2fe487154f | |||
| 71d014af95 | |||
| b1037dec62 | |||
| 3466556849 | |||
| b7951baf23 | |||
| f81fe8cb17 | |||
| 7e8e342e29 | |||
| 445fb173fb | |||
| b317877c41 | |||
| 27c19b5ff5 | |||
| ffd848e5dc | |||
| 45361c276c | |||
| 1b24e3dcef | |||
| 69d88ffefd | |||
| 92fc8ef28f | |||
| 2aa25e3fe7 | |||
| f6bcdb8e6f | |||
| 867a52bc0d | |||
| ec87f280c3 | |||
| 6e362de3da | |||
| 654900bc50 | |||
| 75d0a6181b | |||
| 6de15a92a4 | |||
| b15dcd9730 | |||
| 821f23aed4 | |||
| 79420cd945 | |||
| e3541535e2 | |||
| 431cc226e3 | |||
| 6835fd7bf3 | |||
| 3c4c880c31 | |||
| f35b189ca2 | |||
| c6f91716a4 | |||
| ad69bbf4a9 | |||
| 30158cddc3 | |||
| 825469a7f2 | |||
| 56f9a92054 | |||
| 017f229cfc | |||
| dec6babe1d | |||
| d859e23879 | |||
| f92aea80a7 | |||
| 7b29a5d34e | |||
| c7a369a0ca | |||
| 117af0f9b1 | |||
| 496c85e6e5 | |||
| 1c15c33cf9 | |||
| 50bd1bcbc1 | |||
| d2ae9a87c4 | |||
| c5cb39c27b | |||
| 6d093d1102 | |||
| 01ddcc63bb | |||
| b07b38b5b7 | |||
| 83f0bd2ead | |||
| 7293ee1174 | |||
| 25351c3628 | |||
| d18fb7f63d | |||
| 1054f735ad | |||
| 954d419671 | |||
| 2077b9e375 | |||
| 5135052446 | |||
| f9e1dfe804 | |||
| bd42661a62 | |||
| 3b4d220936 | |||
| e3ac025a59 | |||
| c04864f693 | |||
| a9b05bba15 | |||
| 6ce19eb4a8 | |||
| 52ddf9b4f7 | |||
| 61a7b5bceb | |||
| 70cfe9bfb0 | |||
| b63f1f01b5 | |||
| e9d9690844 | |||
| b1a31d4d68 | |||
| 5cb33b2858 | |||
| 679f394b51 | |||
| 91b5b06a7f | |||
| 4c0583845a | |||
| d7c4324afc | |||
| dbcfbd875e | |||
| d2002cc913 | |||
| 4bc764eb6a | |||
| 1f89a13f92 | |||
| 93a23f0343 | |||
| ce69ae99a1 | |||
| c7d5fc12c6 | |||
| b9c53d692b | |||
| 13376d560f | |||
| 3a8191fc07 | |||
| c0f7f81e23 | |||
| 7743e4da16 | |||
| 887f5d8c84 | |||
| 2ec1199490 | |||
| 9dd58fe32f | |||
| 402a02a302 | |||
| 7b5a05afee | |||
| c3357ebea4 | |||
| 91f6430762 | |||
| 6ee540d5e4 | |||
| 99cdcfcd09 | |||
| fd11944ed6 | |||
| 82c6a3cd5f | |||
| fbafa270c4 | |||
| 1c54d7d6c1 | |||
| d2c7d83256 |
@@ -0,0 +1,194 @@
|
|||||||
|
name: Native apps release
|
||||||
|
|
||||||
|
# Builds the signed store builds of the iOS and Android apps and uploads them:
|
||||||
|
# the Android App Bundle to a Google Play testing track, the iOS archive to
|
||||||
|
# App Store Connect (TestFlight). Promotion to production stays a manual step
|
||||||
|
# in both consoles.
|
||||||
|
#
|
||||||
|
# Runs only in liketrek/TREK, only by hand or on a version tag, and only after a
|
||||||
|
# required reviewer approves the `store` environment, which holds every secret
|
||||||
|
# (see wiki/Native-Apps.md for the list). Pull requests never reach it.
|
||||||
|
#
|
||||||
|
# Both stores get the same numbers: the version from client/package.json
|
||||||
|
# without a prerelease suffix, and a build number that only grows. A prerelease
|
||||||
|
# reuses its X.Y.Z with a higher build number and belongs on the internal track
|
||||||
|
# and in TestFlight only.
|
||||||
|
|
||||||
|
on:
|
||||||
|
workflow_dispatch:
|
||||||
|
inputs:
|
||||||
|
track:
|
||||||
|
description: Google Play track
|
||||||
|
type: choice
|
||||||
|
options: [internal, alpha, beta]
|
||||||
|
default: internal
|
||||||
|
push:
|
||||||
|
tags: ['v*']
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
|
||||||
|
concurrency:
|
||||||
|
group: native-release
|
||||||
|
cancel-in-progress: false
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
android:
|
||||||
|
# Gated on a repository variable so the release can ship iOS alone while the
|
||||||
|
# Google Play account and its signing secrets are not yet in place. Set the
|
||||||
|
# repository variable NATIVE_RELEASE_ANDROID to 1 to turn the Android half on.
|
||||||
|
if: github.repository == 'liketrek/TREK' && vars.NATIVE_RELEASE_ANDROID == '1'
|
||||||
|
runs-on: ubuntu-24.04
|
||||||
|
timeout-minutes: 40
|
||||||
|
environment: store
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v6
|
||||||
|
|
||||||
|
- uses: actions/setup-node@v6
|
||||||
|
with:
|
||||||
|
node-version-file: .nvmrc
|
||||||
|
cache: npm
|
||||||
|
|
||||||
|
- uses: actions/setup-java@v5
|
||||||
|
with:
|
||||||
|
distribution: temurin
|
||||||
|
java-version: 21
|
||||||
|
cache: gradle
|
||||||
|
|
||||||
|
- name: Version and build number
|
||||||
|
id: version
|
||||||
|
run: |
|
||||||
|
echo "version=$(node -p "require('./client/package.json').version.split('-')[0]")" >> "$GITHUB_OUTPUT"
|
||||||
|
echo "build=$((GITHUB_RUN_NUMBER + 1000))" >> "$GITHUB_OUTPUT"
|
||||||
|
|
||||||
|
- name: Install
|
||||||
|
run: npm ci --workspace=shared --workspace=client
|
||||||
|
|
||||||
|
- name: Build shared
|
||||||
|
run: npm run build --workspace=shared
|
||||||
|
|
||||||
|
- name: Build the address screen and sync it into the shell
|
||||||
|
working-directory: client
|
||||||
|
run: npm run cap:sync -- android
|
||||||
|
|
||||||
|
- name: Upload key
|
||||||
|
env:
|
||||||
|
KEYSTORE_B64: ${{ secrets.ANDROID_UPLOAD_KEYSTORE_B64 }}
|
||||||
|
run: printf '%s' "$KEYSTORE_B64" | base64 -d > "$RUNNER_TEMP/upload.jks"
|
||||||
|
|
||||||
|
- name: Build the signed App Bundle
|
||||||
|
working-directory: client/android
|
||||||
|
env:
|
||||||
|
ORG_GRADLE_PROJECT_trekKeystorePassword: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
|
||||||
|
ORG_GRADLE_PROJECT_trekKeyAlias: ${{ secrets.ANDROID_KEY_ALIAS }}
|
||||||
|
ORG_GRADLE_PROJECT_trekKeyPassword: ${{ secrets.ANDROID_KEY_PASSWORD }}
|
||||||
|
run: >-
|
||||||
|
./gradlew bundleRelease --no-daemon
|
||||||
|
-PtrekVersionName=${{ steps.version.outputs.version }}
|
||||||
|
-PtrekVersionCode=${{ steps.version.outputs.build }}
|
||||||
|
-PtrekKeystore="$RUNNER_TEMP/upload.jks"
|
||||||
|
|
||||||
|
- uses: actions/upload-artifact@v6
|
||||||
|
with:
|
||||||
|
name: trek-android-${{ steps.version.outputs.version }}-${{ steps.version.outputs.build }}
|
||||||
|
path: client/android/app/build/outputs/bundle/release/app-release.aab
|
||||||
|
retention-days: 30
|
||||||
|
|
||||||
|
# Play only accepts API uploads once one bundle was uploaded by hand
|
||||||
|
# (wiki/Native-Apps.md). `draft` until the app has left draft in the console.
|
||||||
|
- name: Upload to Google Play
|
||||||
|
uses: r0adkll/upload-google-play@e738b9dd8f2476ea806d921b64aacd24f34515a5 # v1.1.5
|
||||||
|
with:
|
||||||
|
serviceAccountJsonPlainText: ${{ secrets.PLAY_SERVICE_ACCOUNT_JSON }}
|
||||||
|
packageName: com.liketrek.trek
|
||||||
|
releaseFiles: client/android/app/build/outputs/bundle/release/app-release.aab
|
||||||
|
track: ${{ inputs.track || 'internal' }}
|
||||||
|
status: draft
|
||||||
|
|
||||||
|
- name: Remove the upload key
|
||||||
|
if: always()
|
||||||
|
run: rm -f "$RUNNER_TEMP/upload.jks"
|
||||||
|
|
||||||
|
ios:
|
||||||
|
if: github.repository == 'liketrek/TREK'
|
||||||
|
runs-on: macos-15
|
||||||
|
timeout-minutes: 60
|
||||||
|
environment: store
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v6
|
||||||
|
|
||||||
|
# App Store uploads must be built with Xcode 26; the image's default is older.
|
||||||
|
- name: Select Xcode 26
|
||||||
|
run: |
|
||||||
|
XCODE=$(ls -d /Applications/Xcode_26*.app | sort -V | tail -1)
|
||||||
|
test -n "$XCODE"
|
||||||
|
sudo xcode-select -s "$XCODE"
|
||||||
|
xcodebuild -version
|
||||||
|
|
||||||
|
- uses: actions/setup-node@v6
|
||||||
|
with:
|
||||||
|
node-version-file: .nvmrc
|
||||||
|
cache: npm
|
||||||
|
|
||||||
|
- name: Version and build number
|
||||||
|
id: version
|
||||||
|
run: |
|
||||||
|
echo "version=$(node -p "require('./client/package.json').version.split('-')[0]")" >> "$GITHUB_OUTPUT"
|
||||||
|
echo "build=$((GITHUB_RUN_NUMBER + 1000))" >> "$GITHUB_OUTPUT"
|
||||||
|
|
||||||
|
- name: Install
|
||||||
|
run: npm ci --workspace=shared --workspace=client
|
||||||
|
|
||||||
|
- name: Build shared
|
||||||
|
run: npm run build --workspace=shared
|
||||||
|
|
||||||
|
- name: Build the address screen and sync it into the shell
|
||||||
|
working-directory: client
|
||||||
|
run: npm run cap:sync -- ios
|
||||||
|
|
||||||
|
- name: App Store Connect API key
|
||||||
|
env:
|
||||||
|
ASC_KEY_P8_B64: ${{ secrets.ASC_KEY_P8_B64 }}
|
||||||
|
run: printf '%s' "$ASC_KEY_P8_B64" | base64 -d > "$RUNNER_TEMP/AuthKey.p8"
|
||||||
|
|
||||||
|
- name: Distribution certificate
|
||||||
|
env:
|
||||||
|
APPLE_DIST_CERT_P12_B64: ${{ secrets.APPLE_DIST_CERT_P12_B64 }}
|
||||||
|
run: printf '%s' "$APPLE_DIST_CERT_P12_B64" | base64 -d > "$RUNNER_TEMP/dist.p12"
|
||||||
|
|
||||||
|
# Signs for distribution and uploads to TestFlight. Automatic signing cannot
|
||||||
|
# run on a device-less CI runner (it signs for development and then needs a
|
||||||
|
# development profile, which needs a registered device), so client/fastlane/Fastfile
|
||||||
|
# imports the stored distribution certificate and creates the App Store profile
|
||||||
|
# through the API key.
|
||||||
|
# The tag's message, past its subject line, is what testers read under
|
||||||
|
# "What to Test": one short line per change worth trying.
|
||||||
|
- name: TestFlight notes from the tag
|
||||||
|
if: startsWith(github.ref, 'refs/tags/')
|
||||||
|
run: |
|
||||||
|
git fetch --force --depth=1 origin "+${GITHUB_REF}:${GITHUB_REF}"
|
||||||
|
{
|
||||||
|
echo 'TESTFLIGHT_NOTES<<TREK_NOTES_END'
|
||||||
|
# A signed tag carries its signature at the end of the message.
|
||||||
|
git for-each-ref "$GITHUB_REF" --format='%(contents:body)' | sed '/-----BEGIN .*SIGNATURE-----/,$d'
|
||||||
|
echo 'TREK_NOTES_END'
|
||||||
|
} >> "$GITHUB_ENV"
|
||||||
|
|
||||||
|
- name: Build and upload to TestFlight
|
||||||
|
working-directory: client
|
||||||
|
env:
|
||||||
|
ASC_KEY_ID: ${{ secrets.ASC_KEY_ID }}
|
||||||
|
ASC_ISSUER_ID: ${{ secrets.ASC_ISSUER_ID }}
|
||||||
|
ASC_KEY_PATH: ${{ runner.temp }}/AuthKey.p8
|
||||||
|
CERT_P12_PATH: ${{ runner.temp }}/dist.p12
|
||||||
|
CERT_P12_PASSWORD: ${{ secrets.APPLE_DIST_CERT_PASSWORD }}
|
||||||
|
APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
|
||||||
|
MARKETING_VERSION: ${{ steps.version.outputs.version }}
|
||||||
|
CURRENT_PROJECT_VERSION: ${{ steps.version.outputs.build }}
|
||||||
|
FASTLANE_SKIP_UPDATE_CHECK: '1'
|
||||||
|
FASTLANE_HIDE_CHANGELOG: '1'
|
||||||
|
run: fastlane ios beta
|
||||||
|
|
||||||
|
- name: Remove secrets
|
||||||
|
if: always()
|
||||||
|
run: rm -f "$RUNNER_TEMP/AuthKey.p8" "$RUNNER_TEMP/dist.p12"
|
||||||
@@ -0,0 +1,161 @@
|
|||||||
|
name: Native apps
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
|
||||||
|
# Builds the iOS and Android shells whenever they, their address screen or the
|
||||||
|
# Capacitor plugins change. Nobody on the team has to own a Mac for the Swift
|
||||||
|
# side to be compiled on every change, and every run leaves a debug APK to
|
||||||
|
# install on a phone.
|
||||||
|
#
|
||||||
|
# Unsigned on purpose: signing and store uploads need secrets that fork PRs do
|
||||||
|
# not get, and belong in a release workflow of their own.
|
||||||
|
on:
|
||||||
|
pull_request:
|
||||||
|
paths:
|
||||||
|
- 'client/android/**'
|
||||||
|
- 'client/ios/**'
|
||||||
|
- 'client/native-shell/**'
|
||||||
|
- 'client/src/native/trekShell.ts'
|
||||||
|
- 'client/src/native/serverAddress.ts'
|
||||||
|
- 'client/capacitor.config.ts'
|
||||||
|
- 'client/vite.native.config.js'
|
||||||
|
- 'client/scripts/check-store-metadata.mjs'
|
||||||
|
- 'client/fastlane/**'
|
||||||
|
- 'client/package.json'
|
||||||
|
- 'package-lock.json'
|
||||||
|
- 'shared/src/i18n/*/native.ts'
|
||||||
|
- '.github/workflows/native.yml'
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
|
concurrency:
|
||||||
|
group: native-${{ github.ref }}
|
||||||
|
cancel-in-progress: true
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
# The store texts fit their limits and every listing image has its size and
|
||||||
|
# no alpha channel (client/fastlane/README.md). Plain Node, no install.
|
||||||
|
metadata:
|
||||||
|
runs-on: ubuntu-24.04
|
||||||
|
timeout-minutes: 5
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v6
|
||||||
|
|
||||||
|
- uses: actions/setup-node@v6
|
||||||
|
with:
|
||||||
|
node-version-file: .nvmrc
|
||||||
|
|
||||||
|
- name: Check the store listings
|
||||||
|
run: node client/scripts/check-store-metadata.mjs
|
||||||
|
|
||||||
|
android:
|
||||||
|
runs-on: ubuntu-24.04
|
||||||
|
timeout-minutes: 30
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v6
|
||||||
|
|
||||||
|
- uses: actions/setup-node@v6
|
||||||
|
with:
|
||||||
|
node-version-file: .nvmrc
|
||||||
|
cache: npm
|
||||||
|
|
||||||
|
- uses: actions/setup-java@v5
|
||||||
|
with:
|
||||||
|
distribution: temurin
|
||||||
|
java-version: 21
|
||||||
|
cache: gradle
|
||||||
|
|
||||||
|
- name: Install
|
||||||
|
run: npm ci --workspace=shared --workspace=client
|
||||||
|
|
||||||
|
- name: Build shared
|
||||||
|
run: npm run build --workspace=shared
|
||||||
|
|
||||||
|
- name: Build the address screen and sync it into the shells
|
||||||
|
working-directory: client
|
||||||
|
run: npm run cap:sync -- android
|
||||||
|
|
||||||
|
# The release build runs R8 with the keep rules in proguard-rules.pro, so a
|
||||||
|
# rule that goes missing fails here rather than in the store build. It is
|
||||||
|
# unsigned: the upload key only exists in native-release.yml.
|
||||||
|
- name: Assemble debug and release APKs
|
||||||
|
working-directory: client/android
|
||||||
|
run: ./gradlew assembleDebug assembleRelease lintDebug testDebugUnitTest --no-daemon
|
||||||
|
|
||||||
|
- uses: actions/upload-artifact@v6
|
||||||
|
with:
|
||||||
|
name: trek-android-debug
|
||||||
|
path: client/android/app/build/outputs/apk/debug/app-debug.apk
|
||||||
|
retention-days: 14
|
||||||
|
|
||||||
|
ios:
|
||||||
|
runs-on: macos-15
|
||||||
|
timeout-minutes: 40
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v6
|
||||||
|
|
||||||
|
# App Store uploads must be built with Xcode 26; the image's default is older.
|
||||||
|
- name: Select Xcode 26
|
||||||
|
run: |
|
||||||
|
XCODE=$(ls -d /Applications/Xcode_26*.app | sort -V | tail -1)
|
||||||
|
test -n "$XCODE"
|
||||||
|
sudo xcode-select -s "$XCODE"
|
||||||
|
xcodebuild -version
|
||||||
|
|
||||||
|
- name: Check the property lists
|
||||||
|
run: plutil -lint client/ios/App/App/Info.plist client/ios/ExportOptions.plist client/ios/App/NotificationService/Info.plist client/ios/App/NotificationService/NotificationService.entitlements client/ios/App/App/App.entitlements client/ios/App/TREKWidgets/Info.plist client/ios/App/TREKWidgets/TREKWidgets.entitlements client/ios/App/TREKWidgets/*.lproj/Localizable.strings
|
||||||
|
|
||||||
|
- uses: actions/setup-node@v6
|
||||||
|
with:
|
||||||
|
node-version-file: .nvmrc
|
||||||
|
cache: npm
|
||||||
|
|
||||||
|
- name: Install
|
||||||
|
run: npm ci --workspace=shared --workspace=client
|
||||||
|
|
||||||
|
- name: Build shared
|
||||||
|
run: npm run build --workspace=shared
|
||||||
|
|
||||||
|
- name: Build the address screen and sync it into the shells
|
||||||
|
working-directory: client
|
||||||
|
run: npm run cap:sync -- ios
|
||||||
|
|
||||||
|
- name: Build for the simulator
|
||||||
|
working-directory: client/ios/App
|
||||||
|
run: |
|
||||||
|
xcodebuild build \
|
||||||
|
-project App.xcodeproj \
|
||||||
|
-scheme App \
|
||||||
|
-configuration Debug \
|
||||||
|
-sdk iphonesimulator \
|
||||||
|
-destination 'generic/platform=iOS Simulator' \
|
||||||
|
CODE_SIGNING_ALLOWED=NO
|
||||||
|
|
||||||
|
# The widgets drawn to PNGs (client/ios/WidgetPreviews): every size, light and
|
||||||
|
# dark, for a trip ahead, a trip under way and none, plus a home screen and
|
||||||
|
# a lock screen of them. Nobody has to install a build to see a widget change.
|
||||||
|
widget-previews:
|
||||||
|
runs-on: macos-15
|
||||||
|
timeout-minutes: 20
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v6
|
||||||
|
|
||||||
|
- name: Select Xcode 26
|
||||||
|
run: |
|
||||||
|
XCODE=$(ls -d /Applications/Xcode_26*.app | sort -V | tail -1)
|
||||||
|
test -n "$XCODE"
|
||||||
|
sudo xcode-select -s "$XCODE"
|
||||||
|
|
||||||
|
- name: Render the widgets
|
||||||
|
working-directory: client/ios/WidgetPreviews
|
||||||
|
run: |
|
||||||
|
mkdir -p Sources/WidgetPreviews/Widgets
|
||||||
|
cp ../App/TREKWidgets/WidgetSnapshot.swift ../App/TREKWidgets/TrekStyle.swift ../App/TREKWidgets/TrekFamily.swift ../App/TREKWidgets/WorldGrid.swift \
|
||||||
|
../App/TREKWidgets/*Content.swift Sources/WidgetPreviews/Widgets/
|
||||||
|
swift run -c release WidgetPreviews out "$PWD/../App/App/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png"
|
||||||
|
|
||||||
|
- uses: actions/upload-artifact@v6
|
||||||
|
with:
|
||||||
|
name: widget-previews
|
||||||
|
path: client/ios/WidgetPreviews/out
|
||||||
|
retention-days: 14
|
||||||
@@ -182,7 +182,7 @@ Most of what follows is an addon an admin switches on or off. Lists, Costs, Docu
|
|||||||
|
|
||||||
#### 📱 Mobile and offline
|
#### 📱 Mobile and offline
|
||||||
|
|
||||||
- **Installable**: iOS and Android straight from the browser, no App Store, standalone with a themed status bar
|
- **Apps**: TREK Travel Planner for iPhone, iPad and Android connects to any TREK server, and the browser installs TREK as a standalone app with a themed status bar too
|
||||||
- **Phone layouts**: their own screens for every part of the app, with a bottom bar and dashboard widgets the user orders
|
- **Phone layouts**: their own screens for every part of the app, with a bottom bar and dashboard widgets the user orders
|
||||||
- **Offline reads**: the app shell is precached and trips, places, tours, files and nearby places live in a per-user IndexedDB store, so a trip opens with no network
|
- **Offline reads**: the app shell is precached and trips, places, tours, files and nearby places live in a per-user IndexedDB store, so a trip opens with no network
|
||||||
- **Offline writes**: changes queue and replay with an `X-Idempotency-Key`, and a stale edit waits for a keep-mine or keep-theirs choice
|
- **Offline writes**: changes queue and replay with an `X-Idempotency-Key`, and a stale edit waits for a keep-mine or keep-theirs choice
|
||||||
@@ -335,7 +335,7 @@ See [`charts/README.md`](https://github.com/liketrek/TREK/blob/main/charts/READM
|
|||||||
|
|
||||||
<h2 id="install-as-app-pwa">Install as App (PWA)</h2>
|
<h2 id="install-as-app-pwa">Install as App (PWA)</h2>
|
||||||
|
|
||||||
TREK works as a Progressive Web App — no App Store needed.
|
TREK works as a Progressive Web App, and the TREK Travel Planner app for iPhone, iPad and Android connects to the same server ([Native Apps](https://github.com/liketrek/TREK/wiki/Native-Apps)). To install the web app instead:
|
||||||
|
|
||||||
1. Open TREK in the browser (HTTPS required)
|
1. Open TREK in the browser (HTTPS required)
|
||||||
2. **iOS**: Share ▸ *Add to Home Screen*
|
2. **iOS**: Share ▸ *Add to Home Screen*
|
||||||
|
|||||||
@@ -56,5 +56,5 @@ See `values.yaml` for more options.
|
|||||||
- `COOKIE_SECURE` is auto-derived (on when `NODE_ENV=production` or `FORCE_HTTPS=true`). Set `env.COOKIE_SECURE: "false"` only during local testing without TLS. **Not recommended for production.**
|
- `COOKIE_SECURE` is auto-derived (on when `NODE_ENV=production` or `FORCE_HTTPS=true`). Set `env.COOKIE_SECURE: "false"` only during local testing without TLS. **Not recommended for production.**
|
||||||
- Web Push needs no chart settings: TREK generates its key pair on first start and keeps it in the database on the data PVC. To bring your own pair, set `env.VAPID_PUBLIC_KEY` and `secretEnv.VAPID_PRIVATE_KEY` together (and optionally `env.VAPID_SUBJECT`); changing the pair later means every device has to turn push on again.
|
- Web Push needs no chart settings: TREK generates its key pair on first start and keeps it in the database on the data PVC. To bring your own pair, set `env.VAPID_PUBLIC_KEY` and `secretEnv.VAPID_PRIVATE_KEY` together (and optionally `env.VAPID_SUBJECT`); changing the pair later means every device has to turn push on again.
|
||||||
- Set `env.OIDC_DISCOVERY_URL` to override the auto-constructed OIDC discovery endpoint. Required for providers (e.g. Authentik) that expose it at a non-standard path.
|
- Set `env.OIDC_DISCOVERY_URL` to override the auto-constructed OIDC discovery endpoint. Required for providers (e.g. Authentik) that expose it at a non-standard path.
|
||||||
- `podSecurityContext` defaults to `fsGroup: 1000` with `fsGroupChangePolicy: OnRootMismatch`, and `securityContext` (the container's) is empty. The container then starts as root, hands any file under `/app/data` and `/app/uploads` that is not owned by `node` yet to `node`, and drops to `node`. To run as `node` from the start, for example under the `restricted` Pod Security Standard, set `podSecurityContext.runAsUser: 1000` and `runAsGroup: 1000`; the image then skips that step and the privilege drop. See the example in `values.yaml`.
|
- `podSecurityContext` defaults to `fsGroup: 1000` with `fsGroupChangePolicy: OnRootMismatch`, and `securityContext` (the container's) is empty. The container then starts as root, hands `/app/data` and `/app/uploads` to `node` (uid 1000) if the directory or anything directly inside it is not owned by `node` yet, and drops to `node`. Deeper files are not checked. Only the owning user is changed (plus a `root` group), so a different `fsGroup` stays in place. A volume that refuses `chown` (NFS with `root_squash`) logs a warning instead; set `runAsUser: 1000` then. To run as `node` from the start, for example under the `restricted` Pod Security Standard, set `podSecurityContext.runAsUser: 1000` and `runAsGroup: 1000`; the image then skips that step and the privilege drop. See the example in `values.yaml`.
|
||||||
- Use `extraVolumes` and `extraVolumeMounts` to add your own volumes to the pod. To give the booking import more KItinerary extractors, mount a ConfigMap at `/usr/local/share/kitinerary/extractors`, with one `.json` and one `.js` key for each extractor; see the example in `values.yaml`.
|
- Use `extraVolumes` and `extraVolumeMounts` to add your own volumes to the pod. To give the booking import more KItinerary extractors, mount a ConfigMap at `/usr/local/share/kitinerary/extractors`, with one `.json` and one `.js` key for each extractor; see the example in `values.yaml`.
|
||||||
|
|||||||
@@ -7,3 +7,7 @@ playwright/.cache/
|
|||||||
# vite-plugin-pwa dev output (devOptions.enabled)
|
# vite-plugin-pwa dev output (devOptions.enabled)
|
||||||
dev-dist/
|
dev-dist/
|
||||||
e2e/help/media.env
|
e2e/help/media.env
|
||||||
|
|
||||||
|
# The native apps' address screen (npm run build:native), copied into
|
||||||
|
# android/ and ios/ by `cap sync`
|
||||||
|
native-dist/
|
||||||
|
|||||||
@@ -0,0 +1,108 @@
|
|||||||
|
# Using Android gitignore template: https://github.com/github/gitignore/blob/HEAD/Android.gitignore
|
||||||
|
|
||||||
|
# Built application files
|
||||||
|
*.apk
|
||||||
|
*.aar
|
||||||
|
*.ap_
|
||||||
|
*.aab
|
||||||
|
|
||||||
|
# Files for the ART/Dalvik VM
|
||||||
|
*.dex
|
||||||
|
|
||||||
|
# Java class files
|
||||||
|
*.class
|
||||||
|
|
||||||
|
# Generated files
|
||||||
|
bin/
|
||||||
|
gen/
|
||||||
|
out/
|
||||||
|
# Uncomment the following line in case you need and you don't have the release build type files in your app
|
||||||
|
# release/
|
||||||
|
|
||||||
|
# Gradle files
|
||||||
|
.gradle/
|
||||||
|
build/
|
||||||
|
|
||||||
|
# Local configuration file (sdk path, etc)
|
||||||
|
local.properties
|
||||||
|
|
||||||
|
# Proguard folder generated by Eclipse
|
||||||
|
proguard/
|
||||||
|
|
||||||
|
# Log Files
|
||||||
|
*.log
|
||||||
|
|
||||||
|
# Android Studio Navigation editor temp files
|
||||||
|
.navigation/
|
||||||
|
|
||||||
|
# Android Studio captures folder
|
||||||
|
captures/
|
||||||
|
|
||||||
|
# IntelliJ
|
||||||
|
*.iml
|
||||||
|
.idea/workspace.xml
|
||||||
|
.idea/tasks.xml
|
||||||
|
.idea/gradle.xml
|
||||||
|
.idea/assetWizardSettings.xml
|
||||||
|
.idea/dictionaries
|
||||||
|
.idea/libraries
|
||||||
|
# Android Studio 3 in .gitignore file.
|
||||||
|
.idea/caches
|
||||||
|
.idea/modules.xml
|
||||||
|
# Comment next line if keeping position of elements in Navigation Editor is relevant for you
|
||||||
|
.idea/navEditor.xml
|
||||||
|
|
||||||
|
# Keystore files and store credentials. The upload key and the Play service
|
||||||
|
# account live only in the release workflow's secrets and in the owner's
|
||||||
|
# offline backup, never in the repository.
|
||||||
|
*.jks
|
||||||
|
*.keystore
|
||||||
|
keystore.properties
|
||||||
|
*service-account*.json
|
||||||
|
|
||||||
|
# External native build folder generated in Android Studio 2.2 and later
|
||||||
|
.externalNativeBuild
|
||||||
|
.cxx/
|
||||||
|
|
||||||
|
# Google Services (e.g. APIs or Firebase)
|
||||||
|
# Push is not wired up and the build does not apply the google-services plugin,
|
||||||
|
# so no CI secret is needed. Kept ignored so a stray Firebase config never lands
|
||||||
|
# in the repository.
|
||||||
|
google-services.json
|
||||||
|
app/google-services.json
|
||||||
|
|
||||||
|
# Freeline
|
||||||
|
freeline.py
|
||||||
|
freeline/
|
||||||
|
freeline_project_description.json
|
||||||
|
|
||||||
|
# fastlane
|
||||||
|
fastlane/report.xml
|
||||||
|
fastlane/Preview.html
|
||||||
|
fastlane/screenshots
|
||||||
|
fastlane/test_output
|
||||||
|
fastlane/readme.md
|
||||||
|
|
||||||
|
# Version control
|
||||||
|
vcs.xml
|
||||||
|
|
||||||
|
# lint
|
||||||
|
lint/intermediates/
|
||||||
|
lint/generated/
|
||||||
|
lint/outputs/
|
||||||
|
lint/tmp/
|
||||||
|
# lint/reports/
|
||||||
|
|
||||||
|
# Android Profiling
|
||||||
|
*.hprof
|
||||||
|
|
||||||
|
# Cordova plugins for Capacitor
|
||||||
|
capacitor-cordova-android-plugins
|
||||||
|
|
||||||
|
# Copied web assets
|
||||||
|
app/src/main/assets/public
|
||||||
|
|
||||||
|
# Generated Config files
|
||||||
|
app/src/main/assets/capacitor.config.json
|
||||||
|
app/src/main/assets/capacitor.plugins.json
|
||||||
|
app/src/main/res/xml/config.xml
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
/build/*
|
||||||
|
!/build/.npmkeep
|
||||||
@@ -0,0 +1,70 @@
|
|||||||
|
apply plugin: 'com.android.application'
|
||||||
|
|
||||||
|
android {
|
||||||
|
namespace = "com.liketrek.trek"
|
||||||
|
compileSdk = rootProject.ext.compileSdkVersion
|
||||||
|
defaultConfig {
|
||||||
|
applicationId "com.liketrek.trek"
|
||||||
|
minSdkVersion rootProject.ext.minSdkVersion
|
||||||
|
targetSdkVersion rootProject.ext.targetSdkVersion
|
||||||
|
// The release workflow (.github/workflows/native-release.yml) passes both:
|
||||||
|
// the version from client/package.json and a build number that only grows.
|
||||||
|
// Local and PR builds fall back to these placeholders.
|
||||||
|
versionCode((project.findProperty('trekVersionCode') ?: '1') as Integer)
|
||||||
|
versionName(project.findProperty('trekVersionName') ?: '0.0.0-dev')
|
||||||
|
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||||
|
aaptOptions {
|
||||||
|
// Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
|
||||||
|
// Default: https://android.googlesource.com/platform/frameworks/base/+/282e181b58cf72b6ca770dc7ca5f91f135444502/tools/aapt/AaptAssets.cpp#61
|
||||||
|
ignoreAssetsPattern = '!.svn:!.git:!.ds_store:!*.scc:.*:!CVS:!thumbs.db:!picasa.ini:!*~'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// The upload key only exists in the release workflow, which decodes it from a
|
||||||
|
// secret and passes its path and passwords as Gradle properties. Every other
|
||||||
|
// build (local, fork, PR) stays unsigned and needs no secret.
|
||||||
|
signingConfigs {
|
||||||
|
release {
|
||||||
|
if (project.hasProperty('trekKeystore')) {
|
||||||
|
storeFile file(project.property('trekKeystore'))
|
||||||
|
storePassword project.property('trekKeystorePassword')
|
||||||
|
keyAlias project.property('trekKeyAlias')
|
||||||
|
keyPassword project.property('trekKeyPassword')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
buildTypes {
|
||||||
|
release {
|
||||||
|
if (project.hasProperty('trekKeystore')) {
|
||||||
|
signingConfig signingConfigs.release
|
||||||
|
}
|
||||||
|
minifyEnabled true
|
||||||
|
shrinkResources true
|
||||||
|
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
repositories {
|
||||||
|
flatDir{
|
||||||
|
dirs '../capacitor-cordova-android-plugins/src/main/libs', 'libs'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
implementation fileTree(include: ['*.jar'], dir: 'libs')
|
||||||
|
implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion"
|
||||||
|
implementation "androidx.coordinatorlayout:coordinatorlayout:$androidxCoordinatorLayoutVersion"
|
||||||
|
implementation "androidx.core:core-splashscreen:$coreSplashScreenVersion"
|
||||||
|
implementation "androidx.browser:browser:$androidxBrowserVersion"
|
||||||
|
implementation "androidx.biometric:biometric:1.1.0"
|
||||||
|
// Push through liketrek's relay. No google-services plugin: Firebase reads
|
||||||
|
// its project from res/values/firebase.xml, the strings the plugin would generate.
|
||||||
|
implementation "com.google.firebase:firebase-messaging:24.1.2"
|
||||||
|
implementation project(':capacitor-android')
|
||||||
|
testImplementation "junit:junit:$junitVersion"
|
||||||
|
androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
|
||||||
|
androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"
|
||||||
|
implementation project(':capacitor-cordova-android-plugins')
|
||||||
|
}
|
||||||
|
|
||||||
|
apply from: 'capacitor.build.gradle'
|
||||||
@@ -0,0 +1,25 @@
|
|||||||
|
// DO NOT EDIT THIS FILE! IT IS GENERATED EACH TIME "capacitor update" IS RUN
|
||||||
|
|
||||||
|
android {
|
||||||
|
compileOptions {
|
||||||
|
sourceCompatibility JavaVersion.VERSION_21
|
||||||
|
targetCompatibility JavaVersion.VERSION_21
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
|
||||||
|
dependencies {
|
||||||
|
implementation project(':capacitor-app')
|
||||||
|
implementation project(':capacitor-filesystem')
|
||||||
|
implementation project(':capacitor-haptics')
|
||||||
|
implementation project(':capacitor-keyboard')
|
||||||
|
implementation project(':capacitor-share')
|
||||||
|
implementation project(':capacitor-splash-screen')
|
||||||
|
implementation project(':capacitor-status-bar')
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
if (hasProperty('postBuildExtras')) {
|
||||||
|
postBuildExtras()
|
||||||
|
}
|
||||||
@@ -0,0 +1,38 @@
|
|||||||
|
# Add project specific ProGuard rules here.
|
||||||
|
# You can control the set of applied configuration files using the
|
||||||
|
# proguardFiles setting in build.gradle.
|
||||||
|
#
|
||||||
|
# For more details, see
|
||||||
|
# http://developer.android.com/guide/developing/tools/proguard.html
|
||||||
|
|
||||||
|
# If your project uses WebView with JS, uncomment the following
|
||||||
|
# and specify the fully qualified class name to the JavaScript interface
|
||||||
|
# class:
|
||||||
|
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
|
||||||
|
# public *;
|
||||||
|
#}
|
||||||
|
|
||||||
|
# Uncomment this to preserve the line number information for
|
||||||
|
# debugging stack traces.
|
||||||
|
#-keepattributes SourceFile,LineNumberTable
|
||||||
|
|
||||||
|
# If you keep the line number information, uncomment this to
|
||||||
|
# hide the original source file name.
|
||||||
|
#-renamesourcefileattribute SourceFile
|
||||||
|
|
||||||
|
# TREK's own classes: TrekShellPlugin is reached from JavaScript by name and its
|
||||||
|
# methods through reflection, so R8 must neither rename nor drop them.
|
||||||
|
-keep class com.liketrek.trek.** { *; }
|
||||||
|
|
||||||
|
# Every Capacitor plugin: the bridge finds plugins by their annotation and calls
|
||||||
|
# the annotated methods reflectively.
|
||||||
|
-keep @com.getcapacitor.annotation.CapacitorPlugin public class * {
|
||||||
|
@com.getcapacitor.PluginMethod public <methods>;
|
||||||
|
}
|
||||||
|
|
||||||
|
# The WebView bridge: Capacitor's message handler is called from JavaScript
|
||||||
|
# through @JavascriptInterface, and every plugin class is instantiated by name.
|
||||||
|
-keepclassmembers class * {
|
||||||
|
@android.webkit.JavascriptInterface <methods>;
|
||||||
|
}
|
||||||
|
-keep public class * extends com.getcapacitor.Plugin
|
||||||
@@ -0,0 +1,101 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools">
|
||||||
|
|
||||||
|
<application
|
||||||
|
android:allowBackup="false"
|
||||||
|
android:icon="@mipmap/ic_launcher"
|
||||||
|
android:label="@string/app_name"
|
||||||
|
android:networkSecurityConfig="@xml/network_security_config"
|
||||||
|
android:roundIcon="@mipmap/ic_launcher_round"
|
||||||
|
android:supportsRtl="true"
|
||||||
|
android:theme="@style/AppTheme">
|
||||||
|
|
||||||
|
<activity
|
||||||
|
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode|navigation|density"
|
||||||
|
android:name=".MainActivity"
|
||||||
|
android:label="@string/title_activity_main"
|
||||||
|
android:theme="@style/AppTheme.NoActionBarLaunch"
|
||||||
|
android:launchMode="singleTask"
|
||||||
|
android:exported="true">
|
||||||
|
|
||||||
|
<intent-filter>
|
||||||
|
<action android:name="android.intent.action.MAIN" />
|
||||||
|
<category android:name="android.intent.category.LAUNCHER" />
|
||||||
|
</intent-filter>
|
||||||
|
<!-- "Open in TREK" / share a booking document into the import. -->
|
||||||
|
<intent-filter>
|
||||||
|
<action android:name="android.intent.action.VIEW" />
|
||||||
|
<action android:name="android.intent.action.SEND" />
|
||||||
|
<category android:name="android.intent.category.DEFAULT" />
|
||||||
|
<data android:mimeType="application/pdf" />
|
||||||
|
<data android:mimeType="text/calendar" />
|
||||||
|
<data android:mimeType="application/vnd.apple.pkpass" />
|
||||||
|
<data android:mimeType="message/rfc822" />
|
||||||
|
</intent-filter>
|
||||||
|
|
||||||
|
<!-- Deep links.
|
||||||
|
|
||||||
|
The scheme is @string/custom_url_scheme (com.liketrek.trek).
|
||||||
|
launchMode is singleTask above, so a link delivers into the
|
||||||
|
running task via onNewIntent rather than starting a second copy
|
||||||
|
of the app on top of the first.
|
||||||
|
|
||||||
|
This is the return path for SSO and passkey sign-in: TrekShell
|
||||||
|
opens the server's login page in a Custom Tab, and after the
|
||||||
|
hand-off it redirects to com.liketrek.trek://auth?code=…, which
|
||||||
|
lands here and in TrekShellPlugin.handleOnNewIntent.
|
||||||
|
|
||||||
|
Not an App Link (autoVerify + https). App Links are verified
|
||||||
|
against a specific domain via assetlinks.json, and TREK is
|
||||||
|
self-hosted — there is no single domain to verify against. A
|
||||||
|
custom scheme is the only form that works for every user's
|
||||||
|
server. -->
|
||||||
|
<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="@string/custom_url_scheme" />
|
||||||
|
</intent-filter>
|
||||||
|
|
||||||
|
</activity>
|
||||||
|
|
||||||
|
<!-- Push: the relay's data messages, decrypted and shown here. -->
|
||||||
|
<service
|
||||||
|
android:name=".TrekPushService"
|
||||||
|
android:exported="false">
|
||||||
|
<intent-filter>
|
||||||
|
<action android:name="com.google.firebase.MESSAGING_EVENT" />
|
||||||
|
</intent-filter>
|
||||||
|
</service>
|
||||||
|
|
||||||
|
<provider
|
||||||
|
android:name="androidx.core.content.FileProvider"
|
||||||
|
android:authorities="${applicationId}.fileprovider"
|
||||||
|
android:exported="false"
|
||||||
|
android:grantUriPermissions="true">
|
||||||
|
<meta-data
|
||||||
|
android:name="android.support.FILE_PROVIDER_PATHS"
|
||||||
|
android:resource="@xml/file_paths"></meta-data>
|
||||||
|
</provider>
|
||||||
|
|
||||||
|
</application>
|
||||||
|
|
||||||
|
<!-- Permissions. Only what the WebView itself needs: the file picker's
|
||||||
|
camera option and navigator.geolocation for "locate me" on the map,
|
||||||
|
both granted at runtime through Capacitor's WebChromeClient. -->
|
||||||
|
|
||||||
|
<uses-permission android:name="android.permission.INTERNET" />
|
||||||
|
<!-- COARSE is listed first because it is the weaker grant and is enough
|
||||||
|
for "what city am I in". -->
|
||||||
|
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
|
||||||
|
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
|
||||||
|
<!-- required="false" on purpose: TREK is a planner, and everything except
|
||||||
|
"locate me" works without GPS hardware. Marking it required would have
|
||||||
|
Play hide the app from tablets and other GPS-less devices. -->
|
||||||
|
<uses-feature android:name="android.hardware.location.gps" android:required="false" />
|
||||||
|
<uses-permission android:name="android.permission.CAMERA" />
|
||||||
|
<!-- Android 13 and later ask before an app may show notifications. -->
|
||||||
|
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
|
||||||
|
<uses-feature android:name="android.hardware.camera" android:required="false" />
|
||||||
|
</manifest>
|
||||||
@@ -0,0 +1,57 @@
|
|||||||
|
package com.liketrek.trek;
|
||||||
|
|
||||||
|
import android.content.Intent;
|
||||||
|
import android.os.Bundle;
|
||||||
|
import android.view.View;
|
||||||
|
import com.getcapacitor.BridgeActivity;
|
||||||
|
|
||||||
|
public class MainActivity extends BridgeActivity {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
|
registerPlugin(TrekShellPlugin.class);
|
||||||
|
// With a server picked, the WebView loads that server instead of the
|
||||||
|
// bundled address screen, so the UI arrives in the version the server
|
||||||
|
// runs and on its own origin. BridgeActivity reads `config` while it
|
||||||
|
// builds the bridge inside super.onCreate().
|
||||||
|
boolean restarting = TrekServerStore.consumeRestart(this);
|
||||||
|
String server = TrekServerStore.getUrl(this);
|
||||||
|
boolean onServer = server != null && !TrekServerStore.consumeShellOnce(this);
|
||||||
|
config = TrekServerStore.configFor(this, onServer ? server : null, restarting);
|
||||||
|
super.onCreate(savedInstanceState);
|
||||||
|
if (bridge == null) return;
|
||||||
|
// The UI asks for no overscroll effect (overscroll-behavior: none on html)
|
||||||
|
// and Chrome honours that, but the WebView draws the stretch on its root
|
||||||
|
// scroller natively. It scales the whole view, top bar and bottom dock included.
|
||||||
|
bridge.getWebView().setOverScrollMode(View.OVER_SCROLL_NEVER);
|
||||||
|
// Set before any WebView callback can run: they are posted to this thread.
|
||||||
|
if (onServer) bridge.setWebViewClient(new TrekWebViewClient(bridge, this::showAddressScreen));
|
||||||
|
TrekSharedFiles.receive(this, getIntent());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onNewIntent(Intent intent) {
|
||||||
|
super.onNewIntent(intent);
|
||||||
|
TrekSharedFiles.receive(this, intent);
|
||||||
|
}
|
||||||
|
|
||||||
|
private boolean leavingServer;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The server did not load: back to the address screen, which offers retry
|
||||||
|
* and change. A fresh task rather than recreate(), because this usually
|
||||||
|
* happens during launch, while the system splash is still up, and a
|
||||||
|
* recreated activity leaves that splash lying over the new page.
|
||||||
|
*/
|
||||||
|
private void showAddressScreen() {
|
||||||
|
// A failed page can report more than one error; restart only once.
|
||||||
|
if (leavingServer) return;
|
||||||
|
leavingServer = true;
|
||||||
|
TrekServerStore.showShellOnce(this);
|
||||||
|
TrekServerStore.markRestart(this);
|
||||||
|
runOnUiThread(() -> {
|
||||||
|
startActivity(new Intent(this, MainActivity.class).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK));
|
||||||
|
overridePendingTransition(0, 0);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,139 @@
|
|||||||
|
package com.liketrek.trek;
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
import android.content.SharedPreferences;
|
||||||
|
import android.security.keystore.KeyGenParameterSpec;
|
||||||
|
import android.security.keystore.KeyProperties;
|
||||||
|
import android.util.Base64;
|
||||||
|
import java.math.BigInteger;
|
||||||
|
import java.security.KeyFactory;
|
||||||
|
import java.security.KeyPair;
|
||||||
|
import java.security.KeyPairGenerator;
|
||||||
|
import java.security.KeyStore;
|
||||||
|
import java.security.interfaces.ECPrivateKey;
|
||||||
|
import java.security.interfaces.ECPublicKey;
|
||||||
|
import java.security.spec.ECGenParameterSpec;
|
||||||
|
import java.security.spec.PKCS8EncodedKeySpec;
|
||||||
|
import java.security.SecureRandom;
|
||||||
|
import javax.crypto.Cipher;
|
||||||
|
import javax.crypto.KeyGenerator;
|
||||||
|
import javax.crypto.SecretKey;
|
||||||
|
import javax.crypto.spec.GCMParameterSpec;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The device's Web Push key pair (P-256) and auth secret (RFC 8291). The server
|
||||||
|
* encrypts every notification for these, and TrekPushService decrypts with
|
||||||
|
* them. They are kept in the app's preferences, sealed with an AES key that
|
||||||
|
* never leaves the Android Keystore, so a copy of the preferences alone opens
|
||||||
|
* nothing.
|
||||||
|
*/
|
||||||
|
final class TrekPushKeys {
|
||||||
|
|
||||||
|
private static final String PREFS = "trek_push";
|
||||||
|
private static final String WRAP_ALIAS = "trek_push_wrap";
|
||||||
|
private static final String PRIVATE = "private";
|
||||||
|
private static final String PUBLIC = "public";
|
||||||
|
private static final String AUTH = "auth";
|
||||||
|
|
||||||
|
final ECPrivateKey privateKey;
|
||||||
|
/** Uncompressed point, 65 bytes, as the server reads p256dh. */
|
||||||
|
final byte[] publicKey;
|
||||||
|
final byte[] auth;
|
||||||
|
|
||||||
|
TrekPushKeys(ECPrivateKey privateKey, byte[] publicKey, byte[] auth) {
|
||||||
|
this.privateKey = privateKey;
|
||||||
|
this.publicKey = publicKey;
|
||||||
|
this.auth = auth;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** The stored keys, or null when the app never subscribed. */
|
||||||
|
static synchronized TrekPushKeys load(Context context) throws Exception {
|
||||||
|
SharedPreferences prefs = context.getSharedPreferences(PREFS, Context.MODE_PRIVATE);
|
||||||
|
String sealedPrivate = prefs.getString(PRIVATE, null);
|
||||||
|
String publicKey = prefs.getString(PUBLIC, null);
|
||||||
|
String sealedAuth = prefs.getString(AUTH, null);
|
||||||
|
if (sealedPrivate == null || publicKey == null || sealedAuth == null) return null;
|
||||||
|
byte[] pkcs8 = unseal(sealedPrivate);
|
||||||
|
ECPrivateKey key = (ECPrivateKey) KeyFactory.getInstance("EC").generatePrivate(new PKCS8EncodedKeySpec(pkcs8));
|
||||||
|
return new TrekPushKeys(key, Base64.decode(publicKey, Base64.NO_WRAP), unseal(sealedAuth));
|
||||||
|
}
|
||||||
|
|
||||||
|
static synchronized TrekPushKeys loadOrCreate(Context context) throws Exception {
|
||||||
|
TrekPushKeys existing;
|
||||||
|
try {
|
||||||
|
existing = load(context);
|
||||||
|
} catch (Exception unreadable) {
|
||||||
|
// The Keystore key is gone (backup restored to another device, data
|
||||||
|
// cleared): start over, the next subscription carries the new keys.
|
||||||
|
existing = null;
|
||||||
|
}
|
||||||
|
if (existing != null) return existing;
|
||||||
|
|
||||||
|
KeyPairGenerator generator = KeyPairGenerator.getInstance("EC");
|
||||||
|
generator.initialize(new ECGenParameterSpec("secp256r1"));
|
||||||
|
KeyPair pair = generator.generateKeyPair();
|
||||||
|
byte[] publicKey = uncompressed((ECPublicKey) pair.getPublic());
|
||||||
|
byte[] auth = new byte[16];
|
||||||
|
new SecureRandom().nextBytes(auth);
|
||||||
|
context.getSharedPreferences(PREFS, Context.MODE_PRIVATE)
|
||||||
|
.edit()
|
||||||
|
.putString(PRIVATE, seal(pair.getPrivate().getEncoded()))
|
||||||
|
.putString(PUBLIC, Base64.encodeToString(publicKey, Base64.NO_WRAP))
|
||||||
|
.putString(AUTH, seal(auth))
|
||||||
|
.apply();
|
||||||
|
return new TrekPushKeys((ECPrivateKey) pair.getPrivate(), publicKey, auth);
|
||||||
|
}
|
||||||
|
|
||||||
|
static String base64url(byte[] data) {
|
||||||
|
return Base64.encodeToString(data, Base64.URL_SAFE | Base64.NO_WRAP | Base64.NO_PADDING);
|
||||||
|
}
|
||||||
|
|
||||||
|
static byte[] uncompressed(ECPublicKey key) {
|
||||||
|
byte[] out = new byte[65];
|
||||||
|
out[0] = 0x04;
|
||||||
|
copyFixed(key.getW().getAffineX(), out, 1);
|
||||||
|
copyFixed(key.getW().getAffineY(), out, 33);
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** A coordinate as exactly 32 bytes: BigInteger adds a sign byte or drops leading zeros. */
|
||||||
|
private static void copyFixed(BigInteger value, byte[] out, int offset) {
|
||||||
|
byte[] raw = value.toByteArray();
|
||||||
|
int start = Math.max(0, raw.length - 32);
|
||||||
|
int length = raw.length - start;
|
||||||
|
System.arraycopy(raw, start, out, offset + 32 - length, length);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static SecretKey wrapKey() throws Exception {
|
||||||
|
KeyStore store = KeyStore.getInstance("AndroidKeyStore");
|
||||||
|
store.load(null);
|
||||||
|
if (store.containsAlias(WRAP_ALIAS)) return ((KeyStore.SecretKeyEntry) store.getEntry(WRAP_ALIAS, null)).getSecretKey();
|
||||||
|
KeyGenerator generator = KeyGenerator.getInstance(KeyProperties.KEY_ALGORITHM_AES, "AndroidKeyStore");
|
||||||
|
generator.init(
|
||||||
|
new KeyGenParameterSpec.Builder(WRAP_ALIAS, KeyProperties.PURPOSE_ENCRYPT | KeyProperties.PURPOSE_DECRYPT)
|
||||||
|
.setBlockModes(KeyProperties.BLOCK_MODE_GCM)
|
||||||
|
.setEncryptionPaddings(KeyProperties.ENCRYPTION_PADDING_NONE)
|
||||||
|
.setKeySize(256)
|
||||||
|
.build()
|
||||||
|
);
|
||||||
|
return generator.generateKey();
|
||||||
|
}
|
||||||
|
|
||||||
|
private static String seal(byte[] plain) throws Exception {
|
||||||
|
Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding");
|
||||||
|
cipher.init(Cipher.ENCRYPT_MODE, wrapKey());
|
||||||
|
byte[] iv = cipher.getIV();
|
||||||
|
byte[] sealed = cipher.doFinal(plain);
|
||||||
|
byte[] out = new byte[iv.length + sealed.length];
|
||||||
|
System.arraycopy(iv, 0, out, 0, iv.length);
|
||||||
|
System.arraycopy(sealed, 0, out, iv.length, sealed.length);
|
||||||
|
return Base64.encodeToString(out, Base64.NO_WRAP);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static byte[] unseal(String value) throws Exception {
|
||||||
|
byte[] in = Base64.decode(value, Base64.NO_WRAP);
|
||||||
|
Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding");
|
||||||
|
cipher.init(Cipher.DECRYPT_MODE, wrapKey(), new GCMParameterSpec(128, in, 0, 12));
|
||||||
|
return cipher.doFinal(in, 12, in.length - 12);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,101 @@
|
|||||||
|
package com.liketrek.trek;
|
||||||
|
|
||||||
|
import android.Manifest;
|
||||||
|
import android.app.NotificationChannel;
|
||||||
|
import android.app.NotificationManager;
|
||||||
|
import android.app.PendingIntent;
|
||||||
|
import android.content.Context;
|
||||||
|
import android.content.Intent;
|
||||||
|
import android.content.pm.PackageManager;
|
||||||
|
import android.os.Build;
|
||||||
|
import android.util.Base64;
|
||||||
|
import androidx.annotation.NonNull;
|
||||||
|
import androidx.core.app.NotificationCompat;
|
||||||
|
import androidx.core.app.NotificationManagerCompat;
|
||||||
|
import androidx.core.content.ContextCompat;
|
||||||
|
import com.google.firebase.messaging.FirebaseMessagingService;
|
||||||
|
import com.google.firebase.messaging.RemoteMessage;
|
||||||
|
import java.nio.charset.StandardCharsets;
|
||||||
|
import org.json.JSONObject;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Receives the relay's data messages ({enc}: the server's encrypted Web Push
|
||||||
|
* record), decrypts them with the device's keys and shows the notification.
|
||||||
|
* Without the keys, or when the record does not open, it shows the same
|
||||||
|
* neutral text the iOS extension falls back to, never the ciphertext.
|
||||||
|
*/
|
||||||
|
public class TrekPushService extends FirebaseMessagingService {
|
||||||
|
|
||||||
|
static final String CHANNEL = "trek";
|
||||||
|
static final String EXTRA_URL = "trek.pushUrl";
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onMessageReceived(@NonNull RemoteMessage message) {
|
||||||
|
String enc = message.getData().get("enc");
|
||||||
|
if (enc == null) return;
|
||||||
|
String title = getString(R.string.push_fallback_title);
|
||||||
|
String body = getString(R.string.push_fallback_body);
|
||||||
|
String url = null;
|
||||||
|
String tag = null;
|
||||||
|
try {
|
||||||
|
TrekPushKeys keys = TrekPushKeys.load(this);
|
||||||
|
if (keys != null) {
|
||||||
|
byte[] plain = TrekWebPush.decrypt(Base64.decode(enc, Base64.DEFAULT), keys);
|
||||||
|
JSONObject payload = new JSONObject(new String(plain, StandardCharsets.UTF_8));
|
||||||
|
if (!payload.optString("title").isEmpty()) title = payload.optString("title");
|
||||||
|
body = payload.optString("body", body);
|
||||||
|
url = payload.optString("url", null);
|
||||||
|
tag = payload.optString("tag", null);
|
||||||
|
}
|
||||||
|
} catch (Exception unreadable) {
|
||||||
|
// Shown with the neutral text: the tap still opens the app.
|
||||||
|
}
|
||||||
|
show(this, title, body, url, tag);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** A new token means a new endpoint; the UI re-registers on its next start (resyncPushSubscription). */
|
||||||
|
@Override
|
||||||
|
public void onNewToken(@NonNull String token) {}
|
||||||
|
|
||||||
|
static void ensureChannel(Context context) {
|
||||||
|
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) return;
|
||||||
|
NotificationManager manager = context.getSystemService(NotificationManager.class);
|
||||||
|
if (manager == null || manager.getNotificationChannel(CHANNEL) != null) return;
|
||||||
|
NotificationChannel channel = new NotificationChannel(
|
||||||
|
CHANNEL,
|
||||||
|
context.getString(R.string.push_channel_name),
|
||||||
|
NotificationManager.IMPORTANCE_DEFAULT
|
||||||
|
);
|
||||||
|
manager.createNotificationChannel(channel);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void show(Context context, String title, String body, String url, String tag) {
|
||||||
|
ensureChannel(context);
|
||||||
|
Intent open = new Intent(context, MainActivity.class)
|
||||||
|
.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP | Intent.FLAG_ACTIVITY_CLEAR_TOP);
|
||||||
|
if (url != null) open.putExtra(EXTRA_URL, url);
|
||||||
|
int id = tag != null ? tag.hashCode() : (int) (System.currentTimeMillis() & 0x7fffffff);
|
||||||
|
PendingIntent tap = PendingIntent.getActivity(
|
||||||
|
context,
|
||||||
|
id,
|
||||||
|
open,
|
||||||
|
PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE
|
||||||
|
);
|
||||||
|
NotificationCompat.Builder builder = new NotificationCompat.Builder(context, CHANNEL)
|
||||||
|
.setSmallIcon(R.drawable.ic_stat_trek)
|
||||||
|
.setContentTitle(title)
|
||||||
|
.setContentText(body)
|
||||||
|
.setStyle(new NotificationCompat.BigTextStyle().bigText(body))
|
||||||
|
.setAutoCancel(true)
|
||||||
|
.setContentIntent(tap);
|
||||||
|
if (Build.VERSION.SDK_INT >= 33
|
||||||
|
&& ContextCompat.checkSelfPermission(context, Manifest.permission.POST_NOTIFICATIONS) != PackageManager.PERMISSION_GRANTED) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
NotificationManagerCompat.from(context).notify(tag, id, builder.build());
|
||||||
|
} catch (SecurityException notAllowed) {
|
||||||
|
// Notifications switched off for the app since it subscribed.
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,123 @@
|
|||||||
|
package com.liketrek.trek;
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
import android.content.SharedPreferences;
|
||||||
|
import com.getcapacitor.CapConfig;
|
||||||
|
import com.getcapacitor.Logger;
|
||||||
|
import java.io.ByteArrayOutputStream;
|
||||||
|
import java.io.File;
|
||||||
|
import java.io.FileOutputStream;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.io.InputStream;
|
||||||
|
import java.nio.charset.StandardCharsets;
|
||||||
|
import org.json.JSONException;
|
||||||
|
import org.json.JSONObject;
|
||||||
|
|
||||||
|
/** The server the user picked, and the Capacitor configuration that loads it. */
|
||||||
|
final class TrekServerStore {
|
||||||
|
|
||||||
|
private static final String PREFS = "trek_shell";
|
||||||
|
private static final String KEY_URL = "server_url";
|
||||||
|
private static final String KEY_SHELL_ONCE = "shell_once";
|
||||||
|
private static final String KEY_RESTART = "restart";
|
||||||
|
private static final String CONFIG_DIR = "trek-server-config";
|
||||||
|
|
||||||
|
private TrekServerStore() {}
|
||||||
|
|
||||||
|
static String getUrl(Context context) {
|
||||||
|
return prefs(context).getString(KEY_URL, null);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void setUrl(Context context, String url) {
|
||||||
|
SharedPreferences.Editor editor = prefs(context).edit();
|
||||||
|
if (url == null) {
|
||||||
|
editor.remove(KEY_URL);
|
||||||
|
} else {
|
||||||
|
editor.putString(KEY_URL, url);
|
||||||
|
}
|
||||||
|
editor.commit();
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Start the next launch on the bundled address screen, even with a server remembered. */
|
||||||
|
static void showShellOnce(Context context) {
|
||||||
|
prefs(context).edit().putBoolean(KEY_SHELL_ONCE, true).commit();
|
||||||
|
}
|
||||||
|
|
||||||
|
static boolean consumeShellOnce(Context context) {
|
||||||
|
return consume(context, KEY_SHELL_ONCE);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** The next onCreate is the app restarting itself, not a launch. */
|
||||||
|
static void markRestart(Context context) {
|
||||||
|
prefs(context).edit().putBoolean(KEY_RESTART, true).commit();
|
||||||
|
}
|
||||||
|
|
||||||
|
static boolean consumeRestart(Context context) {
|
||||||
|
return consume(context, KEY_RESTART);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static boolean consume(Context context, String key) {
|
||||||
|
boolean set = prefs(context).getBoolean(key, false);
|
||||||
|
if (set) prefs(context).edit().remove(key).commit();
|
||||||
|
return set;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The bundled capacitor.config.json, adjusted for this start. Capacitor only
|
||||||
|
* takes these settings from a config file, so this writes a copy into the
|
||||||
|
* app's private storage and loads that; null means the bundled one as it is.
|
||||||
|
*
|
||||||
|
* With a server: server.url set, and server.errorPath dropped, because that
|
||||||
|
* page would have no bridge on the server's origin (TrekWebViewClient
|
||||||
|
* handles a failed load instead).
|
||||||
|
*
|
||||||
|
* On a restart: no launch splash. The splash plugin shows it again after
|
||||||
|
* recreate() but cannot take it down when the page hides it early, which
|
||||||
|
* left it covering a fully rendered page. A restart has no launch to cover.
|
||||||
|
*/
|
||||||
|
static CapConfig configFor(Context context, String url, boolean restarting) {
|
||||||
|
if (url == null && !restarting) return null;
|
||||||
|
try {
|
||||||
|
JSONObject json = new JSONObject(readAsset(context, "capacitor.config.json"));
|
||||||
|
if (url != null) {
|
||||||
|
JSONObject server = child(json, "server");
|
||||||
|
server.put("url", url);
|
||||||
|
server.remove("errorPath");
|
||||||
|
}
|
||||||
|
if (restarting) {
|
||||||
|
child(child(json, "plugins"), "SplashScreen").put("launchShowDuration", 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
File dir = new File(context.getFilesDir(), CONFIG_DIR);
|
||||||
|
if (!dir.isDirectory() && !dir.mkdirs()) throw new IOException("Cannot create " + dir);
|
||||||
|
try (FileOutputStream out = new FileOutputStream(new File(dir, "capacitor.config.json"))) {
|
||||||
|
out.write(json.toString().getBytes(StandardCharsets.UTF_8));
|
||||||
|
}
|
||||||
|
return CapConfig.loadFromFile(context, dir.getAbsolutePath());
|
||||||
|
} catch (IOException | JSONException ex) {
|
||||||
|
Logger.error("TrekShell", "Could not adjust the app config for " + url, ex);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static JSONObject child(JSONObject parent, String key) throws JSONException {
|
||||||
|
JSONObject existing = parent.optJSONObject(key);
|
||||||
|
if (existing != null) return existing;
|
||||||
|
JSONObject created = new JSONObject();
|
||||||
|
parent.put(key, created);
|
||||||
|
return created;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static String readAsset(Context context, String name) throws IOException {
|
||||||
|
try (InputStream in = context.getAssets().open(name); ByteArrayOutputStream out = new ByteArrayOutputStream()) {
|
||||||
|
byte[] buffer = new byte[8192];
|
||||||
|
int read;
|
||||||
|
while ((read = in.read(buffer)) != -1) out.write(buffer, 0, read);
|
||||||
|
return out.toString("UTF-8");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static SharedPreferences prefs(Context context) {
|
||||||
|
return context.getSharedPreferences(PREFS, Context.MODE_PRIVATE);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,76 @@
|
|||||||
|
package com.liketrek.trek;
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
import android.content.Intent;
|
||||||
|
import android.database.Cursor;
|
||||||
|
import android.net.Uri;
|
||||||
|
import android.provider.OpenableColumns;
|
||||||
|
import android.util.Base64;
|
||||||
|
import com.getcapacitor.JSObject;
|
||||||
|
import java.io.ByteArrayOutputStream;
|
||||||
|
import java.io.InputStream;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Booking documents shared to TREK (open with / share), held until the UI takes
|
||||||
|
* them (TrekShell.takeSharedFile) and announced if it is already running.
|
||||||
|
*/
|
||||||
|
final class TrekSharedFiles {
|
||||||
|
/** Above this the file is not a booking confirmation. */
|
||||||
|
private static final int MAX_BYTES = 15 * 1024 * 1024;
|
||||||
|
|
||||||
|
interface Listener {
|
||||||
|
void onFile(JSObject file);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static JSObject pending;
|
||||||
|
private static Listener listener;
|
||||||
|
|
||||||
|
private TrekSharedFiles() {}
|
||||||
|
|
||||||
|
static void setListener(Listener l) {
|
||||||
|
listener = l;
|
||||||
|
}
|
||||||
|
|
||||||
|
static JSObject take() {
|
||||||
|
JSObject file = pending;
|
||||||
|
pending = null;
|
||||||
|
return file;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void receive(Context context, Intent intent) {
|
||||||
|
if (intent == null) return;
|
||||||
|
Uri uri = null;
|
||||||
|
if (Intent.ACTION_VIEW.equals(intent.getAction())) uri = intent.getData();
|
||||||
|
else if (Intent.ACTION_SEND.equals(intent.getAction())) uri = intent.getParcelableExtra(Intent.EXTRA_STREAM);
|
||||||
|
if (uri == null) return;
|
||||||
|
try (InputStream in = context.getContentResolver().openInputStream(uri)) {
|
||||||
|
if (in == null) return;
|
||||||
|
ByteArrayOutputStream out = new ByteArrayOutputStream();
|
||||||
|
byte[] buffer = new byte[16384];
|
||||||
|
int read;
|
||||||
|
while ((read = in.read(buffer)) != -1) {
|
||||||
|
out.write(buffer, 0, read);
|
||||||
|
if (out.size() > MAX_BYTES) return;
|
||||||
|
}
|
||||||
|
JSObject file = new JSObject();
|
||||||
|
file.put("name", displayName(context, uri));
|
||||||
|
String type = context.getContentResolver().getType(uri);
|
||||||
|
file.put("mimeType", type == null ? intent.getType() : type);
|
||||||
|
file.put("data", Base64.encodeToString(out.toByteArray(), Base64.NO_WRAP));
|
||||||
|
pending = file;
|
||||||
|
if (listener != null) listener.onFile(file);
|
||||||
|
} catch (Exception ignored) {
|
||||||
|
// Unreadable or gone: nothing to import.
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static String displayName(Context context, Uri uri) {
|
||||||
|
try (Cursor cursor = context.getContentResolver().query(uri, new String[] { OpenableColumns.DISPLAY_NAME }, null, null, null)) {
|
||||||
|
if (cursor != null && cursor.moveToFirst()) return cursor.getString(0);
|
||||||
|
} catch (Exception ignored) {
|
||||||
|
// Fall through to the path.
|
||||||
|
}
|
||||||
|
String last = uri.getLastPathSegment();
|
||||||
|
return last == null ? "booking" : last;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,351 @@
|
|||||||
|
package com.liketrek.trek;
|
||||||
|
|
||||||
|
import android.Manifest;
|
||||||
|
import android.content.Intent;
|
||||||
|
import android.net.Uri;
|
||||||
|
import android.os.Build;
|
||||||
|
import android.os.Handler;
|
||||||
|
import android.os.Looper;
|
||||||
|
import androidx.browser.customtabs.CustomTabsIntent;
|
||||||
|
import androidx.core.app.NotificationManagerCompat;
|
||||||
|
import com.getcapacitor.JSObject;
|
||||||
|
import com.getcapacitor.PermissionState;
|
||||||
|
import com.getcapacitor.Plugin;
|
||||||
|
import com.getcapacitor.PluginCall;
|
||||||
|
import com.getcapacitor.PluginMethod;
|
||||||
|
import com.getcapacitor.annotation.CapacitorPlugin;
|
||||||
|
import com.getcapacitor.annotation.Permission;
|
||||||
|
import com.getcapacitor.annotation.PermissionCallback;
|
||||||
|
import com.google.firebase.messaging.FirebaseMessaging;
|
||||||
|
import org.json.JSONObject;
|
||||||
|
|
||||||
|
/** The native half of client/src/native/trekShell.ts. */
|
||||||
|
@CapacitorPlugin(
|
||||||
|
name = "TrekShell",
|
||||||
|
permissions = { @Permission(strings = { Manifest.permission.POST_NOTIFICATIONS }, alias = "notifications") }
|
||||||
|
)
|
||||||
|
public class TrekShellPlugin extends Plugin {
|
||||||
|
|
||||||
|
/** How long to wait after returning from the browser for the redirect to land. */
|
||||||
|
private static final long CANCEL_GRACE_MS = 600;
|
||||||
|
|
||||||
|
private String authCallId;
|
||||||
|
private String authScheme;
|
||||||
|
private boolean authBrowserOpen;
|
||||||
|
private final Handler handler = new Handler(Looper.getMainLooper());
|
||||||
|
|
||||||
|
/**
|
||||||
|
* What this binary offers the server's UI, raised with every native feature
|
||||||
|
* an older binary lacks. The UI asks before it calls (native/capabilities.ts),
|
||||||
|
* and a server can require a minimum (minNativeShellApi in /api/health/features).
|
||||||
|
*/
|
||||||
|
static final int SHELL_API = 2;
|
||||||
|
/** The native features by name, so the UI can turn each on by itself. */
|
||||||
|
static final String[] FEATURES = { "capabilities", "biometricLock", "sharedFiles", "nativePush" };
|
||||||
|
|
||||||
|
/** liketrek's push relay: the endpoint for this device's FCM token (trek-hosted push-relay.ts). */
|
||||||
|
static final String PUSH_RELAY = "https://push.liketrek.com/v1/fcm/";
|
||||||
|
|
||||||
|
/** The notification the app was started from, until the UI asks for it. */
|
||||||
|
private String openedPushUrl;
|
||||||
|
|
||||||
|
@PluginMethod
|
||||||
|
public void getCapabilities(PluginCall call) {
|
||||||
|
JSObject result = new JSObject();
|
||||||
|
result.put("shellApi", SHELL_API);
|
||||||
|
result.put("platform", "android");
|
||||||
|
String version = "";
|
||||||
|
String build = "";
|
||||||
|
try {
|
||||||
|
android.content.pm.PackageInfo info = getContext().getPackageManager().getPackageInfo(getContext().getPackageName(), 0);
|
||||||
|
version = info.versionName == null ? "" : info.versionName;
|
||||||
|
build = String.valueOf(androidx.core.content.pm.PackageInfoCompat.getLongVersionCode(info));
|
||||||
|
} catch (android.content.pm.PackageManager.NameNotFoundException ignored) {
|
||||||
|
// Our own package is always there; the fields simply stay empty.
|
||||||
|
}
|
||||||
|
result.put("appVersion", version);
|
||||||
|
result.put("build", build);
|
||||||
|
com.getcapacitor.JSArray features = new com.getcapacitor.JSArray();
|
||||||
|
for (String feature : FEATURES) features.put(feature);
|
||||||
|
result.put("features", features);
|
||||||
|
call.resolve(result);
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---- Shared booking documents ----
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void load() {
|
||||||
|
TrekSharedFiles.setListener(file -> notifyListeners("sharedFile", file));
|
||||||
|
if (getActivity() != null && getActivity().getIntent() != null) {
|
||||||
|
openedPushUrl = getActivity().getIntent().getStringExtra(TrekPushService.EXTRA_URL);
|
||||||
|
getActivity().getIntent().removeExtra(TrekPushService.EXTRA_URL);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---- Push ----
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Permission, the FCM token and the device keys, as the Web Push subscription
|
||||||
|
* the server stores (native/push.ts). Rejects with DENIED when the user
|
||||||
|
* refuses notifications, as on iOS.
|
||||||
|
*/
|
||||||
|
@PluginMethod
|
||||||
|
public void registerPush(PluginCall call) {
|
||||||
|
if (Build.VERSION.SDK_INT >= 33 && getPermissionState("notifications") != PermissionState.GRANTED) {
|
||||||
|
requestPermissionForAlias("notifications", call, "pushPermissionAnswered");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
subscribePush(call);
|
||||||
|
}
|
||||||
|
|
||||||
|
@PermissionCallback
|
||||||
|
private void pushPermissionAnswered(PluginCall call) {
|
||||||
|
if (getPermissionState("notifications") != PermissionState.GRANTED) {
|
||||||
|
call.reject("Notifications are not allowed", "DENIED");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
subscribePush(call);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void subscribePush(PluginCall call) {
|
||||||
|
if (!NotificationManagerCompat.from(getContext()).areNotificationsEnabled()) {
|
||||||
|
call.reject("Notifications are not allowed", "DENIED");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
TrekPushService.ensureChannel(getContext());
|
||||||
|
final TrekPushKeys keys;
|
||||||
|
try {
|
||||||
|
keys = TrekPushKeys.loadOrCreate(getContext());
|
||||||
|
} catch (Exception e) {
|
||||||
|
call.reject("Could not create the push keys", e);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
FirebaseMessaging.getInstance().getToken().addOnCompleteListener(task -> {
|
||||||
|
if (!task.isSuccessful() || task.getResult() == null) {
|
||||||
|
call.reject("Could not get a push token", task.getException());
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
JSObject subscription = new JSObject();
|
||||||
|
subscription.put("endpoint", PUSH_RELAY + task.getResult());
|
||||||
|
JSObject keyObject = new JSObject();
|
||||||
|
keyObject.put("p256dh", TrekPushKeys.base64url(keys.publicKey));
|
||||||
|
keyObject.put("auth", TrekPushKeys.base64url(keys.auth));
|
||||||
|
subscription.put("keys", keyObject);
|
||||||
|
call.resolve(subscription);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
@PluginMethod
|
||||||
|
public void takeOpenedPush(PluginCall call) {
|
||||||
|
JSObject result = new JSObject();
|
||||||
|
result.put("url", openedPushUrl == null ? JSONObject.NULL : openedPushUrl);
|
||||||
|
openedPushUrl = null;
|
||||||
|
call.resolve(result);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** The document shared to TREK before the UI was there to hear of it. */
|
||||||
|
@PluginMethod
|
||||||
|
public void takeSharedFile(PluginCall call) {
|
||||||
|
JSObject result = new JSObject();
|
||||||
|
JSObject file = TrekSharedFiles.take();
|
||||||
|
result.put("file", file == null ? JSONObject.NULL : file);
|
||||||
|
call.resolve(result);
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---- App lock ----
|
||||||
|
|
||||||
|
private static final int AUTHENTICATORS =
|
||||||
|
androidx.biometric.BiometricManager.Authenticators.BIOMETRIC_WEAK
|
||||||
|
| androidx.biometric.BiometricManager.Authenticators.DEVICE_CREDENTIAL;
|
||||||
|
|
||||||
|
/** Which biometry the device offers for the app lock, if any. */
|
||||||
|
@PluginMethod
|
||||||
|
public void biometryInfo(PluginCall call) {
|
||||||
|
int status = androidx.biometric.BiometricManager.from(getContext()).canAuthenticate(AUTHENTICATORS);
|
||||||
|
JSObject result = new JSObject();
|
||||||
|
result.put("available", status == androidx.biometric.BiometricManager.BIOMETRIC_SUCCESS);
|
||||||
|
result.put("type", "biometric");
|
||||||
|
call.resolve(result);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** The system biometric prompt with the screen lock as the way out. */
|
||||||
|
@PluginMethod
|
||||||
|
public void authenticateBiometric(PluginCall call) {
|
||||||
|
String reason = call.getString("reason", "Unlock TREK");
|
||||||
|
getActivity().runOnUiThread(() -> {
|
||||||
|
androidx.fragment.app.FragmentActivity activity = (androidx.fragment.app.FragmentActivity) getActivity();
|
||||||
|
androidx.biometric.BiometricPrompt prompt = new androidx.biometric.BiometricPrompt(
|
||||||
|
activity,
|
||||||
|
androidx.core.content.ContextCompat.getMainExecutor(getContext()),
|
||||||
|
new androidx.biometric.BiometricPrompt.AuthenticationCallback() {
|
||||||
|
@Override
|
||||||
|
public void onAuthenticationSucceeded(androidx.biometric.BiometricPrompt.AuthenticationResult result) {
|
||||||
|
JSObject ok = new JSObject();
|
||||||
|
ok.put("ok", true);
|
||||||
|
call.resolve(ok);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onAuthenticationError(int code, CharSequence message) {
|
||||||
|
boolean cancelled = code == androidx.biometric.BiometricPrompt.ERROR_USER_CANCELED
|
||||||
|
|| code == androidx.biometric.BiometricPrompt.ERROR_NEGATIVE_BUTTON
|
||||||
|
|| code == androidx.biometric.BiometricPrompt.ERROR_CANCELED;
|
||||||
|
call.reject(message.toString(), cancelled ? "CANCELLED" : "FAILED");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
);
|
||||||
|
androidx.biometric.BiometricPrompt.PromptInfo info = new androidx.biometric.BiometricPrompt.PromptInfo.Builder()
|
||||||
|
.setTitle(reason)
|
||||||
|
.setAllowedAuthenticators(AUTHENTICATORS)
|
||||||
|
.build();
|
||||||
|
prompt.authenticate(info);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/** While on, the recent-apps screen shows no snapshot of the app. */
|
||||||
|
@PluginMethod
|
||||||
|
public void setPrivacyCover(PluginCall call) {
|
||||||
|
boolean enabled = Boolean.TRUE.equals(call.getBoolean("enabled", false));
|
||||||
|
getActivity().runOnUiThread(() -> {
|
||||||
|
if (android.os.Build.VERSION.SDK_INT >= 33) {
|
||||||
|
getActivity().setRecentsScreenshotEnabled(!enabled);
|
||||||
|
} else if (enabled) {
|
||||||
|
getActivity().getWindow().addFlags(android.view.WindowManager.LayoutParams.FLAG_SECURE);
|
||||||
|
} else {
|
||||||
|
getActivity().getWindow().clearFlags(android.view.WindowManager.LayoutParams.FLAG_SECURE);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
call.resolve();
|
||||||
|
}
|
||||||
|
|
||||||
|
@PluginMethod
|
||||||
|
public void getServer(PluginCall call) {
|
||||||
|
String url = TrekServerStore.getUrl(getContext());
|
||||||
|
JSObject result = new JSObject();
|
||||||
|
result.put("url", url == null ? JSONObject.NULL : url);
|
||||||
|
call.resolve(result);
|
||||||
|
}
|
||||||
|
|
||||||
|
@PluginMethod
|
||||||
|
public void setServer(PluginCall call) {
|
||||||
|
String url = call.getString("url");
|
||||||
|
Uri parsed = url == null ? null : Uri.parse(url);
|
||||||
|
if (parsed == null || parsed.getHost() == null || !("https".equals(parsed.getScheme()) || "http".equals(parsed.getScheme()))) {
|
||||||
|
call.reject("A http(s) URL is required");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
TrekServerStore.setUrl(getContext(), url);
|
||||||
|
call.resolve();
|
||||||
|
restart();
|
||||||
|
}
|
||||||
|
|
||||||
|
@PluginMethod
|
||||||
|
public void resetServer(PluginCall call) {
|
||||||
|
TrekServerStore.setUrl(getContext(), null);
|
||||||
|
call.resolve();
|
||||||
|
restart();
|
||||||
|
}
|
||||||
|
|
||||||
|
@PluginMethod
|
||||||
|
public void reload(PluginCall call) {
|
||||||
|
call.resolve();
|
||||||
|
restart();
|
||||||
|
}
|
||||||
|
|
||||||
|
/** The server URL is part of the bridge's configuration, so it takes a new activity. */
|
||||||
|
private void restart() {
|
||||||
|
TrekServerStore.markRestart(getContext());
|
||||||
|
getActivity().runOnUiThread(() -> getActivity().recreate());
|
||||||
|
}
|
||||||
|
|
||||||
|
@PluginMethod
|
||||||
|
public void authenticate(PluginCall call) {
|
||||||
|
String url = call.getString("url");
|
||||||
|
String scheme = call.getString("callbackScheme");
|
||||||
|
if (url == null || scheme == null) {
|
||||||
|
call.reject("url and callbackScheme are required");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
rejectPendingAuth("Superseded by a new sign-in");
|
||||||
|
call.setKeepAlive(true);
|
||||||
|
getBridge().saveCall(call);
|
||||||
|
authCallId = call.getCallbackId();
|
||||||
|
authScheme = scheme;
|
||||||
|
authBrowserOpen = true;
|
||||||
|
// A Custom Tab shares the browser's cookies, so a running SSO session at
|
||||||
|
// the identity provider carries over. The redirect back to the app's
|
||||||
|
// scheme arrives through the intent-filter in AndroidManifest.xml.
|
||||||
|
new CustomTabsIntent.Builder().build().launchUrl(getActivity(), Uri.parse(url));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void handleOnNewIntent(Intent intent) {
|
||||||
|
super.handleOnNewIntent(intent);
|
||||||
|
String pushUrl = intent.getStringExtra(TrekPushService.EXTRA_URL);
|
||||||
|
if (pushUrl != null) {
|
||||||
|
intent.removeExtra(TrekPushService.EXTRA_URL);
|
||||||
|
JSObject opened = new JSObject();
|
||||||
|
opened.put("url", pushUrl);
|
||||||
|
notifyListeners("pushOpened", opened);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
Uri data = intent.getData();
|
||||||
|
PluginCall call = pendingAuthCall();
|
||||||
|
if (call == null || data == null || !authScheme.equals(data.getScheme())) return;
|
||||||
|
JSObject result = new JSObject();
|
||||||
|
result.put("url", data.toString());
|
||||||
|
call.resolve(result);
|
||||||
|
finishAuth(call);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Back in the app without a redirect means the user closed the browser.
|
||||||
|
* onNewIntent runs before onResume when the redirect did arrive, so the
|
||||||
|
* grace period only covers devices that deliver the two out of order.
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
protected void handleOnResume() {
|
||||||
|
super.handleOnResume();
|
||||||
|
if (!authBrowserOpen) return;
|
||||||
|
authBrowserOpen = false;
|
||||||
|
handler.postDelayed(() -> {
|
||||||
|
PluginCall call = pendingAuthCall();
|
||||||
|
if (call == null) return;
|
||||||
|
call.reject("Sign-in cancelled", "CANCELLED");
|
||||||
|
finishAuth(call);
|
||||||
|
}, CANCEL_GRACE_MS);
|
||||||
|
}
|
||||||
|
|
||||||
|
private PluginCall pendingAuthCall() {
|
||||||
|
return authCallId == null ? null : getBridge().getSavedCall(authCallId);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void rejectPendingAuth(String message) {
|
||||||
|
PluginCall call = pendingAuthCall();
|
||||||
|
if (call == null) return;
|
||||||
|
call.reject(message, "CANCELLED");
|
||||||
|
finishAuth(call);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void finishAuth(PluginCall call) {
|
||||||
|
getBridge().releaseCall(call);
|
||||||
|
authCallId = null;
|
||||||
|
authScheme = null;
|
||||||
|
authBrowserOpen = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** iOS only: Android keeps the service worker, which already starts TREK offline. */
|
||||||
|
@PluginMethod
|
||||||
|
public void refreshOfflineCopy(PluginCall call) {
|
||||||
|
JSObject result = new JSObject();
|
||||||
|
result.put("saved", false);
|
||||||
|
call.resolve(result);
|
||||||
|
}
|
||||||
|
|
||||||
|
@PluginMethod
|
||||||
|
public void openOfflineCopy(PluginCall call) {
|
||||||
|
JSObject result = new JSObject();
|
||||||
|
result.put("opened", false);
|
||||||
|
call.resolve(result);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,84 @@
|
|||||||
|
package com.liketrek.trek;
|
||||||
|
|
||||||
|
import java.math.BigInteger;
|
||||||
|
import java.nio.charset.StandardCharsets;
|
||||||
|
import java.security.KeyFactory;
|
||||||
|
import java.security.interfaces.ECPrivateKey;
|
||||||
|
import java.security.interfaces.ECPublicKey;
|
||||||
|
import java.security.spec.ECPoint;
|
||||||
|
import java.security.spec.ECPublicKeySpec;
|
||||||
|
import java.util.Arrays;
|
||||||
|
import javax.crypto.Cipher;
|
||||||
|
import javax.crypto.KeyAgreement;
|
||||||
|
import javax.crypto.Mac;
|
||||||
|
import javax.crypto.spec.GCMParameterSpec;
|
||||||
|
import javax.crypto.spec.SecretKeySpec;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Decrypts a Web Push record (RFC 8291, aes128gcm content coding of RFC 8188):
|
||||||
|
* the same thing a browser does, and the counterpart of the iOS notification
|
||||||
|
* extension's WebPushRecord. One record, as TREK's server always sends.
|
||||||
|
*/
|
||||||
|
final class TrekWebPush {
|
||||||
|
|
||||||
|
private TrekWebPush() {}
|
||||||
|
|
||||||
|
static byte[] decrypt(byte[] record, TrekPushKeys keys) throws Exception {
|
||||||
|
if (record.length < 21) throw new IllegalArgumentException("record too short");
|
||||||
|
byte[] salt = Arrays.copyOfRange(record, 0, 16);
|
||||||
|
int idLength = record[20] & 0xff;
|
||||||
|
if (idLength != 65 || record.length < 21 + idLength + 17) throw new IllegalArgumentException("unexpected header");
|
||||||
|
byte[] senderKey = Arrays.copyOfRange(record, 21, 21 + idLength);
|
||||||
|
byte[] ciphertext = Arrays.copyOfRange(record, 21 + idLength, record.length);
|
||||||
|
|
||||||
|
KeyAgreement agreement = KeyAgreement.getInstance("ECDH");
|
||||||
|
agreement.init(keys.privateKey);
|
||||||
|
agreement.doPhase(publicKeyFrom(senderKey, keys.privateKey), true);
|
||||||
|
byte[] shared = agreement.generateSecret();
|
||||||
|
|
||||||
|
byte[] keyInfo = concat("WebPush: info\0".getBytes(StandardCharsets.US_ASCII), keys.publicKey, senderKey);
|
||||||
|
byte[] ikm = hkdf(keys.auth, shared, keyInfo, 32);
|
||||||
|
byte[] cek = hkdf(salt, ikm, "Content-Encoding: aes128gcm\0".getBytes(StandardCharsets.US_ASCII), 16);
|
||||||
|
byte[] nonce = hkdf(salt, ikm, "Content-Encoding: nonce\0".getBytes(StandardCharsets.US_ASCII), 12);
|
||||||
|
|
||||||
|
Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding");
|
||||||
|
cipher.init(Cipher.DECRYPT_MODE, new SecretKeySpec(cek, "AES"), new GCMParameterSpec(128, nonce));
|
||||||
|
byte[] padded = cipher.doFinal(ciphertext);
|
||||||
|
|
||||||
|
// Padding: the content, one delimiter (2 for the last record), then zeros.
|
||||||
|
int end = padded.length - 1;
|
||||||
|
while (end >= 0 && padded[end] == 0) end--;
|
||||||
|
if (end < 0 || padded[end] != 2) throw new IllegalArgumentException("bad padding");
|
||||||
|
return Arrays.copyOf(padded, end);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static ECPublicKey publicKeyFrom(byte[] point, ECPrivateKey onCurve) throws Exception {
|
||||||
|
if (point[0] != 0x04) throw new IllegalArgumentException("compressed key");
|
||||||
|
BigInteger x = new BigInteger(1, Arrays.copyOfRange(point, 1, 33));
|
||||||
|
BigInteger y = new BigInteger(1, Arrays.copyOfRange(point, 33, 65));
|
||||||
|
return (ECPublicKey) KeyFactory.getInstance("EC").generatePublic(new ECPublicKeySpec(new ECPoint(x, y), onCurve.getParams()));
|
||||||
|
}
|
||||||
|
|
||||||
|
/** HKDF-SHA256 (RFC 5869) for outputs of at most one block. */
|
||||||
|
private static byte[] hkdf(byte[] salt, byte[] ikm, byte[] info, int length) throws Exception {
|
||||||
|
Mac mac = Mac.getInstance("HmacSHA256");
|
||||||
|
mac.init(new SecretKeySpec(salt, "HmacSHA256"));
|
||||||
|
byte[] prk = mac.doFinal(ikm);
|
||||||
|
mac.init(new SecretKeySpec(prk, "HmacSHA256"));
|
||||||
|
mac.update(info);
|
||||||
|
mac.update((byte) 1);
|
||||||
|
return Arrays.copyOf(mac.doFinal(), length);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static byte[] concat(byte[]... parts) {
|
||||||
|
int length = 0;
|
||||||
|
for (byte[] part : parts) length += part.length;
|
||||||
|
byte[] out = new byte[length];
|
||||||
|
int offset = 0;
|
||||||
|
for (byte[] part : parts) {
|
||||||
|
System.arraycopy(part, 0, out, offset, part.length);
|
||||||
|
offset += part.length;
|
||||||
|
}
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,49 @@
|
|||||||
|
package com.liketrek.trek;
|
||||||
|
|
||||||
|
import android.webkit.WebResourceError;
|
||||||
|
import android.webkit.WebResourceRequest;
|
||||||
|
import android.webkit.WebResourceResponse;
|
||||||
|
import android.webkit.WebView;
|
||||||
|
import com.getcapacitor.Bridge;
|
||||||
|
import com.getcapacitor.BridgeWebViewClient;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Used while the WebView shows the user's server. When that server cannot be
|
||||||
|
* loaded, Capacitor would show server.errorPath, but on Android it injects
|
||||||
|
* its bridge only into the server's origin, so that local page could neither
|
||||||
|
* retry nor change the server and stayed blank. Instead the app restarts on
|
||||||
|
* the bundled address screen, where the bridge is present and the screen
|
||||||
|
* offers exactly those two things.
|
||||||
|
*/
|
||||||
|
class TrekWebViewClient extends BridgeWebViewClient {
|
||||||
|
|
||||||
|
private final Runnable onUnreachable;
|
||||||
|
|
||||||
|
TrekWebViewClient(Bridge bridge, Runnable onUnreachable) {
|
||||||
|
super(bridge);
|
||||||
|
this.onUnreachable = onUnreachable;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onReceivedError(WebView view, WebResourceRequest request, WebResourceError error) {
|
||||||
|
if (request.isForMainFrame()) {
|
||||||
|
onUnreachable.run();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
super.onReceivedError(view, request, error);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Only a 5xx on the page itself means the server is down (a proxy's 502 or
|
||||||
|
* 503 while TREK restarts). A 4xx page is left alone: the server answered,
|
||||||
|
* and TREK serves its UI for every other path.
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public void onReceivedHttpError(WebView view, WebResourceRequest request, WebResourceResponse errorResponse) {
|
||||||
|
if (!request.isForMainFrame()) {
|
||||||
|
super.onReceivedHttpError(view, request, errorResponse);
|
||||||
|
} else if (errorResponse.getStatusCode() >= 500) {
|
||||||
|
onUnreachable.run();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
After Width: | Height: | Size: 16 KiB |
|
After Width: | Height: | Size: 5.1 KiB |
|
After Width: | Height: | Size: 8.6 KiB |
|
After Width: | Height: | Size: 16 KiB |
|
After Width: | Height: | Size: 5.1 KiB |
|
After Width: | Height: | Size: 8.6 KiB |
|
After Width: | Height: | Size: 31 KiB |
|
After Width: | Height: | Size: 47 KiB |
|
After Width: | Height: | Size: 69 KiB |
|
After Width: | Height: | Size: 31 KiB |
|
After Width: | Height: | Size: 47 KiB |
|
After Width: | Height: | Size: 69 KiB |
|
After Width: | Height: | Size: 5.1 KiB |
|
After Width: | Height: | Size: 17 KiB |
|
After Width: | Height: | Size: 5.1 KiB |
|
After Width: | Height: | Size: 8.3 KiB |
|
After Width: | Height: | Size: 17 KiB |
|
After Width: | Height: | Size: 5.1 KiB |
|
After Width: | Height: | Size: 8.3 KiB |
|
After Width: | Height: | Size: 33 KiB |
|
After Width: | Height: | Size: 48 KiB |
|
After Width: | Height: | Size: 70 KiB |
|
After Width: | Height: | Size: 33 KiB |
|
After Width: | Height: | Size: 48 KiB |
|
After Width: | Height: | Size: 70 KiB |
@@ -0,0 +1,13 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<!-- Status bar icon for notifications: a single-colour map pin, as Android
|
||||||
|
tints it and shows only its shape. -->
|
||||||
|
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:width="24dp"
|
||||||
|
android:height="24dp"
|
||||||
|
android:viewportWidth="24"
|
||||||
|
android:viewportHeight="24"
|
||||||
|
android:tint="#FFFFFF">
|
||||||
|
<path
|
||||||
|
android:fillColor="#FFFFFF"
|
||||||
|
android:pathData="M12,2C8.13,2 5,5.13 5,9c0,5.25 7,13 7,13s7,-7.75 7,-13c0,-3.87 -3.13,-7 -7,-7zM12,11.5c-1.38,0 -2.5,-1.12 -2.5,-2.5s1.12,-2.5 2.5,-2.5 2.5,1.12 2.5,2.5 -1.12,2.5 -2.5,2.5z" />
|
||||||
|
</vector>
|
||||||
|
After Width: | Height: | Size: 8.3 KiB |
@@ -0,0 +1,12 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
tools:context=".MainActivity">
|
||||||
|
|
||||||
|
<WebView
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent" />
|
||||||
|
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
<background>
|
||||||
|
<inset android:drawable="@mipmap/ic_launcher_background" android:inset="16.7%" />
|
||||||
|
</background>
|
||||||
|
<foreground>
|
||||||
|
<inset android:drawable="@mipmap/ic_launcher_foreground" android:inset="16.7%" />
|
||||||
|
</foreground>
|
||||||
|
<monochrome>
|
||||||
|
<inset android:drawable="@mipmap/ic_launcher_foreground" android:inset="16.7%" />
|
||||||
|
</monochrome>
|
||||||
|
</adaptive-icon>
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
<background>
|
||||||
|
<inset android:drawable="@mipmap/ic_launcher_background" android:inset="16.7%" />
|
||||||
|
</background>
|
||||||
|
<foreground>
|
||||||
|
<inset android:drawable="@mipmap/ic_launcher_foreground" android:inset="16.7%" />
|
||||||
|
</foreground>
|
||||||
|
<monochrome>
|
||||||
|
<inset android:drawable="@mipmap/ic_launcher_foreground" android:inset="16.7%" />
|
||||||
|
</monochrome>
|
||||||
|
</adaptive-icon>
|
||||||
|
After Width: | Height: | Size: 4.3 KiB |
|
After Width: | Height: | Size: 11 KiB |
|
After Width: | Height: | Size: 6.6 KiB |
|
After Width: | Height: | Size: 5.5 KiB |
|
After Width: | Height: | Size: 1.2 KiB |
|
After Width: | Height: | Size: 4.9 KiB |
|
After Width: | Height: | Size: 3.0 KiB |
|
After Width: | Height: | Size: 2.5 KiB |
|
After Width: | Height: | Size: 2.1 KiB |
|
After Width: | Height: | Size: 6.8 KiB |
|
After Width: | Height: | Size: 4.0 KiB |
|
After Width: | Height: | Size: 3.5 KiB |
|
After Width: | Height: | Size: 6.7 KiB |
|
After Width: | Height: | Size: 15 KiB |
|
After Width: | Height: | Size: 9.6 KiB |
|
After Width: | Height: | Size: 7.8 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 24 KiB |
|
After Width: | Height: | Size: 16 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 17 KiB |
|
After Width: | Height: | Size: 31 KiB |
|
After Width: | Height: | Size: 23 KiB |
|
After Width: | Height: | Size: 18 KiB |
@@ -0,0 +1,13 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<!-- The Firebase project the app receives push through (liketrek push relay).
|
||||||
|
These are the strings the google-services Gradle plugin would generate from
|
||||||
|
google-services.json; Firebase reads them at start. None of them is a secret:
|
||||||
|
they identify the project, sending needs the relay's service account. -->
|
||||||
|
<resources>
|
||||||
|
<string name="google_app_id" translatable="false">1:1074454522965:android:3ff2fe270a27a73051b8dc</string>
|
||||||
|
<string name="gcm_defaultSenderId" translatable="false">1074454522965</string>
|
||||||
|
<string name="google_api_key" translatable="false">AIzaSyB2VYXmZ90BZuksHhHR_n2W8naNE_vJAJA</string>
|
||||||
|
<string name="google_crash_reporting_api_key" translatable="false">AIzaSyB2VYXmZ90BZuksHhHR_n2W8naNE_vJAJA</string>
|
||||||
|
<string name="project_id" translatable="false">trek-9392e</string>
|
||||||
|
<string name="google_storage_bucket" translatable="false">trek-9392e.firebasestorage.app</string>
|
||||||
|
</resources>
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<resources>
|
||||||
|
<color name="ic_launcher_background">#09090B</color>
|
||||||
|
<color name="launch_background">#09090B</color>
|
||||||
|
</resources>
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
<?xml version='1.0' encoding='utf-8'?>
|
||||||
|
<resources>
|
||||||
|
<string name="app_name">TREK</string>
|
||||||
|
<string name="title_activity_main">TREK</string>
|
||||||
|
<string name="package_name">com.liketrek.trek</string>
|
||||||
|
<string name="custom_url_scheme">com.liketrek.trek</string>
|
||||||
|
<string name="push_channel_name">Notifications</string>
|
||||||
|
<string name="push_fallback_title">TREK</string>
|
||||||
|
<string name="push_fallback_body">New notification</string>
|
||||||
|
</resources>
|
||||||
@@ -0,0 +1,25 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<resources>
|
||||||
|
|
||||||
|
<!-- Base application theme. -->
|
||||||
|
<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
|
||||||
|
<!-- Customize your theme here. -->
|
||||||
|
<item name="colorPrimary">@color/colorPrimary</item>
|
||||||
|
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
|
||||||
|
<item name="colorAccent">@color/colorAccent</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<style name="AppTheme.NoActionBar" parent="Theme.AppCompat.DayNight.NoActionBar">
|
||||||
|
<item name="windowActionBar">false</item>
|
||||||
|
<item name="windowNoTitle">true</item>
|
||||||
|
<item name="android:background">@null</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
|
|
||||||
|
<style name="AppTheme.NoActionBarLaunch" parent="Theme.SplashScreen">
|
||||||
|
<item name="android:background">@drawable/splash</item>
|
||||||
|
<!-- Android 12+ draws its own launch screen: the app icon on this colour.
|
||||||
|
The same near-black as the icon tile and the first painted frame. -->
|
||||||
|
<item name="windowSplashScreenBackground">@color/launch_background</item>
|
||||||
|
</style>
|
||||||
|
</resources>
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<paths xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
<cache-path name="my_cache_images" path="." />
|
||||||
|
</paths>
|
||||||
@@ -0,0 +1,30 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<!--
|
||||||
|
TREK is self-hosted: the user points the app at their own server, so we cannot
|
||||||
|
know its scheme or its certificate authority ahead of time. Two deliberate
|
||||||
|
relaxations, both required for that to work at all:
|
||||||
|
|
||||||
|
1. cleartextTrafficPermitted="true" — Android blocks http:// by default from
|
||||||
|
targetSdk 28 on. A bare LAN server (http://192.168.1.10:3001) and a
|
||||||
|
Tailscale host (100.64.0.0/10, which is NOT RFC1918, so a private-range
|
||||||
|
allowlist would not cover it) both need this. https:// is unaffected and
|
||||||
|
remains the recommended setup.
|
||||||
|
|
||||||
|
2. <certificates src="user" /> — since Android 7 apps ignore user-installed
|
||||||
|
CAs unless they opt in. Self-hosters running their own CA (step-ca, mkcert,
|
||||||
|
an internal PKI) install its root on the device; without this the app would
|
||||||
|
reject their perfectly valid https:// server. System CAs stay first so
|
||||||
|
public certs keep validating normally.
|
||||||
|
|
||||||
|
The tradeoff is that a user-installed CA can also be a MITM proxy's. That is
|
||||||
|
the same tradeoff the browser-based PWA already makes, and it is the price of
|
||||||
|
letting people run their own infrastructure.
|
||||||
|
-->
|
||||||
|
<network-security-config>
|
||||||
|
<base-config cleartextTrafficPermitted="true">
|
||||||
|
<trust-anchors>
|
||||||
|
<certificates src="system" />
|
||||||
|
<certificates src="user" />
|
||||||
|
</trust-anchors>
|
||||||
|
</base-config>
|
||||||
|
</network-security-config>
|
||||||
@@ -0,0 +1,63 @@
|
|||||||
|
package com.liketrek.trek;
|
||||||
|
|
||||||
|
import static org.junit.Assert.assertEquals;
|
||||||
|
import static org.junit.Assert.assertThrows;
|
||||||
|
|
||||||
|
import java.math.BigInteger;
|
||||||
|
import java.nio.charset.StandardCharsets;
|
||||||
|
import java.security.KeyFactory;
|
||||||
|
import java.security.KeyPairGenerator;
|
||||||
|
import java.security.interfaces.ECPrivateKey;
|
||||||
|
import java.security.interfaces.ECPublicKey;
|
||||||
|
import java.security.spec.ECGenParameterSpec;
|
||||||
|
import java.security.spec.ECPrivateKeySpec;
|
||||||
|
import java.util.Base64;
|
||||||
|
import org.junit.Test;
|
||||||
|
|
||||||
|
/** The decryption against the worked example in RFC 8291, section 5. */
|
||||||
|
public class TrekWebPushTest {
|
||||||
|
|
||||||
|
private static byte[] b64(String value) {
|
||||||
|
return Base64.getUrlDecoder().decode(value);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static TrekPushKeys rfcKeys() throws Exception {
|
||||||
|
KeyPairGenerator generator = KeyPairGenerator.getInstance("EC");
|
||||||
|
generator.initialize(new ECGenParameterSpec("secp256r1"));
|
||||||
|
ECPublicKey anyKey = (ECPublicKey) generator.generateKeyPair().getPublic();
|
||||||
|
BigInteger d = new BigInteger(1, b64("q1dXpw3UpT5VOmu_cf_v6ih07Aems3njxI-JWgLcM94"));
|
||||||
|
ECPrivateKey privateKey = (ECPrivateKey) KeyFactory.getInstance("EC").generatePrivate(new ECPrivateKeySpec(d, anyKey.getParams()));
|
||||||
|
return new TrekPushKeys(
|
||||||
|
privateKey,
|
||||||
|
b64("BCVxsr7N_eNgVRqvHtD0zTZsEc6-VV-JvLexhqUzORcxaOzi6-AYWXvTBHm4bjyPjs7Vd8pZGH6SRpkNtoIAiw4"),
|
||||||
|
b64("BTBZMqHH6r4Tts7J_aSIgg")
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static final String RECORD =
|
||||||
|
"DGv6ra1nlYgDCS1FRnbzlwAAEABBBP4z9KsN6nGRTbVYI_c7VJSPQTBtkgcy27mlmlMoZIIgDll6e3vCYLocInmYWAmS6TlzAC8wEqKK6PBru3jl7A_yl95bQpu6cVPTpK4Mqgkf1CXztLVBSt2Ks3oZwbuwXPXLWyouBWLVWGNWQexSgSxsj_Qulcy4a-fN";
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void decryptsTheRfcExample() throws Exception {
|
||||||
|
byte[] plain = TrekWebPush.decrypt(b64(RECORD), rfcKeys());
|
||||||
|
assertEquals("When I grow up, I want to be a watermelon", new String(plain, StandardCharsets.UTF_8));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void refusesATamperedRecord() throws Exception {
|
||||||
|
byte[] record = b64(RECORD);
|
||||||
|
record[record.length - 1] ^= 1;
|
||||||
|
assertThrows(Exception.class, () -> TrekWebPush.decrypt(record, rfcKeys()));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void writesThePublicKeyAsAFixedLengthPoint() throws Exception {
|
||||||
|
KeyPairGenerator generator = KeyPairGenerator.getInstance("EC");
|
||||||
|
generator.initialize(new ECGenParameterSpec("secp256r1"));
|
||||||
|
for (int i = 0; i < 20; i++) {
|
||||||
|
byte[] point = TrekPushKeys.uncompressed((ECPublicKey) generator.generateKeyPair().getPublic());
|
||||||
|
assertEquals(65, point.length);
|
||||||
|
assertEquals(4, point[0]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
// Top-level build file where you can add configuration options common to all sub-projects/modules.
|
||||||
|
|
||||||
|
buildscript {
|
||||||
|
|
||||||
|
repositories {
|
||||||
|
google()
|
||||||
|
mavenCentral()
|
||||||
|
}
|
||||||
|
dependencies {
|
||||||
|
classpath 'com.android.tools.build:gradle:8.13.0'
|
||||||
|
|
||||||
|
// NOTE: Do not place your application dependencies here; they belong
|
||||||
|
// in the individual module build.gradle files
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
apply from: "variables.gradle"
|
||||||
|
|
||||||
|
allprojects {
|
||||||
|
repositories {
|
||||||
|
google()
|
||||||
|
mavenCentral()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
task clean(type: Delete) {
|
||||||
|
delete rootProject.buildDir
|
||||||
|
}
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
// DO NOT EDIT THIS FILE! IT IS GENERATED EACH TIME "capacitor update" IS RUN
|
||||||
|
include ':capacitor-android'
|
||||||
|
project(':capacitor-android').projectDir = new File('../../node_modules/@capacitor/android/capacitor')
|
||||||
|
|
||||||
|
include ':capacitor-app'
|
||||||
|
project(':capacitor-app').projectDir = new File('../../node_modules/@capacitor/app/android')
|
||||||
|
|
||||||
|
include ':capacitor-filesystem'
|
||||||
|
project(':capacitor-filesystem').projectDir = new File('../../node_modules/@capacitor/filesystem/android')
|
||||||
|
|
||||||
|
include ':capacitor-haptics'
|
||||||
|
project(':capacitor-haptics').projectDir = new File('../../node_modules/@capacitor/haptics/android')
|
||||||
|
|
||||||
|
include ':capacitor-keyboard'
|
||||||
|
project(':capacitor-keyboard').projectDir = new File('../../node_modules/@capacitor/keyboard/android')
|
||||||
|
|
||||||
|
include ':capacitor-share'
|
||||||
|
project(':capacitor-share').projectDir = new File('../../node_modules/@capacitor/share/android')
|
||||||
|
|
||||||
|
include ':capacitor-splash-screen'
|
||||||
|
project(':capacitor-splash-screen').projectDir = new File('../../node_modules/@capacitor/splash-screen/android')
|
||||||
|
|
||||||
|
include ':capacitor-status-bar'
|
||||||
|
project(':capacitor-status-bar').projectDir = new File('../../node_modules/@capacitor/status-bar/android')
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
# Project-wide Gradle settings.
|
||||||
|
|
||||||
|
# IDE (e.g. Android Studio) users:
|
||||||
|
# Gradle settings configured through the IDE *will override*
|
||||||
|
# any settings specified in this file.
|
||||||
|
|
||||||
|
# For more details on how to configure your build environment visit
|
||||||
|
# http://www.gradle.org/docs/current/userguide/build_environment.html
|
||||||
|
|
||||||
|
# Specifies the JVM arguments used for the daemon process.
|
||||||
|
# The setting is particularly useful for tweaking memory settings.
|
||||||
|
org.gradle.jvmargs=-Xmx1536m
|
||||||
|
|
||||||
|
# When configured, Gradle will run in incubating parallel mode.
|
||||||
|
# This option should only be used with decoupled projects. More details, visit
|
||||||
|
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
|
||||||
|
# org.gradle.parallel=true
|
||||||
|
|
||||||
|
# AndroidX package structure to make it clearer which packages are bundled with the
|
||||||
|
# Android operating system, and which are packaged with your app's APK
|
||||||
|
# https://developer.android.com/topic/libraries/support-library/androidx-rn
|
||||||
|
android.useAndroidX=true
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
distributionBase=GRADLE_USER_HOME
|
||||||
|
distributionPath=wrapper/dists
|
||||||
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip
|
||||||
|
networkTimeout=10000
|
||||||
|
validateDistributionUrl=true
|
||||||
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
|
zipStorePath=wrapper/dists
|
||||||
@@ -0,0 +1,251 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
#
|
||||||
|
# Copyright © 2015-2021 the original authors.
|
||||||
|
#
|
||||||
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
# you may not use this file except in compliance with the License.
|
||||||
|
# You may obtain a copy of the License at
|
||||||
|
#
|
||||||
|
# https://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
#
|
||||||
|
# Unless required by applicable law or agreed to in writing, software
|
||||||
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
# See the License for the specific language governing permissions and
|
||||||
|
# limitations under the License.
|
||||||
|
#
|
||||||
|
# SPDX-License-Identifier: Apache-2.0
|
||||||
|
#
|
||||||
|
|
||||||
|
##############################################################################
|
||||||
|
#
|
||||||
|
# Gradle start up script for POSIX generated by Gradle.
|
||||||
|
#
|
||||||
|
# Important for running:
|
||||||
|
#
|
||||||
|
# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
|
||||||
|
# noncompliant, but you have some other compliant shell such as ksh or
|
||||||
|
# bash, then to run this script, type that shell name before the whole
|
||||||
|
# command line, like:
|
||||||
|
#
|
||||||
|
# ksh Gradle
|
||||||
|
#
|
||||||
|
# Busybox and similar reduced shells will NOT work, because this script
|
||||||
|
# requires all of these POSIX shell features:
|
||||||
|
# * functions;
|
||||||
|
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
|
||||||
|
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
|
||||||
|
# * compound commands having a testable exit status, especially «case»;
|
||||||
|
# * various built-in commands including «command», «set», and «ulimit».
|
||||||
|
#
|
||||||
|
# Important for patching:
|
||||||
|
#
|
||||||
|
# (2) This script targets any POSIX shell, so it avoids extensions provided
|
||||||
|
# by Bash, Ksh, etc; in particular arrays are avoided.
|
||||||
|
#
|
||||||
|
# The "traditional" practice of packing multiple parameters into a
|
||||||
|
# space-separated string is a well documented source of bugs and security
|
||||||
|
# problems, so this is (mostly) avoided, by progressively accumulating
|
||||||
|
# options in "$@", and eventually passing that to Java.
|
||||||
|
#
|
||||||
|
# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
|
||||||
|
# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
|
||||||
|
# see the in-line comments for details.
|
||||||
|
#
|
||||||
|
# There are tweaks for specific operating systems such as AIX, CygWin,
|
||||||
|
# Darwin, MinGW, and NonStop.
|
||||||
|
#
|
||||||
|
# (3) This script is generated from the Groovy template
|
||||||
|
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||||
|
# within the Gradle project.
|
||||||
|
#
|
||||||
|
# You can find Gradle at https://github.com/gradle/gradle/.
|
||||||
|
#
|
||||||
|
##############################################################################
|
||||||
|
|
||||||
|
# Attempt to set APP_HOME
|
||||||
|
|
||||||
|
# Resolve links: $0 may be a link
|
||||||
|
app_path=$0
|
||||||
|
|
||||||
|
# Need this for daisy-chained symlinks.
|
||||||
|
while
|
||||||
|
APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
|
||||||
|
[ -h "$app_path" ]
|
||||||
|
do
|
||||||
|
ls=$( ls -ld "$app_path" )
|
||||||
|
link=${ls#*' -> '}
|
||||||
|
case $link in #(
|
||||||
|
/*) app_path=$link ;; #(
|
||||||
|
*) app_path=$APP_HOME$link ;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
|
||||||
|
# This is normally unused
|
||||||
|
# shellcheck disable=SC2034
|
||||||
|
APP_BASE_NAME=${0##*/}
|
||||||
|
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
|
||||||
|
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
|
||||||
|
|
||||||
|
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||||
|
MAX_FD=maximum
|
||||||
|
|
||||||
|
warn () {
|
||||||
|
echo "$*"
|
||||||
|
} >&2
|
||||||
|
|
||||||
|
die () {
|
||||||
|
echo
|
||||||
|
echo "$*"
|
||||||
|
echo
|
||||||
|
exit 1
|
||||||
|
} >&2
|
||||||
|
|
||||||
|
# OS specific support (must be 'true' or 'false').
|
||||||
|
cygwin=false
|
||||||
|
msys=false
|
||||||
|
darwin=false
|
||||||
|
nonstop=false
|
||||||
|
case "$( uname )" in #(
|
||||||
|
CYGWIN* ) cygwin=true ;; #(
|
||||||
|
Darwin* ) darwin=true ;; #(
|
||||||
|
MSYS* | MINGW* ) msys=true ;; #(
|
||||||
|
NONSTOP* ) nonstop=true ;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
CLASSPATH="\\\"\\\""
|
||||||
|
|
||||||
|
|
||||||
|
# Determine the Java command to use to start the JVM.
|
||||||
|
if [ -n "$JAVA_HOME" ] ; then
|
||||||
|
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
||||||
|
# IBM's JDK on AIX uses strange locations for the executables
|
||||||
|
JAVACMD=$JAVA_HOME/jre/sh/java
|
||||||
|
else
|
||||||
|
JAVACMD=$JAVA_HOME/bin/java
|
||||||
|
fi
|
||||||
|
if [ ! -x "$JAVACMD" ] ; then
|
||||||
|
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
|
||||||
|
|
||||||
|
Please set the JAVA_HOME variable in your environment to match the
|
||||||
|
location of your Java installation."
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
JAVACMD=java
|
||||||
|
if ! command -v java >/dev/null 2>&1
|
||||||
|
then
|
||||||
|
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||||
|
|
||||||
|
Please set the JAVA_HOME variable in your environment to match the
|
||||||
|
location of your Java installation."
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Increase the maximum file descriptors if we can.
|
||||||
|
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
||||||
|
case $MAX_FD in #(
|
||||||
|
max*)
|
||||||
|
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
|
||||||
|
# shellcheck disable=SC2039,SC3045
|
||||||
|
MAX_FD=$( ulimit -H -n ) ||
|
||||||
|
warn "Could not query maximum file descriptor limit"
|
||||||
|
esac
|
||||||
|
case $MAX_FD in #(
|
||||||
|
'' | soft) :;; #(
|
||||||
|
*)
|
||||||
|
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
|
||||||
|
# shellcheck disable=SC2039,SC3045
|
||||||
|
ulimit -n "$MAX_FD" ||
|
||||||
|
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
||||||
|
esac
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Collect all arguments for the java command, stacking in reverse order:
|
||||||
|
# * args from the command line
|
||||||
|
# * the main class name
|
||||||
|
# * -classpath
|
||||||
|
# * -D...appname settings
|
||||||
|
# * --module-path (only if needed)
|
||||||
|
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
|
||||||
|
|
||||||
|
# For Cygwin or MSYS, switch paths to Windows format before running java
|
||||||
|
if "$cygwin" || "$msys" ; then
|
||||||
|
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
|
||||||
|
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
|
||||||
|
|
||||||
|
JAVACMD=$( cygpath --unix "$JAVACMD" )
|
||||||
|
|
||||||
|
# Now convert the arguments - kludge to limit ourselves to /bin/sh
|
||||||
|
for arg do
|
||||||
|
if
|
||||||
|
case $arg in #(
|
||||||
|
-*) false ;; # don't mess with options #(
|
||||||
|
/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
|
||||||
|
[ -e "$t" ] ;; #(
|
||||||
|
*) false ;;
|
||||||
|
esac
|
||||||
|
then
|
||||||
|
arg=$( cygpath --path --ignore --mixed "$arg" )
|
||||||
|
fi
|
||||||
|
# Roll the args list around exactly as many times as the number of
|
||||||
|
# args, so each arg winds up back in the position where it started, but
|
||||||
|
# possibly modified.
|
||||||
|
#
|
||||||
|
# NB: a `for` loop captures its iteration list before it begins, so
|
||||||
|
# changing the positional parameters here affects neither the number of
|
||||||
|
# iterations, nor the values presented in `arg`.
|
||||||
|
shift # remove old arg
|
||||||
|
set -- "$@" "$arg" # push replacement arg
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||||
|
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||||
|
|
||||||
|
# Collect all arguments for the java command:
|
||||||
|
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
|
||||||
|
# and any embedded shellness will be escaped.
|
||||||
|
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
|
||||||
|
# treated as '${Hostname}' itself on the command line.
|
||||||
|
|
||||||
|
set -- \
|
||||||
|
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
||||||
|
-classpath "$CLASSPATH" \
|
||||||
|
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
|
||||||
|
"$@"
|
||||||
|
|
||||||
|
# Stop when "xargs" is not available.
|
||||||
|
if ! command -v xargs >/dev/null 2>&1
|
||||||
|
then
|
||||||
|
die "xargs is not available"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Use "xargs" to parse quoted args.
|
||||||
|
#
|
||||||
|
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
|
||||||
|
#
|
||||||
|
# In Bash we could simply go:
|
||||||
|
#
|
||||||
|
# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
|
||||||
|
# set -- "${ARGS[@]}" "$@"
|
||||||
|
#
|
||||||
|
# but POSIX shell has neither arrays nor command substitution, so instead we
|
||||||
|
# post-process each arg (as a line of input to sed) to backslash-escape any
|
||||||
|
# character that might be a shell metacharacter, then use eval to reverse
|
||||||
|
# that process (while maintaining the separation between arguments), and wrap
|
||||||
|
# the whole thing up as a single "set" statement.
|
||||||
|
#
|
||||||
|
# This will of course break if any of these variables contains a newline or
|
||||||
|
# an unmatched quote.
|
||||||
|
#
|
||||||
|
|
||||||
|
eval "set -- $(
|
||||||
|
printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
|
||||||
|
xargs -n1 |
|
||||||
|
sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
|
||||||
|
tr '\n' ' '
|
||||||
|
)" '"$@"'
|
||||||
|
|
||||||
|
exec "$JAVACMD" "$@"
|
||||||
@@ -0,0 +1,94 @@
|
|||||||
|
@rem
|
||||||
|
@rem Copyright 2015 the original author or authors.
|
||||||
|
@rem
|
||||||
|
@rem Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
@rem you may not use this file except in compliance with the License.
|
||||||
|
@rem You may obtain a copy of the License at
|
||||||
|
@rem
|
||||||
|
@rem https://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
@rem
|
||||||
|
@rem Unless required by applicable law or agreed to in writing, software
|
||||||
|
@rem distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
@rem See the License for the specific language governing permissions and
|
||||||
|
@rem limitations under the License.
|
||||||
|
@rem
|
||||||
|
@rem SPDX-License-Identifier: Apache-2.0
|
||||||
|
@rem
|
||||||
|
|
||||||
|
@if "%DEBUG%"=="" @echo off
|
||||||
|
@rem ##########################################################################
|
||||||
|
@rem
|
||||||
|
@rem Gradle startup script for Windows
|
||||||
|
@rem
|
||||||
|
@rem ##########################################################################
|
||||||
|
|
||||||
|
@rem Set local scope for the variables with windows NT shell
|
||||||
|
if "%OS%"=="Windows_NT" setlocal
|
||||||
|
|
||||||
|
set DIRNAME=%~dp0
|
||||||
|
if "%DIRNAME%"=="" set DIRNAME=.
|
||||||
|
@rem This is normally unused
|
||||||
|
set APP_BASE_NAME=%~n0
|
||||||
|
set APP_HOME=%DIRNAME%
|
||||||
|
|
||||||
|
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
|
||||||
|
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
|
||||||
|
|
||||||
|
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||||
|
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
|
||||||
|
|
||||||
|
@rem Find java.exe
|
||||||
|
if defined JAVA_HOME goto findJavaFromJavaHome
|
||||||
|
|
||||||
|
set JAVA_EXE=java.exe
|
||||||
|
%JAVA_EXE% -version >NUL 2>&1
|
||||||
|
if %ERRORLEVEL% equ 0 goto execute
|
||||||
|
|
||||||
|
echo. 1>&2
|
||||||
|
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
|
||||||
|
echo. 1>&2
|
||||||
|
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||||
|
echo location of your Java installation. 1>&2
|
||||||
|
|
||||||
|
goto fail
|
||||||
|
|
||||||
|
:findJavaFromJavaHome
|
||||||
|
set JAVA_HOME=%JAVA_HOME:"=%
|
||||||
|
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
||||||
|
|
||||||
|
if exist "%JAVA_EXE%" goto execute
|
||||||
|
|
||||||
|
echo. 1>&2
|
||||||
|
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
|
||||||
|
echo. 1>&2
|
||||||
|
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||||
|
echo location of your Java installation. 1>&2
|
||||||
|
|
||||||
|
goto fail
|
||||||
|
|
||||||
|
:execute
|
||||||
|
@rem Setup the command line
|
||||||
|
|
||||||
|
set CLASSPATH=
|
||||||
|
|
||||||
|
|
||||||
|
@rem Execute Gradle
|
||||||
|
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
|
||||||
|
|
||||||
|
:end
|
||||||
|
@rem End local scope for the variables with windows NT shell
|
||||||
|
if %ERRORLEVEL% equ 0 goto mainEnd
|
||||||
|
|
||||||
|
:fail
|
||||||
|
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
|
||||||
|
rem the _cmd.exe /c_ return code!
|
||||||
|
set EXIT_CODE=%ERRORLEVEL%
|
||||||
|
if %EXIT_CODE% equ 0 set EXIT_CODE=1
|
||||||
|
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
|
||||||
|
exit /b %EXIT_CODE%
|
||||||
|
|
||||||
|
:mainEnd
|
||||||
|
if "%OS%"=="Windows_NT" endlocal
|
||||||
|
|
||||||
|
:omega
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
include ':app'
|
||||||
|
include ':capacitor-cordova-android-plugins'
|
||||||
|
project(':capacitor-cordova-android-plugins').projectDir = new File('./capacitor-cordova-android-plugins/')
|
||||||
|
|
||||||
|
apply from: 'capacitor.settings.gradle'
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
ext {
|
||||||
|
minSdkVersion = 24
|
||||||
|
compileSdkVersion = 36
|
||||||
|
targetSdkVersion = 36
|
||||||
|
androidxActivityVersion = '1.11.0'
|
||||||
|
androidxAppCompatVersion = '1.7.1'
|
||||||
|
androidxCoordinatorLayoutVersion = '1.3.0'
|
||||||
|
androidxCoreVersion = '1.17.0'
|
||||||
|
androidxFragmentVersion = '1.8.9'
|
||||||
|
coreSplashScreenVersion = '1.2.0'
|
||||||
|
androidxWebkitVersion = '1.14.0'
|
||||||
|
junitVersion = '4.13.2'
|
||||||
|
androidxJunitVersion = '1.3.0'
|
||||||
|
androidxEspressoCoreVersion = '3.7.0'
|
||||||
|
cordovaAndroidVersion = '14.0.1'
|
||||||
|
// Custom Tabs for SSO and passkey sign-in (TrekShellPlugin.authenticate).
|
||||||
|
androidxBrowserVersion = '1.8.0'
|
||||||
|
}
|
||||||
|
After Width: | Height: | Size: 92 KiB |
|
After Width: | Height: | Size: 51 KiB |
|
After Width: | Height: | Size: 112 KiB |
|
After Width: | Height: | Size: 164 KiB |
|
After Width: | Height: | Size: 164 KiB |
@@ -0,0 +1,60 @@
|
|||||||
|
/// <reference types="@capacitor/splash-screen" />
|
||||||
|
/// <reference types="@capacitor/keyboard" />
|
||||||
|
import type { CapacitorConfig } from '@capacitor/cli';
|
||||||
|
import { KeyboardResize } from '@capacitor/keyboard';
|
||||||
|
|
||||||
|
const config: CapacitorConfig = {
|
||||||
|
appId: 'com.liketrek.trek',
|
||||||
|
// What the home screen shows under the icon; the longer title belongs to
|
||||||
|
// the store listings.
|
||||||
|
appName: 'TREK',
|
||||||
|
// The app ships only the address screen. Once a server is picked, the native
|
||||||
|
// side points the WebView at it (TrekBridgeViewController.swift,
|
||||||
|
// MainActivity.java) and the UI comes from that server, always in the version
|
||||||
|
// the server runs. Session cookie, uploads, /ws and plugins work as they do in
|
||||||
|
// a browser, because the WebView is on the server's own origin.
|
||||||
|
webDir: 'native-dist',
|
||||||
|
server: {
|
||||||
|
// Android serves the address screen from https://localhost so it is a
|
||||||
|
// secure context. iOS keeps its default capacitor:// scheme: WKWebView
|
||||||
|
// handles https itself and Capacitor silently drops an iosScheme of https.
|
||||||
|
androidScheme: 'https',
|
||||||
|
// iOS shows this page from the app bundle whenever the server fails to
|
||||||
|
// load. It knows a server is remembered, first tries the stored offline
|
||||||
|
// copy of the server's start page, then offers to retry or pick another
|
||||||
|
// one. Android restarts on the same page instead (TrekWebViewClient.java),
|
||||||
|
// because it injects no bridge into a local page while a server is set.
|
||||||
|
errorPath: 'index.html',
|
||||||
|
},
|
||||||
|
ios: {
|
||||||
|
// Long-pressing a link shows a Safari preview otherwise, which no app does.
|
||||||
|
allowsLinkPreview: false,
|
||||||
|
},
|
||||||
|
plugins: {
|
||||||
|
SplashScreen: {
|
||||||
|
// Matches <meta name="theme-color"> in index.html, so the launch image,
|
||||||
|
// the splash and the first painted frame are the same colour and there is
|
||||||
|
// no white flash between them.
|
||||||
|
backgroundColor: '#09090b',
|
||||||
|
// The server's UI hides it once React has mounted (native/nativeApp.ts),
|
||||||
|
// the address screen once it has rendered. Auto-hide stays on as the
|
||||||
|
// ceiling, so a page that never gets there cannot leave it up for good.
|
||||||
|
launchAutoHide: true,
|
||||||
|
launchShowDuration: 4000,
|
||||||
|
launchFadeOutDuration: 200,
|
||||||
|
showSpinner: false,
|
||||||
|
androidScaleType: 'CENTER_CROP',
|
||||||
|
},
|
||||||
|
Keyboard: {
|
||||||
|
// The mobile shell is built from bottom sheets (mobile/screens/**/M*Sheet).
|
||||||
|
// `body` resizes the webview itself, so a sheet's own scroll container
|
||||||
|
// keeps working; `native` resizes the whole view and fights the sheet.
|
||||||
|
resize: KeyboardResize.Body,
|
||||||
|
// Android-only workaround: with an edge-to-edge status bar the webview
|
||||||
|
// otherwise does not resize at all when the keyboard opens.
|
||||||
|
resizeOnFullScreen: true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
export default config;
|
||||||
@@ -0,0 +1,104 @@
|
|||||||
|
import { expect, test, type Locator } from '@playwright/test';
|
||||||
|
|
||||||
|
// #2981: labels, category and status took the whole row, so a place with two or
|
||||||
|
// three long labels showed one letter of its name or none, and the status pill
|
||||||
|
// ran out of the card. Measured in a real browser because the layout is the bug.
|
||||||
|
const PLACES = [
|
||||||
|
{ name: 'Oceanario de Lisboa', labels: ['Core shortlist', 'Heritage specialist', 'Pair with another stop'] },
|
||||||
|
{ name: 'Cove of Ursa', labels: ['Heritage specialist', 'Pair with another stop'] },
|
||||||
|
{ name: 'A Vida Portuguesa', labels: ['Flagship', 'Market', 'Core shortlist', 'Pair with another stop'] },
|
||||||
|
{ name: 'Torre de Belem', labels: [] as string[] },
|
||||||
|
];
|
||||||
|
|
||||||
|
async function expectInside(row: Locator) {
|
||||||
|
const escapes = await row.evaluate((el) => {
|
||||||
|
const box = el.getBoundingClientRect();
|
||||||
|
return Array.from(el.querySelectorAll('*')).filter((child) => {
|
||||||
|
// The strip's hidden measuring copy is meant to run past the bar.
|
||||||
|
if (child.closest('[aria-hidden="true"]')) return false;
|
||||||
|
const r = child.getBoundingClientRect();
|
||||||
|
return r.width > 0 && (r.left < box.left - 0.5 || r.right > box.right + 0.5);
|
||||||
|
}).length;
|
||||||
|
});
|
||||||
|
expect(escapes).toBe(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
for (const viewport of [
|
||||||
|
{ width: 1920, height: 1000 },
|
||||||
|
{ width: 1400, height: 900 },
|
||||||
|
{ width: 1024, height: 800 },
|
||||||
|
]) {
|
||||||
|
test(`place names stay readable next to long labels at ${viewport.width}px`, async ({ page }) => {
|
||||||
|
test.setTimeout(90_000);
|
||||||
|
await page.setViewportSize(viewport);
|
||||||
|
const addonsResponse = await page.request.get('/api/admin/addons');
|
||||||
|
expect(addonsResponse.ok()).toBeTruthy();
|
||||||
|
const { addons } = await addonsResponse.json();
|
||||||
|
const original = addons.find((addon: { id: string }) => addon.id === 'collections');
|
||||||
|
expect(original).toBeDefined();
|
||||||
|
let collectionId: number | undefined;
|
||||||
|
|
||||||
|
try {
|
||||||
|
expect((await page.request.put('/api/admin/addons/collections', { data: { enabled: true } })).ok()).toBeTruthy();
|
||||||
|
const created = await page.request.post('/api/addons/collections', { data: { name: `Rows ${viewport.width}` } });
|
||||||
|
expect(created.ok()).toBeTruthy();
|
||||||
|
const body = await created.json();
|
||||||
|
collectionId = (body.collection ?? body).id as number;
|
||||||
|
|
||||||
|
const labelIds = new Map<string, number>();
|
||||||
|
for (const name of new Set(PLACES.flatMap((p) => p.labels))) {
|
||||||
|
const res = await page.request.post('/api/addons/collections/labels', {
|
||||||
|
data: { collection_id: collectionId, name, color: '#2563eb' },
|
||||||
|
});
|
||||||
|
expect(res.ok(), `label ${name}`).toBeTruthy();
|
||||||
|
const label = await res.json();
|
||||||
|
labelIds.set(name, (label.label ?? label).id);
|
||||||
|
}
|
||||||
|
for (const place of PLACES) {
|
||||||
|
const res = await page.request.post('/api/addons/collections/places', {
|
||||||
|
data: {
|
||||||
|
collection_id: collectionId,
|
||||||
|
name: place.name,
|
||||||
|
address: 'Rua Anchieta 11, 1200-023 Lisboa, Portugal',
|
||||||
|
lat: 38.71,
|
||||||
|
lng: -9.14,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
expect(res.ok(), `place ${place.name}`).toBeTruthy();
|
||||||
|
const saved = await res.json();
|
||||||
|
if (!place.labels.length) continue;
|
||||||
|
const assign = await page.request.post('/api/addons/collections/labels/assign', {
|
||||||
|
data: { label_ids: place.labels.map((l) => labelIds.get(l)), place_ids: [(saved.place ?? saved).id] },
|
||||||
|
});
|
||||||
|
expect(assign.ok()).toBeTruthy();
|
||||||
|
}
|
||||||
|
|
||||||
|
await page.goto(`/collections/${collectionId}`);
|
||||||
|
const rows = page.locator('.col-lrow');
|
||||||
|
await expect(rows).toHaveCount(PLACES.length);
|
||||||
|
for (const place of PLACES) {
|
||||||
|
const row = rows.filter({ hasText: place.name });
|
||||||
|
const name = row.locator('.li .t');
|
||||||
|
await expect(name).toHaveText(place.name);
|
||||||
|
// The whole name fits: it is not cut to an ellipsis.
|
||||||
|
expect(await name.evaluate((el) => el.scrollWidth <= el.clientWidth + 1)).toBe(true);
|
||||||
|
await expectInside(row);
|
||||||
|
// Every label is either on the row or counted by its "+N" chip.
|
||||||
|
const shown = await row.locator('.col-lrow-label:not(.is-over)').count();
|
||||||
|
// Read without waiting: a row whose labels all fit has no "+N".
|
||||||
|
const [more] = await row.locator('.col-lrow-more').allTextContents();
|
||||||
|
expect(shown + (more ? Number(more.replace('+', '')) : 0)).toBe(place.labels.length);
|
||||||
|
}
|
||||||
|
// The map's label strip stays inside the map: whole, or folded into its button.
|
||||||
|
const topbar = page.locator('.col-map-topbar');
|
||||||
|
if (await topbar.count()) await expectInside(topbar);
|
||||||
|
} finally {
|
||||||
|
if (collectionId !== undefined) {
|
||||||
|
expect((await page.request.delete(`/api/addons/collections/${collectionId}`)).ok()).toBeTruthy();
|
||||||
|
}
|
||||||
|
expect(
|
||||||
|
(await page.request.put('/api/admin/addons/collections', { data: { enabled: !!original.enabled } })).ok()
|
||||||
|
).toBeTruthy();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
@@ -32,8 +32,8 @@ async function swipe(page: Page, from: { x: number; y: number }, to: { x: number
|
|||||||
}
|
}
|
||||||
await cdp.send('Input.dispatchTouchEvent', { type: 'touchEnd', touchPoints: [] })
|
await cdp.send('Input.dispatchTouchEvent', { type: 'touchEnd', touchPoints: [] })
|
||||||
await cdp.detach()
|
await cdp.detach()
|
||||||
// The out leg is 150ms and the in leg 220ms.
|
// The strip snaps natively; give the snap and the selection that follows it time to land.
|
||||||
await page.waitForTimeout(500)
|
await page.waitForTimeout(900)
|
||||||
}
|
}
|
||||||
|
|
||||||
const activeChip = (page: Page) => page.locator('button[aria-current="true"]')
|
const activeChip = (page: Page) => page.locator('button[aria-current="true"]')
|
||||||
@@ -72,19 +72,23 @@ test('#2051 phone: the day details area swipes between days', async ({ page }) =
|
|||||||
|
|
||||||
const day1 = (await activeChip(page).textContent())!.trim()
|
const day1 = (await activeChip(page).textContent())!.trim()
|
||||||
|
|
||||||
|
// The days are a scroll-snap pager: like a native pager it turns once the
|
||||||
|
// finger has carried the page past its middle, so the swipe covers most of it.
|
||||||
|
const reach = Math.round(env.width * 0.4)
|
||||||
|
const chipText = async () => (await activeChip(page).textContent())!.trim()
|
||||||
|
|
||||||
// 1. A swipe left steps forward.
|
// 1. A swipe left steps forward.
|
||||||
await swipe(page, { x: mid + 90, y }, { x: mid - 90, y })
|
await swipe(page, { x: mid + reach, y }, { x: mid - reach, y })
|
||||||
const day2 = (await activeChip(page).textContent())!.trim()
|
await expect.poll(chipText, { message: 'swiping left moved to the next day' }).not.toBe(day1)
|
||||||
expect(day2, 'swiping left moved to the next day').not.toBe(day1)
|
|
||||||
|
|
||||||
// 2. A swipe right steps back to where it started.
|
// 2. A swipe right steps back to where it started.
|
||||||
await swipe(page, { x: mid - 90, y }, { x: mid + 90, y })
|
await swipe(page, { x: mid - reach, y }, { x: mid + reach, y })
|
||||||
expect((await activeChip(page).textContent())!.trim()).toBe(day1)
|
await expect.poll(chipText).toBe(day1)
|
||||||
|
|
||||||
// 3. The first day has nowhere to go back to — it must stay put, and the
|
// 3. The first day has nowhere to go back to — it must stay put, and the
|
||||||
// browser must not have been handed a page-back either.
|
// browser must not have been handed a page-back either.
|
||||||
await swipe(page, { x: mid - 90, y }, { x: mid + 90, y })
|
await swipe(page, { x: mid - reach, y }, { x: mid + reach, y })
|
||||||
expect((await activeChip(page).textContent())!.trim()).toBe(day1)
|
expect(await chipText()).toBe(day1)
|
||||||
expect(page.url()).toContain(`/trips/${tripId}`)
|
expect(page.url()).toContain(`/trips/${tripId}`)
|
||||||
|
|
||||||
// 4. A vertical drag belongs to the card's own scroller, never to the day.
|
// 4. A vertical drag belongs to the card's own scroller, never to the day.
|
||||||
|
|||||||
@@ -0,0 +1,72 @@
|
|||||||
|
import { test, type Page } from '@playwright/test';
|
||||||
|
import { mkdirSync } from 'node:fs';
|
||||||
|
import path from 'node:path';
|
||||||
|
|
||||||
|
import { E2E_STATE_FILE } from '../../playwright.config';
|
||||||
|
import { clearNotices, seed } from '../screenshots/shot';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The store screenshots (`npm run store:shots`, then `npm run store:promote`).
|
||||||
|
*
|
||||||
|
* The same seeded demo trip the wiki pictures show, captured at the sizes App
|
||||||
|
* Store Connect and Google Play ask for: the iPhone 6.9" and iPad 13" displays,
|
||||||
|
* and a Play phone, 7" and 10" tablet. Below 768 px the phone shell answers, so
|
||||||
|
* the phone pictures show the phone UI; the tablets get the desktop layout they
|
||||||
|
* get on a real device.
|
||||||
|
*
|
||||||
|
* Raw captures go to e2e/.tmp/store/<device>/; scripts/store-screenshots.mjs
|
||||||
|
* flattens them (the stores refuse an alpha channel) and copies them into
|
||||||
|
* fastlane/. Nothing here asserts behaviour, and the run is not part of CI.
|
||||||
|
*/
|
||||||
|
|
||||||
|
const STORE_OUT_DIR = path.join(process.cwd(), 'e2e', '.tmp', 'store');
|
||||||
|
|
||||||
|
const DEVICES = [
|
||||||
|
{ name: 'iphone69', viewport: { width: 440, height: 956 }, deviceScaleFactor: 3, isMobile: true },
|
||||||
|
{ name: 'ipad13', viewport: { width: 1032, height: 1376 }, deviceScaleFactor: 2, isMobile: true },
|
||||||
|
{ name: 'play-phone', viewport: { width: 360, height: 640 }, deviceScaleFactor: 3, isMobile: true },
|
||||||
|
{ name: 'play-7in', viewport: { width: 810, height: 1440 }, deviceScaleFactor: 2, isMobile: true },
|
||||||
|
{ name: 'play-10in', viewport: { width: 1280, height: 720 }, deviceScaleFactor: 1.5, isMobile: true },
|
||||||
|
] as const;
|
||||||
|
|
||||||
|
/** The screens, in the order the listings show them. */
|
||||||
|
const SCREENS: { name: string; path: () => string }[] = [
|
||||||
|
{ name: 'dashboard', path: () => '/dashboard' },
|
||||||
|
{ name: 'plan', path: () => `/trips/${seed.tripId}?tab=plan` },
|
||||||
|
{ name: 'bookings', path: () => `/trips/${seed.tripId}?tab=buchungen` },
|
||||||
|
{ name: 'costs', path: () => `/trips/${seed.tripId}?tab=finanzplan` },
|
||||||
|
{ name: 'lists', path: () => `/trips/${seed.tripId}?tab=listen` },
|
||||||
|
{ name: 'journal', path: () => (seed.journeyId ? `/journey/${seed.journeyId}` : '/journey') },
|
||||||
|
];
|
||||||
|
|
||||||
|
/** Waits until the page has drawn what it is going to draw: fonts, images, no pending fade. */
|
||||||
|
async function settle(page: Page): Promise<void> {
|
||||||
|
await page.waitForLoadState('networkidle', { timeout: 5_000 }).catch(() => undefined);
|
||||||
|
await page.evaluate(async () => {
|
||||||
|
await document.fonts.ready;
|
||||||
|
});
|
||||||
|
await page.waitForTimeout(800);
|
||||||
|
}
|
||||||
|
|
||||||
|
for (const device of DEVICES) {
|
||||||
|
test.describe(device.name, () => {
|
||||||
|
test.use({
|
||||||
|
storageState: E2E_STATE_FILE,
|
||||||
|
viewport: device.viewport,
|
||||||
|
deviceScaleFactor: device.deviceScaleFactor,
|
||||||
|
isMobile: device.isMobile,
|
||||||
|
hasTouch: true,
|
||||||
|
});
|
||||||
|
|
||||||
|
SCREENS.forEach((screen, index) => {
|
||||||
|
test(`${index + 1} ${screen.name}`, async ({ page }) => {
|
||||||
|
const dir = path.join(STORE_OUT_DIR, device.name);
|
||||||
|
mkdirSync(dir, { recursive: true });
|
||||||
|
await page.goto(screen.path());
|
||||||
|
await clearNotices(page);
|
||||||
|
await settle(page);
|
||||||
|
await page.screenshot({ path: path.join(dir, `${index + 1}_${screen.name}.png`) });
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
@@ -31,6 +31,14 @@ export default tseslint.config(
|
|||||||
'public',
|
'public',
|
||||||
'test-results',
|
'test-results',
|
||||||
'playwright-report',
|
'playwright-report',
|
||||||
|
// Capacitor native shells. `npx cap sync` copies the built address screen
|
||||||
|
// from native-dist/ into both platforms, so without these ESLint lints the
|
||||||
|
// minified output. gitignore() does not cover them: the iOS and Android
|
||||||
|
// .gitignore files live one level down, and this config's gitignore
|
||||||
|
// integration only reads client/.gitignore.
|
||||||
|
'native-dist',
|
||||||
|
'android/**',
|
||||||
|
'ios/**',
|
||||||
'e2e/**',
|
'e2e/**',
|
||||||
'scripts/**',
|
'scripts/**',
|
||||||
'**/*.config.js',
|
'**/*.config.js',
|
||||||
|
|||||||
@@ -0,0 +1,116 @@
|
|||||||
|
# iOS release signing and TestFlight upload, driven by .github/workflows/native-release.yml.
|
||||||
|
#
|
||||||
|
# Automatic signing cannot work on a CI runner with no registered devices: it signs
|
||||||
|
# the archive for development and then needs a development provisioning profile, which
|
||||||
|
# requires a device. So this signs manually for distribution instead. The distribution
|
||||||
|
# certificate and the App Store provisioning profile are created (or reused) through the
|
||||||
|
# App Store Connect API key, which means no certificate or profile has to be stored as a
|
||||||
|
# secret: the key the workflow already holds is enough.
|
||||||
|
#
|
||||||
|
# The lane expects these in the environment (the workflow sets them):
|
||||||
|
# ASC_KEY_ID, ASC_ISSUER_ID, ASC_KEY_PATH — the App Store Connect API key
|
||||||
|
# APPLE_TEAM_ID — the developer team
|
||||||
|
# MARKETING_VERSION, CURRENT_PROJECT_VERSION — the version and build number
|
||||||
|
# RUNNER_TEMP — a writable scratch directory
|
||||||
|
|
||||||
|
default_platform(:ios)
|
||||||
|
|
||||||
|
APP_IDENTIFIER = "com.liketrek.trek"
|
||||||
|
PROJECT = "ios/App/App.xcodeproj"
|
||||||
|
|
||||||
|
# Every signed target with its bundle identifier: the app and its extensions
|
||||||
|
# (ios/scripts/add-extension.rb put them in the project). Each gets its own App
|
||||||
|
# Store profile, created or reused through the API key like the app's.
|
||||||
|
SIGNED_TARGETS = {
|
||||||
|
"App" => APP_IDENTIFIER,
|
||||||
|
"NotificationService" => "com.liketrek.trek.notifications",
|
||||||
|
"TREKWidgets" => "com.liketrek.trek.widgets",
|
||||||
|
}
|
||||||
|
|
||||||
|
platform :ios do
|
||||||
|
desc "Build the signed Release app and upload it to TestFlight (internal testing)."
|
||||||
|
lane :beta do
|
||||||
|
key = app_store_connect_api_key(
|
||||||
|
key_id: ENV.fetch("ASC_KEY_ID"),
|
||||||
|
issuer_id: ENV.fetch("ASC_ISSUER_ID"),
|
||||||
|
key_filepath: ENV.fetch("ASC_KEY_PATH"),
|
||||||
|
in_house: false,
|
||||||
|
)
|
||||||
|
|
||||||
|
# A throwaway keychain with a known password, so fastlane can unlock the imported
|
||||||
|
# private key for code signing (without the password it cannot set the key's access
|
||||||
|
# list and the certificate is never usable).
|
||||||
|
keychain_name = "trek_ci.keychain"
|
||||||
|
keychain_password = "trek-ci-#{ENV.fetch('GITHUB_RUN_ID', 'local')}"
|
||||||
|
create_keychain(
|
||||||
|
name: keychain_name,
|
||||||
|
password: keychain_password,
|
||||||
|
default_keychain: true,
|
||||||
|
unlock: true,
|
||||||
|
timeout: 3600,
|
||||||
|
lock_when_sleeps: false,
|
||||||
|
)
|
||||||
|
keychain_path = File.expand_path("~/Library/Keychains/#{keychain_name}-db")
|
||||||
|
|
||||||
|
# Import the one distribution certificate from its stored .p12, rather than
|
||||||
|
# minting a new one each run — Apple caps distribution certificates at two, so
|
||||||
|
# a fresh one per build would quickly hit the limit. The matching App Store
|
||||||
|
# profile is created (or reused) through the API key.
|
||||||
|
import_certificate(
|
||||||
|
certificate_path: ENV.fetch("CERT_P12_PATH"),
|
||||||
|
certificate_password: ENV.fetch("CERT_P12_PASSWORD"),
|
||||||
|
keychain_name: keychain_name,
|
||||||
|
keychain_path: keychain_path,
|
||||||
|
keychain_password: keychain_password,
|
||||||
|
)
|
||||||
|
profiles = {}
|
||||||
|
SIGNED_TARGETS.each do |target, identifier|
|
||||||
|
get_provisioning_profile(
|
||||||
|
api_key: key,
|
||||||
|
app_identifier: identifier,
|
||||||
|
development: false,
|
||||||
|
)
|
||||||
|
profiles[identifier] = lane_context[SharedValues::SIGH_NAME]
|
||||||
|
|
||||||
|
# Pin each target to its profile for this build; automatic signing stays the
|
||||||
|
# default a developer sees when they open the project in Xcode.
|
||||||
|
update_code_signing_settings(
|
||||||
|
path: PROJECT,
|
||||||
|
use_automatic_signing: false,
|
||||||
|
team_id: ENV.fetch("APPLE_TEAM_ID"),
|
||||||
|
code_sign_identity: "Apple Distribution",
|
||||||
|
bundle_identifier: identifier,
|
||||||
|
profile_name: profiles[identifier],
|
||||||
|
targets: [target],
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
|
build_app(
|
||||||
|
project: PROJECT,
|
||||||
|
scheme: "App",
|
||||||
|
configuration: "Release",
|
||||||
|
export_method: "app-store",
|
||||||
|
output_directory: File.join(ENV.fetch("RUNNER_TEMP"), "export"),
|
||||||
|
xcargs: [
|
||||||
|
"MARKETING_VERSION=#{ENV.fetch('MARKETING_VERSION')}",
|
||||||
|
"CURRENT_PROJECT_VERSION=#{ENV.fetch('CURRENT_PROJECT_VERSION')}",
|
||||||
|
].join(" "),
|
||||||
|
export_options: {
|
||||||
|
signingStyle: "manual",
|
||||||
|
provisioningProfiles: profiles,
|
||||||
|
},
|
||||||
|
)
|
||||||
|
|
||||||
|
# Upload to App Store Connect; it shows up in TestFlight after Apple finishes processing.
|
||||||
|
# Internal testing needs no App Review, so nothing here submits the app for review.
|
||||||
|
# "What to Test" comes from the release tag's message (native-release.yml). Apple only
|
||||||
|
# takes it once the build is processed, so with notes the lane waits for that.
|
||||||
|
notes = ENV.fetch("TESTFLIGHT_NOTES", "").strip
|
||||||
|
upload_to_testflight(
|
||||||
|
api_key: key,
|
||||||
|
changelog: notes.empty? ? nil : notes,
|
||||||
|
skip_waiting_for_build_processing: notes.empty?,
|
||||||
|
skip_submission: true,
|
||||||
|
)
|
||||||
|
end
|
||||||
|
end
|
||||||