From ee29fff0da51f4cfec4d091fded371fe84efd83d Mon Sep 17 00:00:00 2001
From: Michael Kirk <michael.code@endoftheworl.de>
Date: Mon, 14 Nov 2016 14:24:03 -0500
Subject: [PATCH] [SSK] Default to blocking changed Safety Numbers

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

diff --git a/.travis.yml b/.travis.yml
index a284e7e9b..365376637 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,7 @@ before_install:
     - brew outdated xctool || brew upgrade xctool # only upgrade if outdated (saves 2 minutes)
     - gem install cocoapods # get the latest cocoapods
     - gem install xcpretty
-    - pod repo update --silent # log output is too long without --silent
+    - travis_wait 20 pod repo update --silent # log output is too long without --silent
 
 install: travis_wait 30 pod install # OpenSSL takes a long time to compile
 
diff --git a/Podfile b/Podfile
index 711be46de..4714c7451 100644
--- a/Podfile
+++ b/Podfile
@@ -3,7 +3,7 @@ source 'https://github.com/CocoaPods/Specs.git'
 
 target 'Signal' do
     pod 'SocketRocket',               :git => 'https://github.com/facebook/SocketRocket.git'
-    pod 'SignalServiceKit',           git: 'https://github.com/WhisperSystems/SignalServiceKit.git'
+    pod 'SignalServiceKit',           git: 'https://github.com/WhisperSystems/SignalServiceKit.git', branch: 'mkirk/default-to-blocking-sn'
     #pod 'SignalServiceKit',           path: '../SignalServiceKit'
     pod 'OpenSSL'
     pod 'PastelogKit',                '~> 1.3'
diff --git a/Podfile.lock b/Podfile.lock
index 233cf5e4c..636e1f04b 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -122,7 +122,7 @@ DEPENDENCIES:
   - OpenSSL
   - PastelogKit (~> 1.3)
   - SCWaveformView (~> 1.0)
-  - SignalServiceKit (from `https://github.com/WhisperSystems/SignalServiceKit.git`)
+  - SignalServiceKit (from `https://github.com/WhisperSystems/SignalServiceKit.git`, branch `mkirk/default-to-blocking-sn`)
   - SocketRocket (from `https://github.com/facebook/SocketRocket.git`)
   - ZXingObjC
 
@@ -131,6 +131,7 @@ EXTERNAL SOURCES:
     :branch: fix-intermittent-crash-on-delete
     :git: https://github.com/WhisperSystems/JSQMessagesViewController.git
   SignalServiceKit:
+    :branch: mkirk/default-to-blocking-sn
     :git: https://github.com/WhisperSystems/SignalServiceKit.git
   SocketRocket:
     :git: https://github.com/facebook/SocketRocket.git
@@ -140,7 +141,7 @@ CHECKOUT OPTIONS:
     :commit: 03cde781234ade464dd26914d87e6e95afde1119
     :git: https://github.com/WhisperSystems/JSQMessagesViewController.git
   SignalServiceKit:
-    :commit: 60a39f93c6d86cde883e5e798b79db19f1d46636
+    :commit: e53422f76582439ebd6b3fac54a3787c7e5c6a7b
     :git: https://github.com/WhisperSystems/SignalServiceKit.git
   SocketRocket:
     :commit: 41b57bb2fc292a814f758441a05243eb38457027
@@ -172,6 +173,6 @@ SPEC CHECKSUMS:
   YapDatabase: b1e43555a34a5298e23a045be96817a5ef0da58f
   ZXingObjC: bf15b3814f7a105b6d99f47da2333c93a063650a
 
-PODFILE CHECKSUM: 0e619684d8a5fa1ddbab78c0821d74af558fd7df
+PODFILE CHECKSUM: 9dd2ff3f84dd29f6437914f7ab631aeb84003078
 
 COCOAPODS: 1.0.1