ffi(nostr-sdk): move .shutdown_on_drop(true) in Options::new and …

…`ClientBuilder::build`

bindings/nostr-sdk-ffi/src/client/builder.rs

@@ -50,14 +50,14 @@ impl ClientBuilder {
     /// Set opts
     pub fn opts(self: Arc<Self>, opts: Arc<Options>) -> Self {
         let mut builder = unwrap_or_clone_arc(self);
-        builder.inner = builder
-            .inner
-            .opts(opts.as_ref().deref().clone().shutdown_on_drop(true));
+        builder.inner = builder.inner.opts(opts.as_ref().deref().clone());
         builder
     }
 
     /// Build [`Client`]
     pub fn build(&self) -> Arc<Client> {
-        Arc::new(ClientSdk::from_builder(self.inner.clone()).into())
+        let mut inner = self.inner.clone();
+        inner.opts = inner.opts.shutdown_on_drop(true);
+        Arc::new(ClientSdk::from_builder(inner).into())
     }
 }

bindings/nostr-sdk-ffi/src/client/mod.rs

@@ -14,7 +14,7 @@ use nostr_ffi::{
 };
 use nostr_sdk::client::blocking::Client as ClientSdk;
 use nostr_sdk::relay::RelayPoolNotification as RelayPoolNotificationSdk;
-use nostr_sdk::{NegentropyOptions, Options as OptionsSdk};
+use nostr_sdk::NegentropyOptions;
 use uniffi::Object;
 
 mod builder;
@@ -47,14 +47,17 @@ impl Client {
 
     #[uniffi::constructor]
     pub fn with_opts(signer: Option<Arc<ClientSigner>>, opts: Arc<Options>) -> Self {
-        let opts: OptionsSdk = opts.as_ref().deref().clone().shutdown_on_drop(true);
-        let mut builder = nostr_sdk::ClientBuilder::new().opts(opts);
-        if let Some(signer) = signer {
-            let signer: nostr_sdk::ClientSigner = signer.as_ref().deref().clone();
-            builder = builder.signer(signer);
-        }
         Self {
-            inner: builder.build().into(),
+            inner: match signer {
+                Some(signer) => ClientSdk::with_opts(
+                    signer.as_ref().deref().clone(),
+                    opts.as_ref().deref().clone(),
+                ),
+                None => nostr_sdk::ClientBuilder::new()
+                    .opts(opts.as_ref().deref().clone())
+                    .build()
+                    .into(),
+            },
         }
     }
 

bindings/nostr-sdk-ffi/src/client/options.rs

@@ -33,7 +33,7 @@ impl Options {
     #[uniffi::constructor]
     pub fn new() -> Self {
         Self {
-            inner: nostr_sdk::Options::new(),
+            inner: nostr_sdk::Options::new().shutdown_on_drop(true),
         }
     }