Merge branch 'charlesmchen/prekey2'

Podfile

@@ -6,7 +6,7 @@ target 'Signal' do
     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', :branch => 'charlesmchen/rateLimitingErrorMessage'
     #pod 'SignalServiceKit',           path: '../SignalServiceKit'
     pod 'OpenSSL'
     pod 'PastelogKit',                '~> 1.3'

Podfile.lock

@@ -140,7 +140,7 @@ CHECKOUT OPTIONS:
     :commit: 945c04f9e70f7119d2ada4edb938849f3b7febab
     :git: https://github.com/WhisperSystems/SignalProtocolKit.git
   SignalServiceKit:
-    :commit: 7c55d559d3c9ef7e66a4ebd1daaf7620498c3e3a
+    :commit: 5ed95c4782be899e81b85196c4695cdb9e45276b
     :git: https://github.com/WhisperSystems/SignalServiceKit.git
   SocketRocket:
     :commit: 41b57bb2fc292a814f758441a05243eb38457027
@@ -172,6 +172,6 @@ SPEC CHECKSUMS:
   YapDatabase: b1e43555a34a5298e23a045be96817a5ef0da58f
   ZXingObjC: bf15b3814f7a105b6d99f47da2333c93a063650a
 
-PODFILE CHECKSUM: 1dec14c6ae3ecc013143fca915e5e7a3bb83bdc0
+PODFILE CHECKSUM: 23ca4df281ad1e794af6967db2047f43df88e96a
 
 COCOAPODS: 1.1.1

Signal/Signal-Prefix.pch

@@ -16,6 +16,8 @@
     #endif
 
     #import <SignalServiceKit/Asserts.h>
+    #import <SignalServiceKit/Constraints.h>
+    #import <SignalServiceKit/OWSAnalytics.h>
     #import <SignalServiceKit/OWSDispatch.h>
     #import "iOSVersions.h"
 

Signal/src/audio/incall_audio/EncodedAudioFrame.m

@@ -1,4 +1,7 @@
-#import "Constraints.h"
+//
+//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
+//
+
 #import "EncodedAudioFrame.h"
 
 @implementation EncodedAudioFrame

Signal/src/audio/incall_audio/EncodedAudioPacket.m

@@ -1,4 +1,7 @@
-#import "Constraints.h"
+//
+//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
+//
+
 #import "EncodedAudioPacket.h"
 
 @implementation EncodedAudioPacket

Signal/src/audio/incall_audio/RemoteIOAudio.m

@@ -1,5 +1,8 @@
+//
+//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
+//
+
 #import "AppAudioManager.h"
-#import "Constraints.h"
 #import "Environment.h"
 #import "RemoteIOAudio.h"
 #import "ThreadManager.h"

Signal/src/audio/incall_audio/SpeexCodec.m

@@ -1,4 +1,7 @@
-#import "Constraints.h"
+//
+//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
+//
+
 #import "Environment.h"
 #import "SpeexCodec.h"
 

Signal/src/audio/incall_audio/processing/AudioStretcher.m

@@ -1,5 +1,8 @@
+//
+//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
+//
+
 #import "AudioStretcher.h"
-#import "Constraints.h"
 #import "Util.h"
 #import "time_scale.h"
 

Signal/src/audio/incall_audio/processing/StretchFactorController.m

@@ -1,4 +1,7 @@
-#import "Constraints.h"
+//
+//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
+//
+
 #import "StretchFactorController.h"
 
 #define STRETCH_MODE_EXPAND 0

Signal/src/crypto/CryptoTools.m

@@ -1,6 +1,9 @@
+//
+//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
+//
+
 #import "CryptoTools.h"
 
-#import "Constraints.h"
 #import "Conversions.h"
 #import "EvpMessageDigest.h"
 #import "EvpSymetricUtil.h"

Signal/src/crypto/EvpMessageDigest.m

@@ -1,9 +1,12 @@
+//
+//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
+//
+
 #import "EvpMessageDigest.h"
 
 #import <OpenSSL/evp.h>
 #import <OpenSSL/hmac.h>
 
-#import "Constraints.h"
 #import "EvpUtil.h"
 #import "NumberUtil.h"
 

Signal/src/crypto/EvpSymetricUtil.m

@@ -1,6 +1,9 @@
+//
+//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
+//
+
 #import "EvpSymetricUtil.h"
 
-#import "Constraints.h"
 #import "EvpUtil.h"
 #import "NumberUtil.h"
 

Signal/src/environment/Environment.m

@@ -3,7 +3,6 @@
 //
 
 #import "Environment.h"
-#import "Constraints.h"
 #import "DH3KKeyAgreementProtocol.h"
 #import "DebugLogger.h"
 #import "FunctionalUtil.h"

Signal/src/environment/PropertyListPreferences.m

@@ -3,7 +3,6 @@
 //
 
 #import "PropertyListPreferences.h"
-#import "Constraints.h"
 #import "TSStorageHeaders.h"
 #import <SignalServiceKit/TSPrivacyPreferences.h>
 

Signal/src/environment/SignalKeyingStorage.m

@@ -1,11 +1,7 @@
 //
-//  SignalKeyingStorage.m
+//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
-//  Signal
 //
-//  Created by Frederic Jacobs on 09/07/14.
+
-//  Copyright (c) 2014 Open Whisper Systems. All rights reserved.
-//
-#import "Constraints.h"
 #import "CryptoTools.h"
 #import "SignalKeyingStorage.h"
 #import "TSStorageManager.h"

Signal/src/network/PacketHandler.m

@@ -1,5 +1,8 @@
+//
+//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
+//
+
 #import "PacketHandler.h"
-#import "Constraints.h"
 
 @implementation PacketHandler
 

Signal/src/network/http/HttpRequestOrResponse.m

@@ -1,5 +1,8 @@
+//
+//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
+//
+
 #import "HttpRequestOrResponse.h"
-#import "Constraints.h"
 #import "Util.h"
 
 @implementation HttpRequestOrResponse

Signal/src/network/http/RPAPICall.m

@@ -1,13 +1,8 @@
 //
-//  RedPhoneAPICall.m
+//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
-//  Signal
-//
-//  Created by Frederic Jacobs on 05/10/14.
-//  Copyright (c) 2014 Open Whisper Systems. All rights reserved.
 //
 
 #import <SignalServiceKit/TSAccountManager.h>
-#import "Constraints.h"
 #import "CryptoTools.h"
 #import "PhoneNumber.h"
 #import "RPAPICall.h"

Signal/src/network/rtp/zrtp/HashChain.m

@@ -1,5 +1,8 @@
+//
+//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
+//
+
 #import "CryptoTools.h"
-#import "Constraints.h"
 #import "HashChain.h"
 
 @implementation HashChain

Signal/src/network/rtp/zrtp/ShortAuthenticationStringGenerator.m

@@ -1,4 +1,7 @@
-#import "Constraints.h"
+//
+//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
+//
+
 #import "ShortAuthenticationStringGenerator.h"
 #import "Util.h"
 
@@ -88,4 +91,3 @@ const char* PGP_LIST_ODD[] = {
             @(PGP_LIST_ODD[wordIndexTwo])];
 }
 @end
-

Signal/src/network/rtp/zrtp/packets/DhPacketSharedSecretHashes.m

@@ -1,5 +1,8 @@
+//
+//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
+//
+
 #import "DhPacketSharedSecretHashes.h"
-#import "Constraints.h"
 #import "CryptoTools.h"
 
 @implementation DhPacketSharedSecretHashes

Signal/src/network/tcp/LowLatencyConnector.m

@@ -1,6 +1,9 @@
+//
+//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
+//
+
 #import "LowLatencyConnector.h"
 
-#import "Constraints.h"
 #import "Util.h"
 
 @implementation LowLatencyConnector

Signal/src/network/tcp/StreamPair.m

@@ -1,5 +1,8 @@
+//
+//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
+//
+
 #import "StreamPair.h"
-#import "Constraints.h"
 
 @implementation StreamPair
 @synthesize inputStream, outputStream;

Signal/src/network/tcp/tls/NetworkStream.m

@@ -1,6 +1,9 @@
+//
+//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
+//
+
 #import "Environment.h"
 #import "NetworkStream.h"
-#import "Constraints.h"
 #import "Util.h"
 #import "ThreadManager.h"
 

Signal/src/network/udp/UdpSocket.m

@@ -1,4 +1,7 @@
-#import "Constraints.h"
+//
+//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
+//
+
 #import "ThreadManager.h"
 #import "UdpSocket.h"
 #import "IPAddress.h"

Signal/src/phone/signaling/InitiatorSessionDescriptor.m

@@ -1,6 +1,9 @@
+//
+//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
+//
+
 #import "InitiatorSessionDescriptor.h"
 
-#import "Constraints.h"
 #import "Util.h"
 
 #define SessionIdKey @"sessionId"

Signal/src/phone/signaling/ResponderSessionDescriptor.m

@@ -1,6 +1,9 @@
+//
+//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
+//
+
 #import "ResponderSessionDescriptor.h"
 
-#import "Constraints.h"
 #import "CryptoTools.h"
 #import "InitiateSignal.pb.h"
 #import "SignalKeyingStorage.h"

Signal/src/phone/signaling/SignalUtil.m

@@ -1,7 +1,10 @@
+//
+//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
+//
+
 #import "SignalUtil.h"
 
 #import <SignalServiceKit/TSAccountManager.h>
-#import "Constraints.h"
 #import "SignalKeyingStorage.h"
 #import "Util.h"
 

Signal/src/profiling/DecayingSampleEstimator.m

@@ -1,4 +1,7 @@
-#import "Constraints.h"
+//
+//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
+//
+
 #import "DecayingSampleEstimator.h"
 
 @implementation DecayingSampleEstimator

Signal/src/profiling/LoggingUtil.m

@@ -1,6 +1,9 @@
+//
+//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
+//
+
 #import "AnonymousOccurrenceLogger.h"
 #import "AnonymousValueLogger.h"
-#import "Constraints.h"
 #import "LoggingUtil.h"
 #import "TimeUtil.h"
 

Signal/src/profiling/protocols/utilities/AnonymousConditionLogger.m

@@ -1,5 +1,8 @@
+//
+//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
+//
+
 #import "AnonymousConditionLogger.h"
-#import "Constraints.h"
 
 @implementation AnonymousConditionLogger
 

Signal/src/profiling/protocols/utilities/AnonymousOccurrenceLogger.m

@@ -1,5 +1,8 @@
+//
+//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
+//
+
 #import "AnonymousOccurrenceLogger.h"
-#import "Constraints.h"
 
 @implementation AnonymousOccurrenceLogger
 

Signal/src/profiling/protocols/utilities/AnonymousValueLogger.m

@@ -1,5 +1,8 @@
+//
+//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
+//
+
 #import "AnonymousValueLogger.h"
-#import "Constraints.h"
 
 @implementation AnonymousValueLogger
 

Signal/src/util/ArrayUtil.m

@@ -1,5 +1,8 @@
+//
+//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
+//
+
 #import "ArrayUtil.h"
-#import "Constraints.h"
 
 @implementation NSArray (Util)
 

Signal/src/util/Conversions.h

@@ -1,6 +1,9 @@
+//
+//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
+//
+
 #import <CoreFoundation/CFSocket.h>
 #import <Foundation/Foundation.h>
-#import "Constraints.h"
 #import "CryptoTools.h"
 
 @interface NSData (Conversions)

Signal/src/util/DataUtil.m

@@ -1,4 +1,7 @@
-#import "Constraints.h"
+//
+//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
+//
+
 #import "DataUtil.h"
 
 @implementation NSData (Util)

Signal/src/util/DictionaryUtil.m

@@ -1,4 +1,7 @@
-#import "Constraints.h"
+//
+//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
+//
+
 #import "DataUtil.h"
 #import "DictionaryUtil.h"
 

Signal/src/util/FunctionalUtil.m

@@ -1,4 +1,7 @@
-#import "Constraints.h"
+//
+//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
+//
+
 #import "FunctionalUtil.h"
 
 @implementation NSArray (FunctionalUtil)

Signal/src/util/FutureUtil.m

@@ -1,4 +1,7 @@
-#import "Constraints.h"
+//
+//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
+//
+
 #import "FutureUtil.h"
 
 @implementation TOCCancelToken (FutureUtil)

Signal/src/util/NumberUtil.m

@@ -1,4 +1,7 @@
-#import "Constraints.h"
+//
+//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
+//
+
 #import "NumberUtil.h"
 
 @implementation NumberUtil

Signal/src/util/StringUtil.m

@@ -1,4 +1,7 @@
-#import "Constraints.h"
+//
+//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
+//
+
 #import "DataUtil.h"
 #import "NumberUtil.h"
 #import "StringUtil.h"

Signal/src/util/Util.h

@@ -1,6 +1,9 @@
+//
+//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
+//
+
 #import <Foundation/Foundation.h>
 #import "ArrayUtil.h"
-#import "Constraints.h"
 #import "Crc32.h"
 #import "DataUtil.h"
 #import "DateUtil.h"

Signal/src/util/Zid.m

@@ -1,4 +1,7 @@
-#import "Constraints.h"
+//
+//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
+//
+
 #import "Zid.h"
 
 @implementation Zid

Signal/src/util/collections/CyclicalBuffer.m

@@ -1,4 +1,7 @@
-#import "Constraints.h"
+//
+//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
+//
+
 #import "CyclicalBuffer.h"
 #import "Util.h"
 

Signal/src/util/collections/PriorityQueue.h

@@ -1,5 +1,8 @@
+//
+//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
+//
+
 #import <CoreFoundation/CoreFoundation.h>
-#import "Constraints.h"
 
 @interface PriorityQueue : NSObject {
    @private

Signal/src/util/collections/Queue.m

@@ -1,4 +1,7 @@
-#import "Constraints.h"
+//
+//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
+//
+
 #import "Queue.h"
 
 @implementation Queue {

Signal/src/util/protocols/utilities/AnonymousTerminator.m

@@ -1,5 +1,8 @@
+//
+//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
+//
+
 #import "AnonymousTerminator.h"
-#import "Constraints.h"
 
 @implementation AnonymousTerminator
 

Signal/test/util/ExceptionsTest.m

@@ -1,4 +1,7 @@
-#import "Constraints.h"
+//
+//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
+//
+
 #import "ExceptionsTest.h"
 #import "TestUtil.h"