Fix ./script/bundle to allow passing key

This commit is contained in:
Conrad Irwin
2023-10-09 08:59:25 -06:00
parent 34b7537948
commit 5dbda70235
5 changed files with 8 additions and 13 deletions
-1
View File
@@ -799,7 +799,6 @@ impl Client {
}
}
status = status_rx.next().fuse() => {
dbg!(status);
return Err(anyhow!("authentication canceled"));
}
}
-2
View File
@@ -1014,7 +1014,6 @@ extern "C" fn open_urls(this: &mut Object, _: Sel, _: id, urls: id) {
}
extern "C" fn continue_user_activity(this: &mut Object, _: Sel, _: id, user_activity: id, _: id) {
dbg!("yay!");
let url = unsafe {
let url: id = msg_send!(user_activity, webpageURL);
if url == nil {
@@ -1028,7 +1027,6 @@ extern "C" fn continue_user_activity(this: &mut Object, _: Sel, _: id, user_acti
)
}
};
dbg!(&url);
let platform = unsafe { get_foreground_platform(this) };
if let Some(callback) = platform.0.borrow_mut().open_urls.as_mut() {
callback(url.into_iter().collect());
-7
View File
@@ -4162,7 +4162,6 @@ async fn join_channel_internal(
active_call: &ModelHandle<ActiveCall>,
cx: &mut AsyncAppContext,
) -> Result<bool> {
dbg!("join channel internal");
let should_prompt = active_call.read_with(cx, |active_call, cx| {
let Some(room) = active_call.room().map(|room| room.read(cx)) else {
return false;
@@ -4195,7 +4194,6 @@ async fn join_channel_internal(
return Ok(false); // unreachable!() hopefully
}
}
dbg!("asdajdkjkasd");
let client = cx.read(|cx| active_call.read(cx).client());
@@ -4221,8 +4219,6 @@ async fn join_channel_internal(
}
}
dbg!("past here");
let room = active_call
.update(cx, |active_call, cx| {
active_call.join_channel(channel_id, cx)
@@ -4231,8 +4227,6 @@ async fn join_channel_internal(
room.update(cx, |room, _| room.next_room_update()).await;
dbg!("wow");
let task = room.update(cx, |room, cx| {
if let Some((project, host)) = room.most_active_project() {
return Some(join_remote_project(project, host, app_state.clone(), cx));
@@ -4273,7 +4267,6 @@ pub fn join_channel(
&mut cx,
)
.await;
dbg!("joined!");
// join channel succeeded, and opened a window
if matches!(result, Ok(true)) {
-1
View File
@@ -279,7 +279,6 @@ fn main() {
}
OpenRequest::JoinChannel { channel_id } => cx
.update(|cx| {
dbg!("joining channel");
workspace::join_channel(channel_id, app_state.clone(), None, cx)
})
.detach(),