diff --git a/.gitmodules b/.gitmodules index 91d6d2d..d7dc513 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "apple-private-apis"] path = apple-private-apis - url = git@github.com:OpenBubbles/apple-private-apis.git + url = https://github.com/OpenBubbles/apple-private-apis.git [submodule "open-absinthe"] path = open-absinthe - url = git@github.com:OpenBubbles/OpenAbsinthe-Stub.git + url = https://github.com/OpenBubbles/OpenAbsinthe-Stub.git diff --git a/apple-private-apis b/apple-private-apis index e1c2b0b..a7d7e5f 160000 --- a/apple-private-apis +++ b/apple-private-apis @@ -1 +1 @@ -Subproject commit e1c2b0b26bc0d1e9ef04191b8d31c079ee625586 +Subproject commit a7d7e5f9a7a952b520e0d029d82dc144a8e9f4a7 diff --git a/src/ids/user.rs b/src/ids/user.rs index df97ecc..24f36bf 100644 --- a/src/ids/user.rs +++ b/src/ids/user.rs @@ -804,19 +804,18 @@ impl IDSUser { .send(&REQWEST).await? .bytes().await?; - info!("Got alias response {}", str::from_utf8(&bytes).expect("Bytes to urtf8")); - #[derive(Deserialize)] struct AliasResult { - alias: String, + #[serde(default)] + alias: Option, status: u32, } let parsed: AliasResult = plist::from_bytes(&bytes)?; - *alias = Some(parsed.alias); if parsed.status != 0 { return Err(PushError::AliasError(parsed.status)) } + *alias = Some(parsed.alias.ok_or(PushError::BadMsg)?); info!("Just took action {operation} on alias {} for handle {handle}", alias.as_ref().expect("No alias!"));