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

Improves error message when registering app + app extension after App ID limit is reached

Browse Source
This commit is contained in:
Riley Testut
2020-02-10 16:30:54 -08:00
parent 9a50774f5f
commit 390a770115
4 changed files with 123 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
AltStore/Operations/OperationError.swift
View File

@@ -24,7 +24,7 @@ enum OperationError: LocalizedError
case invalidParameters
case iOSVersionNotSupported(ALTApplication)
case maximumAppIDLimitReached(Date)
case maximumAppIDLimitReached(application: ALTApplication, requiredAppIDs: Int, availableAppIDs: Int, nextExpirationDate: Date)
case noSources
@@ -58,26 +58,38 @@ enum OperationError: LocalizedError
var recoverySuggestion: String? {
switch self
{
case .maximumAppIDLimitReached(let date):
let remainingTime: String
case .maximumAppIDLimitReached(let application, let requiredAppIDs, let availableAppIDs, let date):
let baseMessage = NSLocalizedString("Delete sideloaded apps to free up App ID slots.", comment: "")
let message: String
let numberOfDays = date.numberOfCalendarDays(since: Date())
switch numberOfDays {
case 0:
let components = Calendar.current.dateComponents([.hour], from: Date(), to: date)
let numberOfHours = components.hour!
if requiredAppIDs > 1
{
let availableText: String
switch numberOfHours
switch availableAppIDs
{
case 1: remainingTime = NSLocalizedString("1 hour", comment: "")
default: remainingTime = String(format: NSLocalizedString("%@ hours", comment: ""), NSNumber(value: numberOfHours))
case 0: availableText = NSLocalizedString("none are available", comment: "")
case 1: availableText = NSLocalizedString("only 1 is available", comment: "")
default: availableText = String(format: NSLocalizedString("only %@ are available", comment: ""), NSNumber(value: availableAppIDs))
}
case 1: remainingTime = NSLocalizedString("1 day", comment: "")
default: remainingTime = String(format: NSLocalizedString("%@ days", comment: ""), NSNumber(value: numberOfDays))
let prefixMessage = String(format: NSLocalizedString("%@ requires %@ App IDs, but %@.", comment: ""), application.name, NSNumber(value: requiredAppIDs), availableText)
message = prefixMessage + " " + baseMessage
}
else
{
let dateComponents = Calendar.current.dateComponents([.day, .hour, .minute], from: Date(), to: date)
let dateComponentsFormatter = DateComponentsFormatter()
dateComponentsFormatter.maximumUnitCount = 1
dateComponentsFormatter.unitsStyle = .full
let remainingTime = dateComponentsFormatter.string(from: dateComponents)!
let remainingTimeMessage = String(format: NSLocalizedString("You can register another App ID in %@.", comment: ""), remainingTime)
message = baseMessage + " " + remainingTimeMessage
}
let message = String(format: NSLocalizedString("Delete sideloaded apps to free up App ID slots. You can register another App ID in %@.", comment: ""), remainingTime)
return message
default: return nil