fix: Return a null object for AT-SPI application's parent (#454)

DataTriny · web-flow · commit 8a84abf81eaf · 2024-09-23T06:38:49.000-05:00
diff --git a/platforms/unix/src/atspi/bus.rs b/platforms/unix/src/atspi/bus.rs
@@ -78,20 +78,15 @@ impl Bus {
             .at(path.clone(), ApplicationInterface(node.clone()))
             .await?
         {
-            let desktop = self
-                .socket_proxy
+            self.socket_proxy
                 .embed(&(self.unique_name().as_str(), ObjectId::Root.path().into()))
                 .await?;
 
             self.conn
                 .object_server()
                 .at(
                     path,
-                    RootAccessibleInterface::new(
-                        self.unique_name().to_owned(),
-                        desktop.into(),
-                        node,
-                    ),
+                    RootAccessibleInterface::new(self.unique_name().to_owned(), node),
                 )
                 .await?;
         }
@@ -230,7 +225,7 @@ impl Bus {
                         kind: "",
                         detail1: 0,
                         detail2: 0,
-                        any_data: child.to_address(self.unique_name().clone()).into(),
+                        any_data: child.to_address(self.unique_name().inner()).into(),
                         properties,
                     },
                 )
@@ -294,7 +289,7 @@ impl Bus {
                         kind: "add",
                         detail1: index as i32,
                         detail2: 0,
-                        any_data: child.to_address(self.unique_name().clone()).into(),
+                        any_data: child.to_address(self.unique_name().inner()).into(),
                         properties,
                     },
                 )
@@ -313,7 +308,7 @@ impl Bus {
                         kind: "remove",
                         detail1: -1,
                         detail2: 0,
-                        any_data: child.to_address(self.unique_name().clone()).into(),
+                        any_data: child.to_address(self.unique_name().inner()).into(),
                         properties,
                     },
                 )
@@ -345,7 +340,7 @@ impl Bus {
                                     },
                                     NodeIdOrRoot::Root => ObjectId::Root,
                                 };
-                                parent.to_address(self.unique_name().clone()).into()
+                                parent.to_address(self.unique_name().inner()).into()
                             }
                             Property::Role(value) => Value::U32(value as u32),
                             Property::Value(value) => Value::F64(value),
diff --git a/platforms/unix/src/atspi/interfaces/accessible.rs b/platforms/unix/src/atspi/interfaces/accessible.rs
@@ -49,7 +49,7 @@ impl NodeAccessibleInterface {
                 },
                 NodeIdOrRoot::Root => ObjectId::Root,
             }
-            .to_address(self.bus_name.clone())
+            .to_address(self.bus_name.inner())
         })
     }
 
@@ -90,7 +90,7 @@ impl NodeAccessibleInterface {
                     adapter: self.node.adapter_id(),
                     node: child,
                 }
-                .to_address(self.bus_name.clone())
+                .to_address(self.bus_name.inner())
             })
             .map_err(self.map_error())
     }
@@ -116,7 +116,7 @@ impl NodeAccessibleInterface {
     }
 
     fn get_application(&self) -> (OwnedObjectAddress,) {
-        (ObjectId::Root.to_address(self.bus_name.clone()),)
+        (ObjectId::Root.to_address(self.bus_name.inner()),)
     }
 
     fn get_interfaces(&self) -> fdo::Result<InterfaceSet> {
@@ -126,21 +126,12 @@ impl NodeAccessibleInterface {
 
 pub(crate) struct RootAccessibleInterface {
     bus_name: OwnedUniqueName,
-    desktop_address: OwnedObjectAddress,
     root: PlatformRoot,
 }
 
 impl RootAccessibleInterface {
-    pub fn new(
-        bus_name: OwnedUniqueName,
-        desktop_address: OwnedObjectAddress,
-        root: PlatformRoot,
-    ) -> Self {
-        Self {
-            bus_name,
-            desktop_address,
-            root,
-        }
+    pub fn new(bus_name: OwnedUniqueName, root: PlatformRoot) -> Self {
+        Self { bus_name, root }
     }
 }
 
@@ -158,7 +149,7 @@ impl RootAccessibleInterface {
 
     #[dbus_interface(property)]
     fn parent(&self) -> OwnedObjectAddress {
-        self.desktop_address.clone()
+        OwnedObjectAddress::null()
     }
 
     #[dbus_interface(property)]
@@ -191,7 +182,7 @@ impl RootAccessibleInterface {
     fn get_children(&self) -> fdo::Result<Vec<OwnedObjectAddress>> {
         self.root
             .map_child_ids(|(adapter, node)| {
-                ObjectId::Node { adapter, node }.to_address(self.bus_name.clone())
+                ObjectId::Node { adapter, node }.to_address(self.bus_name.inner())
             })
             .map_err(map_root_error)
     }
@@ -209,7 +200,7 @@ impl RootAccessibleInterface {
     }
 
     fn get_application(&self) -> (OwnedObjectAddress,) {
-        (ObjectId::Root.to_address(self.bus_name.clone()),)
+        (ObjectId::Root.to_address(self.bus_name.inner()),)
     }
 
     fn get_interfaces(&self) -> InterfaceSet {
diff --git a/platforms/unix/src/atspi/interfaces/mod.rs b/platforms/unix/src/atspi/interfaces/mod.rs
@@ -11,20 +11,19 @@ mod text;
 mod value;
 
 use crate::atspi::{ObjectId, OwnedObjectAddress};
-use zbus::{fdo, names::OwnedUniqueName};
+use zbus::{fdo, names::UniqueName};
 
 fn map_root_error(error: accesskit_atspi_common::Error) -> fdo::Error {
     crate::util::map_error(ObjectId::Root, error)
 }
 
 fn optional_object_address(
-    bus_name: &OwnedUniqueName,
+    bus_name: &UniqueName,
     object_id: Option<ObjectId>,
 ) -> (OwnedObjectAddress,) {
-    let bus_name = bus_name.clone();
     match object_id {
         Some(id) => (id.to_address(bus_name),),
-        None => (OwnedObjectAddress::null(bus_name),),
+        None => (OwnedObjectAddress::null(),),
     }
 }
 
diff --git a/platforms/unix/src/atspi/object_address.rs b/platforms/unix/src/atspi/object_address.rs
@@ -6,26 +6,29 @@
 use atspi::Accessible;
 use serde::{Deserialize, Serialize};
 use zbus::{
-    names::{OwnedUniqueName, UniqueName},
+    names::UniqueName,
     zvariant::{ObjectPath, OwnedObjectPath, OwnedValue, Type, Value},
 };
 
 const NULL_PATH: &str = "/org/a11y/atspi/null";
 
 #[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq, OwnedValue, Type, Value)]
 pub(crate) struct OwnedObjectAddress {
-    bus_name: OwnedUniqueName,
+    bus_name: String,
     path: OwnedObjectPath,
 }
 
 impl OwnedObjectAddress {
-    pub(crate) fn new(bus_name: OwnedUniqueName, path: OwnedObjectPath) -> Self {
-        Self { bus_name, path }
+    pub(crate) fn new(bus_name: &UniqueName, path: OwnedObjectPath) -> Self {
+        Self {
+            bus_name: bus_name.to_string(),
+            path,
+        }
     }
 
-    pub(crate) fn null(bus_name: OwnedUniqueName) -> Self {
+    pub(crate) fn null() -> Self {
         Self {
-            bus_name,
+            bus_name: String::new(),
             path: ObjectPath::from_str_unchecked(NULL_PATH).into(),
         }
     }
@@ -34,7 +37,7 @@ impl OwnedObjectAddress {
 impl From<Accessible> for OwnedObjectAddress {
     fn from(object: Accessible) -> Self {
         Self {
-            bus_name: OwnedUniqueName::from(UniqueName::from_string_unchecked(object.name)),
+            bus_name: object.name,
             path: object.path,
         }
     }
diff --git a/platforms/unix/src/atspi/object_id.rs b/platforms/unix/src/atspi/object_id.rs
@@ -8,7 +8,7 @@ use accesskit::NodeId;
 use accesskit_atspi_common::PlatformNode;
 use serde::{Serialize, Serializer};
 use zbus::{
-    names::OwnedUniqueName,
+    names::UniqueName,
     zvariant::{ObjectPath, OwnedObjectPath, Signature, Structure, StructureBuilder, Type},
 };
 
@@ -22,7 +22,7 @@ pub(crate) enum ObjectId {
 }
 
 impl ObjectId {
-    pub(crate) fn to_address(&self, bus_name: OwnedUniqueName) -> OwnedObjectAddress {
+    pub(crate) fn to_address(&self, bus_name: &UniqueName) -> OwnedObjectAddress {
         OwnedObjectAddress::new(bus_name, self.path())
     }
 

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ impl NodeAccessibleInterface {`
`49`	`49`	`},`
`50`	`50`	`NodeIdOrRoot::Root => ObjectId::Root,`
`51`	`51`	`}`
`52`		`- .to_address(self.bus_name.clone())`
	`52`	`+ .to_address(self.bus_name.inner())`
`53`	`53`	`})`
`54`	`54`	`}`
`55`	`55`
`@@ -90,7 +90,7 @@ impl NodeAccessibleInterface {`
`90`	`90`	`adapter: self.node.adapter_id(),`
`91`	`91`	`node: child,`
`92`	`92`	`}`
`93`		`- .to_address(self.bus_name.clone())`
	`93`	`+ .to_address(self.bus_name.inner())`
`94`	`94`	`})`
`95`	`95`	`.map_err(self.map_error())`
`96`	`96`	`}`
`@@ -116,7 +116,7 @@ impl NodeAccessibleInterface {`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`fn get_application(&self) -> (OwnedObjectAddress,) {`
`119`		`- (ObjectId::Root.to_address(self.bus_name.clone()),)`
	`119`	`+ (ObjectId::Root.to_address(self.bus_name.inner()),)`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`fn get_interfaces(&self) -> fdo::Result<InterfaceSet> {`
`@@ -126,21 +126,12 @@ impl NodeAccessibleInterface {`
`126`	`126`
`127`	`127`	`pub(crate) struct RootAccessibleInterface {`
`128`	`128`	`bus_name: OwnedUniqueName,`
`129`		`- desktop_address: OwnedObjectAddress,`
`130`	`129`	`root: PlatformRoot,`
`131`	`130`	`}`
`132`	`131`
`133`	`132`	`impl RootAccessibleInterface {`
`134`		`- pub fn new(`
`135`		`- bus_name: OwnedUniqueName,`
`136`		`- desktop_address: OwnedObjectAddress,`
`137`		`- root: PlatformRoot,`
`138`		`- ) -> Self {`
`139`		`- Self {`
`140`		`- bus_name,`
`141`		`- desktop_address,`
`142`		`- root,`
`143`		`- }`
	`133`	`+ pub fn new(bus_name: OwnedUniqueName, root: PlatformRoot) -> Self {`
	`134`	`+ Self { bus_name, root }`
`144`	`135`	`}`
`145`	`136`	`}`
`146`	`137`
`@@ -158,7 +149,7 @@ impl RootAccessibleInterface {`
`158`	`149`
`159`	`150`	`#[dbus_interface(property)]`
`160`	`151`	`fn parent(&self) -> OwnedObjectAddress {`
`161`		`- self.desktop_address.clone()`
	`152`	`+ OwnedObjectAddress::null()`
`162`	`153`	`}`
`163`	`154`
`164`	`155`	`#[dbus_interface(property)]`
`@@ -191,7 +182,7 @@ impl RootAccessibleInterface {`
`191`	`182`	`fn get_children(&self) -> fdo::Result<Vec<OwnedObjectAddress>> {`
`192`	`183`	`self.root`
`193`	`184`	`.map_child_ids(\|(adapter, node)\| {`
`194`		`- ObjectId::Node { adapter, node }.to_address(self.bus_name.clone())`
	`185`	`+ ObjectId::Node { adapter, node }.to_address(self.bus_name.inner())`
`195`	`186`	`})`
`196`	`187`	`.map_err(map_root_error)`
`197`	`188`	`}`
`@@ -209,7 +200,7 @@ impl RootAccessibleInterface {`
`209`	`200`	`}`
`210`	`201`
`211`	`202`	`fn get_application(&self) -> (OwnedObjectAddress,) {`
`212`		`- (ObjectId::Root.to_address(self.bus_name.clone()),)`
	`203`	`+ (ObjectId::Root.to_address(self.bus_name.inner()),)`
`213`	`204`	`}`
`214`	`205`
`215`	`206`	`fn get_interfaces(&self) -> InterfaceSet {`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ use accesskit::NodeId;`
`8`	`8`	`use accesskit_atspi_common::PlatformNode;`
`9`	`9`	`use serde::{Serialize, Serializer};`
`10`	`10`	`use zbus::{`
`11`		`- names::OwnedUniqueName,`
	`11`	`+ names::UniqueName,`
`12`	`12`	`zvariant::{ObjectPath, OwnedObjectPath, Signature, Structure, StructureBuilder, Type},`
`13`	`13`	`};`
`14`	`14`
`@@ -22,7 +22,7 @@ pub(crate) enum ObjectId {`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`impl ObjectId {`
`25`		`- pub(crate) fn to_address(&self, bus_name: OwnedUniqueName) -> OwnedObjectAddress {`
	`25`	`+ pub(crate) fn to_address(&self, bus_name: &UniqueName) -> OwnedObjectAddress {`
`26`	`26`	`OwnedObjectAddress::new(bus_name, self.path())`
`27`	`27`	`}`
`28`	`28`