From c0f52d1de90b56b387d30a2bf332fde7a3078fba Mon Sep 17 00:00:00 2001
From: Matthew Chen <charlesmchen@gmail.com>
Date: Mon, 13 Feb 2017 17:21:58 -0500
Subject: [PATCH] [SSK] Mark "attempting out" messages as "unsent" on app
 launch

// FREEBIE
---
 Podfile      | 4 ++--
 Podfile.lock | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Podfile b/Podfile
index 2616f47ba..6c5716040 100644
--- a/Podfile
+++ b/Podfile
@@ -5,8 +5,8 @@ target 'Signal' do
     pod 'SocketRocket',               :git => 'https://github.com/facebook/SocketRocket.git'
     pod 'AxolotlKit',                 git: 'https://github.com/WhisperSystems/SignalProtocolKit.git'
     #pod 'AxolotlKit',                 path: '../SignalProtocolKit'
-    #pod 'SignalServiceKit',           git: 'https://github.com/WhisperSystems/SignalServiceKit.git'
-    pod 'SignalServiceKit',           git: 'https://github.com/WhisperSystems/SignalServiceKit.git', :branch => 'charlesmchen/markUnsentMessages'
+    pod 'SignalServiceKit',           git: 'https://github.com/WhisperSystems/SignalServiceKit.git'
+    #pod 'SignalServiceKit',           git: 'https://github.com/WhisperSystems/SignalServiceKit.git', :branch => 'charlesmchen/markUnsentMessages'
     #pod 'SignalServiceKit',           path: '../SignalServiceKit'
     pod 'OpenSSL'
     pod 'PastelogKit',                '~> 1.3'
diff --git a/Podfile.lock b/Podfile.lock
index 9e9994431..f46d2cf20 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -123,7 +123,7 @@ DEPENDENCIES:
   - PastelogKit (~> 1.3)
   - PureLayout
   - SCWaveformView (~> 1.0)
-  - SignalServiceKit (from `https://github.com/WhisperSystems/SignalServiceKit.git`, branch `charlesmchen/markUnsentMessages`)
+  - SignalServiceKit (from `https://github.com/WhisperSystems/SignalServiceKit.git`)
   - SocketRocket (from `https://github.com/facebook/SocketRocket.git`)
   - ZXingObjC
 
@@ -131,7 +131,6 @@ EXTERNAL SOURCES:
   AxolotlKit:
     :git: https://github.com/WhisperSystems/SignalProtocolKit.git
   SignalServiceKit:
-    :branch: charlesmchen/markUnsentMessages
     :git: https://github.com/WhisperSystems/SignalServiceKit.git
   SocketRocket:
     :git: https://github.com/facebook/SocketRocket.git
@@ -141,7 +140,7 @@ CHECKOUT OPTIONS:
     :commit: 945c04f9e70f7119d2ada4edb938849f3b7febab
     :git: https://github.com/WhisperSystems/SignalProtocolKit.git
   SignalServiceKit:
-    :commit: c6fdcbb4986a04b184ae6591af44f1e162c9e29f
+    :commit: 7c55d559d3c9ef7e66a4ebd1daaf7620498c3e3a
     :git: https://github.com/WhisperSystems/SignalServiceKit.git
   SocketRocket:
     :commit: 41b57bb2fc292a814f758441a05243eb38457027
@@ -173,6 +172,6 @@ SPEC CHECKSUMS:
   YapDatabase: b1e43555a34a5298e23a045be96817a5ef0da58f
   ZXingObjC: bf15b3814f7a105b6d99f47da2333c93a063650a
 
-PODFILE CHECKSUM: ab71a7c277b83315d9ca0ca86b9e2a2dc92af86a
+PODFILE CHECKSUM: 1dec14c6ae3ecc013143fca915e5e7a3bb83bdc0
 
 COCOAPODS: 1.1.1