build: add script to build android locally

Puts the denoise bool into an AudioSettings struct in the model state, and persists changes to user state.

Co-authored-by: Sam Sartor <me@samsartor.com>
Co-committed-by: Sam Sartor <me@samsartor.com>

docker/build-android-local.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+set -euo pipefail
+
+SCRIPT_DIR="$(dirname "$(realpath "${BASH_SOURCE[0]}")")"
+PROJECT_ROOT="$(dirname "$SCRIPT_DIR")"
+IMAGE_NAME="mumble-web2/android-release-builder:local"
+
+TARGET="${1:-aarch64-linux-android}"
+
+echo "==> Building Android builder Docker image..."
+docker build -t "$IMAGE_NAME" -f "$SCRIPT_DIR/android-release-builder.Dockerfile" "$PROJECT_ROOT"
+
+echo "==> Building Android APK (target: $TARGET)..."
+docker run --rm \
+    -v "$PROJECT_ROOT:/app" \
+    -w /app \
+    "$IMAGE_NAME" \
+    dx build --platform android --target "$TARGET" --release -p mumble-web2-gui
+
+echo "==> Done! APK should be at:"
+echo "    target/dx/mumble-web2-gui/release/android/app/app/build/outputs/apk/debug/app-debug.apk"

gui/assets/main.scss

@@ -16,6 +16,7 @@ body {
 }
 
 #main {
+  visibility: visible;
   height: 100vh;
   display: flex;
   flex-direction: column;

gui/src/app.rs

@@ -5,12 +5,14 @@ use mime_guess::Mime;
 use mumble_web2_common::{ProxyOverrides, ServerStatus};
 use ordermap::OrderSet;
 use std::collections::{HashMap, HashSet};
+use std::{fmt, sync::Arc};
 
 use crate::imp::{ConfigSystem, ConfigSystemInterface as _, Platform, PlatformInterface as _};
 
 pub type ChannelId = u32;
 pub type UserId = u32;
 
+#[derive(Debug)]
 pub enum ConnectionState {
     Disconnected,
     Connecting,
@@ -18,6 +20,11 @@ pub enum ConnectionState {
     Failed(String),
 }
 
+#[derive(Debug, Clone)]
+pub struct AudioSettings {
+    pub denoise: bool,
+}
+
 #[derive(Debug)]
 pub enum Command {
     Connect {
@@ -45,16 +52,14 @@ pub enum Command {
         channel: ChannelId,
         user: UserId,
     },
-    UpdateMicEffects {
-        denoise: bool,
-    },
+    UpdateAudioSettings(AudioSettings),
     Disconnect,
 }
 
 use Command::*;
 use ConnectionState::*;
 
-#[derive(Default)]
+#[derive(Default, Debug)]
 pub struct UserState {
     pub name: String,
     pub channel: ChannelId,
@@ -79,13 +84,14 @@ impl UserState {
     }
 }
 
+#[derive(Debug)]
 pub struct Chat {
     pub raw: String,
     pub dangerous_html: String,
     pub sender: Option<UserId>,
 }
 
-#[derive(Default)]
+#[derive(Default, Debug)]
 pub struct ChannelState {
     pub name: String,
     pub children: OrderSet<ChannelId>,
@@ -111,7 +117,7 @@ impl ChannelState {
     }
 }
 
-#[derive(Default)]
+#[derive(Default, Debug)]
 pub struct ChannelsState {
     pub channels: HashMap<ChannelId, ChannelState>,
 }
@@ -198,7 +204,7 @@ impl ChannelsState {
     }
 }
 
-#[derive(Default)]
+#[derive(Default, Debug)]
 pub struct ServerState {
     pub channels_state: ChannelsState,
     pub users: HashMap<UserId, UserState>,
@@ -213,14 +219,21 @@ impl ServerState {
 }
 
 pub struct State {
-    pub status: GlobalSignal<ConnectionState>,
-    pub server: GlobalSignal<ServerState>,
+    pub status: Signal<ConnectionState>,
+    pub server: Signal<ServerState>,
+    pub audio: Signal<AudioSettings>,
 }
 
-pub static STATE: State = State {
-    status: Signal::global(|| Disconnected),
-    server: Signal::global(|| Default::default()),
-};
+impl fmt::Debug for State {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_struct("State")
+            .field("status", &self.status.read())
+            .field("server", &self.server.read())
+            .finish()
+    }
+}
+
+pub type SharedState = Arc<State>;
 
 #[derive(Clone, Copy, PartialEq, Eq)]
 pub enum UserIcon {
@@ -267,7 +280,8 @@ pub fn UserPill(name: String, icon: UserIcon, isself: bool) -> Element {
 
 #[component]
 pub fn User(id: UserId) -> Element {
-    let server = STATE.server.read();
+    let state = use_context::<SharedState>();
+    let server = state.server.read();
     match server.users.get(&id) {
         Some(state) => rsx!(UserPill {
             name: state.name.clone(),
@@ -285,7 +299,8 @@ pub fn User(id: UserId) -> Element {
 #[component]
 pub fn Channel(id: ChannelId) -> Element {
     let net: Coroutine<Command> = use_coroutine_handle();
-    let server = STATE.server.read();
+    let state = use_context::<SharedState>();
+    let server = state.server.read();
     let user = server.session.unwrap();
     let Some(state) = server.channels_state.channels.get(&id) else {
         return rsx!("missing channel {id}");
@@ -354,7 +369,8 @@ pub fn Channel(id: ChannelId) -> Element {
 
 #[cfg(any(feature = "desktop", feature = "web"))]
 pub fn pick_and_send_file(net: &Coroutine<Command>) {
-    let channels = if let Some(user) = STATE.server.read().this_user() {
+    let state = use_context::<SharedState>();
+    let channels = if let Some(user) = state.server.read().this_user() {
         vec![user.channel]
     } else {
         return;
@@ -380,11 +396,14 @@ pub fn pick_and_send_file(net: &Coroutine<Command>) {}
 #[component]
 pub fn ChatView() -> Element {
     let net: Coroutine<Command> = use_coroutine_handle();
-    let server = STATE.server.read();
+    let state = use_context::<SharedState>();
+    let server = state.server.read();
     let mut draft = use_signal(|| "".to_string());
 
     let mut do_send = move || {
-        if let Some(user) = STATE.server.read().this_user() {
+        let state = use_context::<SharedState>();
+        let server = state.server.read();
+        if let Some(user) = server.this_user() {
             net.send(SendChat {
                 markdown: draft.write().split_off(0),
                 channels: vec![user.channel],
@@ -456,8 +475,10 @@ pub fn ChatView() -> Element {
 #[component]
 pub fn ControlView(overrides: Resource<ProxyOverrides>) -> Element {
     let net: Coroutine<Command> = use_coroutine_handle();
-    let status = &STATE.status;
-    let server = STATE.server.read();
+    let state = use_context::<SharedState>();
+    let status = &state.status;
+    let server = state.server.read();
+    let audio = state.audio.read();
     let Some(&UserState {
         deaf,
         self_deaf,
@@ -555,7 +576,6 @@ pub fn ControlView(overrides: Resource<ProxyOverrides>) -> Element {
         },
     };
 
-    let denoise = use_signal(|| false);
     rsx!(
         // Server control
         div {
@@ -596,18 +616,23 @@ pub fn ControlView(overrides: Resource<ProxyOverrides>) -> Element {
             }
             span { class: "spacer" }
             button {
-                class: match denoise() {
+                class: match audio.denoise {
                     true => "toggle_button is_on",
                     false => "toggle_button",
                 },
                 role: "switch",
-                aria_checked: denoise(),
+                aria_checked: audio.denoise,
                 onclick: move |_| {
-                    let new_denoise = !denoise();
-                    *denoise.write_unchecked() = new_denoise;
-                    net.send(UpdateMicEffects { denoise: new_denoise })
+                    let state = use_context::<SharedState>();
+                    let mut audio = state.audio.read().clone();
+                    audio.denoise = !audio.denoise;
+                    let denoise = audio.denoise;
+                    *state.audio.write_unchecked() = audio;
+                    net.send(UpdateAudioSettings(AudioSettings { denoise: denoise }));
+                    let user_config = use_context::<ConfigSystem>();
+                    user_config.config_set::<bool>("denoise", &denoise);
                 },
-                match denoise() {
+                match audio.denoise {
                     true => rsx!(span { class: "material-symbols-outlined", "cadence"}),
                     false => rsx!(span { class: "material-symbols-outlined", "graphic_eq"}),
                 }
@@ -645,9 +670,10 @@ pub fn ControlView(overrides: Resource<ProxyOverrides>) -> Element {
 }
 
 #[component]
-pub fn ServerView(overrides: Resource<ProxyOverrides>, user_config: ConfigSystem) -> Element {
+pub fn ServerView(overrides: Resource<ProxyOverrides>) -> Element {
     let net: Coroutine<Command> = use_coroutine_handle();
-    let server = STATE.server.read();
+    let state = use_context::<SharedState>();
+    let server = state.server.read();
     let Some(&UserState {
         deaf,
         self_deaf,
@@ -683,7 +709,8 @@ pub fn ServerView(overrides: Resource<ProxyOverrides>, user_config: ConfigSystem
 }
 
 #[component]
-pub fn LoginView(overrides: Resource<ProxyOverrides>, user_config: ConfigSystem) -> Element {
+pub fn LoginView(overrides: Resource<ProxyOverrides>) -> Element {
+    let user_config = use_context::<ConfigSystem>();
     let net: Coroutine<Command> = use_coroutine_handle();
 
     let last_status = use_signal(|| None::<color_eyre::Result<ServerStatus>>);
@@ -706,8 +733,11 @@ pub fn LoginView(overrides: Resource<ProxyOverrides>, user_config: ConfigSystem)
         }
     });
 
-    let previous_username = user_config.config_get::<String>("username");
-    let mut username = use_signal(|| previous_username.unwrap_or(String::new()));
+    let mut username = use_signal(|| {
+        user_config
+            .config_get::<String>("username")
+            .unwrap_or(String::new())
+    });
 
     let do_connect = move |_| {
         let _ = user_config.config_set::<String>("username", &username.read());
@@ -720,7 +750,8 @@ pub fn LoginView(overrides: Resource<ProxyOverrides>, user_config: ConfigSystem)
             config: overrides.read().clone().unwrap_or_default(),
         })
     };
-    let status = &STATE.status;
+    let state = use_context::<SharedState>();
+    let status = &state.status;
     let bottom = match &*status.read() {
         Disconnected => rsx! {
             button {
@@ -854,10 +885,29 @@ pub fn LoginView(overrides: Resource<ProxyOverrides>, user_config: ConfigSystem)
     //    )
 }
 
+#[component]
 pub fn app() -> Element {
     static STYLE: Asset = asset!("/assets/main.scss");
 
-    use_coroutine(|rx: UnboundedReceiver<Command>| super::network_entrypoint(rx));
+    use_effect(|| {
+        Platform::request_permissions();
+    });
+
+    let user_config = use_root_context(|| ConfigSystem::new().unwrap());
+    let state = use_root_context(|| {
+        SharedState::new(State {
+            status: Signal::new(Disconnected),
+            server: Signal::new(Default::default()),
+            audio: Signal::new(AudioSettings {
+                denoise: user_config.config_get::<bool>("denoise").unwrap_or(true),
+            }),
+        })
+    });
+
+    let network_state = state.clone();
+    use_coroutine(move |rx: UnboundedReceiver<Command>| {
+        super::network_entrypoint(rx, network_state.clone())
+    });
     let overrides = use_resource(|| async move {
         match Platform::load_proxy_overrides().await {
             Ok(overrides) => overrides,
@@ -865,18 +915,14 @@ pub fn app() -> Element {
         }
     });
 
-    let user_config = ConfigSystem::new().unwrap();
-
-    Platform::request_permissions();
-
     rsx!(
         document::Link{ rel: "stylesheet", href: "https://fonts.googleapis.com/css2?family=Nunito:ital,wght@0,200..1000;1,200..1000&display=swap" }
         document::Link{ rel: "stylesheet", href: "https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:opsz,wght,FILL,GRAD@20..48,100..700,0..1,-50..200" }
         document::Link{ rel: "stylesheet", href: STYLE }
 
-        match *STATE.status.read() {
-            Connected => rsx!(ServerView { overrides, user_config }),
-            _ => rsx!(LoginView { overrides, user_config }),
+        match *state.status.read() {
+            Connected => rsx!(ServerView { overrides }),
+            _ => rsx!(LoginView { overrides }),
         }
     )
 }

gui/src/imp/connect.rs

@@ -1,4 +1,4 @@
-use crate::app::Command;
+use crate::app::{Command, SharedState};
 use color_eyre::eyre::{bail, Error};
 use dioxus::hooks::UnboundedReceiver;
 use mumble_protocol::control::ClientControlCodec;
@@ -74,6 +74,7 @@ pub async fn network_connect(
     username: String,
     event_rx: &mut UnboundedReceiver<Command>,
     overrides: &ProxyOverrides,
+    state: SharedState,
 ) -> Result<(), Error> {
     info!("connecting");
 
@@ -102,7 +103,7 @@ pub async fn network_connect(
     let reader = asynchronous_codec::FramedRead::new(read_server.compat(), read_codec);
     let writer = asynchronous_codec::FramedWrite::new(write_server.compat_write(), write_codec);
 
-    crate::network_loop(username, event_rx, reader, writer).await
+    crate::network_loop(username, state, event_rx, reader, writer).await
 }
 
 pub async fn get_status(client: &reqwest::Client) -> color_eyre::Result<ServerStatus> {

gui/src/imp/desktop.rs

@@ -1,9 +1,7 @@
-use crate::app::Command;
+use crate::app::{Command, SharedState};
 use color_eyre::eyre::Error;
 use dioxus::hooks::UnboundedReceiver;
-use etcetera::{choose_app_strategy, AppStrategy, AppStrategyArgs};
 use mumble_web2_common::{ProxyOverrides, ServerStatus};
-use std::collections::HashMap;
 use std::time::Duration;
 
 /// Desktop platform implementation using Tokio and native audio.
@@ -30,8 +28,9 @@ impl super::PlatformInterface for DesktopPlatform {
         username: String,
         event_rx: &mut UnboundedReceiver<Command>,
         overrides: &ProxyOverrides,
+        state: SharedState,
     ) -> Result<(), Error> {
-        super::connect::network_connect(address, username, event_rx, overrides).await
+        super::connect::network_connect(address, username, event_rx, overrides, state).await
     }
 
     async fn get_status(client: &reqwest::Client) -> color_eyre::Result<ServerStatus> {

gui/src/imp/mobile.rs

@@ -1,4 +1,4 @@
-use crate::app::Command;
+use crate::app::{Command, SharedState};
 use color_eyre::eyre::Error;
 use dioxus::hooks::UnboundedReceiver;
 use mumble_web2_common::{ProxyOverrides, ServerStatus};
@@ -24,8 +24,9 @@ impl super::PlatformInterface for MobilePlatform {
         username: String,
         event_rx: &mut UnboundedReceiver<Command>,
         overrides: &ProxyOverrides,
+        state: SharedState,
     ) -> Result<(), Error> {
-        super::connect::network_connect(address, username, event_rx, overrides).await
+        super::connect::network_connect(address, username, event_rx, overrides, state).await
     }
 
     async fn get_status(client: &reqwest::Client) -> color_eyre::Result<ServerStatus> {

gui/src/imp/mod.rs

@@ -4,7 +4,8 @@
 //! The traits make the platform boundary explicit and provide compile-time verification.
 #![allow(async_fn_in_trait)]
 
-use crate::{app::Command, effects::AudioProcessor};
+use crate::app::{Command, SharedState};
+use crate::effects::AudioProcessor;
 use color_eyre::eyre::Error;
 use dioxus::hooks::UnboundedReceiver;
 use mumble_web2_common::{ProxyOverrides, ServerStatus};
@@ -51,7 +52,7 @@ pub trait AudioPlayerInterface {
     fn play_opus(&mut self, payload: &[u8]);
 }
 
-pub trait ConfigSystemInterface: Sized {
+pub trait ConfigSystemInterface: Sized + Clone {
     fn new() -> Result<Self, Error>;
 
     fn config_get<T>(&self, key: &str) -> Option<T>
@@ -82,6 +83,7 @@ pub trait PlatformInterface {
         username: String,
         event_rx: &mut UnboundedReceiver<Command>,
         proxy_overrides: &ProxyOverrides,
+        state: SharedState,
     ) -> impl Future<Output = Result<(), Error>>;
 
     /// Get server status (user count, version, etc.).

gui/src/imp/native_config.rs

@@ -1,10 +1,6 @@
-use crate::app::Command;
 use color_eyre::eyre::Error;
-use dioxus::hooks::UnboundedReceiver;
-use mumble_web2_common::ServerStatus;
 use std::collections::HashMap;
-use std::time::Duration;
-use tracing::{error, info, warn};
+use tracing::info;
 
 #[derive(Clone, PartialEq)]
 pub struct NativeConfigSystem {

gui/src/imp/stub.rs

@@ -1,6 +1,6 @@
 /// Stub implementation of the platform interface, so that we can
 /// `cargo check` without any --feature flags.
-use crate::effects::AudioProcessor;
+use crate::{app::SharedState, effects::AudioProcessor};
 use color_eyre::eyre::Error;
 use dioxus::hooks::UnboundedReceiver;
 use mumble_web2_common::{ProxyOverrides, ServerStatus};
@@ -25,6 +25,7 @@ impl super::PlatformInterface for StubPlatform {
         _username: String,
         _event_rx: &mut UnboundedReceiver<crate::app::Command>,
         _overrides: &ProxyOverrides,
+        _state: SharedState,
     ) -> impl Future<Output = Result<(), Error>> {
         async { panic!("stubbed platform") }
     }
@@ -77,6 +78,7 @@ impl super::AudioPlayerInterface for StubAudioPlayer {
     }
 }
 
+#[derive(Clone)]
 pub struct StubConfigSystem;
 
 impl super::ConfigSystemInterface for StubConfigSystem {

gui/src/imp/web.rs

@@ -1,4 +1,4 @@
-use crate::app::Command;
+use crate::app::{Command, SharedState};
 use crate::effects::{AudioProcessor, AudioProcessorSender, TransmitState};
 use color_eyre::eyre::{bail, eyre, Error};
 use crossbeam::atomic::AtomicCell;
@@ -111,8 +111,9 @@ impl super::PlatformInterface for WebPlatform {
         username: String,
         event_rx: &mut UnboundedReceiver<Command>,
         overrides: &ProxyOverrides,
+        state: SharedState,
     ) -> Result<(), Error> {
-        network_connect(address, username, event_rx, overrides).await
+        network_connect(address, username, event_rx, overrides, state).await
     }
 
     async fn get_status(client: &reqwest::Client) -> color_eyre::Result<ServerStatus> {
@@ -434,6 +435,7 @@ pub async fn network_connect(
     username: String,
     event_rx: &mut UnboundedReceiver<Command>,
     overrides: &ProxyOverrides,
+    state: SharedState,
 ) -> Result<(), Error> {
     info!("connecting");
 
@@ -492,7 +494,7 @@ pub async fn network_connect(
     let writer =
         asynchronous_codec::FramedWrite::new(wasm_stream_writable.into_async_write(), write_codec);
 
-    crate::network_loop(username, event_rx, reader, writer).await
+    crate::network_loop(username, state, event_rx, reader, writer).await
 }
 
 pub fn absolute_url(path: &str) -> Result<Url, Error> {

gui/src/lib.rs

@@ -1,7 +1,6 @@
 use app::Chat;
 use app::Command;
 use app::ConnectionState;
-use app::STATE;
 use asynchronous_codec::FramedRead;
 use asynchronous_codec::FramedWrite;
 use color_eyre::eyre::{bail, Error};
@@ -27,6 +26,9 @@ use std::time::Duration;
 use tracing::error;
 use tracing::info;
 
+use crate::app::AudioSettings;
+use crate::app::SharedState;
+use crate::app::State;
 use crate::effects::AudioProcessor;
 use crate::imp::{
     AudioPlayer, AudioPlayerInterface as _, AudioSystem, AudioSystemInterface as _, Platform,
@@ -38,7 +40,7 @@ mod effects;
 pub mod imp;
 mod msghtml;
 
-pub async fn network_entrypoint(mut event_rx: UnboundedReceiver<Command>) {
+pub async fn network_entrypoint(mut event_rx: UnboundedReceiver<Command>, state: SharedState) {
     loop {
         let Some(Command::Connect {
             address,
@@ -49,25 +51,29 @@ pub async fn network_entrypoint(mut event_rx: UnboundedReceiver<Command>) {
             panic!("did not receive connect command")
         };
 
-        *STATE.server.write() = Default::default();
-        *STATE.status.write() = ConnectionState::Connecting;
+        *state.server.write_unchecked() = Default::default();
+        *state.status.write_unchecked() = ConnectionState::Connecting;
         if let Err(error) =
-            Platform::network_connect(address, username, &mut event_rx, &config).await
+            Platform::network_connect(address, username, &mut event_rx, &config, state.clone())
+                .await
         {
             error!("could not connect {:?}", error);
-            *STATE.status.write() = ConnectionState::Failed(error.to_string());
+            *state.status.write_unchecked() = ConnectionState::Failed(error.to_string());
         } else {
-            *STATE.status.write() = ConnectionState::Disconnected;
+            *state.status.write_unchecked() = ConnectionState::Disconnected;
         }
     }
 }
 
 pub async fn network_loop<R: AsyncRead + Unpin + 'static, W: AsyncWrite + Unpin + 'static>(
     username: String,
+    state: SharedState,
     event_rx: &mut UnboundedReceiver<Command>,
     mut reader: FramedRead<R, ControlCodec<Serverbound, Clientbound>>,
     mut writer: FramedWrite<W, ControlCodec<Serverbound, Clientbound>>,
 ) -> Result<(), Error> {
+    let audio_settings = state.audio.read().clone();
+
     let (mut send_chan, mut writer_recv_chan) = futures_channel::mpsc::unbounded();
     spawn(async move {
         while let Some(msg) = writer_recv_chan.next().await {
@@ -117,10 +123,13 @@ pub async fn network_loop<R: AsyncRead + Unpin + 'static, W: AsyncWrite + Unpin
     }
 
     let mut audio = AudioSystem::new().await?;
+    if audio_settings.denoise {
+        audio.set_processor(AudioProcessor::new_denoising());
+    }
     {
         let send_chan = send_chan.clone();
         let mut sequence_num = 0;
-        audio.start_recording(move |opus_frame, is_terminator| {
+        if let Err(err) = audio.start_recording(move |opus_frame, is_terminator| {
             let _ =
                 send_chan.unbounded_send(ControlPacket::UDPTunnel(Box::new(VoicePacket::Audio {
                     _dst: std::marker::PhantomData,
@@ -131,7 +140,9 @@ pub async fn network_loop<R: AsyncRead + Unpin + 'static, W: AsyncWrite + Unpin
                     position_info: None,
                 })));
             sequence_num = sequence_num.wrapping_add(2);
-        });
+        }) {
+            error!("could not begin recording: {err:?}")
+        }
     }
 
     // Create map of session_id -> AudioDecoder
@@ -149,7 +160,7 @@ pub async fn network_loop<R: AsyncRead + Unpin + 'static, W: AsyncWrite + Unpin
                         if !matches!(msg, ControlPacket::UDPTunnel(_) | ControlPacket::Ping(_)) {
                             info!("receiving packet {:#?}", msg);
                         }
-                        let res = accept_packet(msg, &mut audio, &mut decoder_map);
+                        let res = accept_packet(msg, &mut audio, &mut decoder_map, &state);
                         if let Err(err) = res {
                             error!("error accepting packet {:?}", err)
                         }
@@ -168,7 +179,7 @@ pub async fn network_loop<R: AsyncRead + Unpin + 'static, W: AsyncWrite + Unpin
                 match command {
                     Some(Command::Disconnect) => break,
                     Some(command) => {
-                        let res = accept_command(command, &mut send_chan, &mut audio);
+                        let res = accept_command(command, &mut send_chan, &mut audio, &state);
                         if let Err(err) = res {
                             info!("error accepting command {:?}", err)
                         }
@@ -187,9 +198,10 @@ fn accept_command(
     command: Command,
     send_chan: &mut UnboundedSender<ControlPacket<mumble_protocol::Serverbound>>,
     audio: &mut AudioSystem,
+    state: &State,
 ) -> Result<(), Error> {
     use Command::*;
-    let Some(session) = STATE.server.read().session else {
+    let Some(session) = state.server.read().session else {
         bail!("no session id")
     };
 
@@ -212,7 +224,7 @@ fn accept_command(
             };
 
             {
-                let mut server = STATE.server.write();
+                let mut server = state.server.write_unchecked();
                 let Some(me) = server.session else {
                     bail!("not signed in with a session id")
                 };
@@ -253,7 +265,7 @@ fn accept_command(
             };
 
             {
-                let mut server = STATE.server.write();
+                let mut server = state.server.write_unchecked();
                 let Some(me) = server.session else {
                     bail!("not signed in with a session id")
                 };
@@ -288,7 +300,7 @@ fn accept_command(
             let _ = send_chan.unbounded_send(u.into());
         }
         Connect { .. } | Disconnect => (),
-        UpdateMicEffects { denoise } => {
+        UpdateAudioSettings(AudioSettings { denoise }) => {
             if denoise {
                 audio.set_processor(AudioProcessor::new_denoising());
             } else {
@@ -304,6 +316,7 @@ fn accept_packet(
     msg: ControlPacket<mumble_protocol::Clientbound>,
     audio_context: &mut AudioSystem,
     player_map: &mut HashMap<u32, AudioPlayer>,
+    state: &State,
 ) -> Result<(), Error> {
     match msg {
         ControlPacket::UDPTunnel(u) => {
@@ -340,15 +353,15 @@ fn accept_packet(
             }
         }
         ControlPacket::ChannelState(u) => {
-            let mut server = STATE.server.write();
+            let mut server = state.server.write_unchecked();
             server.channels_state.update_from_channel_state(&u);
         }
         ControlPacket::ChannelRemove(u) => {
-            let mut server = STATE.server.write();
+            let mut server = state.server.write_unchecked();
             server.channels_state.update_from_channel_remove(&u);
         }
         ControlPacket::UserState(u) => {
-            let mut server = STATE.server.write();
+            let mut server = state.server.write_unchecked();
             let server = &mut *server;
             let id = u.get_session();
 
@@ -392,7 +405,7 @@ fn accept_packet(
             }
         }
         ControlPacket::UserRemove(u) => {
-            let mut server = STATE.server.write();
+            let mut server = state.server.write_unchecked();
             let id = u.get_session();
             if let Some(state) = server.users.remove(&id) {
                 if let Some(parent) = server.channels_state.channels.get_mut(&state.channel) {
@@ -401,7 +414,7 @@ fn accept_packet(
             }
         }
         ControlPacket::TextMessage(u) => {
-            let mut server = STATE.server.write();
+            let mut server = state.server.write_unchecked();
             if u.has_message() {
                 let text = u.get_message().to_string();
                 server.chat.push(Chat {
@@ -416,8 +429,8 @@ fn accept_packet(
             }
         }
         ControlPacket::ServerSync(u) => {
-            *STATE.status.write() = ConnectionState::Connected;
-            let mut server = STATE.server.write();
+            *state.status.write_unchecked() = ConnectionState::Connected;
+            let mut server = state.server.write_unchecked();
             if u.has_welcome_text() {
                 let text = u.get_welcome_text().to_string();
                 server.chat.push(Chat {

gui/src/main.rs

@@ -1,6 +1,22 @@
+use dioxus::prelude::*;
 use mumble_web2_gui::{app, imp::Platform, imp::PlatformInterface as _};
 
 pub fn main() {
     Platform::init_logging();
-    dioxus::launch(app::app);
+    dioxus::LaunchBuilder::new()
+        .with_cfg(desktop! {
+            dioxus::desktop::Config::new()
+            // Reduce white flash on startup by setting background color and hiding main element
+            .with_background_color((0, 0, 0, 255))
+            .with_custom_head("<style>html, body { background: black; } #main { visibility: hidden; }</style>".into())
+            .with_disable_context_menu(cfg!(not(debug_assertions)))
+            .with_window(
+                dioxus::desktop::WindowBuilder::new()
+                    .with_title("Mumble Web 2")
+                    .with_min_inner_size(dioxus::desktop::LogicalSize::new(600.0, 300.0))
+                    .with_inner_size(dioxus::desktop::LogicalSize::new(900.0, 700.0))
+                    .with_maximized(false),
+            )
+        })
+        .launch(app::app);
 }