Disables Sources functionality for public versions

Currently tracks install, refresh, and update app events.

.gitmodules

@@ -13,3 +13,6 @@
 [submodule "Dependencies/libplist"]
 	path = Dependencies/libplist
 	url = https://github.com/libimobiledevice/libplist.git
+[submodule "Dependencies/MarkdownAttributedString"]
+	path = Dependencies/MarkdownAttributedString
+	url = https://github.com/chockenberry/MarkdownAttributedString.git

AltKit/AltKit.h

@@ -7,3 +7,6 @@
 //
 
 #import "NSError+ALTServerError.h"
+#import "CFNotificationName+AltStore.h"
+
+extern uint16_t ALTDeviceListeningSocket;

AltKit/AltKit.m

@@ -0,0 +1,11 @@
+//
+//  AltKit.m
+//  AltKit
+//
+//  Created by Riley Testut on 1/10/20.
+//  Copyright © 2020 Riley Testut. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+uint16_t ALTDeviceListeningSocket = 28151;

AltKit/Bundle+AltStore.swift

@@ -18,6 +18,7 @@ public extension Bundle
         public static let appGroups = "ALTAppGroups"
         
         public static let urlTypes = "CFBundleURLTypes"
+        public static let exportedUTIs = "UTExportedTypeDeclarations"
     }
 }
 
@@ -28,6 +29,11 @@ public extension Bundle
         return infoPlistURL
     }
     
+    var provisioningProfileURL: URL {
+        let infoPlistURL = self.bundleURL.appendingPathComponent("embedded.mobileprovision")
+        return infoPlistURL
+    }
+    
     var certificateURL: URL {
         let infoPlistURL = self.bundleURL.appendingPathComponent("ALTCertificate.p12")
         return infoPlistURL

AltKit/CFNotificationName+AltStore.h

@@ -0,0 +1,17 @@
+//
+//  CFNotificationName+AltStore.h
+//  AltKit
+//
+//  Created by Riley Testut on 1/10/20.
+//  Copyright © 2020 Riley Testut. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+extern CFNotificationName const ALTWiredServerConnectionAvailableRequest NS_SWIFT_NAME(wiredServerConnectionAvailableRequest);
+extern CFNotificationName const ALTWiredServerConnectionAvailableResponse NS_SWIFT_NAME(wiredServerConnectionAvailableResponse);
+extern CFNotificationName const ALTWiredServerConnectionStartRequest NS_SWIFT_NAME(wiredServerConnectionStartRequest);
+
+NS_ASSUME_NONNULL_END

AltKit/CFNotificationName+AltStore.m

@@ -0,0 +1,13 @@
+//
+//  CFNotificationName+AltStore.m
+//  AltKit
+//
+//  Created by Riley Testut on 1/10/20.
+//  Copyright © 2020 Riley Testut. All rights reserved.
+//
+
+#import "CFNotificationName+AltStore.h"
+
+CFNotificationName const ALTWiredServerConnectionAvailableRequest = CFSTR("io.altstore.Request.WiredServerConnectionAvailable");
+CFNotificationName const ALTWiredServerConnectionAvailableResponse = CFSTR("io.altstore.Response.WiredServerConnectionAvailable");
+CFNotificationName const ALTWiredServerConnectionStartRequest = CFSTR("io.altstore.Request.WiredServerConnectionStart");

AltKit/CodableServerError.swift

@@ -0,0 +1,58 @@
+//
+//  CodableServerError.swift
+//  AltKit
+//
+//  Created by Riley Testut on 3/5/20.
+//  Copyright © 2020 Riley Testut. All rights reserved.
+//
+
+import Foundation
+
+// Can only automatically conform ALTServerError.Code to Codable, not ALTServerError itself
+extension ALTServerError.Code: Codable {}
+
+struct CodableServerError: Codable
+{
+    var error: ALTServerError {
+        return ALTServerError(self.errorCode, userInfo: self.userInfo ?? [:])
+    }
+    
+    private var errorCode: ALTServerError.Code
+    private var userInfo: [String: String]?
+    
+    private enum CodingKeys: String, CodingKey
+    {
+        case errorCode
+        case userInfo
+    }
+
+    init(error: ALTServerError)
+    {
+        self.errorCode = error.code
+        
+        let userInfo = error.userInfo.compactMapValues { $0 as? String }
+        if !userInfo.isEmpty
+        {
+            self.userInfo = userInfo
+        }
+    }
+    
+    init(from decoder: Decoder) throws
+    {
+        let container = try decoder.container(keyedBy: CodingKeys.self)
+        
+        let errorCode = try container.decode(Int.self, forKey: .errorCode)
+        self.errorCode = ALTServerError.Code(rawValue: errorCode) ?? .unknown
+        
+        let userInfo = try container.decodeIfPresent([String: String].self, forKey: .userInfo)
+        self.userInfo = userInfo
+    }
+    
+    func encode(to encoder: Encoder) throws
+    {
+        var container = encoder.container(keyedBy: CodingKeys.self)
+        try container.encode(self.error.code.rawValue, forKey: .errorCode)
+        try container.encodeIfPresent(self.userInfo, forKey: .userInfo)
+    }
+}
+

AltKit/NSError+ALTServerError.h

@@ -11,8 +11,13 @@
 extern NSErrorDomain const AltServerErrorDomain;
 extern NSErrorDomain const AltServerInstallationErrorDomain;
 
+extern NSErrorUserInfoKey const ALTUnderlyingErrorCodeErrorKey;
+extern NSErrorUserInfoKey const ALTProvisioningProfileBundleIDErrorKey;
+
 typedef NS_ERROR_ENUM(AltServerErrorDomain, ALTServerError)
 {
+    ALTServerErrorUnderlyingError = -1,
+    
     ALTServerErrorUnknown = 0,
     ALTServerErrorConnectionFailed = 1,
     ALTServerErrorLostConnection = 2,
@@ -27,6 +32,14 @@ typedef NS_ERROR_ENUM(AltServerErrorDomain, ALTServerError)
     ALTServerErrorInstallationFailed = 8,
     ALTServerErrorMaximumFreeAppLimitReached = 9,
     ALTServerErrorUnsupportediOSVersion = 10,
+    
+    ALTServerErrorUnknownRequest = 11,
+    ALTServerErrorUnknownResponse = 12,
+    
+    ALTServerErrorInvalidAnisetteData = 13,
+    ALTServerErrorPluginNotFound = 14,
+    
+    ALTServerErrorProfileNotFound = 15
 };
 
 NS_ASSUME_NONNULL_BEGIN

AltKit/NSError+ALTServerError.m

@@ -11,24 +11,43 @@
 NSErrorDomain const AltServerErrorDomain = @"com.rileytestut.AltServer";
 NSErrorDomain const AltServerInstallationErrorDomain = @"com.rileytestut.AltServer.Installation";
 
+NSErrorUserInfoKey const ALTUnderlyingErrorCodeErrorKey = @"underlyingErrorCode";
+NSErrorUserInfoKey const ALTProvisioningProfileBundleIDErrorKey = @"bundleIdentifier";
+
 @implementation NSError (ALTServerError)
 
 + (void)load
 {
     [NSError setUserInfoValueProviderForDomain:AltServerErrorDomain provider:^id _Nullable(NSError * _Nonnull error, NSErrorUserInfoKey  _Nonnull userInfoKey) {
-        if ([userInfoKey isEqualToString:NSLocalizedDescriptionKey])
+        if ([userInfoKey isEqualToString:NSLocalizedFailureReasonErrorKey])
         {
-            return [error alt_localizedDescription];
+            return [error alt_localizedFailureReason];
+        }
+        
+        if ([userInfoKey isEqualToString:NSLocalizedRecoverySuggestionErrorKey])
+        {
+            return [error alt_localizedRecoverySuggestion];
         }
         
         return nil;
     }];
 }
 
-- (nullable NSString *)alt_localizedDescription
+- (nullable NSString *)alt_localizedFailureReason
 {
     switch ((ALTServerError)self.code)
     {
+        case ALTServerErrorUnderlyingError:
+        {
+            NSString *underlyingErrorCode = self.userInfo[ALTUnderlyingErrorCodeErrorKey];
+            if (underlyingErrorCode == nil)
+            {
+                return NSLocalizedString(@"An unknown error occured.", @"");
+            }
+            
+            return [NSString stringWithFormat:NSLocalizedString(@"Error code: %@", @""), underlyingErrorCode];
+        }
+        
         case ALTServerErrorUnknown:
             return NSLocalizedString(@"An unknown error occured.", @"");
             
@@ -57,11 +76,59 @@ NSErrorDomain const AltServerInstallationErrorDomain = @"com.rileytestut.AltServ
             return NSLocalizedString(@"An error occured while installing the app.", @"");
             
         case ALTServerErrorMaximumFreeAppLimitReached:
-            return NSLocalizedString(@"You have reached the limit of 3 apps per device.", @"");
+            return NSLocalizedString(@"Cannot activate more than 3 apps and app extensions.", @"");
             
         case ALTServerErrorUnsupportediOSVersion:
             return NSLocalizedString(@"Your device must be running iOS 12.2 or later to install AltStore.", @"");
+            
+        case ALTServerErrorUnknownRequest:
+            return NSLocalizedString(@"AltServer does not support this request.", @"");
+            
+        case ALTServerErrorUnknownResponse:
+            return NSLocalizedString(@"Received an unknown response from AltServer.", @"");
+            
+        case ALTServerErrorInvalidAnisetteData:
+            return NSLocalizedString(@"Invalid anisette data.", @"");
+            
+        case ALTServerErrorPluginNotFound:
+            return NSLocalizedString(@"Could not connect to Mail plug-in.", @"");
+            
+        case ALTServerErrorProfileNotFound:
+            return [self profileErrorLocalizedDescriptionWithBaseDescription:NSLocalizedString(@"Could not find profile", "")];
     }
 }
+
+- (nullable NSString *)alt_localizedRecoverySuggestion
+{
+    switch ((ALTServerError)self.code)
+    {
+        case ALTServerErrorConnectionFailed:
+        case ALTServerErrorDeviceNotFound:
+            return NSLocalizedString(@"Make sure you have trusted this phone with your computer and WiFi sync is enabled.", @"");
+            
+        case ALTServerErrorPluginNotFound:
+            return NSLocalizedString(@"Make sure Mail is running and the plug-in is enabled in Mail's preferences.", @"");
+            
+        default:
+            return nil;
+    }
+}
+
+- (NSString *)profileErrorLocalizedDescriptionWithBaseDescription:(NSString *)baseDescription
+{
+    NSString *localizedDescription = nil;
+    
+    NSString *bundleID = self.userInfo[ALTProvisioningProfileBundleIDErrorKey];
+    if (bundleID)
+    {
+        localizedDescription = [NSString stringWithFormat:@"%@ “%@”", baseDescription, bundleID];
+    }
+    else
+    {
+        localizedDescription = [NSString stringWithFormat:@"%@.", baseDescription];
+    }
+    
+    return localizedDescription;
+}
     
 @end

AltKit/ServerProtocol.swift

@@ -7,22 +7,248 @@
 //
 
 import Foundation
+import AltSign
 
 public let ALTServerServiceType = "_altserver._tcp"
 
-// Can only automatically conform ALTServerError.Code to Codable, not ALTServerError itself
-extension ALTServerError.Code: Codable {}
-
-protocol ServerMessage: Codable
+protocol ServerMessageProtocol: Codable
 {
     var version: Int { get }
     var identifier: String { get }
 }
 
-public struct PrepareAppRequest: ServerMessage
+public enum ServerRequest: Decodable
+{
+    case anisetteData(AnisetteDataRequest)
+    case prepareApp(PrepareAppRequest)
+    case beginInstallation(BeginInstallationRequest)
+    case installProvisioningProfiles(InstallProvisioningProfilesRequest)
+    case removeProvisioningProfiles(RemoveProvisioningProfilesRequest)
+    case unknown(identifier: String, version: Int)
+    
+    var identifier: String {
+        switch self
+        {
+        case .anisetteData(let request): return request.identifier
+        case .prepareApp(let request): return request.identifier
+        case .beginInstallation(let request): return request.identifier
+        case .installProvisioningProfiles(let request): return request.identifier
+        case .removeProvisioningProfiles(let request): return request.identifier
+        case .unknown(let identifier, _): return identifier
+        }
+    }
+    
+    var version: Int {
+        switch self
+        {
+        case .anisetteData(let request): return request.version
+        case .prepareApp(let request): return request.version
+        case .beginInstallation(let request): return request.version
+        case .installProvisioningProfiles(let request): return request.version
+        case .removeProvisioningProfiles(let request): return request.version
+        case .unknown(_, let version): return version
+        }
+    }
+    
+    private enum CodingKeys: String, CodingKey
+    {
+        case identifier
+        case version
+    }
+    
+    public init(from decoder: Decoder) throws
+    {
+        let container = try decoder.container(keyedBy: CodingKeys.self)
+        
+        let version = try container.decode(Int.self, forKey: .version)
+        
+        let identifier = try container.decode(String.self, forKey: .identifier)
+        switch identifier
+        {
+        case "AnisetteDataRequest":
+            let request = try AnisetteDataRequest(from: decoder)
+            self = .anisetteData(request)
+            
+        case "PrepareAppRequest":
+            let request = try PrepareAppRequest(from: decoder)
+            self = .prepareApp(request)
+            
+        case "BeginInstallationRequest":
+            let request = try BeginInstallationRequest(from: decoder)
+            self = .beginInstallation(request)
+          
+        case "InstallProvisioningProfilesRequest":
+            let request = try InstallProvisioningProfilesRequest(from: decoder)
+            self = .installProvisioningProfiles(request)
+            
+        case "RemoveProvisioningProfilesRequest":
+            let request = try RemoveProvisioningProfilesRequest(from: decoder)
+            self = .removeProvisioningProfiles(request)
+            
+        default:
+            self = .unknown(identifier: identifier, version: version)
+        }
+    }
+}
+
+public enum ServerResponse: Decodable
+{
+    case anisetteData(AnisetteDataResponse)
+    case installationProgress(InstallationProgressResponse)
+    case installProvisioningProfiles(InstallProvisioningProfilesResponse)
+    case removeProvisioningProfiles(RemoveProvisioningProfilesResponse)
+    case error(ErrorResponse)
+    case unknown(identifier: String, version: Int)
+    
+    var identifier: String {
+        switch self
+        {
+        case .anisetteData(let response): return response.identifier
+        case .installationProgress(let response): return response.identifier
+        case .installProvisioningProfiles(let response): return response.identifier
+        case .removeProvisioningProfiles(let response): return response.identifier
+        case .error(let response): return response.identifier
+        case .unknown(let identifier, _): return identifier
+        }
+    }
+    
+    var version: Int {
+        switch self
+        {
+        case .anisetteData(let response): return response.version
+        case .installationProgress(let response): return response.version
+        case .installProvisioningProfiles(let response): return response.version
+        case .removeProvisioningProfiles(let response): return response.version
+        case .error(let response): return response.version
+        case .unknown(_, let version): return version
+        }
+    }
+    
+    private enum CodingKeys: String, CodingKey
+    {
+        case identifier
+        case version
+    }
+    
+    public init(from decoder: Decoder) throws
+    {
+        let container = try decoder.container(keyedBy: CodingKeys.self)
+        
+        let version = try container.decode(Int.self, forKey: .version)
+        
+        let identifier = try container.decode(String.self, forKey: .identifier)
+        switch identifier
+        {
+        case "AnisetteDataResponse":
+            let response = try AnisetteDataResponse(from: decoder)
+            self = .anisetteData(response)
+            
+        case "InstallationProgressResponse":
+            let response = try InstallationProgressResponse(from: decoder)
+            self = .installationProgress(response)
+           
+        case "InstallProvisioningProfilesResponse":
+            let response = try InstallProvisioningProfilesResponse(from: decoder)
+            self = .installProvisioningProfiles(response)
+            
+        case "RemoveProvisioningProfilesResponse":
+            let response = try RemoveProvisioningProfilesResponse(from: decoder)
+            self = .removeProvisioningProfiles(response)
+            
+        case "ErrorResponse":
+            let response = try ErrorResponse(from: decoder)
+            self = .error(response)
+            
+        default:
+            self = .unknown(identifier: identifier, version: version)
+        }
+    }
+}
+
+// _Don't_ provide generic SuccessResponse, as that would prevent us
+// from easily changing response format for a request in the future.
+public struct ErrorResponse: ServerMessageProtocol
+{
+    public var version = 2
+    public var identifier = "ErrorResponse"
+    
+    public var error: ALTServerError {
+        return self.serverError?.error ?? ALTServerError(self.errorCode)
+    }
+    private var serverError: CodableServerError?
+    
+    // Legacy (v1)
+    private var errorCode: ALTServerError.Code
+    
+    public init(error: ALTServerError)
+    {
+        self.serverError = CodableServerError(error: error)
+        self.errorCode = error.code
+    }
+}
+
+public struct AnisetteDataRequest: ServerMessageProtocol
 {
     public var version = 1
-    public var identifier = "PrepareApp"
+    public var identifier = "AnisetteDataRequest"
+    
+    public init()
+    {
+    }
+}
+
+public struct AnisetteDataResponse: ServerMessageProtocol
+{
+    public var version = 1
+    public var identifier = "AnisetteDataResponse"
+    
+    public var anisetteData: ALTAnisetteData
+    
+    private enum CodingKeys: String, CodingKey
+    {
+        case identifier
+        case version
+        case anisetteData
+    }
+
+    public init(anisetteData: ALTAnisetteData)
+    {
+        self.anisetteData = anisetteData
+    }
+    
+    public init(from decoder: Decoder) throws
+    {
+        let container = try decoder.container(keyedBy: CodingKeys.self)
+        self.version = try container.decode(Int.self, forKey: .version)
+        self.identifier = try container.decode(String.self, forKey: .identifier)
+        
+        let json = try container.decode([String: String].self, forKey: .anisetteData)
+        
+        if let anisetteData = ALTAnisetteData(json: json)
+        {
+            self.anisetteData = anisetteData
+        }
+        else
+        {
+            throw DecodingError.dataCorruptedError(forKey: CodingKeys.anisetteData, in: container, debugDescription: "Couuld not parse anisette data from JSON")
+        }
+    }
+    
+    public func encode(to encoder: Encoder) throws
+    {
+        var container = encoder.container(keyedBy: CodingKeys.self)
+        try container.encode(self.version, forKey: .version)
+        try container.encode(self.identifier, forKey: .identifier)
+        
+        let json = self.anisetteData.json()
+        try container.encode(json, forKey: .anisetteData)
+    }
+}
+
+public struct PrepareAppRequest: ServerMessageProtocol
+{
+    public var version = 1
+    public var identifier = "PrepareAppRequest"
     
     public var udid: String
     public var contentSize: Int
@@ -34,37 +260,122 @@ public struct PrepareAppRequest: ServerMessage
     }
 }
 
-public struct BeginInstallationRequest: ServerMessage
+public struct BeginInstallationRequest: ServerMessageProtocol
+{
+    public var version = 2
+    public var identifier = "BeginInstallationRequest"
+    
+    // If activeProfiles is non-nil, then AltServer should remove all profiles except active ones.
+    public var activeProfiles: Set<String>?
+    
+    public init(activeProfiles: Set<String>?)
+    {
+        self.activeProfiles = activeProfiles
+    }
+}
+
+public struct InstallationProgressResponse: ServerMessageProtocol
 {
     public var version = 1
-    public var identifier = "BeginInstallation"
+    public var identifier = "InstallationProgressResponse"
+    
+    public var progress: Double
+    
+    public init(progress: Double)
+    {
+        self.progress = progress
+    }
+}
+
+public struct InstallProvisioningProfilesRequest: ServerMessageProtocol
+{
+    public var version = 1
+    public var identifier = "InstallProvisioningProfilesRequest"
+    
+    public var udid: String
+    public var provisioningProfiles: Set<ALTProvisioningProfile>
+    
+    // If activeProfiles is non-nil, then AltServer should remove all profiles except active ones.
+    public var activeProfiles: Set<String>?
+    
+    private enum CodingKeys: String, CodingKey
+    {
+        case identifier
+        case version
+        case udid
+        case provisioningProfiles
+        case activeProfiles
+    }
+    
+    public init(udid: String, provisioningProfiles: Set<ALTProvisioningProfile>, activeProfiles: Set<String>?)
+    {
+        self.udid = udid
+        self.provisioningProfiles = provisioningProfiles
+        self.activeProfiles = activeProfiles
+    }
+    
+    public init(from decoder: Decoder) throws
+    {
+        let container = try decoder.container(keyedBy: CodingKeys.self)
+        self.version = try container.decode(Int.self, forKey: .version)
+        self.identifier = try container.decode(String.self, forKey: .identifier)
+        self.udid = try container.decode(String.self, forKey: .udid)
+        
+        let rawProvisioningProfiles = try container.decode([Data].self, forKey: .provisioningProfiles)
+        let provisioningProfiles = try rawProvisioningProfiles.map { (data) -> ALTProvisioningProfile in
+            guard let profile = ALTProvisioningProfile(data: data) else {
+                throw DecodingError.dataCorruptedError(forKey: CodingKeys.provisioningProfiles, in: container, debugDescription: "Could not parse provisioning profile from data.")
+            }
+            return profile
+        }
+        
+        self.provisioningProfiles = Set(provisioningProfiles)
+        self.activeProfiles = try container.decodeIfPresent(Set<String>.self, forKey: .activeProfiles)
+    }
+    
+    public func encode(to encoder: Encoder) throws
+    {
+        var container = encoder.container(keyedBy: CodingKeys.self)
+        try container.encode(self.version, forKey: .version)
+        try container.encode(self.identifier, forKey: .identifier)
+        try container.encode(self.udid, forKey: .udid)
+        
+        try container.encode(self.provisioningProfiles.map { $0.data }, forKey: .provisioningProfiles)
+        try container.encodeIfPresent(self.activeProfiles, forKey: .activeProfiles)
+    }
+}
+
+public struct InstallProvisioningProfilesResponse: ServerMessageProtocol
+{
+    public var version = 1
+    public var identifier = "InstallProvisioningProfilesResponse"
     
     public init()
     {
     }
 }
 
-public struct ServerResponse: ServerMessage
+public struct RemoveProvisioningProfilesRequest: ServerMessageProtocol
 {
     public var version = 1
-    public var identifier = "ServerResponse"
+    public var identifier = "RemoveProvisioningProfilesRequest"
     
-    public var progress: Double
-    
-    public var error: ALTServerError? {
-        get {
-            guard let code = self.errorCode else { return nil }
-            return ALTServerError(code)
-        }
-        set {
-            self.errorCode = newValue?.code
-        }
-    }
-    private var errorCode: ALTServerError.Code?
-    
-    public init(progress: Double, error: ALTServerError?)
+    public var udid: String
+    public var bundleIdentifiers: Set<String>
+
+    public init(udid: String, bundleIdentifiers: Set<String>)
+    {
+        self.udid = udid
+        self.bundleIdentifiers = bundleIdentifiers
+    }
+}
+
+public struct RemoveProvisioningProfilesResponse: ServerMessageProtocol
+{
+    public var version = 1
+    public var identifier = "RemoveProvisioningProfilesResponse"
+    
+    public init()
     {
-        self.progress = progress
-        self.error = error
     }
 }

AltPlugin/ALTPluginService.h

@@ -0,0 +1,19 @@
+//
+//  ALTPluginService.h
+//  AltPlugin
+//
+//  Created by Riley Testut on 11/14/19.
+//  Copyright © 2019 Riley Testut. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface ALTPluginService : NSObject
+
++ (instancetype)sharedService;
+
+@end
+
+NS_ASSUME_NONNULL_END

AltPlugin/ALTPluginService.m

@@ -0,0 +1,99 @@
+//
+//  ALTPluginService.m
+//  AltPlugin
+//
+//  Created by Riley Testut on 11/14/19.
+//  Copyright © 2019 Riley Testut. All rights reserved.
+//
+
+#import "ALTPluginService.h"
+
+#import <dlfcn.h>
+
+#import "ALTAnisetteData.h"
+
+@import AppKit;
+
+@interface AKAppleIDSession : NSObject
+- (id)appleIDHeadersForRequest:(id)arg1;
+@end
+
+@interface AKDevice
++ (AKDevice *)currentDevice;
+- (NSString *)uniqueDeviceIdentifier;
+- (NSString *)serialNumber;
+- (NSString *)serverFriendlyDescription;
+@end
+
+@interface ALTPluginService ()
+
+@property (nonatomic, readonly) NSISO8601DateFormatter *dateFormatter;
+
+@end
+
+@implementation ALTPluginService
+
++ (instancetype)sharedService
+{
+    static ALTPluginService *_service = nil;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        _service = [[self alloc] init];
+    });
+    
+    return _service;
+}
+
+- (instancetype)init
+{
+    self = [super init];
+    if (self)
+    {
+        _dateFormatter = [[NSISO8601DateFormatter alloc] init];
+    }
+    
+    return self;
+}
+
++ (void)initialize
+{
+    [[ALTPluginService sharedService] start];
+}
+
+- (void)start
+{
+    dlopen("/System/Library/PrivateFrameworks/AuthKit.framework/AuthKit", RTLD_NOW);
+    
+    [[NSDistributedNotificationCenter defaultCenter] addObserver:self selector:@selector(receiveNotification:) name:@"com.rileytestut.AltServer.FetchAnisetteData" object:nil];
+}
+
+- (void)receiveNotification:(NSNotification *)notification
+{
+    NSString *requestUUID = notification.userInfo[@"requestUUID"];
+    
+    NSMutableURLRequest* req = [[NSMutableURLRequest alloc] initWithURL:[[NSURL alloc] initWithString:@"https://developerservices2.apple.com/services/QH65B2/listTeams.action?clientId=XABBG36SBA"]];
+    [req setHTTPMethod:@"POST"];
+
+    AKAppleIDSession *session = [[NSClassFromString(@"AKAppleIDSession") alloc] initWithIdentifier:@"com.apple.gs.xcode.auth"];
+    NSDictionary *headers = [session appleIDHeadersForRequest:req];
+
+    AKDevice *device = [NSClassFromString(@"AKDevice") currentDevice];
+    NSDate *date = [self.dateFormatter dateFromString:headers[@"X-Apple-I-Client-Time"]];
+    
+    ALTAnisetteData *anisetteData = [[NSClassFromString(@"ALTAnisetteData") alloc] initWithMachineID:headers[@"X-Apple-I-MD-M"]
+                                                                                     oneTimePassword:headers[@"X-Apple-I-MD"]
+                                                                                         localUserID:headers[@"X-Apple-I-MD-LU"]
+                                                                                         routingInfo:[headers[@"X-Apple-I-MD-RINFO"] longLongValue]
+                                                                              deviceUniqueIdentifier:device.uniqueDeviceIdentifier
+                                                                                  deviceSerialNumber:device.serialNumber
+                                                                                   deviceDescription:device.serverFriendlyDescription
+                                                                                                date:date
+                                                                                              locale:[NSLocale currentLocale]
+                                                                                            timeZone:[NSTimeZone localTimeZone]];
+    
+    NSData *data = [NSKeyedArchiver archivedDataWithRootObject:anisetteData requiringSecureCoding:YES error:nil];
+    
+    [[NSDistributedNotificationCenter defaultCenter] postNotificationName:@"com.rileytestut.AltServer.AnisetteDataResponse" object:nil userInfo:@{@"requestUUID": requestUUID, @"anisetteData": data} deliverImmediately:YES];
+}
+
+@end

AltPlugin/Info.plist

@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright © 2019 Riley Testut. All rights reserved.</string>
+	<key>NSPrincipalClass</key>
+	<string>ALTPluginService</string>
+	<key>Supported10.14PluginCompatibilityUUIDs</key>
+	<array>
+		<string># UUIDs for versions from 10.12 to 99.99.99</string>
+		<string># For mail version 10.0 (3226) on OS X Version 10.12 (build 16A319)</string>
+		<string>36CCB8BB-2207-455E-89BC-B9D6E47ABB5B</string>
+		<string># For mail version 10.1 (3251) on OS X Version 10.12.1 (build 16B2553a)</string>
+		<string>9054AFD9-2607-489E-8E63-8B09A749BC61</string>
+		<string># For mail version 10.2 (3259) on OS X Version 10.12.2 (build 16D12b)</string>
+		<string>1CD3B36A-0E3B-4A26-8F7E-5BDF96AAC97E</string>
+		<string># For mail version 10.3 (3273) on OS X Version 10.12.4 (build 16G1036)</string>
+		<string>21560BD9-A3CC-482E-9B99-95B7BF61EDC1</string>
+		<string># For mail version 11.0 (3441.0.1) on OS X Version 10.13 (build 17A315i)</string>
+		<string>C86CD990-4660-4E36-8CDA-7454DEB2E199</string>
+		<string># For mail version 12.0 (3445.100.39) on OS X Version 10.14.1 (build 18B45d)</string>
+		<string>A4343FAF-AE18-40D0-8A16-DFAE481AF9C1</string>
+		<string># For mail version 13.0 (3594.4.2) on OS X Version 10.15 (build 19A558d)</string>
+		<string>6EEA38FB-1A0B-469B-BB35-4C2E0EEA9053</string>
+	</array>
+	<key>Supported10.15PluginCompatibilityUUIDs</key>
+	<array>
+		<string># UUIDs for versions from 10.12 to 99.99.99</string>
+		<string># For mail version 10.0 (3226) on OS X Version 10.12 (build 16A319)</string>
+		<string>36CCB8BB-2207-455E-89BC-B9D6E47ABB5B</string>
+		<string># For mail version 10.1 (3251) on OS X Version 10.12.1 (build 16B2553a)</string>
+		<string>9054AFD9-2607-489E-8E63-8B09A749BC61</string>
+		<string># For mail version 10.2 (3259) on OS X Version 10.12.2 (build 16D12b)</string>
+		<string>1CD3B36A-0E3B-4A26-8F7E-5BDF96AAC97E</string>
+		<string># For mail version 10.3 (3273) on OS X Version 10.12.4 (build 16G1036)</string>
+		<string>21560BD9-A3CC-482E-9B99-95B7BF61EDC1</string>
+		<string># For mail version 11.0 (3441.0.1) on OS X Version 10.13 (build 17A315i)</string>
+		<string>C86CD990-4660-4E36-8CDA-7454DEB2E199</string>
+		<string># For mail version 12.0 (3445.100.39) on OS X Version 10.14.1 (build 18B45d)</string>
+		<string>A4343FAF-AE18-40D0-8A16-DFAE481AF9C1</string>
+		<string># For mail version 13.0 (3594.4.2) on OS X Version 10.15 (build 19A558d)</string>
+		<string>6EEA38FB-1A0B-469B-BB35-4C2E0EEA9053</string>
+	</array>
+</dict>
+</plist>

AltServer/AltServer-Bridging-Header.h

@@ -3,3 +3,6 @@
 //
 
 #import "ALTDeviceManager.h"
+#import "ALTWiredConnection.h"
+#import "ALTNotificationConnection.h"
+#import "AltKit.h"

AltServer/AnisetteDataManager.swift

@@ -0,0 +1,79 @@
+//
+//  AnisetteDataManager.swift
+//  AltServer
+//
+//  Created by Riley Testut on 11/16/19.
+//  Copyright © 2019 Riley Testut. All rights reserved.
+//
+
+import Foundation
+import AltKit
+
+class AnisetteDataManager: NSObject
+{
+    static let shared = AnisetteDataManager()
+    
+    private var anisetteDataCompletionHandlers: [String: (Result<ALTAnisetteData, Error>) -> Void] = [:]
+    private var anisetteDataTimers: [String: Timer] = [:]
+    
+    private override init()
+    {
+        super.init()
+        
+        DistributedNotificationCenter.default().addObserver(self, selector: #selector(AnisetteDataManager.handleAnisetteDataResponse(_:)), name: Notification.Name("com.rileytestut.AltServer.AnisetteDataResponse"), object: nil)
+    }
+    
+    func requestAnisetteData(_ completion: @escaping (Result<ALTAnisetteData, Error>) -> Void)
+    {
+        let requestUUID = UUID().uuidString
+        self.anisetteDataCompletionHandlers[requestUUID] = completion
+        
+        let timer = Timer(timeInterval: 1.0, repeats: false) { (timer) in
+            self.finishRequest(forUUID: requestUUID, result: .failure(ALTServerError(.pluginNotFound)))
+        }
+        self.anisetteDataTimers[requestUUID] = timer
+        
+        RunLoop.main.add(timer, forMode: .default)
+        
+        DistributedNotificationCenter.default().postNotificationName(Notification.Name("com.rileytestut.AltServer.FetchAnisetteData"), object: nil, userInfo: ["requestUUID": requestUUID], options: .deliverImmediately)
+    }
+}
+
+private extension AnisetteDataManager
+{
+    @objc func handleAnisetteDataResponse(_ notification: Notification)
+    {
+        guard let userInfo = notification.userInfo, let requestUUID = userInfo["requestUUID"] as? String else { return }
+                
+        if
+            let archivedAnisetteData = userInfo["anisetteData"] as? Data,
+            let anisetteData = try? NSKeyedUnarchiver.unarchivedObject(ofClass: ALTAnisetteData.self, from: archivedAnisetteData)
+        {
+            if let range = anisetteData.deviceDescription.lowercased().range(of: "(com.apple.mail")
+            {
+                var adjustedDescription = anisetteData.deviceDescription[..<range.lowerBound]
+                adjustedDescription += "(com.apple.dt.Xcode/3594.4.19)>"
+                
+                anisetteData.deviceDescription = String(adjustedDescription)
+            }
+            
+            self.finishRequest(forUUID: requestUUID, result: .success(anisetteData))
+        }
+        else
+        {
+            self.finishRequest(forUUID: requestUUID, result: .failure(ALTServerError(.invalidAnisetteData)))
+        }
+    }
+    
+    func finishRequest(forUUID requestUUID: String, result: Result<ALTAnisetteData, Error>)
+    {
+        let completionHandler = self.anisetteDataCompletionHandlers[requestUUID]
+        self.anisetteDataCompletionHandlers[requestUUID] = nil
+        
+        let timer = self.anisetteDataTimers[requestUUID]
+        self.anisetteDataTimers[requestUUID] = nil
+        
+        timer?.invalidate()
+        completionHandler?(result)
+    }
+}

AltServer/AppDelegate.swift

@@ -12,6 +12,28 @@ import UserNotifications
 import AltSign
 
 import LaunchAtLogin
+import STPrivilegedTask
+
+private let pluginDirectoryURL = URL(fileURLWithPath: "/Library/Mail/Bundles", isDirectory: true)
+private let pluginURL = pluginDirectoryURL.appendingPathComponent("AltPlugin.mailbundle")
+
+enum PluginError: LocalizedError
+{
+    case cancelled
+    case unknown
+    case taskError(String)
+    case taskErrorCode(Int)
+    
+    var errorDescription: String? {
+        switch self
+        {
+        case .cancelled: return NSLocalizedString("Mail plug-in installation was cancelled.", comment: "")
+        case .unknown: return NSLocalizedString("Failed to install Mail plug-in.", comment: "")
+        case .taskError(let output): return output
+        case .taskErrorCode(let errorCode): return String(format: NSLocalizedString("There was an error installing the Mail plug-in. (Error Code: %@)", comment: ""), NSNumber(value: errorCode))
+        }
+    }
+}
 
 @NSApplicationMain
 class AppDelegate: NSObject, NSApplicationDelegate {
@@ -25,16 +47,24 @@ class AppDelegate: NSObject, NSApplicationDelegate {
     @IBOutlet private var appMenu: NSMenu!
     @IBOutlet private var connectedDevicesMenu: NSMenu!
     @IBOutlet private var launchAtLoginMenuItem: NSMenuItem!
+    @IBOutlet private var installMailPluginMenuItem: NSMenuItem!
     
     private weak var authenticationAppleIDTextField: NSTextField?
     private weak var authenticationPasswordTextField: NSSecureTextField?
-
+    
+    private var isMailPluginInstalled: Bool {
+        let isMailPluginInstalled = FileManager.default.fileExists(atPath: pluginURL.path)
+        return isMailPluginInstalled
+    }
+    
     func applicationDidFinishLaunching(_ aNotification: Notification)
     {
         UserDefaults.standard.registerDefaults()
         
         UNUserNotificationCenter.current().delegate = self
+        
         ConnectionManager.shared.start()
+        ALTDeviceManager.shared.start()
         
         let item = NSStatusBar.system.statusItem(withLength: -1)
         guard let button = item.button else { return }
@@ -47,16 +77,20 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         
         self.connectedDevicesMenu.delegate = self
         
-        if !UserDefaults.standard.didPresentInitialNotification
-        {
-            let content = UNMutableNotificationContent()
-            content.title = NSLocalizedString("AltServer Running", comment: "")
-            content.body = NSLocalizedString("AltServer runs in the background as a menu bar app listening for AltStore.", comment: "")
+        UNUserNotificationCenter.current().requestAuthorization(options: [.alert]) { (success, error) in
+            guard success else { return }
             
-            let request = UNNotificationRequest(identifier: UUID().uuidString, content: content, trigger: nil)
-            UNUserNotificationCenter.current().add(request)
-            
-            UserDefaults.standard.didPresentInitialNotification = true
+            if !UserDefaults.standard.didPresentInitialNotification
+            {
+                let content = UNMutableNotificationContent()
+                content.title = NSLocalizedString("AltServer Running", comment: "")
+                content.body = NSLocalizedString("AltServer runs in the background as a menu bar app listening for AltStore.", comment: "")
+                
+                let request = UNNotificationRequest(identifier: UUID().uuidString, content: content, trigger: nil)
+                UNUserNotificationCenter.current().add(request)
+                
+                UserDefaults.standard.didPresentInitialNotification = true
+            }
         }
     }
 
@@ -72,11 +106,23 @@ private extension AppDelegate
     {
         guard let button = self.statusItem?.button, let superview = button.superview, let window = button.window else { return }
         
-        self.connectedDevices = ALTDeviceManager.shared.connectedDevices
+        self.connectedDevices = ALTDeviceManager.shared.availableDevices
         
         self.launchAtLoginMenuItem.state = LaunchAtLogin.isEnabled ? .on : .off
         self.launchAtLoginMenuItem.action = #selector(AppDelegate.toggleLaunchAtLogin(_:))
         
+        if self.isMailPluginInstalled
+        {
+            self.installMailPluginMenuItem.title = NSLocalizedString("Uninstall Mail Plug-in", comment: "")
+        }
+        else
+        {
+            self.installMailPluginMenuItem.title = NSLocalizedString("Install Mail Plug-in", comment: "")
+        }
+
+        self.installMailPluginMenuItem.target = self
+        self.installMailPluginMenuItem.action = #selector(AppDelegate.handleInstallMailPluginMenuItem(_:))
+                
         let x = button.frame.origin.x
         let y = button.frame.origin.y - 5
         
@@ -96,11 +142,7 @@ private extension AppDelegate
         
         let alert = NSAlert()
         alert.messageText = NSLocalizedString("Please enter your Apple ID and password.", comment: "")
-        alert.informativeText = NSLocalizedString("""
-Your Apple ID and password are not saved and are only sent to Apple for authentication.
-
-If you have two-factor authentication enabled, please create an app-specific password for use with AltStore at https://appleid.apple.com.
-""", comment: "")
+        alert.informativeText = NSLocalizedString("Your Apple ID and password are not saved and are only sent to Apple for authentication.", comment: "")
         
         let textFieldSize = NSSize(width: 300, height: 22)
         
@@ -142,41 +184,74 @@ If you have two-factor authentication enabled, please create an app-specific pas
         let password = passwordTextField.stringValue
         
         let device = self.connectedDevices[index]
-        ALTDeviceManager.shared.installAltStore(to: device, appleID: username, password: password) { (result) in
-            switch result
-            {
-            case .success:
-                let content = UNMutableNotificationContent()
-                content.title = NSLocalizedString("Installation Succeeded", comment: "")
-                content.body = String(format: NSLocalizedString("AltStore was successfully installed on %@.", comment: ""), device.name)
-                
-                let request = UNNotificationRequest(identifier: UUID().uuidString, content: content, trigger: nil)
-                UNUserNotificationCenter.current().add(request)
-                
-            case .failure(InstallError.cancelled):
-                // Ignore
-                break
-                
-            case .failure(let error as NSError):
-                
-                let alert = NSAlert()
-                alert.alertStyle = .critical
-                alert.messageText = NSLocalizedString("Installation Failed", comment: "")
-                
-                if let underlyingError = error.userInfo[NSUnderlyingErrorKey] as? Error
+        
+        func install()
+        {
+            ALTDeviceManager.shared.installAltStore(to: device, appleID: username, password: password) { (result) in
+                switch result
                 {
-                    alert.informativeText = underlyingError.localizedDescription
-                }
-                else
-                {
-                    alert.informativeText = error.localizedDescription
-                }
-                
-                NSRunningApplication.current.activate(options: .activateIgnoringOtherApps)
+                case .success:
+                    let content = UNMutableNotificationContent()
+                    content.title = NSLocalizedString("Installation Succeeded", comment: "")
+                    content.body = String(format: NSLocalizedString("AltStore was successfully installed on %@.", comment: ""), device.name)
+                    
+                    let request = UNNotificationRequest(identifier: UUID().uuidString, content: content, trigger: nil)
+                    UNUserNotificationCenter.current().add(request)
+                    
+                case .failure(InstallError.cancelled), .failure(ALTAppleAPIError.requiresTwoFactorAuthentication):
+                    // Ignore
+                    break
+                    
+                case .failure(let error as NSError):
+                    
+                    let alert = NSAlert()
+                    alert.alertStyle = .critical
+                    alert.messageText = NSLocalizedString("Installation Failed", comment: "")
+                    
+                    if let underlyingError = error.userInfo[NSUnderlyingErrorKey] as? Error
+                    {
+                        alert.informativeText = underlyingError.localizedDescription
+                    }
+                    else
+                    {
+                        alert.informativeText = error.localizedDescription
+                    }
+                    
+                    NSRunningApplication.current.activate(options: .activateIgnoringOtherApps)
 
-                alert.runModal()
+                    alert.runModal()
+                }
             }
         }
+        
+        if !self.isMailPluginInstalled
+        {
+            self.installMailPlugin { (result) in
+                DispatchQueue.main.async {
+                    switch result
+                    {
+                    case .failure(PluginError.cancelled): break
+                    case .failure(let error):
+                        let alert = NSAlert()
+                        alert.messageText = NSLocalizedString("Failed to Install Mail Plug-in", comment: "")
+                        alert.informativeText = error.localizedDescription
+                        alert.runModal()
+                        
+                    case .success:
+                        let alert = NSAlert()
+                        alert.messageText = NSLocalizedString("Mail Plug-in Installed", comment: "")
+                        alert.informativeText = NSLocalizedString("Please restart Mail and enable AltPlugin in Mail's Preferences. Mail must be running when installing or refreshing apps with AltServer.", comment: "")
+                        alert.runModal()
+                        
+                        install()
+                    }
+                }
+            }
+        }
+        else
+        {
+            install()
+        }
     }
     
     @objc func toggleLaunchAtLogin(_ item: NSMenuItem)
@@ -192,6 +267,214 @@ If you have two-factor authentication enabled, please create an app-specific pas
         
         LaunchAtLogin.isEnabled.toggle()
     }
+    
+    @objc func handleInstallMailPluginMenuItem(_ item: NSMenuItem)
+    {
+        if self.isMailPluginInstalled
+        {
+            self.uninstallMailPlugin { (result) in
+                DispatchQueue.main.async {
+                    switch result
+                    {
+                    case .failure(PluginError.cancelled): break
+                    case .failure(let error):
+                        let alert = NSAlert()
+                        alert.messageText = NSLocalizedString("Failed to Uninstall Mail Plug-in", comment: "")
+                        alert.informativeText = error.localizedDescription
+                        alert.runModal()
+                        
+                    case .success:
+                        let alert = NSAlert()
+                        alert.messageText = NSLocalizedString("Mail Plug-in Uninstalled", comment: "")
+                        alert.informativeText = NSLocalizedString("Please restart Mail for changes to take effect. You will not be able to use AltServer until the plug-in is reinstalled.", comment: "")
+                        alert.runModal()
+                    }
+                }
+            }
+        }
+        else
+        {
+            self.installMailPlugin { (result) in
+                DispatchQueue.main.async {
+                    switch result
+                    {
+                    case .failure(PluginError.cancelled): break
+                    case .failure(let error):
+                        let alert = NSAlert()
+                        alert.messageText = NSLocalizedString("Failed to Install Mail Plug-in", comment: "")
+                        alert.informativeText = error.localizedDescription
+                        alert.runModal()
+                        
+                    case .success:
+                        let alert = NSAlert()
+                        alert.messageText = NSLocalizedString("Mail Plug-in Installed", comment: "")
+                        alert.informativeText = NSLocalizedString("Please restart Mail and enable AltPlugin in Mail's Preferences. Mail must be running when installing or refreshing apps with AltServer.", comment: "")
+                        alert.runModal()
+                    }
+                }
+            }
+        }
+    }
+    
+    func installMailPlugin(completionHandler: @escaping (Result<Void, Error>) -> Void)
+    {
+        do
+        {
+            let alert = NSAlert()
+            alert.messageText = NSLocalizedString("Install Mail Plug-in", comment: "")
+            alert.informativeText = NSLocalizedString("AltServer requires a Mail plug-in in order to retrieve necessary information about your Apple ID. Would you like to install it now?", comment: "")
+            
+            alert.addButton(withTitle: NSLocalizedString("Install Plug-in", comment: ""))
+            alert.addButton(withTitle: NSLocalizedString("Cancel", comment: ""))
+            
+            NSRunningApplication.current.activate(options: .activateIgnoringOtherApps)
+            
+            let response = alert.runModal()
+            guard response == .alertFirstButtonReturn else { throw PluginError.cancelled }
+            
+            self.downloadPlugin { (result) in
+                do
+                {
+                    let fileURL = try result.get()
+                    defer { try? FileManager.default.removeItem(at: fileURL) }
+                    
+                    // Ensure plug-in directory exists.
+                    let authorization = try self.runAndKeepAuthorization("mkdir", arguments: ["-p", pluginDirectoryURL.path])
+                    
+                    // Unzip AltPlugin to plug-ins directory.
+                    try self.runAndKeepAuthorization("unzip", arguments: ["-o", fileURL.path, "-d", pluginDirectoryURL.path], authorization: authorization)
+                    guard self.isMailPluginInstalled else { throw PluginError.unknown }
+                    
+                    // Enable Mail plug-in preferences.
+                    try self.run("defaults", arguments: ["write", "/Library/Preferences/com.apple.mail", "EnableBundles", "-bool", "YES"], authorization: authorization)
+                    
+                    print("Finished installing Mail plug-in!")
+                    
+                    completionHandler(.success(()))
+                }
+                catch
+                {
+                    completionHandler(.failure(error))
+                }
+            }
+        }
+        catch
+        {
+            completionHandler(.failure(PluginError.cancelled))
+        }
+    }
+    
+    func downloadPlugin(completionHandler: @escaping (Result<URL, Error>) -> Void)
+    {
+        let pluginURL = URL(string: "https://f000.backblazeb2.com/file/altstore/altserver/altplugin/1_0.zip")!
+        
+        let downloadTask = URLSession.shared.downloadTask(with: pluginURL) { (fileURL, response, error) in
+            if let fileURL = fileURL
+            {
+                print("Downloaded plugin to URL:", fileURL)
+                completionHandler(.success(fileURL))
+            }
+            else
+            {
+                completionHandler(.failure(error ?? PluginError.unknown))
+            }
+        }
+        
+        downloadTask.resume()
+    }
+    
+    func uninstallMailPlugin(completionHandler: @escaping (Result<Void, Error>) -> Void)
+    {
+        let alert = NSAlert()
+        alert.messageText = NSLocalizedString("Uninstall Mail Plug-in", comment: "")
+        alert.informativeText = NSLocalizedString("Are you sure you want to uninstall the AltServer Mail plug-in? You will no longer be able to install or refresh apps with AltStore.", comment: "")
+        
+        alert.addButton(withTitle: NSLocalizedString("Uninstall Plug-in", comment: ""))
+        alert.addButton(withTitle: NSLocalizedString("Cancel", comment: ""))
+        
+        NSRunningApplication.current.activate(options: .activateIgnoringOtherApps)
+        
+        let response = alert.runModal()
+        guard response == .alertFirstButtonReturn else { return completionHandler(.failure(PluginError.cancelled)) }
+        
+        DispatchQueue.global().async {
+            do
+            {
+                if FileManager.default.fileExists(atPath: pluginURL.path)
+                {
+                    // Delete Mail plug-in from privileged directory.
+                    try self.run("rm", arguments: ["-rf", pluginURL.path])
+                }
+                
+                completionHandler(.success(()))
+            }
+            catch
+            {
+                completionHandler(.failure(error))
+            }
+        }
+    }
+}
+
+private extension AppDelegate
+{
+    func run(_ program: String, arguments: [String], authorization: AuthorizationRef? = nil) throws
+    {
+        _ = try self._run(program, arguments: arguments, authorization: authorization, freeAuthorization: true)
+    }
+    
+    @discardableResult
+    func runAndKeepAuthorization(_ program: String, arguments: [String], authorization: AuthorizationRef? = nil) throws -> AuthorizationRef
+    {
+        return try self._run(program, arguments: arguments, authorization: authorization, freeAuthorization: false)
+    }
+    
+    func _run(_ program: String, arguments: [String], authorization: AuthorizationRef? = nil, freeAuthorization: Bool) throws -> AuthorizationRef
+    {
+        var launchPath = "/usr/bin/" + program
+        if !FileManager.default.fileExists(atPath: launchPath)
+        {
+            launchPath = "/bin/" + program
+        }
+        
+        print("Running program:", launchPath)
+        
+        let task = STPrivilegedTask()
+        task.launchPath = launchPath
+        task.arguments = arguments
+        task.freeAuthorizationWhenDone = freeAuthorization
+        
+        let errorCode: OSStatus
+        
+        if let authorization = authorization
+        {
+            errorCode = task.launch(withAuthorization: authorization)
+        }
+        else
+        {
+            errorCode = task.launch()
+        }
+        
+        guard errorCode == 0 else { throw PluginError.taskErrorCode(Int(errorCode)) }
+        
+        task.waitUntilExit()
+        
+        print("Exit code:", task.terminationStatus)
+        
+        guard task.terminationStatus == 0 else {
+            let outputData = task.outputFileHandle.readDataToEndOfFile()
+            
+            if let outputString = String(data: outputData, encoding: .utf8), !outputString.isEmpty
+            {
+                throw PluginError.taskError(outputString)
+            }
+            
+            throw PluginError.taskErrorCode(Int(task.terminationStatus))
+        }
+        
+        guard let authorization = task.authorization else { throw PluginError.unknown }
+        return authorization
+    }
 }
 
 extension AppDelegate: NSMenuDelegate

AltServer/Base.lproj/Main.storyboard

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="15504" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14490.70"/>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="15504"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -10,11 +11,11 @@
             <objects>
                 <customObject id="YLy-65-1bz" customClass="NSFontManager"/>
                 <stackView distribution="fill" orientation="vertical" alignment="leading" spacing="4" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" id="urc-xw-Dhc">
-                    <rect key="frame" x="0.0" y="0.0" width="300" height="48"/>
+                    <rect key="frame" x="0.0" y="0.0" width="300" height="46"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <subviews>
                         <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="zLd-d8-ghZ">
-                            <rect key="frame" x="0.0" y="26" width="300" height="22"/>
+                            <rect key="frame" x="0.0" y="25" width="300" height="21"/>
                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" placeholderString="Apple ID" drawsBackground="YES" id="BXa-Re-rs3">
                                 <font key="font" metaFont="system"/>
                                 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -26,7 +27,7 @@
                             </connections>
                         </textField>
                         <secureTextField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="9rp-Vx-rvB">
-                            <rect key="frame" x="0.0" y="0.0" width="300" height="22"/>
+                            <rect key="frame" x="0.0" y="0.0" width="300" height="21"/>
                             <secureTextFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" placeholderString="Password" drawsBackground="YES" usesSingleLineMode="YES" id="xqJ-wt-DlP">
                                 <font key="font" metaFont="system"/>
                                 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -61,9 +62,11 @@
                         <outlet property="authenticationAppleIDTextField" destination="zLd-d8-ghZ" id="wW5-0J-zdq"/>
                         <outlet property="authenticationPasswordTextField" destination="9rp-Vx-rvB" id="ZoC-DI-jzQ"/>
                         <outlet property="connectedDevicesMenu" destination="KJ9-WY-pW1" id="Mcv-64-iFU"/>
+                        <outlet property="installMailPluginMenuItem" destination="3CM-gV-X2G" id="lio-ha-z0S"/>
                         <outlet property="launchAtLoginMenuItem" destination="IyR-FQ-upe" id="Fxn-EP-hwH"/>
                     </connections>
                 </customObject>
+                <customObject id="Arf-IC-5eb" customClass="SUUpdater"/>
                 <application id="hnw-xV-0zn" sceneMemberID="viewController">
                     <menu key="mainMenu" title="Main Menu" systemMenu="main" id="AYu-sK-qS6">
                         <items>
@@ -98,7 +101,17 @@
                                         <menuItem title="Launch at Login" id="IyR-FQ-upe" userLabel="Launch At Login">
                                             <modifierMask key="keyEquivalentModifierMask"/>
                                         </menuItem>
+                                        <menuItem title="Install Mail Plug-in" id="3CM-gV-X2G" userLabel="Mail Plug-in">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                        </menuItem>
                                         <menuItem isSeparatorItem="YES" id="mVM-Nm-Zi9"/>
+                                        <menuItem title="Check for Updates..." id="Tnq-gD-Eic" userLabel="Check for Updates">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="checkForUpdates:" target="Arf-IC-5eb" id="7JG-du-nr4"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem isSeparatorItem="YES" id="hmG-xg-qgm"/>
                                         <menuItem title="Quit AltServer" keyEquivalent="q" id="4sb-4s-VLi">
                                             <connections>
                                                 <action selector="terminate:" target="Ady-hI-5gd" id="Te7-pn-YzF"/>

AltServer/Connections/ALTNotificationConnection+Private.h

@@ -0,0 +1,24 @@
+//
+//  ALTNotificationConnection+Private.h
+//  AltServer
+//
+//  Created by Riley Testut on 1/10/20.
+//  Copyright © 2020 Riley Testut. All rights reserved.
+//
+
+#import "ALTNotificationConnection.h"
+
+#include <libimobiledevice/libimobiledevice.h>
+#include <libimobiledevice/notification_proxy.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface ALTNotificationConnection ()
+
+@property (nonatomic, readonly) np_client_t client;
+
+- (instancetype)initWithDevice:(ALTDevice *)device client:(np_client_t)client;
+
+@end
+
+NS_ASSUME_NONNULL_END

AltServer/Connections/ALTNotificationConnection.h

@@ -0,0 +1,30 @@
+//
+//  ALTNotificationConnection.h
+//  AltServer
+//
+//  Created by Riley Testut on 1/10/20.
+//  Copyright © 2020 Riley Testut. All rights reserved.
+//
+
+#import <AltSign/AltSign.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+NS_SWIFT_NAME(NotificationConnection)
+@interface ALTNotificationConnection : NSObject
+
+@property (nonatomic, copy, readonly) ALTDevice *device;
+
+@property (nonatomic, copy, nullable) void (^receivedNotificationHandler)(CFNotificationName notification);
+
+- (void)startListeningForNotifications:(NSArray<NSString *> *)notifications
+                     completionHandler:(void (^)(BOOL success, NSError *_Nullable error))completionHandler;
+
+- (void)sendNotification:(CFNotificationName)notification
+       completionHandler:(void (^)(BOOL success, NSError *_Nullable error))completionHandler;
+
+- (void)disconnect;
+
+@end
+
+NS_ASSUME_NONNULL_END

AltServer/Connections/ALTNotificationConnection.m

@@ -0,0 +1,93 @@
+//
+//  ALTNotificationConnection.m
+//  AltServer
+//
+//  Created by Riley Testut on 1/10/20.
+//  Copyright © 2020 Riley Testut. All rights reserved.
+//
+
+#import "ALTNotificationConnection+Private.h"
+#import "AltKit.h"
+
+void ALTDeviceReceivedNotification(const char *notification, void *user_data);
+
+@implementation ALTNotificationConnection
+
+- (instancetype)initWithDevice:(ALTDevice *)device client:(np_client_t)client
+{
+    self = [super init];
+    if (self)
+    {
+        _device = [device copy];
+        _client = client;
+    }
+    
+    return self;
+}
+
+- (void)dealloc
+{
+    [self disconnect];
+}
+
+- (void)disconnect
+{
+    np_client_free(self.client);
+    _client = nil;
+}
+
+- (void)startListeningForNotifications:(NSArray<NSString *> *)notifications completionHandler:(void (^)(BOOL, NSError * _Nullable))completionHandler
+{
+    dispatch_async(dispatch_get_global_queue(QOS_CLASS_UTILITY, 0), ^{
+        const char **notificationNames = (const char **)malloc((notifications.count + 1) * sizeof(char *));
+        for (int i = 0; i < notifications.count; i++)
+        {
+            NSString *name = notifications[i];
+            notificationNames[i] = name.UTF8String;
+        }
+        notificationNames[notifications.count] = NULL; // Must have terminating NULL entry.
+        
+        np_error_t result = np_observe_notifications(self.client, notificationNames);
+        if (result != NP_E_SUCCESS)
+        {
+            return completionHandler(NO, [NSError errorWithDomain:AltServerErrorDomain code:ALTServerErrorLostConnection userInfo:nil]);
+        }
+        
+        result = np_set_notify_callback(self.client, ALTDeviceReceivedNotification, (__bridge void *)self);
+        if (result != NP_E_SUCCESS)
+        {
+            return completionHandler(NO, [NSError errorWithDomain:AltServerErrorDomain code:ALTServerErrorLostConnection userInfo:nil]);
+        }
+        
+        completionHandler(YES, nil);
+        
+        free(notificationNames);
+    });
+}
+
+- (void)sendNotification:(CFNotificationName)notification completionHandler:(void (^)(BOOL, NSError * _Nullable))completionHandler
+{
+    dispatch_async(dispatch_get_global_queue(QOS_CLASS_UTILITY, 0), ^{
+        np_error_t result = np_post_notification(self.client, [(__bridge NSString *)notification UTF8String]);
+        if (result == NP_E_SUCCESS)
+        {
+            completionHandler(YES, nil);
+        }
+        else
+        {
+            completionHandler(NO, [NSError errorWithDomain:AltServerErrorDomain code:ALTServerErrorLostConnection userInfo:nil]);
+        }
+    });
+}
+
+@end
+
+void ALTDeviceReceivedNotification(const char *notification, void *user_data)
+{
+    ALTNotificationConnection *connection = (__bridge ALTNotificationConnection *)user_data;
+    
+    if (connection.receivedNotificationHandler)
+    {
+        connection.receivedNotificationHandler((__bridge CFNotificationName)@(notification));
+    }
+}

AltServer/Connections/ALTWiredConnection+Private.h

@@ -0,0 +1,23 @@
+//
+//  ALTWiredConnection+Private.h
+//  AltServer
+//
+//  Created by Riley Testut on 1/10/20.
+//  Copyright © 2020 Riley Testut. All rights reserved.
+//
+
+#import "ALTWiredConnection.h"
+
+#include <libimobiledevice/libimobiledevice.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface ALTWiredConnection ()
+
+@property (nonatomic, readonly) idevice_connection_t connection;
+
+- (instancetype)initWithDevice:(ALTDevice *)device connection:(idevice_connection_t)connection;
+
+@end
+
+NS_ASSUME_NONNULL_END

AltServer/Connections/ALTWiredConnection.h

@@ -0,0 +1,25 @@
+//
+//  ALTWiredConnection.h
+//  AltServer
+//
+//  Created by Riley Testut on 1/10/20.
+//  Copyright © 2020 Riley Testut. All rights reserved.
+//
+
+#import <AltSign/AltSign.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+NS_SWIFT_NAME(WiredConnection)
+@interface ALTWiredConnection : NSObject
+
+@property (nonatomic, copy, readonly) ALTDevice *device;
+
+- (void)sendData:(NSData *)data completionHandler:(void (^)(BOOL, NSError * _Nullable))completionHandler;
+- (void)receiveDataWithExpectedSize:(NSInteger)expectedSize completionHandler:(void (^)(NSData * _Nullable, NSError * _Nullable))completionHandler;
+
+- (void)disconnect;
+
+@end
+
+NS_ASSUME_NONNULL_END

AltServer/Connections/ALTWiredConnection.m

@@ -0,0 +1,101 @@
+//
+//  ALTWiredConnection.m
+//  AltServer
+//
+//  Created by Riley Testut on 1/10/20.
+//  Copyright © 2020 Riley Testut. All rights reserved.
+//
+
+#import "ALTWiredConnection+Private.h"
+#import "AltKit.h"
+
+@implementation ALTWiredConnection
+
+- (instancetype)initWithDevice:(ALTDevice *)device connection:(idevice_connection_t)connection
+{
+    self = [super init];
+    if (self)
+    {
+        _device = [device copy];
+        _connection = connection;
+    }
+    
+    return self;
+}
+
+- (void)dealloc
+{
+    [self disconnect];
+}
+
+- (void)disconnect
+{
+    idevice_disconnect(self.connection);
+    _connection = nil;
+}
+
+- (void)sendData:(NSData *)data completionHandler:(void (^)(BOOL, NSError * _Nullable))completionHandler
+{
+    void (^finish)(NSError *error) = ^(NSError *error) {
+        if (error != nil)
+        {
+            NSLog(@"Send Error: %@", error);
+            completionHandler(NO, error);
+        }
+        else
+        {
+            completionHandler(YES, nil);
+        }
+    };
+    
+    dispatch_async(dispatch_get_global_queue(QOS_CLASS_UTILITY, 0), ^{
+        NSMutableData *mutableData = [data mutableCopy];
+        while (mutableData.length > 0)
+        {
+            uint32_t sentBytes = 0;
+            if (idevice_connection_send(self.connection, (const char *)mutableData.bytes, (int32_t)mutableData.length, &sentBytes) != IDEVICE_E_SUCCESS)
+            {
+                return finish([NSError errorWithDomain:AltServerErrorDomain code:ALTServerErrorLostConnection userInfo:nil]);
+            }
+            
+            [mutableData replaceBytesInRange:NSMakeRange(0, sentBytes) withBytes:NULL length:0];
+        }
+        
+        finish(nil);
+    });
+}
+
+- (void)receiveDataWithExpectedSize:(NSInteger)expectedSize completionHandler:(void (^)(NSData * _Nullable, NSError * _Nullable))completionHandler
+{
+    void (^finish)(NSData *data, NSError *error) = ^(NSData *data, NSError *error) {
+        if (error != nil)
+        {
+            NSLog(@"Receive Data Error: %@", error);
+        }
+        
+        completionHandler(data, error);
+    };
+    
+    dispatch_async(dispatch_get_global_queue(QOS_CLASS_UTILITY, 0), ^{
+        char bytes[4096];
+        NSMutableData *receivedData = [NSMutableData dataWithCapacity:expectedSize];
+        
+        while (receivedData.length < expectedSize)
+        {
+            uint32_t size = MIN(4096, (uint32_t)expectedSize - (uint32_t)receivedData.length);
+            
+            uint32_t receivedBytes = 0;
+            if (idevice_connection_receive_timeout(self.connection, bytes, size, &receivedBytes, 0) != IDEVICE_E_SUCCESS)
+            {
+                return finish(nil, [NSError errorWithDomain:AltServerErrorDomain code:ALTServerErrorLostConnection userInfo:nil]);
+            }
+            
+            NSData *data = [NSData dataWithBytesNoCopy:bytes length:receivedBytes freeWhenDone:NO];
+            [receivedData appendData:data];
+        }
+        
+        finish(receivedData, nil);
+    });
+}
+
+@end

AltServer/Connections/ClientConnection.swift

@@ -0,0 +1,231 @@
+//
+//  ClientConnection.swift
+//  AltServer
+//
+//  Created by Riley Testut on 1/9/20.
+//  Copyright © 2020 Riley Testut. All rights reserved.
+//
+
+import Foundation
+import Network
+
+import AltKit
+import AltSign
+
+extension ClientConnection
+{
+    enum Connection
+    {
+        case wireless(NWConnection)
+        case wired(WiredConnection)
+    }
+}
+
+class ClientConnection
+{
+    let connection: Connection
+    
+    init(connection: Connection)
+    {
+        self.connection = connection
+    }
+    
+    func disconnect()
+    {
+        switch self.connection
+        {
+        case .wireless(let connection):
+            switch connection.state
+            {
+            case .cancelled, .failed:
+                print("Disconnecting from \(connection.endpoint)...")
+                
+            default:
+                // State update handler might call this method again.
+                connection.cancel()
+            }
+            
+        case .wired(let connection):
+            connection.disconnect()
+        }
+    }
+    
+    func send<T: Encodable>(_ response: T, shouldDisconnect: Bool = false, completionHandler: @escaping (Result<Void, ALTServerError>) -> Void)
+    {
+        func finish(_ result: Result<Void, ALTServerError>)
+        {
+            completionHandler(result)
+            
+            if shouldDisconnect
+            {
+                // Add short delay to prevent us from dropping connection too quickly.
+                DispatchQueue.global().asyncAfter(deadline: .now() + 1.0) {
+                    self.disconnect()
+                }
+            }
+        }
+        
+        do
+        {
+            let data = try JSONEncoder().encode(response)
+            let responseSize = withUnsafeBytes(of: Int32(data.count)) { Data($0) }
+            
+            self.send(responseSize) { (result) in
+                switch result
+                {
+                case .failure: finish(.failure(.init(.lostConnection)))
+                case .success:
+                    
+                    self.send(data) { (result) in
+                        switch result
+                        {
+                        case .failure: finish(.failure(.init(.lostConnection)))
+                        case .success: finish(.success(()))
+                        }
+                    }
+                }
+            }
+        }
+        catch
+        {
+            finish(.failure(.init(.invalidResponse)))
+        }
+    }
+    
+    func receiveRequest(completionHandler: @escaping (Result<ServerRequest, ALTServerError>) -> Void)
+    {
+        let size = MemoryLayout<Int32>.size
+        
+        print("Receiving request size")
+        self.receiveData(expectedBytes: size) { (result) in
+            do
+            {
+                let data = try result.get()
+                
+                print("Receiving request...")
+                let expectedBytes = Int(data.withUnsafeBytes { $0.load(as: Int32.self) })
+                self.receiveData(expectedBytes: expectedBytes) { (result) in
+                    do
+                    {
+                        let data = try result.get()
+                        let request = try JSONDecoder().decode(ServerRequest.self, from: data)
+                        
+                        print("Received installation request:", request)
+                        completionHandler(.success(request))
+                    }
+                    catch
+                    {
+                        completionHandler(.failure(ALTServerError(error)))
+                    }
+                }
+            }
+            catch
+            {
+                completionHandler(.failure(ALTServerError(error)))
+            }
+        }
+    }
+    
+    func send(_ data: Data, completionHandler: @escaping (Result<Void, Error>) -> Void)
+    {
+        switch self.connection
+        {
+        case .wireless(let connection):
+            connection.send(content: data, completion: .contentProcessed { (error) in
+                if let error = error
+                {
+                    completionHandler(.failure(error))
+                }
+                else
+                {
+                    completionHandler(.success(()))
+                }
+            })
+            
+        case .wired(let connection):
+            connection.send(data) { (success, error) in
+                if !success
+                {
+                    completionHandler(.failure(ALTServerError(.lostConnection)))
+                }
+                else
+                {
+                    completionHandler(.success(()))
+                }
+            }
+        }
+    }
+    
+    func receiveData(expectedBytes: Int, completionHandler: @escaping (Result<Data, Error>) -> Void)
+    {
+        func finish(data: Data?, error: Error?)
+        {
+            do
+            {
+                let data = try self.process(data: data, error: error)
+                completionHandler(.success(data))
+            }
+            catch
+            {
+                completionHandler(.failure(ALTServerError(error)))
+            }
+        }
+        
+        switch self.connection
+        {
+        case .wireless(let connection):
+            connection.receive(minimumIncompleteLength: expectedBytes, maximumLength: expectedBytes) { (data, _, _, error) in
+                finish(data: data, error: error)
+            }
+            
+        case .wired(let connection):
+            connection.receiveData(withExpectedSize: expectedBytes) { (data, error) in
+                finish(data: data, error: error)
+            }
+        }
+    }
+}
+
+extension ClientConnection: CustomStringConvertible
+{
+    var description: String {
+        switch self.connection
+        {
+        case .wireless(let connection): return "\(connection.endpoint) (Wireless)"
+        case .wired(let connection): return "\(connection.device.name) (Wired)"
+        }
+    }
+}
+
+private extension ClientConnection
+{
+    func process(data: Data?, error: Error?) throws -> Data
+    {
+        do
+        {
+            do
+            {
+                guard let data = data else { throw error ?? ALTServerError(.unknown) }
+                return data
+            }
+            catch let error as NWError
+            {
+                print("Error receiving data from connection \(connection)", error)
+                
+                throw ALTServerError(.lostConnection)
+            }
+            catch
+            {
+                throw error
+            }
+        }
+        catch let error as ALTServerError
+        {
+            throw error
+        }
+        catch
+        {
+            preconditionFailure("A non-ALTServerError should never be thrown from this method.")
+        }
+    }
+}

AltServer/Connections/ConnectionManager.swift

@@ -8,6 +8,7 @@
 
 import Foundation
 import Network
+import AppKit
 
 import AltKit
 
@@ -20,9 +21,8 @@ extension ALTServerError
         case let error as ALTServerError: self = error
         case is DecodingError: self = ALTServerError(.invalidRequest)
         case is EncodingError: self = ALTServerError(.invalidResponse)
-        default:
-            assertionFailure("Caught unknown error type")
-            self = ALTServerError(.unknown)
+        case let error as NSError:
+            self = ALTServerError(.unknown, userInfo: error.userInfo)
         }
     }
 }
@@ -53,10 +53,13 @@ class ConnectionManager
     private lazy var listener = self.makeListener()
     private let dispatchQueue = DispatchQueue(label: "com.rileytestut.AltServer.connections", qos: .utility)
     
-    private var connections = [NWConnection]()
+    private var connections = [ClientConnection]()
+    private var notificationConnections = [ALTDevice: NotificationConnection]()
     
     private init()
     {
+        NotificationCenter.default.addObserver(self, selector: #selector(ConnectionManager.deviceDidConnect(_:)), name: .deviceManagerDeviceDidConnect, object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(ConnectionManager.deviceDidDisconnect(_:)), name: .deviceManagerDeviceDidDisconnect, object: nil)
     }
     
     func start()
@@ -76,6 +79,16 @@ class ConnectionManager
         default: break
         }
     }
+    
+    func disconnect(_ connection: ClientConnection)
+    {
+        connection.disconnect()
+        
+        if let index = self.connections.firstIndex(where: { $0 === connection })
+        {
+            self.connections.remove(at: index)
+        }
+    }
 }
 
 private extension ConnectionManager
@@ -126,68 +139,18 @@ private extension ConnectionManager
         }
         
         listener.newConnectionHandler = { [weak self] (connection) in
-            self?.awaitRequest(from: connection)
+            self?.prepare(connection)
         }
         
         return listener
     }
     
-    func disconnect(_ connection: NWConnection)
+    func prepare(_ connection: NWConnection)
     {
-        switch connection.state
-        {
-        case .cancelled, .failed:
-            print("Disconnecting from \(connection.endpoint)...")
-            
-            if let index = self.connections.firstIndex(where: { $0 === connection })
-            {
-                self.connections.remove(at: index)
-            }
-            
-        default:
-            // State update handler will call this method again.
-            connection.cancel()
-        }
-    }
-    
-    func process(data: Data?, error: NWError?, from connection: NWConnection) throws -> Data
-    {
-        do
-        {
-            do
-            {
-                guard let data = data else { throw error ?? ALTServerError(.unknown) }
-                return data
-            }
-            catch let error as NWError
-            {
-                print("Error receiving data from connection \(connection)", error)
-                
-                throw ALTServerError(.lostConnection)
-            }
-            catch
-            {
-                throw error
-            }
-        }
-        catch let error as ALTServerError
-        {
-            throw error
-        }
-        catch
-        {
-            preconditionFailure("A non-ALTServerError should never be thrown from this method.")
-        }
-    }
-}
-
-private extension ConnectionManager
-{
-    func awaitRequest(from connection: NWConnection)
-    {
-        guard !self.connections.contains(where: { $0 === connection }) else { return }
-        self.connections.append(connection)
+        let clientConnection = ClientConnection(connection: .wireless(connection))
         
+        guard !self.connections.contains(where: { $0 === clientConnection }) else { return }
+        self.connections.append(clientConnection)
         
         connection.stateUpdateHandler = { [weak self] (state) in
             switch state
@@ -196,20 +159,17 @@ private extension ConnectionManager
                 
             case .ready:
                 print("Connected to client:", connection.endpoint)
-                
-                self?.receiveApp(from: connection) { (result) in
-                    self?.finish(connection: connection, error: result.error)
-                }
+                self?.handleRequest(for: clientConnection)
                 
             case .waiting:
                 print("Waiting for connection...")
                 
             case .failed(let error):
                 print("Failed to connect to service \(connection.endpoint).", error)
-                self?.disconnect(connection)
+                self?.disconnect(clientConnection)
                 
             case .cancelled:
-                self?.disconnect(connection)
+                self?.disconnect(clientConnection)
                 
             @unknown default: break
             }
@@ -217,8 +177,132 @@ private extension ConnectionManager
         
         connection.start(queue: self.dispatchQueue)
     }
+}
+
+private extension ConnectionManager
+{
+    func startNotificationConnection(to device: ALTDevice)
+    {
+        ALTDeviceManager.shared.startNotificationConnection(to: device) { (connection, error) in
+            guard let connection = connection else { return }
+            
+            let notifications: [CFNotificationName] = [.wiredServerConnectionAvailableRequest, .wiredServerConnectionStartRequest]
+            connection.startListening(forNotifications: notifications.map { String($0.rawValue) }) { (success, error) in
+                guard success else { return }
+                
+                connection.receivedNotificationHandler = { [weak self, weak connection] (notification) in
+                    guard let self = self, let connection = connection else { return }
+                    self.handle(notification, for: connection)
+                }
+                
+                self.notificationConnections[device] = connection
+            }
+        }
+    }
     
-    func receiveApp(from connection: NWConnection, completionHandler: @escaping (Result<Void, ALTServerError>) -> Void)
+    func stopNotificationConnection(to device: ALTDevice)
+    {
+        guard let connection = self.notificationConnections[device] else { return }
+        connection.disconnect()
+        
+        self.notificationConnections[device] = nil
+    }
+    
+    func handle(_ notification: CFNotificationName, for connection: NotificationConnection)
+    {
+        switch notification
+        {
+        case .wiredServerConnectionAvailableRequest:
+            connection.sendNotification(.wiredServerConnectionAvailableResponse) { (success, error) in
+                if let error = error, !success
+                {
+                    print("Error sending wired server connection response.", error)
+                }
+                else
+                {
+                    print("Sent wired server connection available response!")
+                }
+            }
+            
+        case .wiredServerConnectionStartRequest:
+            ALTDeviceManager.shared.startWiredConnection(to: connection.device) { (wiredConnection, error) in
+                if let wiredConnection = wiredConnection
+                {
+                    print("Started wired server connection!")
+                    
+                    let clientConnection = ClientConnection(connection: .wired(wiredConnection))
+                    self.handleRequest(for: clientConnection)
+                }
+                else if let error = error
+                {
+                    print("Error starting wired server connection.", error)
+                }
+            }
+            
+        default: break
+        }
+    }
+}
+
+private extension ConnectionManager
+{
+    func handleRequest(for connection: ClientConnection)
+    {
+        connection.receiveRequest() { (result) in
+            print("Received initial request with result:", result)
+            
+            switch result
+            {
+            case .failure(let error):
+                let response = ErrorResponse(error: ALTServerError(error))
+                connection.send(response, shouldDisconnect: true) { (result) in
+                    print("Sent error response with result:", result)
+                }
+                
+            case .success(.anisetteData(let request)):
+                self.handleAnisetteDataRequest(request, for: connection)
+                
+            case .success(.prepareApp(let request)):
+                self.handlePrepareAppRequest(request, for: connection)
+                
+            case .success(.beginInstallation): break
+                
+            case .success(.installProvisioningProfiles(let request)):
+                self.handleInstallProvisioningProfilesRequest(request, for: connection)
+                
+            case .success(.removeProvisioningProfiles(let request)):
+                self.handleRemoveProvisioningProfilesRequest(request, for: connection)
+                
+            case .success(.unknown):
+                let response = ErrorResponse(error: ALTServerError(.unknownRequest))
+                connection.send(response, shouldDisconnect: true) { (result) in
+                    print("Sent unknown request response with result:", result)
+                }
+            }
+        }
+    }
+    
+    func handleAnisetteDataRequest(_ request: AnisetteDataRequest, for connection: ClientConnection)
+    {
+        AnisetteDataManager.shared.requestAnisetteData { (result) in
+            switch result
+            {
+            case .failure(let error):
+                let errorResponse = ErrorResponse(error: ALTServerError(error))
+                connection.send(errorResponse, shouldDisconnect: true) { (result) in
+                    print("Sent anisette data error response with result:", result)
+                }
+                
+            case .success(let anisetteData):
+                let response = AnisetteDataResponse(anisetteData: anisetteData)
+                connection.send(response, shouldDisconnect: true) { (result) in
+                    print("Sent anisette data response with result:", result)
+                }
+            }
+        }
+    }
+    
+    func handlePrepareAppRequest(_ request: PrepareAppRequest, for connection: ClientConnection)
     {
         var temporaryURL: URL?
         
@@ -230,83 +314,75 @@ private extension ConnectionManager
                 catch { print("Failed to remove .ipa.", error) }
             }
             
-            completionHandler(result)
+            switch result
+            {
+            case .failure(let error):
+                print("Failed to process request from \(connection).", error)
+                
+                let response = ErrorResponse(error: ALTServerError(error))
+                connection.send(response, shouldDisconnect: true) { (result) in
+                    print("Sent install app error response to \(connection) with result:", result)
+                }
+                
+            case .success:
+                print("Processed request from \(connection).")
+                
+                let response = InstallationProgressResponse(progress: 1.0)
+                connection.send(response, shouldDisconnect: true) { (result) in
+                    print("Sent install app response to \(connection) with result:", result)
+                }
+            }
         }
         
-        self.receive(PrepareAppRequest.self, from: connection) { (result) in
-            print("Received request with result:", result)
+        self.receiveApp(for: request, from: connection) { (result) in
+            print("Received app with result:", result)
             
             switch result
             {
             case .failure(let error): finish(.failure(error))
-            case .success(let request):
-                self.receiveApp(for: request, from: connection) { (result) in
-                    print("Received app with result:", result)
+            case .success(let fileURL):
+                temporaryURL = fileURL
+                
+                print("Awaiting begin installation request...")
+                
+                connection.receiveRequest() { (result) in
+                    print("Received begin installation request with result:", result)
                     
                     switch result
                     {
                     case .failure(let error): finish(.failure(error))
-                    case .success(let request, let fileURL):
-                        temporaryURL = fileURL
+                    case .success(.beginInstallation(let installRequest)):
+                        print("Installing to device \(request.udid)...")
                         
-                        print("Awaiting begin installation request...")
-                        
-                        self.receive(BeginInstallationRequest.self, from: connection) { (result) in
-                            print("Received begin installation request with result:", result)
-                            
+                        self.installApp(at: fileURL, toDeviceWithUDID: request.udid, activeProvisioningProfiles: installRequest.activeProfiles, connection: connection) { (result) in
+                            print("Installed to device with result:", result)
                             switch result
                             {
                             case .failure(let error): finish(.failure(error))
-                            case .success:
-                                print("Installing to device \(request.udid)...")
-                                
-                                self.installApp(at: fileURL, toDeviceWithUDID: request.udid, connection: connection) { (result) in
-                                    print("Installed to device with result:", result)
-                                    switch result
-                                    {
-                                    case .failure(let error): finish(.failure(error))
-                                    case .success: finish(.success(()))
-                                    }
-                                }
+                            case .success: finish(.success(()))
                             }
                         }
+                        
+                    case .success:
+                        let response = ErrorResponse(error: ALTServerError(.unknownRequest))
+                        connection.send(response, shouldDisconnect: true) { (result) in
+                            print("Sent unknown request error response to \(connection) with result:", result)
+                        }
                     }
                 }
             }
         }
     }
     
-    func finish(connection: NWConnection, error: ALTServerError?)
+    func receiveApp(for request: PrepareAppRequest, from connection: ClientConnection, completionHandler: @escaping (Result<URL, ALTServerError>) -> Void)
     {
-        if let error = error
-        {
-            print("Failed to process request from \(connection.endpoint).", error)
-        }
-        else
-        {
-            print("Processed request from \(connection.endpoint).")
-        }
-        
-        let response = ServerResponse(progress: 1.0, error: error)
-        
-        self.send(response, to: connection) { (result) in
-            print("Sent response to \(connection.endpoint) with result:", result)
-            
-            self.disconnect(connection)
-        }
-    }
-    
-    func receiveApp(for request: PrepareAppRequest, from connection: NWConnection, completionHandler: @escaping (Result<(PrepareAppRequest, URL), ALTServerError>) -> Void)
-    {
-        connection.receive(minimumIncompleteLength: request.contentSize, maximumLength: request.contentSize) { (data, _, _, error) in
+        connection.receiveData(expectedBytes: request.contentSize) { (result) in
             do
             {
                 print("Received app data!")
                 
-                let data = try self.process(data: data, error: error, from: connection)
-                
-                print("Processed app data!")
-                
+                let data = try result.get()
+                                
                 guard ALTDeviceManager.shared.availableDevices.contains(where: { $0.identifier == request.udid }) else { throw ALTServerError(.deviceNotFound) }
                 
                 print("Writing app data...")
@@ -316,7 +392,7 @@ private extension ConnectionManager
                 
                 print("Wrote app to URL:", temporaryURL)
                 
-                completionHandler(.success((request, temporaryURL)))
+                completionHandler(.success(temporaryURL))
             }
             catch
             {
@@ -327,14 +403,14 @@ private extension ConnectionManager
         }
     }
     
-    func installApp(at fileURL: URL, toDeviceWithUDID udid: String, connection: NWConnection, completionHandler: @escaping (Result<Void, ALTServerError>) -> Void)
+    func installApp(at fileURL: URL, toDeviceWithUDID udid: String, activeProvisioningProfiles: Set<String>?, connection: ClientConnection, completionHandler: @escaping (Result<Void, ALTServerError>) -> Void)
     {
         let serialQueue = DispatchQueue(label: "com.altstore.ConnectionManager.installQueue", qos: .default)
         var isSending = false
         
         var observation: NSKeyValueObservation?
         
-        let progress = ALTDeviceManager.shared.installApp(at: fileURL, toDeviceWithUDID: udid) { (success, error) in
+        let progress = ALTDeviceManager.shared.installApp(at: fileURL, toDeviceWithUDID: udid, activeProvisioningProfiles: activeProvisioningProfiles) { (success, error) in
             print("Installed app with result:", error == nil ? "Success" : error!.localizedDescription)
             
             if let error = error.map({ $0 as? ALTServerError ?? ALTServerError(.unknown) })
@@ -356,9 +432,9 @@ private extension ConnectionManager
                 isSending = true
                 
                 print("Progress:", progress.fractionCompleted)
-                let response = ServerResponse(progress: progress.fractionCompleted, error: nil)
+                let response = InstallationProgressResponse(progress: progress.fractionCompleted)
                 
-                self.send(response, to: connection) { (result) in                    
+                connection.send(response) { (result) in                    
                     serialQueue.async {
                         isSending = false
                     }
@@ -366,79 +442,67 @@ private extension ConnectionManager
             }
         })
     }
-
-    func send<T: Encodable>(_ response: T, to connection: NWConnection, completionHandler: @escaping (Result<Void, ALTServerError>) -> Void)
+    
+    func handleInstallProvisioningProfilesRequest(_ request: InstallProvisioningProfilesRequest, for connection: ClientConnection)
     {
-        do
-        {            
-            let data = try JSONEncoder().encode(response)
-            let responseSize = withUnsafeBytes(of: Int32(data.count)) { Data($0) }
-
-            connection.send(content: responseSize, completion: .contentProcessed { (error) in
-                do
-                {
-                    if let error = error
-                    {
-                        throw error
-                    }
-
-                    connection.send(content: data, completion: .contentProcessed { (error) in
-                        if error != nil
-                        {
-                            completionHandler(.failure(.init(.lostConnection)))
-                        }
-                        else
-                        {
-                            completionHandler(.success(()))
-                        }
-                    })
+        ALTDeviceManager.shared.installProvisioningProfiles(request.provisioningProfiles, toDeviceWithUDID: request.udid, activeProvisioningProfiles: request.activeProfiles) { (success, error) in
+            if let error = error, !success
+            {
+                print("Failed to install profiles \(request.provisioningProfiles.map { $0.bundleIdentifier }):", error)
+                
+                let errorResponse = ErrorResponse(error: ALTServerError(error))
+                connection.send(errorResponse, shouldDisconnect: true) { (result) in
+                    print("Sent install profiles error response with result:", result)
                 }
-                catch
-                {
-                    completionHandler(.failure(.init(.lostConnection)))
+            }
+            else
+            {
+                print("Installed profiles:", request.provisioningProfiles.map { $0.bundleIdentifier })
+                
+                let response = InstallProvisioningProfilesResponse()
+                connection.send(response, shouldDisconnect: true) { (result) in
+                    print("Sent install profiles response to \(connection) with result:", result)
                 }
-            })
-        }
-        catch
-        {
-            completionHandler(.failure(.init(.invalidResponse)))
+            }
         }
     }
     
-    func receive<T: Decodable>(_ responseType: T.Type, from connection: NWConnection, completionHandler: @escaping (Result<T, ALTServerError>) -> Void)
+    func handleRemoveProvisioningProfilesRequest(_ request: RemoveProvisioningProfilesRequest, for connection: ClientConnection)
     {
-        let size = MemoryLayout<Int32>.size
-        
-        print("Receiving request size")
-        connection.receive(minimumIncompleteLength: size, maximumLength: size) { (data, _, _, error) in
-            do
+        ALTDeviceManager.shared.removeProvisioningProfiles(forBundleIdentifiers: request.bundleIdentifiers, fromDeviceWithUDID: request.udid) { (success, error) in
+            if let error = error, !success
             {
-                let data = try self.process(data: data, error: error, from: connection)
+                print("Failed to remove profiles \(request.bundleIdentifiers):", error)
                 
-                print("Receiving request...")
-                
-                let expectedBytes = Int(data.withUnsafeBytes { $0.load(as: Int32.self) })
-                connection.receive(minimumIncompleteLength: expectedBytes, maximumLength: expectedBytes) { (data, _, _, error) in
-                    do
-                    {
-                        let data = try self.process(data: data, error: error, from: connection)
-                        
-                        let request = try JSONDecoder().decode(T.self, from: data)
-                        
-                        print("Received installation request:", request)
-                        
-                        completionHandler(.success(request))
-                    }
-                    catch
-                    {
-                        completionHandler(.failure(ALTServerError(error)))
-                    }
+                let errorResponse = ErrorResponse(error: ALTServerError(error))
+                connection.send(errorResponse, shouldDisconnect: true) { (result) in
+                    print("Sent remove profiles error response with result:", result)
                 }
             }
-            catch
+            else
             {
-                completionHandler(.failure(ALTServerError(error)))
+                print("Removed profiles:", request.bundleIdentifiers)
+                
+                let response = RemoveProvisioningProfilesResponse()
+                connection.send(response, shouldDisconnect: true) { (result) in
+                    print("Sent remove profiles error response to \(connection) with result:", result)
+                }
             }
         }
     }
 }
+
+private extension ConnectionManager
+{
+    @objc func deviceDidConnect(_ notification: Notification)
+    {
+        guard let device = notification.object as? ALTDevice else { return }
+        self.startNotificationConnection(to: device)
+    }
+    
+    @objc func deviceDidDisconnect(_ notification: Notification)
+    {
+        guard let device = notification.object as? ALTDevice else { return }
+        self.stopNotificationConnection(to: device)
+    }
+}

AltServer/Devices/ALTDeviceManager+Installation.swift

@@ -8,6 +8,13 @@
 
 import Cocoa
 import UserNotifications
+import ObjectiveC
+
+#if STAGING
+private let appURL = URL(string: "https://f000.backblazeb2.com/file/altstore-staging/altstore.ipa")!
+#else
+private let appURL = URL(string: "https://f000.backblazeb2.com/file/altstore/altstore.ipa")!
+#endif
 
 enum InstallError: LocalizedError
 {
@@ -49,126 +56,147 @@ extension ALTDeviceManager
             try? FileManager.default.removeItem(at: destinationDirectoryURL)
         }
         
-        self.authenticate(appleID: appleID, password: password) { (result) in
+        AnisetteDataManager.shared.requestAnisetteData { (result) in
             do
             {
-                let account = try result.get()
+                let anisetteData = try result.get()
                 
-                self.fetchTeam(for: account) { (result) in
+                self.authenticate(appleID: appleID, password: password, anisetteData: anisetteData) { (result) in
                     do
                     {
-                        let team = try result.get()
+                        let (account, session) = try result.get()
                         
-                        self.register(device, team: team) { (result) in
+                        self.fetchTeam(for: account, session: session) { (result) in
                             do
                             {
-                                let device = try result.get()
+                                let team = try result.get()
                                 
-                                self.fetchCertificate(for: team) { (result) in
+                                self.register(device, team: team, session: session) { (result) in
                                     do
                                     {
-                                        let certificate = try result.get()
+                                        let device = try result.get()
                                         
-                                        let content = UNMutableNotificationContent()
-                                        content.title = String(format: NSLocalizedString("Installing AltStore to %@...", comment: ""), device.name)
-                                        content.body = NSLocalizedString("This may take a few seconds.", comment: "")
-                                        
-                                        let request = UNNotificationRequest(identifier: UUID().uuidString, content: content, trigger: nil)
-                                        UNUserNotificationCenter.current().add(request)
-                                        
-                                        self.downloadApp { (result) in
+                                        self.fetchCertificate(for: team, session: session) { (result) in
                                             do
                                             {
-                                                let fileURL = try result.get()
+                                                let certificate = try result.get()
                                                 
-                                                try FileManager.default.createDirectory(at: destinationDirectoryURL, withIntermediateDirectories: true, attributes: nil)
+                                                let content = UNMutableNotificationContent()
+                                                content.title = String(format: NSLocalizedString("Installing AltStore to %@...", comment: ""), device.name)
+                                                content.body = NSLocalizedString("This may take a few seconds.", comment: "")
                                                 
-                                                let appBundleURL = try FileManager.default.unzipAppBundle(at: fileURL, toDirectory: destinationDirectoryURL)
+                                                let request = UNNotificationRequest(identifier: UUID().uuidString, content: content, trigger: nil)
+                                                UNUserNotificationCenter.current().add(request)
                                                 
-                                                do
-                                                {
-                                                    try FileManager.default.removeItem(at: fileURL)
-                                                }
-                                                catch
-                                                {
-                                                    print("Failed to remove downloaded .ipa.", error)
-                                                }
-                                                
-                                                guard let application = ALTApplication(fileURL: appBundleURL) else { throw ALTError(.invalidApp) }
-                                                
-                                                self.registerAppID(name: "AltStore", identifier: "com.rileytestut.AltStore", team: team) { (result) in
+                                                self.downloadApp { (result) in
                                                     do
                                                     {
-                                                        let appID = try result.get()
+                                                        let fileURL = try result.get()
                                                         
-                                                        self.updateFeatures(for: appID, app: application, team: team) { (result) in
+                                                        try FileManager.default.createDirectory(at: destinationDirectoryURL, withIntermediateDirectories: true, attributes: nil)
+                                                        
+                                                        let appBundleURL = try FileManager.default.unzipAppBundle(at: fileURL, toDirectory: destinationDirectoryURL)
+                                                        
+                                                        do
+                                                        {
+                                                            try FileManager.default.removeItem(at: fileURL)
+                                                        }
+                                                        catch
+                                                        {
+                                                            print("Failed to remove downloaded .ipa.", error)
+                                                        }
+                                                        
+                                                        guard let application = ALTApplication(fileURL: appBundleURL) else { throw ALTError(.invalidApp) }
+                                                        
+                                                        // Refresh anisette data to prevent session timeouts.
+                                                        AnisetteDataManager.shared.requestAnisetteData { (result) in
                                                             do
                                                             {
-                                                                let appID = try result.get()
+                                                                let anisetteData = try result.get()
+                                                                session.anisetteData = anisetteData
                                                                 
-                                                                self.fetchProvisioningProfile(for: appID, team: team) { (result) in
+                                                                self.registerAppID(name: "AltStore", identifier: "com.rileytestut.AltStore", team: team, session: session) { (result) in
                                                                     do
                                                                     {
-                                                                        let provisioningProfile = try result.get()
+                                                                        let appID = try result.get()
                                                                         
-                                                                        self.install(application, to: device, team: team, appID: appID, certificate: certificate, profile: provisioningProfile) { (result) in
-                                                                            finish(result.error, title: "Failed to Install AltStore")
+                                                                        self.updateFeatures(for: appID, app: application, team: team, session: session) { (result) in
+                                                                            do
+                                                                            {
+                                                                                let appID = try result.get()
+                                                                                
+                                                                                self.fetchProvisioningProfile(for: appID, team: team, session: session) { (result) in
+                                                                                    do
+                                                                                    {
+                                                                                        let provisioningProfile = try result.get()
+                                                                                        
+                                                                                        self.install(application, to: device, team: team, appID: appID, certificate: certificate, profile: provisioningProfile) { (result) in
+                                                                                            finish(result.error, title: "Failed to Install AltStore")
+                                                                                        }
+                                                                                    }
+                                                                                    catch
+                                                                                    {
+                                                                                        finish(error, title: "Failed to Fetch Provisioning Profile")
+                                                                                    }
+                                                                                }
+                                                                            }
+                                                                            catch
+                                                                            {
+                                                                                finish(error, title: "Failed to Update App ID")
+                                                                            }
                                                                         }
                                                                     }
                                                                     catch
                                                                     {
-                                                                        finish(error, title: "Failed to Fetch Provisioning Profile")
+                                                                        finish(error, title: "Failed to Register App")
                                                                     }
                                                                 }
                                                             }
                                                             catch
                                                             {
-                                                                finish(error, title: "Failed to Update App ID")
+                                                                finish(error, title: "Failed to Refresh Anisette Data")
                                                             }
                                                         }
                                                     }
                                                     catch
                                                     {
-                                                        finish(error, title: "Failed to Register App")
+                                                        finish(error, title: "Failed to Download AltStore")
                                                     }
                                                 }
                                             }
                                             catch
                                             {
-                                                finish(error, title: "Failed to Download AltStore")
-                                                return
+                                                finish(error, title: "Failed to Fetch Certificate")
                                             }
                                         }
                                     }
                                     catch
                                     {
-                                        finish(error, title: "Failed to Fetch Certificate")
+                                        finish(error, title: "Failed to Register Device")
                                     }
                                 }
                             }
                             catch
                             {
-                                finish(error, title: "Failed to Register Device")
+                                finish(error, title: "Failed to Fetch Team")
                             }
                         }
                     }
                     catch
                     {
-                        finish(error, title: "Failed to Fetch Team")
+                        finish(error, title: "Failed to Authenticate")
                     }
                 }
             }
             catch
             {
-                finish(error, title: "Failed to Authenticate")
+                finish(error, title: "Failed to Fetch Anisette Data")
             }
         }
     }
     
     func downloadApp(completionHandler: @escaping (Result<URL, Error>) -> Void)
     {
-        let appURL = URL(string: "https://f000.backblazeb2.com/file/altstore/altstore.ipa")!
-        
         let downloadTask = URLSession.shared.downloadTask(with: appURL) { (fileURL, response, error) in
             do
             {
@@ -184,15 +212,57 @@ extension ALTDeviceManager
         downloadTask.resume()
     }
     
-    func authenticate(appleID: String, password: String, completionHandler: @escaping (Result<ALTAccount, Error>) -> Void)
+    func authenticate(appleID: String, password: String, anisetteData: ALTAnisetteData, completionHandler: @escaping (Result<(ALTAccount, ALTAppleAPISession), Error>) -> Void)
     {
-        ALTAppleAPI.shared.authenticate(appleID: appleID, password: password) { (account, error) in
-            let result = Result(account, error)
-            completionHandler(result)
+        func handleVerificationCode(_ completionHandler: @escaping (String?) -> Void)
+        {
+            DispatchQueue.main.async {
+                let alert = NSAlert()
+                alert.messageText = NSLocalizedString("Two-Factor Authentication Enabled", comment: "")
+                alert.informativeText = NSLocalizedString("Please enter the 6-digit verification code that was sent to your Apple devices.", comment: "")
+                
+                let textField = NSTextField(frame: NSRect(x: 0, y: 0, width: 300, height: 22))
+                textField.delegate = self
+                textField.translatesAutoresizingMaskIntoConstraints = false
+                textField.placeholderString = NSLocalizedString("123456", comment: "")
+                alert.accessoryView = textField
+                alert.window.initialFirstResponder = textField
+                
+                alert.addButton(withTitle: NSLocalizedString("Continue", comment: ""))
+                alert.addButton(withTitle: NSLocalizedString("Cancel", comment: ""))
+                
+                self.securityCodeAlert = alert
+                self.securityCodeTextField = textField
+                self.validate()
+                
+                NSRunningApplication.current.activate(options: .activateIgnoringOtherApps)
+                
+                let response = alert.runModal()
+                if response == .alertFirstButtonReturn
+                {
+                    let code = textField.stringValue
+                    completionHandler(code)
+                }
+                else
+                {
+                    completionHandler(nil)
+                }
+            }
+        }
+        
+        ALTAppleAPI.shared.authenticate(appleID: appleID, password: password, anisetteData: anisetteData, verificationHandler: handleVerificationCode) { (account, session, error) in
+            if let account = account, let session = session
+            {
+                completionHandler(.success((account, session)))
+            }
+            else
+            {
+                completionHandler(.failure(error ?? ALTAppleAPIError(.unknown)))
+            }
         }
     }
     
-    func fetchTeam(for account: ALTAccount, completionHandler: @escaping (Result<ALTTeam, Error>) -> Void)
+    func fetchTeam(for account: ALTAccount, session: ALTAppleAPISession, completionHandler: @escaping (Result<ALTTeam, Error>) -> Void)
     {
         func finish(_ result: Result<ALTTeam, Error>)
         {
@@ -238,7 +308,7 @@ To prevent this from happening, feel free to try again with another Apple ID to
             }
         }
         
-        ALTAppleAPI.shared.fetchTeams(for: account) { (teams, error) in
+        ALTAppleAPI.shared.fetchTeams(for: account, session: session) { (teams, error) in
             do
             {
                 let teams = try Result(teams, error).get()
@@ -267,9 +337,9 @@ To prevent this from happening, feel free to try again with another Apple ID to
         }
     }
     
-    func fetchCertificate(for team: ALTTeam, completionHandler: @escaping (Result<ALTCertificate, Error>) -> Void)
+    func fetchCertificate(for team: ALTTeam, session: ALTAppleAPISession, completionHandler: @escaping (Result<ALTCertificate, Error>) -> Void)
     {
-        ALTAppleAPI.shared.fetchCertificates(for: team) { (certificates, error) in
+        ALTAppleAPI.shared.fetchCertificates(for: team, session: session) { (certificates, error) in
             do
             {
                 let certificates = try Result(certificates, error).get()
@@ -304,11 +374,11 @@ To prevent this from happening, feel free to try again with another Apple ID to
                 
                 if let certificate = certificates.first
                 {
-                    ALTAppleAPI.shared.revoke(certificate, for: team) { (success, error) in
+                    ALTAppleAPI.shared.revoke(certificate, for: team, session: session) { (success, error) in
                         do
                         {
                             try Result(success, error).get()
-                            self.fetchCertificate(for: team, completionHandler: completionHandler)
+                            self.fetchCertificate(for: team, session: session, completionHandler: completionHandler)
                         }
                         catch
                         {
@@ -318,13 +388,13 @@ To prevent this from happening, feel free to try again with another Apple ID to
                 }
                 else
                 {
-                    ALTAppleAPI.shared.addCertificate(machineName: "AltStore", to: team) { (certificate, error) in
+                    ALTAppleAPI.shared.addCertificate(machineName: "AltStore", to: team, session: session) { (certificate, error) in
                         do
                         {
                             let certificate = try Result(certificate, error).get()
                             guard let privateKey = certificate.privateKey else { throw InstallError.missingPrivateKey }
                             
-                            ALTAppleAPI.shared.fetchCertificates(for: team) { (certificates, error) in
+                            ALTAppleAPI.shared.fetchCertificates(for: team, session: session) { (certificates, error) in
                                 do
                                 {
                                     let certificates = try Result(certificates, error).get()
@@ -357,11 +427,11 @@ To prevent this from happening, feel free to try again with another Apple ID to
         }
     }
     
-    func registerAppID(name appName: String, identifier: String, team: ALTTeam, completionHandler: @escaping (Result<ALTAppID, Error>) -> Void)
+    func registerAppID(name appName: String, identifier: String, team: ALTTeam, session: ALTAppleAPISession, completionHandler: @escaping (Result<ALTAppID, Error>) -> Void)
     {
         let bundleID = "com.\(team.identifier).\(identifier)"
         
-        ALTAppleAPI.shared.fetchAppIDs(for: team) { (appIDs, error) in
+        ALTAppleAPI.shared.fetchAppIDs(for: team, session: session) { (appIDs, error) in
             do
             {
                 let appIDs = try Result(appIDs, error).get()
@@ -372,7 +442,7 @@ To prevent this from happening, feel free to try again with another Apple ID to
                 }
                 else
                 {
-                    ALTAppleAPI.shared.addAppID(withName: appName, bundleIdentifier: bundleID, team: team) { (appID, error) in
+                    ALTAppleAPI.shared.addAppID(withName: appName, bundleIdentifier: bundleID, team: team, session: session) { (appID, error) in
                         completionHandler(Result(appID, error))
                     }
                 }
@@ -384,7 +454,7 @@ To prevent this from happening, feel free to try again with another Apple ID to
         }
     }
     
-    func updateFeatures(for appID: ALTAppID, app: ALTApplication, team: ALTTeam, completionHandler: @escaping (Result<ALTAppID, Error>) -> Void)
+    func updateFeatures(for appID: ALTAppID, app: ALTApplication, team: ALTTeam, session: ALTAppleAPISession, completionHandler: @escaping (Result<ALTAppID, Error>) -> Void)
     {
         let requiredFeatures = app.entitlements.compactMap { (entitlement, value) -> (ALTFeature, Any)? in
             guard let feature = ALTFeature(entitlement: entitlement) else { return nil }
@@ -401,14 +471,14 @@ To prevent this from happening, feel free to try again with another Apple ID to
         let appID = appID.copy() as! ALTAppID
         appID.features = features
         
-        ALTAppleAPI.shared.update(appID, team: team) { (appID, error) in
+        ALTAppleAPI.shared.update(appID, team: team, session: session) { (appID, error) in
             completionHandler(Result(appID, error))
         }
     }
     
-    func register(_ device: ALTDevice, team: ALTTeam, completionHandler: @escaping (Result<ALTDevice, Error>) -> Void)
+    func register(_ device: ALTDevice, team: ALTTeam, session: ALTAppleAPISession, completionHandler: @escaping (Result<ALTDevice, Error>) -> Void)
     {
-        ALTAppleAPI.shared.fetchDevices(for: team) { (devices, error) in
+        ALTAppleAPI.shared.fetchDevices(for: team, session: session) { (devices, error) in
             do
             {
                 let devices = try Result(devices, error).get()
@@ -419,7 +489,7 @@ To prevent this from happening, feel free to try again with another Apple ID to
                 }
                 else
                 {
-                    ALTAppleAPI.shared.registerDevice(name: device.name, identifier: device.identifier, team: team) { (device, error) in
+                    ALTAppleAPI.shared.registerDevice(name: device.name, identifier: device.identifier, team: team, session: session) { (device, error) in
                         completionHandler(Result(device, error))
                     }
                 }
@@ -431,9 +501,9 @@ To prevent this from happening, feel free to try again with another Apple ID to
         }
     }
     
-    func fetchProvisioningProfile(for appID: ALTAppID, team: ALTTeam, completionHandler: @escaping (Result<ALTProvisioningProfile, Error>) -> Void)
+    func fetchProvisioningProfile(for appID: ALTAppID, team: ALTTeam, session: ALTAppleAPISession, completionHandler: @escaping (Result<ALTProvisioningProfile, Error>) -> Void)
     {
-        ALTAppleAPI.shared.fetchProvisioningProfile(for: appID, team: team) { (profile, error) in
+        ALTAppleAPI.shared.fetchProvisioningProfile(for: appID, team: team, session: session) { (profile, error) in
             completionHandler(Result(profile, error))
         }
     }
@@ -466,7 +536,8 @@ To prevent this from happening, feel free to try again with another Apple ID to
                     {
                         try Result(success, error).get()
                         
-                        ALTDeviceManager.shared.installApp(at: application.fileURL, toDeviceWithUDID: device.identifier) { (success, error) in
+                        let activeProfiles: Set<String>? = (team.type == .free) ? [profile.bundleIdentifier] : nil
+                        ALTDeviceManager.shared.installApp(at: application.fileURL, toDeviceWithUDID: device.identifier, activeProvisioningProfiles: activeProfiles) { (success, error) in
                             completionHandler(Result(success, error))
                         }
                     }
@@ -485,3 +556,45 @@ To prevent this from happening, feel free to try again with another Apple ID to
         }
     }
 }
+
+private var securityCodeAlertKey = 0
+private var securityCodeTextFieldKey = 0
+
+extension ALTDeviceManager: NSTextFieldDelegate
+{
+    var securityCodeAlert: NSAlert? {
+        get { return objc_getAssociatedObject(self, &securityCodeAlertKey) as? NSAlert }
+        set { objc_setAssociatedObject(self, &securityCodeAlertKey, newValue, .OBJC_ASSOCIATION_RETAIN_NONATOMIC) }
+    }
+    
+    var securityCodeTextField: NSTextField? {
+        get { return objc_getAssociatedObject(self, &securityCodeTextFieldKey) as? NSTextField }
+        set { objc_setAssociatedObject(self, &securityCodeTextFieldKey, newValue, .OBJC_ASSOCIATION_RETAIN_NONATOMIC) }
+    }
+    
+    public func controlTextDidChange(_ obj: Notification)
+    {
+        self.validate()
+    }
+    
+    public func controlTextDidEndEditing(_ obj: Notification)
+    {
+        self.validate()
+    }
+    
+    private func validate()
+    {
+        guard let code = self.securityCodeTextField?.stringValue.trimmingCharacters(in: .whitespacesAndNewlines) else { return }
+        
+        if code.count == 6
+        {
+            self.securityCodeAlert?.buttons.first?.isEnabled = true
+        }
+        else
+        {
+            self.securityCodeAlert?.buttons.first?.isEnabled = false
+        }
+        
+        self.securityCodeAlert?.layout()
+    }
+}

AltServer/Devices/ALTDeviceManager.h

@@ -9,8 +9,14 @@
 #import <Foundation/Foundation.h>
 #import <AltSign/AltSign.h>
 
+@class ALTWiredConnection;
+@class ALTNotificationConnection;
+
 NS_ASSUME_NONNULL_BEGIN
 
+extern NSNotificationName const ALTDeviceManagerDeviceDidConnectNotification NS_SWIFT_NAME(deviceManagerDeviceDidConnect);
+extern NSNotificationName const ALTDeviceManagerDeviceDidDisconnectNotification NS_SWIFT_NAME(deviceManagerDeviceDidDisconnect);
+
 @interface ALTDeviceManager : NSObject
 
 @property (class, nonatomic, readonly) ALTDeviceManager *sharedManager;
@@ -18,7 +24,17 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, readonly) NSArray<ALTDevice *> *connectedDevices;
 @property (nonatomic, readonly) NSArray<ALTDevice *> *availableDevices;
 
-- (NSProgress *)installAppAtURL:(NSURL *)fileURL toDeviceWithUDID:(NSString *)udid completionHandler:(void (^)(BOOL success, NSError *_Nullable error))completionHandler;
+- (void)start;
+
+/* App Installation */
+- (NSProgress *)installAppAtURL:(NSURL *)fileURL toDeviceWithUDID:(NSString *)udid activeProvisioningProfiles:(nullable NSSet<NSString *> *)activeProvisioningProfiles completionHandler:(void (^)(BOOL success, NSError *_Nullable error))completionHandler;
+
+- (void)installProvisioningProfiles:(NSSet<ALTProvisioningProfile *> *)provisioningProfiles toDeviceWithUDID:(NSString *)udid activeProvisioningProfiles:(nullable NSSet<NSString *> *)activeProvisioningProfiles completionHandler:(void (^)(BOOL success, NSError *_Nullable error))completionHandler;
+- (void)removeProvisioningProfilesForBundleIdentifiers:(NSSet<NSString *> *)bundleIdentifiers fromDeviceWithUDID:(NSString *)udid completionHandler:(void (^)(BOOL success, NSError *_Nullable error))completionHandler;
+
+/* Connections */
+- (void)startWiredConnectionToDevice:(ALTDevice *)device completionHandler:(void (^)(ALTWiredConnection *_Nullable connection, NSError *_Nullable error))completionHandler;
+- (void)startNotificationConnectionToDevice:(ALTDevice *)device completionHandler:(void (^)(ALTNotificationConnection *_Nullable connection, NSError *_Nullable error))completionHandler;
 
 @end
 

AltServer/Devices/ALTDeviceManager.mm

@@ -7,7 +7,10 @@
 //
 
 #import "ALTDeviceManager.h"
-#import "NSError+ALTServerError.h"
+
+#import "AltKit.h"
+#import "ALTWiredConnection+Private.h"
+#import "ALTNotificationConnection+Private.h"
 
 #include <libimobiledevice/libimobiledevice.h>
 #include <libimobiledevice/lockdown.h>
@@ -17,8 +20,10 @@
 #include <libimobiledevice/misagent.h>
 
 void ALTDeviceManagerUpdateStatus(plist_t command, plist_t status, void *udid);
+void ALTDeviceDidChangeConnectionStatus(const idevice_event_t *event, void *user_data);
 
-NSErrorDomain const ALTDeviceErrorDomain = @"com.rileytestut.ALTDeviceError";
+NSNotificationName const ALTDeviceManagerDeviceDidConnectNotification = @"ALTDeviceManagerDeviceDidConnectNotification";
+NSNotificationName const ALTDeviceManagerDeviceDidDisconnectNotification = @"ALTDeviceManagerDeviceDidDisconnectNotification";
 
 @interface ALTDeviceManager ()
 
@@ -26,6 +31,8 @@ NSErrorDomain const ALTDeviceErrorDomain = @"com.rileytestut.ALTDeviceError";
 @property (nonatomic, readonly) NSMutableDictionary<NSUUID *, NSProgress *> *installationProgress;
 @property (nonatomic, readonly) dispatch_queue_t installationQueue;
 
+@property (nonatomic, readonly) NSMutableSet<ALTDevice *> *cachedDevices;
+
 @end
 
 @implementation ALTDeviceManager
@@ -50,12 +57,21 @@ NSErrorDomain const ALTDeviceErrorDomain = @"com.rileytestut.ALTDeviceError";
         _installationProgress = [NSMutableDictionary dictionary];
         
         _installationQueue = dispatch_queue_create("com.rileytestut.AltServer.InstallationQueue", DISPATCH_QUEUE_SERIAL);
+        
+        _cachedDevices = [NSMutableSet set];
     }
     
     return self;
 }
 
-- (NSProgress *)installAppAtURL:(NSURL *)fileURL toDeviceWithUDID:(NSString *)udid completionHandler:(void (^)(BOOL, NSError * _Nullable))completionHandler
+- (void)start
+{
+    idevice_event_subscribe(ALTDeviceDidChangeConnectionStatus, nil);
+}
+
+#pragma mark - App Installation -
+
+- (NSProgress *)installAppAtURL:(NSURL *)fileURL toDeviceWithUDID:(NSString *)udid activeProvisioningProfiles:(nullable NSSet<NSString *> *)activeProvisioningProfiles completionHandler:(void (^)(BOOL, NSError * _Nullable))completionHandler
 {
     NSProgress *progress = [NSProgress discreteProgressWithTotalUnitCount:4];
     
@@ -72,47 +88,51 @@ NSErrorDomain const ALTDeviceErrorDomain = @"com.rileytestut.ALTDeviceError";
         __block misagent_client_t mis = NULL;
         __block lockdownd_service_descriptor_t service = NULL;
         
-        NSURL *removedProfilesDirectoryURL = [[[NSFileManager defaultManager] temporaryDirectory] URLByAppendingPathComponent:[[NSUUID UUID] UUIDString]];
-        NSMutableDictionary<NSString *, ALTProvisioningProfile *> *preferredProfiles = [NSMutableDictionary dictionary];
+        NSMutableDictionary<NSString *, ALTProvisioningProfile *> *cachedProfiles = [NSMutableDictionary dictionary];
+        NSMutableSet<ALTProvisioningProfile *> *installedProfiles = [NSMutableSet set];
         
-        void (^finish)(NSError *error) = ^(NSError *error) {
+        void (^finish)(NSError *error) = ^(NSError *e) {
+            __block NSError *error = e;
             
-            if ([[NSFileManager defaultManager] fileExistsAtPath:removedProfilesDirectoryURL.path isDirectory:nil])
+            if (activeProvisioningProfiles != nil)
             {
-                // Reinstall all provisioning profiles we removed before installation.
+                // Remove installed provisioning profiles if they're not active.
                 
-                NSArray *contents = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:removedProfilesDirectoryURL.path error:nil];
-                for (NSString *filename in contents)
+                for (ALTProvisioningProfile *installedProfile in installedProfiles)
                 {
-                    NSURL *fileURL = [removedProfilesDirectoryURL URLByAppendingPathComponent:filename];
-                    
-                    ALTProvisioningProfile *provisioningProfile = [[ALTProvisioningProfile alloc] initWithURL:fileURL];
-                    if (provisioningProfile == nil)
+                    if (![activeProvisioningProfiles containsObject:installedProfile.bundleIdentifier])
                     {
-                        continue;
+                        NSError *removeError = nil;
+                        if (![self removeProvisioningProfile:installedProfile misagent:mis error:&removeError])
+                        {
+                            if (error == nil)
+                            {
+                                error = removeError;
+                            }
+                        }
                     }
-                    
-                    ALTProvisioningProfile *preferredProfile = preferredProfiles[provisioningProfile.bundleIdentifier];
-                    if (![preferredProfile isEqual:provisioningProfile])
+                }
+            }
+            
+            [cachedProfiles enumerateKeysAndObjectsUsingBlock:^(NSString *bundleID, ALTProvisioningProfile *profile, BOOL * _Nonnull stop) {
+                for (ALTProvisioningProfile *installedProfile in installedProfiles)
+                {
+                    if ([installedProfile.bundleIdentifier isEqualToString:profile.bundleIdentifier])
                     {
-                        continue;
-                    }
-                    
-                    plist_t pdata = plist_new_data((const char *)provisioningProfile.data.bytes, provisioningProfile.data.length);
-                    
-                    if (misagent_install(mis, pdata) == MISAGENT_E_SUCCESS)
-                    {
-                        NSLog(@"Reinstalled profile: %@", provisioningProfile.UUID);
-                    }
-                    else
-                    {
-                        int code = misagent_get_status_code(mis);
-                        NSLog(@"Failed to reinstall provisioning profile %@. (%@)", provisioningProfile.UUID, @(code));
+                        // Don't reinstall cached profile because it was installed with the app.
+                        return;
                     }
                 }
                 
-                [[NSFileManager defaultManager] removeItemAtURL:removedProfilesDirectoryURL error:nil];
-            }
+                NSError *installError = nil;
+                if (![self installProvisioningProfile:profile misagent:mis error:&installError])
+                {
+                    if (error == nil)
+                    {
+                        error = installError;
+                    }
+                }
+            }];
             
             instproxy_client_free(ipc);
             afc_client_free(afc);
@@ -165,6 +185,20 @@ NSErrorDomain const ALTDeviceErrorDomain = @"com.rileytestut.ALTDeviceError";
             return finish([NSError errorWithDomain:NSCocoaErrorDomain code:NSFileReadCorruptFileError userInfo:@{NSURLErrorKey: fileURL}]);
         }
         
+        ALTApplication *application = [[ALTApplication alloc] initWithFileURL:appBundleURL];
+        if (application.provisioningProfile)
+        {
+            [installedProfiles addObject:application.provisioningProfile];
+        }
+        
+        for (ALTApplication *appExtension in application.appExtensions)
+        {
+            if (appExtension.provisioningProfile)
+            {
+                [installedProfiles addObject:appExtension.provisioningProfile];
+            }
+        }
+        
         /* Find Device */
         if (idevice_new(&device, udid.UTF8String) != IDEVICE_E_SUCCESS)
         {
@@ -268,89 +302,39 @@ NSErrorDomain const ALTDeviceErrorDomain = @"com.rileytestut.ALTDeviceError";
             service = NULL;
         }
         
-        /* Provisioning Profiles */
-        NSURL *provisioningProfileURL = [appBundleURL URLByAppendingPathComponent:@"embedded.mobileprovision"];
-        ALTProvisioningProfile *installationProvisioningProfile = [[ALTProvisioningProfile alloc] initWithURL:provisioningProfileURL];
-        if (installationProvisioningProfile != nil)
+        BOOL shouldManageProfiles = (activeProvisioningProfiles != nil || [application.provisioningProfile isFreeProvisioningProfile]);
+        if (shouldManageProfiles)
         {
+            // Free developer account was used to sign this app, so we need to remove all
+            // provisioning profiles in order to remain under sideloaded app limit.
+            
             NSError *error = nil;
-            if (![[NSFileManager defaultManager] createDirectoryAtURL:removedProfilesDirectoryURL withIntermediateDirectories:YES attributes:nil error:&error])
+            NSDictionary<NSString *, ALTProvisioningProfile *> *removedProfiles = [self removeAllFreeProfilesExcludingBundleIdentifiers:nil misagent:mis error:&error];
+            if (removedProfiles == nil)
             {
                 return finish(error);
             }
-
-            plist_t profiles = NULL;
             
-            if (misagent_copy_all(mis, &profiles) != MISAGENT_E_SUCCESS)
-            {
-                return finish([NSError errorWithDomain:AltServerErrorDomain code:ALTServerErrorConnectionFailed userInfo:nil]);
-            }
-
-            uint32_t profileCount = plist_array_get_size(profiles);
-            for (int i = 0; i < profileCount; i++)
-            {
-                plist_t profile = plist_array_get_item(profiles, i);
-                if (plist_get_node_type(profile) != PLIST_DATA)
+            [removedProfiles enumerateKeysAndObjectsUsingBlock:^(NSString *bundleID, ALTProvisioningProfile *profile, BOOL * _Nonnull stop) {
+                if (activeProvisioningProfiles != nil)
                 {
-                    continue;
-                }
-                
-                char *bytes = NULL;
-                uint64_t length = 0;
-
-                plist_get_data_val(profile, &bytes, &length);
-                if (bytes == NULL)
-                {
-                    continue;
-                }
-
-                NSData *data = [NSData dataWithBytes:(const void *)bytes length:length];
-                ALTProvisioningProfile *provisioningProfile = [[ALTProvisioningProfile alloc] initWithData:data];
-
-                if (![provisioningProfile.teamIdentifier isEqualToString:installationProvisioningProfile.teamIdentifier])
-                {
-                    NSLog(@"Ignoring: %@ (Team: %@)", provisioningProfile.bundleIdentifier, provisioningProfile.teamIdentifier);
-                    continue;
-                }
-                
-                ALTProvisioningProfile *preferredProfile = preferredProfiles[provisioningProfile.bundleIdentifier];
-                if (preferredProfile != nil)
-                {
-                    if ([provisioningProfile.expirationDate compare:preferredProfile.expirationDate] == NSOrderedDescending)
+                    if ([activeProvisioningProfiles containsObject:bundleID])
                     {
-                        preferredProfiles[provisioningProfile.bundleIdentifier] = provisioningProfile;
+                        // Only cache active profiles to reinstall afterwards.
+                        cachedProfiles[bundleID] = profile;
                     }
                 }
                 else
                 {
-                    preferredProfiles[provisioningProfile.bundleIdentifier] = provisioningProfile;
+                    // Cache all profiles to reinstall afterwards if we didn't provide activeProvisioningProfiles.
+                    cachedProfiles[bundleID] = profile;
                 }
-
-                NSString *filename = [NSString stringWithFormat:@"%@.mobileprovision", [[NSUUID UUID] UUIDString]];
-                NSURL *fileURL = [removedProfilesDirectoryURL URLByAppendingPathComponent:filename];
-
-                NSError *copyError = nil;
-                if (![provisioningProfile.data writeToURL:fileURL options:NSDataWritingAtomic error:&copyError])
-                {
-                    NSLog(@"Failed to copy profile to temporary URL. %@", copyError);
-                    continue;
-                }
-
-                if (misagent_remove(mis, provisioningProfile.UUID.UUIDString.lowercaseString.UTF8String) == MISAGENT_E_SUCCESS)
-                {
-                    NSLog(@"Removed provisioning profile: %@", provisioningProfile.UUID);
-                }
-                else
-                {
-                    int code = misagent_get_status_code(mis);
-                    NSLog(@"Failed to remove provisioning profile %@. Error Code: %@", provisioningProfile.UUID, @(code));
-                }
-            }
-
-            lockdownd_client_free(client);
-            client = NULL;
+            }];
         }
         
+        lockdownd_client_free(client);
+        client = NULL;
+        
         dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
         
         NSProgress *installationProgress = [NSProgress progressWithTotalUnitCount:100 parent:progress pendingUnitCount:1];
@@ -514,6 +498,468 @@ NSErrorDomain const ALTDeviceErrorDomain = @"com.rileytestut.ALTDeviceError";
     return success;
 }
 
+#pragma mark - Provisioning Profiles -
+
+- (void)installProvisioningProfiles:(NSSet<ALTProvisioningProfile *> *)provisioningProfiles toDeviceWithUDID:(NSString *)udid activeProvisioningProfiles:(nullable NSSet<NSString *> *)activeProvisioningProfiles completionHandler:(void (^)(BOOL success, NSError *error))completionHandler
+{
+    dispatch_async(self.installationQueue, ^{
+        __block idevice_t device = NULL;
+        __block lockdownd_client_t client = NULL;
+        __block afc_client_t afc = NULL;
+        __block misagent_client_t mis = NULL;
+        __block lockdownd_service_descriptor_t service = NULL;
+        
+        void (^finish)(NSError *_Nullable) = ^(NSError *error) {
+            lockdownd_service_descriptor_free(service);
+            misagent_client_free(mis);
+            afc_client_free(afc);
+            lockdownd_client_free(client);
+            idevice_free(device);
+            
+            completionHandler(error == nil, error);
+        };
+        
+        /* Find Device */
+        if (idevice_new(&device, udid.UTF8String) != IDEVICE_E_SUCCESS)
+        {
+            return finish([NSError errorWithDomain:AltServerErrorDomain code:ALTServerErrorDeviceNotFound userInfo:nil]);
+        }
+        
+        /* Connect to Device */
+        if (lockdownd_client_new_with_handshake(device, &client, "altserver") != LOCKDOWN_E_SUCCESS)
+        {
+            return finish([NSError errorWithDomain:AltServerErrorDomain code:ALTServerErrorConnectionFailed userInfo:nil]);
+        }
+        
+        /* Connect to Misagent */
+        if (lockdownd_start_service(client, "com.apple.misagent", &service) != LOCKDOWN_E_SUCCESS || service == NULL)
+        {
+            return finish([NSError errorWithDomain:AltServerErrorDomain code:ALTServerErrorConnectionFailed userInfo:nil]);
+        }
+        
+        if (misagent_client_new(device, service, &mis) != MISAGENT_E_SUCCESS)
+        {
+            return finish([NSError errorWithDomain:AltServerErrorDomain code:ALTServerErrorConnectionFailed userInfo:nil]);
+        }
+        
+        NSError *error = nil;
+        
+        if (activeProvisioningProfiles != nil)
+        {
+            // Remove all non-active free provisioning profiles.
+            
+            NSMutableSet *excludedBundleIdentifiers = [activeProvisioningProfiles mutableCopy];
+            for (ALTProvisioningProfile *provisioningProfile in provisioningProfiles)
+            {
+                // Ensure we DO remove old versions of profiles we're about to install, even if they are active.
+                [excludedBundleIdentifiers removeObject:provisioningProfile.bundleIdentifier];
+            }
+            
+            if (![self removeAllFreeProfilesExcludingBundleIdentifiers:excludedBundleIdentifiers misagent:mis error:&error])
+            {
+                return finish(error);
+            }
+        }
+        else
+        {
+            // Remove only older versions of provisioning profiles we're about to install.
+            
+            NSMutableSet *bundleIdentifiers = [NSMutableSet set];
+            for (ALTProvisioningProfile *provisioningProfile in provisioningProfiles)
+            {
+                [bundleIdentifiers addObject:provisioningProfile.bundleIdentifier];
+            }
+            
+            if (![self removeProvisioningProfilesForBundleIdentifiers:bundleIdentifiers misagent:mis error:&error])
+            {
+                return finish(error);
+            }
+        }
+                
+        for (ALTProvisioningProfile *provisioningProfile in provisioningProfiles)
+        {
+            if (![self installProvisioningProfile:provisioningProfile misagent:mis error:&error])
+            {
+                return finish(error);
+            }
+        }
+        
+        finish(nil);
+    });
+}
+
+- (void)removeProvisioningProfilesForBundleIdentifiers:(NSSet<NSString *> *)bundleIdentifiers fromDeviceWithUDID:(NSString *)udid completionHandler:(void (^)(BOOL success, NSError *error))completionHandler
+{
+    dispatch_async(self.installationQueue, ^{
+        __block idevice_t device = NULL;
+        __block lockdownd_client_t client = NULL;
+        __block afc_client_t afc = NULL;
+        __block misagent_client_t mis = NULL;
+        __block lockdownd_service_descriptor_t service = NULL;
+        
+        void (^finish)(NSError *_Nullable) = ^(NSError *error) {
+            lockdownd_service_descriptor_free(service);
+            misagent_client_free(mis);
+            afc_client_free(afc);
+            lockdownd_client_free(client);
+            idevice_free(device);
+            
+            completionHandler(error == nil, error);
+        };
+        
+        /* Find Device */
+        if (idevice_new(&device, udid.UTF8String) != IDEVICE_E_SUCCESS)
+        {
+            return finish([NSError errorWithDomain:AltServerErrorDomain code:ALTServerErrorDeviceNotFound userInfo:nil]);
+        }
+        
+        /* Connect to Device */
+        if (lockdownd_client_new_with_handshake(device, &client, "altserver") != LOCKDOWN_E_SUCCESS)
+        {
+            return finish([NSError errorWithDomain:AltServerErrorDomain code:ALTServerErrorConnectionFailed userInfo:nil]);
+        }
+        
+        /* Connect to Misagent */
+        if (lockdownd_start_service(client, "com.apple.misagent", &service) != LOCKDOWN_E_SUCCESS || service == NULL)
+        {
+            return finish([NSError errorWithDomain:AltServerErrorDomain code:ALTServerErrorConnectionFailed userInfo:nil]);
+        }
+        
+        if (misagent_client_new(device, service, &mis) != MISAGENT_E_SUCCESS)
+        {
+            return finish([NSError errorWithDomain:AltServerErrorDomain code:ALTServerErrorConnectionFailed userInfo:nil]);
+        }
+        
+        NSError *error = nil;
+        if (![self removeProvisioningProfilesForBundleIdentifiers:bundleIdentifiers misagent:mis error:&error])
+        {
+            return finish(error);
+        }
+        
+        finish(nil);
+    });
+}
+
+- (NSDictionary<NSString *, ALTProvisioningProfile *> *)removeProvisioningProfilesForBundleIdentifiers:(NSSet<NSString *> *)bundleIdentifiers misagent:(misagent_client_t)mis error:(NSError **)error
+{
+    return [self removeAllProfilesForBundleIdentifiers:bundleIdentifiers excludingBundleIdentifiers:nil limitedToFreeProfiles:NO misagent:mis error:error];
+}
+
+- (NSDictionary<NSString *, ALTProvisioningProfile *> *)removeAllFreeProfilesExcludingBundleIdentifiers:(nullable NSSet<NSString *> *)bundleIdentifiers misagent:(misagent_client_t)mis error:(NSError **)error
+{
+    return [self removeAllProfilesForBundleIdentifiers:nil excludingBundleIdentifiers:bundleIdentifiers limitedToFreeProfiles:YES misagent:mis error:error];
+}
+
+- (NSDictionary<NSString *, ALTProvisioningProfile *> *)removeAllProfilesForBundleIdentifiers:(nullable NSSet<NSString *> *)includedBundleIdentifiers
+                                                                   excludingBundleIdentifiers:(nullable NSSet<NSString *> *)excludedBundleIdentifiers
+                                                                        limitedToFreeProfiles:(BOOL)limitedToFreeProfiles
+                                                                                     misagent:(misagent_client_t)mis
+                                                                                        error:(NSError **)error
+{
+    NSMutableDictionary<NSString *, ALTProvisioningProfile *> *ignoredProfiles = [NSMutableDictionary dictionary];
+    NSMutableDictionary<NSString *, ALTProvisioningProfile *> *removedProfiles = [NSMutableDictionary dictionary];
+    
+    NSArray<ALTProvisioningProfile *> *provisioningProfiles = [self copyProvisioningProfilesWithClient:mis error:error];
+    if (provisioningProfiles == nil)
+    {
+        return nil;
+    }
+    
+    for (ALTProvisioningProfile *provisioningProfile in provisioningProfiles)
+    {
+        if (limitedToFreeProfiles && ![provisioningProfile isFreeProvisioningProfile])
+        {
+            continue;
+        }
+        
+        if (includedBundleIdentifiers != nil && ![includedBundleIdentifiers containsObject:provisioningProfile.bundleIdentifier])
+        {
+            continue;
+        }
+        
+        if (excludedBundleIdentifiers != nil && [excludedBundleIdentifiers containsObject:provisioningProfile.bundleIdentifier])
+        {
+            // This provisioning profile has an excluded bundle identifier.
+            // Ignore it, unless we've already ignored one with the same bundle identifier,
+            // in which case remove whichever profile is the oldest.
+            
+            ALTProvisioningProfile *previousProfile = ignoredProfiles[provisioningProfile.bundleIdentifier];
+            if (previousProfile != nil)
+            {
+                // We've already ignored a profile with this bundle identifier,
+                // so make sure we only ignore the newest one and remove the oldest one.
+                BOOL isNewerThanPreviousProfile = ([provisioningProfile.expirationDate compare:previousProfile.expirationDate] == NSOrderedDescending);
+                ALTProvisioningProfile *oldestProfile = isNewerThanPreviousProfile ? previousProfile : provisioningProfile;
+                ALTProvisioningProfile *newestProfile = isNewerThanPreviousProfile ? provisioningProfile : previousProfile;
+                
+                ignoredProfiles[provisioningProfile.bundleIdentifier] = newestProfile;
+                
+                // Don't cache this profile or else it will be reinstalled, so just remove it without caching.
+                if (![self removeProvisioningProfile:oldestProfile misagent:mis error:error])
+                {
+                    return nil;
+                }
+            }
+            else
+            {
+                ignoredProfiles[provisioningProfile.bundleIdentifier] = provisioningProfile;
+            }
+            
+            continue;
+        }
+        
+        ALTProvisioningProfile *preferredProfile = removedProfiles[provisioningProfile.bundleIdentifier];
+        if (preferredProfile != nil)
+        {
+            if ([provisioningProfile.expirationDate compare:preferredProfile.expirationDate] == NSOrderedDescending)
+            {
+                removedProfiles[provisioningProfile.bundleIdentifier] = provisioningProfile;
+            }
+        }
+        else
+        {
+            removedProfiles[provisioningProfile.bundleIdentifier] = provisioningProfile;
+        }
+        
+        if (![self removeProvisioningProfile:provisioningProfile misagent:mis error:error])
+        {
+            return nil;
+        }
+    }
+    
+    return removedProfiles;
+}
+
+- (BOOL)installProvisioningProfile:(ALTProvisioningProfile *)provisioningProfile misagent:(misagent_client_t)mis error:(NSError **)error
+{
+    plist_t pdata = plist_new_data((const char *)provisioningProfile.data.bytes, provisioningProfile.data.length);
+    
+    misagent_error_t result = misagent_install(mis, pdata);
+    plist_free(pdata);
+    
+    if (result == MISAGENT_E_SUCCESS)
+    {
+        NSLog(@"Installed profile: %@ (%@)", provisioningProfile.bundleIdentifier, provisioningProfile.UUID);
+        return YES;
+    }
+    else
+    {
+        int statusCode = misagent_get_status_code(mis);
+        NSLog(@"Failed to install provisioning profile %@ (%@). Error Code: %@", provisioningProfile.bundleIdentifier, provisioningProfile.UUID, @(statusCode));
+        
+        if (error)
+        {
+            switch (statusCode)
+            {
+                case -402620383:
+                    *error = [NSError errorWithDomain:AltServerErrorDomain code:ALTServerErrorMaximumFreeAppLimitReached userInfo:nil];
+                    break;
+                    
+                default:
+                    NSString *localizedFailure = [NSString stringWithFormat:NSLocalizedString(@"Could not install profile “%@”", @""), provisioningProfile.bundleIdentifier];
+                    
+                    *error = [NSError errorWithDomain:AltServerErrorDomain code:ALTServerErrorUnderlyingError userInfo:@{
+                        NSLocalizedFailureErrorKey: localizedFailure,
+                        ALTUnderlyingErrorCodeErrorKey: [@(statusCode) description],
+                        ALTProvisioningProfileBundleIDErrorKey: provisioningProfile.bundleIdentifier
+                    }];
+            }
+        }
+        
+        return NO;
+    }
+}
+
+- (BOOL)removeProvisioningProfile:(ALTProvisioningProfile *)provisioningProfile misagent:(misagent_client_t)mis error:(NSError **)error
+{
+    misagent_error_t result = misagent_remove(mis, provisioningProfile.UUID.UUIDString.lowercaseString.UTF8String);
+    if (result == MISAGENT_E_SUCCESS)
+    {
+        NSLog(@"Removed provisioning profile: %@ (%@)", provisioningProfile.bundleIdentifier, provisioningProfile.UUID);
+        return YES;
+    }
+    else
+    {
+        int statusCode = misagent_get_status_code(mis);
+        NSLog(@"Failed to remove provisioning profile %@ (%@). Error Code: %@", provisioningProfile.bundleIdentifier, provisioningProfile.UUID, @(statusCode));
+        
+        if (error)
+        {
+            switch (statusCode)
+            {
+                case -402620405:
+                    *error = [NSError errorWithDomain:AltServerErrorDomain code:ALTServerErrorProfileNotFound userInfo:nil];
+                    break;
+                    
+                default:
+                {
+                    NSString *localizedFailure = [NSString stringWithFormat:NSLocalizedString(@"Could not remove profile “%@”", @""), provisioningProfile.bundleIdentifier];
+                    
+                    *error = [NSError errorWithDomain:AltServerErrorDomain code:ALTServerErrorUnderlyingError userInfo:@{
+                        NSLocalizedFailureErrorKey: localizedFailure,
+                        ALTUnderlyingErrorCodeErrorKey: [@(statusCode) description],
+                        ALTProvisioningProfileBundleIDErrorKey: provisioningProfile.bundleIdentifier
+                    }];
+                }
+            }
+        }
+        
+        return NO;
+    }
+}
+
+- (nullable NSArray<ALTProvisioningProfile *> *)copyProvisioningProfilesWithClient:(misagent_client_t)mis error:(NSError **)error
+{
+    plist_t rawProfiles = NULL;
+    misagent_error_t result = misagent_copy_all(mis, &rawProfiles);
+    if (result != MISAGENT_E_SUCCESS)
+    {
+        int statusCode = misagent_get_status_code(mis);
+        
+        if (error)
+        {
+            *error = [NSError errorWithDomain:AltServerErrorDomain code:ALTServerErrorUnderlyingError userInfo:@{
+                NSLocalizedFailureErrorKey: NSLocalizedString(@"Could not copy provisioning profiles.", @""),
+                ALTUnderlyingErrorCodeErrorKey: [@(statusCode) description]
+            }];
+        }
+        
+        return nil;
+    }
+    
+    /* Copy all provisioning profiles */
+    
+    // For some reason, libplist now fails to parse `rawProfiles` correctly.
+    // Specifically, it no longer recognizes the nodes in the plist array as "data" nodes.
+    // However, if we encode it as XML then decode it again, it'll work ¯\_(ツ)_/¯
+    char *plistXML = nullptr;
+    uint32_t plistLength = 0;
+    plist_to_xml(rawProfiles, &plistXML, &plistLength);
+    
+    plist_t profiles = NULL;
+    plist_from_xml(plistXML, plistLength, &profiles);
+    
+    free(plistXML);
+    
+    NSMutableArray<ALTProvisioningProfile *> *provisioningProfiles = [NSMutableArray array];
+        
+    uint32_t profileCount = plist_array_get_size(profiles);
+    for (int i = 0; i < profileCount; i++)
+    {
+        plist_t profile = plist_array_get_item(profiles, i);
+        if (plist_get_node_type(profile) != PLIST_DATA)
+        {
+            continue;
+        }
+
+        char *bytes = NULL;
+        uint64_t length = 0;
+
+        plist_get_data_val(profile, &bytes, &length);
+        if (bytes == NULL)
+        {
+            continue;
+        }
+
+        NSData *data = [NSData dataWithBytesNoCopy:bytes length:length freeWhenDone:YES];
+        ALTProvisioningProfile *provisioningProfile = [[ALTProvisioningProfile alloc] initWithData:data];
+        if (provisioningProfile == nil)
+        {
+            continue;
+        }
+        
+        [provisioningProfiles addObject:provisioningProfile];
+    }
+    
+    plist_free(rawProfiles);
+    plist_free(profiles);
+    
+    return provisioningProfiles;
+}
+
+#pragma mark - Connections -
+
+- (void)startWiredConnectionToDevice:(ALTDevice *)altDevice completionHandler:(void (^)(ALTWiredConnection * _Nullable, NSError * _Nullable))completionHandler
+{
+    void (^finish)(ALTWiredConnection *connection, NSError *error) = ^(ALTWiredConnection *connection, NSError *error) {
+        if (error != nil)
+        {
+            NSLog(@"Wired Connection Error: %@", error);
+        }
+        
+        completionHandler(connection, error);
+    };
+    
+    idevice_t device = NULL;
+    idevice_connection_t connection = NULL;
+    
+    /* Find Device */
+    if (idevice_new_ignore_network(&device, altDevice.identifier.UTF8String) != IDEVICE_E_SUCCESS)
+    {
+        return finish(nil, [NSError errorWithDomain:AltServerErrorDomain code:ALTServerErrorDeviceNotFound userInfo:nil]);
+    }
+    
+    /* Connect to Listening Socket */
+    if (idevice_connect(device, ALTDeviceListeningSocket, &connection) != IDEVICE_E_SUCCESS)
+    {
+        return finish(nil, [NSError errorWithDomain:AltServerErrorDomain code:ALTServerErrorConnectionFailed userInfo:nil]);
+    }
+    
+    idevice_free(device);
+    
+    ALTWiredConnection *wiredConnection = [[ALTWiredConnection alloc] initWithDevice:altDevice connection:connection];
+    finish(wiredConnection, nil);
+}
+
+- (void)startNotificationConnectionToDevice:(ALTDevice *)altDevice completionHandler:(void (^)(ALTNotificationConnection * _Nullable, NSError * _Nullable))completionHandler
+{
+    void (^finish)(ALTNotificationConnection *, NSError *) = ^(ALTNotificationConnection *connection, NSError *error) {
+        if (error != nil)
+        {
+            NSLog(@"Notification Connection Error: %@", error);
+        }
+        
+        completionHandler(connection, error);
+    };
+    
+    idevice_t device = NULL;
+    lockdownd_client_t lockdownClient = NULL;
+    lockdownd_service_descriptor_t service = NULL;
+    
+    np_client_t client = NULL;
+    
+    /* Find Device */
+    if (idevice_new_ignore_network(&device, altDevice.identifier.UTF8String) != IDEVICE_E_SUCCESS)
+    {
+        return finish(nil, [NSError errorWithDomain:AltServerErrorDomain code:ALTServerErrorDeviceNotFound userInfo:nil]);
+    }
+    
+    /* Connect to Device */
+    if (lockdownd_client_new_with_handshake(device, &lockdownClient, "altserver") != LOCKDOWN_E_SUCCESS)
+    {
+        return finish(nil, [NSError errorWithDomain:AltServerErrorDomain code:ALTServerErrorConnectionFailed userInfo:nil]);
+    }
+
+    /* Connect to Notification Proxy */
+    if ((lockdownd_start_service(lockdownClient, "com.apple.mobile.notification_proxy", &service) != LOCKDOWN_E_SUCCESS) || service == NULL)
+    {
+        return finish(nil, [NSError errorWithDomain:AltServerErrorDomain code:ALTServerErrorConnectionFailed userInfo:nil]);
+    }
+    
+    /* Connect to Client */
+    if (np_client_new(device, service, &client) != NP_E_SUCCESS)
+    {
+        return finish(nil, [NSError errorWithDomain:AltServerErrorDomain code:ALTServerErrorConnectionFailed userInfo:nil]);
+    }
+    
+    lockdownd_service_descriptor_free(service);
+    lockdownd_client_free(lockdownClient);
+    idevice_free(device);
+    
+    ALTNotificationConnection *notificationConnection = [[ALTNotificationConnection alloc] initWithDevice:altDevice client:client];
+    completionHandler(notificationConnection, nil);
+}
+
 #pragma mark - Getters -
 
 - (NSArray<ALTDevice *> *)connectedDevices
@@ -670,3 +1116,49 @@ void ALTDeviceManagerUpdateStatus(plist_t command, plist_t status, void *uuid)
         NSLog(@"Installation Progress: %@", @(percent));
     }
 }
+
+void ALTDeviceDidChangeConnectionStatus(const idevice_event_t *event, void *user_data)
+{
+    ALTDevice * (^deviceForUDID)(NSString *, NSArray<ALTDevice *> *) = ^ALTDevice *(NSString *udid, NSArray<ALTDevice *> *devices) {
+        for (ALTDevice *device in devices)
+        {
+            if ([device.identifier isEqualToString:udid])
+            {
+                return device;
+            }
+        }
+        
+        return nil;
+    };
+    
+    switch (event->event)
+    {
+        case IDEVICE_DEVICE_ADD:
+        {
+            ALTDevice *device = deviceForUDID(@(event->udid), ALTDeviceManager.sharedManager.connectedDevices);
+            [[NSNotificationCenter defaultCenter] postNotificationName:ALTDeviceManagerDeviceDidConnectNotification object:device];
+            
+            if (device)
+            {
+                [ALTDeviceManager.sharedManager.cachedDevices addObject:device];
+            }
+            
+            break;
+        }
+            
+        case IDEVICE_DEVICE_REMOVE:
+        {
+            ALTDevice *device = deviceForUDID(@(event->udid), ALTDeviceManager.sharedManager.cachedDevices.allObjects);
+            [[NSNotificationCenter defaultCenter] postNotificationName:ALTDeviceManagerDeviceDidDisconnectNotification object:device];
+            
+            if (device)
+            {
+                 [ALTDeviceManager.sharedManager.cachedDevices removeObject:device];
+            }
+
+            break;
+        }
+            
+        default: break;
+    }
+}

AltServer/Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>2</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>LSUIElement</key>
@@ -30,5 +30,7 @@
 	<string>Main</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
+	<key>SUFeedURL</key>
+	<string>https://altstore.io/altserver/sparkle-macos.xml</string>
 </dict>
 </plist>

AltStore.xcodeproj/xcshareddata/xcschemes/AltKit.xcscheme

@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1130"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "BF1E314F22A0616100370A3C"
+               BuildableName = "libAltKit.a"
+               BlueprintName = "AltKit"
+               ReferencedContainer = "container:AltStore.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "BF1E314F22A0616100370A3C"
+            BuildableName = "libAltKit.a"
+            BlueprintName = "AltKit"
+            ReferencedContainer = "container:AltStore.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

AltStore.xcodeproj/xcshareddata/xcschemes/AltPlugin.xcscheme

@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1120"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "BF5C5FC4237DF5AE00EDD0C6"
+               BuildableName = "AltPlugin.mailbundle"
+               BlueprintName = "AltPlugin"
+               ReferencedContainer = "container:AltStore.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "1"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "BF5C5FC4237DF5AE00EDD0C6"
+            BuildableName = "AltPlugin.mailbundle"
+            BlueprintName = "AltPlugin"
+            ReferencedContainer = "container:AltStore.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

AltStore/AltStore-Bridging-Header.h

@@ -2,6 +2,10 @@
 //  Use this file to import your target's public headers that you would like to expose to Swift.
 //
 
-#import "NSError+ALTServerError.h"
+#import "AltKit.h"
+
 #import "ALTAppPermission.h"
 #import "ALTPatreonBenefitType.h"
+#import "ALTSourceUserInfoKey.h"
+
+#import "NSAttributedString+Markdown.h"

AltStore/Analytics/AnalyticsManager.swift

@@ -0,0 +1,97 @@
+//
+//  AnalyticsManager.swift
+//  AltStore
+//
+//  Created by Riley Testut on 3/31/20.
+//  Copyright © 2020 Riley Testut. All rights reserved.
+//
+
+import Foundation
+
+import AppCenter
+import AppCenterAnalytics
+import AppCenterCrashes
+
+extension AnalyticsManager
+{
+    enum EventProperty: String
+    {
+        case name
+        case bundleIdentifier
+        case developerName
+        case version
+        case size
+        case tintColor
+        case sourceIdentifier
+        case sourceURL
+    }
+    
+    enum Event
+    {
+        case installedApp(InstalledApp)
+        case updatedApp(InstalledApp)
+        case refreshedApp(InstalledApp)
+        
+        var name: String {
+            switch self
+            {
+            case .installedApp: return "installed_app"
+            case .updatedApp: return "updated_app"
+            case .refreshedApp: return "refreshed_app"
+            }
+        }
+        
+        var properties: [EventProperty: String] {
+            let properties: [EventProperty: String?]
+            
+            switch self
+            {
+            case .installedApp(let app), .updatedApp(let app), .refreshedApp(let app):
+                let appBundleURL = InstalledApp.fileURL(for: app)
+                let appBundleSize = FileManager.default.directorySize(at: appBundleURL)
+                
+                properties = [
+                    .name: app.name,
+                    .bundleIdentifier: app.bundleIdentifier,
+                    .developerName: app.storeApp?.developerName,
+                    .version: app.version,
+                    .size: appBundleSize?.description,
+                    .tintColor: app.storeApp?.tintColor?.hexString,
+                    .sourceIdentifier: app.storeApp?.sourceIdentifier,
+                    .sourceURL: app.storeApp?.source?.sourceURL.absoluteString
+                ]
+            }
+            
+            return properties.compactMapValues { $0 }
+        }
+    }
+}
+
+class AnalyticsManager
+{
+    static let shared = AnalyticsManager()
+    
+    private init()
+    {
+    }
+}
+
+extension AnalyticsManager
+{
+    func start()
+    {
+        MSAppCenter.start("bb08e9bb-c126-408d-bf3f-324c8473fd40", withServices:[
+            MSAnalytics.self,
+            MSCrashes.self
+        ])
+    }
+    
+    func trackEvent(_ event: Event)
+    {
+        let properties = event.properties.reduce(into: [:]) { (properties, item) in
+            properties[item.key.rawValue] = item.value
+        }
+        
+        MSAnalytics.trackEvent(event.name, withProperties: properties)
+    }
+}

AltStore/App Detail/AppViewController.swift

@@ -89,6 +89,8 @@ class AppViewController: UIViewController
         self.bannerView.betaBadgeView.isHidden = !self.app.isBeta
         self.bannerView.tintColor = self.app.tintColor
         
+        self.bannerView.button.addTarget(self, action: #selector(AppViewController.performAppAction(_:)), for: .primaryActionTriggered)
+        
         self.backButtonContainerView.tintColor = self.app.tintColor
         
         self.navigationController?.navigationBar.tintColor = self.app.tintColor
@@ -105,6 +107,7 @@ class AppViewController: UIViewController
         
         NotificationCenter.default.addObserver(self, selector: #selector(AppViewController.didChangeApp(_:)), name: .NSManagedObjectContextObjectsDidChange, object: DatabaseManager.shared.viewContext)
         NotificationCenter.default.addObserver(self, selector: #selector(AppViewController.willEnterForeground(_:)), name: UIApplication.willEnterForegroundNotification, object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(AppViewController.didBecomeActive(_:)), name: UIApplication.didBecomeActiveNotification, object: nil)
         
         self._backgroundBlurEffect = self.backgroundBlurView.effect as? UIBlurEffect
         self._backgroundBlurTintColor = self.backgroundBlurView.contentView.backgroundColor
@@ -499,8 +502,8 @@ extension AppViewController
             catch
             {
                 DispatchQueue.main.async {
-                    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)
                 }
             }
             
@@ -538,6 +541,15 @@ private extension AppViewController
         self._shouldResetLayout = true
         self.view.setNeedsLayout()
     }
+    
+    @objc func didBecomeActive(_ notification: Notification)
+    {
+        guard let navigationController = self.navigationController, navigationController.topViewController == self else { return }
+        
+        // Fixes Navigation Bar appearing after app becomes inactive -> active again.
+        self._shouldResetLayout = true
+        self.view.setNeedsLayout()
+    }
 }
 
 extension AppViewController: UIScrollViewDelegate

AltStore/App IDs/AppIDsViewController.swift

@@ -0,0 +1,230 @@
+//
+//  AppIDsViewController.swift
+//  AltStore
+//
+//  Created by Riley Testut on 1/27/20.
+//  Copyright © 2020 Riley Testut. All rights reserved.
+//
+
+import UIKit
+
+import Roxas
+
+class AppIDsViewController: UICollectionViewController
+{
+    private lazy var dataSource = self.makeDataSource()
+    
+    private var didInitialFetch = false
+    private var isLoading = false {
+        didSet {
+            self.update()
+        }
+    }
+    
+    @IBOutlet var activityIndicatorBarButtonItem: UIBarButtonItem!
+    
+    override func viewDidLoad()
+    {
+        super.viewDidLoad()
+        
+        self.collectionView.dataSource = self.dataSource
+        
+        self.activityIndicatorBarButtonItem.isIndicatingActivity = true
+        
+        let refreshControl = UIRefreshControl()
+        refreshControl.addTarget(self, action: #selector(AppIDsViewController.fetchAppIDs), for: .primaryActionTriggered)
+        self.collectionView.refreshControl = refreshControl
+    }
+    
+    override func viewWillAppear(_ animated: Bool)
+    {
+        super.viewWillAppear(animated)
+        
+        if !self.didInitialFetch
+        {
+            self.fetchAppIDs()
+        }
+    }
+}
+
+private extension AppIDsViewController
+{
+    func makeDataSource() -> RSTFetchedResultsCollectionViewDataSource<AppID>
+    {
+        let fetchRequest = AppID.fetchRequest() as NSFetchRequest<AppID>
+        fetchRequest.sortDescriptors = [NSSortDescriptor(keyPath: \AppID.name, ascending: true),
+                                        NSSortDescriptor(keyPath: \AppID.bundleIdentifier, ascending: true),
+                                        NSSortDescriptor(keyPath: \AppID.expirationDate, ascending: true)]
+        fetchRequest.returnsObjectsAsFaults = false
+        
+        if let team = DatabaseManager.shared.activeTeam()
+        {
+            fetchRequest.predicate = NSPredicate(format: "%K == %@", #keyPath(AppID.team), team)
+        }
+        else
+        {
+            fetchRequest.predicate = NSPredicate(value: false)
+        }
+        
+        let dataSource = RSTFetchedResultsCollectionViewDataSource<AppID>(fetchRequest: fetchRequest, managedObjectContext: DatabaseManager.shared.viewContext)
+        dataSource.proxy = self
+        dataSource.cellConfigurationHandler = { (cell, appID, indexPath) in
+            let tintColor = UIColor.altPrimary
+            
+            let cell = cell as! BannerCollectionViewCell
+            cell.layoutMargins.left = self.view.layoutMargins.left
+            cell.layoutMargins.right = self.view.layoutMargins.right
+            cell.tintColor = tintColor
+                        
+            cell.bannerView.iconImageView.isHidden = true
+            cell.bannerView.button.isIndicatingActivity = false
+            cell.bannerView.betaBadgeView.isHidden = true
+            
+            cell.bannerView.buttonLabel.text = NSLocalizedString("Expires in", comment: "")
+            
+            if let expirationDate = appID.expirationDate
+            {
+                cell.bannerView.button.isHidden = false
+                cell.bannerView.button.isUserInteractionEnabled = false
+                
+                cell.bannerView.buttonLabel.isHidden = false
+                
+                let currentDate = Date()
+                
+                let numberOfDays = expirationDate.numberOfCalendarDays(since: currentDate)
+                
+                if numberOfDays == 1
+                {
+                    cell.bannerView.button.setTitle(NSLocalizedString("1 DAY", comment: ""), for: .normal)
+                }
+                else
+                {
+                    cell.bannerView.button.setTitle(String(format: NSLocalizedString("%@ DAYS", comment: ""), NSNumber(value: numberOfDays)), for: .normal)
+                }
+            }
+            else
+            {
+                cell.bannerView.button.isHidden = true
+                cell.bannerView.buttonLabel.isHidden = true
+            }
+                                                
+            cell.bannerView.titleLabel.text = appID.name
+            cell.bannerView.subtitleLabel.text = appID.bundleIdentifier
+            cell.bannerView.subtitleLabel.numberOfLines = 2
+            
+            // Make sure refresh button is correct size.
+            cell.layoutIfNeeded()
+        }
+        
+        return dataSource
+    }
+    
+    @objc func fetchAppIDs()
+    {
+        guard !self.isLoading else { return }
+        self.isLoading = true
+        
+        AppManager.shared.fetchAppIDs { (result) in
+            do
+            {
+                let (_, context) = try result.get()
+                try context.save()
+            }
+            catch
+            {
+                DispatchQueue.main.async {
+                    let toastView = ToastView(error: error)
+                    toastView.show(in: self)
+                }
+            }
+            
+            DispatchQueue.main.async {
+                self.isLoading = false
+            }
+        }
+    }
+    
+    func update()
+    {
+        if !self.isLoading
+        {
+            self.collectionView.refreshControl?.endRefreshing()
+            self.activityIndicatorBarButtonItem.isIndicatingActivity = false
+        }
+    }
+}
+
+extension AppIDsViewController: UICollectionViewDelegateFlowLayout
+{
+    func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize
+    {
+        return CGSize(width: collectionView.bounds.width, height: 80)
+    }
+    
+    func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, referenceSizeForHeaderInSection section: Int) -> CGSize
+    {
+        let indexPath = IndexPath(row: 0, section: section)
+        let headerView = self.collectionView(collectionView, viewForSupplementaryElementOfKind: UICollectionView.elementKindSectionHeader, at: indexPath)
+        
+        // Use this view to calculate the optimal size based on the collection view's width
+        let size = headerView.systemLayoutSizeFitting(CGSize(width: collectionView.frame.width, height: UIView.layoutFittingExpandedSize.height),
+                                                      withHorizontalFittingPriority: .required, // Width is fixed
+                                                      verticalFittingPriority: .fittingSizeLevel) // Height can be as large as needed
+        return size
+    }
+    
+    func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, referenceSizeForFooterInSection section: Int) -> CGSize
+    {
+        return CGSize(width: collectionView.bounds.width, height: 50)
+    }
+    
+    override func collectionView(_ collectionView: UICollectionView, viewForSupplementaryElementOfKind kind: String, at indexPath: IndexPath) -> UICollectionReusableView
+    {
+        switch kind
+        {
+        case UICollectionView.elementKindSectionHeader:
+            let headerView = collectionView.dequeueReusableSupplementaryView(ofKind: kind, withReuseIdentifier: "Header", for: indexPath) as! TextCollectionReusableView
+            headerView.layoutMargins.left = self.view.layoutMargins.left
+            headerView.layoutMargins.right = self.view.layoutMargins.right
+            
+            if let activeTeam = DatabaseManager.shared.activeTeam(), activeTeam.type == .free
+            {
+                let text = NSLocalizedString("""
+                Each app and app extension installed with AltStore must register an App ID with Apple. Apple limits free developer accounts to 10 App IDs at a time.
+
+                **App IDs can't be deleted**, but they do expire after one week. AltStore will automatically renew App IDs for all active apps once they've expired.
+                """, comment: "")
+                
+                let attributedText = NSAttributedString(markdownRepresentation: text, attributes: [.font: headerView.textLabel.font as Any])
+                headerView.textLabel.attributedText = attributedText
+            }
+            else
+            {
+                headerView.textLabel.text = NSLocalizedString("""
+                Each app and app extension installed with AltStore must register an App ID with Apple.
+                
+                App IDs for paid developer accounts never expire, and there is no limit to how many you can create.
+                """, comment: "")
+            }
+            
+            return headerView
+            
+        case UICollectionView.elementKindSectionFooter:
+            let footerView = collectionView.dequeueReusableSupplementaryView(ofKind: kind, withReuseIdentifier: "Footer", for: indexPath) as! TextCollectionReusableView
+            
+            let count = self.dataSource.itemCount
+            if count == 1
+            {
+                footerView.textLabel.text = NSLocalizedString("1 App ID", comment: "")
+            }
+            else
+            {
+                footerView.textLabel.text = String(format: NSLocalizedString("%@ App IDs", comment: ""), NSNumber(value: count))
+            }
+            
+            return footerView
+            
+        default: fatalError()
+        }
+    }
+}

AltStore/AppDelegate.swift

@@ -21,7 +21,7 @@ private enum RefreshError: LocalizedError
     var errorDescription: String? {
         switch self
         {
-        case .noInstalledApps: return NSLocalizedString("No installed apps to refresh.", comment: "")
+        case .noInstalledApps: return NSLocalizedString("No active apps require refreshing.", comment: "")
         }
     }
 }
@@ -64,9 +64,12 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     var window: UIWindow?
     
     private var runningApplications: Set<String>?
+    private var backgroundRefreshContext: NSManagedObjectContext? // Keep context alive until finished refreshing.
 
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool
     {
+        AnalyticsManager.shared.start()
+        
         self.setTintColor()
         
         ServerManager.shared.startDiscovering()
@@ -209,6 +212,8 @@ extension AppDelegate
                 }
                 
                 taskCompletionHandler()
+                
+                self.backgroundRefreshContext = nil
             }
             
             if let error = taskResult.error
@@ -247,20 +252,20 @@ private extension AppDelegate
                      backgroundFetchCompletionHandler: @escaping (UIBackgroundFetchResult) -> Void,
                      completionHandler: @escaping (Result<[String: Result<InstalledApp, Error>], Error>) -> Void)
     {
-        var fetchSourceResult: Result<Source, Error>?
+        var fetchSourcesResult: Result<Set<Source>, Error>?
         var serversResult: Result<Void, Error>?
         
         let dispatchGroup = DispatchGroup()
         dispatchGroup.enter()
         
-        AppManager.shared.fetchSource() { (result) in
-            fetchSourceResult = result
+        AppManager.shared.fetchSources() { (result) in
+            fetchSourcesResult = result
             
             do
             {
-                let source = try result.get()
+                let sources = try result.get()
                 
-                guard let context = source.managedObjectContext else { return }
+                guard let context = sources.first?.managedObjectContext else { return }
                 
                 let previousUpdatesFetchRequest = InstalledApp.updatesFetchRequest() as! NSFetchRequest<NSFetchRequestResult>
                 previousUpdatesFetchRequest.includesPendingChanges = false
@@ -328,7 +333,7 @@ private extension AppDelegate
             {
                 print("Error fetching apps:", error)
                 
-                fetchSourceResult = .failure(error)
+                fetchSourcesResult = .failure(error)
             }
             
             dispatchGroup.leave()
@@ -339,7 +344,6 @@ private extension AppDelegate
             dispatchGroup.enter()
             
             DatabaseManager.shared.persistentContainer.performBackgroundTask { (context) in
-                
                 let installedApps = InstalledApp.fetchAppsForBackgroundRefresh(in: context)
                 guard !installedApps.isEmpty else {
                     serversResult = .success(())
@@ -351,6 +355,7 @@ private extension AppDelegate
                 }
                 
                 self.runningApplications = []
+                self.backgroundRefreshContext = context
                 
                 let identifiers = installedApps.compactMap { $0.bundleIdentifier }
                 print("Apps to refresh:", identifiers)
@@ -398,7 +403,7 @@ private extension AppDelegate
                             
                             // Also since AltServer has already received the app, it can finish installing even if we're no longer running in background.
                             
-                            if let error = group.error
+                            if let error = group.context.error
                             {
                                 self.scheduleFinishedRefreshingNotification(for: .failure(error), identifier: identifier)
                             }
@@ -410,8 +415,8 @@ private extension AppDelegate
                                 self.scheduleFinishedRefreshingNotification(for: .success(results), identifier: identifier)
                             }
                         }
-                        group.completionHandler = { (result) in
-                            completionHandler(result)
+                        group.completionHandler = { (results) in
+                            completionHandler(.success(results))
                         }
                     }
                 }
@@ -421,12 +426,12 @@ private extension AppDelegate
         dispatchGroup.notify(queue: .main) {
             if !UserDefaults.standard.isBackgroundRefreshEnabled
             {
-                guard let fetchSourceResult = fetchSourceResult else {
+                guard let fetchSourcesResult = fetchSourcesResult else {
                     backgroundFetchCompletionHandler(.failed)
                     return
                 }
                 
-                switch fetchSourceResult
+                switch fetchSourcesResult
                 {
                 case .failure: backgroundFetchCompletionHandler(.failed)
                 case .success: backgroundFetchCompletionHandler(.newData)
@@ -436,13 +441,13 @@ private extension AppDelegate
             }
             else
             {
-                guard let fetchSourceResult = fetchSourceResult, let serversResult = serversResult else {
+                guard let fetchSourcesResult = fetchSourcesResult, let serversResult = serversResult else {
                     backgroundFetchCompletionHandler(.failed)
                     return
                 }
                 
                 // Call completionHandler early to improve chances of refreshing in the background again.
-                switch (fetchSourceResult, serversResult)
+                switch (fetchSourcesResult, serversResult)
                 {
                 case (.success, .success): backgroundFetchCompletionHandler(.newData)
                 case (.success, .failure(ConnectionError.serverNotFound)): backgroundFetchCompletionHandler(.newData)

AltStore/Authentication/Authentication.storyboard

@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15400" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15404"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15703"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -50,7 +51,7 @@
                                         <rect key="frame" x="0.0" y="0.0" width="375" height="623"/>
                                         <subviews>
                                             <stackView opaque="NO" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" axis="vertical" spacing="50" translatesAutoresizingMaskIntoConstraints="NO" id="YmX-7v-pxh">
-                                                <rect key="frame" x="16" y="6" width="343" height="397"/>
+                                                <rect key="frame" x="16" y="6" width="343" height="359.5"/>
                                                 <subviews>
                                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="top" spacing="6" translatesAutoresizingMaskIntoConstraints="NO" id="Yfu-hI-0B7" userLabel="Welcome">
                                                         <rect key="frame" x="0.0" y="0.0" width="343" height="67.5"/>
@@ -70,10 +71,10 @@
                                                         </subviews>
                                                     </stackView>
                                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="32" translatesAutoresizingMaskIntoConstraints="NO" id="Aqh-MD-HFf">
-                                                        <rect key="frame" x="0.0" y="117.5" width="343" height="279.5"/>
+                                                        <rect key="frame" x="0.0" y="117.5" width="343" height="242"/>
                                                         <subviews>
                                                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="15" translatesAutoresizingMaskIntoConstraints="NO" id="Oy6-xr-cZ7">
-                                                                <rect key="frame" x="0.0" y="0.0" width="343" height="196.5"/>
+                                                                <rect key="frame" x="0.0" y="0.0" width="343" height="159"/>
                                                                 <subviews>
                                                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="H95-7V-Kk8" userLabel="Apple ID">
                                                                         <rect key="frame" x="0.0" y="0.0" width="343" height="72"/>
@@ -117,7 +118,7 @@
                                                                         </subviews>
                                                                     </stackView>
                                                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="hd5-yc-rcq" userLabel="Password">
-                                                                        <rect key="frame" x="0.0" y="87" width="343" height="109.5"/>
+                                                                        <rect key="frame" x="0.0" y="87" width="343" height="72"/>
                                                                         <subviews>
                                                                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="lvX-im-C95">
                                                                                 <rect key="frame" x="0.0" y="0.0" width="343" height="17"/>
@@ -155,24 +156,12 @@
                                                                                 </constraints>
                                                                                 <edgeInsets key="layoutMargins" top="0.0" left="14" bottom="0.0" right="14"/>
                                                                             </view>
-                                                                            <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="Glz-dw-2Eg">
-                                                                                <rect key="frame" x="0.0" y="76" width="343" height="33.5"/>
-                                                                                <subviews>
-                                                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="If you used an app-specific password to install AltStore, please use that same password again." textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" minimumScaleFactor="0.25" translatesAutoresizingMaskIntoConstraints="NO" id="a51-OQ-f3j">
-                                                                                        <rect key="frame" x="14" y="0.0" width="315" height="33.5"/>
-                                                                                        <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                                                                                        <color key="textColor" white="1" alpha="0.75" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                                                                        <nil key="highlightedColor"/>
-                                                                                    </label>
-                                                                                </subviews>
-                                                                                <edgeInsets key="layoutMargins" top="0.0" left="14" bottom="0.0" right="14"/>
-                                                                            </stackView>
                                                                         </subviews>
                                                                     </stackView>
                                                                 </subviews>
                                                             </stackView>
                                                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="2N5-zd-fUj">
-                                                                <rect key="frame" x="0.0" y="228.5" width="343" height="51"/>
+                                                                <rect key="frame" x="0.0" y="191" width="343" height="51"/>
                                                                 <color key="backgroundColor" name="SettingsHighlighted"/>
                                                                 <constraints>
                                                                     <constraint firstAttribute="height" constant="51" id="4BK-Un-5pl"/>

AltStore/Authentication/AuthenticationViewController.swift

@@ -12,7 +12,8 @@ import AltSign
 
 class AuthenticationViewController: UIViewController
 {
-    var authenticationHandler: (((ALTAccount, String)?) -> Void)?
+    var authenticationHandler: ((String, String, @escaping (Result<(ALTAccount, ALTAppleAPISession), Error>) -> Void) -> Void)?
+    var completionHandler: (((ALTAccount, ALTAppleAPISession, String)?) -> Void)?
     
     private weak var toastView: ToastView?
     
@@ -96,23 +97,30 @@ private extension AuthenticationViewController
         
         self.signInButton.isIndicatingActivity = true
         
-        ALTAppleAPI.shared.authenticate(appleID: emailAddress, password: password) { (account, error) in
-            do
-            {
-                let account = try Result(account, error).get()
-                self.authenticationHandler?((account, password))
-            }
-            catch
+        self.authenticationHandler?(emailAddress, password) { (result) in
+            switch result
             {
+            case .failure(ALTAppleAPIError.requiresTwoFactorAuthentication):
+                // Ignore
                 DispatchQueue.main.async {
-                    let toastView = ToastView(text: NSLocalizedString("Failed to Log In", comment: ""), detailText: error.localizedDescription)
+                    self.signInButton.isIndicatingActivity = false
+                }
+                
+            case .failure(let error as NSError):
+                DispatchQueue.main.async {
+                    let error = error.withLocalizedFailure(NSLocalizedString("Failed to Log In", comment: ""))
+                    
+                    let toastView = ToastView(error: error)
                     toastView.textLabel.textColor = .altPink
                     toastView.detailTextLabel.textColor = .altPink
-                    toastView.show(in: self.navigationController?.view ?? self.view)
+                    toastView.show(in: self)
                     self.toastView = toastView
                     
                     self.signInButton.isIndicatingActivity = false
                 }
+                
+            case .success((let account, let session)):
+                self.completionHandler?((account, session, password))
             }
             
             DispatchQueue.main.async {
@@ -123,7 +131,7 @@ private extension AuthenticationViewController
     
     @IBAction func cancel(_ sender: UIBarButtonItem)
     {
-        self.authenticationHandler?(nil)
+        self.completionHandler?(nil)
     }
 }
 

AltStore/Authentication/RefreshAltStoreViewController.swift

@@ -13,7 +13,7 @@ import Roxas
 
 class RefreshAltStoreViewController: UIViewController
 {
-    var signer: ALTSigner!
+    var context: AuthenticatedOperationContext!
     
     var completionHandler: ((Result<Void, Error>) -> Void)?
     
@@ -41,22 +41,23 @@ private extension RefreshAltStoreViewController
         {
             sender.isIndicatingActivity = true
             
-            if let progress = AppManager.shared.refreshProgress(for: altStore) ?? AppManager.shared.installationProgress(for: altStore)
+            if let progress = AppManager.shared.installationProgress(for: altStore)
             {
-                // Cancel pending AltStore refresh so we can start a new one.
+                // Cancel pending AltStore installation so we can start a new one.
                 progress.cancel()
             }
-            
-            let group = OperationGroup()
-            group.signer = self.signer // Prevent us from trying to authenticate a second time.
-            group.completionHandler = { (result) in
-                if let error = result.error ?? result.value?.values.compactMap({ $0.error }).first
+                        
+            // Install, _not_ refresh, to ensure we are installing with a non-revoked certificate.
+            let progress = AppManager.shared.install(altStore, presentingViewController: self, context: self.context) { (result) in
+                switch result
                 {
+                case .success: self.completionHandler?(.success(()))
+                case .failure(let error as NSError):
                     DispatchQueue.main.async {
                         sender.progress = nil
                         sender.isIndicatingActivity = false
                         
-                        let alertController = UIAlertController(title: NSLocalizedString("Failed to Refresh AltStore", comment: ""), message: error.localizedDescription, preferredStyle: .alert)
+                        let alertController = UIAlertController(title: NSLocalizedString("Failed to Refresh AltStore", comment: ""), message: error.localizedFailureReason ?? error.localizedDescription, preferredStyle: .alert)
                         alertController.addAction(UIAlertAction(title: NSLocalizedString("Try Again", comment: ""), style: .default, handler: { (action) in
                             refresh()
                         }))
@@ -67,14 +68,9 @@ private extension RefreshAltStoreViewController
                         self.present(alertController, animated: true, completion: nil)
                     }
                 }
-                else
-                {
-                    self.completionHandler?(.success(()))
-                }
             }
             
-            _ = AppManager.shared.refresh([altStore], presentingViewController: self, group: group)
-            sender.progress = group.progress
+            sender.progress = progress
         }
         
         refresh()

AltStore/Base.lproj/LaunchScreen.storyboard

@@ -1,7 +1,10 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13122.16" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15400" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="6NO-wl-tj1">
+    <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13104.12"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15404"/>
+        <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -11,15 +14,38 @@
             <objects>
                 <viewController id="01J-lp-oVM" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <color key="backgroundColor" name="Background"/>
                         <viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
                     </view>
+                    <tabBarItem key="tabBarItem" title="" id="RiK-sx-Kgv"/>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="53" y="375"/>
+            <point key="canvasLocation" x="962.31884057971024" y="375"/>
+        </scene>
+        <!--Tab Bar Controller-->
+        <scene sceneID="9Yy-ze-Trt">
+            <objects>
+                <tabBarController automaticallyAdjustsScrollViewInsets="NO" id="6NO-wl-tj1" sceneMemberID="viewController">
+                    <toolbarItems/>
+                    <tabBar key="tabBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="4lc-l2-vDf">
+                        <autoresizingMask key="autoresizingMask"/>
+                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                    </tabBar>
+                    <connections>
+                        <segue destination="01J-lp-oVM" kind="relationship" relationship="viewControllers" id="2qH-aa-n0z"/>
+                    </connections>
+                </tabBarController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="pxX-hL-ovw" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="52.173913043478265" y="375"/>
         </scene>
     </scenes>
+    <resources>
+        <namedColor name="Background">
+            <color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </namedColor>
+    </resources>
 </document>

AltStore/Base.lproj/Main.storyboard

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15400" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="wKh-xq-NuP">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16092.1" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="wKh-xq-NuP">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15404"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16082.1"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -19,9 +19,6 @@
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <viewLayoutGuide key="safeArea" id="sZd-sc-Bvn"/>
                     </view>
-                    <connections>
-                        <segue destination="49e-Tb-3d3" kind="presentation" identifier="finishLaunching" modalTransitionStyle="crossDissolve" id="6Ov-Kc-Van"/>
-                    </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="vOq-mm-rY5" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
@@ -30,7 +27,7 @@
         <!--Tab Bar Controller-->
         <scene sceneID="yl2-sM-qoP">
             <objects>
-                <tabBarController modalPresentationStyle="fullScreen" id="49e-Tb-3d3" customClass="TabBarController" customModule="AltStore" customModuleProvider="target" sceneMemberID="viewController">
+                <tabBarController storyboardIdentifier="tabBarController" modalPresentationStyle="fullScreen" id="49e-Tb-3d3" customClass="TabBarController" customModule="AltStore" customModuleProvider="target" sceneMemberID="viewController">
                     <tabBar key="tabBar" contentMode="scaleToFill" id="W28-zg-YXA">
                         <rect key="frame" x="0.0" y="975" width="768" height="49"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
@@ -67,7 +64,13 @@
                             <outlet property="delegate" destination="e3L-BF-iXp" id="Mdp-x4-hZe"/>
                         </connections>
                     </collectionView>
-                    <navigationItem key="navigationItem" title="Browse" id="pUx-6k-rtr"/>
+                    <navigationItem key="navigationItem" title="Browse" id="pUx-6k-rtr">
+                        <barButtonItem key="rightBarButtonItem" title="Sources" id="6Ul-JW-TMT">
+                            <connections>
+                                <segue destination="Qo4-72-Hmr" kind="presentation" id="de9-NH-aec"/>
+                            </connections>
+                        </barButtonItem>
+                    </navigationItem>
                 </collectionViewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="cMN-i4-Bxk" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
@@ -106,7 +109,7 @@
                             <visualEffectView opaque="NO" contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="8Tg-wk-r0u">
                                 <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" ambiguous="YES" insetsLayoutMarginsFromSafeArea="NO" id="oNk-OQ-r4M">
+                                <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" id="oNk-OQ-r4M">
                                     <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                 </view>
@@ -136,14 +139,14 @@
                                     <visualEffectView opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="tUK-0J-07U">
                                         <rect key="frame" x="58" y="117" width="18" height="18"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                        <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" ambiguous="YES" insetsLayoutMarginsFromSafeArea="NO" id="yyn-wP-xk4">
+                                        <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" id="yyn-wP-xk4">
                                             <rect key="frame" x="0.0" y="0.0" width="18" height="18"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             <subviews>
                                                 <visualEffectView opaque="NO" contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="JP7-6F-CoG">
                                                     <rect key="frame" x="0.0" y="0.0" width="18" height="18"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                                    <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" ambiguous="YES" insetsLayoutMarginsFromSafeArea="NO" id="UJ5-ia-PVA">
+                                                    <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" id="UJ5-ia-PVA">
                                                         <rect key="frame" x="0.0" y="0.0" width="18" height="18"/>
                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                         <subviews>
@@ -631,13 +634,13 @@ World</string>
                         <color key="backgroundColor" name="Background"/>
                         <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="15" minimumInteritemSpacing="10" id="SB5-U0-jyy">
                             <size key="itemSize" width="375" height="60"/>
-                            <size key="headerReferenceSize" width="50" height="50"/>
-                            <size key="footerReferenceSize" width="0.0" height="0.0"/>
+                            <size key="headerReferenceSize" width="0.0" height="0.0"/>
+                            <size key="footerReferenceSize" width="50" height="60.5"/>
                             <inset key="sectionInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
                         </collectionViewFlowLayout>
                         <cells>
                             <collectionViewCell opaque="NO" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" reuseIdentifier="AppCell" id="kMp-ym-2yu" customClass="InstalledAppCollectionViewCell" customModule="AltStore" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="50" width="375" height="60"/>
+                                <rect key="frame" x="0.0" y="0.0" width="375" height="60"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO">
                                     <rect key="frame" x="0.0" y="0.0" width="375" height="60"/>
@@ -666,7 +669,7 @@ World</string>
                                 </connections>
                             </collectionViewCell>
                             <collectionViewCell opaque="NO" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="NoUpdatesCell" id="h0f-XI-UA5" customClass="NoUpdatesCollectionViewCell" customModule="AltStore" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="125" width="375" height="60"/>
+                                <rect key="frame" x="0.0" y="75" width="375" height="60"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO">
                                     <rect key="frame" x="0.0" y="0.0" width="375" height="60"/>
@@ -726,31 +729,38 @@ World</string>
                                 </connections>
                             </collectionViewCell>
                         </cells>
-                        <collectionReusableView key="sectionHeaderView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" reuseIdentifier="InstalledAppsHeader" id="Crb-NU-1Ye" customClass="InstalledAppsCollectionHeaderView" customModule="AltStore" customModuleProvider="target">
-                            <rect key="frame" x="0.0" y="0.0" width="375" height="50"/>
+                        <collectionReusableView key="sectionFooterView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" reuseIdentifier="InstalledAppsFooter" id="HYs-co-nJZ" customClass="InstalledAppsCollectionFooterView" customModule="AltStore" customModuleProvider="target">
+                            <rect key="frame" x="0.0" y="135" width="375" height="60.5"/>
                             <autoresizingMask key="autoresizingMask"/>
                             <subviews>
-                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Installed" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BDU-hM-rro">
-                                    <rect key="frame" x="20" y="21" width="96.5" height="29"/>
-                                    <fontDescription key="fontDescription" type="boldSystem" pointSize="24"/>
-                                    <nil key="textColor"/>
-                                    <nil key="highlightedColor"/>
-                                </label>
-                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="nxk-e8-ARx">
-                                    <rect key="frame" x="274" y="23" width="81" height="32"/>
-                                    <fontDescription key="fontDescription" type="system" weight="medium" pointSize="16"/>
-                                    <state key="normal" title="Refresh All"/>
-                                </button>
+                                <stackView opaque="NO" contentMode="scaleToFill" horizontalCompressionResistancePriority="900" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="GFQ-Wy-Qhy">
+                                    <rect key="frame" x="138.5" y="0.0" width="98" height="52.5"/>
+                                    <subviews>
+                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="5/10 App IDs" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LLv-8I-6Of">
+                                            <rect key="frame" x="0.0" y="0.0" width="98" height="20.5"/>
+                                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                            <color key="textColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                            <nil key="highlightedColor"/>
+                                        </label>
+                                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="NHb-0F-cHZ">
+                                            <rect key="frame" x="0.0" y="20.5" width="98" height="32"/>
+                                            <fontDescription key="fontDescription" type="system" pointSize="16"/>
+                                            <state key="normal" title="View App IDs"/>
+                                            <connections>
+                                                <segue destination="IXk-qg-mFJ" kind="presentation" identifier="showAppIDs" id="yZB-Fh-cTL"/>
+                                            </connections>
+                                        </button>
+                                    </subviews>
+                                </stackView>
                             </subviews>
                             <constraints>
-                                <constraint firstAttribute="bottom" secondItem="BDU-hM-rro" secondAttribute="bottom" id="9iT-ur-A4W"/>
-                                <constraint firstItem="BDU-hM-rro" firstAttribute="leading" secondItem="Crb-NU-1Ye" secondAttribute="leading" constant="20" id="F8e-9W-MC2"/>
-                                <constraint firstAttribute="trailing" secondItem="nxk-e8-ARx" secondAttribute="trailing" constant="20" id="WxV-85-RcK"/>
-                                <constraint firstItem="nxk-e8-ARx" firstAttribute="firstBaseline" secondItem="BDU-hM-rro" secondAttribute="firstBaseline" id="lIO-3C-ZPH"/>
+                                <constraint firstAttribute="bottom" secondItem="GFQ-Wy-Qhy" secondAttribute="bottom" constant="8" id="HGl-P6-G2v"/>
+                                <constraint firstItem="GFQ-Wy-Qhy" firstAttribute="top" secondItem="HYs-co-nJZ" secondAttribute="top" id="gg9-XU-2ej"/>
+                                <constraint firstItem="GFQ-Wy-Qhy" firstAttribute="centerX" secondItem="HYs-co-nJZ" secondAttribute="centerX" id="vyo-h4-yD9"/>
                             </constraints>
                             <connections>
-                                <outlet property="button" destination="nxk-e8-ARx" id="gwj-97-LVi"/>
-                                <outlet property="textLabel" destination="BDU-hM-rro" id="CQM-8K-bcH"/>
+                                <outlet property="button" destination="NHb-0F-cHZ" id="wOh-Ee-jhN"/>
+                                <outlet property="textLabel" destination="LLv-8I-6Of" id="t2D-f1-5pC"/>
                             </connections>
                         </collectionReusableView>
                         <connections>
@@ -773,6 +783,114 @@ World</string>
             </objects>
             <point key="canvasLocation" x="1728.8" y="716.49175412293857"/>
         </scene>
+        <!--App IDs-->
+        <scene sceneID="kvf-US-rRe">
+            <objects>
+                <collectionViewController title="App IDs" id="y1A-Nm-mw7" customClass="AppIDsViewController" customModule="AltStore" customModuleProvider="target" sceneMemberID="viewController">
+                    <collectionView key="view" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" dataMode="prototypes" id="v1r-C8-h6h">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="647"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                        <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="15" minimumInteritemSpacing="10" id="Wzt-qc-XG8">
+                            <size key="itemSize" width="375" height="80"/>
+                            <size key="headerReferenceSize" width="50" height="60"/>
+                            <size key="footerReferenceSize" width="50" height="50"/>
+                            <inset key="sectionInset" minX="0.0" minY="10" maxX="0.0" maxY="20"/>
+                        </collectionViewFlowLayout>
+                        <cells>
+                            <collectionViewCell opaque="NO" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" reuseIdentifier="Cell" id="XWu-DU-xbh" customClass="BannerCollectionViewCell" customModule="AltStore" customModuleProvider="target">
+                                <rect key="frame" x="0.0" y="70" width="375" height="80"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO">
+                                    <rect key="frame" x="0.0" y="0.0" width="375" height="80"/>
+                                    <autoresizingMask key="autoresizingMask"/>
+                                    <subviews>
+                                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1w8-fI-98T" customClass="AppBannerView" customModule="AltStore" customModuleProvider="target">
+                                            <rect key="frame" x="8" y="0.0" width="359" height="80"/>
+                                            <accessibility key="accessibilityConfiguration">
+                                                <bool key="isElement" value="YES"/>
+                                            </accessibility>
+                                        </view>
+                                    </subviews>
+                                </view>
+                                <constraints>
+                                    <constraint firstAttribute="trailingMargin" secondItem="1w8-fI-98T" secondAttribute="trailing" id="0bS-49-dqo"/>
+                                    <constraint firstAttribute="bottom" secondItem="1w8-fI-98T" secondAttribute="bottom" id="Bif-xB-0gt"/>
+                                    <constraint firstItem="1w8-fI-98T" firstAttribute="top" secondItem="XWu-DU-xbh" secondAttribute="top" id="aEf-KK-MHU"/>
+                                    <constraint firstItem="1w8-fI-98T" firstAttribute="leading" secondItem="XWu-DU-xbh" secondAttribute="leadingMargin" id="mFW-ti-cVB"/>
+                                </constraints>
+                                <connections>
+                                    <outlet property="bannerView" destination="1w8-fI-98T" id="OH8-L9-TZn"/>
+                                </connections>
+                            </collectionViewCell>
+                        </cells>
+                        <collectionReusableView key="sectionHeaderView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" reuseIdentifier="Header" id="th0-G6-bRt" customClass="TextCollectionReusableView" customModule="AltStore" customModuleProvider="target">
+                            <rect key="frame" x="0.0" y="0.0" width="375" height="60"/>
+                            <autoresizingMask key="autoresizingMask"/>
+                            <subviews>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="App IDs Description" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="83Z-Ih-nOW">
+                                    <rect key="frame" x="8" y="14" width="359" height="31"/>
+                                    <fontDescription key="fontDescription" style="UICTFontTextStyleCallout"/>
+                                    <color key="textColor" white="0.5" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                    <nil key="highlightedColor"/>
+                                </label>
+                            </subviews>
+                            <constraints>
+                                <constraint firstAttribute="bottom" secondItem="83Z-Ih-nOW" secondAttribute="bottom" constant="15" id="CQA-og-LZ2"/>
+                                <constraint firstItem="83Z-Ih-nOW" firstAttribute="top" secondItem="th0-G6-bRt" secondAttribute="top" constant="14" id="e0J-MA-eH5"/>
+                                <constraint firstAttribute="leadingMargin" secondItem="83Z-Ih-nOW" secondAttribute="leading" id="nGf-Rh-mnk"/>
+                                <constraint firstAttribute="trailingMargin" secondItem="83Z-Ih-nOW" secondAttribute="trailing" id="sYg-nT-ror"/>
+                            </constraints>
+                            <connections>
+                                <outlet property="textLabel" destination="83Z-Ih-nOW" id="xxM-HD-iJS"/>
+                            </connections>
+                        </collectionReusableView>
+                        <collectionReusableView key="sectionFooterView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" reuseIdentifier="Footer" id="xMh-lD-r6C" customClass="TextCollectionReusableView" customModule="AltStore" customModuleProvider="target">
+                            <rect key="frame" x="0.0" y="170" width="375" height="50"/>
+                            <autoresizingMask key="autoresizingMask"/>
+                            <subviews>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="10 App IDs" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Zna-7n-kBz">
+                                    <rect key="frame" x="146" y="0.0" width="83" height="21"/>
+                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                    <color key="textColor" white="0.5" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                    <nil key="highlightedColor"/>
+                                </label>
+                            </subviews>
+                            <constraints>
+                                <constraint firstItem="Zna-7n-kBz" firstAttribute="centerX" secondItem="xMh-lD-r6C" secondAttribute="centerX" id="7RS-ua-XzZ"/>
+                                <constraint firstItem="Zna-7n-kBz" firstAttribute="top" secondItem="xMh-lD-r6C" secondAttribute="top" id="RvY-z8-XI6"/>
+                            </constraints>
+                            <connections>
+                                <outlet property="textLabel" destination="Zna-7n-kBz" id="LK5-BR-skx"/>
+                            </connections>
+                        </collectionReusableView>
+                        <connections>
+                            <outlet property="dataSource" destination="y1A-Nm-mw7" id="U8O-CF-Jhv"/>
+                            <outlet property="delegate" destination="y1A-Nm-mw7" id="a8i-FA-aUq"/>
+                        </connections>
+                    </collectionView>
+                    <navigationItem key="navigationItem" title="App IDs" id="3Co-uv-Fhb">
+                        <barButtonItem key="leftBarButtonItem" style="plain" id="Aqs-QK-Ups">
+                            <view key="customView" contentMode="scaleToFill" id="p0q-Fg-3Ba">
+                                <rect key="frame" x="16" y="7" width="83" height="42"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                            </view>
+                        </barButtonItem>
+                        <barButtonItem key="rightBarButtonItem" style="done" systemItem="done" id="Ekd-oC-gOr">
+                            <connections>
+                                <segue destination="eS1-sQ-VUA" kind="unwind" unwindAction="unwindToMyAppsViewController:" id="VHS-kt-woS"/>
+                            </connections>
+                        </barButtonItem>
+                    </navigationItem>
+                    <connections>
+                        <outlet property="activityIndicatorBarButtonItem" destination="Aqs-QK-Ups" id="2I7-rT-muy"/>
+                    </connections>
+                </collectionViewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="Lvd-jC-AZO" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+                <exit id="eS1-sQ-VUA" userLabel="Exit" sceneMemberID="exit"/>
+            </objects>
+            <point key="canvasLocation" x="3301.5999999999999" y="715.59220389805103"/>
+        </scene>
         <!--News-->
         <scene sceneID="BV8-6J-nIv">
             <objects>
@@ -793,7 +911,132 @@ World</string>
             </objects>
             <point key="canvasLocation" x="962" y="-752"/>
         </scene>
+        <!--Navigation Controller-->
+        <scene sceneID="1Gj-mS-BaN">
+            <objects>
+                <navigationController automaticallyAdjustsScrollViewInsets="NO" id="IXk-qg-mFJ" sceneMemberID="viewController">
+                    <toolbarItems/>
+                    <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" largeTitles="YES" id="9sB-f3-Fnk">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="108"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                    </navigationBar>
+                    <nil name="viewControllers"/>
+                    <connections>
+                        <segue destination="y1A-Nm-mw7" kind="relationship" relationship="rootViewController" id="ZYf-6x-9a0"/>
+                    </connections>
+                </navigationController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="3LN-mt-qWn" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="2526" y="731"/>
+        </scene>
+        <!--Sources-->
+        <scene sceneID="0S1-zn-9KZ">
+            <objects>
+                <collectionViewController title="Sources" id="cHC-TX-KzQ" customClass="SourcesViewController" customModule="AltStore" customModuleProvider="target" sceneMemberID="viewController">
+                    <collectionView key="view" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" dataMode="prototypes" id="S36-hD-vu2">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="647"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                        <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="15" minimumInteritemSpacing="10" id="X20-b5-XEP">
+                            <size key="itemSize" width="375" height="80"/>
+                            <size key="headerReferenceSize" width="50" height="200"/>
+                            <size key="footerReferenceSize" width="0.0" height="0.0"/>
+                            <inset key="sectionInset" minX="0.0" minY="10" maxX="0.0" maxY="20"/>
+                        </collectionViewFlowLayout>
+                        <cells>
+                            <collectionViewCell opaque="NO" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" reuseIdentifier="Cell" id="XcN-o4-9qm" customClass="BannerCollectionViewCell" customModule="AltStore" customModuleProvider="target">
+                                <rect key="frame" x="0.0" y="210" width="375" height="80"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO">
+                                    <rect key="frame" x="0.0" y="0.0" width="375" height="80"/>
+                                    <autoresizingMask key="autoresizingMask"/>
+                                    <subviews>
+                                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="LW1-CC-bWu" customClass="AppBannerView" customModule="AltStore" customModuleProvider="target">
+                                            <rect key="frame" x="8" y="0.0" width="359" height="80"/>
+                                            <accessibility key="accessibilityConfiguration">
+                                                <bool key="isElement" value="YES"/>
+                                            </accessibility>
+                                        </view>
+                                    </subviews>
+                                </view>
+                                <constraints>
+                                    <constraint firstAttribute="bottom" secondItem="LW1-CC-bWu" secondAttribute="bottom" id="Pkr-zO-0wx"/>
+                                    <constraint firstItem="LW1-CC-bWu" firstAttribute="leading" secondItem="XcN-o4-9qm" secondAttribute="leadingMargin" id="egJ-X3-yEz"/>
+                                    <constraint firstItem="LW1-CC-bWu" firstAttribute="top" secondItem="XcN-o4-9qm" secondAttribute="top" id="glF-aM-4xQ"/>
+                                    <constraint firstAttribute="trailingMargin" secondItem="LW1-CC-bWu" secondAttribute="trailing" id="tQx-yV-LTq"/>
+                                </constraints>
+                                <connections>
+                                    <outlet property="bannerView" destination="LW1-CC-bWu" id="mwO-Ne-L1L"/>
+                                </connections>
+                            </collectionViewCell>
+                        </cells>
+                        <collectionReusableView key="sectionHeaderView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" reuseIdentifier="Header" id="8N7-JY-mcA" customClass="TextCollectionReusableView" customModule="AltStore" customModuleProvider="target">
+                            <rect key="frame" x="0.0" y="0.0" width="375" height="200"/>
+                            <autoresizingMask key="autoresizingMask"/>
+                            <subviews>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Manage sources to control which apps are available to download through AltStore." textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="TZv-TM-uJj">
+                                    <rect key="frame" x="8" y="14" width="359" height="171"/>
+                                    <fontDescription key="fontDescription" style="UICTFontTextStyleCallout"/>
+                                    <color key="textColor" white="0.5" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                    <nil key="highlightedColor"/>
+                                </label>
+                            </subviews>
+                            <constraints>
+                                <constraint firstItem="TZv-TM-uJj" firstAttribute="top" secondItem="8N7-JY-mcA" secondAttribute="top" constant="14" id="2zE-UV-24S"/>
+                                <constraint firstAttribute="bottom" secondItem="TZv-TM-uJj" secondAttribute="bottom" constant="15" id="Aml-PC-dko"/>
+                                <constraint firstAttribute="trailingMargin" secondItem="TZv-TM-uJj" secondAttribute="trailing" id="V0U-al-5eb"/>
+                                <constraint firstAttribute="leadingMargin" secondItem="TZv-TM-uJj" secondAttribute="leading" id="aS5-6Y-rMd"/>
+                            </constraints>
+                            <connections>
+                                <outlet property="textLabel" destination="TZv-TM-uJj" id="kWV-Wv-5gz"/>
+                            </connections>
+                        </collectionReusableView>
+                        <connections>
+                            <outlet property="dataSource" destination="cHC-TX-KzQ" id="VHQ-ls-gde"/>
+                            <outlet property="delegate" destination="cHC-TX-KzQ" id="MWr-Xg-N2k"/>
+                        </connections>
+                    </collectionView>
+                    <navigationItem key="navigationItem" title="Sources" id="QTB-W7-6BG">
+                        <barButtonItem key="leftBarButtonItem" systemItem="add" id="kBB-5c-8gw">
+                            <connections>
+                                <action selector="addSource" destination="cHC-TX-KzQ" id="WiB-Jg-NzT"/>
+                            </connections>
+                        </barButtonItem>
+                        <barButtonItem key="rightBarButtonItem" style="done" systemItem="done" id="NQF-u2-PZv">
+                            <connections>
+                                <segue destination="zjS-Nr-VTw" kind="unwind" unwindAction="unwindToBrowseViewController:" id="VFy-hV-mNV"/>
+                            </connections>
+                        </barButtonItem>
+                    </navigationItem>
+                </collectionViewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="TrV-p3-ZAt" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+                <exit id="zjS-Nr-VTw" userLabel="Exit" sceneMemberID="exit"/>
+            </objects>
+            <point key="canvasLocation" x="3302" y="1430"/>
+        </scene>
+        <!--Navigation Controller-->
+        <scene sceneID="6NV-LQ-gKB">
+            <objects>
+                <navigationController automaticallyAdjustsScrollViewInsets="NO" id="Qo4-72-Hmr" sceneMemberID="viewController">
+                    <toolbarItems/>
+                    <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" largeTitles="YES" id="mcx-oR-qPe">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="108"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                    </navigationBar>
+                    <nil name="viewControllers"/>
+                    <connections>
+                        <segue destination="cHC-TX-KzQ" kind="relationship" relationship="rootViewController" id="BC5-Fs-dCj"/>
+                    </connections>
+                </navigationController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="4mO-93-4qk" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="2526" y="1445"/>
+        </scene>
     </scenes>
+    <inferredMetricsTieBreakers>
+        <segue reference="cnd-KK-o60"/>
+    </inferredMetricsTieBreakers>
+    <color key="tintColor" name="Primary"/>
     <resources>
         <image name="Back" width="18" height="18"/>
         <image name="Browse" width="20" height="20"/>
@@ -810,8 +1053,4 @@ World</string>
             <color red="0.0039215686274509803" green="0.50196078431372548" blue="0.51764705882352946" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
     </resources>
-    <inferredMetricsTieBreakers>
-        <segue reference="dzt-2e-VM9"/>
-    </inferredMetricsTieBreakers>
-    <color key="tintColor" name="Primary"/>
 </document>

AltStore/Browse/BrowseViewController.swift

@@ -31,6 +31,14 @@ class BrowseViewController: UICollectionViewController
     {
         super.viewDidLoad()
         
+        #if BETA
+        self.dataSource.searchController.searchableKeyPaths = [#keyPath(InstalledApp.name)]
+        self.navigationItem.searchController = self.dataSource.searchController
+        #else
+        // Hide Sources button for public version while in beta.
+        self.navigationItem.rightBarButtonItem = nil
+        #endif
+        
         self.prototypeCell.contentView.translatesAutoresizingMaskIntoConstraints = false
         
         self.collectionView.register(BrowseCollectionViewCell.nib, forCellWithReuseIdentifier: RSTCellContentGenericCellIdentifier)
@@ -50,6 +58,11 @@ class BrowseViewController: UICollectionViewController
         self.fetchSource()
         self.updateDataSource()
     }
+    
+    @IBAction private func unwindToBrowseViewController(_ segue: UIStoryboardSegue)
+    {
+        self.fetchSource()
+    }
 }
 
 private extension BrowseViewController
@@ -57,17 +70,12 @@ private extension BrowseViewController
     func makeDataSource() -> RSTFetchedResultsCollectionViewPrefetchingDataSource<StoreApp, UIImage>
     {
         let fetchRequest = StoreApp.fetchRequest() as NSFetchRequest<StoreApp>
-        fetchRequest.sortDescriptors = [NSSortDescriptor(keyPath: \StoreApp.sortIndex, ascending: true), NSSortDescriptor(keyPath: \StoreApp.name, ascending: true)]
+        fetchRequest.sortDescriptors = [NSSortDescriptor(keyPath: \StoreApp.sourceIdentifier, ascending: true),
+                                        NSSortDescriptor(keyPath: \StoreApp.sortIndex, ascending: true),
+                                        NSSortDescriptor(keyPath: \StoreApp.name, ascending: true),
+                                        NSSortDescriptor(keyPath: \StoreApp.bundleIdentifier, ascending: true)]
         fetchRequest.returnsObjectsAsFaults = false
-        
-        if let source = Source.fetchAltStoreSource(in: DatabaseManager.shared.viewContext)
-        {
-            fetchRequest.predicate = NSPredicate(format: "%K != %@ AND %K == %@", #keyPath(StoreApp.bundleIdentifier), StoreApp.altstoreAppID, #keyPath(StoreApp.source), source)
-        }
-        else
-        {
-            fetchRequest.predicate = NSPredicate(format: "%K != %@", #keyPath(StoreApp.bundleIdentifier), StoreApp.altstoreAppID)
-        }
+        fetchRequest.predicate = NSPredicate(format: "%K != %@", #keyPath(StoreApp.bundleIdentifier), StoreApp.altstoreAppID)
         
         let dataSource = RSTFetchedResultsCollectionViewPrefetchingDataSource<StoreApp, UIImage>(fetchRequest: fetchRequest, managedObjectContext: DatabaseManager.shared.viewContext)
         dataSource.cellConfigurationHandler = { (cell, app, indexPath) in
@@ -167,23 +175,25 @@ private extension BrowseViewController
     {
         self.loadingState = .loading
         
-        AppManager.shared.fetchSource() { (result) in
+        AppManager.shared.fetchSources() { (result) in
             do
             {
-                let source = try result.get()
-                try source.managedObjectContext?.save()
+                let sources = try result.get()
+                try sources.first?.managedObjectContext?.save()
                 
                 DispatchQueue.main.async {
                     self.loadingState = .finished(.success(()))
                 }
             }
-            catch
+            catch let error as NSError
             {
                 DispatchQueue.main.async {
                     if self.dataSource.itemCount > 0
                     {
-                        let toastView = ToastView(text: error.localizedDescription, detailText: nil)
-                        toastView.show(in: self.navigationController?.view ?? self.view, duration: 2.0)
+                        let error = error.withLocalizedFailure(NSLocalizedString("Failed to Fetch Sources", comment: ""))
+                        
+                        let toastView = ToastView(error: error)
+                        toastView.show(in: self)
                     }
                     
                     self.loadingState = .finished(.failure(error))
@@ -255,8 +265,8 @@ private extension BrowseViewController
                 {
                 case .failure(OperationError.cancelled): break // Ignore
                 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)
                 
                 case .success: print("Installed app:", app.bundleIdentifier)
                 }

AltStore/Components/AppBannerView.swift

@@ -11,6 +11,8 @@ import Roxas
 
 class AppBannerView: RSTNibView
 {
+    private var originalTintColor: UIColor?
+    
     @IBOutlet var titleLabel: UILabel!
     @IBOutlet var subtitleLabel: UILabel!
     @IBOutlet var iconImageView: AppIconImageView!
@@ -25,6 +27,11 @@ class AppBannerView: RSTNibView
     {
         super.tintColorDidChange()
         
+        if self.tintAdjustmentMode != .dimmed
+        {
+            self.originalTintColor = self.tintColor
+        }
+        
         self.update()
     }
 }
@@ -36,9 +43,7 @@ private extension AppBannerView
         self.clipsToBounds = true
         self.layer.cornerRadius = 22
         
-        self.subtitleLabel.textColor = self.tintColor
-        self.button.tintColor = self.tintColor
-        
-        self.backgroundEffectView.backgroundColor = self.tintColor
+        self.subtitleLabel.textColor = self.originalTintColor ?? self.tintColor        
+        self.backgroundEffectView.backgroundColor = self.originalTintColor ?? self.tintColor
     }
 }

AltStore/Components/AppBannerView.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15400" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15404"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -45,7 +45,7 @@
                             </constraints>
                         </imageView>
                         <stackView opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="100" insetsLayoutMarginsFromSafeArea="NO" axis="vertical" alignment="top" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="caL-vN-Svn">
-                            <rect key="frame" x="85" y="18" width="195" height="52"/>
+                            <rect key="frame" x="85" y="18" width="190" height="52"/>
                             <subviews>
                                 <stackView opaque="NO" contentMode="scaleToFill" horizontalCompressionResistancePriority="500" spacing="6" translatesAutoresizingMaskIntoConstraints="NO" id="1Es-pv-zwd">
                                     <rect key="frame" x="0.0" y="0.0" width="167" height="34"/>
@@ -67,13 +67,13 @@
                                     </subviews>
                                 </stackView>
                                 <visualEffectView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fC4-1V-iMn">
-                                    <rect key="frame" x="0.0" y="36" width="195" height="16"/>
+                                    <rect key="frame" x="0.0" y="36" width="190" height="16"/>
                                     <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" id="LQh-pN-ePC">
-                                        <rect key="frame" x="0.0" y="0.0" width="195" height="16"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="190" height="16"/>
                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="100" verticalHuggingPriority="750" text="Developer" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="oN5-vu-Dnw">
-                                                <rect key="frame" x="0.0" y="0.0" width="195" height="16"/>
+                                                <rect key="frame" x="0.0" y="0.0" width="190" height="16"/>
                                                 <accessibility key="accessibilityConfiguration" label="Developer"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                                 <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -94,20 +94,20 @@
                             </subviews>
                         </stackView>
                         <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="3ox-Q2-Rnd" userLabel="Button Stack View">
-                            <rect key="frame" x="291" y="28.5" width="72" height="31"/>
+                            <rect key="frame" x="286" y="28.5" width="77" height="31"/>
                             <subviews>
                                 <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Yd9-jw-faD">
-                                    <rect key="frame" x="0.0" y="0.0" width="72" height="0.0"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="77" height="0.0"/>
                                     <fontDescription key="fontDescription" type="system" weight="medium" pointSize="10"/>
                                     <color key="textColor" systemColor="secondaryLabelColor" red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
                                     <nil key="highlightedColor"/>
                                 </label>
-                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="tVx-3G-dcu" customClass="PillButton" customModule="AltStore" customModuleProvider="target">
-                                    <rect key="frame" x="0.0" y="0.0" width="72" height="31"/>
+                                <button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="900" horizontalCompressionResistancePriority="900" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="tVx-3G-dcu" customClass="PillButton" customModule="AltStore" customModuleProvider="target">
+                                    <rect key="frame" x="0.0" y="0.0" width="77" height="31"/>
                                     <color key="backgroundColor" red="0.22352941179999999" green="0.4941176471" blue="0.39607843139999999" alpha="0.10000000000000001" colorSpace="custom" customColorSpace="sRGB"/>
                                     <constraints>
                                         <constraint firstAttribute="height" constant="31" id="Zwh-yQ-GTu"/>
-                                        <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="72" id="eGc-Dk-QbL"/>
+                                        <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="77" id="eGc-Dk-QbL"/>
                                     </constraints>
                                     <fontDescription key="fontDescription" type="boldSystem" pointSize="14"/>
                                     <state key="normal" title="FREE"/>
@@ -135,7 +135,7 @@
     <resources>
         <image name="BetaBadge" width="41" height="17"/>
         <namedColor name="BlurTint">
-            <color red="1" green="1" blue="1" alpha="0.29999999999999999" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="1" green="1" blue="1" alpha="0.30000001192092896" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
     </resources>
 </document>

AltStore/Components/BannerCollectionViewCell.swift

@@ -0,0 +1,22 @@
+//
+//  BannerCollectionViewCell.swift
+//  AltStore
+//
+//  Created by Riley Testut on 3/23/20.
+//  Copyright © 2020 Riley Testut. All rights reserved.
+//
+
+import UIKit
+
+class BannerCollectionViewCell: UICollectionViewCell
+{
+    @IBOutlet var bannerView: AppBannerView!
+    
+    override func awakeFromNib()
+    {
+        super.awakeFromNib()
+        
+        self.contentView.autoresizingMask = [.flexibleWidth, .flexibleHeight]
+        self.contentView.preservesSuperviewLayoutMargins = true
+    }
+}

AltStore/Components/Keychain.swift

@@ -71,6 +71,9 @@ class Keychain
     @KeychainItem(key: "patreonRefreshToken")
     var patreonRefreshToken: String?
     
+    @KeychainItem(key: "patreonCreatorAccessToken")
+    var patreonCreatorAccessToken: String?
+    
     private init()
     {
     }

AltStore/Components/TextCollectionReusableView.swift

@@ -0,0 +1,14 @@
+//
+//  TextCollectionReusableView.swift
+//  AltStore
+//
+//  Created by Riley Testut on 3/23/20.
+//  Copyright © 2020 Riley Testut. All rights reserved.
+//
+
+import UIKit
+
+class TextCollectionReusableView: UICollectionReusableView
+{
+    @IBOutlet var textLabel: UILabel!
+}

AltStore/Components/ToastView.swift

@@ -10,11 +10,56 @@ import Roxas
 
 class ToastView: RSTToastView
 {
+    var preferredDuration: TimeInterval
+    
     override init(text: String, detailText detailedText: String?)
     {
+        if detailedText == nil
+        {
+            self.preferredDuration = 4.0
+        }
+        else
+        {
+            self.preferredDuration = 8.0
+        }
+        
         super.init(text: text, detailText: detailedText)
         
-        self.layoutMargins = UIEdgeInsets(top: 6, left: 12, bottom: 6, right: 12)
+        self.layoutMargins = UIEdgeInsets(top: 8, left: 16, bottom: 10, right: 16)
+        self.setNeedsLayout()
+        
+        if let stackView = self.textLabel.superview as? UIStackView
+        {
+            // RSTToastView does not expose stack view containing labels,
+            // so we access it indirectly as the labels' superview.
+            stackView.spacing = (detailedText != nil) ? 4.0 : 0.0
+        }
+    }
+    
+    convenience init(error: Error)
+    {
+        let error = error as NSError
+        
+        let text: String
+        let detailText: String?
+        
+        if let failure = error.localizedFailure
+        {
+            text = failure
+            detailText = error.localizedFailureReason ?? error.localizedRecoverySuggestion ?? error.localizedDescription
+        }
+        else if let reason = error.localizedFailureReason
+        {
+            text = reason
+            detailText = error.localizedRecoverySuggestion
+        }
+        else
+        {
+            text = error.localizedDescription
+            detailText = nil
+        }
+        
+        self.init(text: text, detailText: detailText)
     }
     
     required init(coder aDecoder: NSCoder) {
@@ -25,6 +70,18 @@ class ToastView: RSTToastView
     {
         super.layoutSubviews()
         
-        self.layer.cornerRadius = 16
+        // Rough calculation to determine height of ToastView with one-line textLabel.
+        let minimumHeight = self.textLabel.font.lineHeight.rounded() + 18
+        self.layer.cornerRadius = minimumHeight/2
+    }
+    
+    func show(in viewController: UIViewController)
+    {
+        self.show(in: viewController.navigationController?.view ?? viewController.view, duration: self.preferredDuration)
+    }
+    
+    override func show(in view: UIView)
+    {
+        self.show(in: view, duration: self.preferredDuration)
     }
 }

AltStore/Extensions/FileManager+DirectorySize.swift

@@ -0,0 +1,36 @@
+//
+//  FileManager+DirectorySize.swift
+//  AltStore
+//
+//  Created by Riley Testut on 3/31/20.
+//  Copyright © 2020 Riley Testut. All rights reserved.
+//
+
+import Foundation
+
+extension FileManager
+{
+    func directorySize(at directoryURL: URL) -> Int?
+    {
+        guard let enumerator = FileManager.default.enumerator(at: directoryURL, includingPropertiesForKeys: [.fileSizeKey]) else { return nil }
+        
+        var total: Int = 0
+        
+        for case let fileURL as URL in enumerator
+        {
+            do
+            {
+                let resourceValues = try fileURL.resourceValues(forKeys: [.fileSizeKey])
+                guard let fileSize = resourceValues.fileSize else { continue }
+                
+                total += fileSize
+            }
+            catch
+            {
+                print("Failed to read file size for item: \(fileURL).", error)
+            }
+        }
+        
+        return total
+    }
+}

AltStore/Extensions/JSONDecoder+ManagedObjectContext.swift

@@ -1,36 +0,0 @@
-//
-//  JSONDecoder+ManagedObjectContext.swift
-//  Harmony
-//
-//  Created by Riley Testut on 10/3/18.
-//  Copyright © 2018 Riley Testut. All rights reserved.
-//
-
-import Foundation
-import CoreData
-
-private extension CodingUserInfoKey
-{
-    static let managedObjectContext = CodingUserInfoKey(rawValue: "managedObjectContext")!
-}
-
-public extension JSONDecoder
-{
-    var managedObjectContext: NSManagedObjectContext? {
-        get {
-            let managedObjectContext = self.userInfo[.managedObjectContext] as? NSManagedObjectContext
-            return managedObjectContext
-        }
-        set {
-            self.userInfo[.managedObjectContext] = newValue
-        }
-    }
-}
-
-public extension Decoder
-{
-    var managedObjectContext: NSManagedObjectContext? {
-        let managedObjectContext = self.userInfo[.managedObjectContext] as? NSManagedObjectContext
-        return managedObjectContext
-    }
-}

AltStore/Extensions/JSONDecoder+Properties.swift

@@ -0,0 +1,64 @@
+//
+//  JSONDecoder+Properties.swift
+//  Harmony
+//
+//  Created by Riley Testut on 10/3/18.
+//  Copyright © 2018 Riley Testut. All rights reserved.
+//
+
+import Foundation
+import CoreData
+
+extension CodingUserInfoKey
+{
+    static let managedObjectContext = CodingUserInfoKey(rawValue: "managedObjectContext")!
+    static let sourceURL = CodingUserInfoKey(rawValue: "sourceURL")!
+}
+
+public final class JSONDecoder: Foundation.JSONDecoder
+{
+    @DecoderItem(key: .managedObjectContext)
+    var managedObjectContext: NSManagedObjectContext?
+    
+    @DecoderItem(key: .sourceURL)
+    var sourceURL: URL?
+}
+
+extension Decoder
+{
+    var managedObjectContext: NSManagedObjectContext? { self.userInfo[.managedObjectContext] as? NSManagedObjectContext }
+    var sourceURL: URL? { self.userInfo[.sourceURL] as? URL }
+}
+
+@propertyWrapper
+struct DecoderItem<Value>
+{
+    let key: CodingUserInfoKey
+    
+    var wrappedValue: Value? {
+        get { fatalError("only works on instance properties of classes") }
+        set { fatalError("only works on instance properties of classes") }
+    }
+    
+    init(key: CodingUserInfoKey)
+    {
+        self.key = key
+    }
+    
+    public static subscript<OuterSelf: JSONDecoder>(
+        _enclosingInstance decoder: OuterSelf,
+        wrapped wrappedKeyPath: ReferenceWritableKeyPath<OuterSelf, Value?>,
+        storage storageKeyPath: ReferenceWritableKeyPath<OuterSelf, Self>
+    ) -> Value? {
+        get {
+            let wrapper = decoder[keyPath: storageKeyPath]
+
+            let value = decoder.userInfo[wrapper.key] as? Value
+            return value
+        }
+        set {
+            let wrapper = decoder[keyPath: storageKeyPath]
+            decoder.userInfo[wrapper.key] = newValue
+        }
+    }
+}

AltStore/Extensions/NSError+LocalizedFailure.swift

@@ -0,0 +1,27 @@
+//
+//  NSError+LocalizedFailure.swift
+//  AltStore
+//
+//  Created by Riley Testut on 3/11/20.
+//  Copyright © 2020 Riley Testut. All rights reserved.
+//
+
+import Foundation
+
+extension NSError
+{
+    @objc(alt_localizedFailure)
+    var localizedFailure: String? {
+        let localizedFailure = (self.userInfo[NSLocalizedFailureErrorKey] as? String) ?? (NSError.userInfoValueProvider(forDomain: self.domain)?(self, NSLocalizedFailureErrorKey) as? String)
+        return localizedFailure
+    }
+    
+    func withLocalizedFailure(_ failure: String) -> NSError
+    {
+        var userInfo = self.userInfo
+        userInfo[NSLocalizedFailureErrorKey] = failure
+        
+        let error = NSError(domain: self.domain, code: self.code, userInfo: userInfo)
+        return error
+    }
+}

AltStore/Extensions/UIColor+Hex.swift

@@ -10,6 +10,17 @@ import UIKit
 
 extension UIColor
 {
+    // Borrowed from https://stackoverflow.com/a/26341062
+    var hexString: String {
+        let components = self.cgColor.components
+        let r: CGFloat = components?[0] ?? 0.0
+        let g: CGFloat = components?[1] ?? 0.0
+        let b: CGFloat = components?[2] ?? 0.0
+
+        let hexString = String.init(format: "%02lX%02lX%02lX", lroundf(Float(r * 255)), lroundf(Float(g * 255)), lroundf(Float(b * 255)))
+        return hexString
+    }
+    
     // Borrowed from https://stackoverflow.com/a/33397427
     convenience init?(hexString: String)
     {

AltStore/Extensions/UserDefaults+AltStore.swift

@@ -20,6 +20,25 @@ extension UserDefaults
     @NSManaged var isDebugModeEnabled: Bool
     @NSManaged var presentedLaunchReminderNotification: Bool
     
+    @NSManaged var legacySideloadedApps: [String]?
+    
+    var activeAppsLimit: Int? {
+        get {
+            return self._activeAppsLimit?.intValue
+        }
+        set {
+            if let value = newValue
+            {
+                self._activeAppsLimit = NSNumber(value: value)
+            }
+            else
+            {
+                self._activeAppsLimit = nil
+            }
+        }
+    }
+    @NSManaged @objc(activeAppsLimit) private var _activeAppsLimit: NSNumber?
+    
     func registerDefaults()
     {
         self.register(defaults: [#keyPath(UserDefaults.isBackgroundRefreshEnabled): true])

AltStore/Info.plist

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>ALTDeviceID</key>
-	<string>1c3416b7b0ab68773e6e7eb7f0d110f7c9353acc</string>
+	<string>00008030-001948590202802E</string>
 	<key>ALTServerID</key>
 	<string>1AAAB6FD-E8CE-4B70-8F26-4073215C03B0</string>
 	<key>CFBundleDevelopmentRegion</key>

AltStore/LaunchViewController.swift

@@ -11,6 +11,10 @@ import Roxas
 
 class LaunchViewController: RSTLaunchViewController
 {
+    private var didFinishLaunching = false
+    
+    private var destinationViewController: UIViewController!
+    
     override var launchConditions: [RSTLaunchCondition] {
         let isDatabaseStarted = RSTLaunchCondition(condition: { DatabaseManager.shared.isStarted }) { (completionHandler) in
             DatabaseManager.shared.start(completionHandler: completionHandler)
@@ -18,6 +22,22 @@ class LaunchViewController: RSTLaunchViewController
 
         return [isDatabaseStarted]
     }
+    
+    override var childForStatusBarStyle: UIViewController? {
+        return self.children.first
+    }
+    
+    override var childForStatusBarHidden: UIViewController? {
+        return self.children.first
+    }
+    
+    override func viewDidLoad()
+    {
+        super.viewDidLoad()
+        
+        // Create destinationViewController now so view controllers can register for receiving Notifications.
+        self.destinationViewController = self.storyboard!.instantiateViewController(withIdentifier: "tabBarController") as! TabBarController
+    }
 }
 
 extension LaunchViewController
@@ -44,9 +64,23 @@ extension LaunchViewController
     {
         super.finishLaunching()
         
+        guard !self.didFinishLaunching else { return }
+        
         AppManager.shared.update()
         PatreonAPI.shared.refreshPatreonAccount()
         
-        self.performSegue(withIdentifier: "finishLaunching", sender: nil)
+        // Add view controller as child (rather than presenting modally)
+        // so tint adjustment + card presentations works correctly.
+        self.destinationViewController.view.frame = CGRect(x: 0, y: 0, width: self.view.bounds.width, height: self.view.bounds.height)
+        self.destinationViewController.view.alpha = 0.0
+        self.addChild(self.destinationViewController)
+        self.view.addSubview(self.destinationViewController.view, pinningEdgesWith: .zero)
+        self.destinationViewController.didMove(toParent: self)
+        
+        UIView.animate(withDuration: 0.2) {
+            self.destinationViewController.view.alpha = 1.0
+        }
+        
+        self.didFinishLaunching = true
     }
 }

AltStore/Model/Account.swift

@@ -44,6 +44,11 @@ class Account: NSManagedObject, Fetchable
     {
         super.init(entity: Account.entity(), insertInto: context)
         
+        self.update(account: account)
+    }
+    
+    func update(account: ALTAccount)
+    {
         self.appleID = account.appleID
         self.identifier = account.identifier
         

AltStore/Model/AltStore.xcdatamodeld/.xccurrentversion

@@ -3,6 +3,6 @@
 <plist version="1.0">
 <dict>
 	<key>_XCCurrentVersionName</key>
-	<string>AltStore 2.xcdatamodel</string>
+	<string>AltStore 6.xcdatamodel</string>
 </dict>
 </plist>

AltStore/Model/AltStore.xcdatamodeld/AltStore 3.xcdatamodel/contents

@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="15702" systemVersion="19C57" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
+    <entity name="Account" representedClassName="Account" syncable="YES">
+        <attribute name="appleID" attributeType="String"/>
+        <attribute name="firstName" attributeType="String"/>
+        <attribute name="identifier" attributeType="String"/>
+        <attribute name="isActiveAccount" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
+        <attribute name="lastName" attributeType="String"/>
+        <relationship name="teams" toMany="YES" deletionRule="Cascade" destinationEntity="Team" inverseName="account" inverseEntity="Team"/>
+        <uniquenessConstraints>
+            <uniquenessConstraint>
+                <constraint value="identifier"/>
+            </uniquenessConstraint>
+        </uniquenessConstraints>
+    </entity>
+    <entity name="AppPermission" representedClassName="AppPermission" syncable="YES">
+        <attribute name="type" attributeType="String"/>
+        <attribute name="usageDescription" attributeType="String"/>
+        <relationship name="app" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="StoreApp" inverseName="permissions" inverseEntity="StoreApp"/>
+    </entity>
+    <entity name="InstalledApp" representedClassName="InstalledApp" syncable="YES">
+        <attribute name="bundleIdentifier" attributeType="String"/>
+        <attribute name="expirationDate" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="installedDate" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="name" attributeType="String"/>
+        <attribute name="refreshedDate" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="resignedBundleIdentifier" attributeType="String"/>
+        <attribute name="version" attributeType="String"/>
+        <relationship name="appExtensions" toMany="YES" deletionRule="Cascade" destinationEntity="InstalledExtension" inverseName="parentApp" inverseEntity="InstalledExtension"/>
+        <relationship name="storeApp" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="StoreApp" inverseName="installedApp" inverseEntity="StoreApp"/>
+        <relationship name="team" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Team" inverseName="installedApps" inverseEntity="Team"/>
+        <uniquenessConstraints>
+            <uniquenessConstraint>
+                <constraint value="bundleIdentifier"/>
+            </uniquenessConstraint>
+        </uniquenessConstraints>
+    </entity>
+    <entity name="InstalledExtension" representedClassName="InstalledExtension" syncable="YES">
+        <attribute name="bundleIdentifier" attributeType="String"/>
+        <attribute name="expirationDate" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="installedDate" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="name" attributeType="String"/>
+        <attribute name="refreshedDate" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="resignedBundleIdentifier" attributeType="String"/>
+        <attribute name="version" attributeType="String"/>
+        <relationship name="parentApp" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="InstalledApp" inverseName="appExtensions" inverseEntity="InstalledApp"/>
+    </entity>
+    <entity name="NewsItem" representedClassName="NewsItem" syncable="YES">
+        <attribute name="appID" optional="YES" attributeType="String"/>
+        <attribute name="caption" attributeType="String"/>
+        <attribute name="date" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="externalURL" optional="YES" attributeType="URI"/>
+        <attribute name="identifier" attributeType="String"/>
+        <attribute name="imageURL" optional="YES" attributeType="URI"/>
+        <attribute name="isSilent" attributeType="Boolean" defaultValueString="YES" usesScalarValueType="YES"/>
+        <attribute name="sortIndex" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
+        <attribute name="tintColor" optional="YES" attributeType="Transformable"/>
+        <attribute name="title" attributeType="String"/>
+        <relationship name="source" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Source" inverseName="newsItems" inverseEntity="Source"/>
+        <relationship name="storeApp" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="StoreApp" inverseName="newsItems" inverseEntity="StoreApp"/>
+        <uniquenessConstraints>
+            <uniquenessConstraint>
+                <constraint value="identifier"/>
+            </uniquenessConstraint>
+        </uniquenessConstraints>
+    </entity>
+    <entity name="PatreonAccount" representedClassName="PatreonAccount" syncable="YES">
+        <attribute name="firstName" optional="YES" attributeType="String"/>
+        <attribute name="identifier" attributeType="String"/>
+        <attribute name="isPatron" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
+        <attribute name="name" attributeType="String"/>
+        <uniquenessConstraints>
+            <uniquenessConstraint>
+                <constraint value="identifier"/>
+            </uniquenessConstraint>
+        </uniquenessConstraints>
+    </entity>
+    <entity name="RefreshAttempt" representedClassName="RefreshAttempt" syncable="YES">
+        <attribute name="date" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="errorDescription" optional="YES" attributeType="String"/>
+        <attribute name="identifier" attributeType="String"/>
+        <attribute name="isSuccess" attributeType="Boolean" defaultValueString="YES" usesScalarValueType="YES"/>
+        <uniquenessConstraints>
+            <uniquenessConstraint>
+                <constraint value="identifier"/>
+            </uniquenessConstraint>
+        </uniquenessConstraints>
+    </entity>
+    <entity name="Source" representedClassName="Source" syncable="YES">
+        <attribute name="identifier" attributeType="String"/>
+        <attribute name="name" attributeType="String"/>
+        <attribute name="sourceURL" attributeType="URI"/>
+        <relationship name="apps" toMany="YES" deletionRule="Nullify" ordered="YES" destinationEntity="StoreApp" inverseName="source" inverseEntity="StoreApp"/>
+        <relationship name="newsItems" toMany="YES" deletionRule="Nullify" ordered="YES" destinationEntity="NewsItem" inverseName="source" inverseEntity="NewsItem"/>
+        <uniquenessConstraints>
+            <uniquenessConstraint>
+                <constraint value="identifier"/>
+            </uniquenessConstraint>
+        </uniquenessConstraints>
+    </entity>
+    <entity name="StoreApp" representedClassName="StoreApp" syncable="YES">
+        <attribute name="bundleIdentifier" attributeType="String"/>
+        <attribute name="developerName" attributeType="String"/>
+        <attribute name="downloadURL" attributeType="URI"/>
+        <attribute name="iconURL" attributeType="URI"/>
+        <attribute name="isBeta" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
+        <attribute name="localizedDescription" attributeType="String"/>
+        <attribute name="name" attributeType="String"/>
+        <attribute name="screenshotURLs" attributeType="Transformable"/>
+        <attribute name="size" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
+        <attribute name="sortIndex" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
+        <attribute name="subtitle" optional="YES" attributeType="String"/>
+        <attribute name="tintColor" optional="YES" attributeType="Transformable"/>
+        <attribute name="version" attributeType="String"/>
+        <attribute name="versionDate" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="versionDescription" optional="YES" attributeType="String"/>
+        <relationship name="installedApp" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="InstalledApp" inverseName="storeApp" inverseEntity="InstalledApp"/>
+        <relationship name="newsItems" toMany="YES" deletionRule="Nullify" destinationEntity="NewsItem" inverseName="storeApp" inverseEntity="NewsItem"/>
+        <relationship name="permissions" toMany="YES" deletionRule="Cascade" ordered="YES" destinationEntity="AppPermission" inverseName="app" inverseEntity="AppPermission"/>
+        <relationship name="source" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Source" inverseName="apps" inverseEntity="Source"/>
+        <uniquenessConstraints>
+            <uniquenessConstraint>
+                <constraint value="bundleIdentifier"/>
+            </uniquenessConstraint>
+        </uniquenessConstraints>
+    </entity>
+    <entity name="Team" representedClassName="Team" syncable="YES">
+        <attribute name="identifier" attributeType="String"/>
+        <attribute name="isActiveTeam" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
+        <attribute name="name" attributeType="String"/>
+        <attribute name="type" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="YES"/>
+        <relationship name="account" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Account" inverseName="teams" inverseEntity="Account"/>
+        <relationship name="installedApps" toMany="YES" deletionRule="Nullify" destinationEntity="InstalledApp" inverseName="team" inverseEntity="InstalledApp"/>
+        <uniquenessConstraints>
+            <uniquenessConstraint>
+                <constraint value="identifier"/>
+            </uniquenessConstraint>
+        </uniquenessConstraints>
+    </entity>
+    <elements>
+        <element name="Account" positionX="-36" positionY="90" width="128" height="135"/>
+        <element name="AppPermission" positionX="-45" positionY="90" width="128" height="90"/>
+        <element name="InstalledApp" positionX="-63" positionY="0" width="128" height="193"/>
+        <element name="InstalledExtension" positionX="-45" positionY="135" width="128" height="163"/>
+        <element name="NewsItem" positionX="-45" positionY="126" width="128" height="225"/>
+        <element name="PatreonAccount" positionX="-45" positionY="117" width="128" height="105"/>
+        <element name="RefreshAttempt" positionX="-45" positionY="117" width="128" height="105"/>
+        <element name="Source" positionX="-45" positionY="99" width="128" height="120"/>
+        <element name="StoreApp" positionX="-63" positionY="-18" width="128" height="330"/>
+        <element name="Team" positionX="-45" positionY="81" width="128" height="133"/>
+    </elements>
+</model>

AltStore/Model/AltStore.xcdatamodeld/AltStore 4.xcdatamodel/contents

@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="15702" systemVersion="19C57" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
+    <entity name="Account" representedClassName="Account" syncable="YES">
+        <attribute name="appleID" attributeType="String"/>
+        <attribute name="firstName" attributeType="String"/>
+        <attribute name="identifier" attributeType="String"/>
+        <attribute name="isActiveAccount" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
+        <attribute name="lastName" attributeType="String"/>
+        <relationship name="teams" toMany="YES" deletionRule="Cascade" destinationEntity="Team" inverseName="account" inverseEntity="Team"/>
+        <uniquenessConstraints>
+            <uniquenessConstraint>
+                <constraint value="identifier"/>
+            </uniquenessConstraint>
+        </uniquenessConstraints>
+    </entity>
+    <entity name="AppID" representedClassName="AppID" syncable="YES">
+        <attribute name="bundleIdentifier" attributeType="String"/>
+        <attribute name="expirationDate" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="features" attributeType="Transformable"/>
+        <attribute name="identifier" attributeType="String"/>
+        <attribute name="name" attributeType="String"/>
+        <relationship name="team" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Team" inverseName="appIDs" inverseEntity="Team"/>
+        <uniquenessConstraints>
+            <uniquenessConstraint>
+                <constraint value="identifier"/>
+            </uniquenessConstraint>
+        </uniquenessConstraints>
+    </entity>
+    <entity name="AppPermission" representedClassName="AppPermission" syncable="YES">
+        <attribute name="type" attributeType="String"/>
+        <attribute name="usageDescription" attributeType="String"/>
+        <relationship name="app" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="StoreApp" inverseName="permissions" inverseEntity="StoreApp"/>
+    </entity>
+    <entity name="InstalledApp" representedClassName="InstalledApp" syncable="YES">
+        <attribute name="bundleIdentifier" attributeType="String"/>
+        <attribute name="expirationDate" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="installedDate" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="name" attributeType="String"/>
+        <attribute name="refreshedDate" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="resignedBundleIdentifier" attributeType="String"/>
+        <attribute name="version" attributeType="String"/>
+        <relationship name="appExtensions" toMany="YES" deletionRule="Cascade" destinationEntity="InstalledExtension" inverseName="parentApp" inverseEntity="InstalledExtension"/>
+        <relationship name="storeApp" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="StoreApp" inverseName="installedApp" inverseEntity="StoreApp"/>
+        <relationship name="team" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Team" inverseName="installedApps" inverseEntity="Team"/>
+        <uniquenessConstraints>
+            <uniquenessConstraint>
+                <constraint value="bundleIdentifier"/>
+            </uniquenessConstraint>
+        </uniquenessConstraints>
+    </entity>
+    <entity name="InstalledExtension" representedClassName="InstalledExtension" syncable="YES">
+        <attribute name="bundleIdentifier" attributeType="String"/>
+        <attribute name="expirationDate" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="installedDate" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="name" attributeType="String"/>
+        <attribute name="refreshedDate" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="resignedBundleIdentifier" attributeType="String"/>
+        <attribute name="version" attributeType="String"/>
+        <relationship name="parentApp" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="InstalledApp" inverseName="appExtensions" inverseEntity="InstalledApp"/>
+    </entity>
+    <entity name="NewsItem" representedClassName="NewsItem" syncable="YES">
+        <attribute name="appID" optional="YES" attributeType="String"/>
+        <attribute name="caption" attributeType="String"/>
+        <attribute name="date" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="externalURL" optional="YES" attributeType="URI"/>
+        <attribute name="identifier" attributeType="String"/>
+        <attribute name="imageURL" optional="YES" attributeType="URI"/>
+        <attribute name="isSilent" attributeType="Boolean" defaultValueString="YES" usesScalarValueType="YES"/>
+        <attribute name="sortIndex" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
+        <attribute name="tintColor" optional="YES" attributeType="Transformable"/>
+        <attribute name="title" attributeType="String"/>
+        <relationship name="source" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Source" inverseName="newsItems" inverseEntity="Source"/>
+        <relationship name="storeApp" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="StoreApp" inverseName="newsItems" inverseEntity="StoreApp"/>
+        <uniquenessConstraints>
+            <uniquenessConstraint>
+                <constraint value="identifier"/>
+            </uniquenessConstraint>
+        </uniquenessConstraints>
+    </entity>
+    <entity name="PatreonAccount" representedClassName="PatreonAccount" syncable="YES">
+        <attribute name="firstName" optional="YES" attributeType="String"/>
+        <attribute name="identifier" attributeType="String"/>
+        <attribute name="isPatron" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
+        <attribute name="name" attributeType="String"/>
+        <uniquenessConstraints>
+            <uniquenessConstraint>
+                <constraint value="identifier"/>
+            </uniquenessConstraint>
+        </uniquenessConstraints>
+    </entity>
+    <entity name="RefreshAttempt" representedClassName="RefreshAttempt" syncable="YES">
+        <attribute name="date" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="errorDescription" optional="YES" attributeType="String"/>
+        <attribute name="identifier" attributeType="String"/>
+        <attribute name="isSuccess" attributeType="Boolean" defaultValueString="YES" usesScalarValueType="YES"/>
+        <uniquenessConstraints>
+            <uniquenessConstraint>
+                <constraint value="identifier"/>
+            </uniquenessConstraint>
+        </uniquenessConstraints>
+    </entity>
+    <entity name="Source" representedClassName="Source" syncable="YES">
+        <attribute name="identifier" attributeType="String"/>
+        <attribute name="name" attributeType="String"/>
+        <attribute name="sourceURL" attributeType="URI"/>
+        <relationship name="apps" toMany="YES" deletionRule="Nullify" ordered="YES" destinationEntity="StoreApp" inverseName="source" inverseEntity="StoreApp"/>
+        <relationship name="newsItems" toMany="YES" deletionRule="Nullify" ordered="YES" destinationEntity="NewsItem" inverseName="source" inverseEntity="NewsItem"/>
+        <uniquenessConstraints>
+            <uniquenessConstraint>
+                <constraint value="identifier"/>
+            </uniquenessConstraint>
+        </uniquenessConstraints>
+    </entity>
+    <entity name="StoreApp" representedClassName="StoreApp" syncable="YES">
+        <attribute name="bundleIdentifier" attributeType="String"/>
+        <attribute name="developerName" attributeType="String"/>
+        <attribute name="downloadURL" attributeType="URI"/>
+        <attribute name="iconURL" attributeType="URI"/>
+        <attribute name="isBeta" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
+        <attribute name="localizedDescription" attributeType="String"/>
+        <attribute name="name" attributeType="String"/>
+        <attribute name="screenshotURLs" attributeType="Transformable"/>
+        <attribute name="size" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
+        <attribute name="sortIndex" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
+        <attribute name="subtitle" optional="YES" attributeType="String"/>
+        <attribute name="tintColor" optional="YES" attributeType="Transformable"/>
+        <attribute name="version" attributeType="String"/>
+        <attribute name="versionDate" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="versionDescription" optional="YES" attributeType="String"/>
+        <relationship name="installedApp" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="InstalledApp" inverseName="storeApp" inverseEntity="InstalledApp"/>
+        <relationship name="newsItems" toMany="YES" deletionRule="Nullify" destinationEntity="NewsItem" inverseName="storeApp" inverseEntity="NewsItem"/>
+        <relationship name="permissions" toMany="YES" deletionRule="Cascade" ordered="YES" destinationEntity="AppPermission" inverseName="app" inverseEntity="AppPermission"/>
+        <relationship name="source" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Source" inverseName="apps" inverseEntity="Source"/>
+        <uniquenessConstraints>
+            <uniquenessConstraint>
+                <constraint value="bundleIdentifier"/>
+            </uniquenessConstraint>
+        </uniquenessConstraints>
+    </entity>
+    <entity name="Team" representedClassName="Team" syncable="YES">
+        <attribute name="identifier" attributeType="String"/>
+        <attribute name="isActiveTeam" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
+        <attribute name="name" attributeType="String"/>
+        <attribute name="type" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="YES"/>
+        <relationship name="account" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Account" inverseName="teams" inverseEntity="Account"/>
+        <relationship name="appIDs" toMany="YES" deletionRule="Cascade" destinationEntity="AppID" inverseName="team" inverseEntity="AppID"/>
+        <relationship name="installedApps" toMany="YES" deletionRule="Nullify" destinationEntity="InstalledApp" inverseName="team" inverseEntity="InstalledApp"/>
+        <uniquenessConstraints>
+            <uniquenessConstraint>
+                <constraint value="identifier"/>
+            </uniquenessConstraint>
+        </uniquenessConstraints>
+    </entity>
+    <elements>
+        <element name="Account" positionX="-36" positionY="90" width="128" height="135"/>
+        <element name="AppPermission" positionX="-45" positionY="90" width="128" height="90"/>
+        <element name="InstalledApp" positionX="-63" positionY="0" width="128" height="193"/>
+        <element name="InstalledExtension" positionX="-45" positionY="135" width="128" height="163"/>
+        <element name="NewsItem" positionX="-45" positionY="126" width="128" height="225"/>
+        <element name="PatreonAccount" positionX="-45" positionY="117" width="128" height="105"/>
+        <element name="RefreshAttempt" positionX="-45" positionY="117" width="128" height="105"/>
+        <element name="Source" positionX="-45" positionY="99" width="128" height="120"/>
+        <element name="StoreApp" positionX="-63" positionY="-18" width="128" height="330"/>
+        <element name="Team" positionX="-45" positionY="81" width="128" height="148"/>
+        <element name="AppID" positionX="-27" positionY="153" width="128" height="133"/>
+    </elements>
+</model>

AltStore/Model/AltStore.xcdatamodeld/AltStore 5.xcdatamodel/contents

@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="16117.1" systemVersion="19D76" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
+    <entity name="Account" representedClassName="Account" syncable="YES">
+        <attribute name="appleID" attributeType="String"/>
+        <attribute name="firstName" attributeType="String"/>
+        <attribute name="identifier" attributeType="String"/>
+        <attribute name="isActiveAccount" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
+        <attribute name="lastName" attributeType="String"/>
+        <relationship name="teams" toMany="YES" deletionRule="Cascade" destinationEntity="Team" inverseName="account" inverseEntity="Team"/>
+        <uniquenessConstraints>
+            <uniquenessConstraint>
+                <constraint value="identifier"/>
+            </uniquenessConstraint>
+        </uniquenessConstraints>
+    </entity>
+    <entity name="AppID" representedClassName="AppID" syncable="YES">
+        <attribute name="bundleIdentifier" attributeType="String"/>
+        <attribute name="expirationDate" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="features" attributeType="Transformable"/>
+        <attribute name="identifier" attributeType="String"/>
+        <attribute name="name" attributeType="String"/>
+        <relationship name="team" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Team" inverseName="appIDs" inverseEntity="Team"/>
+        <uniquenessConstraints>
+            <uniquenessConstraint>
+                <constraint value="identifier"/>
+            </uniquenessConstraint>
+        </uniquenessConstraints>
+    </entity>
+    <entity name="AppPermission" representedClassName="AppPermission" syncable="YES">
+        <attribute name="type" attributeType="String"/>
+        <attribute name="usageDescription" attributeType="String"/>
+        <relationship name="app" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="StoreApp" inverseName="permissions" inverseEntity="StoreApp"/>
+    </entity>
+    <entity name="InstalledApp" representedClassName="InstalledApp" syncable="YES">
+        <attribute name="bundleIdentifier" attributeType="String"/>
+        <attribute name="certificateSerialNumber" optional="YES" attributeType="String"/>
+        <attribute name="expirationDate" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="installedDate" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="isActive" attributeType="Boolean" defaultValueString="YES" usesScalarValueType="YES"/>
+        <attribute name="name" attributeType="String"/>
+        <attribute name="refreshedDate" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="resignedBundleIdentifier" attributeType="String"/>
+        <attribute name="version" attributeType="String"/>
+        <relationship name="appExtensions" toMany="YES" deletionRule="Cascade" destinationEntity="InstalledExtension" inverseName="parentApp" inverseEntity="InstalledExtension"/>
+        <relationship name="storeApp" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="StoreApp" inverseName="installedApp" inverseEntity="StoreApp"/>
+        <relationship name="team" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Team" inverseName="installedApps" inverseEntity="Team"/>
+        <uniquenessConstraints>
+            <uniquenessConstraint>
+                <constraint value="bundleIdentifier"/>
+            </uniquenessConstraint>
+        </uniquenessConstraints>
+    </entity>
+    <entity name="InstalledExtension" representedClassName="InstalledExtension" syncable="YES">
+        <attribute name="bundleIdentifier" attributeType="String"/>
+        <attribute name="expirationDate" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="installedDate" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="name" attributeType="String"/>
+        <attribute name="refreshedDate" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="resignedBundleIdentifier" attributeType="String"/>
+        <attribute name="version" attributeType="String"/>
+        <relationship name="parentApp" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="InstalledApp" inverseName="appExtensions" inverseEntity="InstalledApp"/>
+    </entity>
+    <entity name="NewsItem" representedClassName="NewsItem" syncable="YES">
+        <attribute name="appID" optional="YES" attributeType="String"/>
+        <attribute name="caption" attributeType="String"/>
+        <attribute name="date" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="externalURL" optional="YES" attributeType="URI"/>
+        <attribute name="identifier" attributeType="String"/>
+        <attribute name="imageURL" optional="YES" attributeType="URI"/>
+        <attribute name="isSilent" attributeType="Boolean" defaultValueString="YES" usesScalarValueType="YES"/>
+        <attribute name="sortIndex" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
+        <attribute name="tintColor" optional="YES" attributeType="Transformable"/>
+        <attribute name="title" attributeType="String"/>
+        <relationship name="source" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Source" inverseName="newsItems" inverseEntity="Source"/>
+        <relationship name="storeApp" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="StoreApp" inverseName="newsItems" inverseEntity="StoreApp"/>
+        <uniquenessConstraints>
+            <uniquenessConstraint>
+                <constraint value="identifier"/>
+            </uniquenessConstraint>
+        </uniquenessConstraints>
+    </entity>
+    <entity name="PatreonAccount" representedClassName="PatreonAccount" syncable="YES">
+        <attribute name="firstName" optional="YES" attributeType="String"/>
+        <attribute name="identifier" attributeType="String"/>
+        <attribute name="isPatron" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
+        <attribute name="name" attributeType="String"/>
+        <uniquenessConstraints>
+            <uniquenessConstraint>
+                <constraint value="identifier"/>
+            </uniquenessConstraint>
+        </uniquenessConstraints>
+    </entity>
+    <entity name="RefreshAttempt" representedClassName="RefreshAttempt" syncable="YES">
+        <attribute name="date" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="errorDescription" optional="YES" attributeType="String"/>
+        <attribute name="identifier" attributeType="String"/>
+        <attribute name="isSuccess" attributeType="Boolean" defaultValueString="YES" usesScalarValueType="YES"/>
+        <uniquenessConstraints>
+            <uniquenessConstraint>
+                <constraint value="identifier"/>
+            </uniquenessConstraint>
+        </uniquenessConstraints>
+    </entity>
+    <entity name="Source" representedClassName="Source" syncable="YES">
+        <attribute name="identifier" attributeType="String"/>
+        <attribute name="name" attributeType="String"/>
+        <attribute name="sourceURL" attributeType="URI"/>
+        <relationship name="apps" toMany="YES" deletionRule="Nullify" ordered="YES" destinationEntity="StoreApp" inverseName="source" inverseEntity="StoreApp"/>
+        <relationship name="newsItems" toMany="YES" deletionRule="Nullify" ordered="YES" destinationEntity="NewsItem" inverseName="source" inverseEntity="NewsItem"/>
+        <uniquenessConstraints>
+            <uniquenessConstraint>
+                <constraint value="identifier"/>
+            </uniquenessConstraint>
+        </uniquenessConstraints>
+    </entity>
+    <entity name="StoreApp" representedClassName="StoreApp" syncable="YES">
+        <attribute name="bundleIdentifier" attributeType="String"/>
+        <attribute name="developerName" attributeType="String"/>
+        <attribute name="downloadURL" attributeType="URI"/>
+        <attribute name="iconURL" attributeType="URI"/>
+        <attribute name="isBeta" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
+        <attribute name="localizedDescription" attributeType="String"/>
+        <attribute name="name" attributeType="String"/>
+        <attribute name="screenshotURLs" attributeType="Transformable"/>
+        <attribute name="size" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
+        <attribute name="sortIndex" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
+        <attribute name="subtitle" optional="YES" attributeType="String"/>
+        <attribute name="tintColor" optional="YES" attributeType="Transformable"/>
+        <attribute name="version" attributeType="String"/>
+        <attribute name="versionDate" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="versionDescription" optional="YES" attributeType="String"/>
+        <relationship name="installedApp" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="InstalledApp" inverseName="storeApp" inverseEntity="InstalledApp"/>
+        <relationship name="newsItems" toMany="YES" deletionRule="Nullify" destinationEntity="NewsItem" inverseName="storeApp" inverseEntity="NewsItem"/>
+        <relationship name="permissions" toMany="YES" deletionRule="Cascade" ordered="YES" destinationEntity="AppPermission" inverseName="app" inverseEntity="AppPermission"/>
+        <relationship name="source" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Source" inverseName="apps" inverseEntity="Source"/>
+        <uniquenessConstraints>
+            <uniquenessConstraint>
+                <constraint value="bundleIdentifier"/>
+            </uniquenessConstraint>
+        </uniquenessConstraints>
+    </entity>
+    <entity name="Team" representedClassName="Team" syncable="YES">
+        <attribute name="identifier" attributeType="String"/>
+        <attribute name="isActiveTeam" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
+        <attribute name="name" attributeType="String"/>
+        <attribute name="type" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="YES"/>
+        <relationship name="account" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Account" inverseName="teams" inverseEntity="Account"/>
+        <relationship name="appIDs" toMany="YES" deletionRule="Cascade" destinationEntity="AppID" inverseName="team" inverseEntity="AppID"/>
+        <relationship name="installedApps" toMany="YES" deletionRule="Nullify" destinationEntity="InstalledApp" inverseName="team" inverseEntity="InstalledApp"/>
+        <uniquenessConstraints>
+            <uniquenessConstraint>
+                <constraint value="identifier"/>
+            </uniquenessConstraint>
+        </uniquenessConstraints>
+    </entity>
+    <elements>
+        <element name="Account" positionX="-36" positionY="90" width="128" height="135"/>
+        <element name="AppID" positionX="-27" positionY="153" width="128" height="133"/>
+        <element name="AppPermission" positionX="-45" positionY="90" width="128" height="90"/>
+        <element name="InstalledApp" positionX="-63" positionY="0" width="128" height="223"/>
+        <element name="InstalledExtension" positionX="-45" positionY="135" width="128" height="163"/>
+        <element name="NewsItem" positionX="-45" positionY="126" width="128" height="225"/>
+        <element name="PatreonAccount" positionX="-45" positionY="117" width="128" height="105"/>
+        <element name="RefreshAttempt" positionX="-45" positionY="117" width="128" height="105"/>
+        <element name="Source" positionX="-45" positionY="99" width="128" height="120"/>
+        <element name="StoreApp" positionX="-63" positionY="-18" width="128" height="330"/>
+        <element name="Team" positionX="-45" positionY="81" width="128" height="148"/>
+    </elements>
+</model>

AltStore/Model/AltStore.xcdatamodeld/AltStore 6.xcdatamodel/contents

@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="16117.1" systemVersion="19D76" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
+    <entity name="Account" representedClassName="Account" syncable="YES">
+        <attribute name="appleID" attributeType="String"/>
+        <attribute name="firstName" attributeType="String"/>
+        <attribute name="identifier" attributeType="String"/>
+        <attribute name="isActiveAccount" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
+        <attribute name="lastName" attributeType="String"/>
+        <relationship name="teams" toMany="YES" deletionRule="Cascade" destinationEntity="Team" inverseName="account" inverseEntity="Team"/>
+        <uniquenessConstraints>
+            <uniquenessConstraint>
+                <constraint value="identifier"/>
+            </uniquenessConstraint>
+        </uniquenessConstraints>
+    </entity>
+    <entity name="AppID" representedClassName="AppID" syncable="YES">
+        <attribute name="bundleIdentifier" attributeType="String"/>
+        <attribute name="expirationDate" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="features" attributeType="Transformable"/>
+        <attribute name="identifier" attributeType="String"/>
+        <attribute name="name" attributeType="String"/>
+        <relationship name="team" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Team" inverseName="appIDs" inverseEntity="Team"/>
+        <uniquenessConstraints>
+            <uniquenessConstraint>
+                <constraint value="identifier"/>
+            </uniquenessConstraint>
+        </uniquenessConstraints>
+    </entity>
+    <entity name="AppPermission" representedClassName="AppPermission" syncable="YES">
+        <attribute name="type" attributeType="String"/>
+        <attribute name="usageDescription" attributeType="String"/>
+        <relationship name="app" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="StoreApp" inverseName="permissions" inverseEntity="StoreApp"/>
+    </entity>
+    <entity name="InstalledApp" representedClassName="InstalledApp" syncable="YES">
+        <attribute name="bundleIdentifier" attributeType="String"/>
+        <attribute name="certificateSerialNumber" optional="YES" attributeType="String"/>
+        <attribute name="expirationDate" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="installedDate" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="isActive" attributeType="Boolean" defaultValueString="YES" usesScalarValueType="YES"/>
+        <attribute name="name" attributeType="String"/>
+        <attribute name="refreshedDate" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="resignedBundleIdentifier" attributeType="String"/>
+        <attribute name="version" attributeType="String"/>
+        <relationship name="appExtensions" toMany="YES" deletionRule="Cascade" destinationEntity="InstalledExtension" inverseName="parentApp" inverseEntity="InstalledExtension"/>
+        <relationship name="storeApp" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="StoreApp" inverseName="installedApp" inverseEntity="StoreApp"/>
+        <relationship name="team" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Team" inverseName="installedApps" inverseEntity="Team"/>
+        <uniquenessConstraints>
+            <uniquenessConstraint>
+                <constraint value="bundleIdentifier"/>
+            </uniquenessConstraint>
+        </uniquenessConstraints>
+    </entity>
+    <entity name="InstalledExtension" representedClassName="InstalledExtension" syncable="YES">
+        <attribute name="bundleIdentifier" attributeType="String"/>
+        <attribute name="expirationDate" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="installedDate" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="name" attributeType="String"/>
+        <attribute name="refreshedDate" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="resignedBundleIdentifier" attributeType="String"/>
+        <attribute name="version" attributeType="String"/>
+        <relationship name="parentApp" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="InstalledApp" inverseName="appExtensions" inverseEntity="InstalledApp"/>
+    </entity>
+    <entity name="NewsItem" representedClassName="NewsItem" syncable="YES">
+        <attribute name="appID" optional="YES" attributeType="String"/>
+        <attribute name="caption" attributeType="String"/>
+        <attribute name="date" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="externalURL" optional="YES" attributeType="URI"/>
+        <attribute name="identifier" attributeType="String"/>
+        <attribute name="imageURL" optional="YES" attributeType="URI"/>
+        <attribute name="isSilent" attributeType="Boolean" defaultValueString="YES" usesScalarValueType="YES"/>
+        <attribute name="sortIndex" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
+        <attribute name="sourceIdentifier" optional="YES" attributeType="String"/>
+        <attribute name="tintColor" optional="YES" attributeType="Transformable"/>
+        <attribute name="title" attributeType="String"/>
+        <relationship name="source" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Source" inverseName="newsItems" inverseEntity="Source"/>
+        <relationship name="storeApp" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="StoreApp" inverseName="newsItems" inverseEntity="StoreApp"/>
+        <uniquenessConstraints>
+            <uniquenessConstraint>
+                <constraint value="identifier"/>
+                <constraint value="sourceIdentifier"/>
+            </uniquenessConstraint>
+        </uniquenessConstraints>
+    </entity>
+    <entity name="PatreonAccount" representedClassName="PatreonAccount" syncable="YES">
+        <attribute name="firstName" optional="YES" attributeType="String"/>
+        <attribute name="identifier" attributeType="String"/>
+        <attribute name="isPatron" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
+        <attribute name="name" attributeType="String"/>
+        <uniquenessConstraints>
+            <uniquenessConstraint>
+                <constraint value="identifier"/>
+            </uniquenessConstraint>
+        </uniquenessConstraints>
+    </entity>
+    <entity name="RefreshAttempt" representedClassName="RefreshAttempt" syncable="YES">
+        <attribute name="date" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="errorDescription" optional="YES" attributeType="String"/>
+        <attribute name="identifier" attributeType="String"/>
+        <attribute name="isSuccess" attributeType="Boolean" defaultValueString="YES" usesScalarValueType="YES"/>
+        <uniquenessConstraints>
+            <uniquenessConstraint>
+                <constraint value="identifier"/>
+            </uniquenessConstraint>
+        </uniquenessConstraints>
+    </entity>
+    <entity name="Source" representedClassName="Source" syncable="YES">
+        <attribute name="identifier" attributeType="String"/>
+        <attribute name="name" attributeType="String"/>
+        <attribute name="sourceURL" attributeType="URI"/>
+        <relationship name="apps" toMany="YES" deletionRule="Cascade" ordered="YES" destinationEntity="StoreApp" inverseName="source" inverseEntity="StoreApp"/>
+        <relationship name="newsItems" toMany="YES" deletionRule="Cascade" ordered="YES" destinationEntity="NewsItem" inverseName="source" inverseEntity="NewsItem"/>
+        <uniquenessConstraints>
+            <uniquenessConstraint>
+                <constraint value="identifier"/>
+            </uniquenessConstraint>
+        </uniquenessConstraints>
+    </entity>
+    <entity name="StoreApp" representedClassName="StoreApp" syncable="YES">
+        <attribute name="bundleIdentifier" attributeType="String"/>
+        <attribute name="developerName" attributeType="String"/>
+        <attribute name="downloadURL" attributeType="URI"/>
+        <attribute name="iconURL" attributeType="URI"/>
+        <attribute name="isBeta" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
+        <attribute name="localizedDescription" attributeType="String"/>
+        <attribute name="name" attributeType="String"/>
+        <attribute name="screenshotURLs" attributeType="Transformable"/>
+        <attribute name="size" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
+        <attribute name="sortIndex" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
+        <attribute name="sourceIdentifier" optional="YES" attributeType="String"/>
+        <attribute name="subtitle" optional="YES" attributeType="String"/>
+        <attribute name="tintColor" optional="YES" attributeType="Transformable"/>
+        <attribute name="version" attributeType="String"/>
+        <attribute name="versionDate" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="versionDescription" optional="YES" attributeType="String"/>
+        <relationship name="installedApp" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="InstalledApp" inverseName="storeApp" inverseEntity="InstalledApp"/>
+        <relationship name="newsItems" toMany="YES" deletionRule="Nullify" destinationEntity="NewsItem" inverseName="storeApp" inverseEntity="NewsItem"/>
+        <relationship name="permissions" toMany="YES" deletionRule="Cascade" ordered="YES" destinationEntity="AppPermission" inverseName="app" inverseEntity="AppPermission"/>
+        <relationship name="source" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Source" inverseName="apps" inverseEntity="Source"/>
+        <uniquenessConstraints>
+            <uniquenessConstraint>
+                <constraint value="sourceIdentifier"/>
+                <constraint value="bundleIdentifier"/>
+            </uniquenessConstraint>
+        </uniquenessConstraints>
+    </entity>
+    <entity name="Team" representedClassName="Team" syncable="YES">
+        <attribute name="identifier" attributeType="String"/>
+        <attribute name="isActiveTeam" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
+        <attribute name="name" attributeType="String"/>
+        <attribute name="type" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="YES"/>
+        <relationship name="account" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Account" inverseName="teams" inverseEntity="Account"/>
+        <relationship name="appIDs" toMany="YES" deletionRule="Cascade" destinationEntity="AppID" inverseName="team" inverseEntity="AppID"/>
+        <relationship name="installedApps" toMany="YES" deletionRule="Nullify" destinationEntity="InstalledApp" inverseName="team" inverseEntity="InstalledApp"/>
+        <uniquenessConstraints>
+            <uniquenessConstraint>
+                <constraint value="identifier"/>
+            </uniquenessConstraint>
+        </uniquenessConstraints>
+    </entity>
+    <elements>
+        <element name="Account" positionX="-36" positionY="90" width="128" height="135"/>
+        <element name="AppID" positionX="-27" positionY="153" width="128" height="133"/>
+        <element name="AppPermission" positionX="-45" positionY="90" width="128" height="90"/>
+        <element name="InstalledApp" positionX="-63" positionY="0" width="128" height="223"/>
+        <element name="InstalledExtension" positionX="-45" positionY="135" width="128" height="163"/>
+        <element name="NewsItem" positionX="-45" positionY="126" width="128" height="238"/>
+        <element name="PatreonAccount" positionX="-45" positionY="117" width="128" height="105"/>
+        <element name="RefreshAttempt" positionX="-45" positionY="117" width="128" height="105"/>
+        <element name="Source" positionX="-45" positionY="99" width="128" height="118"/>
+        <element name="StoreApp" positionX="-63" positionY="-18" width="128" height="343"/>
+        <element name="Team" positionX="-45" positionY="81" width="128" height="148"/>
+    </elements>
+</model>

AltStore/Model/AppID.swift

@@ -0,0 +1,52 @@
+//
+//  AppID.swift
+//  AltStore
+//
+//  Created by Riley Testut on 1/27/20.
+//  Copyright © 2020 Riley Testut. All rights reserved.
+//
+
+import Foundation
+import CoreData
+
+import AltSign
+
+@objc(AppID)
+class AppID: NSManagedObject, Fetchable
+{
+    /* Properties */
+    @NSManaged var name: String
+    @NSManaged var identifier: String
+    @NSManaged var bundleIdentifier: String
+    @NSManaged var features: [ALTFeature: Any]
+    @NSManaged var expirationDate: Date?
+    
+    /* Relationships */
+    @NSManaged private(set) var team: Team?
+    
+    private override init(entity: NSEntityDescription, insertInto context: NSManagedObjectContext?)
+    {
+        super.init(entity: entity, insertInto: context)
+    }
+    
+    init(_ appID: ALTAppID, team: Team, context: NSManagedObjectContext)
+    {
+        super.init(entity: AppID.entity(), insertInto: context)
+                
+        self.name = appID.name
+        self.identifier = appID.identifier
+        self.bundleIdentifier = appID.bundleIdentifier
+        self.features = appID.features
+        self.expirationDate = appID.expirationDate
+        
+        self.team = team
+    }
+}
+
+extension AppID
+{
+    @nonobjc class func fetchRequest() -> NSFetchRequest<AppID>
+    {
+        return NSFetchRequest<AppID>(entityName: "AppID")
+    }
+}

AltStore/Model/DatabaseManager.swift

@@ -158,6 +158,7 @@ private extension DatabaseManager
                 storeApp.source = altStoreSource
             }
                         
+            let serialNumber = Bundle.main.object(forInfoDictionaryKey: Bundle.Info.certificateID) as? String
             let installedApp: InstalledApp
             
             if let app = storeApp.installedApp
@@ -166,7 +167,7 @@ private extension DatabaseManager
             }
             else
             {
-                installedApp = InstalledApp(resignedApp: localApp, originalBundleIdentifier: StoreApp.altstoreAppID, context: context)
+                installedApp = InstalledApp(resignedApp: localApp, originalBundleIdentifier: StoreApp.altstoreAppID, certificateSerialNumber: serialNumber, context: context)
                 installedApp.storeApp = storeApp
             }
             
@@ -193,13 +194,20 @@ private extension DatabaseManager
                 }
             }
             
+            let cachedRefreshedDate = installedApp.refreshedDate
+            let cachedExpirationDate = installedApp.expirationDate
+                        
             // Must go after comparing versions to see if we need to update our cached AltStore app bundle.
-            installedApp.version = localApp.version
+            installedApp.update(resignedApp: localApp, certificateSerialNumber: serialNumber)
             
-            if let provisioningProfile = localApp.provisioningProfile
+            if installedApp.refreshedDate < cachedRefreshedDate
             {
-                installedApp.refreshedDate = provisioningProfile.creationDate
-                installedApp.expirationDate = provisioningProfile.expirationDate
+                // Embedded provisioning profile has a creation date older than our refreshed date.
+                // This most likely means we've refreshed the app since then, and profile is now outdated,
+                // so use cached dates instead (i.e. not the dates updated from provisioning profile).
+                
+                installedApp.refreshedDate = cachedRefreshedDate
+                installedApp.expirationDate = cachedExpirationDate
             }
             
             do

AltStore/Model/InstalledApp.swift

@@ -11,8 +11,23 @@ import CoreData
 
 import AltSign
 
+// Free developer accounts are limited to only 3 active sideloaded apps at a time as of iOS 13.3.1.
+let ALTActiveAppsLimit = 3
+
+protocol InstalledAppProtocol: Fetchable
+{
+    var name: String { get }
+    var bundleIdentifier: String { get }
+    var resignedBundleIdentifier: String { get }
+    var version: String { get }
+    
+    var refreshedDate: Date { get }
+    var expirationDate: Date { get }
+    var installedDate: Date { get }
+}
+
 @objc(InstalledApp)
-class InstalledApp: NSManagedObject, Fetchable
+class InstalledApp: NSManagedObject, InstalledAppProtocol
 {
     /* Properties */
     @NSManaged var name: String
@@ -22,39 +37,63 @@ class InstalledApp: NSManagedObject, Fetchable
     
     @NSManaged var refreshedDate: Date
     @NSManaged var expirationDate: Date
+    @NSManaged var installedDate: Date
+    
+    @NSManaged var isActive: Bool
+    
+    @NSManaged var certificateSerialNumber: String?
     
     /* Relationships */
     @NSManaged var storeApp: StoreApp?
+    @NSManaged var team: Team?
+    @NSManaged var appExtensions: Set<InstalledExtension>
     
     var isSideloaded: Bool {
         return self.storeApp == nil
     }
     
+    var appIDCount: Int {
+        return 1 + self.appExtensions.count
+    }
+    
     private override init(entity: NSEntityDescription, insertInto context: NSManagedObjectContext?)
     {
         super.init(entity: entity, insertInto: context)
     }
     
-    init(resignedApp: ALTApplication, originalBundleIdentifier: String, context: NSManagedObjectContext)
+    init(resignedApp: ALTApplication, originalBundleIdentifier: String, certificateSerialNumber: String?, context: NSManagedObjectContext)
     {
         super.init(entity: InstalledApp.entity(), insertInto: context)
         
-        self.name = resignedApp.name
         self.bundleIdentifier = originalBundleIdentifier
-        self.resignedBundleIdentifier = resignedApp.bundleIdentifier
         
+        self.refreshedDate = Date()
+        self.installedDate = Date()
+        
+        self.expirationDate = self.refreshedDate.addingTimeInterval(60 * 60 * 24 * 7) // Rough estimate until we get real values from provisioning profile.
+        
+        self.update(resignedApp: resignedApp, certificateSerialNumber: certificateSerialNumber)
+    }
+    
+    func update(resignedApp: ALTApplication, certificateSerialNumber: String?)
+    {
+        self.name = resignedApp.name
+        
+        self.resignedBundleIdentifier = resignedApp.bundleIdentifier
         self.version = resignedApp.version
+        
+        self.certificateSerialNumber = certificateSerialNumber
 
         if let provisioningProfile = resignedApp.provisioningProfile
         {
-            self.refreshedDate = provisioningProfile.creationDate
-            self.expirationDate = provisioningProfile.expirationDate
+            self.update(provisioningProfile: provisioningProfile)
         }
-        else
-        {
-            self.refreshedDate = Date()
-            self.expirationDate = self.refreshedDate.addingTimeInterval(60 * 60 * 24 * 7) // Rough estimate until we get real values from provisioning profile.
-        }        
+    }
+    
+    func update(provisioningProfile: ALTProvisioningProfile)
+    {
+        self.refreshedDate = provisioningProfile.creationDate
+        self.expirationDate = provisioningProfile.expirationDate
     }
 }
 
@@ -68,7 +107,15 @@ extension InstalledApp
     class func updatesFetchRequest() -> NSFetchRequest<InstalledApp>
     {
         let fetchRequest = InstalledApp.fetchRequest() as NSFetchRequest<InstalledApp>
-        fetchRequest.predicate = NSPredicate(format: "%K != nil AND %K != %K", #keyPath(InstalledApp.storeApp), #keyPath(InstalledApp.version), #keyPath(InstalledApp.storeApp.version))
+        fetchRequest.predicate = NSPredicate(format: "%K == YES AND %K != nil AND %K != %K",
+                                             #keyPath(InstalledApp.isActive), #keyPath(InstalledApp.storeApp), #keyPath(InstalledApp.version), #keyPath(InstalledApp.storeApp.version))
+        return fetchRequest
+    }
+    
+    class func activeAppsFetchRequest() -> NSFetchRequest<InstalledApp>
+    {
+        let fetchRequest = InstalledApp.fetchRequest() as NSFetchRequest<InstalledApp>
+        fetchRequest.predicate = NSPredicate(format: "%K == YES", #keyPath(InstalledApp.isActive))
         return fetchRequest
     }
     
@@ -80,9 +127,15 @@ extension InstalledApp
         return altStore
     }
     
+    class func fetchActiveApps(in context: NSManagedObjectContext) -> [InstalledApp]
+    {
+        let activeApps = InstalledApp.fetch(InstalledApp.activeAppsFetchRequest(), in: context)
+        return activeApps
+    }
+    
     class func fetchAppsForRefreshingAll(in context: NSManagedObjectContext) -> [InstalledApp]
     {
-        var predicate = NSPredicate(format: "%K != %@", #keyPath(InstalledApp.bundleIdentifier), StoreApp.altstoreAppID)
+        var predicate = NSPredicate(format: "%K == YES AND %K != %@", #keyPath(InstalledApp.isActive), #keyPath(InstalledApp.bundleIdentifier), StoreApp.altstoreAppID)
         
         if let patreonAccount = DatabaseManager.shared.patreonAccount(in: context), patreonAccount.isPatron, PatreonAPI.shared.isAuthenticated
         {
@@ -112,7 +165,8 @@ extension InstalledApp
         // Date 6 hours before now.
         let date = Date().addingTimeInterval(-1 * 6 * 60 * 60)
         
-        var predicate = NSPredicate(format: "(%K < %@) AND (%K != %@)",
+        var predicate = NSPredicate(format: "(%K == YES) AND (%K < %@) AND (%K != %@)",
+                                    #keyPath(InstalledApp.isActive),
                                     #keyPath(InstalledApp.refreshedDate), date as NSDate,
                                     #keyPath(InstalledApp.bundleIdentifier), StoreApp.altstoreAppID)
         
@@ -132,7 +186,7 @@ extension InstalledApp
         
         if let altStoreApp = InstalledApp.fetchAltStore(in: context), altStoreApp.refreshedDate < date
         {
-            // Refresh AltStore last since it causes app to quit.
+            // Refresh AltStore last since it may cause app to quit.
             installedApps.append(altStoreApp)
         }
         
@@ -187,6 +241,12 @@ extension InstalledApp
         return directoryURL
     }
     
+    class func installedAppUTI(forBundleIdentifier bundleIdentifier: String) -> String
+    {
+        let installedAppUTI = "io.altstore.Installed." + bundleIdentifier
+        return installedAppUTI
+    }
+    
     var directoryURL: URL {
         return InstalledApp.directoryURL(for: self)
     }
@@ -198,4 +258,8 @@ extension InstalledApp
     var refreshedIPAURL: URL {
         return InstalledApp.refreshedIPAURL(for: self)
     }
+    
+    var installedAppUTI: String {
+        return InstalledApp.installedAppUTI(forBundleIdentifier: self.resignedBundleIdentifier)
+    }
 }

AltStore/Model/InstalledExtension.swift

@@ -0,0 +1,75 @@
+//
+//  InstalledExtension.swift
+//  AltStore
+//
+//  Created by Riley Testut on 1/7/20.
+//  Copyright © 2020 Riley Testut. All rights reserved.
+//
+
+import Foundation
+import CoreData
+
+import AltSign
+
+@objc(InstalledExtension)
+class InstalledExtension: NSManagedObject, InstalledAppProtocol
+{
+    /* Properties */
+    @NSManaged var name: String
+    @NSManaged var bundleIdentifier: String
+    @NSManaged var resignedBundleIdentifier: String
+    @NSManaged var version: String
+    
+    @NSManaged var refreshedDate: Date
+    @NSManaged var expirationDate: Date
+    @NSManaged var installedDate: Date
+    
+    /* Relationships */
+    @NSManaged var parentApp: InstalledApp?
+    
+    private override init(entity: NSEntityDescription, insertInto context: NSManagedObjectContext?)
+    {
+        super.init(entity: entity, insertInto: context)
+    }
+    
+    init(resignedAppExtension: ALTApplication, originalBundleIdentifier: String, context: NSManagedObjectContext)
+    {
+        super.init(entity: InstalledExtension.entity(), insertInto: context)
+        
+        self.bundleIdentifier = originalBundleIdentifier
+        
+        self.refreshedDate = Date()
+        self.installedDate = Date()
+        
+        self.expirationDate = self.refreshedDate.addingTimeInterval(60 * 60 * 24 * 7) // Rough estimate until we get real values from provisioning profile.
+        
+        self.update(resignedAppExtension: resignedAppExtension)
+    }
+    
+    func update(resignedAppExtension: ALTApplication)
+    {
+        self.name = resignedAppExtension.name
+        
+        self.resignedBundleIdentifier = resignedAppExtension.bundleIdentifier
+        self.version = resignedAppExtension.version
+
+        if let provisioningProfile = resignedAppExtension.provisioningProfile
+        {
+            self.update(provisioningProfile: provisioningProfile)
+        }
+    }
+    
+    func update(provisioningProfile: ALTProvisioningProfile)
+    {
+        self.refreshedDate = provisioningProfile.creationDate
+        self.expirationDate = provisioningProfile.expirationDate
+    }
+}
+
+extension InstalledExtension
+{
+    @nonobjc class func fetchRequest() -> NSFetchRequest<InstalledExtension>
+    {
+        return NSFetchRequest<InstalledExtension>(entityName: "InstalledExtension")
+    }
+}

AltStore/Model/MergePolicy.swift

@@ -15,8 +15,33 @@ open class MergePolicy: RSTRelationshipPreservingMergePolicy
     open override func resolve(constraintConflicts conflicts: [NSConstraintConflict]) throws
     {
         guard conflicts.allSatisfy({ $0.databaseObject != nil }) else {
-            assertionFailure("MergePolicy is only intended to work with database-level conflicts.")
-            return try super.resolve(constraintConflicts: conflicts)            
+            for conflict in conflicts
+            {
+                switch conflict.conflictingObjects.first
+                {
+                case is StoreApp where conflict.conflictingObjects.count == 2:
+                    // Modified cached StoreApp while replacing it with new one, causing context-level conflict.
+                    // Most likely, we set up a relationship between the new StoreApp and a NewsItem,
+                    // causing cached StoreApp to delete it's NewsItem relationship, resulting in (resolvable) conflict.
+                    
+                    if let previousApp = conflict.conflictingObjects.first(where: { !$0.isInserted }) as? StoreApp
+                    {
+                        // Delete previous permissions (same as below).
+                        for permission in previousApp.permissions
+                        {
+                            permission.managedObjectContext?.delete(permission)
+                        }
+                    }
+                    
+                default:
+                    // Unknown context-level conflict.
+                    assertionFailure("MergePolicy is only intended to work with database-level conflicts.")
+                }
+            }
+            
+            try super.resolve(constraintConflicts: conflicts)
+                        
+            return
         }
         
         for conflict in conflicts

AltStore/Model/Migrations/Policies/InstalledAppPolicy.swift

@@ -0,0 +1,58 @@
+//
+//  InstalledAppPolicy.swift
+//  AltStore
+//
+//  Created by Riley Testut on 1/24/20.
+//  Copyright © 2020 Riley Testut. All rights reserved.
+//
+
+import CoreData
+import AltSign
+
+@objc(InstalledAppToInstalledAppMigrationPolicy)
+class InstalledAppToInstalledAppMigrationPolicy: NSEntityMigrationPolicy
+{
+    override func createRelationships(forDestination dInstance: NSManagedObject, in mapping: NSEntityMapping, manager: NSMigrationManager) throws
+    {
+        try super.createRelationships(forDestination: dInstance, in: mapping, manager: manager)
+        
+        // Entity must be in manager.destinationContext.
+        let entity = NSEntityDescription.entity(forEntityName: "Team", in: manager.destinationContext)
+        
+        let fetchRequest = NSFetchRequest<NSManagedObject>()
+        fetchRequest.entity = entity
+        fetchRequest.predicate = NSPredicate(format: "%K == YES", #keyPath(Team.isActiveTeam))
+        
+        let teams = try manager.destinationContext.fetch(fetchRequest)
+        
+        // Cannot use NSManagedObject subclasses during migration, so fallback to using KVC instead.
+        dInstance.setValue(teams.first, forKey: #keyPath(InstalledApp.team))
+    }
+    
+    @objc(defaultIsActiveForBundleID:team:)
+    func defaultIsActive(for bundleID: String, team: NSManagedObject?) -> NSNumber
+    {
+        let isActive: Bool
+        
+        let activeAppsMinimumVersion = OperatingSystemVersion(majorVersion: 13, minorVersion: 3, patchVersion: 1)
+        if !ProcessInfo.processInfo.isOperatingSystemAtLeast(activeAppsMinimumVersion)
+        {
+            isActive = true
+        }
+        else if let team = team, let type = team.value(forKey: #keyPath(Team.type)) as? Int16, type != ALTTeamType.free.rawValue
+        {
+            isActive = true
+        }
+        else
+        {
+            // AltStore should always be active, but deactivate all other apps.
+            isActive = (bundleID == StoreApp.altstoreAppID)
+            
+            // We can assume there is an active app limit,
+            // but will confirm next time user authenticates.
+            UserDefaults.standard.activeAppsLimit = ALTActiveAppsLimit
+        }
+        
+        return NSNumber(value: isActive)
+    }
+}

AltStore/Model/NewsItem.swift

@@ -26,6 +26,7 @@ class NewsItem: NSManagedObject, Decodable, Fetchable
     @NSManaged var externalURL: URL?
     
     @NSManaged var appID: String?
+    @NSManaged var sourceIdentifier: String?
     
     /* Relationships */
     @NSManaged var storeApp: StoreApp?

AltStore/Model/Source.swift

@@ -10,8 +10,29 @@ import CoreData
 
 extension Source
 {
+    #if ALPHA
+    static let altStoreIdentifier = "com.rileytestut.AltStore.Alpha"
+    #else
     static let altStoreIdentifier = "com.rileytestut.AltStore"
-    static let altStoreSourceURL = URL(string: "https://cdn.altstore.io/file/altstore/apps.json")!
+    #endif
+    
+    #if STAGING
+    
+    #if ALPHA
+    static let altStoreSourceURL = URL(string: "https://f000.backblazeb2.com/file/altstore-staging/sources/alpha/apps-alpha-staging.json")!
+    #else
+    static let altStoreSourceURL = URL(string: "https://f000.backblazeb2.com/file/altstore-staging/apps-staging.json")!
+    #endif
+    
+    #else
+    
+    #if ALPHA
+    static let altStoreSourceURL = URL(string: "https://alpha.altstore.io/")!
+    #else
+    static let altStoreSourceURL = URL(string: "https://apps.altstore.io/")!
+    #endif
+    
+    #endif
 }
 
 @objc(Source)
@@ -22,6 +43,9 @@ class Source: NSManagedObject, Fetchable, Decodable
     @NSManaged var identifier: String
     @NSManaged var sourceURL: URL
     
+    /* Non-Core Data Properties */
+    var userInfo: [ALTSourceUserInfoKey: String]?
+    
     /* Relationships */
     @objc(apps) @NSManaged private(set) var _apps: NSOrderedSet
     @objc(newsItems) @NSManaged private(set) var _newsItems: NSOrderedSet
@@ -49,6 +73,7 @@ class Source: NSManagedObject, Fetchable, Decodable
         case name
         case identifier
         case sourceURL
+        case userInfo
         case apps
         case news
     }
@@ -61,52 +86,64 @@ class Source: NSManagedObject, Fetchable, Decodable
     required init(from decoder: Decoder) throws
     {
         guard let context = decoder.managedObjectContext else { preconditionFailure("Decoder must have non-nil NSManagedObjectContext.") }
+        guard let sourceURL = decoder.sourceURL else { preconditionFailure("Decoder must have non-nil sourceURL.") }
         
         super.init(entity: Source.entity(), insertInto: nil)
         
+        self.sourceURL = sourceURL
+        
         let container = try decoder.container(keyedBy: CodingKeys.self)
         self.name = try container.decode(String.self, forKey: .name)
         self.identifier = try container.decode(String.self, forKey: .identifier)
-        self.sourceURL = try container.decode(URL.self, forKey: .sourceURL)
+        
+        let userInfo = try container.decodeIfPresent([String: String].self, forKey: .userInfo)
+        self.userInfo = userInfo?.reduce(into: [:]) { $0[ALTSourceUserInfoKey($1.key)] = $1.value }
         
         let apps = try container.decodeIfPresent([StoreApp].self, forKey: .apps) ?? []
+        let appsByID = Dictionary(apps.map { ($0.bundleIdentifier, $0) }, uniquingKeysWith: { (a, b) in return a })
+        
         for (index, app) in apps.enumerated()
         {
+            app.sourceIdentifier = self.identifier
             app.sortIndex = Int32(index)
         }
         
         let newsItems = try container.decodeIfPresent([NewsItem].self, forKey: .news) ?? []
         for (index, item) in newsItems.enumerated()
         {
+            item.sourceIdentifier = self.identifier
             item.sortIndex = Int32(index)
         }
         
         context.insert(self)
-        
-        let appsByID = Dictionary(apps.map { ($0.bundleIdentifier, $0) }, uniquingKeysWith: { (a, b) in return a })
-        
+                
         for newsItem in newsItems
-        {
-            newsItem.source = self
-            
+        {            
             guard let appID = newsItem.appID else { continue }
             
             if let storeApp = appsByID[appID]
             {
                 newsItem.storeApp = storeApp
             }
+            else
+            {
+                newsItem.storeApp = nil
+            }
         }
         
         // Must assign after we're inserted into context.
         self._apps = NSMutableOrderedSet(array: apps)
         self._newsItems = NSMutableOrderedSet(array: newsItems)
-        
-        print("Downloaded Order:", self.apps.map { $0.bundleIdentifier })
     }
 }
 
 extension Source
 {
+    @nonobjc class func fetchRequest() -> NSFetchRequest<Source>
+    {
+        return NSFetchRequest<Source>(entityName: "Source")
+    }
+    
     class func makeAltStoreSource(in context: NSManagedObjectContext) -> Source
     {
         let source = Source(context: context)

AltStore/Model/StoreApp.swift

@@ -14,12 +14,15 @@ import AltSign
 
 extension StoreApp
 {
-    #if BETA
+    #if ALPHA
+    static let altstoreAppID = "com.rileytestut.AltStore.Alpha"
+    static let alternativeAltStoreAppIDs: Set<String> = ["com.rileytestut.AltStore", "com.rileytestut.AltStore.Beta"]
+    #elseif BETA
     static let altstoreAppID = "com.rileytestut.AltStore.Beta"
-    static let alternativeAltStoreAppID = "com.rileytestut.AltStore"
+    static let alternativeAltStoreAppIDs: Set<String> = ["com.rileytestut.AltStore", "com.rileytestut.AltStore.Alpha"]
     #else
     static let altstoreAppID = "com.rileytestut.AltStore"
-    static let alternativeAltStoreAppID = "com.rileytestut.AltStore.Beta"
+    static let alternativeAltStoreAppIDs: Set<String> = ["com.rileytestut.AltStore.Beta", "com.rileytestut.AltStore.Alpha"]
     #endif
 }
 
@@ -46,12 +49,26 @@ class StoreApp: NSManagedObject, Decodable, Fetchable
     @NSManaged private(set) var tintColor: UIColor?
     @NSManaged private(set) var isBeta: Bool
     
+    @NSManaged var sourceIdentifier: String?
+    
     @NSManaged var sortIndex: Int32
     
     /* Relationships */
     @NSManaged var installedApp: InstalledApp?
-    @NSManaged var source: Source?
-    @objc(permissions) @NSManaged var _permissions: NSOrderedSet
+    @NSManaged var newsItems: Set<NewsItem>
+    
+    @NSManaged @objc(source) var _source: Source?
+    @NSManaged @objc(permissions) var _permissions: NSOrderedSet
+    
+    @nonobjc var source: Source? {
+        set {
+            self._source = newValue
+            self.sourceIdentifier = newValue?.identifier
+        }
+        get {
+            return self._source
+        }
+    }
     
     @nonobjc var permissions: [AppPermission] {
         return self._permissions.array as! [AppPermission]

AltStore/Model/Team.swift

@@ -17,7 +17,7 @@ extension ALTTeamType
         switch self
         {
         case .free: return NSLocalizedString("Free Developer Account", comment: "")
-        case .individual: return NSLocalizedString("Individual", comment: "")
+        case .individual: return NSLocalizedString("Developer", comment: "")
         case .organization: return NSLocalizedString("Organization", comment: "")
         case .unknown: fallthrough
         @unknown default: return NSLocalizedString("Unknown", comment: "")
@@ -25,6 +25,11 @@ extension ALTTeamType
     }
 }
 
+extension Team
+{
+    static let maximumFreeAppIDs = 10
+}
+
 @objc(Team)
 class Team: NSManagedObject, Fetchable
 {
@@ -37,6 +42,8 @@ class Team: NSManagedObject, Fetchable
     
     /* Relationships */
     @NSManaged private(set) var account: Account!
+    @NSManaged var installedApps: Set<InstalledApp>
+    @NSManaged private(set) var appIDs: Set<AppID>
     
     var altTeam: ALTTeam?
     
@@ -49,13 +56,18 @@ class Team: NSManagedObject, Fetchable
     {
         super.init(entity: Team.entity(), insertInto: context)
         
+        self.account = account
+        
+        self.update(team: team)
+    }
+    
+    func update(team: ALTTeam)
+    {
         self.altTeam = team
         
         self.name = team.name
         self.identifier = team.identifier
         self.type = team.type
-        
-        self.account = account
     }
 }
 

AltStore/My Apps/InstalledAppsCollectionHeaderView.swift

@@ -0,0 +1,43 @@
+//
+//  InstalledAppsCollectionHeaderView.swift
+//  AltStore
+//
+//  Created by Riley Testut on 3/9/20.
+//  Copyright © 2020 Riley Testut. All rights reserved.
+//
+
+import UIKit
+
+class InstalledAppsCollectionHeaderView: UICollectionReusableView
+{
+    let textLabel: UILabel
+    let button: UIButton
+    
+    override init(frame: CGRect)
+    {
+        self.textLabel = UILabel()
+        self.textLabel.translatesAutoresizingMaskIntoConstraints = false
+        self.textLabel.font = UIFont.systemFont(ofSize: 24, weight: .bold)
+        
+        self.button = UIButton(type: .system)
+        self.button.translatesAutoresizingMaskIntoConstraints = false
+        self.button.titleLabel?.font = UIFont.systemFont(ofSize: 16, weight: .medium)
+        
+        super.init(frame: frame)
+        
+        self.addSubview(self.textLabel)
+        self.addSubview(self.button)
+        
+        NSLayoutConstraint.activate([self.textLabel.leadingAnchor.constraint(equalTo: self.layoutMarginsGuide.leadingAnchor),
+                                     self.textLabel.bottomAnchor.constraint(equalTo: self.bottomAnchor)])
+        
+        NSLayoutConstraint.activate([self.button.trailingAnchor.constraint(equalTo: self.layoutMarginsGuide.trailingAnchor),
+                                     self.button.firstBaselineAnchor.constraint(equalTo: self.textLabel.firstBaselineAnchor)])
+        
+        self.preservesSuperviewLayoutMargins = true
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+}

AltStore/My Apps/InstalledAppsCollectionHeaderView.xib

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16092.1" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina6_1" orientation="portrait" appearance="light"/>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16082.1"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <collectionReusableView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" reuseIdentifier="InstalledAppsHeader" id="eyV-eW-aLi" customClass="InstalledAppsCollectionHeaderView" customModule="AltStore" customModuleProvider="target">
+            <rect key="frame" x="0.0" y="0.0" width="375" height="50"/>
+            <autoresizingMask key="autoresizingMask"/>
+            <subviews>
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Installed" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zhW-Re-WNf">
+                    <rect key="frame" x="20" y="21" width="96.5" height="29"/>
+                    <fontDescription key="fontDescription" type="boldSystem" pointSize="24"/>
+                    <nil key="textColor"/>
+                    <nil key="highlightedColor"/>
+                </label>
+                <button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="1000" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="iMf-wr-wRV">
+                    <rect key="frame" x="274" y="23" width="81" height="32"/>
+                    <fontDescription key="fontDescription" type="system" weight="medium" pointSize="16"/>
+                    <state key="normal" title="Refresh All"/>
+                </button>
+            </subviews>
+            <constraints>
+                <constraint firstItem="zhW-Re-WNf" firstAttribute="leading" secondItem="eyV-eW-aLi" secondAttribute="leading" constant="20" id="Fo0-fL-UpD"/>
+                <constraint firstAttribute="bottom" secondItem="zhW-Re-WNf" secondAttribute="bottom" id="OWw-FY-KOh"/>
+                <constraint firstAttribute="trailing" secondItem="iMf-wr-wRV" secondAttribute="trailing" constant="20" id="dJM-7c-k31"/>
+                <constraint firstItem="iMf-wr-wRV" firstAttribute="firstBaseline" secondItem="zhW-Re-WNf" secondAttribute="firstBaseline" id="iU7-F2-XDu"/>
+            </constraints>
+            <viewLayoutGuide key="safeArea" id="N3q-SZ-Vyv"/>
+            <connections>
+                <outlet property="button" destination="iMf-wr-wRV" id="kWT-cc-BjS"/>
+                <outlet property="textLabel" destination="zhW-Re-WNf" id="UOg-4X-rWx"/>
+            </connections>
+            <point key="canvasLocation" x="19.565217391304348" y="30.803571428571427"/>
+        </collectionReusableView>
+    </objects>
+</document>

AltStore/My Apps/MyAppsComponents.swift

@@ -7,9 +7,12 @@
 //
 
 import UIKit
+import Roxas
 
 class InstalledAppCollectionViewCell: UICollectionViewCell
 {
+    private(set) var deactivateBadge: UIView?
+    
     @IBOutlet var bannerView: AppBannerView!
     
     override func awakeFromNib()
@@ -19,12 +22,40 @@ class InstalledAppCollectionViewCell: UICollectionViewCell
         self.contentView.autoresizingMask = [.flexibleWidth, .flexibleHeight]
         self.contentView.preservesSuperviewLayoutMargins = true
         
-        self.bannerView.buttonLabel.text = NSLocalizedString("Expires in", comment: "")
-        self.bannerView.buttonLabel.isHidden = false
+        if #available(iOS 13.0, *)
+        {
+            let deactivateBadge = UIView()
+            deactivateBadge.translatesAutoresizingMaskIntoConstraints = false
+            deactivateBadge.isHidden = true
+            self.addSubview(deactivateBadge)
+            
+            // Solid background to make the X opaque white.
+            let backgroundView = UIView()
+            backgroundView.translatesAutoresizingMaskIntoConstraints = false
+            backgroundView.backgroundColor = .white
+            deactivateBadge.addSubview(backgroundView)
+                        
+            let badgeView = UIImageView(image: UIImage(systemName: "xmark.circle.fill"))
+            badgeView.preferredSymbolConfiguration = UIImage.SymbolConfiguration(scale: .large)
+            badgeView.tintColor = .systemRed
+            deactivateBadge.addSubview(badgeView, pinningEdgesWith: .zero)
+            
+            NSLayoutConstraint.activate([
+                deactivateBadge.centerXAnchor.constraint(equalTo: self.bannerView.iconImageView.trailingAnchor),
+                deactivateBadge.centerYAnchor.constraint(equalTo: self.bannerView.iconImageView.topAnchor),
+                
+                backgroundView.centerXAnchor.constraint(equalTo: badgeView.centerXAnchor),
+                backgroundView.centerYAnchor.constraint(equalTo: badgeView.centerYAnchor),
+                backgroundView.widthAnchor.constraint(equalTo: badgeView.widthAnchor, multiplier: 0.5),
+                backgroundView.heightAnchor.constraint(equalTo: badgeView.heightAnchor, multiplier: 0.5)
+            ])
+            
+            self.deactivateBadge = deactivateBadge
+        }
     }
 }
 
-class InstalledAppsCollectionHeaderView: UICollectionReusableView
+class InstalledAppsCollectionFooterView: UICollectionReusableView
 {
     @IBOutlet var textLabel: UILabel!
     @IBOutlet var button: UIButton!

AltStore/My Apps/UpdateCollectionViewCell.swift

@@ -30,6 +30,8 @@ extension UpdateCollectionViewCell
     @IBOutlet var versionDescriptionTextView: CollapsingTextView!
     
     @IBOutlet private var blurView: UIVisualEffectView!
+    
+    private var originalTintColor: UIColor?
             
     override func awakeFromNib()
     {
@@ -52,6 +54,11 @@ extension UpdateCollectionViewCell
     {
         super.tintColorDidChange()
         
+        if self.tintAdjustmentMode != .dimmed
+        {
+            self.originalTintColor = self.tintColor
+        }
+        
         self.update()
     }
     
@@ -91,11 +98,9 @@ private extension UpdateCollectionViewCell
         case .expanded: self.versionDescriptionTextView.isCollapsed = false
         }
         
-        self.versionDescriptionTitleLabel.textColor = self.tintColor
-        self.blurView.backgroundColor = self.tintColor
-        
-        self.bannerView.button.tintColor = self.tintColor
-        self.bannerView.button.progressTintColor = self.tintColor
+        self.versionDescriptionTitleLabel.textColor = self.originalTintColor ?? self.tintColor
+        self.blurView.backgroundColor = self.originalTintColor ?? self.tintColor
+        self.bannerView.button.progressTintColor = self.originalTintColor ?? self.tintColor
         
         self.setNeedsLayout()
         self.layoutIfNeeded()

AltStore/News/NewsViewController.swift

@@ -56,6 +56,13 @@ class NewsViewController: UICollectionViewController
     // Cache
     private var cachedCellSizes = [String: CGSize]()
     
+    required init?(coder: NSCoder)
+    {
+        super.init(coder: coder)
+        
+        NotificationCenter.default.addObserver(self, selector: #selector(NewsViewController.importApp(_:)), name: AppDelegate.importAppDeepLinkNotification, object: nil)
+    }
+    
     override func viewDidLoad()
     {
         super.viewDidLoad()
@@ -99,9 +106,11 @@ private extension NewsViewController
     func makeDataSource() -> RSTFetchedResultsCollectionViewPrefetchingDataSource<NewsItem, UIImage>
     {
         let fetchRequest = NewsItem.fetchRequest() as NSFetchRequest<NewsItem>
-        fetchRequest.sortDescriptors = [NSSortDescriptor(keyPath: \NewsItem.sortIndex, ascending: false)]
+        fetchRequest.sortDescriptors = [NSSortDescriptor(keyPath: \NewsItem.date, ascending: false),
+                                        NSSortDescriptor(keyPath: \NewsItem.sortIndex, ascending: true),
+                                        NSSortDescriptor(keyPath: \NewsItem.sourceIdentifier, ascending: true)]
         
-        let fetchedResultsController = NSFetchedResultsController(fetchRequest: fetchRequest, managedObjectContext: DatabaseManager.shared.viewContext, sectionNameKeyPath: #keyPath(NewsItem.sortIndex), cacheName: nil)
+        let fetchedResultsController = NSFetchedResultsController(fetchRequest: fetchRequest, managedObjectContext: DatabaseManager.shared.viewContext, sectionNameKeyPath: #keyPath(NewsItem.objectID), cacheName: nil)
         
         let dataSource = RSTFetchedResultsCollectionViewPrefetchingDataSource<NewsItem, UIImage>(fetchedResultsController: fetchedResultsController)
         dataSource.proxy = self
@@ -165,23 +174,25 @@ private extension NewsViewController
     {
         self.loadingState = .loading
         
-        AppManager.shared.fetchSource() { (result) in
+        AppManager.shared.fetchSources() { (result) in
             do
             {
-                let source = try result.get()
-                try source.managedObjectContext?.save()
+                let sources = try result.get()
+                try sources.first?.managedObjectContext?.save()
                 
                 DispatchQueue.main.async {
                     self.loadingState = .finished(.success(()))
                 }
             }
-            catch
+            catch let error as NSError
             {
                 DispatchQueue.main.async {
                     if self.dataSource.itemCount > 0
                     {
-                        let toastView = ToastView(text: error.localizedDescription, detailText: nil)
-                        toastView.show(in: self.navigationController?.view ?? self.view, duration: 2.0)
+                        let error = error.withLocalizedFailure(NSLocalizedString("Failed to Fetch Sources", comment: ""))
+                        
+                        let toastView = ToastView(error: error)
+                        toastView.show(in: self)
                     }
                     
                     self.loadingState = .finished(.failure(error))
@@ -277,8 +288,8 @@ private extension NewsViewController
                 {
                 case .failure(OperationError.cancelled): break // Ignore
                 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)
                     
                 case .success: print("Installed app:", storeApp.bundleIdentifier)
                 }
@@ -300,6 +311,14 @@ private extension NewsViewController
     }
 }
 
+private extension NewsViewController
+{
+    @objc func importApp(_ notification: Notification)
+    {
+        self.presentedViewController?.dismiss(animated: true, completion: nil)
+    }
+}
+
 extension NewsViewController
 {
     override func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath)

AltStore/Operations/AppOperationContext.swift

@@ -1,58 +0,0 @@
-//
-//  Contexts.swift
-//  AltStore
-//
-//  Created by Riley Testut on 6/20/19.
-//  Copyright © 2019 Riley Testut. All rights reserved.
-//
-
-import Foundation
-import CoreData
-import Network
-
-import AltSign
-
-class AppOperationContext
-{
-    lazy var temporaryDirectory: URL = {
-        let temporaryDirectory = FileManager.default.uniqueTemporaryURL()
-        
-        do { try FileManager.default.createDirectory(at: temporaryDirectory, withIntermediateDirectories: true, attributes: nil) }
-        catch { self.error = error }
-        
-        return temporaryDirectory
-    }()
-    
-    var bundleIdentifier: String
-    var group: OperationGroup
-    
-    var app: ALTApplication?
-    var resignedApp: ALTApplication?
-    
-    var connection: NWConnection?
-    
-    var installedApp: InstalledApp? {
-        didSet {
-            self.installedAppContext = self.installedApp?.managedObjectContext
-        }
-    }
-    private var installedAppContext: NSManagedObjectContext?
-    
-    var isFinished = false
-    
-    var error: Error? {
-        get {
-            return _error ?? self.group.error
-        }
-        set {
-            _error = newValue
-        }
-    }
-    private var _error: Error?
-    
-    init(bundleIdentifier: String, group: OperationGroup)
-    {
-        self.bundleIdentifier = bundleIdentifier
-        self.group = group
-    }
-}

AltStore/Operations/AuthenticationOperation.swift

@@ -8,7 +8,9 @@
 
 import Foundation
 import Roxas
+import Network
 
+import AltKit
 import AltSign
 
 enum AuthenticationError: LocalizedError
@@ -30,8 +32,10 @@ enum AuthenticationError: LocalizedError
 }
 
 @objc(AuthenticationOperation)
-class AuthenticationOperation: ResultOperation<ALTSigner>
+class AuthenticationOperation: ResultOperation<(ALTTeam, ALTCertificate, ALTAppleAPISession)>
 {
+    let context: AuthenticatedOperationContext
+    
     private weak var presentingViewController: UIViewController?
     
     private lazy var navigationController: UINavigationController = {
@@ -48,57 +52,92 @@ class AuthenticationOperation: ResultOperation<ALTSigner>
     private var appleIDPassword: String?
     private var shouldShowInstructions = false
     
-    private var signer: ALTSigner?
+    private let operationQueue = OperationQueue()
     
-    init(presentingViewController: UIViewController?)
+    private var submitCodeAction: UIAlertAction?
+    
+    init(context: AuthenticatedOperationContext, presentingViewController: UIViewController?)
     {
+        self.context = context
         self.presentingViewController = presentingViewController
         
         super.init()
-                
-        self.progress.totalUnitCount = 3
+        
+        self.context.authenticationOperation = self
+        self.operationQueue.name = "com.altstore.AuthenticationOperation"
+        self.progress.totalUnitCount = 4
     }
     
     override func main()
     {
         super.main()
         
+        if let error = self.context.error
+        {
+            self.finish(.failure(error))
+            return
+        }
+                
         // Sign In
-        self.signIn { (result) in
+        self.signIn() { (result) in
             guard !self.isCancelled else { return self.finish(.failure(OperationError.cancelled)) }
             
             switch result
             {
             case .failure(let error): self.finish(.failure(error))
-            case .success(let account):
+            case .success((let account, let session)):
+                self.context.session = session
                 self.progress.completedUnitCount += 1
                 
                 // Fetch Team
-                self.fetchTeam(for: account) { (result) in
+                self.fetchTeam(for: account, session: session) { (result) in
                     guard !self.isCancelled else { return self.finish(.failure(OperationError.cancelled)) }
                     
                     switch result
                     {
                     case .failure(let error): self.finish(.failure(error))
                     case .success(let team):
+                        self.context.team = team
                         self.progress.completedUnitCount += 1
                         
                         // Fetch Certificate
-                        self.fetchCertificate(for: team) { (result) in
+                        self.fetchCertificate(for: team, session: session) { (result) in
                             guard !self.isCancelled else { return self.finish(.failure(OperationError.cancelled)) }
                             
                             switch result
                             {
                             case .failure(let error): self.finish(.failure(error))
                             case .success(let certificate):
+                                self.context.certificate = certificate
                                 self.progress.completedUnitCount += 1
-                                
-                                let signer = ALTSigner(team: team, certificate: certificate)
-                                self.signer = signer
-                                
-                                self.showInstructionsIfNecessary() { (didShowInstructions) in
-                                    self.finish(.success(signer))
-                                }                                
+                                       
+                                // Register Device
+                                self.registerCurrentDevice(for: team, session: session) { (result) in
+                                    guard !self.isCancelled else { return self.finish(.failure(OperationError.cancelled)) }
+                                    
+                                    switch result
+                                    {
+                                    case .failure(let error): self.finish(.failure(error))
+                                    case .success:
+                                        self.progress.completedUnitCount += 1
+                                        
+                                        // Save account/team to disk.
+                                        self.save(team) { (result) in
+                                            guard !self.isCancelled else { return self.finish(.failure(OperationError.cancelled)) }
+                                            
+                                            switch result
+                                            {
+                                            case .failure(let error): self.finish(.failure(error))
+                                            case .success:
+                                                // Must cache App IDs _after_ saving account/team to disk.
+                                                self.cacheAppIDs(team: team, session: session) { (result) in
+                                                    let result = result.map { _ in (team, certificate, session) }
+                                                    self.finish(result)
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
                             }
                         }
                     }
@@ -107,21 +146,65 @@ class AuthenticationOperation: ResultOperation<ALTSigner>
         }
     }
     
-    override func finish(_ result: Result<ALTSigner, Error>)
+    func save(_ altTeam: ALTTeam, completionHandler: @escaping (Result<Void, Error>) -> Void)
     {
-        guard !self.isFinished else { return }
-        
-        print("Finished authenticating with result:", result)
-        
         let context = DatabaseManager.shared.persistentContainer.newBackgroundContext()
         context.performAndWait {
             do
             {
-                let signer = try result.get()
-                let altAccount = signer.team.account
+                let account: Account
+                let team: Team
+                
+                if let tempAccount = Account.first(satisfying: NSPredicate(format: "%K == %@", #keyPath(Account.identifier), altTeam.account.identifier), in: context)
+                {
+                    account = tempAccount
+                }
+                else
+                {
+                    account = Account(altTeam.account, context: context)
+                }
+                
+                if let tempTeam = Team.first(satisfying: NSPredicate(format: "%K == %@", #keyPath(Team.identifier), altTeam.identifier), in: context)
+                {
+                    team = tempTeam
+                }
+                else
+                {
+                    team = Team(altTeam, account: account, context: context)
+                }
+                
+                account.update(account: altTeam.account)
+                team.update(team: altTeam)
+                                
+                try context.save()
+                
+                completionHandler(.success(()))
+            }
+            catch
+            {
+                completionHandler(.failure(error))
+            }
+        }
+    }
+    
+    override func finish(_ result: Result<(ALTTeam, ALTCertificate, ALTAppleAPISession), Error>)
+    {
+        guard !self.isFinished else { return }
+        
+        print("Finished authenticating with result:", result.error?.localizedDescription ?? "success")
+        
+        let context = DatabaseManager.shared.persistentContainer.newBackgroundContext()
+        context.perform {
+            do
+            {
+                let (altTeam, altCertificate, session) = try result.get()
+                
+                guard
+                    let account = Account.first(satisfying: NSPredicate(format: "%K == %@", #keyPath(Account.identifier), altTeam.account.identifier), in: context),
+                    let team = Team.first(satisfying: NSPredicate(format: "%K == %@", #keyPath(Team.identifier), altTeam.identifier), in: context)
+                else { throw AuthenticationError.noTeam }
                 
                 // Account
-                let account = Account(altAccount, context: context)
                 account.isActiveAccount = true
                 
                 let otherAccountsFetchRequest = Account.fetchRequest() as NSFetchRequest<Account>
@@ -134,7 +217,6 @@ class AuthenticationOperation: ResultOperation<ALTSigner>
                 }
                 
                 // Team
-                let team = Team(signer.team, account: account, context: context)
                 team.isActiveTeam = true
                 
                 let otherTeamsFetchRequest = Team.fetchRequest() as NSFetchRequest<Team>
@@ -146,28 +228,42 @@ class AuthenticationOperation: ResultOperation<ALTSigner>
                     team.isActiveTeam = false
                 }
                 
+                let activeAppsMinimumVersion = OperatingSystemVersion(majorVersion: 13, minorVersion: 3, patchVersion: 1)
+                if team.type == .free, ProcessInfo.processInfo.isOperatingSystemAtLeast(activeAppsMinimumVersion)
+                {
+                    UserDefaults.standard.activeAppsLimit = ALTActiveAppsLimit
+                }
+                else
+                {
+                    UserDefaults.standard.activeAppsLimit = nil
+                }
+                
                 // Save
                 try context.save()
                 
                 // Update keychain
-                Keychain.shared.appleIDEmailAddress = altAccount.appleID // "account" may have nil appleID since we just saved.
+                Keychain.shared.appleIDEmailAddress = altTeam.account.appleID
                 Keychain.shared.appleIDPassword = self.appleIDPassword
                 
-                Keychain.shared.signingCertificate = signer.certificate.p12Data()
-                Keychain.shared.signingCertificatePassword = signer.certificate.machineIdentifier
+                Keychain.shared.signingCertificate = altCertificate.p12Data()
+                Keychain.shared.signingCertificatePassword = altCertificate.machineIdentifier
                 
-                // Refresh screen must go last since a successful refresh will cause the app to quit.
-                self.showRefreshScreenIfNecessary() { (didShowRefreshAlert) in
-                    super.finish(.success(signer))
+                self.showInstructionsIfNecessary() { (didShowInstructions) in
                     
-                    DispatchQueue.main.async {
-                        self.navigationController.dismiss(animated: true, completion: nil)
+                    let signer = ALTSigner(team: altTeam, certificate: altCertificate)
+                    // Refresh screen must go last since a successful refresh will cause the app to quit.
+                    self.showRefreshScreenIfNecessary(signer: signer, session: session) { (didShowRefreshAlert) in
+                        super.finish(result)
+                        
+                        DispatchQueue.main.async {
+                            self.navigationController.dismiss(animated: true, completion: nil)
+                        }
                     }
                 }
             }
             catch
             {
-                super.finish(.failure(error))
+                super.finish(result)
                 
                 DispatchQueue.main.async {
                     self.navigationController.dismiss(animated: true, completion: nil)
@@ -204,21 +300,26 @@ private extension AuthenticationOperation
 
 private extension AuthenticationOperation
 {
-    func signIn(completionHandler: @escaping (Result<ALTAccount, Swift.Error>) -> Void)
+    func signIn(completionHandler: @escaping (Result<(ALTAccount, ALTAppleAPISession), Swift.Error>) -> Void)
     {
         func authenticate()
         {
             DispatchQueue.main.async {
                 let authenticationViewController = self.storyboard.instantiateViewController(withIdentifier: "authenticationViewController") as! AuthenticationViewController
-                authenticationViewController.authenticationHandler = { (result) in
-                    if let (account, password) = result
+                authenticationViewController.authenticationHandler = { (appleID, password, completionHandler) in
+                    self.authenticate(appleID: appleID, password: password) { (result) in
+                        completionHandler(result)
+                    }
+                }
+                authenticationViewController.completionHandler = { (result) in
+                    if let (account, session, password) = result
                     {
                         // We presented the Auth UI and the user signed in.
                         // In this case, we'll assume we should show the instructions again.
                         self.shouldShowInstructions = true
                         
                         self.appleIDPassword = password
-                        completionHandler(.success(account))
+                        completionHandler(.success((account, session)))
                     }
                     else
                     {
@@ -235,24 +336,17 @@ private extension AuthenticationOperation
         
         if let appleID = Keychain.shared.appleIDEmailAddress, let password = Keychain.shared.appleIDPassword
         {
-            ALTAppleAPI.shared.authenticate(appleID: appleID, password: password) { (account, error) in
-                do
+            self.authenticate(appleID: appleID, password: password) { (result) in
+                switch result
                 {
+                case .success((let account, let session)):
                     self.appleIDPassword = password
+                    completionHandler(.success((account, session)))
                     
-                    let account = try Result(account, error).get()
-                    completionHandler(.success(account))
-                }
-                catch ALTAppleAPIError.incorrectCredentials
-                {
+                case .failure(ALTAppleAPIError.incorrectCredentials), .failure(ALTAppleAPIError.appSpecificPasswordRequired):
                     authenticate()
-                }
-                catch ALTAppleAPIError.appSpecificPasswordRequired
-                {
-                    authenticate()
-                }
-                catch
-                {
+                    
+                case .failure(let error):
                     completionHandler(.failure(error))
                 }
             }
@@ -263,7 +357,78 @@ private extension AuthenticationOperation
         }
     }
     
-    func fetchTeam(for account: ALTAccount, completionHandler: @escaping (Result<ALTTeam, Swift.Error>) -> Void)
+    func authenticate(appleID: String, password: String, completionHandler: @escaping (Result<(ALTAccount, ALTAppleAPISession), Swift.Error>) -> Void)
+    {
+        let fetchAnisetteDataOperation = FetchAnisetteDataOperation(context: self.context)
+        fetchAnisetteDataOperation.resultHandler = { (result) in
+            switch result
+            {
+            case .failure(let error): completionHandler(.failure(error))
+            case .success(let anisetteData):
+                let verificationHandler: ((@escaping (String?) -> Void) -> Void)?
+                
+                if let presentingViewController = self.presentingViewController
+                {
+                    verificationHandler = { (completionHandler) in
+                        DispatchQueue.main.async {
+                            let alertController = UIAlertController(title: NSLocalizedString("Please enter the 6-digit verification code that was sent to your Apple devices.", comment: ""), message: nil, preferredStyle: .alert)
+                            alertController.addTextField { (textField) in
+                                textField.autocorrectionType = .no
+                                textField.autocapitalizationType = .none
+                                textField.keyboardType = .numberPad
+                                
+                                NotificationCenter.default.addObserver(self, selector: #selector(AuthenticationOperation.textFieldTextDidChange(_:)), name: UITextField.textDidChangeNotification, object: textField)
+                            }
+                            
+                            let submitAction = UIAlertAction(title: NSLocalizedString("Continue", comment: ""), style: .default) { (action) in
+                                let textField = alertController.textFields?.first
+                                
+                                let code = textField?.text ?? ""
+                                completionHandler(code)
+                            }
+                            submitAction.isEnabled = false
+                            alertController.addAction(submitAction)
+                            self.submitCodeAction = submitAction
+                            
+                            alertController.addAction(UIAlertAction(title: RSTSystemLocalizedString("Cancel"), style: .cancel) { (action) in
+                                completionHandler(nil)
+                            })
+                            
+                            if self.navigationController.presentingViewController != nil
+                            {
+                                self.navigationController.present(alertController, animated: true, completion: nil)
+                            }
+                            else
+                            {
+                                presentingViewController.present(alertController, animated: true, completion: nil)
+                            }
+                        }
+                    }
+                }
+                else
+                {
+                    // No view controller to present security code alert, so don't provide verificationHandler.
+                    verificationHandler = nil
+                }
+                    
+                ALTAppleAPI.shared.authenticate(appleID: appleID, password: password, anisetteData: anisetteData,
+                                                verificationHandler: verificationHandler) { (account, session, error) in
+                    if let account = account, let session = session
+                    {
+                        completionHandler(.success((account, session)))
+                    }
+                    else
+                    {
+                        completionHandler(.failure(error ?? OperationError.unknown))
+                    }
+                }
+            }
+        }
+        
+        self.operationQueue.addOperation(fetchAnisetteDataOperation)
+    }
+    
+    func fetchTeam(for account: ALTAccount, session: ALTAppleAPISession, completionHandler: @escaping (Result<ALTTeam, Swift.Error>) -> Void)
     {
         func selectTeam(from teams: [ALTTeam])
         {
@@ -285,7 +450,7 @@ private extension AuthenticationOperation
             }
         }
 
-        ALTAppleAPI.shared.fetchTeams(for: account) { (teams, error) in
+        ALTAppleAPI.shared.fetchTeams(for: account, session: session) { (teams, error) in
             switch Result(teams, error)
             {
             case .failure(let error): completionHandler(.failure(error))
@@ -304,18 +469,18 @@ private extension AuthenticationOperation
         }
     }
     
-    func fetchCertificate(for team: ALTTeam, completionHandler: @escaping (Result<ALTCertificate, Swift.Error>) -> Void)
+    func fetchCertificate(for team: ALTTeam, session: ALTAppleAPISession, completionHandler: @escaping (Result<ALTCertificate, Swift.Error>) -> Void)
     {
         func requestCertificate()
         {
             let machineName = "AltStore - " + UIDevice.current.name
-            ALTAppleAPI.shared.addCertificate(machineName: machineName, to: team) { (certificate, error) in
+            ALTAppleAPI.shared.addCertificate(machineName: machineName, to: team, session: session) { (certificate, error) in
                 do
                 {
                     let certificate = try Result(certificate, error).get()
                     guard let privateKey = certificate.privateKey else { throw AuthenticationError.missingPrivateKey }
                     
-                    ALTAppleAPI.shared.fetchCertificates(for: team) { (certificates, error) in
+                    ALTAppleAPI.shared.fetchCertificates(for: team, session: session) { (certificates, error) in
                         do
                         {
                             let certificates = try Result(certificates, error).get()
@@ -344,7 +509,7 @@ private extension AuthenticationOperation
         {
             guard let certificate = certificates.first else { return completionHandler(.failure(AuthenticationError.noCertificate)) }
             
-            ALTAppleAPI.shared.revoke(certificate, for: team) { (success, error) in
+            ALTAppleAPI.shared.revoke(certificate, for: team, session: session) { (success, error) in
                 if let error = error, !success
                 {
                     completionHandler(.failure(error))
@@ -356,7 +521,7 @@ private extension AuthenticationOperation
             }
         }
         
-        ALTAppleAPI.shared.fetchCertificates(for: team) { (certificates, error) in
+        ALTAppleAPI.shared.fetchCertificates(for: team, session: session) { (certificates, error) in
             do
             {
                 let certificates = try Result(certificates, error).get()
@@ -411,6 +576,55 @@ private extension AuthenticationOperation
         }
     }
     
+    func registerCurrentDevice(for team: ALTTeam, session: ALTAppleAPISession, completionHandler: @escaping (Result<ALTDevice, Error>) -> Void)
+    {
+        guard let udid = Bundle.main.object(forInfoDictionaryKey: Bundle.Info.deviceID) as? String else {
+            return completionHandler(.failure(OperationError.unknownUDID))
+        }
+        
+        ALTAppleAPI.shared.fetchDevices(for: team, session: session) { (devices, error) in
+            do
+            {
+                let devices = try Result(devices, error).get()
+                
+                if let device = devices.first(where: { $0.identifier == udid })
+                {
+                    completionHandler(.success(device))
+                }
+                else
+                {
+                    ALTAppleAPI.shared.registerDevice(name: UIDevice.current.name, identifier: udid, team: team, session: session) { (device, error) in
+                        completionHandler(Result(device, error))
+                    }
+                }
+            }
+            catch
+            {
+                completionHandler(.failure(error))
+            }
+        }
+    }
+    
+    func cacheAppIDs(team: ALTTeam, session: ALTAppleAPISession, completionHandler: @escaping (Result<Void, Error>) -> Void)
+    {
+        let fetchAppIDsOperation = FetchAppIDsOperation(context: self.context)
+        fetchAppIDsOperation.resultHandler = { (result) in
+            do
+            {
+                let (_, context) = try result.get()
+                try context.save()
+                
+                completionHandler(.success(()))
+            }
+            catch
+            {
+                completionHandler(.failure(error))
+            }
+        }
+        
+        self.operationQueue.addOperation(fetchAppIDsOperation)
+    }
+    
     func showInstructionsIfNecessary(completionHandler: @escaping (Bool) -> Void)
     {
         guard self.shouldShowInstructions else { return completionHandler(false) }
@@ -429,17 +643,22 @@ private extension AuthenticationOperation
         }
     }
     
-    func showRefreshScreenIfNecessary(completionHandler: @escaping (Bool) -> Void)
+    func showRefreshScreenIfNecessary(signer: ALTSigner, session: ALTAppleAPISession, completionHandler: @escaping (Bool) -> Void)
     {
-        guard let signer = self.signer else { return completionHandler(false) }
         guard let application = ALTApplication(fileURL: Bundle.main.bundleURL), let provisioningProfile = application.provisioningProfile else { return completionHandler(false) }
         
         // If we're not using the same certificate used to install AltStore, warn user that they need to refresh.
         guard !provisioningProfile.certificates.contains(signer.certificate) else { return completionHandler(false) }
         
+#if DEBUG
+        completionHandler(false)
+#else
         DispatchQueue.main.async {
+            let context = AuthenticatedOperationContext(context: self.context)
+            context.operations.removeAllObjects() // Prevent deadlock due to endless waiting on previous operations to finish.
+            
             let refreshViewController = self.storyboard.instantiateViewController(withIdentifier: "refreshAltStoreViewController") as! RefreshAltStoreViewController
-            refreshViewController.signer = signer
+            refreshViewController.context = context
             refreshViewController.completionHandler = { _ in
                 completionHandler(true)
             }
@@ -449,5 +668,16 @@ private extension AuthenticationOperation
                 completionHandler(false)
             }
         }
+#endif
+    }
+}
+
+extension AuthenticationOperation
+{
+    @objc func textFieldTextDidChange(_ notification: Notification)
+    {
+        guard let textField = notification.object as? UITextField else { return }
+        
+        self.submitCodeAction?.isEnabled = (textField.text ?? "").count == 6
     }
 }

AltStore/Operations/DeactivateAppOperation.swift

@@ -0,0 +1,90 @@
+//
+//  DeactivateAppOperation.swift
+//  AltStore
+//
+//  Created by Riley Testut on 3/4/20.
+//  Copyright © 2020 Riley Testut. All rights reserved.
+//
+
+import Foundation
+
+import AltSign
+import AltKit
+
+import Roxas
+
+@objc(DeactivateAppOperation)
+class DeactivateAppOperation: ResultOperation<InstalledApp>
+{
+    let app: InstalledApp
+    let context: OperationContext
+    
+    init(app: InstalledApp, context: OperationContext)
+    {
+        self.app = app
+        self.context = context
+        
+        super.init()
+    }
+    
+    override func main()
+    {
+        super.main()
+        
+        if let error = self.context.error
+        {
+            self.finish(.failure(error))
+            return
+        }
+        
+        guard let server = self.context.server else { return self.finish(.failure(OperationError.invalidParameters)) }
+        guard let udid = Bundle.main.object(forInfoDictionaryKey: Bundle.Info.deviceID) as? String else { return self.finish(.failure(OperationError.unknownUDID)) }
+        
+        ServerManager.shared.connect(to: server) { (result) in
+            switch result
+            {
+            case .failure(let error): self.finish(.failure(error))
+            case .success(let connection):
+                print("Sending deactivate app request...")
+                
+                DatabaseManager.shared.persistentContainer.performBackgroundTask { (context) in
+                    let installedApp = context.object(with: self.app.objectID) as! InstalledApp
+                    
+                    let appExtensionProfiles = installedApp.appExtensions.map { $0.resignedBundleIdentifier }
+                    let allIdentifiers = [installedApp.resignedBundleIdentifier] + appExtensionProfiles
+                    
+                    let request = RemoveProvisioningProfilesRequest(udid: udid, bundleIdentifiers: Set(allIdentifiers))
+                    connection.send(request) { (result) in
+                        print("Sent deactive app request!")
+                        
+                        switch result
+                        {
+                        case .failure(let error): self.finish(.failure(error))
+                        case .success:
+                            print("Waiting for deactivate app response...")
+                            connection.receiveResponse() { (result) in
+                                print("Receiving deactivate app response:", result)
+                                
+                                switch result
+                                {
+                                case .failure(let error): self.finish(.failure(error))
+                                case .success(.error(let response)): self.finish(.failure(response.error))
+                                case .success(.removeProvisioningProfiles):
+                                    DatabaseManager.shared.persistentContainer.performBackgroundTask { (context) in
+                                        self.progress.completedUnitCount += 1
+                                        
+                                        let installedApp = context.object(with: self.app.objectID) as! InstalledApp
+                                        installedApp.isActive = false
+                                        self.finish(.success(installedApp))
+                                    }
+                                    
+                                case .success: self.finish(.failure(ALTServerError(.unknownResponse)))
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

AltStore/Operations/FetchAnisetteDataOperation.swift

@@ -0,0 +1,71 @@
+//
+//  FetchAnisetteDataOperation.swift
+//  AltStore
+//
+//  Created by Riley Testut on 1/7/20.
+//  Copyright © 2020 Riley Testut. All rights reserved.
+//
+
+import Foundation
+
+import AltSign
+import AltKit
+
+import Roxas
+
+@objc(FetchAnisetteDataOperation)
+class FetchAnisetteDataOperation: ResultOperation<ALTAnisetteData>
+{
+    let context: OperationContext
+    
+    init(context: OperationContext)
+    {
+        self.context = context
+    }
+    
+    override func main()
+    {
+        super.main()
+        
+        if let error = self.context.error
+        {
+            self.finish(.failure(error))
+            return
+        }
+        
+        guard let server = self.context.server else { return self.finish(.failure(OperationError.invalidParameters)) }
+        
+        ServerManager.shared.connect(to: server) { (result) in
+            switch result
+            {
+            case .failure(let error):
+                self.finish(.failure(error))
+            case .success(let connection):
+                print("Sending anisette data request...")
+                
+                let request = AnisetteDataRequest()
+                connection.send(request) { (result) in
+                    print("Sent anisette data request!")
+                    
+                    switch result
+                    {
+                    case .failure(let error): self.finish(.failure(error))
+                    case .success:
+                        print("Waiting for anisette data...")
+                        connection.receiveResponse() { (result) in
+                            print("Receiving anisette data:", result.error?.localizedDescription ?? "success")
+                            
+                            switch result
+                            {
+                            case .failure(let error): self.finish(.failure(error))
+                            case .success(.error(let response)): self.finish(.failure(response.error))
+                            case .success(.anisetteData(let response)): self.finish(.success(response.anisetteData))
+                            case .success: self.finish(.failure(ALTServerError(.unknownRequest)))
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

AltStore/Operations/FetchAppIDsOperation.swift

@@ -0,0 +1,73 @@
+//
+//  FetchAppIDsOperation.swift
+//  AltStore
+//
+//  Created by Riley Testut on 1/27/20.
+//  Copyright © 2020 Riley Testut. All rights reserved.
+//
+
+import Foundation
+
+import AltSign
+import AltKit
+
+import Roxas
+
+@objc(FetchAppIDsOperation)
+class FetchAppIDsOperation: ResultOperation<([AppID], NSManagedObjectContext)>
+{
+    let context: AuthenticatedOperationContext
+    let managedObjectContext: NSManagedObjectContext
+    
+    init(context: AuthenticatedOperationContext, managedObjectContext: NSManagedObjectContext = DatabaseManager.shared.persistentContainer.newBackgroundContext())
+    {
+        self.context = context
+        self.managedObjectContext = managedObjectContext
+        
+        super.init()
+    }
+    
+    override func main()
+    {
+        super.main()
+        
+        if let error = self.context.error
+        {
+            self.finish(.failure(error))
+            return
+        }
+        
+        guard
+            let team = self.context.team,
+            let session = self.context.session
+        else { return self.finish(.failure(OperationError.invalidParameters)) }
+                
+        ALTAppleAPI.shared.fetchAppIDs(for: team, session: session) { (appIDs, error) in
+            self.managedObjectContext.perform {
+                do
+                {
+                    let fetchedAppIDs = try Result(appIDs, error).get()
+                    
+                    guard let team = Team.first(satisfying: NSPredicate(format: "%K == %@", #keyPath(Team.identifier), team.identifier), in: self.managedObjectContext) else { throw OperationError.notAuthenticated }
+                    
+                    let fetchedIdentifiers = fetchedAppIDs.map { $0.identifier }
+                    
+                    let deletedAppIDsRequest = AppID.fetchRequest() as NSFetchRequest<AppID>
+                    deletedAppIDsRequest.predicate = NSPredicate(format: "%K == %@ AND NOT (%K IN %@)",
+                                                                 #keyPath(AppID.team), team,
+                                                                 #keyPath(AppID.identifier), fetchedIdentifiers)
+                    
+                    let deletedAppIDs = try self.managedObjectContext.fetch(deletedAppIDsRequest)
+                    deletedAppIDs.forEach { self.managedObjectContext.delete($0) }
+                    
+                    let appIDs = fetchedAppIDs.map { AppID($0, team: team, context: self.managedObjectContext) }
+                    self.finish(.success((appIDs, self.managedObjectContext)))
+                }
+                catch
+                {
+                    self.finish(.failure(error))
+                }
+            }
+        }
+    }
+}

AltStore/Operations/FetchProvisioningProfilesOperation.swift

@@ -0,0 +1,431 @@
+//
+//  FetchProvisioningProfilesOperation.swift
+//  AltStore
+//
+//  Created by Riley Testut on 2/27/20.
+//  Copyright © 2020 Riley Testut. All rights reserved.
+//
+
+import Foundation
+import Roxas
+
+import AltSign
+
+@objc(FetchProvisioningProfilesOperation)
+class FetchProvisioningProfilesOperation: ResultOperation<[String: ALTProvisioningProfile]>
+{
+    let context: AppOperationContext
+    
+    private let appGroupsLock = NSLock()
+    
+    init(context: AppOperationContext)
+    {
+        self.context = context
+        
+        super.init()
+        
+        self.progress.totalUnitCount = 1
+    }
+    
+    override func main()
+    {
+        super.main()
+        
+        if let error = self.context.error
+        {
+            self.finish(.failure(error))
+            return
+        }
+        
+        guard
+            let app = self.context.app,
+            let team = self.context.team,
+            let session = self.context.session
+        else { return self.finish(.failure(OperationError.invalidParameters)) }
+        
+        self.progress.totalUnitCount = Int64(1 + app.appExtensions.count)
+        
+        self.prepareProvisioningProfile(for: app, parentApp: nil, team: team, session: session) { (result) in
+            do
+            {
+                self.progress.completedUnitCount += 1
+                
+                let profile = try result.get()
+                
+                var profiles = [app.bundleIdentifier: profile]
+                var error: Error?
+                
+                let dispatchGroup = DispatchGroup()
+                
+                for appExtension in app.appExtensions
+                {
+                    dispatchGroup.enter()
+                    
+                    self.prepareProvisioningProfile(for: appExtension, parentApp: app, team: team, session: session) { (result) in
+                        switch result
+                        {
+                        case .failure(let e): error = e
+                        case .success(let profile): profiles[appExtension.bundleIdentifier] = profile
+                        }
+                        
+                        dispatchGroup.leave()
+                        
+                        self.progress.completedUnitCount += 1
+                    }
+                }
+                
+                dispatchGroup.notify(queue: .global()) {
+                    if let error = error
+                    {
+                        self.finish(.failure(error))
+                    }
+                    else
+                    {
+                        self.finish(.success(profiles))
+                    }
+                }
+            }
+            catch
+            {
+                self.finish(.failure(error))
+            }
+        }
+    }
+    
+    func process<T>(_ result: Result<T, Error>) -> T?
+    {
+        switch result
+        {
+        case .failure(let error):
+            self.finish(.failure(error))
+            return nil
+            
+        case .success(let value):
+            guard !self.isCancelled else {
+                self.finish(.failure(OperationError.cancelled))
+                return nil
+            }
+            
+            return value
+        }
+    }
+}
+
+extension FetchProvisioningProfilesOperation
+{
+    func prepareProvisioningProfile(for app: ALTApplication, parentApp: ALTApplication?, team: ALTTeam, session: ALTAppleAPISession, completionHandler: @escaping (Result<ALTProvisioningProfile, Error>) -> Void)
+    {
+        DatabaseManager.shared.persistentContainer.performBackgroundTask { (context) in
+            
+            let preferredBundleID: String?
+            
+            // Check if we have already installed this app with this team before.
+            let predicate = NSPredicate(format: "%K == %@", #keyPath(InstalledApp.bundleIdentifier), app.bundleIdentifier)
+            if let installedApp = InstalledApp.first(satisfying: predicate, in: context)
+            {
+                // Teams match if installedApp.team has same identifier as team,
+                // or if installedApp.team is nil but resignedBundleIdentifier contains the team's identifier.
+                let teamsMatch = installedApp.team?.identifier == team.identifier || (installedApp.team == nil && installedApp.resignedBundleIdentifier.contains(team.identifier))
+                
+                #if DEBUG
+                
+                if app.bundleIdentifier == StoreApp.altstoreAppID || StoreApp.alternativeAltStoreAppIDs.contains(app.bundleIdentifier)
+                {
+                    // Use legacy bundle ID format for AltStore.
+                    preferredBundleID = "com.\(team.identifier).\(app.bundleIdentifier)"
+                }
+                else
+                {
+                    preferredBundleID = teamsMatch ? installedApp.resignedBundleIdentifier : nil
+                }
+                
+                #else
+                
+                if teamsMatch
+                {
+                    // This app is already installed with the same team, so use the same resigned bundle identifier as before.
+                    // This way, if we change the identifier format (again), AltStore will continue to use
+                    // the old bundle identifier to prevent it from installing as a new app.
+                    preferredBundleID = installedApp.resignedBundleIdentifier
+                }
+                else
+                {
+                    preferredBundleID = nil
+                }
+                
+                #endif
+            }
+            else
+            {
+                preferredBundleID = nil
+            }
+            
+            let bundleID: String
+            
+            if let preferredBundleID = preferredBundleID
+            {
+                bundleID = preferredBundleID
+            }
+            else
+            {
+                // This app isn't already installed, so create the resigned bundle identifier ourselves.
+                // Or, if the app _is_ installed but with a different team, we need to create a new
+                // bundle identifier anyway to prevent collisions with the previous team.
+                let parentBundleID = parentApp?.bundleIdentifier ?? app.bundleIdentifier
+                let updatedParentBundleID = parentBundleID + "." + team.identifier // Append just team identifier to make it harder to track.
+                
+                if app.bundleIdentifier == StoreApp.altstoreAppID || StoreApp.alternativeAltStoreAppIDs.contains(app.bundleIdentifier)
+                {
+                    // Use legacy bundle ID format for AltStore.
+                    bundleID = "com.\(team.identifier).\(app.bundleIdentifier)"
+                }
+                else
+                {
+                    bundleID = app.bundleIdentifier.replacingOccurrences(of: parentBundleID, with: updatedParentBundleID)
+                }
+            }
+            
+            let preferredName: String
+            
+            if let parentApp = parentApp
+            {
+                preferredName = parentApp.name + " " + app.name
+            }
+            else
+            {
+                preferredName = app.name
+            }
+            
+            // Register
+            self.registerAppID(for: app, name: preferredName, bundleIdentifier: bundleID, team: team, session: session) { (result) in
+                switch result
+                {
+                case .failure(let error): completionHandler(.failure(error))
+                case .success(let appID):
+                    
+                    // Update features
+                    self.updateFeatures(for: appID, app: app, team: team, session: session) { (result) in
+                        switch result
+                        {
+                        case .failure(let error): completionHandler(.failure(error))
+                        case .success(let appID):
+                            
+                            // Update app groups
+                            self.updateAppGroups(for: appID, app: app, team: team, session: session) { (result) in
+                                switch result
+                                {
+                                case .failure(let error): completionHandler(.failure(error))
+                                case .success(let appID):
+                                    
+                                    // Fetch Provisioning Profile
+                                    self.fetchProvisioningProfile(for: appID, team: team, session: session) { (result) in
+                                        completionHandler(result)
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+    
+    func registerAppID(for application: ALTApplication, name: String, bundleIdentifier: String, team: ALTTeam, session: ALTAppleAPISession, completionHandler: @escaping (Result<ALTAppID, Error>) -> Void)
+    {
+        ALTAppleAPI.shared.fetchAppIDs(for: team, session: session) { (appIDs, error) in
+            do
+            {
+                let appIDs = try Result(appIDs, error).get()
+                
+                if let appID = appIDs.first(where: { $0.bundleIdentifier == bundleIdentifier })
+                {
+                    completionHandler(.success(appID))
+                }
+                else
+                {
+                    let requiredAppIDs = 1 + application.appExtensions.count
+                    let availableAppIDs = max(0, Team.maximumFreeAppIDs - appIDs.count)
+                    
+                    let sortedExpirationDates = appIDs.compactMap { $0.expirationDate }.sorted(by: { $0 < $1 })
+                    
+                    if team.type == .free
+                    {
+                        if requiredAppIDs > availableAppIDs
+                        {
+                            if let expirationDate = sortedExpirationDates.first
+                            {
+                                throw OperationError.maximumAppIDLimitReached(application: application, requiredAppIDs: requiredAppIDs, availableAppIDs: availableAppIDs, nextExpirationDate: expirationDate)
+                            }
+                            else
+                            {
+                                throw ALTAppleAPIError(.maximumAppIDLimitReached)
+                            }
+                        }
+                    }
+                    
+                    ALTAppleAPI.shared.addAppID(withName: name, bundleIdentifier: bundleIdentifier, team: team, session: session) { (appID, error) in
+                        do
+                        {
+                            do
+                            {
+                                let appID = try Result(appID, error).get()
+                                completionHandler(.success(appID))
+                            }
+                            catch ALTAppleAPIError.maximumAppIDLimitReached
+                            {
+                                if let expirationDate = sortedExpirationDates.first
+                                {
+                                    throw OperationError.maximumAppIDLimitReached(application: application, requiredAppIDs: requiredAppIDs, availableAppIDs: availableAppIDs, nextExpirationDate: expirationDate)
+                                }
+                                else
+                                {
+                                    throw ALTAppleAPIError(.maximumAppIDLimitReached)
+                                }
+                            }
+                        }
+                        catch
+                        {
+                            completionHandler(.failure(error))
+                        }
+                    }
+                }
+            }
+            catch
+            {
+                completionHandler(.failure(error))
+            }
+        }
+    }
+    
+    func updateFeatures(for appID: ALTAppID, app: ALTApplication, team: ALTTeam, session: ALTAppleAPISession, completionHandler: @escaping (Result<ALTAppID, Error>) -> Void)
+    {
+        let requiredFeatures = app.entitlements.compactMap { (entitlement, value) -> (ALTFeature, Any)? in
+            guard let feature = ALTFeature(entitlement: entitlement) else { return nil }
+            return (feature, value)
+        }
+        
+        var features = requiredFeatures.reduce(into: [ALTFeature: Any]()) { $0[$1.0] = $1.1 }
+        
+        if let applicationGroups = app.entitlements[.appGroups] as? [String], !applicationGroups.isEmpty
+        {
+            features[.appGroups] = true
+        }
+        
+        var updateFeatures = false
+        
+        // Determine whether the required features are already enabled for the AppID.
+        for (feature, value) in features
+        {
+            if let appIDValue = appID.features[feature] as AnyObject?, (value as AnyObject).isEqual(appIDValue)
+            {
+                // AppID already has this feature enabled and the values are the same.
+                continue
+            }
+            else
+            {
+                // AppID either doesn't have this feature enabled or the value has changed,
+                // so we need to update it to reflect new values.
+                updateFeatures = true
+                break
+            }
+        }
+        
+        if updateFeatures
+        {
+            let appID = appID.copy() as! ALTAppID
+            appID.features = features
+            
+            ALTAppleAPI.shared.update(appID, team: team, session: session) { (appID, error) in
+                completionHandler(Result(appID, error))
+            }
+        }
+        else
+        {
+            completionHandler(.success(appID))
+        }
+    }
+    
+    func updateAppGroups(for appID: ALTAppID, app: ALTApplication, team: ALTTeam, session: ALTAppleAPISession, completionHandler: @escaping (Result<ALTAppID, Error>) -> Void)
+    {
+        // TODO: Handle apps belonging to more than one app group.
+        guard let applicationGroups = app.entitlements[.appGroups] as? [String], let groupIdentifier = applicationGroups.first else {
+            return completionHandler(.success(appID))
+        }
+        
+        func finish(_ result: Result<ALTAppGroup, Error>)
+        {
+            switch result
+            {
+            case .failure(let error): completionHandler(.failure(error))
+            case .success(let group):
+                // Assign App Group
+                // TODO: Determine whether app already belongs to app group.
+                
+                ALTAppleAPI.shared.add(appID, to: group, team: team, session: session) { (success, error) in
+                    let result = result.map { _ in appID }
+                    completionHandler(result)
+                }
+            }
+        }
+        
+        // Dispatch onto global queue to prevent appGroupsLock deadlock.
+        DispatchQueue.global().async {
+            let adjustedGroupIdentifier = groupIdentifier + "." + team.identifier
+            
+            // Ensure we're not concurrently fetching and updating app groups,
+            // which can lead to race conditions such as adding an app group twice.
+            self.appGroupsLock.lock()
+            
+            ALTAppleAPI.shared.fetchAppGroups(for: team, session: session) { (groups, error) in
+                switch Result(groups, error)
+                {
+                case .failure(let error):
+                    self.appGroupsLock.unlock()
+                    completionHandler(.failure(error))
+                    
+                case .success(let groups):
+                    if let group = groups.first(where: { $0.groupIdentifier == adjustedGroupIdentifier })
+                    {
+                        self.appGroupsLock.unlock()
+                        finish(.success(group))
+                    }
+                    else
+                    {
+                        // Not all characters are allowed in group names, so we replace periods with spaces (like Apple does).
+                        let name = "AltStore " + groupIdentifier.replacingOccurrences(of: ".", with: " ")
+                        
+                        ALTAppleAPI.shared.addAppGroup(withName: name, groupIdentifier: adjustedGroupIdentifier, team: team, session: session) { (group, error) in
+                            self.appGroupsLock.unlock()
+                            finish(Result(group, error))
+                        }
+                    }
+                }
+            }
+        }
+    }
+    
+    func fetchProvisioningProfile(for appID: ALTAppID, team: ALTTeam, session: ALTAppleAPISession, completionHandler: @escaping (Result<ALTProvisioningProfile, Error>) -> Void)
+    {
+        ALTAppleAPI.shared.fetchProvisioningProfile(for: appID, team: team, session: session) { (profile, error) in
+            switch Result(profile, error)
+            {
+            case .failure(let error): completionHandler(.failure(error))
+            case .success(let profile):
+                
+                // Delete existing profile
+                ALTAppleAPI.shared.delete(profile, for: team, session: session) { (success, error) in
+                    switch Result(success, error)
+                    {
+                    case .failure(let error): completionHandler(.failure(error))
+                    case .success:
+                        
+                        // Fetch new provisiong profile
+                        ALTAppleAPI.shared.fetchProvisioningProfile(for: appID, team: team, session: session) { (profile, error) in
+                            completionHandler(Result(profile, error))
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

AltStore/Operations/FetchSourceOperation.swift

@@ -7,12 +7,15 @@
 //
 
 import Foundation
+import CoreData
+
 import Roxas
 
 @objc(FetchSourceOperation)
 class FetchSourceOperation: ResultOperation<Source>
 {
     let sourceURL: URL
+    let managedObjectContext: NSManagedObjectContext
     
     private let session: URLSession
     
@@ -21,9 +24,10 @@ class FetchSourceOperation: ResultOperation<Source>
         return dateFormatter
     }()
     
-    init(sourceURL: URL)
+    init(sourceURL: URL, managedObjectContext: NSManagedObjectContext = DatabaseManager.shared.persistentContainer.newBackgroundContext())
     {
         self.sourceURL = sourceURL
+        self.managedObjectContext = managedObjectContext
         
         let configuration = URLSessionConfiguration.default
         configuration.requestCachePolicy = .reloadIgnoringLocalCacheData
@@ -37,7 +41,7 @@ class FetchSourceOperation: ResultOperation<Source>
         super.main()
         
         let dataTask = self.session.dataTask(with: self.sourceURL) { (data, response, error) in
-            DatabaseManager.shared.persistentContainer.performBackgroundTask { (context) in
+            self.managedObjectContext.perform {
                 do
                 {
                     let (data, _) = try Result((data, response), error).get()
@@ -64,9 +68,16 @@ class FetchSourceOperation: ResultOperation<Source>
                         throw DecodingError.dataCorruptedError(in: container, debugDescription: "Date is in invalid format.")
                     })
                     
-                    decoder.managedObjectContext = context
+                    decoder.managedObjectContext = self.managedObjectContext
+                    decoder.sourceURL = self.sourceURL
                     
                     let source = try decoder.decode(Source.self, from: data)
+                    
+                    if source.identifier == Source.altStoreIdentifier, let patreonAccessToken = source.userInfo?[.patreonAccessToken]
+                    {
+                        Keychain.shared.patreonCreatorAccessToken = patreonAccessToken
+                    }
+                    
                     self.finish(.success(source))
                 }
                 catch

AltStore/Operations/FindServerOperation.swift

@@ -7,45 +7,90 @@
 //
 
 import Foundation
+import AltKit
 import Roxas
 
+private extension Notification.Name
+{
+    static let didReceiveWiredServerConnectionResponse = Notification.Name("io.altstore.didReceiveWiredServerConnectionResponse")
+}
+
+private let ReceivedWiredServerConnectionResponse: @convention(c) (CFNotificationCenter?, UnsafeMutableRawPointer?, CFNotificationName?, UnsafeRawPointer?, CFDictionary?) -> Void =
+{ (center, observer, name, object, userInfo) in
+    NotificationCenter.default.post(name: .didReceiveWiredServerConnectionResponse, object: nil)
+}
+
 @objc(FindServerOperation)
 class FindServerOperation: ResultOperation<Server>
 {
-    let group: OperationGroup
+    let context: OperationContext
     
-    init(group: OperationGroup)
+    private var isWiredServerConnectionAvailable = false
+    
+    init(context: OperationContext = OperationContext())
     {
-        self.group = group
-        
-        super.init()
+        self.context = context
     }
-    
+        
     override func main()
     {
         super.main()
         
-        if let error = self.group.error
+        if let error = self.context.error
         {
             self.finish(.failure(error))
             return
         }
         
-        if let server = ServerManager.shared.discoveredServers.first(where: { $0.isPreferred })
+        if let server = self.context.server
         {
-            // Preferred server.
             self.finish(.success(server))
+            return
         }
-        else if let server = ServerManager.shared.discoveredServers.first
-        {
-            // Any available server.
-            self.finish(.success(server))
-        }
-        else
-        {
-            // No servers.
-            self.finish(.failure(ConnectionError.serverNotFound))
+        
+        let notificationCenter = CFNotificationCenterGetDarwinNotifyCenter()
+        
+        // Prepare observers to receive callback from wired server (if connected).
+        CFNotificationCenterAddObserver(notificationCenter, nil, ReceivedWiredServerConnectionResponse, CFNotificationName.wiredServerConnectionAvailableResponse.rawValue, nil, .deliverImmediately)
+        NotificationCenter.default.addObserver(self, selector: #selector(FindServerOperation.didReceiveWiredServerConnectionResponse(_:)), name: .didReceiveWiredServerConnectionResponse, object: nil)
+        
+        // Post notification.
+        CFNotificationCenterPostNotification(notificationCenter, .wiredServerConnectionAvailableRequest, nil, nil, true)
+        
+        // Wait for either callback or timeout.
+        DispatchQueue.global().asyncAfter(deadline: .now() + 1.0) {
+            if self.isWiredServerConnectionAvailable
+            {
+                let server = Server(isWiredConnection: true)
+                self.finish(.success(server))
+            }
+            else
+            {
+                if let server = ServerManager.shared.discoveredServers.first(where: { $0.isPreferred })
+                {
+                    // Preferred server.
+                    self.finish(.success(server))
+                }
+                else if let server = ServerManager.shared.discoveredServers.first
+                {
+                    // Any available server.
+                    self.finish(.success(server))
+                }
+                else
+                {
+                    // No servers.
+                    self.finish(.failure(ConnectionError.serverNotFound))
+                }
+            }
         }
     }
 }
 
+private extension FindServerOperation
+{
+    @objc func didReceiveWiredServerConnectionResponse(_ notification: Notification)
+    {
+        self.isWiredServerConnectionAvailable = true
+    }
+}
+

AltStore/Operations/InstallAppOperation.swift

@@ -16,9 +16,11 @@ import Roxas
 @objc(InstallAppOperation)
 class InstallAppOperation: ResultOperation<InstalledApp>
 {
-    let context: AppOperationContext
+    let context: InstallAppOperationContext
     
-    init(context: AppOperationContext)
+    private var didCleanUp = false
+    
+    init(context: InstallAppOperationContext)
     {
         self.context = context
         
@@ -38,13 +40,15 @@ class InstallAppOperation: ResultOperation<InstalledApp>
         }
         
         guard
+            let certificate = self.context.certificate,
             let resignedApp = self.context.resignedApp,
-            let connection = self.context.connection,
-            let server = self.context.group.server
+            let connection = self.context.installationConnection
         else { return self.finish(.failure(OperationError.invalidParameters)) }
         
         let backgroundContext = DatabaseManager.shared.persistentContainer.newBackgroundContext()
         backgroundContext.perform {
+            
+            /* App */
             let installedApp: InstalledApp
             
             // Fetch + update rather than insert + resolve merge conflicts to prevent potential context-level conflicts.
@@ -54,27 +58,100 @@ class InstallAppOperation: ResultOperation<InstalledApp>
             }
             else
             {
-                installedApp = InstalledApp(resignedApp: resignedApp, originalBundleIdentifier: self.context.bundleIdentifier, context: backgroundContext)
+                installedApp = InstalledApp(resignedApp: resignedApp, originalBundleIdentifier: self.context.bundleIdentifier, certificateSerialNumber: certificate.serialNumber, context: backgroundContext)
             }
             
-            installedApp.version = resignedApp.version
-            
-            if let profile = resignedApp.provisioningProfile
+            installedApp.update(resignedApp: resignedApp, certificateSerialNumber: certificate.serialNumber)
+
+            if let team = DatabaseManager.shared.activeTeam(in: backgroundContext)
             {
-                installedApp.refreshedDate = profile.creationDate
-                installedApp.expirationDate = profile.expirationDate
+                installedApp.team = team
             }
             
-            self.context.group.beginInstallationHandler?(installedApp)
+            /* App Extensions */
+            var installedExtensions = Set<InstalledExtension>()
             
-            let request = BeginInstallationRequest()
-            server.send(request, via: connection) { (result) in
+            if
+                let bundle = Bundle(url: resignedApp.fileURL),
+                let directory = bundle.builtInPlugInsURL,
+                let enumerator = FileManager.default.enumerator(at: directory, includingPropertiesForKeys: nil, options: [.skipsSubdirectoryDescendants])
+            {
+                for case let fileURL as URL in enumerator
+                {
+                    guard let appExtensionBundle = Bundle(url: fileURL) else { continue }
+                    guard let appExtension = ALTApplication(fileURL: appExtensionBundle.bundleURL) else { continue }
+                    
+                    let parentBundleID = self.context.bundleIdentifier
+                    let resignedParentBundleID = resignedApp.bundleIdentifier
+                    
+                    let resignedBundleID = appExtension.bundleIdentifier
+                    let originalBundleID = resignedBundleID.replacingOccurrences(of: resignedParentBundleID, with: parentBundleID)
+                    
+                    let installedExtension: InstalledExtension
+                    
+                    if let appExtension = installedApp.appExtensions.first(where: { $0.bundleIdentifier == originalBundleID })
+                    {
+                        installedExtension = appExtension
+                    }
+                    else
+                    {
+                        installedExtension = InstalledExtension(resignedAppExtension: appExtension, originalBundleIdentifier: originalBundleID, context: backgroundContext)
+                    }
+                    
+                    installedExtension.update(resignedAppExtension: appExtension)
+                    
+                    installedExtensions.insert(installedExtension)
+                }
+            }
+            
+            installedApp.appExtensions = installedExtensions
+            
+            // Temporary directory and resigned .ipa no longer needed, so delete them now to ensure AltStore doesn't quit before we get the chance to.
+            self.cleanUp()
+            
+            self.context.beginInstallationHandler?(installedApp)
+            
+            var activeProfiles: Set<String>?
+            if let sideloadedAppsLimit = UserDefaults.standard.activeAppsLimit
+            {
+                // When installing these new profiles, AltServer will remove all non-active profiles to ensure we remain under limit.
+                
+                let fetchRequest = InstalledApp.activeAppsFetchRequest()
+                fetchRequest.includesPendingChanges = false
+                
+                var activeApps = InstalledApp.fetch(fetchRequest, in: backgroundContext)
+                if !activeApps.contains(installedApp)
+                {
+                    let availableActiveApps = max(sideloadedAppsLimit - activeApps.count, 0)
+                    let requiredActiveAppSlots = 1 + installedExtensions.count // As of iOS 13.3.1, app extensions count as "apps"
+                    
+                    if requiredActiveAppSlots <= availableActiveApps
+                    {
+                        // This app has not been explicitly activated, but there are enough slots available,
+                        // so implicitly activate it.
+                        installedApp.isActive = true
+                        activeApps.append(installedApp)
+                    }
+                    else
+                    {
+                        installedApp.isActive = false
+                    }
+                }
+
+                activeProfiles = Set(activeApps.flatMap { (installedApp) -> [String] in
+                    let appExtensionProfiles = installedApp.appExtensions.map { $0.resignedBundleIdentifier }
+                    return [installedApp.resignedBundleIdentifier] + appExtensionProfiles
+                })
+            }
+            
+            let request = BeginInstallationRequest(activeProfiles: activeProfiles)
+            connection.send(request) { (result) in
                 switch result
                 {
                 case .failure(let error): self.finish(.failure(error))
                 case .success:
                     
-                    self.receive(from: connection, server: server) { (result) in
+                    self.receive(from: connection) { (result) in
                         switch result
                         {
                         case .success:
@@ -92,27 +169,43 @@ class InstallAppOperation: ResultOperation<InstalledApp>
         }
     }
     
-    func receive(from connection: NWConnection, server: Server, completionHandler: @escaping (Result<Void, Error>) -> Void)
+    override func finish(_ result: Result<InstalledApp, Error>)
     {
-        server.receive(ServerResponse.self, from: connection) { (result) in
+        self.cleanUp()
+        
+        super.finish(result)
+    }
+}
+
+private extension InstallAppOperation
+{
+    func receive(from connection: ServerConnection, completionHandler: @escaping (Result<Void, Error>) -> Void)
+    {
+        connection.receiveResponse() { (result) in
             do
             {
                 let response = try result.get()
                 print(response)
                 
-                if let error = response.error
+                switch response
                 {
-                    completionHandler(.failure(error))
-                }
-                else if response.progress == 1.0
-                {
-                    self.progress.completedUnitCount = self.progress.totalUnitCount
-                    completionHandler(.success(()))
-                }
-                else
-                {
-                    self.progress.completedUnitCount = Int64(response.progress * 100)
-                    self.receive(from: connection, server: server, completionHandler: completionHandler)
+                case .installationProgress(let response):
+                    if response.progress == 1.0
+                    {
+                        self.progress.completedUnitCount = self.progress.totalUnitCount
+                        completionHandler(.success(()))
+                    }
+                    else
+                    {
+                        self.progress.completedUnitCount = Int64(response.progress * 100)
+                        self.receive(from: connection, completionHandler: completionHandler)
+                    }
+                    
+                case .error(let response):
+                    completionHandler(.failure(response.error))
+                    
+                default:
+                    completionHandler(.failure(ALTServerError(.unknownRequest)))
                 }
             }
             catch
@@ -121,4 +214,25 @@ class InstallAppOperation: ResultOperation<InstalledApp>
             }
         }
     }
+    
+    func cleanUp()
+    {
+        guard !self.didCleanUp else { return }
+        self.didCleanUp = true
+        
+        do
+        {
+            try FileManager.default.removeItem(at: self.context.temporaryDirectory)
+            
+            if let app = self.context.app
+            {
+                let fileURL = InstalledApp.refreshedIPAURL(for: app)
+                try FileManager.default.removeItem(at: fileURL)
+            }
+        }
+        catch
+        {
+            print("Failed to remove temporary directory.", error)
+        }
+    }
 }

AltStore/Operations/OperationContexts.swift

@@ -0,0 +1,108 @@
+//
+//  Contexts.swift
+//  AltStore
+//
+//  Created by Riley Testut on 6/20/19.
+//  Copyright © 2019 Riley Testut. All rights reserved.
+//
+
+import Foundation
+import CoreData
+import Network
+
+import AltSign
+
+class OperationContext
+{
+    var server: Server?
+    var error: Error?
+    
+    let operations: NSHashTable<Foundation.Operation>
+    
+    init(server: Server? = nil, error: Error? = nil, operations: [Foundation.Operation] = [])
+    {
+        self.server = server
+        self.error = error
+        
+        self.operations = NSHashTable<Foundation.Operation>.weakObjects()
+        for operation in operations
+        {
+            self.operations.add(operation)
+        }
+    }
+    
+    convenience init(context: OperationContext)
+    {
+        self.init(server: context.server, error: context.error, operations: context.operations.allObjects)
+    }
+}
+
+class AuthenticatedOperationContext: OperationContext
+{
+    var session: ALTAppleAPISession?
+    
+    var team: ALTTeam?
+    var certificate: ALTCertificate?
+    
+    weak var authenticationOperation: AuthenticationOperation?
+    
+    convenience init(context: AuthenticatedOperationContext)
+    {
+        self.init(server: context.server, error: context.error, operations: context.operations.allObjects)
+        
+        self.session = context.session
+        self.team = context.team
+        self.certificate = context.certificate
+        self.authenticationOperation = context.authenticationOperation
+    }
+}
+
+@dynamicMemberLookup
+class AppOperationContext
+{
+    let bundleIdentifier: String
+    private let authenticatedContext: AuthenticatedOperationContext
+    
+    var app: ALTApplication?
+    var provisioningProfiles: [String: ALTProvisioningProfile]?
+    
+    var isFinished = false
+    
+    var error: Error? {
+        get {
+            return _error ?? self.authenticatedContext.error
+        }
+        set {
+            _error = newValue
+        }
+    }
+    private var _error: Error?
+    
+    init(bundleIdentifier: String, authenticatedContext: AuthenticatedOperationContext)
+    {
+        self.bundleIdentifier = bundleIdentifier
+        self.authenticatedContext = authenticatedContext
+    }
+    
+    subscript<T>(dynamicMember keyPath: WritableKeyPath<AuthenticatedOperationContext, T>) -> T
+    {
+        return self.authenticatedContext[keyPath: keyPath]
+    }
+}
+
+class InstallAppOperationContext: AppOperationContext
+{
+    lazy var temporaryDirectory: URL = {
+        let temporaryDirectory = FileManager.default.uniqueTemporaryURL()
+        
+        do { try FileManager.default.createDirectory(at: temporaryDirectory, withIntermediateDirectories: true, attributes: nil) }
+        catch { self.error = error }
+        
+        return temporaryDirectory
+    }()
+    
+    var resignedApp: ALTApplication?
+    var installationConnection: ServerConnection?
+    
+    var beginInstallationHandler: ((InstalledApp) -> Void)?
+}

AltStore/Operations/OperationError.swift

@@ -24,10 +24,11 @@ enum OperationError: LocalizedError
     case invalidParameters
     
     case iOSVersionNotSupported(ALTApplication)
+    case maximumAppIDLimitReached(application: ALTApplication, requiredAppIDs: Int, availableAppIDs: Int, nextExpirationDate: Date)
     
     case noSources
     
-    var errorDescription: String? {
+    var failureReason: String? {
         switch self {
         case .unknown: return NSLocalizedString("An unknown error occured.", comment: "")
         case .unknownResult: return NSLocalizedString("The operation returned an unknown result.", comment: "")
@@ -49,6 +50,49 @@ enum OperationError: LocalizedError
             
             let localizedDescription = String(format: NSLocalizedString("%@ requires %@.", comment: ""), name, version)
             return localizedDescription
+            
+        case .maximumAppIDLimitReached: return NSLocalizedString("Cannot register more than 10 App IDs.", comment: "")
+        }
+    }
+    
+    var recoverySuggestion: String? {
+        switch self
+        {
+        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
+            
+            if requiredAppIDs > 1
+            {
+                let availableText: String
+                
+                switch availableAppIDs
+                {
+                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))
+                }
+                
+                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
+            }
+            
+            return message
+            
+        default: return nil
         }
     }
 }

AltStore/Operations/OperationGroup.swift

@@ -1,84 +0,0 @@
-//
-//  OperationGroup.swift
-//  AltStore
-//
-//  Created by Riley Testut on 6/20/19.
-//  Copyright © 2019 Riley Testut. All rights reserved.
-//
-
-import Foundation
-import CoreData
-
-import AltSign
-
-class OperationGroup
-{
-    let progress = Progress.discreteProgress(totalUnitCount: 0)
-    
-    var completionHandler: ((Result<[String: Result<InstalledApp, Error>], Error>) -> Void)?
-    var beginInstallationHandler: ((InstalledApp) -> Void)?
-    
-    var server: Server?
-    var signer: ALTSigner?
-    
-    var error: Error?
-    
-    var results = [String: Result<InstalledApp, Error>]()
-    
-    private var progressByBundleIdentifier = [String: Progress]()
-    
-    private let operationQueue = OperationQueue()
-    private let installOperationQueue = OperationQueue()
-    
-    init()
-    {
-        // Enforce only one installation at a time.
-        self.installOperationQueue.maxConcurrentOperationCount = 1
-    }
-    
-    func cancel()
-    {
-        self.operationQueue.cancelAllOperations()
-        self.installOperationQueue.cancelAllOperations()
-    }
-    
-    func addOperations(_ operations: [Operation])
-    {
-        for operation in operations
-        {
-            if let installOperation = operation as? InstallAppOperation
-            {
-                if let previousOperation = self.installOperationQueue.operations.last
-                {
-                    // Ensures they execute in the order they're added, since isReady is still false at this point.
-                    installOperation.addDependency(previousOperation)
-                }
-                
-                self.installOperationQueue.addOperation(installOperation)
-            }
-            else
-            {
-                self.operationQueue.addOperation(operation)
-            }
-        }
-    }
-    
-    func set(_ progress: Progress, for app: AppProtocol)
-    {
-        self.progressByBundleIdentifier[app.bundleIdentifier] = progress
-        
-        self.progress.totalUnitCount += 1
-        self.progress.addChild(progress, withPendingUnitCount: 1)
-    }
-    
-    func progress(for app: AppProtocol) -> Progress?
-    {
-        return self.progress(forAppWithBundleIdentifier: app.bundleIdentifier)
-    }
-    
-    func progress(forAppWithBundleIdentifier bundleIdentifier: String) -> Progress?
-    {
-        let progress = self.progressByBundleIdentifier[bundleIdentifier]
-        return progress
-    }
-}

AltStore/Operations/RefreshAppOperation.swift

@@ -0,0 +1,124 @@
+//
+//  RefreshAppOperation.swift
+//  AltStore
+//
+//  Created by Riley Testut on 2/27/20.
+//  Copyright © 2020 Riley Testut. All rights reserved.
+//
+
+import Foundation
+
+import AltSign
+import AltKit
+
+import Roxas
+
+@objc(RefreshAppOperation)
+class RefreshAppOperation: ResultOperation<InstalledApp>
+{
+    let context: AppOperationContext
+    
+    // Strong reference to managedObjectContext to keep it alive until we're finished.
+    let managedObjectContext: NSManagedObjectContext
+    
+    init(context: AppOperationContext)
+    {
+        self.context = context
+        self.managedObjectContext = DatabaseManager.shared.persistentContainer.newBackgroundContext()
+        
+        super.init()
+    }
+    
+    override func main()
+    {
+        super.main()
+        
+        do
+        {
+            if let error = self.context.error
+            {
+                throw error
+            }
+            
+            guard
+                let server = self.context.server,
+                let app = self.context.app,
+                let profiles = self.context.provisioningProfiles
+            else { throw OperationError.invalidParameters }
+            
+            guard let udid = Bundle.main.object(forInfoDictionaryKey: Bundle.Info.deviceID) as? String else { throw OperationError.unknownUDID }
+            
+            ServerManager.shared.connect(to: server) { (result) in
+                switch result
+                {
+                case .failure(let error): self.finish(.failure(error))
+                case .success(let connection):
+                    DatabaseManager.shared.persistentContainer.performBackgroundTask { (context) in
+                        print("Sending refresh app request...")
+                        
+                        var activeProfiles: Set<String>?
+                        if UserDefaults.standard.activeAppsLimit != nil
+                        {
+                            // When installing these new profiles, AltServer will remove all non-active profiles to ensure we remain under limit.
+                            let activeApps = InstalledApp.fetchActiveApps(in: context)
+                            activeProfiles = Set(activeApps.flatMap { (installedApp) -> [String] in
+                                let appExtensionProfiles = installedApp.appExtensions.map { $0.resignedBundleIdentifier }
+                                return [installedApp.resignedBundleIdentifier] + appExtensionProfiles
+                            })
+                        }
+                        
+                        let request = InstallProvisioningProfilesRequest(udid: udid, provisioningProfiles: Set(profiles.values), activeProfiles: activeProfiles)
+                        connection.send(request) { (result) in
+                            print("Sent refresh app request!")
+                            
+                            switch result
+                            {
+                            case .failure(let error): self.finish(.failure(error))
+                            case .success:
+                                print("Waiting for refresh app response...")
+                                connection.receiveResponse() { (result) in
+                                    print("Receiving refresh app response:", result)
+                                    
+                                    switch result
+                                    {
+                                    case .failure(let error): self.finish(.failure(error))
+                                    case .success(.error(let response)): self.finish(.failure(response.error))
+                                        
+                                    case .success(.installProvisioningProfiles):
+                                        self.managedObjectContext.perform {
+                                            let predicate = NSPredicate(format: "%K == %@", #keyPath(InstalledApp.bundleIdentifier), app.bundleIdentifier)
+                                            guard let installedApp = InstalledApp.first(satisfying: predicate, in: self.managedObjectContext) else {
+                                                return self.finish(.failure(OperationError.invalidApp))
+                                            }
+                                            
+                                            self.progress.completedUnitCount += 1
+                                            
+                                            if let provisioningProfile = profiles[app.bundleIdentifier]
+                                            {
+                                                installedApp.update(provisioningProfile: provisioningProfile)
+                                            }
+                                            
+                                            for installedExtension in installedApp.appExtensions
+                                            {
+                                                guard let provisioningProfile = profiles[installedExtension.bundleIdentifier] else { continue }
+                                                installedExtension.update(provisioningProfile: provisioningProfile)
+                                            }
+                                            
+                                            self.finish(.success(installedApp))
+                                        }
+                                        
+                                    case .success: self.finish(.failure(ALTServerError(.unknownRequest)))
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        catch
+        {
+            self.finish(.failure(error))
+        }
+    }
+}

AltStore/Operations/RefreshGroup.swift

@@ -0,0 +1,77 @@
+//
+//  RefreshGroup.swift
+//  AltStore
+//
+//  Created by Riley Testut on 6/20/19.
+//  Copyright © 2019 Riley Testut. All rights reserved.
+//
+
+import Foundation
+import CoreData
+
+import AltSign
+
+class RefreshGroup: NSObject
+{
+    let context: AuthenticatedOperationContext
+    let progress = Progress.discreteProgress(totalUnitCount: 0)
+    
+    var completionHandler: (([String: Result<InstalledApp, Error>]) -> Void)?
+    var beginInstallationHandler: ((InstalledApp) -> Void)?
+        
+    private(set) var results = [String: Result<InstalledApp, Error>]()
+    
+    private var isFinished = false
+    
+    private let dispatchGroup = DispatchGroup()
+    private var operations: [Foundation.Operation] = []
+    
+    init(context: AuthenticatedOperationContext = AuthenticatedOperationContext())
+    {
+        self.context = context
+        
+        super.init()
+    }
+    
+    func add(_ operations: [Foundation.Operation])
+    {
+        for operation in operations
+        {
+            self.dispatchGroup.enter()
+            
+            operation.completionBlock = { [weak self] in
+                self?.dispatchGroup.leave()
+            }
+        }
+        
+        if self.operations.isEmpty && !operations.isEmpty
+        {
+            self.dispatchGroup.notify(queue: .global()) {
+                self.finish()
+            }
+        }
+        
+        self.operations.append(contentsOf: operations)
+    }
+    
+    func set(_ result: Result<InstalledApp, Error>, forAppWithBundleIdentifier bundleIdentifier: String)
+    {
+        self.results[bundleIdentifier] = result
+    }
+    
+    func cancel()
+    {
+        self.operations.forEach { $0.cancel() }
+    }
+}
+
+private extension RefreshGroup
+{
+    func finish()
+    {
+        guard !self.isFinished else { return }
+        self.isFinished = true
+        
+        self.completionHandler?(self.results)
+    }
+}

AltStore/Operations/ResignAppOperation.swift

@@ -14,9 +14,9 @@ import AltSign
 @objc(ResignAppOperation)
 class ResignAppOperation: ResultOperation<ALTApplication>
 {
-    let context: AppOperationContext
+    let context: InstallAppOperationContext
     
-    init(context: AppOperationContext)
+    init(context: InstallAppOperationContext)
     {
         self.context = context
         
@@ -37,50 +37,42 @@ class ResignAppOperation: ResultOperation<ALTApplication>
         
         guard
             let app = self.context.app,
-            let signer = self.context.group.signer
+            let profiles = self.context.provisioningProfiles,
+            let team = self.context.team,
+            let certificate = self.context.certificate
         else { return self.finish(.failure(OperationError.invalidParameters)) }
         
-        // Register Device
-        self.registerCurrentDevice(for: signer.team) { (result) in
-            guard let _ = self.process(result) else { return }
+        // Prepare app bundle
+        let prepareAppProgress = Progress.discreteProgress(totalUnitCount: 2)
+        self.progress.addChild(prepareAppProgress, withPendingUnitCount: 3)
+        
+        let prepareAppBundleProgress = self.prepareAppBundle(for: app, profiles: profiles) { (result) in
+            guard let appBundleURL = self.process(result) else { return }
             
-            // Prepare Provisioning Profiles
-            self.prepareProvisioningProfiles(app.fileURL, team: signer.team) { (result) in
-                guard let profiles = self.process(result) else { return }
+            print("Resigning App:", self.context.bundleIdentifier)
+            
+            // Resign app bundle
+            let resignProgress = self.resignAppBundle(at: appBundleURL, team: team, certificate: certificate, profiles: Array(profiles.values)) { (result) in
+                guard let resignedURL = self.process(result) else { return }
                 
-                // Prepare app bundle
-                let prepareAppProgress = Progress.discreteProgress(totalUnitCount: 2)
-                self.progress.addChild(prepareAppProgress, withPendingUnitCount: 3)
-                
-                let prepareAppBundleProgress = self.prepareAppBundle(for: app, profiles: profiles) { (result) in
-                    guard let appBundleURL = self.process(result) else { return }
+                // Finish
+                do
+                {
+                    let destinationURL = InstalledApp.refreshedIPAURL(for: app)
+                    try FileManager.default.copyItem(at: resignedURL, to: destinationURL, shouldReplace: true)
                     
-                    print("Resigning App:", self.context.bundleIdentifier)
-                    
-                    // Resign app bundle
-                    let resignProgress = self.resignAppBundle(at: appBundleURL, signer: signer, profiles: Array(profiles.values)) { (result) in
-                        guard let resignedURL = self.process(result) else { return }
-                        
-                        // Finish
-                        do
-                        {
-                            let destinationURL = InstalledApp.refreshedIPAURL(for: app)
-                            try FileManager.default.copyItem(at: resignedURL, to: destinationURL, shouldReplace: true)
-                            
-                            // Use appBundleURL since we need an app bundle, not .ipa.
-                            guard let resignedApplication = ALTApplication(fileURL: appBundleURL) else { throw OperationError.invalidApp }
-                            self.finish(.success(resignedApplication))
-                        }
-                        catch
-                        {
-                            self.finish(.failure(error))
-                        }
-                    }
-                    prepareAppProgress.addChild(resignProgress, withPendingUnitCount: 1)
+                    // Use appBundleURL since we need an app bundle, not .ipa.
+                    guard let resignedApplication = ALTApplication(fileURL: appBundleURL) else { throw OperationError.invalidApp }
+                    self.finish(.success(resignedApplication))
+                }
+                catch
+                {
+                    self.finish(.failure(error))
                 }
-                prepareAppProgress.addChild(prepareAppBundleProgress, withPendingUnitCount: 1)
             }
+            prepareAppProgress.addChild(resignProgress, withPendingUnitCount: 1)
         }
+        prepareAppProgress.addChild(prepareAppBundleProgress, withPendingUnitCount: 1)
     }
     
     func process<T>(_ result: Result<T, Error>) -> T?
@@ -104,246 +96,6 @@ class ResignAppOperation: ResultOperation<ALTApplication>
 
 private extension ResignAppOperation
 {
-    func registerCurrentDevice(for team: ALTTeam, completionHandler: @escaping (Result<ALTDevice, Error>) -> Void)
-    {
-        guard let udid = Bundle.main.object(forInfoDictionaryKey: Bundle.Info.deviceID) as? String else {
-            return completionHandler(.failure(OperationError.unknownUDID))
-        }
-        
-        ALTAppleAPI.shared.fetchDevices(for: team) { (devices, error) in
-            do
-            {
-                let devices = try Result(devices, error).get()
-                
-                if let device = devices.first(where: { $0.identifier == udid })
-                {
-                    completionHandler(.success(device))
-                }
-                else
-                {
-                    ALTAppleAPI.shared.registerDevice(name: UIDevice.current.name, identifier: udid, team: team) { (device, error) in
-                        completionHandler(Result(device, error))
-                    }
-                }
-            }
-            catch
-            {
-                completionHandler(.failure(error))
-            }
-        }
-    }
-    
-    func prepareProvisioningProfiles(_ fileURL: URL, team: ALTTeam, completionHandler: @escaping (Result<[String: ALTProvisioningProfile], Error>) -> Void)
-    {
-        guard let bundle = Bundle(url: fileURL), let app = ALTApplication(fileURL: fileURL) else { return completionHandler(.failure(OperationError.invalidApp)) }
-        
-        let dispatchGroup = DispatchGroup()
-        
-        var profiles = [String: ALTProvisioningProfile]()
-        var error: Error?
-        
-        dispatchGroup.enter()
-        
-        self.prepareProvisioningProfile(for: app, team: team) { (result) in
-            switch result
-            {
-            case .failure(let e): error = e
-            case .success(let profile):
-                profiles[app.bundleIdentifier] = profile
-            }
-            dispatchGroup.leave()
-        }
-        
-        if let directory = bundle.builtInPlugInsURL, let enumerator = FileManager.default.enumerator(at: directory, includingPropertiesForKeys: nil, options: [.skipsSubdirectoryDescendants])
-        {
-            for case let fileURL as URL in enumerator where fileURL.pathExtension.lowercased() == "appex"
-            {
-                guard let appExtension = ALTApplication(fileURL: fileURL) else { continue }
-                
-                dispatchGroup.enter()
-                
-                self.prepareProvisioningProfile(for: appExtension, team: team) { (result) in
-                    switch result
-                    {
-                    case .failure(let e): error = e
-                    case .success(let profile):
-                        profiles[appExtension.bundleIdentifier] = profile
-                    }
-                    dispatchGroup.leave()
-                }
-            }
-        }
-        
-        dispatchGroup.notify(queue: .global()) {
-            if let error = error
-            {
-                completionHandler(.failure(error))
-            }
-            else
-            {
-                completionHandler(.success(profiles))
-            }
-        }
-    }
-    
-    func prepareProvisioningProfile(for app: ALTApplication, team: ALTTeam, completionHandler: @escaping (Result<ALTProvisioningProfile, Error>) -> Void)
-    {
-        // Register
-        self.register(app, team: team) { (result) in
-            switch result
-            {
-            case .failure(let error): completionHandler(.failure(error))
-            case .success(let appID):
-                
-                // Update features
-                self.updateFeatures(for: appID, app: app, team: team) { (result) in
-                    switch result
-                    {
-                    case .failure(let error): completionHandler(.failure(error))
-                    case .success(let appID):
-                        
-                        // Update app groups
-                        self.updateAppGroups(for: appID, app: app, team: team) { (result) in
-                            switch result
-                            {
-                            case .failure(let error): completionHandler(.failure(error))
-                            case .success(let appID):
-                                
-                                // Fetch Provisioning Profile
-                                self.fetchProvisioningProfile(for: appID, team: team) { (result) in
-                                    completionHandler(result)
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-    
-    func register(_ app: ALTApplication, team: ALTTeam, completionHandler: @escaping (Result<ALTAppID, Error>) -> Void)
-    {
-        let appName = app.name
-        let bundleID = "com.\(team.identifier).\(app.bundleIdentifier)"
-        
-        ALTAppleAPI.shared.fetchAppIDs(for: team) { (appIDs, error) in
-            do
-            {
-                let appIDs = try Result(appIDs, error).get()
-                
-                if let appID = appIDs.first(where: { $0.bundleIdentifier == bundleID })
-                {
-                    completionHandler(.success(appID))
-                }
-                else
-                {
-                    ALTAppleAPI.shared.addAppID(withName: appName, bundleIdentifier: bundleID, team: team) { (appID, error) in
-                        completionHandler(Result(appID, error))
-                    }
-                }
-            }
-            catch
-            {
-                completionHandler(.failure(error))
-            }
-        }
-    }
-    
-    func updateFeatures(for appID: ALTAppID, app: ALTApplication, team: ALTTeam, completionHandler: @escaping (Result<ALTAppID, Error>) -> Void)
-    {
-        let requiredFeatures = app.entitlements.compactMap { (entitlement, value) -> (ALTFeature, Any)? in
-            guard let feature = ALTFeature(entitlement: entitlement) else { return nil }
-            return (feature, value)
-        }
-        
-        var features = requiredFeatures.reduce(into: [ALTFeature: Any]()) { $0[$1.0] = $1.1 }
-        
-        if let applicationGroups = app.entitlements[.appGroups] as? [String], !applicationGroups.isEmpty
-        {
-            features[.appGroups] = true
-        }
-        
-        let appID = appID.copy() as! ALTAppID
-        appID.features = features
-        
-        ALTAppleAPI.shared.update(appID, team: team) { (appID, error) in
-            completionHandler(Result(appID, error))
-        }
-    }
-    
-    func updateAppGroups(for appID: ALTAppID, app: ALTApplication, team: ALTTeam, completionHandler: @escaping (Result<ALTAppID, Error>) -> Void)
-    {
-        // TODO: Handle apps belonging to more than one app group.
-        guard let applicationGroups = app.entitlements[.appGroups] as? [String], let groupIdentifier = applicationGroups.first else {
-            return completionHandler(.success(appID))
-        }
-        
-        func finish(_ result: Result<ALTAppGroup, Error>)
-        {
-            switch result
-            {
-            case .failure(let error): completionHandler(.failure(error))
-            case .success(let group):
-                // Assign App Group
-                // TODO: Determine whether app already belongs to app group.
-                
-                ALTAppleAPI.shared.add(appID, to: group, team: team) { (success, error) in
-                    let result = result.map { _ in appID }
-                    completionHandler(result)
-                }
-            }
-        }
-        
-        let adjustedGroupIdentifier = "group.\(team.identifier)." + groupIdentifier
-        
-        ALTAppleAPI.shared.fetchAppGroups(for: team) { (groups, error) in
-            switch Result(groups, error)
-            {
-            case .failure(let error): completionHandler(.failure(error))
-            case .success(let groups):
-                
-                if let group = groups.first(where: { $0.groupIdentifier == adjustedGroupIdentifier })
-                {
-                    finish(.success(group))
-                }
-                else
-                {
-                    // Not all characters are allowed in group names, so we replace periods with spaces (like Apple does).
-                    let name = "AltStore " + groupIdentifier.replacingOccurrences(of: ".", with: " ")
-                    
-                    ALTAppleAPI.shared.addAppGroup(withName: name, groupIdentifier: adjustedGroupIdentifier, team: team) { (group, error) in
-                        finish(Result(group, error))
-                    }
-                }
-            }
-        }
-    }
-    
-    func fetchProvisioningProfile(for appID: ALTAppID, team: ALTTeam, completionHandler: @escaping (Result<ALTProvisioningProfile, Error>) -> Void)
-    {
-        ALTAppleAPI.shared.fetchProvisioningProfile(for: appID, team: team) { (profile, error) in
-            switch Result(profile, error)
-            {
-            case .failure(let error): completionHandler(.failure(error))
-            case .success(let profile):
-                
-                // Delete existing profile
-                ALTAppleAPI.shared.delete(profile, for: team) { (success, error) in
-                    switch Result(success, error)
-                    {
-                    case .failure(let error): completionHandler(.failure(error))
-                    case .success:
-                        
-                        // Fetch new provisiong profile
-                        ALTAppleAPI.shared.fetchProvisioningProfile(for: appID, team: team) { (profile, error) in
-                            completionHandler(Result(profile, error))
-                        }
-                    }
-                }
-            }            
-        }
-    }
-    
     func prepareAppBundle(for app: ALTApplication, profiles: [String: ALTProvisioningProfile], completionHandler: @escaping (Result<URL, Error>) -> Void) -> Progress
     {
         let progress = Progress.discreteProgress(totalUnitCount: 1)
@@ -371,6 +123,17 @@ private extension ResignAppOperation
                 infoDictionary[Bundle.Info.appGroups] = appGroups
             }
             
+            // Add app-specific exported UTI so we can check later if this app (extension) is installed or not.
+            let installedAppUTI = ["UTTypeConformsTo": [],
+                                   "UTTypeDescription": "AltStore Installed App",
+                                   "UTTypeIconFiles": [],
+                                   "UTTypeIdentifier": InstalledApp.installedAppUTI(forBundleIdentifier: profile.bundleIdentifier),
+                                   "UTTypeTagSpecification": [:]] as [String : Any]
+            
+            var exportedUTIs = infoDictionary[Bundle.Info.exportedUTIs] as? [[String: Any]] ?? []
+            exportedUTIs.append(installedAppUTI)
+            infoDictionary[Bundle.Info.exportedUTIs] = exportedUTIs
+            
             try (infoDictionary as NSDictionary).write(to: bundle.infoPlistURL)
         }
         
@@ -395,7 +158,7 @@ private extension ResignAppOperation
                 
                 var additionalValues: [String: Any] = [Bundle.Info.urlTypes: allURLSchemes]
 
-                if self.context.bundleIdentifier == StoreApp.altstoreAppID || self.context.bundleIdentifier == StoreApp.alternativeAltStoreAppID
+                if self.context.bundleIdentifier == StoreApp.altstoreAppID || StoreApp.alternativeAltStoreAppIDs.contains(self.context.bundleIdentifier)
                 {
                     guard let udid = Bundle.main.object(forInfoDictionaryKey: Bundle.Info.deviceID) as? String else { throw OperationError.unknownUDID }
                     additionalValues[Bundle.Info.deviceID] = udid
@@ -440,8 +203,9 @@ private extension ResignAppOperation
         return progress
     }
     
-    func resignAppBundle(at fileURL: URL, signer: ALTSigner, profiles: [ALTProvisioningProfile], completionHandler: @escaping (Result<URL, Error>) -> Void) -> Progress
+    func resignAppBundle(at fileURL: URL, team: ALTTeam, certificate: ALTCertificate, profiles: [ALTProvisioningProfile], completionHandler: @escaping (Result<URL, Error>) -> Void) -> Progress
     {
+        let signer = ALTSigner(team: team, certificate: certificate)
         let progress = signer.signApp(at: fileURL, provisioningProfiles: profiles) { (success, error) in
             do
             {

AltStore/Operations/SendAppOperation.swift

@@ -12,13 +12,13 @@ import Network
 import AltKit
 
 @objc(SendAppOperation)
-class SendAppOperation: ResultOperation<NWConnection>
+class SendAppOperation: ResultOperation<ServerConnection>
 {
     let context: AppOperationContext
     
     private let dispatchQueue = DispatchQueue(label: "com.altstore.SendAppOperation")
     
-    private var connection: NWConnection?
+    private var serverConnection: ServerConnection?
     
     init(context: AppOperationContext)
     {
@@ -39,27 +39,27 @@ class SendAppOperation: ResultOperation<NWConnection>
             return
         }
         
-        guard let app = self.context.app, let server = self.context.group.server else { return self.finish(.failure(OperationError.invalidParameters)) }
+        guard let app = self.context.app, let server = self.context.server else { return self.finish(.failure(OperationError.invalidParameters)) }
         
         // self.context.resignedApp.fileURL points to the app bundle, but we want the .ipa.
         let fileURL = InstalledApp.refreshedIPAURL(for: app)
         
         // Connect to server.
-        self.connect(to: server) { (result) in
+        ServerManager.shared.connect(to: server) { (result) in
             switch result
             {
             case .failure(let error): self.finish(.failure(error))
-            case .success(let connection):
-                self.connection = connection
+            case .success(let serverConnection):
+                self.serverConnection = serverConnection
                 
                 // Send app to server.
-                self.sendApp(at: fileURL, via: connection, server: server) { (result) in
+                self.sendApp(at: fileURL, via: serverConnection) { (result) in
                     switch result
                     {
                     case .failure(let error): self.finish(.failure(error))
                     case .success:
                         self.progress.completedUnitCount += 1
-                        self.finish(.success(connection))
+                        self.finish(.success(serverConnection))
                     }
                 }
             }
@@ -69,34 +69,7 @@ class SendAppOperation: ResultOperation<NWConnection>
 
 private extension SendAppOperation
 {
-    func connect(to server: Server, completionHandler: @escaping (Result<NWConnection, Error>) -> Void)
-    {
-        let connection = NWConnection(to: .service(name: server.service.name, type: server.service.type, domain: server.service.domain, interface: nil), using: .tcp)
-        
-        connection.stateUpdateHandler = { [unowned connection] (state) in
-            switch state
-            {
-            case .failed(let error):
-                print("Failed to connect to service \(server.service.name).", error)
-                completionHandler(.failure(ConnectionError.connectionFailed))
-               
-            case .cancelled:
-                completionHandler(.failure(OperationError.cancelled))
-                
-            case .ready:
-                completionHandler(.success(connection))
-            
-            case .waiting: break
-            case .setup: break
-            case .preparing: break
-            @unknown default: break
-            }
-        }
-        
-        connection.start(queue: self.dispatchQueue)
-    }
-    
-    func sendApp(at fileURL: URL, via connection: NWConnection, server: Server, completionHandler: @escaping (Result<Void, Error>) -> Void)
+    func sendApp(at fileURL: URL, via connection: ServerConnection, completionHandler: @escaping (Result<Void, Error>) -> Void)
     {
         do
         {
@@ -106,14 +79,14 @@ private extension SendAppOperation
             let request = PrepareAppRequest(udid: udid, contentSize: appData.count)
             
             print("Sending request \(request)")
-            server.send(request, via: connection) { (result) in
+            connection.send(request) { (result) in
                 switch result
                 {
                 case .failure(let error): completionHandler(.failure(error))
                 case .success:
                     
                     print("Sending app data (\(appData.count) bytes)")
-                    server.send(appData, via: connection, prependSize: false) { (result) in
+                    connection.send(appData, prependSize: false) { (result) in
                         switch result
                         {
                         case .failure(let error): completionHandler(.failure(error))