From 2e36f41838e00aa557574434582c3e5c1da15a2d Mon Sep 17 00:00:00 2001
From: Matthew Chen <charlesmchen@gmail.com>
Date: Wed, 10 May 2017 16:00:41 -0400
Subject: [PATCH] Add support for manually activating censorship circumvention.

// FREEBIE
---
 Podfile                                 | 4 ++--
 Podfile.lock                            | 9 +++------
 Signal/src/Jobs/MessageFetcherJob.swift | 2 +-
 Signal/src/network/PushManager.m        | 2 +-
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/Podfile b/Podfile
index 6c588a2f1..827294851 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 'JSQMessagesViewController',  git: 'https://github.com/WhisperSystems/JSQMessagesViewController.git', branch: 'mkirk/position-edit-menu'
     #pod 'JSQMessagesViewController'   path: '../JSQMessagesViewController'
diff --git a/Podfile.lock b/Podfile.lock
index 5803ee8c7..284539e24 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -112,7 +112,7 @@ DEPENDENCIES:
   - JSQMessagesViewController (from `https://github.com/WhisperSystems/JSQMessagesViewController.git`, branch `mkirk/position-edit-menu`)
   - OpenSSL
   - PureLayout
-  - SignalServiceKit (from `https://github.com/WhisperSystems/SignalServiceKit.git`)
+  - SignalServiceKit (from `../SignalServiceKit`)
   - SocketRocket (from `https://github.com/facebook/SocketRocket.git`)
 
 EXTERNAL SOURCES:
@@ -122,7 +122,7 @@ EXTERNAL SOURCES:
     :branch: mkirk/position-edit-menu
     :git: https://github.com/WhisperSystems/JSQMessagesViewController.git
   SignalServiceKit:
-    :git: https://github.com/WhisperSystems/SignalServiceKit.git
+    :path: ../SignalServiceKit
   SocketRocket:
     :git: https://github.com/facebook/SocketRocket.git
 
@@ -133,9 +133,6 @@ CHECKOUT OPTIONS:
   JSQMessagesViewController:
     :commit: 7054e4b13ee5bcd6d524adb6dc9a726e8c466308
     :git: https://github.com/WhisperSystems/JSQMessagesViewController.git
-  SignalServiceKit:
-    :commit: cbeafac20ebb0437baf8982381c1980db276681f
-    :git: https://github.com/WhisperSystems/SignalServiceKit.git
   SocketRocket:
     :commit: 877ac7438be3ad0b45ef5ca3969574e4b97112bf
     :git: https://github.com/facebook/SocketRocket.git
@@ -161,6 +158,6 @@ SPEC CHECKSUMS:
   UnionFind: c33be5adb12983981d6e827ea94fc7f9e370f52d
   YapDatabase: cd911121580ff16675f65ad742a9eb0ab4d9e266
 
-PODFILE CHECKSUM: cb2cbbe74dab34123e1cb527417ef658aa60bd26
+PODFILE CHECKSUM: 7664b398319c44d566a6da1acaecfc658742f18f
 
 COCOAPODS: 1.2.1
diff --git a/Signal/src/Jobs/MessageFetcherJob.swift b/Signal/src/Jobs/MessageFetcherJob.swift
index 6b67dea5e..759666eba 100644
--- a/Signal/src/Jobs/MessageFetcherJob.swift
+++ b/Signal/src/Jobs/MessageFetcherJob.swift
@@ -26,7 +26,7 @@ class MessageFetcherJob: NSObject {
 
     func runAsync() {
         Logger.debug("\(TAG) \(#function)")
-        guard signalService.isCensored  else {
+        guard signalService.isCensorshipCircumventionActive  else {
             Logger.debug("\(self.TAG) delegating message fetching to SocketManager since we're using normal transport.")
             TSSocketManager.requestSocketOpen()
             return
diff --git a/Signal/src/network/PushManager.m b/Signal/src/network/PushManager.m
index 71c4972a8..30b9a0aa0 100644
--- a/Signal/src/network/PushManager.m
+++ b/Signal/src/network/PushManager.m
@@ -63,7 +63,7 @@
     _callUIAdapter = callUIAdapter;
     _messageSender = messageSender;
 
-    OWSSignalService *signalService = [OWSSignalService new];
+    OWSSignalService *signalService = [OWSSignalService sharedInstance];
     _messageFetcherJob = [[OWSMessageFetcherJob alloc] initWithMessagesManager:messagesManager
                                                                 networkManager:networkManager
                                                                  signalService:signalService];