From fc6b4b554939e1f7874382d3c1cf10cd06b95762 Mon Sep 17 00:00:00 2001
From: Frederic Jacobs <github@fredericjacobs.com>
Date: Tue, 30 Dec 2014 18:57:22 +0100
Subject: [PATCH] New wire format

Unnecessary base64 encoding has now been removed.
---
 Signal.xcworkspace/..Pods                                  | 1 -
 Signal/src/textsecure/Network/WebSockets/TSSocketManager.m | 6 +-----
 2 files changed, 1 insertion(+), 6 deletions(-)
 delete mode 160000 Signal.xcworkspace/..Pods

diff --git a/Signal.xcworkspace/..Pods b/Signal.xcworkspace/..Pods
deleted file mode 160000
index 585c9e6ca..000000000
--- a/Signal.xcworkspace/..Pods
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 585c9e6ca1b55e99fb5c09aa31a6d590c2be5c58
diff --git a/Signal/src/textsecure/Network/WebSockets/TSSocketManager.m b/Signal/src/textsecure/Network/WebSockets/TSSocketManager.m
index 86c0791d7..eacaaa2eb 100644
--- a/Signal/src/textsecure/Network/WebSockets/TSSocketManager.m
+++ b/Signal/src/textsecure/Network/WebSockets/TSSocketManager.m
@@ -138,11 +138,7 @@ NSString * const SocketConnectingNotification = @"SocketConnectingNotification";
     [self sendWebSocketMessageAcknowledgement:message];
     
     if ([message.path isEqualToString:@"/api/v1/message"] && [message.verb isEqualToString:@"PUT"]){
-        
-        NSString *base64String   = [[NSString alloc] initWithData:message.body encoding:NSUTF8StringEncoding];
-        
-        NSData *encryptedSignal  = [NSData dataFromBase64String:base64String];
-        NSData *decryptedPayload = [Cryptography decryptAppleMessagePayload:encryptedSignal
+        NSData *decryptedPayload = [Cryptography decryptAppleMessagePayload:message.body
                                                            withSignalingKey:TSStorageManager.signalingKey];
         
         if (!decryptedPayload) {