Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix device-name when linking as secondary device #123

Merged
merged 1 commit into from
Jan 22, 2022
Merged

Conversation

gferon
Copy link
Collaborator

@gferon gferon commented Jan 18, 2022

Also refactoredemptied a function that wasn't really useful, which will break compilation of downstream clients.

Resolves #121 and whisperfish/presage#38

Workaround before #124

@gferon gferon requested a review from rubdos January 18, 2022 23:09
Copy link
Member

@rubdos rubdos left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. The FIXME that you introduces should probably be tracked as an issue, I suppose.

@@ -46,7 +46,8 @@ pub struct ConfirmDeviceMessage {
pub supports_sms: bool,
pub fetches_messages: bool,
pub registration_id: u32,
pub name: String,
// FIXME: the name goes back here when we send this via the websocket
//pub name: String,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this become an issue?

@rubdos
Copy link
Member

rubdos commented Jan 22, 2022

OK, I'll merge it now.

@rubdos rubdos merged commit 9e96203 into master Jan 22, 2022
@rubdos
Copy link
Member

rubdos commented Jan 22, 2022

error[E0061]: this function takes 3 arguments but 4 arguments were supplied
   --> libsignal-service-actix/examples/link.rs:54:27
    |
54  |         provision_manager.provision_secondary_device(
    |                           ^^^^^^^^^^^^^^^^^^^^^^^^^^ expected 3 arguments
55  |             &mut csprng,
    |             -----------
56  |             signaling_key,
    |             -------------
57  |             &args.device_name,
    |             -----------------
58  |             tx,
    |             -- supplied 4 arguments
    |
note: associated function defined here
   --> /home/rsmet/src/libsignal-service-rs/libsignal-service/src/provisioning/manager.rs:281:18
    |
281 |     pub async fn provision_secondary_device<R: rand::Rng + rand::CryptoRng>(
    |

Seems like we didn't check the examples :'-)

@gferon
Copy link
Collaborator Author

gferon commented Jan 22, 2022

CI did fail though 😅 I'll fix it ASAP

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Linked secondary devices show as Unnamed device
2 participants