Revert "fix: Refreshing via Xcode would cause a crash here"

This reverts commit a3a34eb9ef.

AltStore/Managing Apps/AppManager.swift

@@ -1234,129 +1234,120 @@ private extension AppManager
         return group
     }
     
-    func removeAppExtensions(
+    func removeAppExtensions(from application: ALTApplication, existingApp: InstalledApp?, extensions: Set<ALTApplication>, _ presentingViewController: UIViewController?, completion: @escaping (Result<Void, Error>) -> Void)
-        from application: ALTApplication,
+    {
-        existingApp: InstalledApp?,
-        extensions: Set<ALTApplication>,
-        _ presentingViewController: UIViewController?,
-        completion: @escaping (Result<Void, Error>) -> Void
-    ) {
             
-        // App-Extensions: Ensure existing app's extensions and currently installing app's extensions must match
+        //App-Extensions: Ensure existing app's extensions and currently installing app's extensions must match
-        if let existingApp {
+        let existingAppEx: Set<InstalledExtension> = existingApp?.appExtensions ?? Set()
-            _ = RSTAsyncBlockOperation { _ in
+        let currentAppEx: Set<ALTApplication> = application.appExtensions
-                let existingAppEx: Set<InstalledExtension> = existingApp.appExtensions
-                let currentAppEx: Set<ALTApplication> = application.appExtensions
         
-                let currentAppExNames  = currentAppEx.map{ appEx in appEx.bundleIdentifier}
+        let currentAppExNames  = currentAppEx.map{ appEx in appEx.bundleIdentifier}
-                let existingAppExNames = existingAppEx.map{ appEx in appEx.bundleIdentifier}
+        let existingAppExNames = existingAppEx.map{ appEx in appEx.bundleIdentifier}
 
-                let excessExtensions = currentAppEx.filter{
+        let excessExtensions = currentAppEx.filter{
-                    !(existingAppExNames.contains($0.bundleIdentifier))
+            !(existingAppExNames.contains($0.bundleIdentifier))
-                }
+        }
-                
+        
-                
+        let isMatching = (currentAppEx.count == existingAppEx.count) && excessExtensions.isEmpty
-                let isMatching = (currentAppEx.count == existingAppEx.count) && excessExtensions.isEmpty
+        let diagnosticsMsg = "AppManager.removeAppExtensions: App Extensions in existingApp and currentApp are matching: \(isMatching)\n"
-                let diagnosticsMsg = "AppManager.removeAppExtensions: App Extensions in existingApp and currentApp are matching: \(isMatching)\n"
+                           + "AppManager.removeAppExtensions: existingAppEx: \(existingAppExNames); currentAppEx: \(String(describing: currentAppExNames))\n"
-                + "AppManager.removeAppExtensions: existingAppEx: \(existingAppExNames); currentAppEx: \(String(describing: currentAppExNames))\n"
+        print(diagnosticsMsg)
-                print(diagnosticsMsg)
+     
-                
+        // if background mode, then remove only the excess extensions
-                
+        guard let presentingViewController: UIViewController = presentingViewController else {
-                // if background mode, then remove only the excess extensions
+            // perform silent extensions cleanup for those that aren't already present in existing app
-                guard let presentingViewController: UIViewController = presentingViewController else {
+            print("\n    Performing background mode Extensions removal    \n")
-                    // perform silent extensions cleanup for those that aren't already present in existing app
+            print("AppManager.removeAppExtensions: Excess Extensions: \(excessExtensions)")
-                    print("\n    Performing background mode Extensions removal    \n")
+            
-                    print("AppManager.removeAppExtensions: Excess Extensions: \(excessExtensions)")
+            do {
-                    
+                for appExtension in excessExtensions {
-                    do {
+                    print("Deleting extension \(appExtension.bundleIdentifier)")
-                        for appExtension in excessExtensions {
+                    try FileManager.default.removeItem(at: appExtension.fileURL)
-                            print("Deleting extension \(appExtension.bundleIdentifier)")
-                            try FileManager.default.removeItem(at: appExtension.fileURL)
-                        }
-                        return completion(.success(()))
-                    } catch {
-                        return completion(.failure(error))
-                    }
                 }
+                return completion(.success(()))
+            } catch {
+                return completion(.failure(error))
             }
         }
      
         guard !application.appExtensions.isEmpty else { return completion(.success(())) }
         
-        DispatchQueue.main.async {
+        let firstSentence: String
-            let firstSentence: String
         
-            if UserDefaults.standard.activeAppLimitIncludesExtensions
+        if UserDefaults.standard.activeAppLimitIncludesExtensions
+        {
+            firstSentence = NSLocalizedString("Non-developer Apple IDs are limited to 3 active apps and app extensions.", comment: "")
+        }
+        else
+        {
+            firstSentence = NSLocalizedString("Non-developer Apple IDs are limited to creating 10 App IDs per week.", comment: "")
+        }
+        
+        let message = firstSentence + " " + NSLocalizedString("Would you like to remove this app's extensions so they don't count towards your limit? There are \(extensions.count) Extensions", comment: "")
+        
+        let alertController = UIAlertController(title: NSLocalizedString("App Contains Extensions", comment: ""), message: message, preferredStyle: .alert)
+        alertController.addAction(UIAlertAction(title: UIAlertAction.cancel.title, style: UIAlertAction.cancel.style, handler: { (action) in
+            completion(.failure(OperationError.cancelled))
+        }))
+        alertController.addAction(UIAlertAction(title: NSLocalizedString("Keep App Extensions", comment: ""), style: .default) { (action) in
+            completion(.success(()))
+        })
+        alertController.addAction(UIAlertAction(title: NSLocalizedString("Remove App Extensions", comment: ""), style: .destructive) { (action) in
+            do
             {
-                firstSentence = NSLocalizedString("Non-developer Apple IDs are limited to 3 active apps and app extensions.", comment: "")
+                for appExtension in application.appExtensions
-            }
+                {
-            else
+                    print("Deleting extension \(appExtension.bundleIdentifier)")
-            {
+                    try FileManager.default.removeItem(at: appExtension.fileURL)
-                firstSentence = NSLocalizedString("Non-developer Apple IDs are limited to creating 10 App IDs per week.", comment: "")
+                }
-            }
                 
-            let message = firstSentence + " " + NSLocalizedString("Would you like to remove this app's extensions so they don't count towards your limit? There are \(extensions.count) Extensions", comment: "")
-            
-            let alertController = UIAlertController(title: NSLocalizedString("App Contains Extensions", comment: ""), message: message, preferredStyle: .alert)
-            alertController.addAction(UIAlertAction(title: UIAlertAction.cancel.title, style: UIAlertAction.cancel.style, handler: { (action) in
-                completion(.failure(OperationError.cancelled))
-            }))
-            alertController.addAction(UIAlertAction(title: NSLocalizedString("Keep App Extensions", comment: ""), style: .default) { (action) in
                 completion(.success(()))
-            })
+            }
-            alertController.addAction(UIAlertAction(title: NSLocalizedString("Remove App Extensions", comment: ""), style: .destructive) { (action) in
+            catch
+            {
+                completion(.failure(error))
+            }
+        })
+        
+        alertController.addAction(UIAlertAction(title: NSLocalizedString("Choose App Extensions", comment: ""), style: .default) { (action) in
+            let popoverContentController = AppExtensionViewHostingController(extensions: extensions) { (selection) in
                 do
                 {
-                    for appExtension in application.appExtensions
+                    for appExtension in selection
                     {
                         print("Deleting extension \(appExtension.bundleIdentifier)")
+                        
                         try FileManager.default.removeItem(at: appExtension.fileURL)
                     }
-                    
                     completion(.success(()))
                 }
                 catch
                 {
                     completion(.failure(error))
                 }
-            })
+                return nil
-            
-            if let presentingViewController {
-                alertController.addAction(UIAlertAction(title: NSLocalizedString("Choose App Extensions", comment: ""), style: .default) { (action) in
-                    let popoverContentController = AppExtensionViewHostingController(extensions: extensions) { (selection) in
-                        do
-                        {
-                            for appExtension in selection
-                            {
-                                print("Deleting extension \(appExtension.bundleIdentifier)")
-                                
-                                try FileManager.default.removeItem(at: appExtension.fileURL)
-                            }
-                            completion(.success(()))
-                        }
-                        catch
-                        {
-                            completion(.failure(error))
-                        }
-                        return nil
-                    }
-                    
-                    let suiview = popoverContentController.view!
-                    suiview.translatesAutoresizingMaskIntoConstraints = false
-                    
-                    popoverContentController.modalPresentationStyle = .popover
-                    
-                    if let popoverPresentationController = popoverContentController.popoverPresentationController {
-                        popoverPresentationController.sourceView = presentingViewController.view
-                        popoverPresentationController.sourceRect = CGRect(x: 50, y: 50, width: 4, height: 4)
-                        popoverPresentationController.delegate = popoverContentController
-                        
-                        presentingViewController.present(popoverContentController, animated: true)
-                    }
-                })
-                
-                presentingViewController.present(alertController, animated: true)
             }
+            
+            let suiview = popoverContentController.view!
+            suiview.translatesAutoresizingMaskIntoConstraints = false
+            
+            popoverContentController.modalPresentationStyle = .popover
+            
+            if let popoverPresentationController = popoverContentController.popoverPresentationController {
+                popoverPresentationController.sourceView = presentingViewController.view
+                popoverPresentationController.sourceRect = CGRect(x: 50, y: 50, width: 4, height: 4)
+                popoverPresentationController.delegate = popoverContentController
+                
+                DispatchQueue.main.async {
+                    presentingViewController.present(popoverContentController, animated: true)
+                }
+            }
+            
+
+        })
+        
+        DispatchQueue.main.async {
+            presentingViewController.present(alertController, animated: true)
         }
     }