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

Updates SourceError.blocked recovery suggestion to list installed/blocked apps

Browse Source 
If source is already added, the error message will list all installed apps from the source.

If adding source for first time, the error message will mention exactly which apps have been blocked from the source (if provided).
This commit is contained in:
Riley Testut
2023-05-16 15:39:38 -05:00
committed by Magesh K
parent 177d453491
commit 5a2f32704c
8 changed files with 202 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
AltStore/Operations/UpdateKnownSourcesOperation.swift
View File

@@ -19,22 +19,16 @@ private extension URL
extension UpdateKnownSourcesOperation
{
struct Source: Decodable
{
var identifier: String
var sourceURL: URL?
}
private struct Response: Decodable
{
var version: Int
var trusted: [Source]
var blocked: [Source]?
var trusted: [KnownSource]?
var blocked: [KnownSource]?
}
}
class UpdateKnownSourcesOperation: ResultOperation<([UpdateKnownSourcesOperation.Source], [UpdateKnownSourcesOperation.Source])>
class UpdateKnownSourcesOperation: ResultOperation<([KnownSource], [KnownSource])>
{
override func main()
{
@@ -54,17 +48,11 @@ class UpdateKnownSourcesOperation: ResultOperation<([UpdateKnownSourcesOperation
guard let data = data else { throw error! }
let response = try Foundation.JSONDecoder().decode(Response.self, from: data)
let sources = (trusted: response.trusted, blocked: response.blocked ?? [])
let sources = (trusted: response.trusted ?? [], blocked: response.blocked ?? [])
// Cache trusted sources
let trustedSourceIDs = Set(sources.trusted.map { $0.identifier })
UserDefaults.shared.trustedSourceIDs = trustedSourceIDs
// Cache blocked sources
let blockedSourceIDs = Set(sources.blocked.map { $0.identifier })
let blockedSourceURLs = Set(sources.blocked.compactMap { $0.sourceURL })
UserDefaults.shared.blockedSourceIDs = blockedSourceIDs
UserDefaults.shared.blockedSourceURLs = blockedSourceURLs
// Cache sources
UserDefaults.shared.trustedSources = sources.trusted
UserDefaults.shared.blockedSources = sources.blocked
self.finish(.success(sources))
}