Progress is now working properly

apollographql · Sep 26, 2017 · c0a001c · c0a001c
1 parent 3554952
commit c0a001c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/Sources/Apollo/SessionDelegate.swift b/Sources/Apollo/SessionDelegate.swift
@@ -24,13 +24,13 @@ class SessionDelegate: NSObject {
     self.tasks[task.taskIdentifier] = SessionDelegateTask(completionHandler: completionHandler, progressHandler: progressHandler)
   }
 
-  func get(task: URLSessionTask) -> SessionDelegateTask? {
+  fileprivate func get(task: URLSessionTask) -> SessionDelegateTask? {
     return lock.withLock {
       return self.tasks[task.taskIdentifier]
     }
   }
 
-  func remove(task: URLSessionTask) {
+  fileprivate func remove(task: URLSessionTask) {
     self.lock.lock()
     defer { self.lock.unlock() }
 
@@ -47,7 +47,8 @@ extension SessionDelegate: URLSessionDataDelegate {
 extension SessionDelegate: URLSessionTaskDelegate {
   func urlSession(_ session: URLSession, task: URLSessionTask, didSendBodyData bytesSent: Int64, totalBytesSent: Int64, totalBytesExpectedToSend: Int64) {
     if let sessionTask = self.get(task: task), let progressHandler = sessionTask.progressHandler {
-      progressHandler(Progress((totalBytesSent/totalBytesExpectedToSend)) * 100)
+      let progress = Float(totalBytesSent)/Float(totalBytesExpectedToSend)
+      progressHandler(Progress(progress * 100))
     }
   }
 

diff --git a/Tests/ApolloTestSupport/MockNetworkTransport.swift b/Tests/ApolloTestSupport/MockNetworkTransport.swift
@@ -7,7 +7,7 @@ public final class MockNetworkTransport: NetworkTransport {
     self.body = body
   }
 
-  public func send<Operation:>(operation: Operation, completionHandler: @escaping (GraphQLResponse<Operation>?, Error?) -> Void) -> Cancellable {
+  public func send<Operation>(operation: Operation, completionHandler: @escaping (GraphQLResponse<Operation>?, Error?) -> Void) -> Cancellable {
     DispatchQueue.global(qos: .default).async {
       completionHandler(GraphQLResponse(operation: operation, body: self.body), nil)
     }