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.

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Initial work towards supporting Groups v2 #73

Merged
merged 9 commits into from
Mar 4, 2021
Merged

Initial work towards supporting Groups v2 #73

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
cf7c9af
Initial work towards supporting Groups v2
gferon Feb 7, 2021
f3916ab
Various improvements
gferon Mar 3, 2021
b6b8f56
Decryption\!
gferon Mar 3, 2021
a86d145
Improve CredentialsCache API
gferon Mar 3, 2021
14abba5
Own String in HttpCredentials
gferon Mar 4, 2021
64add0e
Address some review comments
gferon Mar 4, 2021
8a1df28
Move things around
gferon Mar 4, 2021
cde9b10
Remove ProtobufEncodeError
gferon Mar 4, 2021
9678b7b
Remove std::mem::swap
gferon Mar 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion libsignal-service-actix/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ libsignal-protocol = { git = "https://github.com/Michael-F-Bryan/libsignal-proto
awc = { version = "3.0.0-beta.1", features=["rustls"] }
actix = "0.11.0-beta.1"
actix-http = "3.0.0-beta.1"
actix-rt = "2.0.0"
actix-rt = "2.0"
mpart-async = "0.5.0"
serde_json = "1.0"
futures = "0.3"
Expand Down
2 changes: 1 addition & 1 deletion libsignal-service-actix/examples/registering.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ async fn main() -> Result<(), Error> {
&mut signaling_key,
)
.unwrap();
let credentials = Credentials {
let credentials = ServiceCredentials {
uuid: None,
phonenumber: args.username.clone(),
password: Some(password),
Expand Down
5 changes: 3 additions & 2 deletions libsignal-service-actix/src/provisioning.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use libsignal_protocol::{
};
use libsignal_service::{
configuration::ServiceConfiguration,
messagepipe::Credentials,
messagepipe::ServiceCredentials,
prelude::PushService,
provisioning::{ProvisioningError, ProvisioningPipe, ProvisioningStep},
push_service::{ConfirmDeviceMessage, DeviceId},
Expand Down Expand Up @@ -108,9 +108,10 @@ where

// we need to authenticate with the phone number
// to confirm the new device
// TODO: we should now be able to override credentials?
let mut push_service = AwcPushService::new(
service_configuration.clone(),
Some(Credentials {
Some(ServiceCredentials {
phonenumber: phone_number.clone(),
uuid: None,
password: Some(password.to_string()),
Expand Down