Skip to content

Commit 35c46eb

Browse files
committed
isTauri does not work with Android
1 parent 7522fcd commit 35c46eb

File tree

2 files changed

+11
-8
lines changed

2 files changed

+11
-8
lines changed

package.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@
2020
"android:run": "vite build && node capacitor.config.generator.mjs && npx cap run android",
2121
"android:sync": "vite build && node capacitor.config.generator.mjs && npx cap sync android",
2222
"android:release": "vite build && node capacitor.config.generator.mjs && npx cap build android --release",
23+
"android:emu:list": "$ANDROID_HOME/emulator/emulator -list-avds",
24+
"android:emu:check": "adb devices | grep -q emulator && echo 'Emulator running' || echo 'No emulator'",
25+
"android:emu:start": "QT_QPA_PLATFORM=xcb $ANDROID_HOME/emulator/emulator -avd ${AVD:-Medium_Phone_API_35} -gpu swiftshader_indirect -no-snapshot-load &",
26+
"android:emu:start:host": "QT_QPA_PLATFORM=xcb $ANDROID_HOME/emulator/emulator -avd ${AVD:-Medium_Phone_API_35} -gpu host -no-snapshot-load &",
2327
"format": "prettier --write {src,test}/**/*.{js,vue,css,less}",
2428
"storybook": "start-storybook -p 6006",
2529
"prepare": "husky install",

src/js/utils/checkBrowserCompatibility.js

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { Capacitor } from "@capacitor/core";
2+
import { isTauri } from "@tauri-apps/api/core";
23

34
// Detects OS using modern userAgentData API with fallback to legacy platform
45
// Returns standardized OS name string or "unknown"
@@ -60,17 +61,14 @@ export function isCapacitorWeb() {
6061
return false;
6162
}
6263

63-
export function isTauri() {
64-
return "__TAURI_INTERNALS__" in window;
65-
}
66-
6764
export function checkBrowserCompatibility() {
6865
const isWebSerial = checkWebSerialSupport();
6966
const isWebBluetooth = checkWebBluetoothSupport();
7067
const isWebUSB = checkWebUSBSupport();
7168
const isChromium = isChromiumBrowser();
7269

73-
const isNative = Capacitor.isNativePlatform() || isTauri();
70+
const tauriDetected = isTauri();
71+
const isNative = Capacitor.isNativePlatform() || tauriDetected;
7472

7573
// Check if running in a test environment
7674
const isTestEnvironment =
@@ -79,6 +77,7 @@ export function checkBrowserCompatibility() {
7977
const compatible = isTestEnvironment || isNative || (isChromium && (isWebSerial || isWebBluetooth || isWebUSB));
8078

8179
console.log("User Agent: ", navigator.userAgentData);
80+
console.log("Tauri detected: ", tauriDetected);
8281
console.log("Native: ", isNative);
8382
console.log("Chromium: ", isChromium);
8483
console.log("Web Serial: ", isWebSerial);
@@ -88,9 +87,9 @@ export function checkBrowserCompatibility() {
8887
console.log("iOS: ", isIOS());
8988
console.log("Capacitor web: ", isCapacitorWeb());
9089

91-
// if (compatible) {
92-
return true;
93-
// }
90+
if (compatible) {
91+
return true;
92+
}
9493

9594
let errorMessage = "";
9695
if (!isChromium) {

0 commit comments

Comments
 (0)