From 3aa041d2adc9602c177b72d9ce9903e174c17737 Mon Sep 17 00:00:00 2001 From: Riley Testut Date: Thu, 18 May 2023 15:50:53 -0500 Subject: [PATCH] [AltStoreCore] Renames StoreApp.latestVersionString to _version --- AltStoreCore/Model/InstalledApp.swift | 2 +- .../Policies/StoreApp10ToStoreApp11Policy.swift | 2 +- AltStoreCore/Model/StoreApp.swift | 13 +++++++------ 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/AltStoreCore/Model/InstalledApp.swift b/AltStoreCore/Model/InstalledApp.swift index e612aea9..ac2915f6 100644 --- a/AltStoreCore/Model/InstalledApp.swift +++ b/AltStoreCore/Model/InstalledApp.swift @@ -203,7 +203,7 @@ public extension InstalledApp fetchRequest.predicate = NSPredicate(format: "%K == YES AND %K != nil AND %K != %K", #keyPath(InstalledApp.isActive), #keyPath(InstalledApp.storeApp), - #keyPath(InstalledApp.version), #keyPath(InstalledApp.storeApp.latestVersionString)) + #keyPath(InstalledApp.version), #keyPath(InstalledApp.storeApp._version)) return fetchRequest } diff --git a/AltStoreCore/Model/Migrations/Policies/StoreApp10ToStoreApp11Policy.swift b/AltStoreCore/Model/Migrations/Policies/StoreApp10ToStoreApp11Policy.swift index aba473f8..7ca75c60 100644 --- a/AltStoreCore/Model/Migrations/Policies/StoreApp10ToStoreApp11Policy.swift +++ b/AltStoreCore/Model/Migrations/Policies/StoreApp10ToStoreApp11Policy.swift @@ -22,7 +22,7 @@ fileprivate extension NSManagedObject } var storeAppVersion: String? { - let version = self.value(forKey: #keyPath(StoreApp.latestVersionString)) as? String + let version = self.value(forKey: #keyPath(StoreApp._version)) as? String return version } diff --git a/AltStoreCore/Model/StoreApp.swift b/AltStoreCore/Model/StoreApp.swift index 3114d40e..217a1dc6 100644 --- a/AltStoreCore/Model/StoreApp.swift +++ b/AltStoreCore/Model/StoreApp.swift @@ -106,16 +106,14 @@ public class StoreApp: NSManagedObject, Decodable, Fetchable @NSManaged public private(set) var iconURL: URL @NSManaged public private(set) var screenshotURLs: [URL] - @NSManaged @objc(version) public private(set) var latestVersionString: String - @NSManaged @objc(versionDate) internal private(set) var _versionDate: Date - @NSManaged @objc(versionDescription) internal private(set) var _versionDescription: String? - @NSManaged @objc(downloadURL) internal var _downloadURL: URL @NSManaged public private(set) var platformURLs: PlatformURLs? @NSManaged public private(set) var tintColor: UIColor? @NSManaged public private(set) var isBeta: Bool + @NSManaged public var sortIndex: Int32 + @objc public internal(set) var sourceIdentifier: String? { get { self.willAccessValue(forKey: #keyPath(sourceIdentifier)) @@ -137,7 +135,10 @@ public class StoreApp: NSManagedObject, Decodable, Fetchable } @NSManaged private var primitiveSourceIdentifier: String? - @NSManaged public var sortIndex: Int32 + // Legacy (kept for backwards compatibility) + @NSManaged @objc(version) internal private(set) var _version: String + @NSManaged @objc(versionDate) internal private(set) var _versionDate: Date + @NSManaged @objc(versionDescription) internal private(set) var _versionDescription: String? /* Relationships */ @NSManaged public var installedApp: InstalledApp? @@ -365,7 +366,7 @@ internal extension StoreApp } // Preserve backwards compatibility by assigning legacy property values. - self.latestVersionString = latestVersion.version + self._version = latestVersion.version self._versionDate = latestVersion.date self._versionDescription = latestVersion.localizedDescription self._downloadURL = latestVersion.downloadURL