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

Improves 10 App ID limit error handling

Browse Source
This commit is contained in:
Riley Testut
2020-01-24 14:14:08 -08:00
parent e823d5f621
commit b196981c89
7 changed files with 123 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
AltStore/My Apps/MyAppsViewController.swift
View File

@@ -383,9 +383,8 @@ private extension MyAppsViewController
switch result
{
case .failure(let error):
let toastView = ToastView(text: error.localizedDescription, detailText: nil)
toastView.setNeedsLayout()
toastView.show(in: self.navigationController?.view ?? self.view, duration: 2.0)
let toastView = ToastView(error: error)
toastView.show(in: self)
case .success(let results):
let failures = results.compactMapValues { (result) -> Error? in
@@ -399,22 +398,32 @@ private extension MyAppsViewController
guard !failures.isEmpty else { break }
let localizedText: String
let detailText: String?
let toastView: ToastView
if let failure = failures.first, failures.count == 1
if let failure = failures.first, results.count == 1
{
localizedText = failure.value.localizedDescription
detailText = nil
toastView = ToastView(error: failure.value)
}
else
{
localizedText = String(format: NSLocalizedString("Failed to refresh %@ apps.", comment: ""), NSNumber(value: failures.count))
detailText = failures.first?.value.localizedDescription
let localizedText: String
if failures.count == 1
{
localizedText = NSLocalizedString("Failed to refresh 1 app.", comment: "")
}
else
{
localizedText = String(format: NSLocalizedString("Failed to refresh %@ apps.", comment: ""), NSNumber(value: failures.count))
}
let detailText = failures.first?.value.localizedDescription
toastView = ToastView(text: localizedText, detailText: detailText)
toastView.preferredDuration = 2.0
}
let toastView = ToastView(text: localizedText, detailText: detailText)
toastView.show(in: self.navigationController?.view ?? self.view, duration: 2.0)
toastView.show(in: self)
}
self.refreshGroup = nil
@@ -574,8 +583,8 @@ private extension MyAppsViewController
self.collectionView.reloadItems(at: [indexPath])
case .failure(let error):
let toastView = ToastView(text: error.localizedDescription, detailText: nil)
toastView.show(in: self.navigationController?.view ?? self.view, duration: 2)
let toastView = ToastView(error: error)
toastView.show(in: self)
self.collectionView.reloadItems(at: [indexPath])
@@ -637,8 +646,8 @@ private extension MyAppsViewController
DispatchQueue.main.async {
if let error = result.error
{
let toastView = ToastView(text: error.localizedDescription, detailText: nil)
toastView.show(in: self.navigationController?.view ?? self.view, duration: 2.0)
let toastView = ToastView(error: error)
toastView.show(in: self)
}
else
{
@@ -666,8 +675,8 @@ private extension MyAppsViewController
DispatchQueue.main.async {
self.navigationItem.leftBarButtonItem?.isIndicatingActivity = false
let toastView = ToastView(text: error.localizedDescription, detailText: nil)
toastView.show(in: self.navigationController?.view ?? self.view, duration: 2.0)
let toastView = ToastView(error: error)
toastView.show(in: self)
}
completion(.failure(error))