fix deleting booted devices

okwasniewski · Nov 20, 2023 · 4b82b0e · 4b82b0e
1 parent fb32c77
commit 4b82b0e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 11 deletions.
diff --git a/MiniSim/MenuItems/SubMenuItem.swift b/MiniSim/MenuItems/SubMenuItem.swift
@@ -127,7 +127,7 @@ enum SubMenuItems {
         let needBootedDevice = false
         let image = NSImage(
             systemSymbolName: "trash",
-            accessibilityDescription: "Delete simulator"
+            accessibilityDescription: "Delete emulator"
         )
 
     }

diff --git a/MiniSim/Service/DeviceService.swift b/MiniSim/Service/DeviceService.swift
@@ -416,14 +416,10 @@ extension DeviceService {
     static func deleteEmulator(device: Device) throws {
         let avdPath = try ADB.getAvdPath()
         let adbPath = try ADB.getAdbPath()
-
-        let activeDevices = try shellOut(to: "\(adbPath) devices")
-        guard let deviceId = device.identifier else {
-            throw DeviceError.deviceNotFound
-        }
-
-        let isEmulatorActive = activeDevices.contains(deviceId)
-        if isEmulatorActive{
+        if device.booted {
+            guard let deviceId = device.identifier else {
+                throw DeviceError.deviceNotFound
+            }
             try shellOut(to: "\(adbPath) -s \(deviceId) emu kill")
         }
         try shellOut(to: "\(avdPath) delete avd -n \"\(device.name)\"")
@@ -462,7 +458,7 @@ extension DeviceService {
                     if let command = DeviceService.getCustomCommand(platform: .android, commandName: itemName) {
                         try DeviceService.runCustomCommand(device, command: command)
                     }
-                    
+
                 case .delete:
                     let result = !NSAlert.showQuestionDialog(
                         title: "Are you sure?",
@@ -472,7 +468,7 @@ extension DeviceService {
                     queue.async {
                         do {
                             try DeviceService.deleteEmulator(device: device)
-                            DeviceService.showSuccessMessage(title: "Simulator deleted!", message: device.name)
+                            DeviceService.showSuccessMessage(title: "Emulator deleted!", message: device.name)
                             NotificationCenter.default.post(name: .deviceDeleted, object: nil)
                         } catch {
                             NSAlert.showError(message: error.localizedDescription)