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

Fixes showing “Update” button on app store page when no supported update is available

Browse Source
This commit is contained in:
Riley Testut
2023-05-18 17:44:54 -05:00
parent eebb777422
commit eb81fee411
2 changed files with 7 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
AltStore/App Detail/AppViewController.swift
View File

@@ -346,7 +346,7 @@ private extension AppViewController
if let installedApp = self.app.installedApp if let installedApp = self.app.installedApp
{ {
if let latestVersion = self.app.latestAvailableVersion, !installedApp.matches(latestVersion) if let latestVersion = self.app.latestSupportedVersion, !installedApp.matches(latestVersion)
{ {
button.setTitle(NSLocalizedString("UPDATE", comment: ""), for: .normal) button.setTitle(NSLocalizedString("UPDATE", comment: ""), for: .normal)
} }
@@ -364,7 +364,7 @@ private extension AppViewController
button.progress = progress button.progress = progress
} }
if let versionDate = self.app.latestAvailableVersion?.date, versionDate > Date() if let versionDate = self.app.latestSupportedVersion?.date, versionDate > Date()
{ {
self.bannerView.button.countdownDate = versionDate self.bannerView.button.countdownDate = versionDate
self.navigationBarDownloadButton.countdownDate = versionDate self.navigationBarDownloadButton.countdownDate = versionDate
@@ -500,7 +500,7 @@ extension AppViewController
{ {
if let installedApp = self.app.installedApp if let installedApp = self.app.installedApp
{ {
if let latestVersion = self.app.latestAvailableVersion, !installedApp.matches(latestVersion) if let latestVersion = self.app.latestSupportedVersion, !installedApp.matches(latestVersion)
{ {
self.updateApp(installedApp) self.updateApp(installedApp)
} }
@@ -562,7 +562,7 @@ extension AppViewController
return return
} }
_ = AppManager.shared.update(installedApp, to: .latestAvailableVersionWithFallback, presentingViewController: self) { (result) in _ = AppManager.shared.update(installedApp, presentingViewController: self) { (result) in
DispatchQueue.main.async { DispatchQueue.main.async {
switch result switch result
{ {

19
AltStore/Managing Apps/AppManager.swift
View File

@@ -25,12 +25,6 @@ extension AppManager
static let expirationWarningNotificationID = "altstore-expiration-warning" static let expirationWarningNotificationID = "altstore-expiration-warning"
static let enableJITResultNotificationID = "altstore-enable-jit" static let enableJITResultNotificationID = "altstore-enable-jit"
enum PreferredAppVersion
{
case latestSupportedVersion
case latestAvailableVersionWithFallback
}
} }
class AppManagerPublisher: ObservableObject class AppManagerPublisher: ObservableObject
@@ -545,16 +539,9 @@ extension AppManager
} }
@discardableResult @discardableResult
func update(_ installedApp: InstalledApp, to preferredAppVersion: PreferredAppVersion = .latestSupportedVersion, presentingViewController: UIViewController?, context: AuthenticatedOperationContext = AuthenticatedOperationContext(), completionHandler: @escaping (Result<InstalledApp, Error>) -> Void) -> Progress func update(_ installedApp: InstalledApp, presentingViewController: UIViewController?, context: AuthenticatedOperationContext = AuthenticatedOperationContext(), completionHandler: @escaping (Result<InstalledApp, Error>) -> Void) -> Progress
{ {
let preferredApp: AppProtocol? guard let appVersion = installedApp.storeApp?.latestSupportedVersion else {
switch preferredAppVersion
{
case .latestSupportedVersion: preferredApp = installedApp.storeApp?.latestSupportedVersion
case .latestAvailableVersionWithFallback: preferredApp = installedApp.storeApp // Use StoreApp directly to correctly handle min/max OS versions in DownloadAppOperation.
}
guard let app = preferredApp else {
completionHandler(.failure(OperationError.appNotFound(name: installedApp.name))) completionHandler(.failure(OperationError.appNotFound(name: installedApp.name)))
return Progress.discreteProgress(totalUnitCount: 1) return Progress.discreteProgress(totalUnitCount: 1)
} }
@@ -572,7 +559,7 @@ extension AppManager
} }
} }
let operation = AppOperation.update(app) let operation = AppOperation.update(appVersion)
assert(operation.app as AnyObject !== installedApp) // Make sure we never accidentally "update" to already installed app. assert(operation.app as AnyObject !== installedApp) // Make sure we never accidentally "update" to already installed app.
self.perform([operation], presentingViewController: presentingViewController, group: group) self.perform([operation], presentingViewController: presentingViewController, group: group)