Merge pull request #191 from ylxdzsw/patch-1

Fix dbus service algorithm fallback

Author: bilelmoussaoui

client/src/dbus/error.rs

@@ -20,7 +20,7 @@ pub enum ServiceError {
 #[derive(Debug)]
 pub enum Error {
     /// Something went wrong on the wire.
-    Zbus(zbus::Error),
+    ZBus(zbus::Error),
     /// A service error.
     Service(ServiceError),
     /// The item/collection was removed.
@@ -39,19 +39,19 @@ pub enum Error {
 
 impl From<zbus::Error> for Error {
     fn from(e: zbus::Error) -> Self {
-        Self::Zbus(e)
+        Self::ZBus(e)
     }
 }
 
 impl From<zbus::fdo::Error> for Error {
     fn from(e: zbus::fdo::Error) -> Self {
-        Self::Zbus(zbus::Error::FDO(Box::new(e)))
+        Self::ZBus(zbus::Error::FDO(Box::new(e)))
     }
 }
 
 impl From<zbus::zvariant::Error> for Error {
     fn from(e: zbus::zvariant::Error) -> Self {
-        Self::Zbus(zbus::Error::Variant(e))
+        Self::ZBus(zbus::Error::Variant(e))
     }
 }
 
@@ -84,7 +84,7 @@ impl std::error::Error for Error {}
 impl fmt::Display for Error {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
-            Self::Zbus(err) => write!(f, "zbus error {err}"),
+            Self::ZBus(err) => write!(f, "zbus error {err}"),
             Self::Service(err) => write!(f, "service error {err}"),
             Self::IO(err) => write!(f, "IO error {err}"),
             Self::Deleted => write!(f, "Item/Collection was deleted, can no longer be used"),

client/src/dbus/service.rs

@@ -4,7 +4,7 @@ use ashpd::WindowIdentifier;
 use futures_util::{Stream, StreamExt};
 use zbus::zvariant::OwnedObjectPath;
 
-use super::{api, Algorithm, Collection, Error};
+use super::{api, Algorithm, Collection, Error, ServiceError};
 use crate::Key;
 
 /// The entry point of communicating with a [`org.freedesktop.Secrets`](https://specifications.freedesktop.org/secret-service-spec/latest/index.html) implementation.
@@ -51,7 +51,10 @@ impl<'a> Service<'a> {
     pub async fn new() -> Result<Service<'a>, Error> {
         let service = match Self::encrypted().await {
             Ok(service) => Ok(service),
-            Err(Error::Zbus(zbus::Error::MethodError(_, _, _))) => Self::plain().await,
+            Err(Error::ZBus(zbus::Error::MethodError(..))) => Self::plain().await,
+            Err(Error::Service(ServiceError::ZBus(zbus::Error::MethodError(..)))) => {
+                Self::plain().await
+            }
             Err(e) => Err(e),
         }?;
         Ok(service)

portal/src/error.rs

@@ -33,7 +33,7 @@ impl From<oo7::dbus::Error> for Error {
 
 impl From<oo7::zbus::Error> for Error {
     fn from(value: oo7::zbus::Error) -> Self {
-        Self::Oo7(oo7::dbus::Error::Zbus(value))
+        Self::Oo7(oo7::dbus::Error::ZBus(value))
     }
 }