Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
gpui_ios: Forward Universal Links to URL handlers (#65858)
Anthony Eid2c626b339719
diff --git a/crates/gpui_ios/Cargo.toml b/crates/gpui_ios/Cargo.tomlindex 4fc8d6cab22..bc5ad869700 100644--- a/crates/gpui_ios/Cargo.toml+++ b/crates/gpui_ios/Cargo.toml@@ -42,7 +42,7 @@ futures.workspace = truegpui_apple = { workspace = true, features = ["font-kit"] }log.workspace = trueobjc2.workspace = true-objc2-foundation = { workspace = true, features = ["NSThread", "NSOperation", "block2"] }+objc2-foundation = { workspace = true, features = ["NSThread", "NSOperation", "NSUserActivity", "block2"] }objc2-ui-kit.workspace = trueobjc2-quartz-core = { workspace = true, features = ["CADisplayLink"] }objc2-core-foundation = { workspace = true, default-features = true }diff --git a/crates/gpui_ios/src/ios/application.rs b/crates/gpui_ios/src/ios/application.rsindex aac23f33f1d..e6235cf7af8 100644--- a/crates/gpui_ios/src/ios/application.rs+++ b/crates/gpui_ios/src/ios/application.rs@@ -9,6 +9,7 @@ use objc2::{};use objc2_foundation::{NSDictionary, NSObject, NSObjectProtocol, NSRunLoop, NSRunLoopCommonModes, NSSet, NSString,+ NSUserActivity, NSUserActivityTypeBrowsingWeb,};use objc2_quartz_core::CADisplayLink;use objc2_ui_kit::{@@ -161,6 +162,17 @@ impl IosApplicationState {.collect();self.open_urls.with(|callback| callback(urls));}++ fn continue_user_activity(&self, activity: &NSUserActivity) {+ if &*activity.activityType() != unsafe { NSUserActivityTypeBrowsingWeb } {+ return;+ }+ let Some(url) = activity.webpageURL().and_then(|url| url.absoluteString()) else {+ return;+ };+ self.open_urls+ .with(|callback| callback(vec![url.to_string()]));+ }}impl Drop for IosApplicationState {@@ -181,6 +193,10 @@ impl SceneConnectionOptions {#[unsafe(method(URLContexts))]#[unsafe(method_family = none)]fn url_contexts(&self) -> Option<Retained<NSSet<UIOpenURLContext>>>;++ #[unsafe(method(userActivities))]+ #[unsafe(method_family = none)]+ fn user_activities(&self) -> Option<Retained<NSSet<NSUserActivity>>>;);}@@ -305,6 +321,11 @@ define_class!(if let Some(contexts) = options.url_contexts() {application.open_urls(&contexts);}+ if let Some(activities) = options.user_activities() {+ for activity in activities.iter() {+ application.continue_user_activity(&activity);+ }+ }application.stop_display_link();let display_link = unsafe {@@ -365,6 +386,13 @@ define_class!(platform.application.open_urls(contexts);}}++ #[unsafe(method(scene:continueUserActivity:))]+ fn continue_user_activity(&self, scene: &UIScene, activity: &NSUserActivity) {+ if let Some(platform) = self.platform_for_scene(scene) {+ platform.application.continue_user_activity(activity);+ }+ }});@@ -384,6 +412,38 @@ mod tests {use super::*;use std::{cell::Cell, rc::Rc};+ #[test]+ fn browsing_activity_delivers_url_without_losing_query_or_fragment() {+ use objc2::AnyThread;+ use objc2_foundation::NSURL;++ let state = IosApplicationState::default();+ let received = Rc::new(RefCell::new(Vec::new()));+ state.open_urls.set(Box::new({+ let received = received.clone();+ move |urls| received.borrow_mut().extend(urls)+ }));+ let url_string = "https://example.com/thread/123?source=link#selection";+ let url = NSURL::URLWithString(&NSString::from_str(url_string)).expect("test URL is valid");+ let activity = NSUserActivity::initWithActivityType(NSUserActivity::alloc(), unsafe {+ NSUserActivityTypeBrowsingWeb+ });+ state.continue_user_activity(&activity);+ assert!(received.borrow().is_empty());++ activity.setWebpageURL(Some(&url));+ state.continue_user_activity(&activity);+ assert_eq!(*received.borrow(), vec![url_string.to_string()]);++ let unrelated = NSUserActivity::initWithActivityType(+ NSUserActivity::alloc(),+ &NSString::from_str("com.example.edit"),+ );+ unrelated.setWebpageURL(Some(&url));+ state.continue_user_activity(&unrelated);+ assert_eq!(*received.borrow(), vec![url_string.to_string()]);+ }+#[test]fn launch_callback_runs_once_and_can_register_callbacks() {let state = Rc::new(IosApplicationState::default());