murdle/fluxer
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix(app): avoid overwriting user self-mute on reload (#54)

Browse Source
This commit is contained in:
hampus-fluxer 2026-01-06 05:49:57 +01:00 committed by GitHub
parent d0ef591dd9
commit 1662839211
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fluxer_app/src/stores/LocalVoiceStateStore.tsx
View File

@ -40,6 +40,7 @@ class LocalVoiceStateStore {
private microphonePermissionGranted: boolean | null = MediaPermissionStore.isMicrophoneGranted(); private microphonePermissionGranted: boolean | null = MediaPermissionStore.isMicrophoneGranted();
private mutedByPermission = !MediaPermissionStore.isMicrophoneGranted(); private mutedByPermission = !MediaPermissionStore.isMicrophoneGranted();
private persistenceHydrationPromise: Promise<void>;
private _disposers: Array<() => void> = []; private _disposers: Array<() => void> = [];
private lastDevicePermissionStatus: VoiceDeviceState['permissionStatus'] | null = private lastDevicePermissionStatus: VoiceDeviceState['permissionStatus'] | null =
VoiceDevicePermissionStore.getState().permissionStatus; VoiceDevicePermissionStore.getState().permissionStatus;
@ -60,7 +61,8 @@ class LocalVoiceStateStore {
{autoBind: true}, {autoBind: true},
); );
this._disposers = []; this._disposers = [];
void this.initPersistence().then(() => { this.persistenceHydrationPromise = this.initPersistence();
this.persistenceHydrationPromise.then(() => {
this.enforcePermissionMuteIfNeeded(); this.enforcePermissionMuteIfNeeded();
}); });
this.initializePermissionSync(); this.initializePermissionSync();
@ -87,6 +89,7 @@ class LocalVoiceStateStore {
private async initializePermissionSync(): Promise<void> { private async initializePermissionSync(): Promise<void> {
try { try {
let defaultMuteInitialized = false; let defaultMuteInitialized = false;
await this.persistenceHydrationPromise;
const syncWithPermission = (source: 'init' | 'change') => { const syncWithPermission = (source: 'init' | 'change') => {
if (!MediaPermissionStore.isInitialized()) { if (!MediaPermissionStore.isInitialized()) {
@ -111,7 +114,7 @@ class LocalVoiceStateStore {
return; return;
} }
const shouldAutoUnmute = this.mutedByPermission && this.selfMute; const shouldAutoUnmute = this.mutedByPermission && this.selfMute && !this.hasUserSetMute;
const shouldApplyDefaultUnmute = !defaultMuteInitialized && !this.hasUserSetMute && this.selfMute; const shouldApplyDefaultUnmute = !defaultMuteInitialized && !this.hasUserSetMute && this.selfMute;
if (shouldAutoUnmute || shouldApplyDefaultUnmute) { if (shouldAutoUnmute || shouldApplyDefaultUnmute) {
@ -156,7 +159,7 @@ class LocalVoiceStateStore {
this.lastDevicePermissionStatus = status; this.lastDevicePermissionStatus = status;
if (status === 'granted') { if (status === 'granted') {
this.applyPermissionGrant(); void this.applyPermissionGrant();
} else if (status === 'denied') { } else if (status === 'denied') {
this.applyPermissionMute(); this.applyPermissionMute();
} }
@ -190,7 +193,8 @@ class LocalVoiceStateStore {
} }
} }
private applyPermissionGrant(): void { private async applyPermissionGrant(): Promise<void> {
await this.persistenceHydrationPromise;
runInAction(() => { runInAction(() => {
this.microphonePermissionGranted = true; this.microphonePermissionGranted = true;
if (this.mutedByPermission && this.selfMute && !this.hasUserSetMute) { if (this.mutedByPermission && this.selfMute && !this.hasUserSetMute) {