From f6c0625c2cd77fef6b5dc510bf59c93af7ed49d3 Mon Sep 17 00:00:00 2001 From: Frederic Jacobs Date: Mon, 27 Jul 2015 15:39:45 +0200 Subject: [PATCH] Removing unused imported classes. //FREEBIE --- Signal.xcodeproj/project.pbxproj | 26 ------- Signal/main.m | 2 +- Signal/src/AppDelegate.m | 10 --- Signal/src/audio/AppAudioManager.m | 2 - Signal/src/audio/SoundPlayer.m | 1 - Signal/src/audio/incall_audio/AudioSocket.m | 2 - .../src/audio/incall_audio/CallAudioManager.m | 3 - .../incall_audio/processing/AudioProcessor.m | 4 -- .../processing/DesiredBufferDepthController.m | 1 - .../incall_audio/processing/DropoutTracker.m | 3 - Signal/src/call/RecentCall.m | 3 - Signal/src/call/RecentCallManager.m | 7 -- Signal/src/contact/Contact.m | 2 - Signal/src/contact/ContactsManager.m | 3 - Signal/src/crypto/CryptoTools.m | 3 - Signal/src/environment/DebugLogger.m | 1 - Signal/src/environment/Environment.m | 3 - Signal/src/environment/PreferencesUtil.m | 3 - Signal/src/environment/Release.m | 2 - Signal/src/environment/VersionMigrations.m | 3 - Signal/src/network/IpAddress.m | 1 - Signal/src/network/PushManager.m | 3 - Signal/src/network/dns/DnsManager.m | 2 - Signal/src/network/dns/HostNameEndPoint.m | 1 - Signal/src/network/http/HttpManager.m | 2 - Signal/src/network/http/HttpRequest.m | 1 - Signal/src/network/http/HttpRequestUtil.m | 3 - Signal/src/network/http/HttpResponse.m | 1 - Signal/src/network/http/RPAPICall.m | 1 - .../network/http/RPServerRequestsManager.m | 7 -- Signal/src/network/rtp/RtpPacket.m | 2 - Signal/src/network/rtp/srtp/SrtpSocket.m | 1 - Signal/src/network/rtp/zrtp/MasterSecret.m | 3 - Signal/src/network/rtp/zrtp/ZrtpInitiator.m | 6 -- Signal/src/network/rtp/zrtp/ZrtpManager.m | 3 - Signal/src/network/rtp/zrtp/ZrtpResponder.m | 4 -- .../zrtp/agreement/DH3KKeyAgreementProtocol.m | 6 -- .../agreement/EC25KeyAgreementParticipant.m | 2 - .../rtp/zrtp/agreement/EvpKeyAgreement.m | 1 - .../network/rtp/zrtp/packets/CommitPacket.m | 2 - .../network/rtp/zrtp/packets/ConfirmPacket.m | 2 - .../src/network/rtp/zrtp/packets/DhPacket.m | 2 - .../rtp/zrtp/packets/HandshakePacket.m | 6 -- .../network/rtp/zrtp/packets/HelloPacket.m | 3 - Signal/src/network/tcp/LowLatencyConnector.m | 3 - Signal/src/network/tcp/tls/NetworkStream.m | 4 -- Signal/src/network/tcp/tls/SecureEndPoint.m | 1 - Signal/src/network/udp/UdpSocket.m | 1 - Signal/src/phone/PhoneManager.m | 5 -- Signal/src/phone/PhoneNumber.m | 2 - Signal/src/phone/callstate/CallController.m | 3 - Signal/src/phone/signaling/CallConnectUtil.m | 2 - .../signaling/CallConnectUtil_Initiator.m | 2 - .../signaling/CallConnectUtil_Responder.m | 3 - .../phone/signaling/CallConnectUtil_Server.m | 3 - .../signaling/ResponderSessionDescriptor.m | 1 - Signal/src/phone/signaling/SignalUtil.m | 2 - .../PhoneNumberDirectoryFilter.m | 2 - .../PhoneNumberDirectoryFilterManager.m | 1 - Signal/src/profiling/EventWindow.m | 1 - .../src/textsecure/Account/TSAccountManager.m | 2 - Signal/src/textsecure/Contacts/TSThread.m | 4 -- .../Contacts/Threads/TSContactThread.m | 2 - .../TSInvalidIdentityKeySendingErrorMessage.m | 1 - .../src/textsecure/Messages/TSErrorMessage.m | 1 - Signal/src/textsecure/Messages/TSMessage.m | 1 - .../Messages/TSMessagesManager+attachments.m | 3 - .../Messages/TSMessagesManager+sendMessages.m | 7 -- .../textsecure/Messages/TSMessagesManager.m | 12 ---- .../src/textsecure/Messages/TSServerMessage.m | 1 - .../API/Requests/TSRegisterPrekeysRequest.m | 2 - .../textsecure/Network/API/TSNetworkManager.m | 2 - .../Network/WebSockets/TSSocketManager.m | 3 - .../src/textsecure/Security/SecurityUtils.m | 1 - .../Storage/TSDatabaseSecondaryIndexes.m | 2 - .../src/textsecure/Storage/TSDatabaseView.m | 2 - .../src/textsecure/Storage/TSStorageManager.m | 5 -- Signal/src/textsecure/Util/Cryptography.m | 2 - Signal/src/textsecure/Util/NSString+escape.h | 13 ---- Signal/src/textsecure/Util/NSString+escape.m | 18 ----- Signal/src/util/Conversions.m | 1 - Signal/src/util/DateUtil.m | 2 - Signal/src/util/FutureUtil.m | 1 - Signal/src/util/Operation.m | 1 - Signal/src/util/TimeUtil.m | 2 - Signal/src/util/collections/PriorityQueue.m | 1 - .../util/protocols/PreKeyBundle+jsonDict.m | 1 - .../CodeVerificationViewController.m | 1 - .../CountryCodeViewController.m | 2 - .../FingerprintViewController.m | 3 - .../FullImageViewController.m | 1 - .../view controllers/InCallViewController.m | 5 -- .../MessageComposeTableViewController.m | 6 -- .../view controllers/MessagesViewController.m | 15 ---- .../view controllers/NewGroupViewController.m | 5 -- ...otificationSettingsOptionsViewController.m | 1 - .../NotificationSettingsViewController.m | 1 - .../RegistrationViewController.m | 9 --- .../ScanIdentityBarcodeViewController.m | 1 - .../SettingsTableViewController.m | 14 ---- .../ShowGroupMembersViewController.m | 10 --- .../view controllers/SignalTabBarController.h | 13 ---- .../view controllers/SignalTabBarController.m | 66 ----------------- .../src/view controllers/TSMessageAdapter.m | 4 -- .../TSVideoAttachmentAdapter.m | 3 - .../UITests/SignalsViewController.m | 7 -- Signal/src/views/ContactTableViewCell.m | 1 - Signal/src/views/InteractiveLabel.h | 8 --- Signal/src/views/InteractiveLabel.m | 71 ------------------- ...QMessagesCollectionViewCell+menuBarItems.h | 13 ---- ...QMessagesCollectionViewCell+menuBarItems.m | 49 ------------- Signal/src/views/LocalizableCustomFontLabel.h | 24 ------- Signal/src/views/LocalizableCustomFontLabel.m | 34 --------- Signal/test/audio/JitterQueueTest.m | 3 - Signal/test/audio/SpeexCodecTest.m | 1 - Signal/test/network/IpEndPointTest.m | 1 - Signal/test/network/dns/DnsManagerTest.m | 4 -- .../network/http/HttpRequestResponseTest.m | 4 -- Signal/test/network/rtp/RtpPacketTests.m | 1 - Signal/test/network/rtp/zrtp/EC25AgreerTest.m | 2 - .../network/rtp/zrtp/HandshakePacketTest.m | 2 - .../test/network/rtp/zrtp/MasterSecretTest.m | 1 - Signal/test/network/rtp/zrtp/ZrtpTest.m | 7 -- .../network/tcp/LowLatencyConnectorTest.m | 2 - .../test/network/tcp/tls/NetworkStreamTest.m | 4 -- .../test/network/tcp/tls/SecureEndPointTest.m | 1 - Signal/test/network/udp/UdpSocketTest.m | 3 - Signal/test/phone/BloomFilterTests.m | 2 - .../phone/signaling/SessionDescriptorTest.m | 2 - Signal/test/push/PushManagerTest.m | 1 - Signal/test/textsecure/CryptographyTests.mm | 1 - .../textsecure/SignedPreKeyDeletionTests.m | 2 - .../test/textsecure/TSMessageStorageTests.m | 5 -- .../textsecure/TSStoragePreKeyStoreTests.m | 2 - Signal/test/textsecure/TextSecureKitTests.m | 1 - .../test/textsecure/VersionMigrationsTests.m | 4 -- Signal/test/util/FutureUtilTest.m | 1 - Signal/test/util/PriorityQueueTest.m | 2 - 138 files changed, 1 insertion(+), 703 deletions(-) delete mode 100644 Signal/src/textsecure/Util/NSString+escape.h delete mode 100644 Signal/src/textsecure/Util/NSString+escape.m delete mode 100644 Signal/src/view controllers/SignalTabBarController.h delete mode 100644 Signal/src/view controllers/SignalTabBarController.m delete mode 100644 Signal/src/views/InteractiveLabel.h delete mode 100644 Signal/src/views/InteractiveLabel.m delete mode 100644 Signal/src/views/JSQMessagesCollectionViewCell+menuBarItems.h delete mode 100644 Signal/src/views/JSQMessagesCollectionViewCell+menuBarItems.m delete mode 100644 Signal/src/views/LocalizableCustomFontLabel.h delete mode 100644 Signal/src/views/LocalizableCustomFontLabel.m diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index f40737458..2582d061c 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -8,7 +8,6 @@ /* Begin PBXBuildFile section */ 701231B518ECAA4500D456C4 /* EvpMessageDigest.m in Sources */ = {isa = PBXBuildFile; fileRef = 701231B418ECAA4500D456C4 /* EvpMessageDigest.m */; }; - 70377AA91916BA0500CAF501 /* InteractiveLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = 70377AA81916BA0500CAF501 /* InteractiveLabel.m */; }; 70377AAB1918450100CAF501 /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 70377AAA1918450100CAF501 /* MobileCoreServices.framework */; }; 7038632718F70C0700D4A43F /* CryptoTools.m in Sources */ = {isa = PBXBuildFile; fileRef = 7038632418F70C0700D4A43F /* CryptoTools.m */; }; 7038632818F70C0700D4A43F /* EvpSymetricUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 7038632618F70C0700D4A43F /* EvpSymetricUtil.m */; }; @@ -17,8 +16,6 @@ 70B800AF190C548D0042E3F0 /* libspeex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 70B800AC190C54790042E3F0 /* libspeex.a */; }; 70B8FEE21909FE360042E3F0 /* 171756__nenadsimic__picked-coin-echo-2.wav in Resources */ = {isa = PBXBuildFile; fileRef = 70B8FEE11909FE360042E3F0 /* 171756__nenadsimic__picked-coin-echo-2.wav */; }; 70BAFD5D190584BE00FA5E0B /* NotificationTracker.m in Sources */ = {isa = PBXBuildFile; fileRef = 70BAFD5C190584BE00FA5E0B /* NotificationTracker.m */; }; - 765052A1182945EF008313E1 /* LocalizableCustomFontLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = 765052A0182945EF008313E1 /* LocalizableCustomFontLabel.m */; }; - 765052A2182945EF008313E1 /* LocalizableCustomFontLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = 765052A0182945EF008313E1 /* LocalizableCustomFontLabel.m */; }; 765052AA18294C9F008313E1 /* HelveticaNeueLTStd-Lt.otf in Resources */ = {isa = PBXBuildFile; fileRef = 765052A518294C9F008313E1 /* HelveticaNeueLTStd-Lt.otf */; }; 765052AC18294C9F008313E1 /* HelveticaNeueLTStd-Md.otf in Resources */ = {isa = PBXBuildFile; fileRef = 765052A618294C9F008313E1 /* HelveticaNeueLTStd-Md.otf */; }; 765052B3182BF839008313E1 /* HelveticaNeueLTStd-Th.otf in Resources */ = {isa = PBXBuildFile; fileRef = 765052B1182BF839008313E1 /* HelveticaNeueLTStd-Th.otf */; }; @@ -347,7 +344,6 @@ B67ADDC41989FF8700E1A773 /* RPServerRequestsManager.m in Sources */ = {isa = PBXBuildFile; fileRef = B67ADDC31989FF8700E1A773 /* RPServerRequestsManager.m */; }; B67EBF5D19194AC60084CCFD /* Settings.bundle in Resources */ = {isa = PBXBuildFile; fileRef = B67EBF5C19194AC60084CCFD /* Settings.bundle */; }; B68112EA1A4D9EC400BA82FF /* UIImage+normalizeImage.m in Sources */ = {isa = PBXBuildFile; fileRef = B68112E91A4D9EC400BA82FF /* UIImage+normalizeImage.m */; }; - B68112ED1A4DA30300BA82FF /* JSQMessagesCollectionViewCell+menuBarItems.m in Sources */ = {isa = PBXBuildFile; fileRef = B68112EC1A4DA30300BA82FF /* JSQMessagesCollectionViewCell+menuBarItems.m */; }; B684A46D19C3446200B11029 /* PushManagerTest.m in Sources */ = {isa = PBXBuildFile; fileRef = B684A46C19C3446200B11029 /* PushManagerTest.m */; }; B6850E5A1995A4710068E715 /* whisperFake.cer in Resources */ = {isa = PBXBuildFile; fileRef = B6850E591995A4710068E715 /* whisperFake.cer */; }; B692BF071A76EF0F002786DA /* TSDatabaseSecondaryIndexes.m in Sources */ = {isa = PBXBuildFile; fileRef = B692BF061A76EF0F002786DA /* TSDatabaseSecondaryIndexes.m */; }; @@ -394,7 +390,6 @@ B6B096911A1D25ED008BFAA6 /* NSData+Base64.m in Sources */ = {isa = PBXBuildFile; fileRef = B6B096581A1D25ED008BFAA6 /* NSData+Base64.m */; }; B6B096921A1D25ED008BFAA6 /* NSData+hexString.m in Sources */ = {isa = PBXBuildFile; fileRef = B6B0965A1A1D25ED008BFAA6 /* NSData+hexString.m */; }; B6B096931A1D25ED008BFAA6 /* NSData+messagePadding.m in Sources */ = {isa = PBXBuildFile; fileRef = B6B0965C1A1D25ED008BFAA6 /* NSData+messagePadding.m */; }; - B6B096941A1D25ED008BFAA6 /* NSString+escape.m in Sources */ = {isa = PBXBuildFile; fileRef = B6B0965E1A1D25ED008BFAA6 /* NSString+escape.m */; }; B6B096951A1D25ED008BFAA6 /* NSURLSessionDataTask+StatusCode.m in Sources */ = {isa = PBXBuildFile; fileRef = B6B096601A1D25ED008BFAA6 /* NSURLSessionDataTask+StatusCode.m */; }; B6B1013C196D213F007E3930 /* SignalKeyingStorage.m in Sources */ = {isa = PBXBuildFile; fileRef = B6B1013B196D213F007E3930 /* SignalKeyingStorage.m */; }; B6B50AAB1A4192C500F8F607 /* TSMessagesManager+attachments.m in Sources */ = {isa = PBXBuildFile; fileRef = B6B50AAA1A4192C500F8F607 /* TSMessagesManager+attachments.m */; }; @@ -544,8 +539,6 @@ 14DDBCE302E19644A773D119 /* Pods.app store release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods.app store release.xcconfig"; path = "Pods/Target Support Files/Pods/Pods.app store release.xcconfig"; sourceTree = ""; }; 701231B318ECAA4500D456C4 /* EvpMessageDigest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EvpMessageDigest.h; sourceTree = ""; }; 701231B418ECAA4500D456C4 /* EvpMessageDigest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EvpMessageDigest.m; sourceTree = ""; }; - 70377AA71916BA0500CAF501 /* InteractiveLabel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InteractiveLabel.h; sourceTree = ""; }; - 70377AA81916BA0500CAF501 /* InteractiveLabel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = InteractiveLabel.m; sourceTree = ""; }; 70377AAA1918450100CAF501 /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = System/Library/Frameworks/MobileCoreServices.framework; sourceTree = SDKROOT; }; 7038632318F70C0700D4A43F /* CryptoTools.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoTools.h; sourceTree = ""; }; 7038632418F70C0700D4A43F /* CryptoTools.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CryptoTools.m; sourceTree = ""; }; @@ -559,8 +552,6 @@ 70BAFD5B190584BE00FA5E0B /* NotificationTracker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NotificationTracker.h; sourceTree = ""; }; 70BAFD5C190584BE00FA5E0B /* NotificationTracker.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NotificationTracker.m; sourceTree = ""; }; 70E803ED18F6DD1400BF77BC /* EvpUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EvpUtil.h; sourceTree = ""; }; - 7650529F182945EF008313E1 /* LocalizableCustomFontLabel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LocalizableCustomFontLabel.h; sourceTree = ""; }; - 765052A0182945EF008313E1 /* LocalizableCustomFontLabel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LocalizableCustomFontLabel.m; sourceTree = ""; }; 765052A518294C9F008313E1 /* HelveticaNeueLTStd-Lt.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "HelveticaNeueLTStd-Lt.otf"; sourceTree = ""; }; 765052A618294C9F008313E1 /* HelveticaNeueLTStd-Md.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "HelveticaNeueLTStd-Md.otf"; sourceTree = ""; }; 765052B1182BF839008313E1 /* HelveticaNeueLTStd-Th.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "HelveticaNeueLTStd-Th.otf"; sourceTree = ""; }; @@ -963,8 +954,6 @@ B67EBF5C19194AC60084CCFD /* Settings.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = Settings.bundle; path = SettingsBundle/Settings.bundle; sourceTree = SOURCE_ROOT; }; B68112E81A4D9EC400BA82FF /* UIImage+normalizeImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "UIImage+normalizeImage.h"; path = "util/UIImage+normalizeImage.h"; sourceTree = ""; }; B68112E91A4D9EC400BA82FF /* UIImage+normalizeImage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "UIImage+normalizeImage.m"; path = "util/UIImage+normalizeImage.m"; sourceTree = ""; }; - B68112EB1A4DA30300BA82FF /* JSQMessagesCollectionViewCell+menuBarItems.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "JSQMessagesCollectionViewCell+menuBarItems.h"; path = "views/JSQMessagesCollectionViewCell+menuBarItems.h"; sourceTree = ""; }; - B68112EC1A4DA30300BA82FF /* JSQMessagesCollectionViewCell+menuBarItems.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "JSQMessagesCollectionViewCell+menuBarItems.m"; path = "views/JSQMessagesCollectionViewCell+menuBarItems.m"; sourceTree = ""; }; B684A46C19C3446200B11029 /* PushManagerTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PushManagerTest.m; path = Signal/test/push/PushManagerTest.m; sourceTree = SOURCE_ROOT; }; B6850E591995A4710068E715 /* whisperFake.cer */ = {isa = PBXFileReference; lastKnownFileType = file; path = whisperFake.cer; sourceTree = ""; }; B68B0E8D1A542AD700DE8A02 /* TSErrorMessage_privateConstructor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TSErrorMessage_privateConstructor.h; sourceTree = ""; }; @@ -1069,8 +1058,6 @@ B6B0965A1A1D25ED008BFAA6 /* NSData+hexString.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSData+hexString.m"; sourceTree = ""; }; B6B0965B1A1D25ED008BFAA6 /* NSData+messagePadding.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSData+messagePadding.h"; sourceTree = ""; }; B6B0965C1A1D25ED008BFAA6 /* NSData+messagePadding.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSData+messagePadding.m"; sourceTree = ""; }; - B6B0965D1A1D25ED008BFAA6 /* NSString+escape.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+escape.h"; sourceTree = ""; }; - B6B0965E1A1D25ED008BFAA6 /* NSString+escape.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+escape.m"; sourceTree = ""; }; B6B0965F1A1D25ED008BFAA6 /* NSURLSessionDataTask+StatusCode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSURLSessionDataTask+StatusCode.h"; sourceTree = ""; }; B6B096601A1D25ED008BFAA6 /* NSURLSessionDataTask+StatusCode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSURLSessionDataTask+StatusCode.m"; sourceTree = ""; }; B6B1013A196D213F007E3930 /* SignalKeyingStorage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SignalKeyingStorage.h; sourceTree = ""; }; @@ -1885,10 +1872,6 @@ FCB11D891A1284BB002F93FB /* SettingsTableViewCell.m */, 76EB052E18170B33006006FC /* ContactTableViewCell.h */, 76EB052F18170B33006006FC /* ContactTableViewCell.m */, - 70377AA71916BA0500CAF501 /* InteractiveLabel.h */, - 70377AA81916BA0500CAF501 /* InteractiveLabel.m */, - 7650529F182945EF008313E1 /* LocalizableCustomFontLabel.h */, - 765052A0182945EF008313E1 /* LocalizableCustomFontLabel.m */, 76EB053818170B33006006FC /* xibs */, ); path = views; @@ -2383,8 +2366,6 @@ B6B0965A1A1D25ED008BFAA6 /* NSData+hexString.m */, B6B0965B1A1D25ED008BFAA6 /* NSData+messagePadding.h */, B6B0965C1A1D25ED008BFAA6 /* NSData+messagePadding.m */, - B6B0965D1A1D25ED008BFAA6 /* NSString+escape.h */, - B6B0965E1A1D25ED008BFAA6 /* NSString+escape.m */, B6B0965F1A1D25ED008BFAA6 /* NSURLSessionDataTask+StatusCode.h */, B6B096601A1D25ED008BFAA6 /* NSURLSessionDataTask+StatusCode.m */, B6019E951A2492AB001118DF /* NSDate+millisecondTimeStamp.h */, @@ -2656,8 +2637,6 @@ FCFA64B61A24F6730007FB87 /* UIFont+OWS.m */, B68112E81A4D9EC400BA82FF /* UIImage+normalizeImage.h */, B68112E91A4D9EC400BA82FF /* UIImage+normalizeImage.m */, - B68112EB1A4DA30300BA82FF /* JSQMessagesCollectionViewCell+menuBarItems.h */, - B68112EC1A4DA30300BA82FF /* JSQMessagesCollectionViewCell+menuBarItems.m */, ); name = "UI Categories"; path = ..; @@ -3088,7 +3067,6 @@ 76EB061418170B33006006FC /* AnonymousConditionLogger.m in Sources */, 76EB05C018170B33006006FC /* DhPacket.m in Sources */, B63885D01A2685D700A226A6 /* PreKeyBundle+jsonDict.m in Sources */, - 765052A1182945EF008313E1 /* LocalizableCustomFontLabel.m in Sources */, FC3196301A0814130094C78E /* SettingsTableViewController.m in Sources */, 7038632818F70C0700D4A43F /* EvpSymetricUtil.m in Sources */, 76EB068618170B34006006FC /* ContactTableViewCell.m in Sources */, @@ -3110,7 +3088,6 @@ 76EB05EA18170B33006006FC /* CallProgress.m in Sources */, FCFA64B41A24F3880007FB87 /* UIColor+OWS.m in Sources */, 76EB05C218170B33006006FC /* DhPacketSharedSecretHashes.m in Sources */, - B68112ED1A4DA30300BA82FF /* JSQMessagesCollectionViewCell+menuBarItems.m in Sources */, B6B096701A1D25ED008BFAA6 /* TSInfoMessage.m in Sources */, B6C93C4E199567AD00EDF894 /* DebugLogger.m in Sources */, 76EB063218170B33006006FC /* Crc32.m in Sources */, @@ -3154,7 +3131,6 @@ FCFD25821A154B3800F4C644 /* CodeVerificationViewController.m in Sources */, B65EDA1219E1BE6400AAA7CB /* RPAPICall.m in Sources */, 76EB05DC18170B33006006FC /* StreamPair.m in Sources */, - 70377AA91916BA0500CAF501 /* InteractiveLabel.m in Sources */, 76EB064618170B33006006FC /* TimeUtil.m in Sources */, 70BAFD5D190584BE00FA5E0B /* NotificationTracker.m in Sources */, 76EB05A418170B33006006FC /* PacketHandler.m in Sources */, @@ -3205,7 +3181,6 @@ 76EB05B218170B33006006FC /* DH3KKeyAgreementProtocol.m in Sources */, 76EB060618170B33006006FC /* PhoneNumberDirectoryFilterManager.m in Sources */, B63761EC19E1FBE8005735D1 /* HttpRequest.m in Sources */, - B6B096941A1D25ED008BFAA6 /* NSString+escape.m in Sources */, 76EB060818170B33006006FC /* ResponderSessionDescriptor.m in Sources */, B90418E6183E9DD40038554A /* DateUtil.m in Sources */, B63AF5D21A1F757900D01AAD /* TSNetworkManager.m in Sources */, @@ -3285,7 +3260,6 @@ 76EB05F518170B33006006FC /* CallConnectResult.m in Sources */, BFB074C219A4BCA400F2947C /* ObservableTest.m in Sources */, A157076017F0CD6D007C2BD6 /* IpEndPointTest.m in Sources */, - 765052A2182945EF008313E1 /* LocalizableCustomFontLabel.m in Sources */, A157076117F0CD6D007C2BD6 /* RtpPacketTests.m in Sources */, 76EB05C518170B33006006FC /* HandshakePacket.m in Sources */, 76EB058F18170B33006006FC /* HostNameEndPoint.m in Sources */, diff --git a/Signal/main.m b/Signal/main.m index 74202e658..1f7772575 100644 --- a/Signal/main.m +++ b/Signal/main.m @@ -1,4 +1,4 @@ -#import + #import "AppDelegate.h" diff --git a/Signal/src/AppDelegate.m b/Signal/src/AppDelegate.m index 3618d72f3..94adc46e4 100644 --- a/Signal/src/AppDelegate.m +++ b/Signal/src/AppDelegate.m @@ -1,30 +1,20 @@ #import "AppDelegate.h" -#import "AppAudioManager.h" #import "CategorizingLogger.h" #import "ContactsManager.h" #import "DebugLogger.h" -#import "DiscardingLog.h" #import "Environment.h" #import "PhoneNumberDirectoryFilterManager.h" #import "PreferencesUtil.h" #import "PushManager.h" -#import "PriorityQueue.h" #import "Release.h" -#import "SignalsViewController.h" #import "TSAccountManager.h" #import "TSPreKeyManager.h" #import "TSMessagesManager.h" #import "TSSocketManager.h" #import "TSStorageManager.h" -#import "Util.h" #import "VersionMigrations.h" -#import "UIColor+OWS.h" #import "CodeVerificationViewController.h" -#ifdef __APPLE__ -#include "TargetConditionals.h" -#endif - static NSString * const kStoryboardName = @"Storyboard"; static NSString * const kInitialViewControllerIdentifier = @"UserInitialViewController"; static NSString * const kURLSchemeSGNLKey = @"sgnl"; diff --git a/Signal/src/audio/AppAudioManager.m b/Signal/src/audio/AppAudioManager.m index 8c07539c2..9bf6c2856 100644 --- a/Signal/src/audio/AppAudioManager.m +++ b/Signal/src/audio/AppAudioManager.m @@ -1,9 +1,7 @@ #import "AppAudioManager.h" -#import #import "AudioRouter.h" #import "SoundBoard.h" -#import "SoundPlayer.h" #define DEFAULT_CATEGORY AVAudioSessionCategorySoloAmbient diff --git a/Signal/src/audio/SoundPlayer.m b/Signal/src/audio/SoundPlayer.m index f3d18a299..8bedc2b45 100644 --- a/Signal/src/audio/SoundPlayer.m +++ b/Signal/src/audio/SoundPlayer.m @@ -1,5 +1,4 @@ #import "SoundPlayer.h" -#import "SoundBoard.h" @interface SoundInstance () -(void) play; diff --git a/Signal/src/audio/incall_audio/AudioSocket.m b/Signal/src/audio/incall_audio/AudioSocket.m index e8c4e9643..54922b5e8 100644 --- a/Signal/src/audio/incall_audio/AudioSocket.m +++ b/Signal/src/audio/incall_audio/AudioSocket.m @@ -1,6 +1,4 @@ #import "AudioSocket.h" -#import "Constraints.h" -#import "RtpPacket.h" @implementation AudioSocket diff --git a/Signal/src/audio/incall_audio/CallAudioManager.m b/Signal/src/audio/incall_audio/CallAudioManager.m index 451fffe34..833f5a742 100644 --- a/Signal/src/audio/incall_audio/CallAudioManager.m +++ b/Signal/src/audio/incall_audio/CallAudioManager.m @@ -1,8 +1,5 @@ #import "AnonymousTerminator.h" #import "CallAudioManager.h" -#import "PreferencesUtil.h" -#import "ThreadManager.h" -#import "Util.h" #define SAFETY_FACTOR_FOR_COMPUTE_DELAY 3.0 diff --git a/Signal/src/audio/incall_audio/processing/AudioProcessor.m b/Signal/src/audio/incall_audio/processing/AudioProcessor.m index 04ca1313f..96dd8b17d 100644 --- a/Signal/src/audio/incall_audio/processing/AudioProcessor.m +++ b/Signal/src/audio/incall_audio/processing/AudioProcessor.m @@ -1,8 +1,4 @@ #import "AudioProcessor.h" -#import "Environment.h" -#import "Constraints.h" -#import "SpeexCodec.h" -#import "Util.h" @implementation AudioProcessor diff --git a/Signal/src/audio/incall_audio/processing/DesiredBufferDepthController.m b/Signal/src/audio/incall_audio/processing/DesiredBufferDepthController.m index 40a4f1eeb..8920c9f63 100644 --- a/Signal/src/audio/incall_audio/processing/DesiredBufferDepthController.m +++ b/Signal/src/audio/incall_audio/processing/DesiredBufferDepthController.m @@ -1,5 +1,4 @@ #import "DesiredBufferDepthController.h" -#import "Constraints.h" #import "PreferencesUtil.h" #import "Util.h" #import "AudioPacker.h" diff --git a/Signal/src/audio/incall_audio/processing/DropoutTracker.m b/Signal/src/audio/incall_audio/processing/DropoutTracker.m index 06321573b..87b010e0e 100644 --- a/Signal/src/audio/incall_audio/processing/DropoutTracker.m +++ b/Signal/src/audio/incall_audio/processing/DropoutTracker.m @@ -1,8 +1,5 @@ #import "DropoutTracker.h" #import "Util.h" -#import "Constraints.h" -#import "Environment.h" -#import "TimeUtil.h" #define maxActionableLatency 0.3 #define binsPerPacket 2.0 diff --git a/Signal/src/call/RecentCall.m b/Signal/src/call/RecentCall.m index 4d28be05c..51e71fa53 100644 --- a/Signal/src/call/RecentCall.m +++ b/Signal/src/call/RecentCall.m @@ -1,7 +1,4 @@ #import "RecentCall.h" -#import "Environment.h" -#import "PreferencesUtil.h" -#import "Util.h" static NSString *const DEFAULTS_KEY_CONTACT_ID = @"DefaultsKeyContactID"; static NSString *const DEFAULTS_KEY_PHONE_NUMBER = @"DefaultsKeyPhoneNumber"; diff --git a/Signal/src/call/RecentCallManager.m b/Signal/src/call/RecentCallManager.m index f6a9eed05..cb2c3a653 100644 --- a/Signal/src/call/RecentCallManager.m +++ b/Signal/src/call/RecentCallManager.m @@ -1,12 +1,5 @@ #import "RecentCallManager.h" -#import "ContactsManager.h" -#import "FunctionalUtil.h" -#import "ObservableValue.h" -#import "PreferencesUtil.h" -#import "PushManager.h" -#import "NSDate+millisecondTimeStamp.h" #import "TSCall.h" -#import "TSContactThread.h" #import "TSMessagesManager.h" #import "TSStorageManager.h" diff --git a/Signal/src/contact/Contact.m b/Signal/src/contact/Contact.m index 6eb114ac4..a3672aa27 100644 --- a/Signal/src/contact/Contact.m +++ b/Signal/src/contact/Contact.m @@ -1,9 +1,7 @@ #import "Contact.h" #import "ContactsManager.h" #import "TSStorageManager.h" -#import "Util.h" #import "Environment.h" -#import "PreferencesUtil.h" #import "TSRecipient.h" static NSString *const DEFAULTS_KEY_CONTACT = @"DefaultsKeyContact"; diff --git a/Signal/src/contact/ContactsManager.m b/Signal/src/contact/ContactsManager.m index 61f3ae4fb..88f020fc4 100644 --- a/Signal/src/contact/ContactsManager.m +++ b/Signal/src/contact/ContactsManager.m @@ -1,11 +1,8 @@ #import "ContactsManager.h" -#import -#import #import "Environment.h" #import "NotificationManifest.h" #import "PhoneNumberDirectoryFilter.h" #import "PhoneNumberDirectoryFilterManager.h" -#import "PreferencesUtil.h" #import "Util.h" #define ADDRESSBOOK_QUEUE dispatch_get_main_queue() diff --git a/Signal/src/crypto/CryptoTools.m b/Signal/src/crypto/CryptoTools.m index 7debcb67a..85d168b32 100644 --- a/Signal/src/crypto/CryptoTools.m +++ b/Signal/src/crypto/CryptoTools.m @@ -1,12 +1,9 @@ #import "CryptoTools.h" -#import - #import "Constraints.h" #import "Conversions.h" #import "EvpMessageDigest.h" #import "EvpSymetricUtil.h" -#import "SecurityFailure.h" #import "Util.h" @implementation CryptoTools diff --git a/Signal/src/environment/DebugLogger.m b/Signal/src/environment/DebugLogger.m index 2a083c778..7f679fa37 100644 --- a/Signal/src/environment/DebugLogger.m +++ b/Signal/src/environment/DebugLogger.m @@ -11,7 +11,6 @@ #pragma mark Logging - Production logging wants us to write some logs to a file in case we need it for debugging. #import -#import @interface DebugLogger () diff --git a/Signal/src/environment/Environment.m b/Signal/src/environment/Environment.m index 4b7d804b2..3b572440f 100644 --- a/Signal/src/environment/Environment.m +++ b/Signal/src/environment/Environment.m @@ -4,11 +4,8 @@ #import "FunctionalUtil.h" #import "KeyAgreementProtocol.h" #import "DH3KKeyAgreementProtocol.h" -#import "HostNameEndPoint.h" #import "RecentCallManager.h" -#import "ContactsManager.h" #import "MessagesViewController.h" -#import "PreferencesUtil.h" #import "PhoneNumberDirectoryFilterManager.h" #import "SignalKeyingStorage.h" #import "SignalsViewController.h" diff --git a/Signal/src/environment/PreferencesUtil.m b/Signal/src/environment/PreferencesUtil.m index a51ebf498..7511a7bb3 100644 --- a/Signal/src/environment/PreferencesUtil.m +++ b/Signal/src/environment/PreferencesUtil.m @@ -1,8 +1,5 @@ #import "PreferencesUtil.h" -#import "CryptoTools.h" #import "Constraints.h" -#import "PhoneNumber.h" -#import "Util.h" #import "NotificationManifest.h" diff --git a/Signal/src/environment/Release.m b/Signal/src/environment/Release.m index d0ebd7876..eef765ba4 100644 --- a/Signal/src/environment/Release.m +++ b/Signal/src/environment/Release.m @@ -1,7 +1,5 @@ #import "Release.h" -#import "PropertyListPreferences.h" #import "DiscardingLog.h" -#import "HostNameEndPoint.h" #import "PhoneManager.h" #import "PhoneNumberUtil.h" #import "RecentCallManager.h" diff --git a/Signal/src/environment/VersionMigrations.m b/Signal/src/environment/VersionMigrations.m index 14788eb7a..e09958683 100644 --- a/Signal/src/environment/VersionMigrations.m +++ b/Signal/src/environment/VersionMigrations.m @@ -11,14 +11,11 @@ #import "Environment.h" #import "PhoneNumberDirectoryFilterManager.h" #import "PreferencesUtil.h" -#import "PropertyListPreferences.h" #import "PushManager.h" #import "TSAccountManager.h" #import "RecentCallManager.h" #import "SignalKeyingStorage.h" #import "UICKeyChainStore.h" -#import "TSStorageManager.h" -#import "TSDatabaseView.h" #define IS_MIGRATING_FROM_1DOT0_TO_LARGER_KEY @"Migrating from 1.0 to Larger" #define NEEDS_TO_REGISTER_PUSH_KEY @"Register For Push" diff --git a/Signal/src/network/IpAddress.m b/Signal/src/network/IpAddress.m index b7d4d6880..b1ec686ba 100644 --- a/Signal/src/network/IpAddress.m +++ b/Signal/src/network/IpAddress.m @@ -1,6 +1,5 @@ #import "IpAddress.h" #import "Util.h" -#import "Constraints.h" #import "IpEndPoint.h" #define LOCAL_HOST_IP @"127.0.0.1" diff --git a/Signal/src/network/PushManager.m b/Signal/src/network/PushManager.m index f0543b44d..f33bbe2e6 100644 --- a/Signal/src/network/PushManager.m +++ b/Signal/src/network/PushManager.m @@ -14,10 +14,7 @@ #import "PreferencesUtil.h" #import "PushManager.h" -#import "Environment.h" -#import "PreferencesUtil.h" #import "RPServerRequestsManager.h" -#import "TSAccountManager.h" #import "TSSocketManager.h" #define pushManagerDomain @"org.whispersystems.pushmanager" diff --git a/Signal/src/network/dns/DnsManager.m b/Signal/src/network/dns/DnsManager.m index 57f505f47..dc557147c 100644 --- a/Signal/src/network/dns/DnsManager.m +++ b/Signal/src/network/dns/DnsManager.m @@ -1,10 +1,8 @@ #import "DnsManager.h" #import -#import "HttpResponse.h" #import "IpEndPoint.h" #import "ThreadManager.h" -#import "UdpSocket.h" #import "Util.h" #define STRING_POINTER_FLAG 0xc0 diff --git a/Signal/src/network/dns/HostNameEndPoint.m b/Signal/src/network/dns/HostNameEndPoint.m index 053e4473b..34e032c0b 100644 --- a/Signal/src/network/dns/HostNameEndPoint.m +++ b/Signal/src/network/dns/HostNameEndPoint.m @@ -1,7 +1,6 @@ #import "HostNameEndPoint.h" #import "DnsManager.h" #import "IpEndPoint.h" -#import "ThreadManager.h" #import "Util.h" @implementation HostNameEndPoint diff --git a/Signal/src/network/http/HttpManager.m b/Signal/src/network/http/HttpManager.m index d463db48b..e946f5a7c 100644 --- a/Signal/src/network/http/HttpManager.m +++ b/Signal/src/network/http/HttpManager.m @@ -1,6 +1,4 @@ #import "HttpManager.h" -#import "NetworkStream.h" -#import "HttpSocket.h" #import "Util.h" @implementation HttpManager diff --git a/Signal/src/network/http/HttpRequest.m b/Signal/src/network/http/HttpRequest.m index 9cfdbe12d..abefe1307 100644 --- a/Signal/src/network/http/HttpRequest.m +++ b/Signal/src/network/http/HttpRequest.m @@ -1,7 +1,6 @@ #import "HttpRequest.h" #import "Util.h" #import "CryptoTools.h" -#import "Constraints.h" #import "HttpRequestOrResponse.h" @interface HttpRequest () diff --git a/Signal/src/network/http/HttpRequestUtil.m b/Signal/src/network/http/HttpRequestUtil.m index ddfba2278..bffd01100 100644 --- a/Signal/src/network/http/HttpRequestUtil.m +++ b/Signal/src/network/http/HttpRequestUtil.m @@ -1,7 +1,4 @@ #import "HttpRequestUtil.h" -#import "Constraints.h" -#import "PreferencesUtil.h" -#import "Util.h" #import "SignalKeyingStorage.h" @implementation HttpRequest (HttpRequestUtil) diff --git a/Signal/src/network/http/HttpResponse.m b/Signal/src/network/http/HttpResponse.m index 11c5aaeb4..dc357ddc7 100644 --- a/Signal/src/network/http/HttpResponse.m +++ b/Signal/src/network/http/HttpResponse.m @@ -1,6 +1,5 @@ #import "HttpResponse.h" #import "Util.h" -#import "Constraints.h" #import "HttpRequestOrResponse.h" @implementation HttpResponse diff --git a/Signal/src/network/http/RPAPICall.m b/Signal/src/network/http/RPAPICall.m index b711c0194..fdaa34916 100644 --- a/Signal/src/network/http/RPAPICall.m +++ b/Signal/src/network/http/RPAPICall.m @@ -10,7 +10,6 @@ #import "CryptoTools.h" #import "PhoneNumber.h" #import "RPAPICall.h" -#import "SignalUtil.h" #import "SignalKeyingStorage.h" #import "Util.h" #import "NSData+ows_StripToken.h" diff --git a/Signal/src/network/http/RPServerRequestsManager.m b/Signal/src/network/http/RPServerRequestsManager.m index 631fd73e5..a510061fe 100644 --- a/Signal/src/network/http/RPServerRequestsManager.m +++ b/Signal/src/network/http/RPServerRequestsManager.m @@ -5,15 +5,8 @@ // Created by Frederic Jacobs on 31/07/14. // Copyright (c) 2014 Open Whisper Systems. All rights reserved. // -#import "HttpRequest.h" #import "RPServerRequestsManager.h" -#import "Constraints.h" -#import "CryptoTools.h" -#import "DataUtil.h" #import "Environment.h" -#import "HostNameEndPoint.h" -#import "SignalKeyingStorage.h" -#import "Util.h" #import "AFHTTPSessionManager+SignalMethods.h" diff --git a/Signal/src/network/rtp/RtpPacket.m b/Signal/src/network/rtp/RtpPacket.m index 632c7e066..4390a078a 100644 --- a/Signal/src/network/rtp/RtpPacket.m +++ b/Signal/src/network/rtp/RtpPacket.m @@ -1,7 +1,5 @@ #import "RtpPacket.h" #import "Util.h" -#import "Constraints.h" -#import "FunctionalUtil.h" #import "Environment.h" const uint8_t PACKET_VERSION = 2; diff --git a/Signal/src/network/rtp/srtp/SrtpSocket.m b/Signal/src/network/rtp/srtp/SrtpSocket.m index d1921c8d3..5c743c2ef 100644 --- a/Signal/src/network/rtp/srtp/SrtpSocket.m +++ b/Signal/src/network/rtp/srtp/SrtpSocket.m @@ -1,6 +1,5 @@ #import "SrtpSocket.h" #import "ZrtpManager.h" -#import "ZrtpHandshakeSocket.h" @implementation SrtpSocket diff --git a/Signal/src/network/rtp/zrtp/MasterSecret.m b/Signal/src/network/rtp/zrtp/MasterSecret.m index e19572bb8..4641dee0c 100644 --- a/Signal/src/network/rtp/zrtp/MasterSecret.m +++ b/Signal/src/network/rtp/zrtp/MasterSecret.m @@ -1,8 +1,5 @@ #import "MasterSecret.h" -#import "Conversions.h" -#import "CryptoTools.h" #import "ShortAuthenticationStringGenerator.h" -#import "Util.h" #define INITIATOR_SRTP_KEY_LABEL @"Initiator SRTP master key" #define RESPONDER_SRTP_KEY_LABEL @"Responder SRTP master key" diff --git a/Signal/src/network/rtp/zrtp/ZrtpInitiator.m b/Signal/src/network/rtp/zrtp/ZrtpInitiator.m index 418a7b853..defe7849a 100644 --- a/Signal/src/network/rtp/zrtp/ZrtpInitiator.m +++ b/Signal/src/network/rtp/zrtp/ZrtpInitiator.m @@ -1,12 +1,6 @@ #import "ConfirmPacket.h" -#import "CryptoTools.h" -#import "DH3KKeyAgreementProtocol.h" -#import "Constraints.h" -#import "FunctionalUtil.h" #import "MasterSecret.h" -#import "Util.h" #import "ZrtpInitiator.h" -#import "PreferencesUtil.h" #import "SignalKeyingStorage.h" #define DHRS1_LENGTH 8 diff --git a/Signal/src/network/rtp/zrtp/ZrtpManager.m b/Signal/src/network/rtp/zrtp/ZrtpManager.m index 1878930cf..106b2b3f5 100644 --- a/Signal/src/network/rtp/zrtp/ZrtpManager.m +++ b/Signal/src/network/rtp/zrtp/ZrtpManager.m @@ -1,11 +1,8 @@ #import "ZrtpManager.h" #import "ThreadManager.h" -#import "ZrtpHandshakeSocket.h" -#import "ZrtpHandshakeResult.h" #import "ZrtpInitiator.h" #import "ZrtpResponder.h" #import "ConfirmAckPacket.h" -#import "TimeUtil.h" #define MAX_RETRANSMIT_COUNT 45 #define MIN_RETRANSMIT_INTERVAL_SECONDS 0.15 diff --git a/Signal/src/network/rtp/zrtp/ZrtpResponder.m b/Signal/src/network/rtp/zrtp/ZrtpResponder.m index 73faa9137..b29040ae6 100644 --- a/Signal/src/network/rtp/zrtp/ZrtpResponder.m +++ b/Signal/src/network/rtp/zrtp/ZrtpResponder.m @@ -1,10 +1,6 @@ #import "CommitPacket.h" #import "ConfirmPacket.h" -#import "DH3KKeyAgreementProtocol.h" -#import "PreferencesUtil.h" -#import "FunctionalUtil.h" #import "MasterSecret.h" -#import "Util.h" #import "ZrtpResponder.h" #import "HelloAckPacket.h" #import "ConfirmAckPacket.h" diff --git a/Signal/src/network/rtp/zrtp/agreement/DH3KKeyAgreementProtocol.m b/Signal/src/network/rtp/zrtp/agreement/DH3KKeyAgreementProtocol.m index 90911e29b..3c587006a 100644 --- a/Signal/src/network/rtp/zrtp/agreement/DH3KKeyAgreementProtocol.m +++ b/Signal/src/network/rtp/zrtp/agreement/DH3KKeyAgreementProtocol.m @@ -1,11 +1,5 @@ #import "DH3KKeyAgreementProtocol.h" #import "DH3KKeyAgreementParticipant.h" -#import "Constraints.h" -#import "CryptoTools.h" -#import "Util.h" -#import "Conversions.h" - -#import "EvpKeyAgreement.h" @implementation DH3KKeyAgreementProtocol diff --git a/Signal/src/network/rtp/zrtp/agreement/EC25KeyAgreementParticipant.m b/Signal/src/network/rtp/zrtp/agreement/EC25KeyAgreementParticipant.m index b68ddca6e..aadb520db 100644 --- a/Signal/src/network/rtp/zrtp/agreement/EC25KeyAgreementParticipant.m +++ b/Signal/src/network/rtp/zrtp/agreement/EC25KeyAgreementParticipant.m @@ -1,6 +1,4 @@ #import "EC25KeyAgreementParticipant.h" -#import "EvpKeyAgreement.h" -#import "Constraints.h" @implementation EC25KeyAgreementParticipant diff --git a/Signal/src/network/rtp/zrtp/agreement/EvpKeyAgreement.m b/Signal/src/network/rtp/zrtp/agreement/EvpKeyAgreement.m index 3c457a793..e4667ed32 100644 --- a/Signal/src/network/rtp/zrtp/agreement/EvpKeyAgreement.m +++ b/Signal/src/network/rtp/zrtp/agreement/EvpKeyAgreement.m @@ -1,5 +1,4 @@ #import "EvpKeyAgreement.h" -#import "Util.h" #import #import #import diff --git a/Signal/src/network/rtp/zrtp/packets/CommitPacket.m b/Signal/src/network/rtp/zrtp/packets/CommitPacket.m index cf75eb9fa..62c3a7454 100644 --- a/Signal/src/network/rtp/zrtp/packets/CommitPacket.m +++ b/Signal/src/network/rtp/zrtp/packets/CommitPacket.m @@ -1,6 +1,4 @@ #import "CommitPacket.h" -#import "Util.h" -#import "CryptoTools.h" @implementation CommitPacket diff --git a/Signal/src/network/rtp/zrtp/packets/ConfirmPacket.m b/Signal/src/network/rtp/zrtp/packets/ConfirmPacket.m index a8b262eeb..739e551fa 100644 --- a/Signal/src/network/rtp/zrtp/packets/ConfirmPacket.m +++ b/Signal/src/network/rtp/zrtp/packets/ConfirmPacket.m @@ -1,6 +1,4 @@ #import "ConfirmPacket.h" -#import "Util.h" -#import "Conversions.h" @implementation ConfirmPacket diff --git a/Signal/src/network/rtp/zrtp/packets/DhPacket.m b/Signal/src/network/rtp/zrtp/packets/DhPacket.m index 84e1e799c..cc9cc3e76 100644 --- a/Signal/src/network/rtp/zrtp/packets/DhPacket.m +++ b/Signal/src/network/rtp/zrtp/packets/DhPacket.m @@ -1,6 +1,4 @@ #import "DhPacket.h" -#import "Util.h" -#import "CryptoTools.h" @implementation DhPacket diff --git a/Signal/src/network/rtp/zrtp/packets/HandshakePacket.m b/Signal/src/network/rtp/zrtp/packets/HandshakePacket.m index 9f986c613..b8241314e 100644 --- a/Signal/src/network/rtp/zrtp/packets/HandshakePacket.m +++ b/Signal/src/network/rtp/zrtp/packets/HandshakePacket.m @@ -1,13 +1,7 @@ #import "HandshakePacket.h" -#import "Constraints.h" -#import "Conversions.h" -#import "Util.h" -#import "CryptoTools.h" -#import "Crc32.h" #import "DhPacket.h" #import "ConfirmPacket.h" #import "CommitPacket.h" -#import "HelloPacket.h" #import "ConfirmAckPacket.h" #import "HelloAckPacket.h" diff --git a/Signal/src/network/rtp/zrtp/packets/HelloPacket.m b/Signal/src/network/rtp/zrtp/packets/HelloPacket.m index a27ac3bc8..01f16d7f9 100644 --- a/Signal/src/network/rtp/zrtp/packets/HelloPacket.m +++ b/Signal/src/network/rtp/zrtp/packets/HelloPacket.m @@ -1,7 +1,4 @@ #import "HelloPacket.h" -#import "Util.h" -#import "DH3KKeyAgreementProtocol.h" -#import "FunctionalUtil.h" #import "Environment.h" @implementation HelloPacket diff --git a/Signal/src/network/tcp/LowLatencyConnector.m b/Signal/src/network/tcp/LowLatencyConnector.m index ab16af1f9..0da8ead42 100644 --- a/Signal/src/network/tcp/LowLatencyConnector.m +++ b/Signal/src/network/tcp/LowLatencyConnector.m @@ -1,9 +1,6 @@ #import "LowLatencyConnector.h" #import "Constraints.h" -#import "DnsManager.h" -#import "IpAddress.h" -#import "NetworkStream.h" #import "Util.h" @implementation LowLatencyConnector diff --git a/Signal/src/network/tcp/tls/NetworkStream.m b/Signal/src/network/tcp/tls/NetworkStream.m index 62dd002f4..21d04cf59 100644 --- a/Signal/src/network/tcp/tls/NetworkStream.m +++ b/Signal/src/network/tcp/tls/NetworkStream.m @@ -2,10 +2,6 @@ #import "NetworkStream.h" #import "Constraints.h" #import "Util.h" -#import "SecureEndPoint.h" -#import "HostNameEndPoint.h" -#import "IpEndPoint.h" -#import "IpAddress.h" #import "ThreadManager.h" #define READ_BUFFER_LENGTH 1024 diff --git a/Signal/src/network/tcp/tls/SecureEndPoint.m b/Signal/src/network/tcp/tls/SecureEndPoint.m index eae011b30..517288add 100644 --- a/Signal/src/network/tcp/tls/SecureEndPoint.m +++ b/Signal/src/network/tcp/tls/SecureEndPoint.m @@ -1,6 +1,5 @@ #import "SecureEndPoint.h" #import "Util.h" -#import "DnsManager.h" @implementation SecureEndPoint @synthesize certificate, hostNameEndPoint; diff --git a/Signal/src/network/udp/UdpSocket.m b/Signal/src/network/udp/UdpSocket.m index 91a353782..dde96450a 100644 --- a/Signal/src/network/udp/UdpSocket.m +++ b/Signal/src/network/udp/UdpSocket.m @@ -1,7 +1,6 @@ #import "Constraints.h" #import "ThreadManager.h" #import "UdpSocket.h" -#import "Util.h" @implementation UdpSocket diff --git a/Signal/src/phone/PhoneManager.m b/Signal/src/phone/PhoneManager.m index cc742b08f..e4eb5d4ca 100644 --- a/Signal/src/phone/PhoneManager.m +++ b/Signal/src/phone/PhoneManager.m @@ -1,12 +1,7 @@ #import "AppAudioManager.h" #import "CallAudioManager.h" #import "PhoneManager.h" -#import "ThreadManager.h" -#import "CallTermination.h" -#import "CallFailedServerMessage.h" -#import "CallProgress.h" #import "RecentCallManager.h" -#import "Util.h" @implementation PhoneManager diff --git a/Signal/src/phone/PhoneNumber.m b/Signal/src/phone/PhoneNumber.m index 40f2b9cc0..3ea02d4ae 100644 --- a/Signal/src/phone/PhoneNumber.m +++ b/Signal/src/phone/PhoneNumber.m @@ -1,7 +1,5 @@ #import "PhoneNumber.h" #import "Constraints.h" -#import "Util.h" -#import "PreferencesUtil.h" #import "Environment.h" #import "PhoneNumberUtil.h" #import "NBAsYouTypeFormatter.h" diff --git a/Signal/src/phone/callstate/CallController.m b/Signal/src/phone/callstate/CallController.m index 884cefc4a..932b18066 100644 --- a/Signal/src/phone/callstate/CallController.m +++ b/Signal/src/phone/callstate/CallController.m @@ -1,7 +1,4 @@ #import "CallController.h" -#import "Util.h" -#import "Environment.h" -#import "SignalUtil.h" @implementation CallController { UIBackgroundTaskIdentifier backgroundtask; diff --git a/Signal/src/phone/signaling/CallConnectUtil.m b/Signal/src/phone/signaling/CallConnectUtil.m index 9d184afca..0614f9f99 100644 --- a/Signal/src/phone/signaling/CallConnectUtil.m +++ b/Signal/src/phone/signaling/CallConnectUtil.m @@ -1,8 +1,6 @@ #import "CallConnectUtil.h" #import "CallConnectUtil_Initiator.h" #import "CallConnectUtil_Responder.h" -#import "SignalUtil.h" -#import "Util.h" @implementation CallConnectUtil diff --git a/Signal/src/phone/signaling/CallConnectUtil_Initiator.m b/Signal/src/phone/signaling/CallConnectUtil_Initiator.m index 4b742f74b..7a58b1a45 100644 --- a/Signal/src/phone/signaling/CallConnectUtil_Initiator.m +++ b/Signal/src/phone/signaling/CallConnectUtil_Initiator.m @@ -5,8 +5,6 @@ #import "IgnoredPacketFailure.h" #import "SignalUtil.h" #import "UnrecognizedRequestFailure.h" -#import "Util.h" -#import "ZrtpManager.h" @implementation CallConnectUtil_Initiator diff --git a/Signal/src/phone/signaling/CallConnectUtil_Responder.m b/Signal/src/phone/signaling/CallConnectUtil_Responder.m index 35571698c..d652375fe 100644 --- a/Signal/src/phone/signaling/CallConnectUtil_Responder.m +++ b/Signal/src/phone/signaling/CallConnectUtil_Responder.m @@ -1,11 +1,8 @@ #import "CallConnectUtil_Responder.h" -#import "CallConnectUtil.h" #import "CallConnectUtil_Server.h" #import "SignalUtil.h" #import "UnrecognizedRequestFailure.h" -#import "Util.h" -#import "ZrtpManager.h" @implementation CallConnectUtil_Responder diff --git a/Signal/src/phone/signaling/CallConnectUtil_Server.m b/Signal/src/phone/signaling/CallConnectUtil_Server.m index b04f7b4d5..a8146d710 100644 --- a/Signal/src/phone/signaling/CallConnectUtil_Server.m +++ b/Signal/src/phone/signaling/CallConnectUtil_Server.m @@ -1,13 +1,10 @@ #import "CallConnectUtil_Server.h" -#import "AudioSocket.h" #import "CallConnectResult.h" #import "DnsManager.h" #import "IgnoredPacketFailure.h" #import "LowLatencyConnector.h" #import "SignalUtil.h" -#import "UdpSocket.h" -#import "Util.h" #import "ZrtpManager.h" #define BASE_TIMEOUT_SECONDS 1 diff --git a/Signal/src/phone/signaling/ResponderSessionDescriptor.m b/Signal/src/phone/signaling/ResponderSessionDescriptor.m index 850fbf96d..64a0bfd01 100644 --- a/Signal/src/phone/signaling/ResponderSessionDescriptor.m +++ b/Signal/src/phone/signaling/ResponderSessionDescriptor.m @@ -2,7 +2,6 @@ #import "Constraints.h" #import "CryptoTools.h" -#import "PreferencesUtil.h" #import "Util.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 8b93df4de..ec1c7f1b7 100644 --- a/Signal/src/phone/signaling/SignalUtil.m +++ b/Signal/src/phone/signaling/SignalUtil.m @@ -1,8 +1,6 @@ #import "SignalUtil.h" #import "Constraints.h" -#import "Environment.h" -#import "PreferencesUtil.h" #import "Util.h" #import "SignalKeyingStorage.h" diff --git a/Signal/src/phone/signaling/number directory/PhoneNumberDirectoryFilter.m b/Signal/src/phone/signaling/number directory/PhoneNumberDirectoryFilter.m index 0ba63a3ee..18f3e5f43 100644 --- a/Signal/src/phone/signaling/number directory/PhoneNumberDirectoryFilter.m +++ b/Signal/src/phone/signaling/number directory/PhoneNumberDirectoryFilter.m @@ -1,7 +1,5 @@ #import "PhoneNumberDirectoryFilter.h" -#import "Environment.h" #import "Constraints.h" -#import "PreferencesUtil.h" #define HASH_COUNT_HEADER_KEY @"X-Hash-Count" #define MIN_NEW_EXPIRATION_SECONDS (12 * 60 * 60) diff --git a/Signal/src/phone/signaling/number directory/PhoneNumberDirectoryFilterManager.m b/Signal/src/phone/signaling/number directory/PhoneNumberDirectoryFilterManager.m index ba7ac380b..015334f98 100644 --- a/Signal/src/phone/signaling/number directory/PhoneNumberDirectoryFilterManager.m +++ b/Signal/src/phone/signaling/number directory/PhoneNumberDirectoryFilterManager.m @@ -6,7 +6,6 @@ #import "NotificationManifest.h" #import "PreferencesUtil.h" #import "RPServerRequestsManager.h" -#import "SignalUtil.h" #import "ThreadManager.h" #import "TSContactsIntersectionRequest.h" #import "TSStorageManager.h" diff --git a/Signal/src/profiling/EventWindow.m b/Signal/src/profiling/EventWindow.m index c0673368c..99f60f6c4 100644 --- a/Signal/src/profiling/EventWindow.m +++ b/Signal/src/profiling/EventWindow.m @@ -1,5 +1,4 @@ #import "EventWindow.h" -#import "Util.h" @implementation EventWindow diff --git a/Signal/src/textsecure/Account/TSAccountManager.m b/Signal/src/textsecure/Account/TSAccountManager.m index 586f5e83b..9a4230b9a 100644 --- a/Signal/src/textsecure/Account/TSAccountManager.m +++ b/Signal/src/textsecure/Account/TSAccountManager.m @@ -6,8 +6,6 @@ // Copyright (c) 2014 Open Whisper Systems. All rights reserved. // -#include - #import "Constraints.h" #import "NSData+Base64.h" #import "NSData+hexString.h" diff --git a/Signal/src/textsecure/Contacts/TSThread.m b/Signal/src/textsecure/Contacts/TSThread.m index b6edfbf96..0695ec326 100644 --- a/Signal/src/textsecure/Contacts/TSThread.m +++ b/Signal/src/textsecure/Contacts/TSThread.m @@ -7,16 +7,12 @@ // #import "TSThread.h" -#import "ContactsManager.h" #import "TSDatabaseView.h" #import "TSInteraction.h" #import "TSStorageManager.h" -#import "TSCall.h" #import "TSOutgoingMessage.h" #import "TSIncomingMessage.h" -#import "TSInfoMessage.h" -#import "TSErrorMessage.h" @interface TSThread () diff --git a/Signal/src/textsecure/Contacts/Threads/TSContactThread.m b/Signal/src/textsecure/Contacts/Threads/TSContactThread.m index 5f0309d19..b0bcb3fa4 100644 --- a/Signal/src/textsecure/Contacts/Threads/TSContactThread.m +++ b/Signal/src/textsecure/Contacts/Threads/TSContactThread.m @@ -10,9 +10,7 @@ #import "Environment.h" #import "IncomingPushMessageSignal.pb.h" -#import "TSStorageManager.h" #import "ContactsManager.h" -#import "TSRecipient.h" #define TSContactThreadPrefix @"c" diff --git a/Signal/src/textsecure/Messages/InvalidKeyMessages/TSInvalidIdentityKeySendingErrorMessage.m b/Signal/src/textsecure/Messages/InvalidKeyMessages/TSInvalidIdentityKeySendingErrorMessage.m index 132653535..cccf2af01 100644 --- a/Signal/src/textsecure/Messages/InvalidKeyMessages/TSInvalidIdentityKeySendingErrorMessage.m +++ b/Signal/src/textsecure/Messages/InvalidKeyMessages/TSInvalidIdentityKeySendingErrorMessage.m @@ -10,7 +10,6 @@ #import -#import "NSDate+millisecondTimeStamp.h" #import "PreKeyBundle+jsonDict.h" #import "TSInvalidIdentityKeySendingErrorMessage.h" #import "TSFingerprintGenerator.h" diff --git a/Signal/src/textsecure/Messages/TSErrorMessage.m b/Signal/src/textsecure/Messages/TSErrorMessage.m index cab73ccb2..3d95603ce 100644 --- a/Signal/src/textsecure/Messages/TSErrorMessage.m +++ b/Signal/src/textsecure/Messages/TSErrorMessage.m @@ -7,7 +7,6 @@ // #import "TSErrorMessage.h" -#import "NSDate+millisecondTimeStamp.h" #import "TSMessagesManager.h" #import "TSErrorMessage_privateConstructor.h" diff --git a/Signal/src/textsecure/Messages/TSMessage.m b/Signal/src/textsecure/Messages/TSMessage.m index f8a781030..ab84d22ee 100644 --- a/Signal/src/textsecure/Messages/TSMessage.m +++ b/Signal/src/textsecure/Messages/TSMessage.m @@ -7,7 +7,6 @@ // #import "TSMessage.h" -#import "TSAttachment.h" NSString * const TSAttachementsRelationshipEdgeName = @"TSAttachmentEdge"; diff --git a/Signal/src/textsecure/Messages/TSMessagesManager+attachments.m b/Signal/src/textsecure/Messages/TSMessagesManager+attachments.m index 3d85f3006..739a699e7 100644 --- a/Signal/src/textsecure/Messages/TSMessagesManager+attachments.m +++ b/Signal/src/textsecure/Messages/TSMessagesManager+attachments.m @@ -12,11 +12,8 @@ #import "Cryptography.h" #import "TSAllocAttachmentRequest.h" -#import "TSAttachmentEncryptionResult.h" #import "TSAttachmentPointer.h" -#import "TSAttachmentStream.h" #import "TSAttachmentRequest.h" -#import "TSConstants.h" #import "TSInfoMessage.h" #import "TSMessagesManager+attachments.h" #import "TSMessagesManager+sendMessages.h" diff --git a/Signal/src/textsecure/Messages/TSMessagesManager+sendMessages.m b/Signal/src/textsecure/Messages/TSMessagesManager+sendMessages.m index 4ca9d3400..5c4f27339 100644 --- a/Signal/src/textsecure/Messages/TSMessagesManager+sendMessages.m +++ b/Signal/src/textsecure/Messages/TSMessagesManager+sendMessages.m @@ -15,7 +15,6 @@ #import "Environment.h" #import "PreferencesUtil.h" -#import "IncomingPushMessageSignal.pb.h" #import "NSData+messagePadding.h" #import "TSStorageManager.h" #import "TSStorageManager+SessionStore.h" @@ -26,19 +25,13 @@ #import "PreKeyBundle+jsonDict.h" #import "SignalKeyingStorage.h" -#import "TSAttachmentStream.h" #import "TSNetworkManager.h" #import "TSServerMessage.h" #import "TSSubmitMessageRequest.h" #import "TSRecipientPrekeyRequest.h" -#import "TSErrorMessage.h" #import "TSInfoMessage.h" -#import "TSContactThread.h" -#import "TSGroupThread.h" -#import "TSRecipient.h" - @interface TSMessagesManager () dispatch_queue_t sendingQueue(void); @end diff --git a/Signal/src/textsecure/Messages/TSMessagesManager.m b/Signal/src/textsecure/Messages/TSMessagesManager.m index dc3b42c9f..d8a96be72 100644 --- a/Signal/src/textsecure/Messages/TSMessagesManager.m +++ b/Signal/src/textsecure/Messages/TSMessagesManager.m @@ -12,14 +12,8 @@ #import #import -#import "Cryptography.h" -#import "IncomingPushMessageSignal.pb.h" -#import "NSData+Base64.h" - #import "PushManager.h" -#import "TSIncomingMessage.h" -#import "TSErrorMessage.h" #import "TSInvalidIdentityKeyReceivingErrorMessage.h" #import "TSInfoMessage.h" @@ -29,10 +23,7 @@ #import "TSStorageManager+SessionStore.h" #import "TSStorageManager+SignedPreKeyStore.h" #import "TSStorageManager+PreKeyStore.h" -#import "TSNetworkManager.h" -#import "TSSubmitMessageRequest.h" #import "TSMessagesManager+attachments.h" -#import "TSAttachmentPointer.h" #import "SignalKeyingStorage.h" @@ -43,9 +34,6 @@ #import "ContactsManager.h" #import "TSCall.h" -#import -#import - @interface TSMessagesManager () @property SystemSoundID newMessageSound; diff --git a/Signal/src/textsecure/Messages/TSServerMessage.m b/Signal/src/textsecure/Messages/TSServerMessage.m index 68fc56326..146aee766 100644 --- a/Signal/src/textsecure/Messages/TSServerMessage.m +++ b/Signal/src/textsecure/Messages/TSServerMessage.m @@ -10,7 +10,6 @@ #import "TSServerMessage.h" #import "NSData+Base64.h" -#import @interface TSServerMessage () diff --git a/Signal/src/textsecure/Network/API/Requests/TSRegisterPrekeysRequest.m b/Signal/src/textsecure/Network/API/Requests/TSRegisterPrekeysRequest.m index e57847f54..afe88661c 100644 --- a/Signal/src/textsecure/Network/API/Requests/TSRegisterPrekeysRequest.m +++ b/Signal/src/textsecure/Network/API/Requests/TSRegisterPrekeysRequest.m @@ -14,8 +14,6 @@ #import #import -#import "TSStorageManager+IdentityKeyStore.h" - @implementation TSRegisterPrekeysRequest - (id)initWithPrekeyArray:(NSArray*)prekeys identityKey:(NSData*)identityKeyPublic signedPreKeyRecord:(SignedPreKeyRecord*)signedRecord preKeyLastResort:(PreKeyRecord*)lastResort { diff --git a/Signal/src/textsecure/Network/API/TSNetworkManager.m b/Signal/src/textsecure/Network/API/TSNetworkManager.m index 4f7a2e04c..0b928eb78 100644 --- a/Signal/src/textsecure/Network/API/TSNetworkManager.m +++ b/Signal/src/textsecure/Network/API/TSNetworkManager.m @@ -9,9 +9,7 @@ #import #import "TSAccountManager.h" -#import "TSConstants.h" #import "TSNetworkManager.h" -#import "TSRequest.h" #import "TSRegisterWithTokenRequest.h" #import "TSStorageManager+keyingMaterial.h" diff --git a/Signal/src/textsecure/Network/WebSockets/TSSocketManager.m b/Signal/src/textsecure/Network/WebSockets/TSSocketManager.m index 35bca2d25..3cbb945d9 100644 --- a/Signal/src/textsecure/Network/WebSockets/TSSocketManager.m +++ b/Signal/src/textsecure/Network/WebSockets/TSSocketManager.m @@ -13,11 +13,8 @@ #import "TSMessagesManager.h" #import "TSSocketManager.h" #import "TSStorageManager+keyingMaterial.h" -#import -#import "NSData+Base64.h" #import "Cryptography.h" -#import "IncomingPushMessageSignal.pb.h" #define kWebSocketHeartBeat 30 #define kWebSocketReconnectTry 5 diff --git a/Signal/src/textsecure/Security/SecurityUtils.m b/Signal/src/textsecure/Security/SecurityUtils.m index 369582ddb..100137e6a 100644 --- a/Signal/src/textsecure/Security/SecurityUtils.m +++ b/Signal/src/textsecure/Security/SecurityUtils.m @@ -7,7 +7,6 @@ // #import "SecurityUtils.h" -#import @implementation SecurityUtils diff --git a/Signal/src/textsecure/Storage/TSDatabaseSecondaryIndexes.m b/Signal/src/textsecure/Storage/TSDatabaseSecondaryIndexes.m index 2e7dd597f..20f5a69f1 100644 --- a/Signal/src/textsecure/Storage/TSDatabaseSecondaryIndexes.m +++ b/Signal/src/textsecure/Storage/TSDatabaseSecondaryIndexes.m @@ -8,8 +8,6 @@ #import "TSDatabaseSecondaryIndexes.h" -#import - #import "TSInteraction.h" #define TSTimeStampSQLiteIndex @"messagesTimeStamp" diff --git a/Signal/src/textsecure/Storage/TSDatabaseView.m b/Signal/src/textsecure/Storage/TSDatabaseView.m index ca59be3a9..a8e5ea4de 100644 --- a/Signal/src/textsecure/Storage/TSDatabaseView.m +++ b/Signal/src/textsecure/Storage/TSDatabaseView.m @@ -12,9 +12,7 @@ #import "TSThread.h" #import "TSIncomingMessage.h" -#import "TSInteraction.h" #import "TSStorageManager.h" -#import "TSRecipient.h" NSString *TSInboxGroup = @"TSInboxGroup"; NSString *TSArchiveGroup = @"TSArchiveGroup"; diff --git a/Signal/src/textsecure/Storage/TSStorageManager.m b/Signal/src/textsecure/Storage/TSStorageManager.m index 909562b5f..e72cec5ff 100644 --- a/Signal/src/textsecure/Storage/TSStorageManager.m +++ b/Signal/src/textsecure/Storage/TSStorageManager.m @@ -7,18 +7,13 @@ // #import "TSStorageManager.h" -#import #import -#import #import "CryptoTools.h" #import "DebugLogger.h" #import "NSData+Base64.h" #import "TSThread.h" #import "TSInteraction.h" -#import "TSRecipient.h" -#import "TSAttachment.h" -#import "TSAttachmentStream.h" #import #import "TSDatabaseView.h" diff --git a/Signal/src/textsecure/Util/Cryptography.m b/Signal/src/textsecure/Util/Cryptography.m index 18b2f28ad..d9f719fe5 100755 --- a/Signal/src/textsecure/Util/Cryptography.m +++ b/Signal/src/textsecure/Util/Cryptography.m @@ -6,13 +6,11 @@ // Copyright (c) 2013 Open Whisper Systems. All rights reserved. // -#import #import #import #import "Cryptography.h" #import "Constraints.h" -#import "TSAttachmentStream.h" #import "NSData+Base64.h" diff --git a/Signal/src/textsecure/Util/NSString+escape.h b/Signal/src/textsecure/Util/NSString+escape.h deleted file mode 100644 index 42f7614d6..000000000 --- a/Signal/src/textsecure/Util/NSString+escape.h +++ /dev/null @@ -1,13 +0,0 @@ -// -// NSString+escape.h -// TextSecureiOS -// -// Created by Frederic Jacobs on 9/29/13. -// Copyright (c) 2013 Open Whisper Systems. All rights reserved. -// - -#import - -@interface NSString (escape) -- (NSString*) escape; -@end diff --git a/Signal/src/textsecure/Util/NSString+escape.m b/Signal/src/textsecure/Util/NSString+escape.m deleted file mode 100644 index ba9c41a5a..000000000 --- a/Signal/src/textsecure/Util/NSString+escape.m +++ /dev/null @@ -1,18 +0,0 @@ -// -// NSString+escape.m -// TextSecureiOS -// -// Created by Frederic Jacobs on 9/29/13. -// Copyright (c) 2013 Open Whisper Systems. All rights reserved. -// - -#import "NSString+escape.h" - -@implementation NSString (escape) - -- (NSString*) escape{ - return [self stringByAddingPercentEscapesUsingEncoding: - NSASCIIStringEncoding]; -} - -@end diff --git a/Signal/src/util/Conversions.m b/Signal/src/util/Conversions.m index 3c92b7ec6..96fbdcc4e 100644 --- a/Signal/src/util/Conversions.m +++ b/Signal/src/util/Conversions.m @@ -1,6 +1,5 @@ #import "Conversions.h" #import "Util.h" -#import "CryptoTools.h" @implementation NSData (Conversions) diff --git a/Signal/src/util/DateUtil.m b/Signal/src/util/DateUtil.m index e472b6834..f4f302295 100644 --- a/Signal/src/util/DateUtil.m +++ b/Signal/src/util/DateUtil.m @@ -1,6 +1,4 @@ #import "DateUtil.h" -#import "Environment.h" -#import "PreferencesUtil.h" #define ONE_DAY_TIME_INTERVAL (double)60*60*24 #define ONE_WEEK_TIME_INTERVAL (double)60*60*24*7 diff --git a/Signal/src/util/FutureUtil.m b/Signal/src/util/FutureUtil.m index cdb176a56..017a0642c 100644 --- a/Signal/src/util/FutureUtil.m +++ b/Signal/src/util/FutureUtil.m @@ -1,6 +1,5 @@ #import "Constraints.h" #import "FutureUtil.h" -#import "Operation.h" @implementation TOCCancelToken (FutureUtil) diff --git a/Signal/src/util/Operation.m b/Signal/src/util/Operation.m index 643560176..0177bc777 100644 --- a/Signal/src/util/Operation.m +++ b/Signal/src/util/Operation.m @@ -1,5 +1,4 @@ #import "Util.h" -#import "Constraints.h" @implementation Operation diff --git a/Signal/src/util/TimeUtil.m b/Signal/src/util/TimeUtil.m index 31c714d54..1c93c01b9 100644 --- a/Signal/src/util/TimeUtil.m +++ b/Signal/src/util/TimeUtil.m @@ -1,7 +1,5 @@ #import "TimeUtil.h" #import "Util.h" -#import "AnonymousTerminator.h" -#import "Constraints.h" @implementation TimeUtil diff --git a/Signal/src/util/collections/PriorityQueue.m b/Signal/src/util/collections/PriorityQueue.m index 533a7cd48..cf788c88b 100644 --- a/Signal/src/util/collections/PriorityQueue.m +++ b/Signal/src/util/collections/PriorityQueue.m @@ -1,5 +1,4 @@ #import "PriorityQueue.h" -#import @implementation PriorityQueue diff --git a/Signal/src/util/protocols/PreKeyBundle+jsonDict.m b/Signal/src/util/protocols/PreKeyBundle+jsonDict.m index 554d01060..7d0d311ae 100644 --- a/Signal/src/util/protocols/PreKeyBundle+jsonDict.m +++ b/Signal/src/util/protocols/PreKeyBundle+jsonDict.m @@ -6,7 +6,6 @@ // Copyright (c) 2014 Open Whisper Systems. All rights reserved. // -#import "Constraints.h" #import "PreKeyBundle+jsonDict.h" #import "NSData+Base64.h" diff --git a/Signal/src/view controllers/CodeVerificationViewController.m b/Signal/src/view controllers/CodeVerificationViewController.m index 66a9a0cdd..b88c7162d 100644 --- a/Signal/src/view controllers/CodeVerificationViewController.m +++ b/Signal/src/view controllers/CodeVerificationViewController.m @@ -13,7 +13,6 @@ #import "RPServerRequestsManager.h" #import "LocalizableText.h" #import "PushManager.h" -#import "SignalKeyingStorage.h" #import "TSAccountManager.h" @interface CodeVerificationViewController () diff --git a/Signal/src/view controllers/CountryCodeViewController.m b/Signal/src/view controllers/CountryCodeViewController.m index 71f871e93..30e126db8 100644 --- a/Signal/src/view controllers/CountryCodeViewController.m +++ b/Signal/src/view controllers/CountryCodeViewController.m @@ -1,8 +1,6 @@ #import "CountryCodeViewController.h" #import "CountryCodeTableViewCell.h" -#import "NBPhoneNumberUtil.h" -#import "PhoneNumber.h" #import "PhoneNumberUtil.h" static NSString *const CONTRY_CODE_TABLE_CELL_IDENTIFIER = @"CountryCodeTableViewCell"; diff --git a/Signal/src/view controllers/FingerprintViewController.m b/Signal/src/view controllers/FingerprintViewController.m index 3d8f711c1..6fd0d8a18 100644 --- a/Signal/src/view controllers/FingerprintViewController.m +++ b/Signal/src/view controllers/FingerprintViewController.m @@ -8,10 +8,8 @@ #import "FingerprintViewController.h" -#import "Cryptography.h" #import #import <25519/Curve25519.h> -#import "NSData+hexString.h" #import "DJWActionSheet+OWS.h" #import "TSStorageManager.h" #import "TSStorageManager+IdentityKeyStore.h" @@ -19,7 +17,6 @@ #import "PresentIdentityQRCodeViewController.h" #import "ScanIdentityBarcodeViewController.h" #import "SignalsNavigationController.h" -#include "NSData+Base64.h" #import "TSFingerprintGenerator.h" diff --git a/Signal/src/view controllers/FullImageViewController.m b/Signal/src/view controllers/FullImageViewController.m index bdb7a91a9..01772bb90 100644 --- a/Signal/src/view controllers/FullImageViewController.m +++ b/Signal/src/view controllers/FullImageViewController.m @@ -8,7 +8,6 @@ #import "FullImageViewController.h" #import "DJWActionSheet+OWS.h" -#import "TSAttachmentStream.h" #import "UIUtil.h" #define kImageViewCornerRadius 5.0f diff --git a/Signal/src/view controllers/InCallViewController.m b/Signal/src/view controllers/InCallViewController.m index 1788eb974..ea78a02cf 100644 --- a/Signal/src/view controllers/InCallViewController.m +++ b/Signal/src/view controllers/InCallViewController.m @@ -3,11 +3,6 @@ #import "InCallViewController.h" #import "LocalizableText.h" #import "RecentCallManager.h" -#import "Util.h" -#import "CallAudioManager.h" -#import "PhoneManager.h" - -#import #define BUTTON_BORDER_WIDTH 1.0f #define CONTACT_IMAGE_BORDER_WIDTH 2.0f diff --git a/Signal/src/view controllers/MessageComposeTableViewController.m b/Signal/src/view controllers/MessageComposeTableViewController.m index a1a7e64bf..ca14d92e1 100644 --- a/Signal/src/view controllers/MessageComposeTableViewController.m +++ b/Signal/src/view controllers/MessageComposeTableViewController.m @@ -8,16 +8,10 @@ #import "MessageComposeTableViewController.h" #import "Environment.h" -#import "Contact.h" -#import "PhoneNumberUtil.h" -#import "PreferencesUtil.h" -#import "MessagesViewController.h" -#import "SignalsViewController.h" #import "NotificationManifest.h" #import "PhoneNumberDirectoryFilterManager.h" #import -#import #import "ContactTableViewCell.h" #import "UIColor+OWS.h" diff --git a/Signal/src/view controllers/MessagesViewController.m b/Signal/src/view controllers/MessagesViewController.m index 124f5d377..43ae8f0d9 100644 --- a/Signal/src/view controllers/MessagesViewController.m +++ b/Signal/src/view controllers/MessagesViewController.m @@ -19,25 +19,13 @@ #import "SignalKeyingStorage.h" #import "JSQCallCollectionViewCell.h" -#import "JSQCall.h" - -#import "JSQDisplayedMessageCollectionViewCell.h" -#import "JSQInfoMessage.h" -#import "JSQErrorMessage.h" #import "UIUtil.h" #import "DJWActionSheet+OWS.h" #import -#import -#import - -#import "TSContactThread.h" -#import "TSGroupThread.h" #import "TSStorageManager.h" #import "TSDatabaseView.h" -#import "UIColor+OWS.h" -#import "UIFont+OWS.h" #import "UIButton+OWS.h" #import @@ -46,8 +34,6 @@ #import "TSErrorMessage.h" #import "TSInvalidIdentityKeyErrorMessage.h" #import "TSIncomingMessage.h" -#import "TSInteraction.h" -#import "TSPhotoAdapter.h" #import "TSAttachmentPointer.h" #import "TSVideoAttachmentAdapter.h" @@ -55,7 +41,6 @@ #import "TSMessagesManager+attachments.h" #import "NSDate+millisecondTimeStamp.h" -#import "PhoneNumber.h" #import "Environment.h" #import "PhoneManager.h" #import "ContactsManager.h" diff --git a/Signal/src/view controllers/NewGroupViewController.m b/Signal/src/view controllers/NewGroupViewController.m index 29d3e5fc8..171a041b8 100644 --- a/Signal/src/view controllers/NewGroupViewController.m +++ b/Signal/src/view controllers/NewGroupViewController.m @@ -8,14 +8,11 @@ #import "NewGroupViewController.h" #import "SignalsViewController.h" -#import "Contact.h" #import "ContactsManager.h" #import "Environment.h" #import "FunctionalUtil.h" -#import "Contact.h" -#import "TSGroupModel.h" #import "SecurityUtils.h" #import "SignalKeyingStorage.h" @@ -24,8 +21,6 @@ #import "UIUtil.h" #import "DJWActionSheet+OWS.h" #import -#import -#import static NSString* const kUnwindToMessagesViewSegue = @"UnwindToMessagesViewSegue"; diff --git a/Signal/src/view controllers/NotificationSettingsOptionsViewController.m b/Signal/src/view controllers/NotificationSettingsOptionsViewController.m index fd2a87929..b9cd6ae22 100644 --- a/Signal/src/view controllers/NotificationSettingsOptionsViewController.m +++ b/Signal/src/view controllers/NotificationSettingsOptionsViewController.m @@ -8,7 +8,6 @@ #import "NotificationSettingsOptionsViewController.h" #import "Environment.h" -#import "PropertyListPreferences.h" #import "PreferencesUtil.h" @interface NotificationSettingsOptionsViewController () diff --git a/Signal/src/view controllers/NotificationSettingsViewController.m b/Signal/src/view controllers/NotificationSettingsViewController.m index 9d81d1117..05b835f59 100755 --- a/Signal/src/view controllers/NotificationSettingsViewController.m +++ b/Signal/src/view controllers/NotificationSettingsViewController.m @@ -11,7 +11,6 @@ #import "Environment.h" #import "PreferencesUtil.h" #import "NotificationSettingsOptionsViewController.h" -#import "UIUtil.h" @interface NotificationSettingsViewController () diff --git a/Signal/src/view controllers/RegistrationViewController.m b/Signal/src/view controllers/RegistrationViewController.m index c35b332e7..41a25df9e 100644 --- a/Signal/src/view controllers/RegistrationViewController.m +++ b/Signal/src/view controllers/RegistrationViewController.m @@ -11,22 +11,13 @@ #import "Environment.h" #import "LocalizableText.h" -#import "NBAsYouTypeFormatter.h" #import "PhoneNumber.h" #import "CodeVerificationViewController.h" -#import "PhoneNumberDirectoryFilterManager.h" #import "PhoneNumberUtil.h" -#import "PreferencesUtil.h" -#import "PushManager.h" #import "RPServerRequestsManager.h" -#import "SignalUtil.h" #import "SignalKeyingStorage.h" -#import "ThreadManager.h" -#import "TSAccountManager.h" #import "Util.h" -#import - static NSString *const kCodeSentSegue = @"codeSent"; @interface RegistrationViewController () diff --git a/Signal/src/view controllers/ScanIdentityBarcodeViewController.m b/Signal/src/view controllers/ScanIdentityBarcodeViewController.m index fab9c7f98..fd934e4d7 100644 --- a/Signal/src/view controllers/ScanIdentityBarcodeViewController.m +++ b/Signal/src/view controllers/ScanIdentityBarcodeViewController.m @@ -8,7 +8,6 @@ #import "ScanIdentityBarcodeViewController.h" #import "NSData+Base64.h" -#import "NSData+hexString.h" #import "UIColor+OWS.h" diff --git a/Signal/src/view controllers/SettingsTableViewController.m b/Signal/src/view controllers/SettingsTableViewController.m index 9f41b01b0..0c4cfc4f1 100644 --- a/Signal/src/view controllers/SettingsTableViewController.m +++ b/Signal/src/view controllers/SettingsTableViewController.m @@ -7,31 +7,17 @@ // #import "SettingsTableViewController.h" -#import "DJWActionSheet+OWS.h" -#import "SettingsTableViewCell.h" #import "TSAccountManager.h" -#import "TSStorageManager.h" #import "Environment.h" #import "PreferencesUtil.h" #import "UIUtil.h" -#import #import "RPServerRequestsManager.h" #import "TSSocketManager.h" -#import - -#import "Cryptography.h" -#import -#import <25519/Curve25519.h> -#import "NSData+hexString.h" -#import "Environment.h" #import "ContactsManager.h" -#import "Contact.h" -#import "TSStorageManager.h" -#import "TSStorageManager+IdentityKeyStore.h" #import "PrivacySettingsTableViewController.h" #import "AdvancedSettingsTableViewController.h" diff --git a/Signal/src/view controllers/ShowGroupMembersViewController.m b/Signal/src/view controllers/ShowGroupMembersViewController.m index 5e21c330a..8f27ffe65 100644 --- a/Signal/src/view controllers/ShowGroupMembersViewController.m +++ b/Signal/src/view controllers/ShowGroupMembersViewController.m @@ -11,23 +11,13 @@ #import "SignalsViewController.h" -#import "Contact.h" #import "ContactsManager.h" #import "GroupContactsResult.h" #import "Environment.h" -#import "FunctionalUtil.h" - -#import "Contact.h" -#import "TSGroupModel.h" -#import "SecurityUtils.h" #import "UIUtil.h" -#import "DJWActionSheet+OWS.h" #import -#import -#import -#import static NSString* const kUnwindToMessagesViewSegue = @"UnwindToMessagesViewSegue"; diff --git a/Signal/src/view controllers/SignalTabBarController.h b/Signal/src/view controllers/SignalTabBarController.h deleted file mode 100644 index a21f6668e..000000000 --- a/Signal/src/view controllers/SignalTabBarController.h +++ /dev/null @@ -1,13 +0,0 @@ -// -// SignalTabBarController.h -// Signal -// -// Created by Dylan Bourgeois on 05/12/14. -// Copyright (c) 2014 Open Whisper Systems. All rights reserved. -// - -#import - -@interface SignalTabBarController : UITabBarController - -@end diff --git a/Signal/src/view controllers/SignalTabBarController.m b/Signal/src/view controllers/SignalTabBarController.m deleted file mode 100644 index f4da80a9c..000000000 --- a/Signal/src/view controllers/SignalTabBarController.m +++ /dev/null @@ -1,66 +0,0 @@ -// -// SignalTabBarController.m -// Signal -// -// Created by Dylan Bourgeois on 05/12/14. -// Copyright (c) 2014 Open Whisper Systems. All rights reserved. -// - -#import -#import - -#import "CodeVerificationViewController.h" -#import "Environment.h" -#import "PreferencesUtil.h" -#import "SignalTabBarController.h" -#import "TSAccountManager.h" -#import "TSDatabaseView.h" -#import "TSStorageManager.h" - -static NSString *const kSignupFlowSegueIndentifier = @"showSignupFlow"; - -@interface SignalTabBarController () -@property YapDatabaseConnection *dbConnection; -@end - -@implementation SignalTabBarController - -- (void)viewDidLoad { - [super viewDidLoad]; - - self.dbConnection = [TSStorageManager sharedManager].newDatabaseConnection; - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(yapDatabaseModified:) - name:YapDatabaseModifiedNotification - object:nil]; -} - -- (void)viewDidAppear:(BOOL)animated{ - [super viewDidAppear:animated]; - - if (![Environment.preferences getIsMigratingToVersion2Dot0] && ![TSAccountManager isRegistered] ){ - [self performSegueWithIdentifier:kSignupFlowSegueIndentifier sender:self]; - } -} - -- (void)yapDatabaseModified:(NSNotification *)notification { - __block NSUInteger numberOfItems; - [self.dbConnection readWithBlock:^(YapDatabaseReadTransaction *transaction) { - numberOfItems = [[transaction ext:TSUnreadDatabaseViewExtensionName] numberOfItemsInAllGroups]; - }]; - - NSNumber *badgeNumber = [NSNumber numberWithUnsignedInteger:numberOfItems]; - NSString *badgeValue = nil; - - if (![badgeNumber isEqualToNumber:@0]) { - badgeValue = [badgeNumber stringValue]; - } - [[self signalsItem] setBadgeValue:badgeValue]; - [[UIApplication sharedApplication] setApplicationIconBadgeNumber:badgeNumber.integerValue]; -} - -- (UITabBarItem*)signalsItem{ - return self.tabBar.items[1]; -} - -@end diff --git a/Signal/src/view controllers/TSMessageAdapter.m b/Signal/src/view controllers/TSMessageAdapter.m index 1efc14404..aace3ed6c 100644 --- a/Signal/src/view controllers/TSMessageAdapter.m +++ b/Signal/src/view controllers/TSMessageAdapter.m @@ -7,7 +7,6 @@ // #import "JSQCall.h" -#import "NSDate+millisecondTimeStamp.h" #import "TSMessageAdapter.h" #import "TSIncomingMessage.h" @@ -15,9 +14,6 @@ #import "TSCall.h" #import "TSInfoMessage.h" #import "TSErrorMessage.h" -#import "TSattachment.h" -#import "TSAttachmentStream.h" -#import "TSPhotoAdapter.h" #import "TSAttachmentPointer.h" #import "TSVideoAttachmentAdapter.h" diff --git a/Signal/src/view controllers/TSVideoAttachmentAdapter.m b/Signal/src/view controllers/TSVideoAttachmentAdapter.m index b4edf80ed..e377056f6 100644 --- a/Signal/src/view controllers/TSVideoAttachmentAdapter.m +++ b/Signal/src/view controllers/TSVideoAttachmentAdapter.m @@ -9,12 +9,9 @@ #import "TSVideoAttachmentAdapter.h" #import "TSMessagesManager.h" -#import "UIDevice+TSHardwareVersion.h" #import "JSQMessagesMediaViewBubbleImageMasker.h" #import "FFCircularProgressView.h" #import "TSStorageManager+keyingMaterial.h" -#import "TSNetworkManager.h" -#import "UIColor+OWS.h" #import "SCWaveformView.h" #import "MIMETypeUtil.h" #define AUDIO_BAR_HEIGHT 36 diff --git a/Signal/src/view controllers/UITests/SignalsViewController.m b/Signal/src/view controllers/UITests/SignalsViewController.m index 5a2b1ce6f..c2dd7cc7d 100644 --- a/Signal/src/view controllers/UITests/SignalsViewController.m +++ b/Signal/src/view controllers/UITests/SignalsViewController.m @@ -17,20 +17,13 @@ #import "TSStorageManager.h" #import "TSAccountManager.h" #import "TSDatabaseView.h" -#import "TSSocketManager.h" -#import "TSContactThread.h" #import "TSMessagesManager+sendMessages.h" -#import "UIImage+normalizeImage.h" #import "VersionMigrations.h" #import "PreferencesUtil.h" #import "NSDate+millisecondTimeStamp.h" #import -#import "YapDatabaseViewTransaction.h" -#import "YapDatabaseViewMappings.h" #import "YapDatabaseViewConnection.h" -#import "YapDatabaseFullTextSearch.h" -#import "YapDatabase.h" #define CELL_HEIGHT 72.0f #define HEADER_HEIGHT 44.0f diff --git a/Signal/src/views/ContactTableViewCell.m b/Signal/src/views/ContactTableViewCell.m index d4177a2a9..0e522ffcd 100644 --- a/Signal/src/views/ContactTableViewCell.m +++ b/Signal/src/views/ContactTableViewCell.m @@ -3,7 +3,6 @@ #import "Environment.h" #import "PhoneManager.h" -#import "DJWActionSheet+OWS.h" #define CONTACT_TABLE_CELL_BORDER_WIDTH 1.0f diff --git a/Signal/src/views/InteractiveLabel.h b/Signal/src/views/InteractiveLabel.h deleted file mode 100644 index 68b56c4a2..000000000 --- a/Signal/src/views/InteractiveLabel.h +++ /dev/null @@ -1,8 +0,0 @@ -#import - -@interface InteractiveLabel : UILabel - --(void) onPaste:(void(^)(id sender)) pasteBlock; --(void) onCopy:(void(^)(id sender)) copyBlock; - -@end diff --git a/Signal/src/views/InteractiveLabel.m b/Signal/src/views/InteractiveLabel.m deleted file mode 100644 index 6a69c4079..000000000 --- a/Signal/src/views/InteractiveLabel.m +++ /dev/null @@ -1,71 +0,0 @@ -#import "InteractiveLabel.h" - -@interface InteractiveLabel () - -@property (copy) void (^pasteBlock) (id sender); -@property (copy) void (^copyBlock) (id sender); - -@end - -@implementation InteractiveLabel - -#pragma mark Menu Setup - --(id) initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if(self) { - [self setupGestureRecognizer]; - } - return self; -} - --(void) awakeFromNib { - [super awakeFromNib]; - [self setupGestureRecognizer]; -} - --(BOOL) canBecomeFirstResponder{ - return YES; -} - --(void) setupGestureRecognizer { - UILongPressGestureRecognizer* recognizer = [[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(didRegisterLongPress:)]; - [self addGestureRecognizer:recognizer]; -} - - --(void) didRegisterLongPress:(UILongPressGestureRecognizer*) recognizer { - if (recognizer.state == UIGestureRecognizerStateBegan) { - [self becomeFirstResponder]; - UIMenuController *menu = UIMenuController.sharedMenuController; - [menu setTargetRect:self.frame inView:self.superview]; - [menu setMenuVisible:YES animated:YES]; - - } -} - -//todo: set custom dispaly logic via block for runtime decision --(BOOL) canPerformAction:(SEL)action withSender:(id)sender { - if(action == @selector(paste:)) { return nil != self.pasteBlock;}; - if(action == @selector(copy:)) { return nil != self.copyBlock; }; - - return NO; -} - -#pragma mark Block Handling - --(void) onPaste:(void (^)(id sender)) pasteAction { - self.pasteBlock = pasteAction; -} - --(void) onCopy:(void (^)(id sender)) copyAction { - self.copyBlock = copyAction; -} - --(void) paste:(id)sender { - if(self.pasteBlock){ - self.pasteBlock(sender); - } -} - -@end diff --git a/Signal/src/views/JSQMessagesCollectionViewCell+menuBarItems.h b/Signal/src/views/JSQMessagesCollectionViewCell+menuBarItems.h deleted file mode 100644 index 1baf6cb26..000000000 --- a/Signal/src/views/JSQMessagesCollectionViewCell+menuBarItems.h +++ /dev/null @@ -1,13 +0,0 @@ -// -// JSQMessagesCollectionViewCell+menuBarItems.h -// Signal -// -// Created by Frederic Jacobs on 26/12/14. -// Copyright (c) 2014 Open Whisper Systems. All rights reserved. -// - -#import "JSQMessagesCollectionViewCell.h" - -@interface JSQMessagesCollectionViewCell (menuBarItems) - -@end diff --git a/Signal/src/views/JSQMessagesCollectionViewCell+menuBarItems.m b/Signal/src/views/JSQMessagesCollectionViewCell+menuBarItems.m deleted file mode 100644 index 958d02e27..000000000 --- a/Signal/src/views/JSQMessagesCollectionViewCell+menuBarItems.m +++ /dev/null @@ -1,49 +0,0 @@ -// -// JSQMessagesCollectionViewCell+menuBarItems.m -// Signal -// -// Created by Frederic Jacobs on 26/12/14. -// Copyright (c) 2014 Open Whisper Systems. All rights reserved. -// - -#import "JSQMessagesCollectionViewCell+menuBarItems.h" - -@implementation JSQMessagesCollectionViewCell (menuBarItems) - -- (BOOL)canPerformAction:(SEL)action withSender:(id)sender -{ - if (action == @selector(delete:)) { - return YES; - } - - return [super canPerformAction:action withSender:sender]; -} - -- (void)delete:(id)sender -{ - [self performSelectorOnParentCollectionView:@selector(delete:) - withSender:sender]; -} - -- (void)performSelectorOnParentCollectionView:(SEL)selector - withSender:(id)sender { - UIView *view = self; - do { - view = view.superview; - } while (![view isKindOfClass:[UICollectionView class]]); - UICollectionView *collectionView = (UICollectionView *)view; - NSIndexPath *indexPath = [collectionView indexPathForCell:self]; - - if (collectionView.delegate && - [collectionView.delegate respondsToSelector:@selector(collectionView: - performAction: - forItemAtIndexPath: - withSender:)]) - - [collectionView.delegate collectionView:collectionView - performAction:selector - forItemAtIndexPath:indexPath - withSender:sender]; -} - -@end diff --git a/Signal/src/views/LocalizableCustomFontLabel.h b/Signal/src/views/LocalizableCustomFontLabel.h deleted file mode 100644 index 4b6d82027..000000000 --- a/Signal/src/views/LocalizableCustomFontLabel.h +++ /dev/null @@ -1,24 +0,0 @@ -#import - -/** - * - * This class enables us to set custom fonts for labels in the xib without making an outlet and setting it manually - * Also contains a property for localization purposes - * - */ - -#define CUSTOM_FONT_LABELS \ -LocalizableCustomFontLabel(HelveticaNeueLTStdBoldLabel, HelveticaNeueLTStd-Bold) \ -LocalizableCustomFontLabel(HelveticaNeueLTStdLightLabel, HelveticaNeueLTStd-Lt) \ -LocalizableCustomFontLabel(HelveticaNeueLTStdMedLabel, HelveticaNeueLTStd-Md) \ -LocalizableCustomFontLabel(HelveticaNeueLTStdThinLabel, HelveticaNeueLTStd-Th) \ - -@interface LocalizableCustomFontLabel : UILabel - -@property (nonatomic, strong) NSString *localizationKey; - -@end - -#define LocalizableCustomFontLabel(CLASS_NAME, FONT_NAME) @interface CLASS_NAME : LocalizableCustomFontLabel {} @end -CUSTOM_FONT_LABELS -#undef LocalizableCustomFontLabel diff --git a/Signal/src/views/LocalizableCustomFontLabel.m b/Signal/src/views/LocalizableCustomFontLabel.m deleted file mode 100644 index 616689c1d..000000000 --- a/Signal/src/views/LocalizableCustomFontLabel.m +++ /dev/null @@ -1,34 +0,0 @@ -#import "LocalizableCustomFontLabel.h" - -@implementation LocalizableCustomFontLabel - -- (void)awakeFromNib { - [super awakeFromNib]; - - NSString *fontName = [self fontName]; - self.font = [UIFont fontWithName:fontName size:self.font.pointSize]; -} - -- (void)setLocalizationKey:(NSString *)localizationKey { - _localizationKey = localizationKey; - if (_localizationKey) { - self.text = NSLocalizedString(_localizationKey, @""); - } -} - -- (NSString *)fontName { - return nil; -} - -@end - -#define LocalizableCustomFontLabel(CLASS_NAME, FONT_NAME) \ -@implementation CLASS_NAME \ -- (NSString *)fontName { \ -return @"" # FONT_NAME; \ -} \ -@end \ - -CUSTOM_FONT_LABELS - -#undef LocalizableCustomFontLabel diff --git a/Signal/test/audio/JitterQueueTest.m b/Signal/test/audio/JitterQueueTest.m index 40b7bb0b9..7703291c2 100644 --- a/Signal/test/audio/JitterQueueTest.m +++ b/Signal/test/audio/JitterQueueTest.m @@ -1,9 +1,6 @@ #import #import "JitterQueue.h" #import "TestUtil.h" -#import "EncodedAudioPacket.h" -#import "Util.h" -#import "DiscardingLog.h" #import "Queue.h" #define testLoggedNothing(q) test(q->messageQueue.count == 0) diff --git a/Signal/test/audio/SpeexCodecTest.m b/Signal/test/audio/SpeexCodecTest.m index 76e82d4c6..0fe15012e 100644 --- a/Signal/test/audio/SpeexCodecTest.m +++ b/Signal/test/audio/SpeexCodecTest.m @@ -1,7 +1,6 @@ #import #import "SpeexCodec.h" #import "TestUtil.h" -#import "Util.h" @interface SpeexCodecTest : XCTestCase diff --git a/Signal/test/network/IpEndPointTest.m b/Signal/test/network/IpEndPointTest.m index 2495892ea..b0ab0923c 100644 --- a/Signal/test/network/IpEndPointTest.m +++ b/Signal/test/network/IpEndPointTest.m @@ -1,6 +1,5 @@ #import #import "TestUtil.h" -#import "IpEndPoint.h" #import "IpAddress.h" @interface IpEndPointTest : XCTestCase diff --git a/Signal/test/network/dns/DnsManagerTest.m b/Signal/test/network/dns/DnsManagerTest.m index cb5b85cd8..b784e6b8c 100644 --- a/Signal/test/network/dns/DnsManagerTest.m +++ b/Signal/test/network/dns/DnsManagerTest.m @@ -1,10 +1,6 @@ #import #import "DnsManager.h" #import "TestUtil.h" -#import "Util.h" -#import "IpAddress.h" -#import "ThreadManager.h" -#import #define infrastructureTestHostName @"relay.whispersystems.org" #define reliableHostName @"example.com" diff --git a/Signal/test/network/http/HttpRequestResponseTest.m b/Signal/test/network/http/HttpRequestResponseTest.m index 24632115d..57707667f 100644 --- a/Signal/test/network/http/HttpRequestResponseTest.m +++ b/Signal/test/network/http/HttpRequestResponseTest.m @@ -1,11 +1,7 @@ #import #import "TestUtil.h" -#import "Util.h" #import "HttpSocket.h" -#import "HttpRequestUtil.h" -#import "PreferencesUtil.h" #import "SignalUtil.h" -#import "SignalKeyingStorage.h" @interface HttpRequestResponseTest : XCTestCase diff --git a/Signal/test/network/rtp/RtpPacketTests.m b/Signal/test/network/rtp/RtpPacketTests.m index 7c68c74d7..0c5bc0297 100644 --- a/Signal/test/network/rtp/RtpPacketTests.m +++ b/Signal/test/network/rtp/RtpPacketTests.m @@ -1,6 +1,5 @@ #import #import "TestUtil.h" -#import "Util.h" @interface RtpPacketTests : XCTestCase diff --git a/Signal/test/network/rtp/zrtp/EC25AgreerTest.m b/Signal/test/network/rtp/zrtp/EC25AgreerTest.m index 934317380..eabe65c81 100644 --- a/Signal/test/network/rtp/zrtp/EC25AgreerTest.m +++ b/Signal/test/network/rtp/zrtp/EC25AgreerTest.m @@ -1,7 +1,5 @@ #import #import "TestUtil.h" -#import "EC25KeyAgreementParticipant.h" -#import "EC25KeyAgreementProtocol.h" @interface EC25AgreerTest : XCTestCase @end diff --git a/Signal/test/network/rtp/zrtp/HandshakePacketTest.m b/Signal/test/network/rtp/zrtp/HandshakePacketTest.m index 046837d96..ef2f0dc3e 100644 --- a/Signal/test/network/rtp/zrtp/HandshakePacketTest.m +++ b/Signal/test/network/rtp/zrtp/HandshakePacketTest.m @@ -1,8 +1,6 @@ #import #import "HelloPacket.h" #import "TestUtil.h" -#import "Util.h" -#import "Crc32.h" @interface HandshakePacketTest : XCTestCase diff --git a/Signal/test/network/rtp/zrtp/MasterSecretTest.m b/Signal/test/network/rtp/zrtp/MasterSecretTest.m index 72044b960..c62c4f236 100644 --- a/Signal/test/network/rtp/zrtp/MasterSecretTest.m +++ b/Signal/test/network/rtp/zrtp/MasterSecretTest.m @@ -1,6 +1,5 @@ #import #import "MasterSecret.h" -#import "Util.h" #import "TestUtil.h" @interface MasterSecretTest : XCTestCase diff --git a/Signal/test/network/rtp/zrtp/ZrtpTest.m b/Signal/test/network/rtp/zrtp/ZrtpTest.m index 8c9099426..61680a620 100644 --- a/Signal/test/network/rtp/zrtp/ZrtpTest.m +++ b/Signal/test/network/rtp/zrtp/ZrtpTest.m @@ -1,14 +1,7 @@ #import #import "TestUtil.h" -#import "Util.h" #import "CallController.h" #import "ZrtpManager.h" -#import "ThreadManager.h" -#import "ZrtpHandshakeResult.h" -#import "DiscardingLog.h" -#import "HelloAckPacket.h" -#import "ConfirmAckPacket.h" -#import "HostNameEndPoint.h" #import "IpAddress.h" #import "SignalKeyingStorage.h" diff --git a/Signal/test/network/tcp/LowLatencyConnectorTest.m b/Signal/test/network/tcp/LowLatencyConnectorTest.m index 470f65a09..3afdb63c0 100644 --- a/Signal/test/network/tcp/LowLatencyConnectorTest.m +++ b/Signal/test/network/tcp/LowLatencyConnectorTest.m @@ -1,10 +1,8 @@ #import #import "LowLatencyConnector.h" -#import "NetworkStream.h" #import "Util.h" #import "HostNameEndPoint.h" #import "TestUtil.h" -#import "ThreadManager.h" @interface LowLatencyConnectorTest : XCTestCase @end diff --git a/Signal/test/network/tcp/tls/NetworkStreamTest.m b/Signal/test/network/tcp/tls/NetworkStreamTest.m index c3cbc7987..4fb8ca534 100644 --- a/Signal/test/network/tcp/tls/NetworkStreamTest.m +++ b/Signal/test/network/tcp/tls/NetworkStreamTest.m @@ -1,10 +1,6 @@ #import #import "NetworkStream.h" #import "TestUtil.h" -#import "Util.h" -#import "HostNameEndPoint.h" -#import "SecureEndPoint.h" -#import "ThreadManager.h" #define TEST_SERVER_HOST @"master.whispersystems.org" #define TEST_SERVER_PORT 31337 diff --git a/Signal/test/network/tcp/tls/SecureEndPointTest.m b/Signal/test/network/tcp/tls/SecureEndPointTest.m index d2ff67fd9..e3495abd0 100644 --- a/Signal/test/network/tcp/tls/SecureEndPointTest.m +++ b/Signal/test/network/tcp/tls/SecureEndPointTest.m @@ -1,7 +1,6 @@ #import #import "SecureEndPoint.h" #import "TestUtil.h" -#import "IpEndPoint.h" @interface SecureEndPointTest : XCTestCase diff --git a/Signal/test/network/udp/UdpSocketTest.m b/Signal/test/network/udp/UdpSocketTest.m index 00de8623d..d4dbcff87 100644 --- a/Signal/test/network/udp/UdpSocketTest.m +++ b/Signal/test/network/udp/UdpSocketTest.m @@ -1,10 +1,7 @@ #import -#import #import "IpAddress.h" #import "TestUtil.h" -#import "ThreadManager.h" #import "UdpSocket.h" -#import "Util.h" @interface UdpSocketTest : XCTestCase diff --git a/Signal/test/phone/BloomFilterTests.m b/Signal/test/phone/BloomFilterTests.m index bba6f9105..cdc684c97 100644 --- a/Signal/test/phone/BloomFilterTests.m +++ b/Signal/test/phone/BloomFilterTests.m @@ -6,11 +6,9 @@ // Copyright (c) 2015 Open Whisper Systems. All rights reserved. // -#import #import #import "Cryptography.h" #import "Environment.h" -#import "PropertyListPreferences.h" @interface PropertyListPreferences() - (NSData*)tryRetreiveBloomFilter; diff --git a/Signal/test/phone/signaling/SessionDescriptorTest.m b/Signal/test/phone/signaling/SessionDescriptorTest.m index b4efb4a95..f1d99fdc1 100644 --- a/Signal/test/phone/signaling/SessionDescriptorTest.m +++ b/Signal/test/phone/signaling/SessionDescriptorTest.m @@ -1,8 +1,6 @@ #import #import "InitiatorSessionDescriptor.h" -#import "ResponderSessionDescriptor.h" #import "TestUtil.h" -#import "Util.h" @interface SessionDescriptorTest : XCTestCase diff --git a/Signal/test/push/PushManagerTest.m b/Signal/test/push/PushManagerTest.m index 933450a36..dba45114c 100644 --- a/Signal/test/push/PushManagerTest.m +++ b/Signal/test/push/PushManagerTest.m @@ -6,7 +6,6 @@ // Copyright (c) 2014 Open Whisper Systems. All rights reserved. // -#import #import @interface PushManagerTest : XCTestCase diff --git a/Signal/test/textsecure/CryptographyTests.mm b/Signal/test/textsecure/CryptographyTests.mm index 6a3e3d2d2..7b03ab57e 100644 --- a/Signal/test/textsecure/CryptographyTests.mm +++ b/Signal/test/textsecure/CryptographyTests.mm @@ -7,7 +7,6 @@ // #import -#include #import "Cryptography.h" #import "NSData+Base64.h" diff --git a/Signal/test/textsecure/SignedPreKeyDeletionTests.m b/Signal/test/textsecure/SignedPreKeyDeletionTests.m index cc8165f26..ce94fa288 100644 --- a/Signal/test/textsecure/SignedPreKeyDeletionTests.m +++ b/Signal/test/textsecure/SignedPreKeyDeletionTests.m @@ -9,8 +9,6 @@ #import #import -#import <25519/Curve25519.h> -#import <25519/Ed25519.h> #import "TSPreKeyManager.h" #import "TSStorageManager+SignedPreKeyStore.h" diff --git a/Signal/test/textsecure/TSMessageStorageTests.m b/Signal/test/textsecure/TSMessageStorageTests.m index 5978b38b2..dacaa4ce7 100644 --- a/Signal/test/textsecure/TSMessageStorageTests.m +++ b/Signal/test/textsecure/TSMessageStorageTests.m @@ -6,7 +6,6 @@ // Copyright (c) 2014 Open Whisper Systems. All rights reserved. // -#import #import #import "Cryptography.h" @@ -17,11 +16,7 @@ #import "TSStorageManager.h" #import "TSMessage.h" -#import "TSErrorMessage.h" -#import "TSInfoMessage.h" #import "TSIncomingMessage.h" -#import "TSCall.h" -#import "TSOutgoingMessage.h" @interface TSMessageStorageTests : XCTestCase diff --git a/Signal/test/textsecure/TSStoragePreKeyStoreTests.m b/Signal/test/textsecure/TSStoragePreKeyStoreTests.m index 595f982cb..2eddbc39c 100644 --- a/Signal/test/textsecure/TSStoragePreKeyStoreTests.m +++ b/Signal/test/textsecure/TSStoragePreKeyStoreTests.m @@ -9,8 +9,6 @@ #import "TSStorageManager+PreKeyStore.h" #import -#import - @interface TSStoragePreKeyStoreTests : XCTestCase @end diff --git a/Signal/test/textsecure/TextSecureKitTests.m b/Signal/test/textsecure/TextSecureKitTests.m index d53adbd64..ab841ade7 100644 --- a/Signal/test/textsecure/TextSecureKitTests.m +++ b/Signal/test/textsecure/TextSecureKitTests.m @@ -6,7 +6,6 @@ // Copyright (c) 2014 Open Whisper Systems. All rights reserved. // -#import #import @interface TextSecureKitTests : XCTestCase diff --git a/Signal/test/textsecure/VersionMigrationsTests.m b/Signal/test/textsecure/VersionMigrationsTests.m index 1d3368c7c..20ed3de3d 100644 --- a/Signal/test/textsecure/VersionMigrationsTests.m +++ b/Signal/test/textsecure/VersionMigrationsTests.m @@ -13,18 +13,14 @@ #import "Cryptography.h" #import "Environment.h" #import "TSStorageManager.h" -#import "TSStorageManager+IdentityKeyStore.h" #import "RecentCall.h" #import "RecentCallManager.h" #import "Release.h" -#import "SecurityUtils.h" #import "TestUtil.h" #import "TSCall.h" -#import "TSContactThread.h" #import "TSDatabaseView.h" #import "SignalKeyingStorage.h" #import "UICKeyChainStore.h" -#import "YapDatabaseConnection.h" @interface VersionMigrations(Testing) diff --git a/Signal/test/util/FutureUtilTest.m b/Signal/test/util/FutureUtilTest.m index cd7e826e7..c209ab3a6 100644 --- a/Signal/test/util/FutureUtilTest.m +++ b/Signal/test/util/FutureUtilTest.m @@ -1,7 +1,6 @@ #import #import "TestUtil.h" #import "ThreadManager.h" -#import "Util.h" @interface FutureUtilTest:XCTestCase @end diff --git a/Signal/test/util/PriorityQueueTest.m b/Signal/test/util/PriorityQueueTest.m index b047990c6..1c77244ea 100644 --- a/Signal/test/util/PriorityQueueTest.m +++ b/Signal/test/util/PriorityQueueTest.m @@ -1,7 +1,5 @@ #import #import "TestUtil.h" -#import "PriorityQueue.h" -#import "Util.h" @interface PriorityQueueTest : XCTestCase @end