Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb339a66 authored by Sonny Sasaka's avatar Sonny Sasaka
Browse files

floss: Refactor create_adapter_proxy 

create_adapter_proxy is better to be a method instead of associated
function because it operates on itself. Additionally, passing i32 is
simpler to be done by value instead of by reference.

Bug: 199213563
Tag: #floss
Test: Manual

Change-Id: I5f34aaf93f69e9be02223ee3ccfa5c778417f9fd
parent eebc450a

system/gd/rust/linux/client/src/main.rs

+7 −7
Original line number Diff line number Diff line
@@ -92,15 +92,15 @@ impl ClientContext { 
    }



    // Creates adapter proxy, registers callbacks and initializes address.

    fn create_adapter_proxy(context: Arc<Mutex<ClientContext>>, idx: &i32) {

        let conn = context.lock().unwrap().dbus_connection.clone();

        let cr = context.lock().unwrap().dbus_crossroads.clone();

    fn create_adapter_proxy(&mut self, idx: i32) {

        let conn = self.dbus_connection.clone();

        let cr = self.dbus_crossroads.clone();



        let dbus = BluetoothDBus::new(conn, cr, *idx);

        context.lock().unwrap().adapter_dbus = Some(dbus);

        let dbus = BluetoothDBus::new(conn, cr, idx);

        self.adapter_dbus = Some(dbus);



        // Trigger callback registration in the foreground

        let fg = context.lock().unwrap().fg.clone();

        let fg = self.fg.clone();

        tokio::spawn(async move {

            let objpath = String::from("/org/chromium/bluetooth/client/bluetooth_callback");

            let _ = fg.send(ForegroundActions::RegisterAdapterCallback(objpath)).await;
@@ -151,7 +151,7 @@ impl IBluetoothManagerCallback for BtManagerCallback { 
            self.context.lock().unwrap().enabled = enabled;

            self.context.lock().unwrap().adapter_ready = false;

            if enabled {

                ClientContext::create_adapter_proxy(self.context.clone(), &hci_interface);

                self.context.lock().unwrap().create_adapter_proxy(hci_interface);

            } else {

                self.context.lock().unwrap().adapter_dbus = None;

            }