From f604cfb5535628fd9c0d94bdf950da812c36d2ec Mon Sep 17 00:00:00 2001
From: Matthew Chen <charlesmchen@gmail.com>
Date: Mon, 3 Apr 2017 14:53:23 -0400
Subject: [PATCH] Apply assert to ensure singletons are only created once &
 filter incoming messages using the blacklist.

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

diff --git a/Podfile b/Podfile
index 8d8b3f33d..52b196b6c 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',           path: '../SignalServiceKit'
+    pod 'SignalServiceKit',           git: 'https://github.com/WhisperSystems/SignalServiceKit.git'
+    #pod 'SignalServiceKit',           path: '../SignalServiceKit'
     pod 'OpenSSL'
     pod 'SCWaveformView',             '~> 1.0'
     pod 'JSQMessagesViewController'
diff --git a/Podfile.lock b/Podfile.lock
index 4eac84301..9d586765a 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -116,14 +116,14 @@ DEPENDENCIES:
   - OpenSSL
   - PureLayout
   - SCWaveformView (~> 1.0)
-  - SignalServiceKit (from `../SignalServiceKit`)
+  - SignalServiceKit (from `https://github.com/WhisperSystems/SignalServiceKit.git`)
   - SocketRocket (from `https://github.com/facebook/SocketRocket.git`)
 
 EXTERNAL SOURCES:
   AxolotlKit:
     :git: https://github.com/WhisperSystems/SignalProtocolKit.git
   SignalServiceKit:
-    :path: "../SignalServiceKit"
+    :git: https://github.com/WhisperSystems/SignalServiceKit.git
   SocketRocket:
     :git: https://github.com/facebook/SocketRocket.git
 
@@ -131,6 +131,9 @@ CHECKOUT OPTIONS:
   AxolotlKit:
     :commit: cbf2f47d59dd54d6d720fe787f835bd767443bb6
     :git: https://github.com/WhisperSystems/SignalProtocolKit.git
+  SignalServiceKit:
+    :commit: e4ec7298441e82c8c5cd0678ea165dc3e12b2986
+    :git: https://github.com/WhisperSystems/SignalServiceKit.git
   SocketRocket:
     :commit: 877ac7438be3ad0b45ef5ca3969574e4b97112bf
     :git: https://github.com/facebook/SocketRocket.git
@@ -158,6 +161,6 @@ SPEC CHECKSUMS:
   UnionFind: c33be5adb12983981d6e827ea94fc7f9e370f52d
   YapDatabase: b1e43555a34a5298e23a045be96817a5ef0da58f
 
-PODFILE CHECKSUM: cb02bca5a68f5b03df77200dae4ce1235a007807
+PODFILE CHECKSUM: a060377074cb361576f346a58d1503b3bd708440
 
 COCOAPODS: 1.2.0