1 files changed, 10 insertions, 13 deletions

diff --git a/src/lib.rs b/src/lib.rs
index dc3432a..8b0aae5 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -110,8 +110,8 @@ pub use crate::auth::{Admin, Authenticate, User};
 pub use crate::config::Config;
 #[allow(deprecated)]
 pub use crate::device::{
-    connect, Device, DeviceWrapper, Model, Pro, SdCardData, Storage, StorageProductionInfo,
-    StorageStatus, VolumeMode, VolumeStatus,
+    Device, DeviceWrapper, Model, Pro, SdCardData, Storage, StorageProductionInfo, StorageStatus,
+    VolumeMode, VolumeStatus,
 };
 pub use crate::error::{CommandError, CommunicationError, Error, LibraryError};
 pub use crate::otp::{ConfigureOtp, GenerateOtp, OtpMode, OtpSlotData};
@@ -204,12 +204,9 @@ impl Manager {
     /// ```
     ///
     /// [`NotConnected`]: enum.CommunicationError.html#variant.NotConnected
-    pub fn connect(&mut self) -> Result<DeviceWrapper, Error> {
+    pub fn connect(&mut self) -> Result<DeviceWrapper<'_>, Error> {
         if unsafe { nitrokey_sys::NK_login_auto() } == 1 {
-            match device::get_connected_device() {
-                Some(wrapper) => Ok(wrapper),
-                None => Err(CommunicationError::NotConnected.into()),
-            }
+            device::get_connected_device(self)
         } else {
             Err(CommunicationError::NotConnected.into())
         }
@@ -239,9 +236,9 @@ impl Manager {
     /// ```
     ///
     /// [`NotConnected`]: enum.CommunicationError.html#variant.NotConnected
-    pub fn connect_model(&mut self, model: Model) -> Result<DeviceWrapper, Error> {
+    pub fn connect_model(&mut self, model: Model) -> Result<DeviceWrapper<'_>, Error> {
         if device::connect_enum(model) {
-            Ok(device::create_device_wrapper(model))
+            Ok(device::create_device_wrapper(self, model))
         } else {
             Err(CommunicationError::NotConnected.into())
         }
@@ -270,9 +267,9 @@ impl Manager {
     /// ```
     ///
     /// [`NotConnected`]: enum.CommunicationError.html#variant.NotConnected
-    pub fn connect_pro(&mut self) -> Result<Pro, Error> {
+    pub fn connect_pro(&mut self) -> Result<Pro<'_>, Error> {
         if device::connect_enum(device::Model::Pro) {
-            Ok(device::Pro::new())
+            Ok(device::Pro::new(self))
         } else {
             Err(CommunicationError::NotConnected.into())
         }
@@ -301,9 +298,9 @@ impl Manager {
     /// ```
     ///
     /// [`NotConnected`]: enum.CommunicationError.html#variant.NotConnected
-    pub fn connect_storage(&mut self) -> Result<Storage, Error> {
+    pub fn connect_storage(&mut self) -> Result<Storage<'_>, Error> {
         if device::connect_enum(Model::Storage) {
-            Ok(Storage::new())
+            Ok(Storage::new(self))
         } else {
             Err(CommunicationError::NotConnected.into())
         }