From 2e2d536dc8e6507a22986f4c5b192f204c66813b Mon Sep 17 00:00:00 2001 From: nworbnhoj Date: Wed, 20 Dec 2023 14:36:59 +1100 Subject: [PATCH] stub libsignal::ProvisioningUuid --- apps/sigchat/src/manager.rs | 5 ++--- apps/sigchat/src/manager/libsignal.rs | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/apps/sigchat/src/manager.rs b/apps/sigchat/src/manager.rs index 50e9e5575..ff678cab8 100644 --- a/apps/sigchat/src/manager.rs +++ b/apps/sigchat/src/manager.rs @@ -154,13 +154,12 @@ impl Manager { log::info!("provisioning websocket established to {host}"); match ws.read() { Ok(Message::Binary(uuid)) => { - log::info!("raw uuid ProtoBuffer: {:?}", uuid); - let uuid = "TODO decode uuid ProtoBuffer"; + let uuid = libsignal::ProvisioningUuid::decode(uuid).id.clone(); let identity_key_pair = libsignal::generate_identity_key_pair(); let pub_key = identity_key_pair.djb_identity_key.key.clone(); match url::Url::parse_with_params( "sgnl://linkdevice", - &[("uuid", &uuid), ("pub_key", &pub_key.as_str())], + &[("uuid", &uuid.as_str()), ("pub_key", &pub_key.as_str())], ) { Ok(device_link_uri) => { log::info!("device_link_uri: {device_link_uri}"); diff --git a/apps/sigchat/src/manager/libsignal.rs b/apps/sigchat/src/manager/libsignal.rs index eb53e38f5..a8fd77958 100644 --- a/apps/sigchat/src/manager/libsignal.rs +++ b/apps/sigchat/src/manager/libsignal.rs @@ -2,6 +2,23 @@ +// https://github.com/signalapp/Signal-Android/blob/d2053d2db7b1b930b7058ce5506dd6037ac3b808/libsignal-service/src/main/protowire/Provisioning.proto#L13C9-L15 +// +// message ProvisioningUuid { +// optional string uuid = 1; +// } +pub struct ProvisioningUuid { + pub id : String, +} +impl ProvisioningUuid { + pub fn decode(bytes: Vec) -> ProvisioningUuid { + log::info!("raw uuid Protocol Buffer: {:?}", bytes); + ProvisioningUuid {id : "TODO decode uuid Protocol Buffer".to_string()} + } +} + +////////////////////////////////////////////////////////// + // use org.signal.libsignal.protocol.IdentityKey; pub struct IdentityKey { pub key:String,