From 3019a7614ae225e11f626d4eba9ac7da361834dd Mon Sep 17 00:00:00 2001 From: Ryan ZHAO Date: Fri, 2 Oct 2020 11:54:33 +1000 Subject: [PATCH] fix the response handler in PushNotificationManager --- .../Push Notifications/LokiPushNotificationManager.swift | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/SignalServiceKit/src/Loki/Push Notifications/LokiPushNotificationManager.swift b/SignalServiceKit/src/Loki/Push Notifications/LokiPushNotificationManager.swift index 2497225a4..faa163b52 100644 --- a/SignalServiceKit/src/Loki/Push Notifications/LokiPushNotificationManager.swift +++ b/SignalServiceKit/src/Loki/Push Notifications/LokiPushNotificationManager.swift @@ -29,7 +29,7 @@ public final class LokiPushNotificationManager : NSObject { let request = TSRequest(url: url, method: "POST", parameters: parameters) request.allHTTPHeaderFields = [ "Content-Type" : "application/json" ] let promise: Promise = OnionRequestAPI.sendOnionRequest(request, to: server, using: pnServerPublicKey).map2 { response in - guard let json = response as? JSON else { + guard let json = response["body"] as? JSON else { return print("[Loki] Couldn't unregister from push notifications.") } guard json["code"] as? Int != 0 else { @@ -69,7 +69,7 @@ public final class LokiPushNotificationManager : NSObject { let request = TSRequest(url: url, method: "POST", parameters: parameters) request.allHTTPHeaderFields = [ "Content-Type" : "application/json" ] let promise: Promise = OnionRequestAPI.sendOnionRequest(request, to: server, using: pnServerPublicKey).map2 { response in - guard let json = response as? JSON else { + guard let json = response["body"] as? JSON else { return print("[Loki] Couldn't register device token.") } guard json["code"] as? Int != 0 else { @@ -104,7 +104,7 @@ public final class LokiPushNotificationManager : NSObject { let request = TSRequest(url: url, method: "POST", parameters: parameters) request.allHTTPHeaderFields = [ "Content-Type" : "application/json" ] let promise = OnionRequestAPI.sendOnionRequest(request, to: server, using: pnServerPublicKey).map2 { response in - guard let json = response as? JSON else { + guard let json = response["body"] as? JSON else { return print("[Loki] Couldn't subscribe/unsubscribe closed group: \(closedGroupPublicKey).") } guard json["code"] as? Int != 0 else { @@ -125,7 +125,7 @@ public final class LokiPushNotificationManager : NSObject { let request = TSRequest(url: url, method: "POST", parameters: parameters) request.allHTTPHeaderFields = [ "Content-Type" : "application/json" ] let promise = OnionRequestAPI.sendOnionRequest(request, to: server, using: pnServerPublicKey).map2 { response in - guard let json = response as? JSON else { + guard let json = response["body"] as? JSON else { return print("[Loki] Couldn't notify PN server.") } guard json["code"] as? Int != 0 else {