Merge branch 'develop-lc' into LiveContainerSupport2

Author: hugeBlack

AltStore.xcodeproj/project.pbxproj

@@ -3,7 +3,4 @@
 //
 
 #import "NSAttributedString+Markdown.h"
-#import "ALTAppPatcher.h"
-
-#include "fragmentzip.h"
 #include "../LiveContainerSupport/XPCServer.h"

AltStore/AltStore-Bridging-Header.h

@@ -941,70 +941,6 @@ extension AppManager
         self.run([enableJITOperation], context: context, requiresSerialQueue: true)
     }
 
-    func patch(resignedApp: ALTApplication, presentingViewController: UIViewController, context authContext: AuthenticatedOperationContext, completionHandler: @escaping (Result<InstalledApp, Error>) -> Void) -> PatchAppOperation
-    {
-        final class Context: InstallAppOperationContext, PatchAppContext
-        {
-        }
-        
-        guard let originalBundleID = resignedApp.bundle.infoDictionary?[Bundle.Info.altBundleID] as? String else {
-            let context = Context(bundleIdentifier: resignedApp.bundleIdentifier, authenticatedContext: authContext)
-            completionHandler(.failure(OperationError.invalidApp))
-            
-            return PatchAppOperation(context: context)
-        }
-        
-        let context = Context(bundleIdentifier: originalBundleID, authenticatedContext: authContext)
-        context.resignedApp = resignedApp
-        
-        let patchAppOperation = PatchAppOperation(context: context)
-        let sendAppOperation = SendAppOperation(context: context)
-        let installOperation = InstallAppOperation(context: context)
-        
-        let installationProgress = Progress.discreteProgress(totalUnitCount: 100)
-        installationProgress.addChild(sendAppOperation.progress, withPendingUnitCount: 40)
-        installationProgress.addChild(installOperation.progress, withPendingUnitCount: 60)
-        
-        /* Patch */
-        patchAppOperation.resultHandler = { [weak patchAppOperation] (result) in
-            switch result
-            {
-            case .failure(let error):
-                context.error = error
-            case .success:
-                // Kinda hacky that we're calling patchAppOperation's progressHandler manually, but YOLO.
-                patchAppOperation?.progressHandler?(installationProgress, NSLocalizedString("Patching placeholder app...", comment: ""))
-            }
-        }
-        
-        /* Send */
-        sendAppOperation.resultHandler = { (result) in
-            switch result
-            {
-            case .failure(let error):
-                context.error = error
-                completionHandler(.failure(error))
-            case .success(_): print("App sent over AFC")
-            }
-        }
-        sendAppOperation.addDependency(patchAppOperation)
-
-        
-        /* Install */
-        installOperation.resultHandler = { (result) in
-            switch result
-            {
-            case .failure(let error): completionHandler(.failure(error))
-            case .success(let installedApp): completionHandler(.success(installedApp))
-            }
-            //UIApplication.shared.open(shortcutURLon, options: [:], completionHandler: nil)
-        }
-        installOperation.addDependency(sendAppOperation)
-        
-        self.run([patchAppOperation, sendAppOperation, installOperation], context: context.authenticatedContext)
-        return patchAppOperation
-    }
-    
     func installationProgress(for app: AppProtocol) -> Progress?
     {
         os_unfair_lock_lock(self.progressLock)
@@ -1392,80 +1328,6 @@ private extension AppManager
         }
         deactivateAppsOperation.addDependency(fetchProvisioningProfilesOperation)
 
-        /* Patch App */
-        let patchAppOperation = RSTAsyncBlockOperation { operation in
-            do
-            {
-                // Only attempt to patch app if we're installing a new app, not refreshing existing app.
-                // Post reboot, we install the correct jailbreak app by refreshing the patched app,
-                // so this check avoids infinite recursion.
-                guard case .install = appOperation else {
-                    operation.finish()
-                    return
-                }
-                
-                guard let presentingViewController = context.presentingViewController else { return operation.finish() }
-                
-                if let error = context.error
-                {
-                    throw error
-                }
-                
-                guard let app = context.app else {
-                    throw OperationError.invalidParameters("AppManager._install.patchAppOperation: context.app is nil")
-                }
-                
-                guard let isUntetherRequired = app.bundle.infoDictionary?[Bundle.Info.untetherRequired] as? Bool,
-                      let minimumiOSVersionString = app.bundle.infoDictionary?[Bundle.Info.untetherMinimumiOSVersion] as? String,
-                      let maximumiOSVersionString = app.bundle.infoDictionary?[Bundle.Info.untetherMaximumiOSVersion] as? String,
-                      case let minimumiOSVersion = OperatingSystemVersion(string: minimumiOSVersionString),
-                      case let maximumiOSVersion = OperatingSystemVersion(string: maximumiOSVersionString)
-                else { return operation.finish() }
-                
-                let iOSVersion = ProcessInfo.processInfo.operatingSystemVersion
-                let iOSVersionSupported = ProcessInfo.processInfo.isOperatingSystemAtLeast(minimumiOSVersion) &&
-                (!ProcessInfo.processInfo.isOperatingSystemAtLeast(maximumiOSVersion) || maximumiOSVersion == iOSVersion)
-                
-                guard isUntetherRequired, iOSVersionSupported, UIDevice.current.supportsFugu14 else { return operation.finish() }
-                
-                guard let patchAppLink = app.bundle.infoDictionary?[Bundle.Info.untetherURL] as? String,
-                      let patchAppURL = URL(string: patchAppLink)
-                else { throw OperationError.invalidApp }
-                
-                let patchApp = AnyApp(name: app.name, bundleIdentifier: context.bundleIdentifier, url: patchAppURL, storeApp: nil)
-                
-                DispatchQueue.main.async {
-                    let storyboard = UIStoryboard(name: "PatchApp", bundle: nil)
-                    let navigationController = storyboard.instantiateInitialViewController() as! UINavigationController
-                    
-                    let patchViewController = navigationController.topViewController as! PatchViewController
-                    patchViewController.patchApp = patchApp
-                    patchViewController.completionHandler = { [weak presentingViewController] (result) in
-                        switch result
-                        {
-                        case .failure(OperationError.cancelled): break // Ignore
-                        case .failure(let error): group.context.error = error
-                        case .success: group.context.error = OperationError.cancelled
-                        }
-                        
-                        operation.finish()
-                        
-                        DispatchQueue.main.async {
-                            presentingViewController?.dismiss(animated: true, completion: nil)
-                        }
-                    }
-                    presentingViewController.present(navigationController, animated: true, completion: nil)
-                }
-            }
-            catch
-            {
-                group.context.error = error
-                operation.finish()
-            }
-        }
-        patchAppOperation.addDependency(deactivateAppsOperation)
-        
-
         let modifyAppExBundleIdOperation = RSTAsyncBlockOperation { operation in
             if !context.useMainProfile {
                 operation.finish()
@@ -1497,7 +1359,6 @@ private extension AppManager
                 self.exportResginedAppsToDocsDir(resignedApp)
             }
         }
-        resignAppOperation.addDependency(patchAppOperation)
         resignAppOperation.addDependency(modifyAppExBundleIdOperation)
         progress.addChild(resignAppOperation.progress, withPendingUnitCount: 20)
 
@@ -1548,7 +1409,6 @@ private extension AppManager
             verifyOperation,
             removeAppExtensionsOperation,
             deactivateAppsOperation,
-            patchAppOperation,
             refreshAnisetteDataOperation,
             fetchProvisioningProfilesOperation,
             modifyAppExBundleIdOperation,