neoarz/SideStore
1
0
Fork 0
mirror of https://github.com/SideStore/SideStore.git synced 2026-02-16 18:23:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Moves minimum iOS version check to VerifyAppOperation

Browse Source
This commit is contained in:
Riley Testut
2021-02-26 13:46:49 -06:00
parent acc202031c
commit 77c085ef1a
3 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AltStore/Operations/DownloadAppOperation.swift
View File

@@ -80,8 +80,6 @@ class DownloadAppOperation: ResultOperation<ALTApplication>
guard let application = ALTApplication(fileURL: appBundleURL) else { throw OperationError.invalidApp } guard let application = ALTApplication(fileURL: appBundleURL) else { throw OperationError.invalidApp }
guard ProcessInfo.processInfo.isOperatingSystemAtLeast(application.minimumiOSVersion) else { throw OperationError.iOSVersionNotSupported(application) }
try FileManager.default.copyItem(at: appBundleURL, to: self.destinationURL, shouldReplace: true) try FileManager.default.copyItem(at: appBundleURL, to: self.destinationURL, shouldReplace: true)
if self.context.bundleIdentifier == StoreApp.dolphinAppID, self.context.bundleIdentifier != application.bundleIdentifier if self.context.bundleIdentifier == StoreApp.dolphinAppID, self.context.bundleIdentifier != application.bundleIdentifier

13
AltStore/Operations/OperationError.swift
View File

@@ -24,7 +24,6 @@ enum OperationError: LocalizedError
case invalidApp case invalidApp
case invalidParameters case invalidParameters
case iOSVersionNotSupported(ALTApplication)
case maximumAppIDLimitReached(application: ALTApplication, requiredAppIDs: Int, availableAppIDs: Int, nextExpirationDate: Date) case maximumAppIDLimitReached(application: ALTApplication, requiredAppIDs: Int, availableAppIDs: Int, nextExpirationDate: Date)
case noSources case noSources
@@ -46,18 +45,6 @@ enum OperationError: LocalizedError
case .noSources: return NSLocalizedString("There are no AltStore sources.", comment: "") case .noSources: return NSLocalizedString("There are no AltStore sources.", comment: "")
case .openAppFailed(let name): return String(format: NSLocalizedString("AltStore was denied permission to launch %@.", comment: ""), name) case .openAppFailed(let name): return String(format: NSLocalizedString("AltStore was denied permission to launch %@.", comment: ""), name)
case .missingAppGroup: return NSLocalizedString("AltStore's shared app group could not be found.", comment: "") case .missingAppGroup: return NSLocalizedString("AltStore's shared app group could not be found.", comment: "")
case .iOSVersionNotSupported(let app):
let name = app.name
var version = "iOS \(app.minimumiOSVersion.majorVersion).\(app.minimumiOSVersion.minorVersion)"
if app.minimumiOSVersion.patchVersion > 0
{
version += ".\(app.minimumiOSVersion.patchVersion)"
}
let localizedDescription = String(format: NSLocalizedString("%@ requires %@.", comment: ""), name, version)
return localizedDescription
case .maximumAppIDLimitReached: return NSLocalizedString("Cannot register more than 10 App IDs.", comment: "") case .maximumAppIDLimitReached: return NSLocalizedString("Cannot register more than 10 App IDs.", comment: "")
} }
} }

21
AltStore/Operations/VerifyAppOperation.swift
View File

@@ -15,12 +15,14 @@ enum VerificationError: ALTLocalizedError
{ {
case privateEntitlements(ALTApplication, entitlements: [String: Any]) case privateEntitlements(ALTApplication, entitlements: [String: Any])
case mismatchedBundleIdentifiers(ALTApplication, sourceBundleID: String) case mismatchedBundleIdentifiers(ALTApplication, sourceBundleID: String)
case iOSVersionNotSupported(ALTApplication)
var app: ALTApplication { var app: ALTApplication {
switch self switch self
{ {
case .privateEntitlements(let app, _): return app case .privateEntitlements(let app, _): return app
case .mismatchedBundleIdentifiers(let app, _): return app case .mismatchedBundleIdentifiers(let app, _): return app
case .iOSVersionNotSupported(let app): return app
} }
} }
@@ -36,6 +38,18 @@ enum VerificationError: ALTLocalizedError
case .mismatchedBundleIdentifiers(let app, let sourceBundleID): case .mismatchedBundleIdentifiers(let app, let sourceBundleID):
return String(format: NSLocalizedString("The bundle ID “%@” does not match the one specified by the source (“%@”).", comment: ""), app.bundleIdentifier, sourceBundleID) return String(format: NSLocalizedString("The bundle ID “%@” does not match the one specified by the source (“%@”).", comment: ""), app.bundleIdentifier, sourceBundleID)
case .iOSVersionNotSupported(let app):
let name = app.name
var version = "iOS \(app.minimumiOSVersion.majorVersion).\(app.minimumiOSVersion.minorVersion)"
if app.minimumiOSVersion.patchVersion > 0
{
version += ".\(app.minimumiOSVersion.patchVersion)"
}
let localizedDescription = String(format: NSLocalizedString("%@ requires %@.", comment: ""), name, version)
return localizedDescription
} }
} }
} }
@@ -69,7 +83,11 @@ class VerifyAppOperation: ResultOperation<Void>
guard app.bundleIdentifier == self.context.bundleIdentifier else { guard app.bundleIdentifier == self.context.bundleIdentifier else {
throw VerificationError.mismatchedBundleIdentifiers(app, sourceBundleID: self.context.bundleIdentifier) throw VerificationError.mismatchedBundleIdentifiers(app, sourceBundleID: self.context.bundleIdentifier)
} }
guard ProcessInfo.processInfo.isOperatingSystemAtLeast(app.minimumiOSVersion) else {
throw VerificationError.iOSVersionNotSupported(app)
}
if #available(iOS 13.5, *) if #available(iOS 13.5, *)
{ {
// No psychic paper, so we can ignore private entitlements // No psychic paper, so we can ignore private entitlements
@@ -149,6 +167,7 @@ private extension VerifyAppOperation
presentingViewController.present(alertController, animated: true, completion: nil) presentingViewController.present(alertController, animated: true, completion: nil)
case .mismatchedBundleIdentifiers: return completion(.failure(error)) case .mismatchedBundleIdentifiers: return completion(.failure(error))
case .iOSVersionNotSupported: return completion(.failure(error))
} }
} }
} }