diff --git a/ipbc-Client/ipbc-Client.xcworkspace/xcuserdata/gerrit.xcuserdatad/UserInterfaceState.xcuserstate b/ipbc-Client/ipbc-Client.xcworkspace/xcuserdata/gerrit.xcuserdatad/UserInterfaceState.xcuserstate index 8b113d2..e93c557 100644 Binary files a/ipbc-Client/ipbc-Client.xcworkspace/xcuserdata/gerrit.xcuserdatad/UserInterfaceState.xcuserstate and b/ipbc-Client/ipbc-Client.xcworkspace/xcuserdata/gerrit.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/ipbc-Client/ipbc-Client/Constants.swift b/ipbc-Client/ipbc-Client/Constants.swift index 10a9751..2cdefb8 100644 --- a/ipbc-Client/ipbc-Client/Constants.swift +++ b/ipbc-Client/ipbc-Client/Constants.swift @@ -15,8 +15,9 @@ struct Constants { struct WebService { static let BASE = "www.ip-bc.org" - static let UPDATE = "https://update.ip-bc.org" - static let GET_USERS_IP = "https://www.ip-bc.org/ws/info/ip" + static let UPDATE = "https://ip-bc.org/ws/update/ip" //"http://localhost:8080/ip-bc.org/ws/update/dyndns" + static let GET_USERS_IP = "https://www.ip-bc.org/ws/info/ip" //"http://localhost:8080/ip-bc.org/ws/info/ip" + static let GET_MASTER_DOMAINS = "https://app.ip-bc.org/domains" } struct UserDefaults { diff --git a/ipbc-Client/ipbc-Client/WebServiceClient.swift b/ipbc-Client/ipbc-Client/WebServiceClient.swift index 8fa34a6..4dec9be 100644 --- a/ipbc-Client/ipbc-Client/WebServiceClient.swift +++ b/ipbc-Client/ipbc-Client/WebServiceClient.swift @@ -79,13 +79,18 @@ class WebserviceClient { } if self.isNetworkAvailableFirstCheck && self.isNetworkAvailable { - self.doUpdate() + self.thingsToDoOnNetworkAvailableRightAfterStart() } self.isNetworkAvailableFirstCheck = false } } + private func thingsToDoOnNetworkAvailableRightAfterStart() { + self.doUpdate() + //self.detectMasterDomains() + } + private func detectIP() { Alamofire.request(.GET, Constants.WebService.GET_USERS_IP, parameters: nil) .validate(statusCode: 200..<201) @@ -120,6 +125,31 @@ class WebserviceClient { } } + private func detectMasterDomains() { + Alamofire.request(.GET, Constants.WebService.GET_MASTER_DOMAINS, parameters: nil) + .validate(statusCode: 200..<201) + .validate(contentType: ["text/plain"]) + .responseJSON { response in + /* + print(response.request) // original URL request + print(response.response) // URL response + print(response.data) // server data + print(response.result) // result of response serialization + */ + + switch response.result { + case .Success: + if let responseJSON = response.result.value { + print("WebserviceClient: MasterDomains: \(responseJSON)") + //TODO: implement what to do now + } + case .Failure(let error): + print("WebserviceClient: Error during get current IP:") + print(error) + } + } + } + // MARK: Timer fire actions @objc func checkForNewIPTimerAction(timer : NSTimer) { @@ -144,15 +174,15 @@ class WebserviceClient { let headers = [ "Content-Type": "application/json" ] - let parameters = [ + /*let parameters = [ "domain": domain, "token": token - ] - /*let parameters = [ - "": "{\"domain\":\"\(domain)\", \"token\":\"\(token)\"}" ]*/ + let parameters = [ + "": "{\"domain\":\"\(domain)\", \"token\":\"\(token)\"}" + ] Alamofire.request(.POST, Constants.WebService.UPDATE, headers: headers, parameters: parameters) - .validate(statusCode: 200..<201) + //.validate(statusCode: 200..<201) //.validate(contentType: ["application/json"]) .responseString { response in /*