gerrit/ipbc-Client_macOS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

URL fixed

Browse Source
This commit is contained in:
Gerrit Linnemann 2015-11-20 17:54:23 +01:00
parent 4a3e92aba5
commit f10032a628
3 changed files with 39 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
ipbc-Client/ipbc-Client.xcworkspace/xcuserdata/gerrit.xcuserdatad/UserInterfaceState.xcuserstate generated
View File

Binary file not shown.

5
ipbc-Client/ipbc-Client/Constants.swift
View File

@ -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 {

42
ipbc-Client/ipbc-Client/WebServiceClient.swift
View File

@ -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
/*