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

Verifies Sources don’t contain duplicate bundle IDs

Browse Source 
AltStore assumes all apps have unique bundle IDs per source. Weird bugs can occur when this is not the case (such as merging multiple store listings into one), so we now verify upfront whether source contains duplicate bundle IDs before saving.
This commit is contained in:
Riley Testut
2022-11-22 13:02:19 -06:00
parent 579885acd6
commit 96dec5329d
4 changed files with 76 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
AltStore/Sources/SourcesViewController.swift
View File

@@ -12,29 +12,6 @@ import CoreData
import AltStoreCore
import Roxas
struct SourceError: ALTLocalizedError
{
enum Code: Int, ALTErrorCode
{
typealias Error = SourceError
case unsupported
}
var code: Code
var errorTitle: String?
var errorFailure: String?
@Managed var source: Source
var errorFailureReason: String {
switch self.code
{
case .unsupported: return String(format: NSLocalizedString("The source “%@” is not supported by this version of AltStore.", comment: ""), self.$source.name)
}
}
}
@objc(SourcesFooterView)
private class SourcesFooterView: TextCollectionReusableView
{
@@ -241,7 +218,14 @@ private extension SourcesViewController
{
case .success: break
case .failure(OperationError.cancelled): break
case .failure(let error): self.present(error)
case .failure(var error as SourceError):
let title = String(format: NSLocalizedString("“%@” could not be added to AltStore.", comment: ""), error.$source.name)
error.errorTitle = title
self.present(error)
case .failure(let error as NSError):
self.present(error.withLocalizedTitle(NSLocalizedString("Unable to Add Source", comment: "")))
}
self.collectionView.reloadSections([Section.trusted.rawValue])
@@ -265,10 +249,6 @@ private extension SourcesViewController
let sourceName = source.name
let managedObjectContext = source.managedObjectContext
#if !BETA
guard let trustedSourceIDs = UserDefaults.shared.trustedSourceIDs, trustedSourceIDs.contains(source.identifier) else { throw SourceError(code: .unsupported, source: source) }
#endif
// Hide warning when adding a featured trusted source.
let message = isTrusted ? nil : NSLocalizedString("Make sure to only add sources that you trust.", comment: "")
@@ -313,9 +293,10 @@ private extension SourcesViewController
}
let nsError = error as NSError
let message = nsError.userInfo[NSDebugDescriptionErrorKey] as? String ?? nsError.localizedRecoverySuggestion
let title = nsError.localizedTitle // OK if nil.
let message = [nsError.localizedDescription, nsError.localizedDebugDescription, nsError.localizedRecoverySuggestion].compactMap { $0 }.joined(separator: "\n\n")
let alertController = UIAlertController(title: error.localizedDescription, message: message, preferredStyle: .alert)
let alertController = UIAlertController(title: title, message: message, preferredStyle: .alert)
alertController.addAction(.ok)
self.present(alertController, animated: true, completion: nil)
}