From cc2d47fbd394dd76288ac5ddf4ac2af374551182 Mon Sep 17 00:00:00 2001
From: Michael Kirk <michaelkirk@users.noreply.github.com>
Date: Mon, 22 Aug 2016 16:54:31 -0400
Subject: [PATCH] Update protocol (#1315)

* Update to latest SignalServiceProtocol
* Show SignalServiceKit compiler warnings

// FREEBIE

* Update to latest signal protocol

// FREEBIE
---
 Podfile.lock                                       |  6 +++---
 .../xcshareddata/xcschemes/Signal.xcscheme         | 14 ++++++++++++++
 .../xcshareddata/Signal.xcscmblueprint             |  2 +-
 .../src/view controllers/MessagesViewController.m  |  2 +-
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/Podfile.lock b/Podfile.lock
index fcca23721..db5b9dfde 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -44,7 +44,7 @@ PODS:
   - Reachability (3.2)
   - SAMKeychain (1.5.0)
   - SCWaveformView (1.0.0)
-  - SignalServiceKit (0.0.8):
+  - SignalServiceKit (0.1.0):
     - '25519'
     - AFNetworking
     - AxolotlKit
@@ -130,7 +130,7 @@ EXTERNAL SOURCES:
 
 CHECKOUT OPTIONS:
   SignalServiceKit:
-    :commit: f3a91c2629c1deda88195a932ebf253134e020b3
+    :commit: 1d0b645fc98545ba09d2828c1908689d3052ca4c
     :git: https://github.com/WhisperSystems/SignalServiceKit.git
   SocketRocket:
     :commit: 8096fef47d582bff8ae3758c9ae7af1d55ea53d6
@@ -154,7 +154,7 @@ SPEC CHECKSUMS:
   Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
   SAMKeychain: 1fc9ae02f576365395758b12888c84704eebc423
   SCWaveformView: 52a96750255d817e300565a80c81fb643e233e07
-  SignalServiceKit: 9bdacbb1cb046836e9d601273fa4fad934ad3ecb
+  SignalServiceKit: 84781a0e45a7eead501a3e35065a1b32dcbbe0ac
   SocketRocket: 3f77ec2104cc113add553f817ad90a77114f5d43
   SQLCipher: 4c768761421736a247ed6cf412d9045615d53dff
   TwistedOakCollapsingFutures: f359b90f203e9ab13dfb92c9ff41842a7fe1cd0c
diff --git a/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme b/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme
index a3b6da25e..739548326 100644
--- a/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme
+++ b/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme
@@ -20,6 +20,20 @@
                ReferencedContainer = "container:Signal.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "ACDD4720B3F44CB9CE791085C2FBB289"
+               BuildableName = "libSignalServiceKit.a"
+               BlueprintName = "SignalServiceKit"
+               ReferencedContainer = "container:Pods/Pods.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction
diff --git a/Signal.xcworkspace/xcshareddata/Signal.xcscmblueprint b/Signal.xcworkspace/xcshareddata/Signal.xcscmblueprint
index 78d646f4b..0b164cb0a 100644
--- a/Signal.xcworkspace/xcshareddata/Signal.xcscmblueprint
+++ b/Signal.xcworkspace/xcshareddata/Signal.xcscmblueprint
@@ -13,7 +13,7 @@
   "DVTSourceControlWorkspaceBlueprintIdentifierKey" : "D0F297E7-A82D-4657-A941-96B268F80ABC",
   "DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
     "ABB939127996C66F7E852A780552ADEEF03C6B13" : "SocketRocket\/",
-    "37054CE35CE656680D6FFFA9EE19249E0D149C5E" : "TSKit\/",
+    "37054CE35CE656680D6FFFA9EE19249E0D149C5E" : "SignalServiceKit\/",
     "5D79A077E31B3FE97A3C6613CBFFDD71C314D14C" : "Signal-iOS\/",
     "90530B99EB0008E7A50951FDFBE02169118FA649" : "JSQMessagesViewController\/",
     "D74FB800F048CB516BB4BC70047F7CC676D291B9" : "Signal-iOS\/Pods\/"
diff --git a/Signal/src/view controllers/MessagesViewController.m b/Signal/src/view controllers/MessagesViewController.m
index ed65a3b0d..8653805b1 100644
--- a/Signal/src/view controllers/MessagesViewController.m	
+++ b/Signal/src/view controllers/MessagesViewController.m	
@@ -1391,7 +1391,7 @@ typedef enum : NSUInteger {
 - (void)handleErrorMessageTap:(TSErrorMessage *)message {
     if ([message isKindOfClass:[TSInvalidIdentityKeyErrorMessage class]]) {
         TSInvalidIdentityKeyErrorMessage *errorMessage = (TSInvalidIdentityKeyErrorMessage *)message;
-        NSString *newKeyFingerprint                    = [errorMessage newIdentityKey];
+        NSString *newKeyFingerprint = [errorMessage newIdentityFingerprint];
 
         NSString *keyOwner;
         if ([message isKindOfClass:[TSInvalidIdentityKeySendingErrorMessage class]]) {