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

Supports app versions with explicit build versions

Browse Source 
AltStore will now consider an update available if either:

* The source’s marketing version doesn’t match installed app’s version
* The source declares a build version AND it doesn’t match the install app’s build version

The installed app matches an app version if both maketing versions match, and the build versions match (if provided by the source).
This commit is contained in:
Riley Testut
2023-05-18 14:51:26 -05:00
committed by Magesh K
parent efce9a8579
commit f7640e35d1
13 changed files with 130 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
AltStoreCore/Model/InstalledApp.swift
View File

@@ -49,6 +49,7 @@ public class InstalledApp: NSManagedObject, InstalledAppProtocol
@NSManaged public var bundleIdentifier: String
@NSManaged public var resignedBundleIdentifier: String
@NSManaged public var version: String
@NSManaged public var buildVersion: String
@NSManaged public var refreshedDate: Date
@NSManaged public var expirationDate: Date
@@ -118,29 +119,38 @@ public class InstalledApp: NSManagedObject, InstalledAppProtocol
self.update(resignedApp: resignedApp, certificateSerialNumber: certificateSerialNumber)
}
}
public extension InstalledApp
{
var localizedVersion: String {
let localizedVersion = "\(self.version) (\(self.buildVersion))"
return localizedVersion
}
public func update(resignedApp: ALTApplication, certificateSerialNumber: String?)
func update(resignedApp: ALTApplication, certificateSerialNumber: String?)
{
self.name = resignedApp.name
self.resignedBundleIdentifier = resignedApp.bundleIdentifier
self.version = resignedApp.version
self.buildVersion = resignedApp.buildVersion
self.certificateSerialNumber = certificateSerialNumber
if let provisioningProfile = resignedApp.provisioningProfile
{
self.update(provisioningProfile: provisioningProfile)
}
}
public func update(provisioningProfile: ALTProvisioningProfile)
func update(provisioningProfile: ALTProvisioningProfile)
{
self.refreshedDate = provisioningProfile.creationDate
self.expirationDate = provisioningProfile.expirationDate
}
public func loadIcon(completion: @escaping (Result<UIImage?, Error>) -> Void)
func loadIcon(completion: @escaping (Result<UIImage?, Error>) -> Void)
{
let hasAlternateIcon = self.hasAlternateIcon
let alternateIconURL = self.alternateIconURL
@@ -165,6 +175,19 @@ public class InstalledApp: NSManagedObject, InstalledAppProtocol
}
}
}
func matches(_ appVersion: AppVersion) -> Bool
{
// Versions MUST match exactly.
guard self.version == appVersion.version else { return false }
// If buildVersion is nil, return true because versions match.
guard let buildVersion = appVersion.buildVersion else { return true }
// If buildVersion != nil, compare buildVersions and return result.
let matchesAppVersion = (self.buildVersion == buildVersion)
return matchesAppVersion
}
}
public extension InstalledApp
@@ -186,13 +209,22 @@ public extension InstalledApp
class func supportedUpdatesFetchRequest() -> NSFetchRequest<InstalledApp>
{
let predicate = NSPredicate(format: "%K != nil AND %K != %K",
#keyPath(InstalledApp.storeApp.latestSupportedVersion),
#keyPath(InstalledApp.version), #keyPath(InstalledApp.storeApp.latestSupportedVersion.version))
let fetchRequest = InstalledApp.fetchRequest() as NSFetchRequest<InstalledApp>
let fetchRequest = InstalledApp.updatesFetchRequest()
fetchRequest.predicate = NSCompoundPredicate(andPredicateWithSubpredicates: [fetchRequest.predicate, predicate].compactMap { $0 })
let predicateFormat = [
// isActive && storeApp != nil && latestSupportedVersion != nil
"%K == YES AND %K != nil AND %K != nil",
"AND",
// (latestSupportedVersion.version != installedApp.version || (latestSupportedVersion.buildVersion != nil && latestSupportedVersion.buildVersion != installedApp.buildVersion))
"(%K != %K OR (%K != '' AND %K != %K))",
].joined(separator: " ")
fetchRequest.predicate = NSPredicate(format: predicateFormat,
#keyPath(InstalledApp.isActive), #keyPath(InstalledApp.storeApp), #keyPath(InstalledApp.storeApp.latestSupportedVersion),
#keyPath(InstalledApp.storeApp.latestSupportedVersion.version), #keyPath(InstalledApp.version),
#keyPath(InstalledApp.storeApp.latestSupportedVersion._buildVersion), #keyPath(InstalledApp.storeApp.latestSupportedVersion._buildVersion), #keyPath(InstalledApp.buildVersion))
return fetchRequest
}