mirror of
https://github.com/mauriceboe/TREK.git
synced 2026-11-21 03:26:07 +00:00
feat(native): share a booking document to TREK and import it into a trip
TREK now appears under "Open in" and in the share sheet for PDFs, calendar entries, Wallet passes and mails (iOS document types, Android VIEW and SEND filters). The native side reads the file (up to 15 MB) and hands it to the UI, which asks which trip it belongs to, upcoming trips first, then opens that trip's booking import with the file already chosen.
This commit is contained in:
@@ -23,6 +23,16 @@
|
||||
<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.
|
||||
|
||||
|
||||
@@ -26,6 +26,13 @@ public class MainActivity extends BridgeActivity {
|
||||
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;
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
@@ -31,7 +31,7 @@ public class TrekShellPlugin extends Plugin {
|
||||
*/
|
||||
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" };
|
||||
static final String[] FEATURES = { "capabilities", "biometricLock", "sharedFiles" };
|
||||
|
||||
@PluginMethod
|
||||
public void getCapabilities(PluginCall call) {
|
||||
@@ -55,6 +55,22 @@ public class TrekShellPlugin extends Plugin {
|
||||
call.resolve(result);
|
||||
}
|
||||
|
||||
// ---- Shared booking documents ----
|
||||
|
||||
@Override
|
||||
public void load() {
|
||||
TrekSharedFiles.setListener(file -> notifyListeners("sharedFile", file));
|
||||
}
|
||||
|
||||
/** 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 =
|
||||
|
||||
@@ -84,6 +84,27 @@
|
||||
apple-app-site-association, and a self-hosted app has no single domain to
|
||||
verify against. SceneDelegate already forwards openURLContexts to
|
||||
Capacitor, so no Swift change is needed. -->
|
||||
<key>CFBundleDocumentTypes</key>
|
||||
<array>
|
||||
<dict>
|
||||
<key>CFBundleTypeName</key>
|
||||
<string>Booking document</string>
|
||||
<key>CFBundleTypeRole</key>
|
||||
<string>Viewer</string>
|
||||
<key>LSHandlerRank</key>
|
||||
<string>Alternate</string>
|
||||
<key>LSItemContentTypes</key>
|
||||
<array>
|
||||
<string>com.adobe.pdf</string>
|
||||
<string>com.apple.ical.ics</string>
|
||||
<string>com.apple.pkpass</string>
|
||||
<string>com.apple.mail.email</string>
|
||||
<string>public.email-message</string>
|
||||
</array>
|
||||
</dict>
|
||||
</array>
|
||||
<key>LSSupportsOpeningDocumentsInPlace</key>
|
||||
<false/>
|
||||
<key>CFBundleURLTypes</key>
|
||||
<array>
|
||||
<dict>
|
||||
|
||||
@@ -11,6 +11,10 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
|
||||
window?.rootViewController = TrekBridgeViewController()
|
||||
window?.makeKeyAndVisible()
|
||||
|
||||
// Launched by "Open in TREK" on a booking document.
|
||||
for context in connectionOptions.urlContexts where context.url.isFileURL {
|
||||
TrekSharedFiles.receive(context.url)
|
||||
}
|
||||
SceneDelegateProxy.shared.scene(scene, willConnectTo: session, options: connectionOptions)
|
||||
}
|
||||
|
||||
@@ -25,7 +29,12 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
|
||||
}
|
||||
|
||||
func scene(_ scene: UIScene, openURLContexts URLContexts: Set<UIOpenURLContext>) {
|
||||
SceneDelegateProxy.shared.scene(scene, openURLContexts: URLContexts)
|
||||
// A booking document shared to TREK goes to the UI's import; anything
|
||||
// else (the sign-in callback) stays with Capacitor.
|
||||
let files = URLContexts.filter { $0.url.isFileURL }
|
||||
for context in files { TrekSharedFiles.receive(context.url) }
|
||||
let others = URLContexts.subtracting(files)
|
||||
if !others.isEmpty { SceneDelegateProxy.shared.scene(scene, openURLContexts: others) }
|
||||
}
|
||||
|
||||
func scene(_ scene: UIScene, continue userActivity: NSUserActivity) {
|
||||
@@ -58,3 +67,41 @@ enum TrekPrivacyCover {
|
||||
cover = nil
|
||||
}
|
||||
}
|
||||
|
||||
/// Booking documents shared to TREK ("Open in TREK"), held until the UI takes
|
||||
/// them (TrekShell.takeSharedFile) and announced if it is already running.
|
||||
enum TrekSharedFiles {
|
||||
/// Above this the file is not a booking confirmation, and base64 over the
|
||||
/// bridge would only stall the app.
|
||||
static let maxBytes = 15 * 1024 * 1024
|
||||
private(set) static var pending: [String: Any]?
|
||||
static var onReceive: (([String: Any]) -> Void)?
|
||||
|
||||
static func receive(_ url: URL) {
|
||||
let scoped = url.startAccessingSecurityScopedResource()
|
||||
defer { if scoped { url.stopAccessingSecurityScopedResource() } }
|
||||
guard let data = try? Data(contentsOf: url), data.count <= maxBytes else { return }
|
||||
let file: [String: Any] = [
|
||||
"name": url.lastPathComponent,
|
||||
"mimeType": mimeType(for: url.pathExtension.lowercased()),
|
||||
"data": data.base64EncodedString(),
|
||||
]
|
||||
pending = file
|
||||
onReceive?(file)
|
||||
}
|
||||
|
||||
static func take() -> [String: Any]? {
|
||||
defer { pending = nil }
|
||||
return pending
|
||||
}
|
||||
|
||||
private static func mimeType(for ext: String) -> String {
|
||||
switch ext {
|
||||
case "pdf": return "application/pdf"
|
||||
case "ics": return "text/calendar"
|
||||
case "pkpass": return "application/vnd.apple.pkpass"
|
||||
case "eml": return "message/rfc822"
|
||||
default: return "application/octet-stream"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -26,6 +26,7 @@ public class TrekShellPlugin: CAPPlugin, CAPBridgedPlugin, ASWebAuthenticationPr
|
||||
CAPPluginMethod(name: "setPrivacyCover", returnType: CAPPluginReturnPromise),
|
||||
CAPPluginMethod(name: "startLocation", returnType: CAPPluginReturnPromise),
|
||||
CAPPluginMethod(name: "stopLocation", returnType: CAPPluginReturnPromise),
|
||||
CAPPluginMethod(name: "takeSharedFile", returnType: CAPPluginReturnPromise),
|
||||
]
|
||||
|
||||
/// What this binary offers the server's UI, raised with every native feature
|
||||
@@ -33,7 +34,24 @@ public class TrekShellPlugin: CAPPlugin, CAPBridgedPlugin, ASWebAuthenticationPr
|
||||
/// and a server can require a minimum (minNativeShellApi in /api/health/features).
|
||||
static let shellApi = 2
|
||||
/// The native features by name, so the UI can turn each on by itself.
|
||||
static let features: [String] = ["capabilities", "edgeBack", "tileCache", "biometricLock", "geolocation"]
|
||||
static let features: [String] = ["capabilities", "edgeBack", "tileCache", "biometricLock", "geolocation", "sharedFiles"]
|
||||
|
||||
// MARK: - Shared booking documents
|
||||
|
||||
override public func load() {
|
||||
TrekSharedFiles.onReceive = { [weak self] file in
|
||||
DispatchQueue.main.async { self?.notifyListeners("sharedFile", data: file) }
|
||||
}
|
||||
}
|
||||
|
||||
/// The document shared to TREK before the UI was there to hear of it.
|
||||
@objc func takeSharedFile(_ call: CAPPluginCall) {
|
||||
if let file = TrekSharedFiles.take() {
|
||||
call.resolve(["file": file])
|
||||
} else {
|
||||
call.resolve(["file": NSNull()])
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Location
|
||||
|
||||
|
||||
@@ -34,6 +34,7 @@ import OfflineBanner from './components/Layout/OfflineBanner'
|
||||
import NewVersionNotice from './components/Layout/NewVersionNotice'
|
||||
import NativeUpdateNotice from './components/Layout/NativeUpdateNotice'
|
||||
import AppLockGate from './components/Layout/AppLockGate'
|
||||
import NativeImportSheet from './components/Layout/NativeImportSheet'
|
||||
import { SystemNoticeHost } from './components/SystemNotices/SystemNoticeHost.js'
|
||||
import HelpPanel from './components/Help/HelpPanel'
|
||||
// Notice action registrations (side-effect imports):
|
||||
@@ -446,6 +447,7 @@ export default function App() {
|
||||
<ErrorBoundary boundaryId="widget:new-version" fallback={null}><NewVersionNotice /></ErrorBoundary>
|
||||
<ErrorBoundary boundaryId="widget:native-update" fallback={null}><NativeUpdateNotice /></ErrorBoundary>
|
||||
<ErrorBoundary boundaryId="widget:app-lock" fallback={null}><AppLockGate /></ErrorBoundary>
|
||||
<ErrorBoundary boundaryId="widget:native-import" fallback={null}><NativeImportSheet /></ErrorBoundary>
|
||||
{/* One boundary for all route chunks, above <Routes> so it stays mounted
|
||||
across navigations. react-router runs location updates inside a transition,
|
||||
so a mounted boundary keeps the current page on screen instead of flashing
|
||||
|
||||
@@ -0,0 +1,43 @@
|
||||
import { beforeEach, describe, expect, it, vi } from 'vitest';
|
||||
import { act, fireEvent, render, screen } from '../../../tests/helpers/render';
|
||||
import { tripsApi } from '../../api/client';
|
||||
import { useSharedImportStore } from '../../native/sharedFiles';
|
||||
import NativeImportSheet from './NativeImportSheet';
|
||||
|
||||
const navigate = vi.hoisted(() => vi.fn());
|
||||
vi.mock('react-router', async (importOriginal) => ({
|
||||
...(await importOriginal<typeof import('react-router')>()),
|
||||
useNavigate: () => navigate,
|
||||
}));
|
||||
|
||||
beforeEach(() => {
|
||||
navigate.mockReset();
|
||||
useSharedImportStore.setState({ file: null, tripId: null });
|
||||
vi.spyOn(tripsApi, 'list').mockResolvedValue({
|
||||
trips: [
|
||||
{ id: 1, title: 'Past trip', start_date: '2020-01-01', end_date: '2020-01-05' },
|
||||
{ id: 2, title: 'Japan', start_date: '2099-03-01', end_date: '2099-03-10' },
|
||||
],
|
||||
});
|
||||
});
|
||||
|
||||
describe('NativeImportSheet', () => {
|
||||
it('asks which trip a shared document goes to, upcoming trips first, and opens it there', async () => {
|
||||
render(<NativeImportSheet />);
|
||||
act(() => useSharedImportStore.getState().setFile(new File(['x'], 'booking.pdf', { type: 'application/pdf' })));
|
||||
|
||||
const rows = await screen.findAllByRole('button', { name: /Japan|Past trip/ });
|
||||
expect(rows.map((r) => r.textContent)).toEqual(['Japan', 'Past trip']);
|
||||
expect(screen.getByText('booking.pdf')).toBeInTheDocument();
|
||||
|
||||
fireEvent.click(rows[0]);
|
||||
expect(useSharedImportStore.getState().tripId).toBe(2);
|
||||
expect(navigate).toHaveBeenCalledWith('/trips/2');
|
||||
});
|
||||
|
||||
it('stays closed with nothing shared', () => {
|
||||
render(<NativeImportSheet />);
|
||||
expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
|
||||
expect(tripsApi.list).not.toHaveBeenCalled();
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,80 @@
|
||||
/**
|
||||
* NativeImportSheet: a booking document was shared to TREK (native/sharedFiles.ts),
|
||||
* so this asks which trip it belongs to and opens that trip's booking import with
|
||||
* the file already chosen. Trips still ahead come first, the ones that ended after.
|
||||
*/
|
||||
import { ChevronRight, FileText } from 'lucide-react';
|
||||
import React, { useEffect, useState } from 'react';
|
||||
import { useNavigate } from 'react-router';
|
||||
import { tripsApi } from '../../api/client';
|
||||
import { useTranslation } from '../../i18n';
|
||||
import MSheet from '../../mobile/components/MSheet';
|
||||
import { useSharedImportStore } from '../../native/sharedFiles';
|
||||
|
||||
interface TripRow {
|
||||
id: number;
|
||||
title: string;
|
||||
start_date?: string | null;
|
||||
end_date?: string | null;
|
||||
}
|
||||
|
||||
export default function NativeImportSheet(): React.ReactElement | null {
|
||||
const { t } = useTranslation();
|
||||
const navigate = useNavigate();
|
||||
const file = useSharedImportStore((s) => s.file);
|
||||
const tripId = useSharedImportStore((s) => s.tripId);
|
||||
const chooseTrip = useSharedImportStore((s) => s.chooseTrip);
|
||||
const setFile = useSharedImportStore((s) => s.setFile);
|
||||
const [trips, setTrips] = useState<TripRow[]>([]);
|
||||
|
||||
const open = !!file && tripId == null;
|
||||
|
||||
useEffect(() => {
|
||||
if (!open) return;
|
||||
tripsApi.list().then(
|
||||
(data: { trips?: TripRow[] }) => {
|
||||
const today = new Date().toISOString().slice(0, 10);
|
||||
const list = [...(data.trips ?? [])];
|
||||
const ahead = (trip: TripRow) => (trip.end_date ?? '9999') >= today;
|
||||
list.sort(
|
||||
(a, b) => Number(ahead(b)) - Number(ahead(a)) || (a.start_date ?? '').localeCompare(b.start_date ?? '')
|
||||
);
|
||||
setTrips(list);
|
||||
},
|
||||
() => setTrips([])
|
||||
);
|
||||
}, [open]);
|
||||
|
||||
const pick = (id: number) => {
|
||||
chooseTrip(id);
|
||||
navigate(`/trips/${id}`);
|
||||
};
|
||||
|
||||
return (
|
||||
<MSheet open={open} onClose={() => setFile(null)} variant="bottom" ariaLabel={t('native.share.title')}>
|
||||
<div className="px-4 pb-4 pt-6">
|
||||
<div className="mb-1 px-1 text-[0.8125rem] font-bold text-m-ink">{t('native.share.title')}</div>
|
||||
{file && (
|
||||
<div className="mb-3 flex items-center gap-2 px-1 font-geist text-[0.6875rem] text-m-muted">
|
||||
<FileText size={13} aria-hidden="true" />
|
||||
<span className="truncate">{file.name}</span>
|
||||
</div>
|
||||
)}
|
||||
<div className="flex max-h-[50vh] flex-col gap-2 overflow-y-auto">
|
||||
{trips.map((trip) => (
|
||||
<button
|
||||
key={trip.id}
|
||||
type="button"
|
||||
onClick={() => pick(trip.id)}
|
||||
className="flex items-center gap-3 rounded-[16px] border border-[color:var(--m-gbr)] bg-[color:var(--m-glass)] px-4 py-3 text-start transition-transform active:scale-[.98]"
|
||||
>
|
||||
<span className="min-w-0 flex-1 truncate text-[0.875rem] font-bold text-m-ink">{trip.title}</span>
|
||||
<ChevronRight size={16} className="flex-none text-m-faint" aria-hidden="true" />
|
||||
</button>
|
||||
))}
|
||||
{trips.length === 0 && <p className="px-1 text-[0.75rem] text-m-muted">{t('native.share.noTrips')}</p>}
|
||||
</div>
|
||||
</div>
|
||||
</MSheet>
|
||||
);
|
||||
}
|
||||
@@ -1,4 +1,5 @@
|
||||
import { createPortal } from 'react-dom'
|
||||
import { useSharedImportStore } from '../../native/sharedFiles'
|
||||
import { useState, useRef, useEffect } from 'react'
|
||||
import { Upload, X } from 'lucide-react'
|
||||
import { useTranslation } from '../../i18n'
|
||||
@@ -35,6 +36,12 @@ export default function BookingImportModal({ isOpen, onClose, tripId, kind }: Bo
|
||||
const mouseDownTarget = useRef<EventTarget | null>(null)
|
||||
|
||||
const [files, setFiles] = useState<File[]>([])
|
||||
// A booking document shared to TREK lands here already chosen.
|
||||
useEffect(() => {
|
||||
if (!isOpen) return
|
||||
const shared = useSharedImportStore.getState().file
|
||||
if (shared) setFiles([useSharedImportStore.getState().take() ?? shared])
|
||||
}, [isOpen])
|
||||
const [isDragOver, setIsDragOver] = useState(false)
|
||||
const [loading, setLoading] = useState(false)
|
||||
const [error, setError] = useState('')
|
||||
|
||||
@@ -9,6 +9,7 @@ import { pickDockTabs } from './dockTabs'
|
||||
import MBadge from '../../components/MBadge'
|
||||
import MIconBtn from '../../components/MIconBtn'
|
||||
import { useActivePill } from '../../components/useActivePill'
|
||||
import { useSharedImportStore } from '../../../native/sharedFiles'
|
||||
import MPlanTimeline from './plan/MPlanTimeline'
|
||||
import MMapArea from './map/MMapArea'
|
||||
import MPlacesBrowser from './places/MPlacesBrowser'
|
||||
@@ -291,6 +292,14 @@ export default function MTripShell({
|
||||
})
|
||||
}, [planner.selectedDayId, days, dayRail])
|
||||
// The active day's pill glides to the next chip rather than jumping there.
|
||||
// A booking document shared to TREK, and this trip picked for it: open the import.
|
||||
const sharedTripId = useSharedImportStore(s => s.tripId)
|
||||
useEffect(() => {
|
||||
if (sharedTripId == null || sharedTripId !== Number(tripId)) return
|
||||
planner.setBookingImportKind('bookings')
|
||||
planner.setShowBookingImport(true)
|
||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||
}, [sharedTripId, tripId])
|
||||
const dayPill = useActivePill(dayRail, '[aria-current="true"]', [planner.selectedDayId, days, dayRail, language])
|
||||
|
||||
const trTab = planner.activeTab
|
||||
|
||||
@@ -23,6 +23,7 @@ vi.mock('./capabilities', () => ({
|
||||
loadNativeCapabilities: vi.fn(async () => ({})),
|
||||
}));
|
||||
vi.mock('./geolocation', () => ({ installNativeGeolocation: vi.fn() }));
|
||||
vi.mock('./sharedFiles', () => ({ startSharedFiles: vi.fn(async () => {}) }));
|
||||
vi.mock('../mobile/overlayStack', () => ({ closeTopOverlay: vi.fn(() => false) }));
|
||||
|
||||
function backButtonHandler(): (event: { canGoBack: boolean }) => void {
|
||||
|
||||
@@ -9,6 +9,7 @@ import { installNativeGeolocation } from './geolocation';
|
||||
import { keepOfflineShellFresh } from './offlineShell';
|
||||
import { isNativeApp, isNativeIos } from './platform';
|
||||
import { reportNativeFailure } from './reportFailure';
|
||||
import { startSharedFiles } from './sharedFiles';
|
||||
import { isUnimplemented } from './trekShell';
|
||||
|
||||
/** Long enough that the warm-up never competes with the first screen's requests. */
|
||||
@@ -27,6 +28,8 @@ export function startNativeApp(): void {
|
||||
void checkAppUpdate(fetchServerFeatures);
|
||||
// The app's own location under navigator.geolocation, where the binary has it.
|
||||
void loadNativeCapabilities().then(() => installNativeGeolocation());
|
||||
// Booking documents shared to TREK, waiting for a trip to import into.
|
||||
void startSharedFiles();
|
||||
|
||||
// A tap on the status bar scrolls the list under it back to the top, as in
|
||||
// every iOS app (the status-bar plugin fires statusTap on iOS).
|
||||
|
||||
@@ -0,0 +1,53 @@
|
||||
import { beforeEach, describe, expect, it, vi } from 'vitest';
|
||||
import { hasNativeFeature } from './capabilities';
|
||||
import { startSharedFiles, toFile, useSharedImportStore } from './sharedFiles';
|
||||
import { TrekShell } from './trekShell';
|
||||
|
||||
vi.mock('./capabilities', () => ({ hasNativeFeature: vi.fn(), loadNativeCapabilities: vi.fn(async () => ({})) }));
|
||||
vi.mock('./trekShell', () => ({
|
||||
TrekShell: { addListener: vi.fn(async () => ({ remove: async () => {} })), takeSharedFile: vi.fn() },
|
||||
isUnimplemented: () => false,
|
||||
}));
|
||||
|
||||
const PDF = { name: 'booking.pdf', mimeType: 'application/pdf', data: btoa('%PDF-1.4 hello') };
|
||||
|
||||
beforeEach(() => {
|
||||
useSharedImportStore.setState({ file: null, tripId: null });
|
||||
vi.mocked(hasNativeFeature).mockReturnValue(true);
|
||||
vi.mocked(TrekShell.takeSharedFile).mockReset().mockResolvedValue({ file: null });
|
||||
});
|
||||
|
||||
describe('shared booking documents', () => {
|
||||
it('turns the base64 the native side sends into a File', async () => {
|
||||
const file = toFile(PDF);
|
||||
expect(file.name).toBe('booking.pdf');
|
||||
expect(file.type).toBe('application/pdf');
|
||||
expect(await file.text()).toBe('%PDF-1.4 hello');
|
||||
});
|
||||
|
||||
it('picks up a document shared before the UI ran, and the next ones as they come', async () => {
|
||||
vi.mocked(TrekShell.takeSharedFile).mockResolvedValue({ file: PDF });
|
||||
await startSharedFiles();
|
||||
expect(useSharedImportStore.getState().file?.name).toBe('booking.pdf');
|
||||
|
||||
const listener = vi.mocked(TrekShell.addListener).mock.calls[0][1] as (p: typeof PDF) => void;
|
||||
listener({ ...PDF, name: 'train.ics', mimeType: 'text/calendar' });
|
||||
expect(useSharedImportStore.getState().file?.name).toBe('train.ics');
|
||||
});
|
||||
|
||||
it('hands the file over once a trip is picked, and empties the queue', () => {
|
||||
useSharedImportStore.getState().setFile(toFile(PDF));
|
||||
useSharedImportStore.getState().chooseTrip(7);
|
||||
expect(useSharedImportStore.getState().tripId).toBe(7);
|
||||
expect(useSharedImportStore.getState().take()?.name).toBe('booking.pdf');
|
||||
expect(useSharedImportStore.getState()).toMatchObject({ file: null, tripId: null });
|
||||
});
|
||||
|
||||
it('does nothing in a binary without the feature', async () => {
|
||||
vi.mocked(hasNativeFeature).mockReturnValue(false);
|
||||
vi.mocked(TrekShell.addListener).mockClear();
|
||||
await startSharedFiles();
|
||||
expect(TrekShell.addListener).not.toHaveBeenCalled();
|
||||
expect(TrekShell.takeSharedFile).not.toHaveBeenCalled();
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,55 @@
|
||||
import { create } from 'zustand';
|
||||
import { hasNativeFeature, loadNativeCapabilities } from './capabilities';
|
||||
import { reportNativeFailure } from './reportFailure';
|
||||
import { TrekShell, isUnimplemented, type SharedFilePayload } from './trekShell';
|
||||
|
||||
/**
|
||||
* Booking documents shared to TREK ("Open in TREK" on a PDF, a calendar entry,
|
||||
* a Wallet pass or a mail). The native side hands them over as base64
|
||||
* (TrekShell.takeSharedFile and the sharedFile event); here they become a File
|
||||
* waiting for a trip: NativeImportSheet asks which one, and the trip's booking
|
||||
* import opens with the file already chosen (BookingImportModal).
|
||||
*/
|
||||
interface SharedImportState {
|
||||
file: File | null;
|
||||
/** The trip the user picked for it; the planner of that trip takes it from here. */
|
||||
tripId: number | null;
|
||||
setFile: (file: File | null) => void;
|
||||
chooseTrip: (tripId: number) => void;
|
||||
/** The booking import took the file: the queue is empty again. */
|
||||
take: () => File | null;
|
||||
}
|
||||
|
||||
export const useSharedImportStore = create<SharedImportState>((set, get) => ({
|
||||
file: null,
|
||||
tripId: null,
|
||||
setFile: (file) => set({ file, tripId: null }),
|
||||
chooseTrip: (tripId) => set({ tripId }),
|
||||
take: () => {
|
||||
const { file } = get();
|
||||
set({ file: null, tripId: null });
|
||||
return file;
|
||||
},
|
||||
}));
|
||||
|
||||
export function toFile(payload: SharedFilePayload): File {
|
||||
const binary = atob(payload.data);
|
||||
const bytes = new Uint8Array(binary.length);
|
||||
for (let i = 0; i < binary.length; i++) bytes[i] = binary.charCodeAt(i);
|
||||
return new File([bytes], payload.name || 'booking', { type: payload.mimeType || 'application/octet-stream' });
|
||||
}
|
||||
|
||||
/** Picks up a document shared before the UI ran, and listens for the next ones. */
|
||||
export async function startSharedFiles(): Promise<void> {
|
||||
await loadNativeCapabilities();
|
||||
if (!hasNativeFeature('sharedFiles')) return;
|
||||
const accept = (payload: SharedFilePayload | null) => {
|
||||
if (payload?.data) useSharedImportStore.getState().setFile(toFile(payload));
|
||||
};
|
||||
void TrekShell.addListener('sharedFile', accept);
|
||||
try {
|
||||
accept((await TrekShell.takeSharedFile()).file);
|
||||
} catch (err) {
|
||||
if (!isUnimplemented(err)) reportNativeFailure(err);
|
||||
}
|
||||
}
|
||||
@@ -49,6 +49,20 @@ export interface TrekShellPlugin {
|
||||
event: 'location',
|
||||
listener: (payload: NativeLocationPayload) => void
|
||||
): Promise<{ remove: () => Promise<void> }>;
|
||||
addListener(
|
||||
event: 'sharedFile',
|
||||
listener: (payload: SharedFilePayload) => void
|
||||
): Promise<{ remove: () => Promise<void> }>;
|
||||
/** Feature sharedFiles: the booking document shared to TREK before the UI ran. */
|
||||
takeSharedFile(): Promise<{ file: SharedFilePayload | null }>;
|
||||
}
|
||||
|
||||
/** A document shared to TREK, as the native side reads it. */
|
||||
export interface SharedFilePayload {
|
||||
name: string;
|
||||
mimeType: string;
|
||||
/** base64 */
|
||||
data: string;
|
||||
}
|
||||
|
||||
/** A position, or an error shaped like GeolocationPositionError (1 denied, 2 unavailable). */
|
||||
|
||||
@@ -80,6 +80,8 @@ const native: TranslationStrings = {
|
||||
'native.lock.settingTitle': 'قفل التطبيق',
|
||||
'native.lock.setting': 'القفل باستخدام Face ID أو رمز المرور',
|
||||
'native.lock.settingHint': 'يطلب ذلك عند فتح TREK وبعد نصف دقيقة في الخلفية، ويخفي التطبيق في مبدّل التطبيقات.',
|
||||
'native.share.title': 'الاستيراد إلى أي رحلة؟',
|
||||
'native.share.noTrips': 'لا توجد رحلة بعد. أنشئ رحلة أولًا ثم شارك المستند مجددًا.',
|
||||
};
|
||||
|
||||
export default native;
|
||||
|
||||
@@ -82,6 +82,8 @@ const native: TranslationStrings = {
|
||||
'native.lock.setting': 'Face ID və ya kodla kilidlə',
|
||||
'native.lock.settingHint':
|
||||
'TREK açılanda və arxa fonda yarım dəqiqədən sonra soruşur, tətbiqi tətbiq dəyişdiricisində gizlədir.',
|
||||
'native.share.title': 'Hansı səyahətə idxal edilsin?',
|
||||
'native.share.noTrips': 'Hələ səyahət yoxdur. Əvvəlcə birini yaradın, sonra sənədi yenidən paylaşın.',
|
||||
};
|
||||
|
||||
export default native;
|
||||
|
||||
@@ -82,6 +82,8 @@ const native: TranslationStrings = {
|
||||
'native.lock.setting': 'Bloquear com Face ID ou código',
|
||||
'native.lock.settingHint':
|
||||
'Pede ao abrir o TREK e após meio minuto em segundo plano, e oculta o app no seletor de apps.',
|
||||
'native.share.title': 'Importar para qual viagem?',
|
||||
'native.share.noTrips': 'Ainda não há viagens. Crie uma primeiro e compartilhe o documento de novo.',
|
||||
};
|
||||
|
||||
export default native;
|
||||
|
||||
@@ -82,6 +82,8 @@ const native: TranslationStrings = {
|
||||
'native.lock.setting': 'Bloqueja amb Face ID o codi',
|
||||
'native.lock.settingHint':
|
||||
'Ho demana en obrir TREK i després de mig minut en segon pla, i amaga l’app al selector d’apps.',
|
||||
'native.share.title': 'A quin viatge vols importar-ho?',
|
||||
'native.share.noTrips': 'Encara no hi ha cap viatge. Crea’n un i torna a compartir el document.',
|
||||
};
|
||||
|
||||
export default native;
|
||||
|
||||
@@ -82,6 +82,8 @@ const native: TranslationStrings = {
|
||||
'native.lock.setting': 'Zamknout pomocí Face ID nebo kódu',
|
||||
'native.lock.settingHint':
|
||||
'Zeptá se při otevření TREK a po půl minutě na pozadí a skryje aplikaci v přepínači aplikací.',
|
||||
'native.share.title': 'Importovat do které cesty?',
|
||||
'native.share.noTrips': 'Zatím žádná cesta. Nejdřív nějakou vytvořte a pak dokument sdílejte znovu.',
|
||||
};
|
||||
|
||||
export default native;
|
||||
|
||||
@@ -83,6 +83,8 @@ const native: TranslationStrings = {
|
||||
'native.lock.setting': 'Mit Face ID oder Code sperren',
|
||||
'native.lock.settingHint':
|
||||
'Fragt beim Öffnen und nach einer halben Minute im Hintergrund nach und verbirgt TREK im App-Umschalter.',
|
||||
'native.share.title': 'In welchen Trip importieren?',
|
||||
'native.share.noTrips': 'Noch kein Trip. Lege zuerst einen an und teile das Dokument dann erneut.',
|
||||
};
|
||||
|
||||
export default native;
|
||||
|
||||
@@ -82,6 +82,8 @@ const native: TranslationStrings = {
|
||||
'native.lock.setting': 'Lock with Face ID or passcode',
|
||||
'native.lock.settingHint':
|
||||
'Asks when TREK opens and after half a minute in the background, and hides the app in the app switcher.',
|
||||
'native.share.title': 'Import into which trip?',
|
||||
'native.share.noTrips': 'No trip yet. Create one first, then share the document again.',
|
||||
};
|
||||
|
||||
export default native;
|
||||
|
||||
@@ -83,6 +83,8 @@ const native: TranslationStrings = {
|
||||
'native.lock.setting': 'Bloquear con Face ID o código',
|
||||
'native.lock.settingHint':
|
||||
'Lo pide al abrir TREK y tras medio minuto en segundo plano, y oculta la app en el selector de apps.',
|
||||
'native.share.title': '¿En qué viaje importar?',
|
||||
'native.share.noTrips': 'Aún no hay viajes. Crea uno primero y vuelve a compartir el documento.',
|
||||
};
|
||||
|
||||
export default native;
|
||||
|
||||
@@ -82,6 +82,8 @@ const native: TranslationStrings = {
|
||||
'native.lock.setting': 'Lukusta Face ID või pääsukoodiga',
|
||||
'native.lock.settingHint':
|
||||
'Küsib TREK-i avamisel ja pärast poolt minutit taustal ning peidab rakenduse rakenduste vahetajas.',
|
||||
'native.share.title': 'Millisesse reisi importida?',
|
||||
'native.share.noTrips': 'Reise veel pole. Loo esmalt üks ja jaga dokumenti uuesti.',
|
||||
};
|
||||
|
||||
export default native;
|
||||
|
||||
@@ -83,6 +83,8 @@ const native: TranslationStrings = {
|
||||
'native.lock.setting': 'Verrouiller avec Face ID ou code',
|
||||
'native.lock.settingHint':
|
||||
'Le demande à l’ouverture de TREK et après une demi-minute en arrière-plan, et masque l’app dans le sélecteur d’apps.',
|
||||
'native.share.title': 'Importer dans quel voyage ?',
|
||||
'native.share.noTrips': 'Pas encore de voyage. Créez-en un, puis partagez à nouveau le document.',
|
||||
};
|
||||
|
||||
export default native;
|
||||
|
||||
@@ -85,6 +85,8 @@ const native: TranslationStrings = {
|
||||
'native.lock.setting': 'Κλείδωμα με Face ID ή κωδικό',
|
||||
'native.lock.settingHint':
|
||||
'Ζητείται κατά το άνοιγμα του TREK και μετά από μισό λεπτό στο παρασκήνιο, και η εφαρμογή κρύβεται στην εναλλαγή εφαρμογών.',
|
||||
'native.share.title': 'Εισαγωγή σε ποιο ταξίδι;',
|
||||
'native.share.noTrips': 'Δεν υπάρχει ακόμα ταξίδι. Δημιουργήστε ένα πρώτα και κοινοποιήστε ξανά το έγγραφο.',
|
||||
};
|
||||
|
||||
export default native;
|
||||
|
||||
@@ -80,6 +80,8 @@ const native: TranslationStrings = {
|
||||
'native.lock.settingTitle': 'נעילת אפליקציה',
|
||||
'native.lock.setting': 'נעילה עם Face ID או קוד',
|
||||
'native.lock.settingHint': 'מבקש בעת פתיחת TREK ואחרי חצי דקה ברקע, ומסתיר את האפליקציה במחליף האפליקציות.',
|
||||
'native.share.title': 'לייבא לאיזה טיול?',
|
||||
'native.share.noTrips': 'אין עדיין טיול. צרו טיול ואז שתפו את המסמך שוב.',
|
||||
};
|
||||
|
||||
export default native;
|
||||
|
||||
@@ -84,6 +84,8 @@ const native: TranslationStrings = {
|
||||
'native.lock.setting': 'Zárolás Face ID-val vagy kóddal',
|
||||
'native.lock.settingHint':
|
||||
'Rákérdez a TREK megnyitásakor és fél perc háttérben töltött idő után, és elrejti az alkalmazást az alkalmazásváltóban.',
|
||||
'native.share.title': 'Melyik utazásba importáljuk?',
|
||||
'native.share.noTrips': 'Még nincs utazás. Előbb hozz létre egyet, aztán oszd meg újra a dokumentumot.',
|
||||
};
|
||||
|
||||
export default native;
|
||||
|
||||
@@ -83,6 +83,8 @@ const native: TranslationStrings = {
|
||||
'native.lock.setting': 'Kunci dengan Face ID atau kode sandi',
|
||||
'native.lock.settingHint':
|
||||
'Meminta saat TREK dibuka dan setelah setengah menit di latar belakang, serta menyembunyikan aplikasi di pengalih aplikasi.',
|
||||
'native.share.title': 'Impor ke perjalanan mana?',
|
||||
'native.share.noTrips': 'Belum ada perjalanan. Buat satu dulu, lalu bagikan dokumennya lagi.',
|
||||
};
|
||||
|
||||
export default native;
|
||||
|
||||
@@ -83,6 +83,8 @@ const native: TranslationStrings = {
|
||||
'native.lock.setting': 'Blocca con Face ID o codice',
|
||||
'native.lock.settingHint':
|
||||
'Lo chiede all’apertura di TREK e dopo mezzo minuto in background, e nasconde l’app nel selettore delle app.',
|
||||
'native.share.title': 'Importare in quale viaggio?',
|
||||
'native.share.noTrips': 'Ancora nessun viaggio. Creane uno, poi condividi di nuovo il documento.',
|
||||
};
|
||||
|
||||
export default native;
|
||||
|
||||
@@ -83,6 +83,8 @@ const native: TranslationStrings = {
|
||||
'native.lock.setting': 'Face IDまたはパスコードでロック',
|
||||
'native.lock.settingHint':
|
||||
'TREKを開いたときと、バックグラウンドで30秒経過したあとに確認し、アプリスイッチャーでは内容を隠します。',
|
||||
'native.share.title': 'どの旅行に取り込みますか?',
|
||||
'native.share.noTrips': 'まだ旅行がありません。先に作成してから、もう一度ドキュメントを共有してください。',
|
||||
};
|
||||
|
||||
export default native;
|
||||
|
||||
@@ -81,6 +81,8 @@ const native: TranslationStrings = {
|
||||
'native.lock.setting': 'Face ID 또는 암호로 잠금',
|
||||
'native.lock.settingHint':
|
||||
'TREK을 열 때와 백그라운드에서 30초가 지난 후에 확인하며, 앱 전환기에서는 내용을 숨깁니다.',
|
||||
'native.share.title': '어느 여행으로 가져올까요?',
|
||||
'native.share.noTrips': '아직 여행이 없습니다. 먼저 여행을 만든 뒤 문서를 다시 공유하세요.',
|
||||
};
|
||||
|
||||
export default native;
|
||||
|
||||
@@ -82,6 +82,8 @@ const native: TranslationStrings = {
|
||||
'native.lock.setting': 'Vergrendelen met Face ID of toegangscode',
|
||||
'native.lock.settingHint':
|
||||
'Vraagt erom bij het openen van TREK en na een halve minuut op de achtergrond, en verbergt de app in de appkiezer.',
|
||||
'native.share.title': 'In welke reis importeren?',
|
||||
'native.share.noTrips': 'Nog geen reis. Maak er eerst een aan en deel het document dan opnieuw.',
|
||||
};
|
||||
|
||||
export default native;
|
||||
|
||||
@@ -82,6 +82,8 @@ const native: TranslationStrings = {
|
||||
'native.lock.setting': 'Blokuj za pomocą Face ID lub kodu',
|
||||
'native.lock.settingHint':
|
||||
'Pyta przy otwieraniu TREK i po pół minuty w tle oraz ukrywa aplikację w przełączniku aplikacji.',
|
||||
'native.share.title': 'Do której podróży zaimportować?',
|
||||
'native.share.noTrips': 'Nie ma jeszcze podróży. Najpierw utwórz podróż, a potem udostępnij dokument ponownie.',
|
||||
};
|
||||
|
||||
export default native;
|
||||
|
||||
@@ -83,6 +83,8 @@ const native: TranslationStrings = {
|
||||
'native.lock.setting': 'Блокировать с Face ID или кодом',
|
||||
'native.lock.settingHint':
|
||||
'Запрашивается при открытии TREK и через полминуты в фоне, а в переключателе приложений содержимое скрыто.',
|
||||
'native.share.title': 'В какую поездку импортировать?',
|
||||
'native.share.noTrips': 'Поездок пока нет. Сначала создайте поездку, затем снова поделитесь документом.',
|
||||
};
|
||||
|
||||
export default native;
|
||||
|
||||
@@ -82,6 +82,8 @@ const native: TranslationStrings = {
|
||||
'native.lock.setting': 'Zamknúť pomocou Face ID alebo kódu',
|
||||
'native.lock.settingHint':
|
||||
'Opýta sa pri otvorení TREK a po pol minúte na pozadí a skryje aplikáciu v prepínači aplikácií.',
|
||||
'native.share.title': 'Importovať do ktorej cesty?',
|
||||
'native.share.noTrips': 'Zatiaľ žiadna cesta. Najprv nejakú vytvorte a potom dokument zdieľajte znova.',
|
||||
};
|
||||
|
||||
export default native;
|
||||
|
||||
@@ -83,6 +83,8 @@ const native: TranslationStrings = {
|
||||
'native.lock.setting': 'Lås med Face ID eller lösenkod',
|
||||
'native.lock.settingHint':
|
||||
'Frågar när TREK öppnas och efter en halv minut i bakgrunden, och döljer appen i appväxlaren.',
|
||||
'native.share.title': 'Importera till vilken resa?',
|
||||
'native.share.noTrips': 'Ingen resa ännu. Skapa en först och dela sedan dokumentet igen.',
|
||||
};
|
||||
|
||||
export default native;
|
||||
|
||||
@@ -80,6 +80,8 @@ const native: TranslationStrings = {
|
||||
'native.lock.settingTitle': 'ล็อกแอป',
|
||||
'native.lock.setting': 'ล็อกด้วย Face ID หรือรหัส',
|
||||
'native.lock.settingHint': 'ถามเมื่อเปิด TREK และหลังจากอยู่เบื้องหลังครึ่งนาที และซ่อนแอปในตัวสลับแอป',
|
||||
'native.share.title': 'นำเข้าไปยังทริปไหน',
|
||||
'native.share.noTrips': 'ยังไม่มีทริป สร้างทริปก่อนแล้วแชร์เอกสารอีกครั้ง',
|
||||
};
|
||||
|
||||
export default native;
|
||||
|
||||
@@ -83,6 +83,8 @@ const native: TranslationStrings = {
|
||||
'native.lock.setting': 'Face ID veya parola ile kilitle',
|
||||
'native.lock.settingHint':
|
||||
'TREK açılırken ve arka planda yarım dakika sonra sorar, uygulamayı uygulama değiştiricide gizler.',
|
||||
'native.share.title': 'Hangi geziye aktarılsın?',
|
||||
'native.share.noTrips': 'Henüz gezi yok. Önce bir gezi oluşturun, sonra belgeyi yeniden paylaşın.',
|
||||
};
|
||||
|
||||
export default native;
|
||||
|
||||
@@ -82,6 +82,8 @@ const native: TranslationStrings = {
|
||||
'native.lock.setting': 'Блокувати за допомогою Face ID або коду',
|
||||
'native.lock.settingHint':
|
||||
'Запитує під час відкриття TREK і після пів хвилини у фоні, а в перемикачі застосунків вміст приховано.',
|
||||
'native.share.title': 'До якої подорожі імпортувати?',
|
||||
'native.share.noTrips': 'Подорожей ще немає. Спершу створіть подорож, а потім знову поділіться документом.',
|
||||
};
|
||||
|
||||
export default native;
|
||||
|
||||
@@ -83,6 +83,8 @@ const native: TranslationStrings = {
|
||||
'native.lock.setting': 'Khóa bằng Face ID hoặc mật mã',
|
||||
'native.lock.settingHint':
|
||||
'Hỏi khi mở TREK và sau nửa phút chạy nền, đồng thời ẩn ứng dụng trong trình chuyển ứng dụng.',
|
||||
'native.share.title': 'Nhập vào chuyến đi nào?',
|
||||
'native.share.noTrips': 'Chưa có chuyến đi nào. Hãy tạo một chuyến trước rồi chia sẻ lại tài liệu.',
|
||||
};
|
||||
|
||||
export default native;
|
||||
|
||||
@@ -80,6 +80,8 @@ const native: TranslationStrings = {
|
||||
'native.lock.settingTitle': 'App 鎖定',
|
||||
'native.lock.setting': '使用 Face ID 或密碼鎖定',
|
||||
'native.lock.settingHint': '開啟 TREK 時以及在背景停留半分鐘後會要求驗證,並在 App 切換器中隱藏內容。',
|
||||
'native.share.title': '要匯入到哪個行程?',
|
||||
'native.share.noTrips': '還沒有行程。請先建立一個,然後再次分享該文件。',
|
||||
};
|
||||
|
||||
export default native;
|
||||
|
||||
@@ -80,6 +80,8 @@ const native: TranslationStrings = {
|
||||
'native.lock.settingTitle': '应用锁',
|
||||
'native.lock.setting': '使用面容 ID 或密码锁定',
|
||||
'native.lock.settingHint': '打开 TREK 时以及在后台停留半分钟后会要求验证,并在应用切换器中隐藏内容。',
|
||||
'native.share.title': '导入到哪个行程?',
|
||||
'native.share.noTrips': '还没有行程。请先创建一个,然后再次分享该文档。',
|
||||
};
|
||||
|
||||
export default native;
|
||||
|
||||
Reference in New Issue
Block a user