From 3c3f782e7d63a6d53b8a5fd2afa39432b1448cf0 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Mon, 13 Feb 2017 11:40:30 -0500 Subject: [PATCH] Clean up prekey usage. // FREEBIE --- Podfile | 2 +- Podfile.lock | 4 ++-- Signal/Signal-Prefix.pch | 2 ++ Signal/src/audio/incall_audio/EncodedAudioFrame.m | 5 ++++- Signal/src/audio/incall_audio/EncodedAudioPacket.m | 5 ++++- Signal/src/audio/incall_audio/RemoteIOAudio.m | 5 ++++- Signal/src/audio/incall_audio/SpeexCodec.m | 5 ++++- Signal/src/audio/incall_audio/processing/AudioStretcher.m | 5 ++++- .../incall_audio/processing/StretchFactorController.m | 5 ++++- Signal/src/crypto/CryptoTools.m | 5 ++++- Signal/src/crypto/EvpMessageDigest.m | 5 ++++- Signal/src/crypto/EvpSymetricUtil.m | 5 ++++- Signal/src/environment/Environment.m | 1 - Signal/src/environment/PropertyListPreferences.m | 1 - Signal/src/environment/SignalKeyingStorage.m | 8 ++------ Signal/src/network/PacketHandler.m | 5 ++++- Signal/src/network/http/HttpRequestOrResponse.m | 5 ++++- Signal/src/network/http/RPAPICall.m | 7 +------ Signal/src/network/rtp/zrtp/HashChain.m | 5 ++++- .../network/rtp/zrtp/ShortAuthenticationStringGenerator.m | 6 ++++-- .../network/rtp/zrtp/packets/DhPacketSharedSecretHashes.m | 5 ++++- Signal/src/network/tcp/LowLatencyConnector.m | 5 ++++- Signal/src/network/tcp/StreamPair.m | 5 ++++- Signal/src/network/tcp/tls/NetworkStream.m | 5 ++++- Signal/src/network/udp/UdpSocket.m | 5 ++++- Signal/src/phone/signaling/InitiatorSessionDescriptor.m | 5 ++++- Signal/src/phone/signaling/ResponderSessionDescriptor.m | 5 ++++- Signal/src/phone/signaling/SignalUtil.m | 5 ++++- Signal/src/profiling/DecayingSampleEstimator.m | 5 ++++- Signal/src/profiling/LoggingUtil.m | 5 ++++- .../protocols/utilities/AnonymousConditionLogger.m | 5 ++++- .../protocols/utilities/AnonymousOccurrenceLogger.m | 5 ++++- .../profiling/protocols/utilities/AnonymousValueLogger.m | 5 ++++- Signal/src/util/ArrayUtil.m | 5 ++++- Signal/src/util/Conversions.h | 5 ++++- Signal/src/util/DataUtil.m | 5 ++++- Signal/src/util/DictionaryUtil.m | 5 ++++- Signal/src/util/FunctionalUtil.m | 5 ++++- Signal/src/util/FutureUtil.m | 5 ++++- Signal/src/util/NumberUtil.m | 5 ++++- Signal/src/util/StringUtil.m | 5 ++++- Signal/src/util/Util.h | 5 ++++- Signal/src/util/Zid.m | 5 ++++- Signal/src/util/collections/CyclicalBuffer.m | 5 ++++- Signal/src/util/collections/PriorityQueue.h | 5 ++++- Signal/src/util/collections/Queue.m | 5 ++++- Signal/src/util/protocols/utilities/AnonymousTerminator.m | 5 ++++- Signal/test/util/ExceptionsTest.m | 5 ++++- 48 files changed, 172 insertions(+), 59 deletions(-) diff --git a/Podfile b/Podfile index 6c5716040..ffd1c3806 100644 --- a/Podfile +++ b/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' diff --git a/Podfile.lock b/Podfile.lock index f46d2cf20..2d2f3db5e 100644 --- a/Podfile.lock +++ b/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 diff --git a/Signal/Signal-Prefix.pch b/Signal/Signal-Prefix.pch index 800821156..95894be0f 100644 --- a/Signal/Signal-Prefix.pch +++ b/Signal/Signal-Prefix.pch @@ -16,6 +16,8 @@ #endif #import + #import + #import #import #import "iOSVersions.h" diff --git a/Signal/src/audio/incall_audio/EncodedAudioFrame.m b/Signal/src/audio/incall_audio/EncodedAudioFrame.m index 266f76b77..6bb1747e4 100644 --- a/Signal/src/audio/incall_audio/EncodedAudioFrame.m +++ b/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 diff --git a/Signal/src/audio/incall_audio/EncodedAudioPacket.m b/Signal/src/audio/incall_audio/EncodedAudioPacket.m index 421aa18f5..15d02a4f8 100644 --- a/Signal/src/audio/incall_audio/EncodedAudioPacket.m +++ b/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 diff --git a/Signal/src/audio/incall_audio/RemoteIOAudio.m b/Signal/src/audio/incall_audio/RemoteIOAudio.m index 63c56be89..a6641644b 100644 --- a/Signal/src/audio/incall_audio/RemoteIOAudio.m +++ b/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" diff --git a/Signal/src/audio/incall_audio/SpeexCodec.m b/Signal/src/audio/incall_audio/SpeexCodec.m index e07120954..44361660c 100644 --- a/Signal/src/audio/incall_audio/SpeexCodec.m +++ b/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" diff --git a/Signal/src/audio/incall_audio/processing/AudioStretcher.m b/Signal/src/audio/incall_audio/processing/AudioStretcher.m index 959541aa7..73558de76 100644 --- a/Signal/src/audio/incall_audio/processing/AudioStretcher.m +++ b/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" diff --git a/Signal/src/audio/incall_audio/processing/StretchFactorController.m b/Signal/src/audio/incall_audio/processing/StretchFactorController.m index f4bbab39f..b90cf88ca 100644 --- a/Signal/src/audio/incall_audio/processing/StretchFactorController.m +++ b/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 diff --git a/Signal/src/crypto/CryptoTools.m b/Signal/src/crypto/CryptoTools.m index 7df5f43dc..e9b384d82 100644 --- a/Signal/src/crypto/CryptoTools.m +++ b/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" diff --git a/Signal/src/crypto/EvpMessageDigest.m b/Signal/src/crypto/EvpMessageDigest.m index d9fb5ec19..9dea8ec0a 100644 --- a/Signal/src/crypto/EvpMessageDigest.m +++ b/Signal/src/crypto/EvpMessageDigest.m @@ -1,9 +1,12 @@ +// +// Copyright (c) 2017 Open Whisper Systems. All rights reserved. +// + #import "EvpMessageDigest.h" #import #import -#import "Constraints.h" #import "EvpUtil.h" #import "NumberUtil.h" diff --git a/Signal/src/crypto/EvpSymetricUtil.m b/Signal/src/crypto/EvpSymetricUtil.m index 5a21db5fc..a45523378 100644 --- a/Signal/src/crypto/EvpSymetricUtil.m +++ b/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" diff --git a/Signal/src/environment/Environment.m b/Signal/src/environment/Environment.m index 03543c0a7..ff58d082b 100644 --- a/Signal/src/environment/Environment.m +++ b/Signal/src/environment/Environment.m @@ -3,7 +3,6 @@ // #import "Environment.h" -#import "Constraints.h" #import "DH3KKeyAgreementProtocol.h" #import "DebugLogger.h" #import "FunctionalUtil.h" diff --git a/Signal/src/environment/PropertyListPreferences.m b/Signal/src/environment/PropertyListPreferences.m index 90de1e94d..4923b7223 100644 --- a/Signal/src/environment/PropertyListPreferences.m +++ b/Signal/src/environment/PropertyListPreferences.m @@ -3,7 +3,6 @@ // #import "PropertyListPreferences.h" -#import "Constraints.h" #import "TSStorageHeaders.h" #import diff --git a/Signal/src/environment/SignalKeyingStorage.m b/Signal/src/environment/SignalKeyingStorage.m index 30ed082d3..85f9e2f34 100644 --- a/Signal/src/environment/SignalKeyingStorage.m +++ b/Signal/src/environment/SignalKeyingStorage.m @@ -1,11 +1,7 @@ // -// SignalKeyingStorage.m -// Signal +// Copyright (c) 2017 Open Whisper Systems. All rights reserved. // -// 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" diff --git a/Signal/src/network/PacketHandler.m b/Signal/src/network/PacketHandler.m index 1e763421c..16daf54d2 100644 --- a/Signal/src/network/PacketHandler.m +++ b/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 diff --git a/Signal/src/network/http/HttpRequestOrResponse.m b/Signal/src/network/http/HttpRequestOrResponse.m index 89740698f..47fc56530 100644 --- a/Signal/src/network/http/HttpRequestOrResponse.m +++ b/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 diff --git a/Signal/src/network/http/RPAPICall.m b/Signal/src/network/http/RPAPICall.m index 0e41b3014..320d274e7 100644 --- a/Signal/src/network/http/RPAPICall.m +++ b/Signal/src/network/http/RPAPICall.m @@ -1,13 +1,8 @@ // -// RedPhoneAPICall.m -// Signal -// -// Created by Frederic Jacobs on 05/10/14. -// Copyright (c) 2014 Open Whisper Systems. All rights reserved. +// Copyright (c) 2017 Open Whisper Systems. All rights reserved. // #import -#import "Constraints.h" #import "CryptoTools.h" #import "PhoneNumber.h" #import "RPAPICall.h" diff --git a/Signal/src/network/rtp/zrtp/HashChain.m b/Signal/src/network/rtp/zrtp/HashChain.m index c96d5d7ac..8deac6f11 100644 --- a/Signal/src/network/rtp/zrtp/HashChain.m +++ b/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 diff --git a/Signal/src/network/rtp/zrtp/ShortAuthenticationStringGenerator.m b/Signal/src/network/rtp/zrtp/ShortAuthenticationStringGenerator.m index d9583f09f..3f248730c 100644 --- a/Signal/src/network/rtp/zrtp/ShortAuthenticationStringGenerator.m +++ b/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 - diff --git a/Signal/src/network/rtp/zrtp/packets/DhPacketSharedSecretHashes.m b/Signal/src/network/rtp/zrtp/packets/DhPacketSharedSecretHashes.m index aa3649aca..638c69f9b 100644 --- a/Signal/src/network/rtp/zrtp/packets/DhPacketSharedSecretHashes.m +++ b/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 diff --git a/Signal/src/network/tcp/LowLatencyConnector.m b/Signal/src/network/tcp/LowLatencyConnector.m index d35b6bb51..9b79af8be 100644 --- a/Signal/src/network/tcp/LowLatencyConnector.m +++ b/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 diff --git a/Signal/src/network/tcp/StreamPair.m b/Signal/src/network/tcp/StreamPair.m index 823402f43..14460480c 100644 --- a/Signal/src/network/tcp/StreamPair.m +++ b/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; diff --git a/Signal/src/network/tcp/tls/NetworkStream.m b/Signal/src/network/tcp/tls/NetworkStream.m index 1272888c2..14ea304b1 100644 --- a/Signal/src/network/tcp/tls/NetworkStream.m +++ b/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" diff --git a/Signal/src/network/udp/UdpSocket.m b/Signal/src/network/udp/UdpSocket.m index a2c6de136..aa31413c6 100644 --- a/Signal/src/network/udp/UdpSocket.m +++ b/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" diff --git a/Signal/src/phone/signaling/InitiatorSessionDescriptor.m b/Signal/src/phone/signaling/InitiatorSessionDescriptor.m index 2a11c8ff6..9f3dd2e92 100644 --- a/Signal/src/phone/signaling/InitiatorSessionDescriptor.m +++ b/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" diff --git a/Signal/src/phone/signaling/ResponderSessionDescriptor.m b/Signal/src/phone/signaling/ResponderSessionDescriptor.m index 6ee229024..e391752a7 100644 --- a/Signal/src/phone/signaling/ResponderSessionDescriptor.m +++ b/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" diff --git a/Signal/src/phone/signaling/SignalUtil.m b/Signal/src/phone/signaling/SignalUtil.m index 6f2909fa7..59601f6ac 100644 --- a/Signal/src/phone/signaling/SignalUtil.m +++ b/Signal/src/phone/signaling/SignalUtil.m @@ -1,7 +1,10 @@ +// +// Copyright (c) 2017 Open Whisper Systems. All rights reserved. +// + #import "SignalUtil.h" #import -#import "Constraints.h" #import "SignalKeyingStorage.h" #import "Util.h" diff --git a/Signal/src/profiling/DecayingSampleEstimator.m b/Signal/src/profiling/DecayingSampleEstimator.m index f2fb8f50b..91ca83bed 100644 --- a/Signal/src/profiling/DecayingSampleEstimator.m +++ b/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 diff --git a/Signal/src/profiling/LoggingUtil.m b/Signal/src/profiling/LoggingUtil.m index 453126766..fcbc735c3 100644 --- a/Signal/src/profiling/LoggingUtil.m +++ b/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" diff --git a/Signal/src/profiling/protocols/utilities/AnonymousConditionLogger.m b/Signal/src/profiling/protocols/utilities/AnonymousConditionLogger.m index 1cb5a2a25..5613dbe4e 100644 --- a/Signal/src/profiling/protocols/utilities/AnonymousConditionLogger.m +++ b/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 diff --git a/Signal/src/profiling/protocols/utilities/AnonymousOccurrenceLogger.m b/Signal/src/profiling/protocols/utilities/AnonymousOccurrenceLogger.m index 25d995ea6..322260694 100644 --- a/Signal/src/profiling/protocols/utilities/AnonymousOccurrenceLogger.m +++ b/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 diff --git a/Signal/src/profiling/protocols/utilities/AnonymousValueLogger.m b/Signal/src/profiling/protocols/utilities/AnonymousValueLogger.m index cf72ccc6d..59203a995 100644 --- a/Signal/src/profiling/protocols/utilities/AnonymousValueLogger.m +++ b/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 diff --git a/Signal/src/util/ArrayUtil.m b/Signal/src/util/ArrayUtil.m index 3a2b3ff9b..27164b331 100644 --- a/Signal/src/util/ArrayUtil.m +++ b/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) diff --git a/Signal/src/util/Conversions.h b/Signal/src/util/Conversions.h index fa432632b..85ee94856 100644 --- a/Signal/src/util/Conversions.h +++ b/Signal/src/util/Conversions.h @@ -1,6 +1,9 @@ +// +// Copyright (c) 2017 Open Whisper Systems. All rights reserved. +// + #import #import -#import "Constraints.h" #import "CryptoTools.h" @interface NSData (Conversions) diff --git a/Signal/src/util/DataUtil.m b/Signal/src/util/DataUtil.m index 10f1d8ce5..2224784a8 100644 --- a/Signal/src/util/DataUtil.m +++ b/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) diff --git a/Signal/src/util/DictionaryUtil.m b/Signal/src/util/DictionaryUtil.m index 5dd29ee84..67a4ed4da 100644 --- a/Signal/src/util/DictionaryUtil.m +++ b/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" diff --git a/Signal/src/util/FunctionalUtil.m b/Signal/src/util/FunctionalUtil.m index b6b5e525e..f919197da 100644 --- a/Signal/src/util/FunctionalUtil.m +++ b/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) diff --git a/Signal/src/util/FutureUtil.m b/Signal/src/util/FutureUtil.m index e33ef6321..a359d711a 100644 --- a/Signal/src/util/FutureUtil.m +++ b/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) diff --git a/Signal/src/util/NumberUtil.m b/Signal/src/util/NumberUtil.m index 1ac164a94..db8424e1c 100644 --- a/Signal/src/util/NumberUtil.m +++ b/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 diff --git a/Signal/src/util/StringUtil.m b/Signal/src/util/StringUtil.m index d018fe927..94f95e1a7 100644 --- a/Signal/src/util/StringUtil.m +++ b/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" diff --git a/Signal/src/util/Util.h b/Signal/src/util/Util.h index abf0915a6..2c0033a7e 100644 --- a/Signal/src/util/Util.h +++ b/Signal/src/util/Util.h @@ -1,6 +1,9 @@ +// +// Copyright (c) 2017 Open Whisper Systems. All rights reserved. +// + #import #import "ArrayUtil.h" -#import "Constraints.h" #import "Crc32.h" #import "DataUtil.h" #import "DateUtil.h" diff --git a/Signal/src/util/Zid.m b/Signal/src/util/Zid.m index b1f99b6d7..1a874ac26 100644 --- a/Signal/src/util/Zid.m +++ b/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 diff --git a/Signal/src/util/collections/CyclicalBuffer.m b/Signal/src/util/collections/CyclicalBuffer.m index 19ea1cef8..4fb7cc9fc 100644 --- a/Signal/src/util/collections/CyclicalBuffer.m +++ b/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" diff --git a/Signal/src/util/collections/PriorityQueue.h b/Signal/src/util/collections/PriorityQueue.h index 65e5d216b..68fb6b2a4 100644 --- a/Signal/src/util/collections/PriorityQueue.h +++ b/Signal/src/util/collections/PriorityQueue.h @@ -1,5 +1,8 @@ +// +// Copyright (c) 2017 Open Whisper Systems. All rights reserved. +// + #import -#import "Constraints.h" @interface PriorityQueue : NSObject { @private diff --git a/Signal/src/util/collections/Queue.m b/Signal/src/util/collections/Queue.m index 3f0c048ce..309808746 100644 --- a/Signal/src/util/collections/Queue.m +++ b/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 { diff --git a/Signal/src/util/protocols/utilities/AnonymousTerminator.m b/Signal/src/util/protocols/utilities/AnonymousTerminator.m index d0c4c1f36..b47c505b2 100644 --- a/Signal/src/util/protocols/utilities/AnonymousTerminator.m +++ b/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 diff --git a/Signal/test/util/ExceptionsTest.m b/Signal/test/util/ExceptionsTest.m index 8b848b691..cac5a7efb 100644 --- a/Signal/test/util/ExceptionsTest.m +++ b/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"