neoarz/SideStore
1
0
Fork 0
mirror of https://github.com/SideStore/SideStore.git synced 2026-02-09 06:43:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

[AppManager]: Fix: Added bac missing removeAppExtensionsOperation in run operations group and improved erorr handling

Browse Source
This commit is contained in:
Magesh K
2024-12-13 20:18:23 +05:30
parent 90a1f4dd83
commit 6c60c2092c
1 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
AltStore/Managing Apps/AppManager.swift
View File

@@ -213,7 +213,9 @@ extension AppManager
authenticationOperation.resultHandler = { (result) in authenticationOperation.resultHandler = { (result) in
switch result switch result
{ {
case .failure(let error): context.error = error case .failure(let error):
context.error = error
completionHandler(.failure(error))
case .success: break case .success: break
} }
@@ -324,6 +326,7 @@ extension AppManager
do do
{ {
_ = LoggedError(error: sanitizedError, app: app, operation: operation, context: context) _ = LoggedError(error: sanitizedError, app: app, operation: operation, context: context)
print("AppManager.log(): error:\(sanitizedError) app:\(app.bundleIdentifier) operation:\(operation)")
try context.save() try context.save()
} }
catch let saveError catch let saveError
@@ -955,7 +958,9 @@ extension AppManager
patchAppOperation.resultHandler = { [weak patchAppOperation] (result) in patchAppOperation.resultHandler = { [weak patchAppOperation] (result) in
switch result switch result
{ {
case .failure(let error): context.error = error case .failure(let error):
context.error = error
completionHandler(.failure(error))
case .success: case .success:
// Kinda hacky that we're calling patchAppOperation's progressHandler manually, but YOLO. // Kinda hacky that we're calling patchAppOperation's progressHandler manually, but YOLO.
patchAppOperation?.progressHandler?(installationProgress, NSLocalizedString("Patching placeholder app...", comment: "")) patchAppOperation?.progressHandler?(installationProgress, NSLocalizedString("Patching placeholder app...", comment: ""))
@@ -966,7 +971,9 @@ extension AppManager
sendAppOperation.resultHandler = { (result) in sendAppOperation.resultHandler = { (result) in
switch result switch result
{ {
case .failure(let error): context.error = error case .failure(let error):
context.error = error
completionHandler(.failure(error))
case .success(_): print("App sent over AFC") case .success(_): print("App sent over AFC")
} }
} }
@@ -1460,6 +1467,7 @@ private extension AppManager
catch catch
{ {
context.error = error context.error = error
completionHandler(.failure(error))
} }
} }
verifyOperation.addDependency(downloadOperation) verifyOperation.addDependency(downloadOperation)
@@ -1487,7 +1495,7 @@ private extension AppManager
throw OperationError.invalidParameters("AppManager._install.removeAppExtensionsOperation: context.app is nil") throw OperationError.invalidParameters("AppManager._install.removeAppExtensionsOperation: context.app is nil")
} }
self?.removeAppExtensions(from: currentApp, self?.removeAppExtensions(from: currentApp,
existingApp: app as? InstalledApp, existingApp: app as? InstalledApp,
extensions: extensions, extensions: extensions,
@@ -1722,7 +1730,21 @@ private extension AppManager
progress.addChild(installOperation.progress, withPendingUnitCount: 30) progress.addChild(installOperation.progress, withPendingUnitCount: 30)
installOperation.addDependency(sendAppOperation) installOperation.addDependency(sendAppOperation)
var operations = [verifyPledgeOperation, downloadOperation, verifyOperation, deactivateAppsOperation, patchAppOperation, refreshAnisetteDataOperation, fetchProvisioningProfilesOperation, resignAppOperation, sendAppOperation, installOperation].compactMap { $0 } // Operations picked for request
var operations = [
verifyPledgeOperation,
downloadOperation,
verifyOperation,
removeAppExtensionsOperation,
deactivateAppsOperation,
patchAppOperation,
refreshAnisetteDataOperation,
fetchProvisioningProfilesOperation,
resignAppOperation,
sendAppOperation,
installOperation
].compactMap { $0 }
group.add(operations) group.add(operations)
if let storeApp = downloadingApp.storeApp, storeApp.isPledgeRequired if let storeApp = downloadingApp.storeApp, storeApp.isPledgeRequired