Replace some Roxas with Roxas UI

Signed-off-by: Joseph Mattello <mail@joemattiello.com>
2026-04-05 18:25:41 +02:00 · 2023-02-25 01:38:29 -05:00
parent f270ecc537
commit a6559d8bb9
41 changed files with 55 additions and 44 deletions
--- a/AltStore.xcodeproj/project.pbxproj
+++ b/AltStore.xcodeproj/project.pbxproj
@@ -45,6 +45,8 @@
 		B34AFD1529A9D31200E637B4 /* ServerProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = B34AFD1229A9D2C100E637B4 /* ServerProtocol.swift */; };
 		B34AFD1729A9D9FC00E637B4 /* RoxasUI in Frameworks */ = {isa = PBXBuildFile; productRef = B34AFD1629A9D9FC00E637B4 /* RoxasUI */; };
 		B34AFD1929A9DB0200E637B4 /* SideKit in Frameworks */ = {isa = PBXBuildFile; productRef = B34AFD1829A9DB0200E637B4 /* SideKit */; };
+		B34AFD1B29A9DFA200E637B4 /* NSError+AltStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = B34AFD1A29A9DFA200E637B4 /* NSError+AltStore.swift */; };
+		B34AFD1C29A9DFA200E637B4 /* NSError+AltStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = B34AFD1A29A9DFA200E637B4 /* NSError+AltStore.swift */; };
 		B376FE3E29258C8900E18883 /* OSLog+SideStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = B376FE3D29258C8900E18883 /* OSLog+SideStore.swift */; };
 		B39F16132918D7C5002E9404 /* Consts.swift in Sources */ = {isa = PBXBuildFile; fileRef = B39F16122918D7C5002E9404 /* Consts.swift */; };
 		B39F16152918D7DA002E9404 /* Consts+Proxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = B39F16142918D7DA002E9404 /* Consts+Proxy.swift */; };
@@ -495,6 +497,7 @@
 		B343F87B295F7C5D002B1159 /* tlv.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tlv.c; sourceTree = "<group>"; };
 		B343F886295F7F9B002B1159 /* libfragmentzip.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = libfragmentzip.xcodeproj; path = Dependencies/libfragmentzip/libfragmentzip.xcodeproj; sourceTree = "<group>"; };
 		B34AFD1229A9D2C100E637B4 /* ServerProtocol.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ServerProtocol.swift; path = ../../../../Downloads/ServerProtocol.swift; sourceTree = "<group>"; };
+		B34AFD1A29A9DFA200E637B4 /* NSError+AltStore.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSError+AltStore.swift"; sourceTree = "<group>"; };
 		B376FE3D29258C8900E18883 /* OSLog+SideStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "OSLog+SideStore.swift"; sourceTree = "<group>"; };
 		B39575F4284F29E20080B4FF /* Roxas.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Roxas.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		B39F16122918D7C5002E9404 /* Consts.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Consts.swift; sourceTree = "<group>"; };
@@ -1657,6 +1660,7 @@
 		BFF767C32489A6800097E58C /* Extensions */ = {
 			isa = PBXGroup;
 			children = (
+				B34AFD1A29A9DFA200E637B4 /* NSError+AltStore.swift */,
 				BFBAC8852295C90300587369 /* Result+Conveniences.swift */,
 				BF1E314122A05D4C00370A3C /* Bundle+AltStore.swift */,
 				BF1FE357251A9FB000C3CE09 /* NSXPCConnection+MachServices.swift */,
@@ -2171,6 +2175,7 @@
 				BFECAC8924FD950E0077C41F /* ConnectionManager.swift in Sources */,
 				BFECAC9524FD98BB0077C41F /* CFNotificationName+AltStore.m in Sources */,
 				BFECAC8E24FD950E0077C41F /* Connection.swift in Sources */,
+				B34AFD1B29A9DFA200E637B4 /* NSError+AltStore.swift in Sources */,
 				BF10EB34248730750055E6DB /* main.swift in Sources */,
 				BF8CAE462489E772004D6CCE /* AppManager.swift in Sources */,
 				BFECAC9024FD950E0077C41F /* Bundle+AltStore.swift in Sources */,
@@ -2304,6 +2309,7 @@
 				BF8B17EB250AC40000F8157F /* FileManager+SharedDirectories.swift in Sources */,
 				BF66EEE02501AECA007EE018 /* Account.swift in Sources */,
 				BF66EED52501AECA007EE018 /* AltStore.xcdatamodeld in Sources */,
+				B34AFD1C29A9DFA200E637B4 /* NSError+AltStore.swift in Sources */,
 				BFAECC582501B0A400528F27 /* ALTConstants.m in Sources */,
 				D5F99A1A28D12B1400476A16 /* StoreApp10ToStoreApp11Policy.swift in Sources */,
 				BFAECC592501B0A400528F27 /* Result+Conveniences.swift in Sources */,
--- a/Detail/AppContentViewController.swift
+++ b/Detail/AppContentViewController.swift
@@ -9,7 +9,7 @@
 import UIKit

 import AltStoreCore
-import Roxas
+import RoxasUI

 import Nuke

--- a/Detail/AppViewController.swift
+++ b/Detail/AppViewController.swift
@@ -9,7 +9,7 @@
 import UIKit

 import AltStoreCore
-import Roxas
+import RoxasUI

 import Nuke

--- a/IDs/AppIDsViewController.swift
+++ b/IDs/AppIDsViewController.swift
@@ -9,7 +9,7 @@
 import UIKit

 import AltStoreCore
-import Roxas
+import RoxasUI

 final class AppIDsViewController: UICollectionViewController
 {
--- a/AltStore/AppDelegate.swift
+++ b/AltStore/AppDelegate.swift
@@ -13,7 +13,7 @@ import Intents

 import AltStoreCore
 import AltSign
-import Roxas
+import RoxasUI
 import EmotionalDamage

 extension AppDelegate
--- a/AltStore/Authentication/RefreshAltStoreViewController.swift
+++ b/AltStore/Authentication/RefreshAltStoreViewController.swift
@@ -10,7 +10,7 @@ import UIKit

 import AltStoreCore
 import AltSign
-import Roxas
+import RoxasUI

 final class RefreshAltStoreViewController: UIViewController
 {
--- a/AltStore/Browse/BrowseCollectionViewCell.swift
+++ b/AltStore/Browse/BrowseCollectionViewCell.swift
@@ -8,7 +8,7 @@

 import UIKit

-import Roxas
+import RoxasUI

 import Nuke

--- a/AltStore/Browse/BrowseViewController.swift
+++ b/AltStore/Browse/BrowseViewController.swift
@@ -9,7 +9,7 @@
 import UIKit

 import AltStoreCore
-import Roxas
+import RoxasUI

 import Nuke

--- a/AltStore/Browse/ScreenshotCollectionViewCell.swift
+++ b/AltStore/Browse/ScreenshotCollectionViewCell.swift
@@ -8,7 +8,7 @@

 import UIKit

-import Roxas
+import RoxasUI

@objc(ScreenshotCollectionViewCell)
 class ScreenshotCollectionViewCell: UICollectionViewCell
--- a/AltStore/Components/AppBannerView.swift
+++ b/AltStore/Components/AppBannerView.swift
@@ -9,7 +9,7 @@
 import UIKit

 import AltStoreCore
-import Roxas
+import RoxasUI

 class AppBannerView: RSTNibView
 {
--- a/AltStore/Components/NavigationBar.swift
+++ b/AltStore/Components/NavigationBar.swift
@@ -8,7 +8,7 @@

 import UIKit

-import Roxas
+import RoxasUI

 final class NavigationBar: UINavigationBar
 {
--- a/AltStore/Components/ToastView.swift
+++ b/AltStore/Components/ToastView.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2019 Riley Testut. All rights reserved.
 //

-import Roxas
+import RoxasUI

 import AltStoreCore

--- a/AltStore/LaunchViewController.swift
+++ b/AltStore/LaunchViewController.swift
@@ -7,7 +7,7 @@
 //

 import UIKit
-import Roxas
+import RoxasUI
 import EmotionalDamage
 import minimuxer

--- a/Apps/AppManager.swift
+++ b/Apps/AppManager.swift
@@ -16,7 +16,7 @@ import WidgetKit

 import AltStoreCore
 import AltSign
-import Roxas
+import RoxasUI

 extension AppManager
 {
--- a/Apps/MyAppsComponents.swift
+++ b/Apps/MyAppsComponents.swift
@@ -7,7 +7,7 @@
 //

 import UIKit
-import Roxas
+import RoxasUI

 final class InstalledAppCollectionViewCell: UICollectionViewCell
 {
--- a/Apps/MyAppsViewController.swift
+++ b/Apps/MyAppsViewController.swift
@@ -13,7 +13,7 @@ import Combine

 import AltStoreCore
 import AltSign
-import Roxas
+import RoxasUI

 import Nuke

--- a/AltStore/News/NewsViewController.swift
+++ b/AltStore/News/NewsViewController.swift
@@ -10,7 +10,7 @@ import UIKit
 import SafariServices

 import AltStoreCore
-import Roxas
+import RoxasUI

 import Nuke

--- a/AltStore/Operations/AuthenticationOperation.swift
+++ b/AltStore/Operations/AuthenticationOperation.swift
@@ -7,7 +7,7 @@
 //

 import Foundation
-import Roxas
+import RoxasUI
 import Network

 import AltStoreCore
--- a/AltStore/Operations/DeactivateAppOperation.swift
+++ b/AltStore/Operations/DeactivateAppOperation.swift
@@ -10,7 +10,7 @@ import Foundation

 import AltStoreCore
 import AltSign
-import Roxas
+import RoxasUI
 import minimuxer

@objc(DeactivateAppOperation)
--- a/AltStore/Operations/DownloadAppOperation.swift
+++ b/AltStore/Operations/DownloadAppOperation.swift
@@ -7,7 +7,7 @@
 //

 import Foundation
-import Roxas
+import RoxasUI

 import AltStoreCore
 import AltSign
--- a/AltStore/Operations/FetchAnisetteDataOperation.swift
+++ b/AltStore/Operations/FetchAnisetteDataOperation.swift
@@ -10,7 +10,7 @@ import Foundation

 import AltStoreCore
 import AltSign
-import Roxas
+import RoxasUI

@objc(FetchAnisetteDataOperation)
 final class FetchAnisetteDataOperation: ResultOperation<ALTAnisetteData>
--- a/AltStore/Operations/FetchAppIDsOperation.swift
+++ b/AltStore/Operations/FetchAppIDsOperation.swift
@@ -10,7 +10,7 @@ import Foundation

 import AltStoreCore
 import AltSign
-import Roxas
+import RoxasUI

@objc(FetchAppIDsOperation)
 final class FetchAppIDsOperation: ResultOperation<([AppID], NSManagedObjectContext)>
--- a/AltStore/Operations/FetchProvisioningProfilesOperation.swift
+++ b/AltStore/Operations/FetchProvisioningProfilesOperation.swift
@@ -10,7 +10,7 @@ import Foundation

 import AltStoreCore
 import AltSign
-import Roxas
+import RoxasUI

@objc(FetchProvisioningProfilesOperation)
 final class FetchProvisioningProfilesOperation: ResultOperation<[String: ALTProvisioningProfile]>
--- a/AltStore/Operations/FetchSourceOperation.swift
+++ b/AltStore/Operations/FetchSourceOperation.swift
@@ -10,7 +10,7 @@ import Foundation
 import CoreData

 import AltStoreCore
-import Roxas
+import RoxasUI

@objc(FetchSourceOperation)
 final class FetchSourceOperation: ResultOperation<Source>
--- a/AltStore/Operations/InstallAppOperation.swift
+++ b/AltStore/Operations/InstallAppOperation.swift
@@ -10,7 +10,7 @@ import Network

 import AltStoreCore
 import AltSign
-import Roxas
+import RoxasUI

@objc(InstallAppOperation)
 final class InstallAppOperation: ResultOperation<InstalledApp>
--- a/AltStore/Operations/Operation.swift
+++ b/AltStore/Operations/Operation.swift
@@ -7,7 +7,7 @@
 //

 import Foundation
-import Roxas
+import RoxasUI

 class ResultOperation<ResultType>: Operation
 {
--- a/AltStore/Operations/Patch
+++ b/AltStore/Operations/Patch
@@ -12,7 +12,7 @@
 #include <stdlib.h>
 #include <string.h>

-@import Roxas;
+@import RoxasUI;

 #define CPU_SUBTYPE_PAC    0x80000000
 #define FAT_MAGIC 0xcafebabe
--- a/App/PatchAppOperation.swift
+++ b/App/PatchAppOperation.swift
@@ -13,7 +13,7 @@ import System

 import AltStoreCore
 import AltSign
-import Roxas
+import RoxasUI

@available(iOS 14, *)
 protocol PatchAppContext
--- a/App/PatchViewController.swift
+++ b/App/PatchViewController.swift
@@ -11,7 +11,7 @@ import Combine

 import AltStoreCore
 import AltSign
-import Roxas
+import RoxasUI

@available(iOS 14.0, *)
 extension PatchViewController
--- a/AltStore/Operations/RefreshAppOperation.swift
+++ b/AltStore/Operations/RefreshAppOperation.swift
@@ -10,7 +10,7 @@ import Foundation

 import AltStoreCore
 import AltSign
-import Roxas
+import RoxasUI
 import minimuxer

@objc(RefreshAppOperation)
--- a/AltStore/Operations/ResignAppOperation.swift
+++ b/AltStore/Operations/ResignAppOperation.swift
@@ -7,7 +7,7 @@
 //

 import Foundation
-import Roxas
+import RoxasUI

 import AltStoreCore
 import AltSign
--- a/AltStore/Operations/VerifyAppOperation.swift
+++ b/AltStore/Operations/VerifyAppOperation.swift
@@ -9,7 +9,7 @@
 import Foundation

 import AltSign
-import Roxas
+import RoxasUI

 enum VerificationError: ALTLocalizedError
 {
--- a/Log/ErrorLogViewController.swift
+++ b/Log/ErrorLogViewController.swift
@@ -10,7 +10,7 @@ import UIKit
 import SafariServices

 import AltStoreCore
-import Roxas
+import RoxasUI

 import Nuke

--- a/AltStore/Settings/PatreonViewController.swift
+++ b/AltStore/Settings/PatreonViewController.swift
@@ -11,7 +11,7 @@ import SafariServices
 import AuthenticationServices

 import AltStoreCore
-import Roxas
+import RoxasUI

 extension PatreonViewController
 {
--- a/AltStore/Settings/RefreshAttemptsViewController.swift
+++ b/AltStore/Settings/RefreshAttemptsViewController.swift
@@ -9,7 +9,7 @@
 import UIKit

 import AltStoreCore
-import Roxas
+import RoxasUI

@objc(RefreshAttemptTableViewCell)
 private final class RefreshAttemptTableViewCell: UITableViewCell
--- a/AltStore/Settings/SettingsHeaderFooterView.swift
+++ b/AltStore/Settings/SettingsHeaderFooterView.swift
@@ -8,7 +8,7 @@

 import UIKit

-import Roxas
+import RoxasUI

 final class SettingsHeaderFooterView: UITableViewHeaderFooterView
 {
--- a/AltStore/Sources/SourcesViewController.swift
+++ b/AltStore/Sources/SourcesViewController.swift
@@ -10,7 +10,7 @@ import UIKit
 import CoreData

 import AltStoreCore
-import Roxas
+import RoxasUI

 struct SourceError: LocalizedError
 {
--- a/AltStoreCore/Patreon/PatreonAPI.swift
+++ b/AltStoreCore/Patreon/PatreonAPI.swift
@@ -268,11 +268,11 @@ public extension PatreonAPI
            {
                let account = try result.get()
                
-                if let context = account.managedObjectContext, !account.isPatron
-                {
+//                if let context = account.managedObjectContext, !account.isPatron
+//                {
                    // Deactivate all beta apps now that we're no longer a patron.
                    //self.deactivateBetaApps(in: context)
-                }
+//                }
                
                try account.managedObjectContext?.save()
            }
--- a/Shared/Connections/Connection.swift
+++ b/Shared/Connections/Connection.swift
@@ -10,7 +10,12 @@ import Foundation
 import Network
 import SideKit

-public extension Connection
+public protocol SideConnection: Connection {
+    func __send(_ data: Data, completionHandler: @escaping (Bool, Error?) -> Void)
+    func __receiveData(expectedSize: Int, completionHandler: @escaping (Data?, Error?) -> Void)
+}
+
+public extension SideConnection
 {
    func send(_ data: Data, completionHandler: @escaping (Result<Void, ALTServerError>) -> Void)
    {
@@ -24,7 +29,7 @@ public extension Connection
            completionHandler(result)
        }
    }
-    
+
    func receiveData(expectedSize: Int, completionHandler: @escaping (Result<Data, ALTServerError>) -> Void)
    {
        self.__receiveData(expectedSize: expectedSize) { (data, error) in
@@ -32,7 +37,7 @@ public extension Connection
                guard let nwError = failure as? NWError else { return ALTServerError.init(failure) }
                return ALTServerError.lostConnection(underlyingError: nwError)
            }
-            
+
            completionHandler(result)
        }
    }
--- a/Shared/Connections/NetworkConnection.swift
+++ b/Shared/Connections/NetworkConnection.swift
@@ -10,7 +10,7 @@ import Foundation
 import Network
 import SideKit

-public class NetworkConnection: NSObject, Connection
+public class NetworkConnection: NSObject, SideConnection
 {
    public let nwConnection: NWConnection
    
--- a/Shared/Connections/XPCConnection.swift
+++ b/Shared/Connections/XPCConnection.swift
@@ -23,7 +23,7 @@ extension XPCConnection
    public static let machServiceNames = [unc0verMachServiceName, odysseyMachServiceName]
 }

-public class XPCConnection: NSObject, Connection
+public class XPCConnection: NSObject, SideConnection
 {
    public let xpcConnection: NSXPCConnection