Merge branch 'charlesmchen/censorship-circumvention-2'

Podfile

@@ -4,7 +4,7 @@ source 'https://github.com/CocoaPods/Specs.git'
 target 'Signal' do
     pod 'SocketRocket',               :git => 'https://github.com/facebook/SocketRocket.git'
     pod 'AxolotlKit', git: 'https://github.com/WhisperSystems/SignalProtocolKit.git'
-    pod 'SignalServiceKit',           git: 'https://github.com/WhisperSystems/SignalServiceKit.git', branch: 'mkirk/censorship-circumvention'
+    pod 'SignalServiceKit',           git: 'https://github.com/WhisperSystems/SignalServiceKit.git', branch: 'master'
     #pod 'SignalServiceKit',           path: '../SignalServiceKit'
     pod 'OpenSSL'
     pod 'PastelogKit',                '~> 1.3'

Podfile.lock

@@ -121,7 +121,7 @@ DEPENDENCIES:
   - OpenSSL
   - PastelogKit (~> 1.3)
   - SCWaveformView (~> 1.0)
-  - SignalServiceKit (from `https://github.com/WhisperSystems/SignalServiceKit.git`, branch `mkirk/censorship-circumvention`)
+  - SignalServiceKit (from `https://github.com/WhisperSystems/SignalServiceKit.git`, branch `master`)
   - SocketRocket (from `https://github.com/facebook/SocketRocket.git`)
   - ZXingObjC
 
@@ -129,7 +129,7 @@ EXTERNAL SOURCES:
   AxolotlKit:
     :git: https://github.com/WhisperSystems/SignalProtocolKit.git
   SignalServiceKit:
-    :branch: mkirk/censorship-circumvention
+    :branch: master
     :git: https://github.com/WhisperSystems/SignalServiceKit.git
   SocketRocket:
     :git: https://github.com/facebook/SocketRocket.git
@@ -139,7 +139,7 @@ CHECKOUT OPTIONS:
     :commit: 714f5ebe199ecc999b33c6f97a4bb57e2db90e75
     :git: https://github.com/WhisperSystems/SignalProtocolKit.git
   SignalServiceKit:
-    :commit: 78515377b14f1055c4a87548a7899650b753ce52
+    :commit: a9340b06fd6549766ab537b2d7d603bf96f82504
     :git: https://github.com/WhisperSystems/SignalServiceKit.git
   SocketRocket:
     :commit: 41b57bb2fc292a814f758441a05243eb38457027
@@ -170,6 +170,6 @@ SPEC CHECKSUMS:
   YapDatabase: b1e43555a34a5298e23a045be96817a5ef0da58f
   ZXingObjC: bf15b3814f7a105b6d99f47da2333c93a063650a
 
-PODFILE CHECKSUM: e09325f010ba0ef1fd0bfa07f665e7be73c43ee0
+PODFILE CHECKSUM: cb24c78080551874a45d1a20de4a1bef7427b41f
 
 COCOAPODS: 1.0.1

Signal/Signal-Prefix.pch

@@ -16,6 +16,7 @@
     #endif
 
     #import "iOSVersions.h"
+    #import <SignalServiceKit/Asserts.h>
 
     #define SignalAlertView(title,msg) [[[UIAlertView alloc] initWithTitle:title message:msg delegate:nil cancelButtonTitle:NSLocalizedString(@"OK", @"") otherButtonTitles:nil, nil] show]
     #define SignalReportError [Pastelog reportErrorAndSubmitLogsWithAlertTitle:NSLocalizedString(@"ERROR_WAS_DETECTED_TITLE", @"") alertBody:NSLocalizedString(@"ERROR_WAS_DETECTED_SUBMIT", @"")];

Signal/src/AppDelegate.m

@@ -238,8 +238,12 @@ static NSString *const kURLHostVerifyPrefix             = @"verify";
                                                // signing.
                                                [TSSocketManager becomeActiveFromForeground];
                                                [[Environment getCurrent].contactsManager verifyABPermission];
+                                               
+                                               // This will fetch new messages, if we're using domain
+                                               // fronting.
+                                               [[PushManager sharedManager] applicationDidBecomeActive];
                                            }];
-
+    
     [self removeScreenProtection];
 }
 

Signal/src/Models/OWSMessagesBubblesSizeCalculator.h

@@ -3,6 +3,7 @@
 #import <JSQMessagesViewController/JSQMessagesBubblesSizeCalculator.h>
 
 NS_SWIFT_NAME(MessagesBubblesSizeCalculator)
+
 @interface OWSMessagesBubblesSizeCalculator : JSQMessagesBubblesSizeCalculator
 
 - (CGSize)messageBubbleSizeForMessageData:(id<JSQMessageData>)messageData

Signal/src/network/PushManager.h

@@ -85,6 +85,7 @@ typedef void (^pushTokensSuccessBlock)(NSString *pushToken, NSString *voipToken)
           forLocalNotification:(UILocalNotification *)notification
               withResponseInfo:(NSDictionary *)responseInfo
              completionHandler:(void (^)())completionHandler;
+- (void)applicationDidBecomeActive;
 
 @end
 

Signal/src/network/PushManager.m

@@ -162,6 +162,10 @@
     }
 }
 
+- (void)applicationDidBecomeActive {
+    [self.messageFetcherJob runAsync];
+}
+
 - (UILocalNotification *)closeVOIPBackgroundTask {
     [[UIApplication sharedApplication] endBackgroundTask:_callBackgroundTask];
     _callBackgroundTask = UIBackgroundTaskInvalid;