Merge branch 'module_refactoring' into develop

AltServer/AltServer-Bridging-Header.h

@@ -5,4 +5,9 @@
 #import "ALTDeviceManager.h"
 #import "ALTWiredConnection.h"
 #import "ALTNotificationConnection.h"
-#import "AltKit.h"
+
+// Shared
+#import "ALTConstants.h"
+#import "ALTConnection.h"
+#import "NSError+ALTServerError.h"
+#import "CFNotificationName+AltStore.h"

AltServer/AnisetteDataManager.swift

@@ -7,7 +7,6 @@
 //
 
 import Foundation
-import AltKit
 
 class AnisetteDataManager: NSObject
 {

AltServer/AppDelegate.swift

@@ -63,7 +63,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         
         UNUserNotificationCenter.current().delegate = self
         
-        ConnectionManager.shared.start()
+        ServerConnectionManager.shared.start()
         ALTDeviceManager.shared.start()
         
         let item = NSStatusBar.system.statusItem(withLength: -1)

AltServer/Connections/ALTNotificationConnection.h

@@ -6,7 +6,7 @@
 //  Copyright © 2020 Riley Testut. All rights reserved.
 //
 
-#import <AltSign/AltSign.h>
+#import "AltSign.h"
 
 NS_ASSUME_NONNULL_BEGIN
 

AltServer/Connections/ALTNotificationConnection.mm

@@ -7,7 +7,8 @@
 //
 
 #import "ALTNotificationConnection+Private.h"
-#import "AltKit.h"
+
+#import "NSError+ALTServerError.h"
 
 void ALTDeviceReceivedNotification(const char *notification, void *user_data);
 

AltServer/Connections/ALTWiredConnection.h

@@ -6,9 +6,9 @@
 //  Copyright © 2020 Riley Testut. All rights reserved.
 //
 
-#import <AltSign/AltSign.h>
+#import "AltSign.h"
 
-#import "AltKit.h"
+#import "ALTConnection.h"
 
 NS_ASSUME_NONNULL_BEGIN
 

AltServer/Connections/ALTWiredConnection.mm

@@ -7,7 +7,9 @@
 //
 
 #import "ALTWiredConnection+Private.h"
-#import "AltKit.h"
+
+#import "ALTConnection.h"
+#import "NSError+ALTServerError.h"
 
 @implementation ALTWiredConnection
 

AltServer/Connections/RequestHandler.swift

@@ -7,21 +7,20 @@
 //
 
 import Foundation
-import AltKit
 
-typealias ConnectionManager = AltKit.ConnectionManager<RequestHandler>
+typealias ServerConnectionManager = ConnectionManager<ServerRequestHandler>
 
-private let connectionManager = ConnectionManager(requestHandler: RequestHandler(),
+private let connectionManager = ConnectionManager(requestHandler: ServerRequestHandler(),
                                                   connectionHandlers: [WirelessConnectionHandler(), WiredConnectionHandler()])
 
-extension ConnectionManager
+extension ServerConnectionManager
 {
     static var shared: ConnectionManager {
         return connectionManager
     }
 }
 
-struct RequestHandler: AltKit.RequestHandler
+struct ServerRequestHandler: RequestHandler
 {
     func handleAnisetteDataRequest(_ request: AnisetteDataRequest, for connection: Connection, completionHandler: @escaping (Result<AnisetteDataResponse, Error>) -> Void)
     {
@@ -187,7 +186,7 @@ private extension RequestHandler
         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 { ALTServerError($0) }
+            if let error = error.map({ ALTServerError($0) })
             {
                 completionHandler(.failure(error))
             }

AltServer/Connections/WiredConnectionHandler.swift

@@ -7,7 +7,6 @@
 //
 
 import Foundation
-import AltKit
 
 class WiredConnectionHandler: ConnectionHandler
 {

AltServer/Connections/WirelessConnectionHandler.swift

@@ -9,8 +9,6 @@
 import Foundation
 import Network
 
-import AltKit
-
 extension WirelessConnectionHandler
 {
     public enum State

AltServer/Devices/ALTDeviceManager.h

@@ -7,7 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import <AltSign/AltSign.h>
+#import "AltSign.h"
 
 @class ALTWiredConnection;
 @class ALTNotificationConnection;

AltServer/Devices/ALTDeviceManager.mm

@@ -8,10 +8,12 @@
 
 #import "ALTDeviceManager.h"
 
-#import "AltKit.h"
 #import "ALTWiredConnection+Private.h"
 #import "ALTNotificationConnection+Private.h"
 
+#import "ALTConstants.h"
+#import "NSError+ALTServerError.h"
+
 #include <libimobiledevice/libimobiledevice.h>
 #include <libimobiledevice/lockdown.h>
 #include <libimobiledevice/installation_proxy.h>