From da4dd4cc79fe09f6ffeb72469a4f66ab86be47ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Leon=20B=C3=B6ttger?= <leon.boettger@icloud.com>
Date: Wed, 12 Mar 2025 18:49:03 +0100
Subject: [PATCH] Automatically launch main app if not running and extension
 run

---
 ShareExtension/ShareViewController.swift | 71 ++++++++++++++++--------
 1 file changed, 48 insertions(+), 23 deletions(-)

diff --git a/ShareExtension/ShareViewController.swift b/ShareExtension/ShareViewController.swift
index 7a11498..dbe6981 100644
--- a/ShareExtension/ShareViewController.swift
+++ b/ShareExtension/ShareViewController.swift
@@ -109,29 +109,34 @@ class ShareViewController: NSViewController, ShareExtensionDelegate{
 	
 	override func viewDidLoad(){
 		super.viewDidLoad()
-		NearbyConnectionManager.shared.startDeviceDiscovery()
-        isDiscovering = true
+        
+        launchMainApp()
+        
+        DispatchQueue.main.asyncAfter(deadline: .now() + 1.0) {
+            NearbyConnectionManager.shared.startDeviceDiscovery()
+            self.isDiscovering = true
+        }
         
 		NearbyConnectionManager.shared.addShareExtensionDelegate(self)
         
-        let refreshInterval = 7.0
-        
-        refreshTimer = Timer.scheduledTimer(withTimeInterval: refreshInterval, repeats: true, block: { _ in
-            
-            // Restart device discovery if no devices are found
-            if self.isDiscovering && self.foundDevices.isEmpty {
-                
-                log("Refreshing device list")
-                
-                NearbyConnectionManager.shared.stopDeviceDiscovery()
-                
-                DispatchQueue.main.asyncAfter(deadline: .now() + 1.0) {
-                    if self.isDiscovering {
-                        NearbyConnectionManager.shared.startDeviceDiscovery()
-                    }
-                }
-            }
-        })
+//        let refreshInterval = 7.0
+//        
+//        refreshTimer = Timer.scheduledTimer(withTimeInterval: refreshInterval, repeats: true, block: { _ in
+//            
+//            // Restart device discovery if no devices are found
+//            if self.isDiscovering && self.foundDevices.isEmpty {
+//                
+//                log("Refreshing device list")
+//                
+//                NearbyConnectionManager.shared.stopDeviceDiscovery()
+//                
+//                DispatchQueue.main.asyncAfter(deadline: .now() + 1.0) {
+//                    if self.isDiscovering {
+//                        NearbyConnectionManager.shared.startDeviceDiscovery()
+//                    }
+//                }
+//            }
+//        })
 	}
 	
 	override func viewWillDisappear() {
@@ -139,9 +144,9 @@ class ShareViewController: NSViewController, ShareExtensionDelegate{
         self.qrWindow?.close()
         
 		if chosenDevice==nil{
-			NearbyConnectionManager.shared.stopDeviceDiscovery()
             isDiscovering = false
             refreshTimer?.invalidate()
+            NearbyConnectionManager.shared.stopDeviceDiscovery()
 		}
 		NearbyConnectionManager.shared.removeShareExtensionDelegate(self)
 	}
@@ -309,10 +314,10 @@ class ShareViewController: NSViewController, ShareExtensionDelegate{
 	func selectDevice(device:RemoteDeviceInfo){
         
         self.qrWindow?.close()
-        
-		NearbyConnectionManager.shared.stopDeviceDiscovery()
+
         isDiscovering = false
         refreshTimer?.invalidate()
+		NearbyConnectionManager.shared.stopDeviceDiscovery()
         
 		listViewWrapper?.animator().isHidden=true
 		progressView?.animator().isHidden=false
@@ -377,3 +382,23 @@ extension ShareViewController:NSCollectionViewDataSource{
         return device.name
     }
 }
+
+
+func launchMainApp() {
+    let bundleIdentifier = "com.leonboettger.neardrop"
+    let runningApps = NSWorkspace.shared.runningApplications
+
+    // Check if the app is already running
+    let isRunning = runningApps.contains { $0.bundleIdentifier == bundleIdentifier }
+    
+    if !isRunning {
+        log("Launching main app")
+        NSWorkspace.shared.launchApplication(withBundleIdentifier: bundleIdentifier,
+                                             options: [.default],
+                                             additionalEventParamDescriptor: nil,
+                                             launchIdentifier: nil)
+    }
+    else {
+        log("Main app is already running")
+    }
+}