mirror of
https://git.undefined-dev.fr/Blendman974/faceclaw.git
synced 2026-11-19 21:03:09 +00:00
Merge pull request #61 from Om-Alve/voice-permission-no-activity
Don't need an Activity to check already-granted permissions
This commit is contained in:
4 files changed
+90
-1
No files matched your search
@@ -65,11 +65,16 @@ async function ensurePermissions(
|
||||
): Promise<void> {
|
||||
if (!global.isAndroid) return;
|
||||
|
||||
const activity = getActivity();
|
||||
const missing = permissions.filter((permission) => !isPermissionGranted(permission));
|
||||
|
||||
if (missing.length === 0) return;
|
||||
|
||||
// Only a request needs an Activity. Checking must not: the glasses session
|
||||
// outlives it (swiping the app away in Recents destroys the Activity while
|
||||
// the foreground service keeps the process running), and voice input
|
||||
// checks the microphone permission on every start.
|
||||
const activity = getActivity();
|
||||
|
||||
await new Promise<void>((resolve, reject) => {
|
||||
const callback = (args: {
|
||||
requestCode: number;
|
||||
|
||||
@@ -2258,6 +2258,7 @@ class DashboardController {
|
||||
.catch((error) => {
|
||||
this.appendLog(`voice permission failed: ${this.formatError(error)}`);
|
||||
if (!hasMicrophonePermission()) voiceControlBridge.reportPermissionDenied();
|
||||
else voiceControlBridge.reportStartFailed(this.formatError(error));
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@@ -199,6 +199,14 @@ export class FaceclawVoiceControlBridge {
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Capture could not be started for a reason other than a denied permission.
|
||||
* Without this the dialog keeps showing the idle "Voice control stopped."
|
||||
*/
|
||||
reportStartFailed(reason: string): void {
|
||||
this.setStatus("Voice input couldn't start.", reason);
|
||||
}
|
||||
|
||||
/** Begin push-to-talk capture (momentary; released with stopPushToTalk). */
|
||||
startPushToTalk(options: PushToTalkOptions): void {
|
||||
this.acquireCapture("ptt", options);
|
||||
|
||||
@@ -0,0 +1,75 @@
|
||||
const test = require('node:test');
|
||||
const assert = require('node:assert/strict');
|
||||
const { loader } = require('./helpers/load-typescript.cjs');
|
||||
|
||||
const GRANTED = 0;
|
||||
const DENIED = -1;
|
||||
const RECORD_AUDIO = 'android.permission.RECORD_AUDIO';
|
||||
|
||||
/**
|
||||
* app/g2/android-permissions.ts against a stubbed Android: `granted` is the set
|
||||
* of permissions already held, `activity` the foreground/start Activity. It is
|
||||
* null once the app's Activity is destroyed (swiped away in Recents) while the
|
||||
* foreground service keeps the process and the glasses session running:
|
||||
* NativeScript then clears both foregroundActivity and startActivity.
|
||||
*/
|
||||
function permissions({ granted = [], activity = null } = {}) {
|
||||
const held = new Set(granted);
|
||||
const requests = [];
|
||||
const Application = {
|
||||
android: {
|
||||
foregroundActivity: activity,
|
||||
startActivity: activity,
|
||||
activityRequestPermissionsEvent: 'activityRequestPermissions',
|
||||
on() {},
|
||||
off() {},
|
||||
},
|
||||
};
|
||||
const globals = {
|
||||
global: { isAndroid: true },
|
||||
Array: { create: (_type, length) => new Array(length) },
|
||||
android: {
|
||||
content: { pm: { PackageManager: { PERMISSION_GRANTED: GRANTED } } },
|
||||
os: { Build: { VERSION: { SDK_INT: 34 } } },
|
||||
Manifest: { permission: { BLUETOOTH_SCAN: 'android.permission.BLUETOOTH_SCAN', BLUETOOTH_CONNECT: 'android.permission.BLUETOOTH_CONNECT' } },
|
||||
},
|
||||
androidx: {
|
||||
core: {
|
||||
content: { ContextCompat: { checkSelfPermission: (_context, permission) => (held.has(permission) ? GRANTED : DENIED) } },
|
||||
app: { ActivityCompat: { requestPermissions: (requester, list, code) => requests.push({ requester, list: [...list], code }) } },
|
||||
},
|
||||
},
|
||||
};
|
||||
const load = loader(globals, {
|
||||
'@nativescript/core': { Application, Utils: { android: { getApplicationContext: () => ({}) } } },
|
||||
});
|
||||
return { api: load('app/g2/android-permissions.ts'), requests };
|
||||
}
|
||||
|
||||
test('a granted permission needs no Activity, so voice works after the app is swiped away', async () => {
|
||||
const { api, requests } = permissions({ granted: [RECORD_AUDIO], activity: null });
|
||||
await api.ensureVoicePermissions();
|
||||
assert.equal(requests.length, 0);
|
||||
});
|
||||
|
||||
test('BLE permissions that are all granted need no Activity either', async () => {
|
||||
const { api } = permissions({
|
||||
granted: ['android.permission.BLUETOOTH_SCAN', 'android.permission.BLUETOOTH_CONNECT', 'android.permission.POST_NOTIFICATIONS'],
|
||||
activity: null,
|
||||
});
|
||||
await api.ensureBlePermissions();
|
||||
});
|
||||
|
||||
test('a missing permission is requested through the Activity', async () => {
|
||||
const activity = { name: 'main' };
|
||||
const { api, requests } = permissions({ granted: [], activity });
|
||||
void api.ensureVoicePermissions();
|
||||
assert.equal(requests.length, 1);
|
||||
assert.equal(requests[0].requester, activity);
|
||||
assert.deepEqual(requests[0].list, [RECORD_AUDIO]);
|
||||
});
|
||||
|
||||
test('a missing permission with no Activity still fails, since nothing can show the prompt', async () => {
|
||||
const { api } = permissions({ granted: [], activity: null });
|
||||
await assert.rejects(api.ensureVoicePermissions(), /No Android activity/);
|
||||
});
|
||||
Reference in new issue
Block a user