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

Refactors app version comparison logic to always include buildVersion

Browse Source 
Before, whether or not the source included the buildVersion affected the comparison. If present, the buildVersion was used in comparison, if not, only the version itself was used for comparsion.

This meant it was impossible to update from a version with a buildVersion to the same version without one (e.g. going from betas to final releases). Now we _always_ consider the buildVersion in the comparsion, so an earlier entry in versions array without buildVersion can be considered “newer” even if versions match.
This commit is contained in:
Riley Testut
2023-05-26 19:12:13 -05:00
committed by Magesh K
parent 641e7d5f2e
commit 7f9ee81150
4 changed files with 35 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
AltStoreCore/Model/InstalledApp.swift
View File

@@ -60,6 +60,7 @@ public class InstalledApp: NSManagedObject, InstalledAppProtocol
@NSManaged public var hasAlternateIcon: Bool
@NSManaged public var certificateSerialNumber: String?
@NSManaged public var storeBuildVersion: String?
/* Transient */
@NSManaged public var isRefreshing: Bool
@@ -104,7 +105,7 @@ public class InstalledApp: NSManagedObject, InstalledAppProtocol
super.init(entity: entity, insertInto: context)
}
public init(resignedApp: ALTApplication, originalBundleIdentifier: String, certificateSerialNumber: String?, context: NSManagedObjectContext)
public init(resignedApp: ALTApplication, originalBundleIdentifier: String, certificateSerialNumber: String?, storeBuildVersion: String?, context: NSManagedObjectContext)
{
super.init(entity: InstalledApp.entity(), insertInto: context)
@@ -117,24 +118,30 @@ public class InstalledApp: NSManagedObject, InstalledAppProtocol
self.expirationDate = self.refreshedDate.addingTimeInterval(60 * 60 * 24 * 7) // Rough estimate until we get real values from provisioning profile.
self.update(resignedApp: resignedApp, certificateSerialNumber: certificateSerialNumber)
// In practice this update() is redundant because we always call update() again after init from callers,
// but better to have an init that is guaranteed to successfully initialize an object
// than one that has a hidden assumption a second method will be called.
self.update(resignedApp: resignedApp, certificateSerialNumber: certificateSerialNumber, storeBuildVersion: storeBuildVersion)
}
}
public extension InstalledApp
{
var localizedVersion: String {
let localizedVersion = "\(self.version) (\(self.buildVersion))"
guard let storeBuildVersion else { return self.version }
let localizedVersion = "\(self.version) (\(storeBuildVersion))"
return localizedVersion
}
func update(resignedApp: ALTApplication, certificateSerialNumber: String?)
func update(resignedApp: ALTApplication, certificateSerialNumber: String?, storeBuildVersion: String?)
{
self.name = resignedApp.name
self.resignedBundleIdentifier = resignedApp.bundleIdentifier
self.version = resignedApp.version
self.buildVersion = resignedApp.buildVersion
self.storeBuildVersion = storeBuildVersion
self.certificateSerialNumber = certificateSerialNumber
@@ -178,14 +185,7 @@ public extension InstalledApp
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)
let matchesAppVersion = (self.version == appVersion.version && self.storeBuildVersion == appVersion.buildVersion)
return matchesAppVersion
}
}
@@ -207,14 +207,18 @@ public extension InstalledApp
"AND",
// (latestSupportedVersion.version != installedApp.version || (latestSupportedVersion.buildVersion != nil && latestSupportedVersion.buildVersion != installedApp.buildVersion))
"(%K != %K OR (%K != '' AND %K != %K))",
// latestSupportedVersion.version != installedApp.version || latestSupportedVersion.buildVersion != installedApp.storeBuildVersion
//
// We have to also check !(latestSupportedVersion.buildVersion == '' && installedApp.storeBuildVersion == nil)
// because latestSupportedVersion.buildVersion stores an empty string for nil, while installedApp.storeBuildVersion uses NULL.
"(%K != %K OR (%K != %K AND NOT (%K == '' AND %K == nil)))",
].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))
#keyPath(InstalledApp.storeApp.latestSupportedVersion._buildVersion), #keyPath(InstalledApp.storeBuildVersion),
#keyPath(InstalledApp.storeApp.latestSupportedVersion._buildVersion), #keyPath(InstalledApp.storeBuildVersion))
return fetchRequest
}