Merge pull request #54 from hyperoslo/fix/query_builder

Fix query builder
vadymmarkov · Nov 22, 2016 · 11e6f8c · 11e6f8c
2 parents f2956b8 + e023dd4
commit 11e6f8c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/Sources/Helpers/QueryBuilder.swift b/Sources/Helpers/QueryBuilder.swift
@@ -62,16 +62,14 @@ public struct QueryBuilder {
       var index = string.startIndex
 
       while index != string.endIndex {
-        guard let endIndex = string.index(index, offsetBy: 50, limitedBy: string.endIndex) else {
-          break
-        }
-
+        let endIndex = string.index(index, offsetBy: 50, limitedBy: string.endIndex) ?? string.endIndex
         let range = Range(index..<endIndex)
         let substring = string.substring(with: range)
 
-        index = endIndex
         escapedString += substring.addingPercentEncoding(
           withAllowedCharacters: allowedCharacters as CharacterSet) ?? substring
+
+        index = endIndex
       }
     }
 

diff --git a/Sources/Networking.swift b/Sources/Networking.swift
@@ -104,7 +104,6 @@ public final class Networking: NSObject {
         return ride
     }
 
-
     let etagPromise = ride.then { [weak self] result -> Wave in
       self?.saveEtag(request: request, response: result.response)
       return result