浏览代码

add Swifter

Signed-off-by: Marino Faggiana <marino@marinofaggiana.com>
Marino Faggiana 2 年之前
父节点
当前提交
7fdfd80c24
共有 2 个文件被更改,包括 9 次插入10 次删除
  1. 6 9
      iOSClient/Networking/NCConfigServer.swift
  2. 3 1
      iOSClient/Settings/NCSettings.m

+ 6 - 9
iOSClient/Networking/NCConfigServer.swift

@@ -12,9 +12,6 @@ import NextcloudKit
 
 @objc class NCConfigServer: NSObject, UIActionSheetDelegate {
 
-    // MARK: Singleton
-    @objc static let shared = NCConfigServer()
-
     // Start service
     @objc func startService(url: URL) {
 
@@ -41,7 +38,7 @@ import NextcloudKit
 
     internal let listeningPort: in_port_t = 8080
     internal var configName: String = "Profile install"
-    private var localServer: HttpServer!
+    private var localServer: HttpServer?
     private var returnURL: String = ""
     private var configData: Data!
 
@@ -53,7 +50,7 @@ import NextcloudKit
         unregisterFromNotifications()
     }
 
-    // MARK:- Control functions
+    // MARK: - Control functions
 
     internal func start(data: Data) {
         self.configData = data
@@ -64,7 +61,7 @@ import NextcloudKit
         let url = URL(string: page)!
         if UIApplication.shared.canOpenURL(url as URL) {
             do {
-                try localServer.start(listeningPort, forceIPv4: false, priority: .default)
+                try localServer?.start(listeningPort, forceIPv4: false, priority: .default)
                 serverState = .Ready
                 registerForNotifications()
                 UIApplication.shared.open(url)
@@ -83,10 +80,10 @@ import NextcloudKit
         }
     }
 
-    // MARK:- Private functions
+    // MARK: - Private functions
 
     private func setupHandlers() {
-        localServer["/install"] = { request in
+        localServer?["/install"] = { request in
             switch self.serverState {
             case .Stopped:
                 return .notFound()
@@ -129,7 +126,7 @@ import NextcloudKit
     private func returnedToApp() {
         if serverState != .Stopped {
             serverState = .BackToApp
-            localServer.stop()
+            localServer?.stop()
         }
     }
 

+ 3 - 1
iOSClient/Settings/NCSettings.m

@@ -350,7 +350,9 @@
     [self deselectFormRow:sender];
 
     NSString *url = [appDelegate.urlBase stringByAppendingString:@"/remote.php/dav/provisioning/apple-provisioning.mobileconfig"];
-    [[NCConfigServer shared] startServiceWithUrl:[NSURL URLWithString: url]];
+    //[[NCConfigServer shared] startServiceWithUrl:[NSURL URLWithString: url]];
+    NCConfigServer *configServer = [NCConfigServer new];
+    [configServer startServiceWithUrl:[NSURL URLWithString: url]];
 }