Refactor: Simplify conditional logic for VPN import and disconnection handling

Author: rhslack

src/app.rs

@@ -786,13 +786,13 @@ impl App {
                                     break;
                                 }
 
-                                if let Ok(active) = vpn_manager.get_active_vpns().await {
-                                    if active.iter().any(|(name, _)| name != &profile_name) {
-                                        let _ = event_tx.send(AppEvent::Notification("Another active VPN detected during stabilization. Ensuring exclusivity...".to_string())).await;
-                                        for (name, _) in active {
-                                            if name != profile_name {
-                                                let _ = vpn_manager.disconnect(&name).await;
-                                            }
+                                if let Ok(active) = vpn_manager.get_active_vpns().await
+                                    && active.iter().any(|(name, _)| name != &profile_name)
+                                {
+                                    let _ = event_tx.send(AppEvent::Notification("Another active VPN detected during stabilization. Ensuring exclusivity...".to_string())).await;
+                                    for (name, _) in active {
+                                        if name != profile_name {
+                                            let _ = vpn_manager.disconnect(&name).await;
                                         }
                                     }
                                 }

src/bin/remipn.rs

@@ -398,12 +398,12 @@ async fn cmd_connect(name: String) -> Result<()> {
                 }
 
                 // ensure no other VPN is active
-                if let Ok(active) = mgr.get_active_vpns().await {
-                    if active.iter().any(|(name, _)| name != &profile_name) {
-                        for (name, _) in active {
-                            if name != profile_name {
-                                let _ = mgr.disconnect(&name).await;
-                            }
+                if let Ok(active) = mgr.get_active_vpns().await
+                    && active.iter().any(|(name, _)| name != &profile_name)
+                {
+                    for (name, _) in active {
+                        if name != profile_name {
+                            let _ = mgr.disconnect(&name).await;
                         }
                     }
                 }

src/config.rs

@@ -91,21 +91,20 @@ impl Config {
         let mut imported_any = false;
 
         // Import from default import dir
-        if let Ok(import_dir) = Self::import_dir() {
-            if self.import_from_dir(&import_dir)? {
-                imported_any = true;
-            }
+        if let Ok(import_dir) = Self::import_dir()
+            && self.import_from_dir(&import_dir)?
+        {
+            imported_any = true;
         }
 
         // Import from Azure VPN Client dir on macOS
         #[cfg(target_os = "macos")]
         {
-            if let Ok(azure_dir) = Self::azure_vpn_import_dir() {
-                if azure_dir.exists() {
-                    if self.import_from_dir(&azure_dir)? {
-                        imported_any = true;
-                    }
-                }
+            if let Ok(azure_dir) = Self::azure_vpn_import_dir()
+                && azure_dir.exists()
+                && self.import_from_dir(&azure_dir)?
+            {
+                imported_any = true;
             }
         }