Merge pull request #944 from SideStore/develop

Merge develop into main for 0.6.1 release

AltStore/Managing Apps/AppManager.swift

@@ -993,7 +993,6 @@ extension AppManager
             case .failure(let error): completionHandler(.failure(error))
             case .success(let installedApp): completionHandler(.success(installedApp))
             }
-            //UIApplication.shared.open(shortcutURLon, options: [:], completionHandler: nil)
         }
         installOperation.addDependency(sendAppOperation)
         

AltStore/Operations/InstallAppOperation.swift

@@ -13,8 +13,6 @@ import AltSign
 import Roxas
 import minimuxer
 
-let shortcutURLonDelay = URL(string: "shortcuts://run-shortcut?name=TurnOnDataDelay")!
-
 @objc(InstallAppOperation)
 final class InstallAppOperation: ResultOperation<InstalledApp>
 {
@@ -206,10 +204,6 @@ final class InstallAppOperation: ResultOperation<InstalledApp>
                             let alert = UIAlertController(title: "Finish Refresh", message: "Please reopen SideStore after the process is finished.To finish refreshing, SideStore must be moved to the background. To do this, you can either go to the Home Screen manually or by hitting Continue. Please reopen SideStore after doing this.", preferredStyle: .alert)
                             alert.addAction(UIAlertAction(title: NSLocalizedString("Continue", comment: ""), style: .default, handler: { _ in
                                 print("Going home")
-                                // Cell Shortcut
-                                UIApplication.shared.open(shortcutURLonDelay, options: [:]) { _ in
-                                    print("Cell OFF Shortcut finished execution.")}
-                                    
                                 UIApplication.shared.perform(#selector(NSXPCConnection.suspend))
                             }))
 
@@ -226,8 +220,6 @@ final class InstallAppOperation: ResultOperation<InstalledApp>
                             }
                         }
                     }
-                    // Cell Shortcut
-                    UIApplication.shared.open(shortcutURLonDelay, options: [:]) { _ in print("Cell OFF Shortcut finished execution.")}
                     UIApplication.shared.perform(#selector(NSXPCConnection.suspend))
                 }
             }

AltStore/Operations/Patch App/PatchAppOperation.swift

@@ -212,6 +212,7 @@ private extension PatchAppOperation
             #if targetEnvironment(simulator)
             throw PatchAppError.unsupportedOperatingSystemVersion(ProcessInfo.processInfo.operatingSystemVersion)
             #else
+            
             let spotlightPath = "Applications/Spotlight.app/Spotlight"
             let spotlightFileURL = self.patchDirectory.appendingPathComponent(spotlightPath)
             

AltStore/Operations/SendAppOperation.swift

@@ -27,48 +27,39 @@ final class SendAppOperation: ResultOperation<()>
         self.progress.totalUnitCount = 1
     }
     
-    override func main() {
+    override func main()
+    {
         super.main()
-
-        if let error = self.context.error {
+        
+        if let error = self.context.error
+        {
             return self.finish(.failure(error))
         }
-
+        
         guard let resignedApp = self.context.resignedApp else {
             return self.finish(.failure(OperationError.invalidParameters("SendAppOperation.main: self.resignedApp is nil")))
         }
-
-        let shortcutURLoff = URL(string: "shortcuts://run-shortcut?name=TurnOffData")!
-
+                
+        // self.context.resignedApp.fileURL points to the app bundle, but we want the .ipa.
         let app = AnyApp(name: resignedApp.name, bundleIdentifier: self.context.bundleIdentifier, url: resignedApp.fileURL, storeApp: nil)
         let fileURL = InstalledApp.refreshedIPAURL(for: app)
+        
         print("AFC App `fileURL`: \(fileURL.absoluteString)")
-
-        // Wait for Shortcut to Finish Before Proceeding
-        UIApplication.shared.open(shortcutURLoff, options: [:]) { _ in
-            print("Shortcut finished execution. Proceeding with file transfer.")
-
-            DispatchQueue.global().async {
-                self.processFile(at: fileURL, for: app.bundleIdentifier)
+        
+        if let data = NSData(contentsOf: fileURL) {
+            do {
+                let bytes = Data(data).toRustByteSlice()
+                try yeet_app_afc(app.bundleIdentifier, bytes.forRust())
+                self.progress.completedUnitCount += 1
+                self.finish(.success(()))
+            } catch {
+                self.finish(.failure(MinimuxerError.RwAfc))
+                self.progress.completedUnitCount += 1
+                self.finish(.success(()))
             }
-        }
-    }
-
-    private func processFile(at fileURL: URL, for bundleIdentifier: String) {
-        guard let data = NSData(contentsOf: fileURL) else {
+        } else {
             print("IPA doesn't exist????")
-            return self.finish(.failure(OperationError(.appNotFound(name: bundleIdentifier))))
-        }
-
-        do {
-            let bytes = Data(data).toRustByteSlice()
-            try yeet_app_afc(bundleIdentifier, bytes.forRust())
-            self.progress.completedUnitCount += 1
-            self.finish(.success(()))
-        } catch {
-            self.finish(.failure(MinimuxerError.RwAfc))
-            self.progress.completedUnitCount += 1
-            self.finish(.success(()))
+            self.finish(.failure(OperationError(.appNotFound(name: resignedApp.name))))
         }
     }
 }