Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 240e194

Browse files
committedSep 16, 2016
General fixes
1 parent 6e036c0 commit 240e194

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+148
-136
lines changed
 

‎Account/FxAClient10.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ public class FxAClient10 {
247247
"authPW": authPW.base16EncodedStringWithOptions(NSDataBase16EncodingOptions.LowerCase),
248248
]
249249

250-
var URL: NSURL = self.URL.URLByAppendingPathComponent("/account/login")
250+
var URL: NSURL = self.URL.URLByAppendingPathComponent("/account/login")!
251251
if getKeys {
252252
let components = NSURLComponents(URL: URL, resolvingAgainstBaseURL: false)!
253253
components.query = "keys=true"
@@ -264,7 +264,7 @@ public class FxAClient10 {
264264

265265
public func keys(keyFetchToken: NSData) -> Deferred<Maybe<FxAKeysResponse>> {
266266
let URL = self.URL.URLByAppendingPathComponent("/account/keys")
267-
let mutableURLRequest = NSMutableURLRequest(URL: URL)
267+
let mutableURLRequest = NSMutableURLRequest(URL: URL!)
268268
mutableURLRequest.HTTPMethod = Method.GET.rawValue
269269

270270
let salt: NSData = NSData()
@@ -284,7 +284,7 @@ public class FxAClient10 {
284284
]
285285

286286
let URL = self.URL.URLByAppendingPathComponent("/certificate/sign")
287-
let mutableURLRequest = NSMutableURLRequest(URL: URL)
287+
let mutableURLRequest = NSMutableURLRequest(URL: URL!)
288288
mutableURLRequest.HTTPMethod = Method.POST.rawValue
289289

290290
mutableURLRequest.setValue("application/json", forHTTPHeaderField: "Content-Type")
@@ -299,7 +299,7 @@ public class FxAClient10 {
299299
}
300300

301301
public func status(uid: String) -> Deferred<Maybe<FxAStatusResponse>> {
302-
let statusURL = self.URL.URLByAppendingPathComponent("/account/status").withQueryParam("uid", value: uid)
302+
let statusURL = self.URL.URLByAppendingPathComponent("/account/status")!.withQueryParam("uid", value: uid)
303303
let mutableURLRequest = NSMutableURLRequest(URL: statusURL)
304304
mutableURLRequest.HTTPMethod = Method.GET.rawValue
305305

@@ -310,7 +310,7 @@ public class FxAClient10 {
310310

311311
public func devices(sessionToken: NSData) -> Deferred<Maybe<FxADevicesResponse>> {
312312
let URL = self.URL.URLByAppendingPathComponent("/account/devices")
313-
let mutableURLRequest = NSMutableURLRequest(URL: URL)
313+
let mutableURLRequest = NSMutableURLRequest(URL: URL!)
314314
mutableURLRequest.HTTPMethod = Method.GET.rawValue
315315

316316
mutableURLRequest.setValue("application/json", forHTTPHeaderField: "Content-Type")
@@ -325,7 +325,7 @@ public class FxAClient10 {
325325

326326
public func registerOrUpdateDevice(sessionToken: NSData, device: FxADevice) -> Deferred<Maybe<FxADevice>> {
327327
let URL = self.URL.URLByAppendingPathComponent("/account/device")
328-
let mutableURLRequest = NSMutableURLRequest(URL: URL)
328+
let mutableURLRequest = NSMutableURLRequest(URL: URL!)
329329
mutableURLRequest.HTTPMethod = Method.POST.rawValue
330330

331331
mutableURLRequest.setValue("application/json", forHTTPHeaderField: "Content-Type")

‎Account/HawkHelper.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public class HawkHelper {
8585
if let port = url.port {
8686
append(port.stringValue)
8787
} else {
88-
if url.scheme.lowercaseString == "https" {
88+
if url.scheme?.lowercaseString == "https" {
8989
append("443")
9090
} else {
9191
append("80")

0 commit comments

Comments
 (0)
Please sign in to comment.