Xetibo/ReSet
1
0
Fork 0
mirror of https://github.com/Xetibo/ReSet.git synced 2025-04-17 10:18:32 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: Use connect instead of pairing, as pairing does nothing currently

Browse source
This commit is contained in:
Fabio Lenherr / DashieTM 2023-12-03 22:37:01 +01:00
parent 736bcb8e4d
commit c5fb9611c9
3 changed files with 45 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Cargo.toml
View file

@ -5,7 +5,7 @@ edition = "2021"
description = "A wip universal Linux settings application." description = "A wip universal Linux settings application."
[dependencies] [dependencies]
reset_daemon = "0.3.6" reset_daemon = "0.3.7"
ReSet-Lib = "0.6.1" ReSet-Lib = "0.6.1"
adw = { version = "0.5.3", package = "libadwaita", features = ["v1_4"] } adw = { version = "0.5.3", package = "libadwaita", features = ["v1_4"] }
dbus = "0.9.7" dbus = "0.9.7"

26
src/components/bluetooth/bluetoothBox.rs
View file

@ -44,6 +44,7 @@ fn setupCallbacks(
listeners: Arc<Listeners>, listeners: Arc<Listeners>,
bluetooth_box: Arc<BluetoothBox>, bluetooth_box: Arc<BluetoothBox>,
) -> Arc<BluetoothBox> { ) -> Arc<BluetoothBox> {
let bluetooth_box_ref = bluetooth_box.clone();
let imp = bluetooth_box.imp(); let imp = bluetooth_box.imp();
// let bluetooth_box_ref = bluetooth_box.clone(); // let bluetooth_box_ref = bluetooth_box.clone();
imp.resetVisibility.set_activatable(true); imp.resetVisibility.set_activatable(true);
@ -55,11 +56,18 @@ fn setupCallbacks(
.set_action_name(Some("navigation.pop")); .set_action_name(Some("navigation.pop"));
// TODO add a manual search button here // TODO add a manual search button here
imp.resetBluetoothSwitch.connect_state_set(move |_, state| { imp.resetBluetoothSwitch.connect_state_set(move |_, state| {
// TODO restart bluetooth search here.
if !state { if !state {
let imp = bluetooth_box_ref.imp();
imp.resetBluetoothConnectedDevices.remove_all();
listeners.bluetooth_listener.store(false, Ordering::SeqCst); listeners.bluetooth_listener.store(false, Ordering::SeqCst);
set_adapter_enabled(
imp.resetCurrentBluetoothAdapter.borrow().path.clone(),
false,
);
} else { } else {
listeners.bluetooth_listener.store(true, Ordering::SeqCst); let imp = bluetooth_box_ref.imp();
set_adapter_enabled(imp.resetCurrentBluetoothAdapter.borrow().path.clone(), true);
start_bluetooth_listener(listeners.clone(), bluetooth_box_ref.clone());
} }
glib::Propagation::Proceed glib::Propagation::Proceed
}); });
@ -320,3 +328,17 @@ fn set_bluetooth_adapter(path: Path<'static>) {
let _: Result<(Vec<BluetoothAdapter>,), Error> = let _: Result<(Vec<BluetoothAdapter>,), Error> =
proxy.method_call("org.Xetibo.ReSetBluetooth", "SetBluetoothAdapter", (path,)); proxy.method_call("org.Xetibo.ReSetBluetooth", "SetBluetoothAdapter", (path,));
} }
fn set_adapter_enabled(path: Path<'static>, enabled: bool) {
let conn = Connection::new_session().unwrap();
let proxy = conn.with_proxy(
"org.Xetibo.ReSetDaemon",
"/org/Xetibo/ReSetDaemon",
Duration::from_millis(1000),
);
let _: Result<(Vec<BluetoothAdapter>,), Error> = proxy.method_call(
"org.Xetibo.ReSetBluetooth",
"SetBluetoothAdapterEnabled",
(path, enabled),
);
}

39
src/components/bluetooth/bluetoothEntry.rs
View file

@ -49,15 +49,16 @@ impl BluetoothEntry {
}); });
let gesture = GestureClick::new(); let gesture = GestureClick::new();
let connected = device.connected; let connected = device.connected;
let paired = device.paired; // let paired = device.paired;
// paired is not what we think
// TODO implement paired
let path = device.path.clone(); let path = device.path.clone();
gesture.connect_released(move |_, _, _, _| { gesture.connect_released(move |_, _, _, _| {
connect_to_device(path.clone());
if connected { if connected {
disconnect_from_device(path.clone()); disconnect_from_device(path.clone());
} else if paired {
connect_to_device(path.clone());
} else { } else {
pair_with_device(path.clone()); connect_to_device(path.clone());
} }
}); });
entry.add_controller(gesture); entry.add_controller(gesture);
@ -81,21 +82,21 @@ fn connect_to_device(path: Path<'static>) {
}); });
} }
fn pair_with_device(path: Path<'static>) { // fn pair_with_device(path: Path<'static>) {
gio::spawn_blocking(move || { // gio::spawn_blocking(move || {
let conn = Connection::new_session().unwrap(); // let conn = Connection::new_session().unwrap();
let proxy = conn.with_proxy( // let proxy = conn.with_proxy(
"org.Xetibo.ReSetDaemon", // "org.Xetibo.ReSetDaemon",
"/org/Xetibo/ReSetDaemon", // "/org/Xetibo/ReSetDaemon",
Duration::from_millis(1000), // Duration::from_millis(1000),
); // );
let _: Result<(bool,), Error> = proxy.method_call( // let _: Result<(bool,), Error> = proxy.method_call(
"org.Xetibo.ReSetBluetooth", // "org.Xetibo.ReSetBluetooth",
"PairWithBluetoothDevice", // "PairWithBluetoothDevice",
(path,), // (path,),
); // );
}); // });
} // }
fn disconnect_from_device(path: Path<'static>) { fn disconnect_from_device(path: Path<'static>) {
gio::spawn_blocking(move || { gio::spawn_blocking(move || {