Merge branch 'charlesmchen/headerTargets2'

Scripts/import_include_normalize.py

@@ -0,0 +1,389 @@
+#!/usr/bin/env python2.7
+# -*- coding: utf-8 -*-
+
+import os
+import sys
+import subprocess
+import datetime
+import argparse
+import commands
+
+
+git_repo_path = os.path.abspath(subprocess.check_output(['git', 'rev-parse', '--show-toplevel']).strip())
+
+
+class Include:
+    def __init__(self, line, isInclude, isQuote, body, comment):
+        self.line = line
+        self.isInclude = isInclude
+        self.isQuote = isQuote
+        self.body = body
+        self.comment = comment
+
+    def format(self):
+        result = '%s %s%s%s' % (
+                                ('#include' if self.isInclude else '#import'),
+                                ('"' if self.isQuote else '<'),
+                                self.body.strip(),
+                                ('"' if self.isQuote else '>'),
+                                )
+        if self.comment.strip():
+            result += ' ' + self.comment.strip()
+        return result
+    
+    def isSystemFrameworkOrPod(self):
+        prefixes = [
+            'UIKit',
+            'Intents',
+            'SignalCoreKit',
+            'UserNotifications',
+            'WebRTC',
+            'Foundation',
+            'PureLayout',
+            'YYImage',
+            'MetalKit',
+            'objc',
+            'SSZipArchive',
+            'sys',
+            'MessageUI',
+            'Contacts',
+            'MobileCoreServices',
+            'AVKit',
+            'MediaPlayer',
+            'StoreKit',
+            'AVFoundation',
+            'XCTest',
+            'Availability',
+            'CocoaLumberjack',
+            'AudioToolbox',
+            'SignalMetadataKit',
+            'Curve25519Kit',
+            'Mantle',
+            'CoreServices',
+            'webp',
+            'AFNetworking',
+            'CommonCrypto',
+            'libPhoneNumber_iOS',
+            'openssl',
+            'Photos',
+            'ContactsUI',
+        ]
+        for prefix in prefixes:
+            if self.body.startswith(prefix + '/'):
+                return True
+        systemFrameworkHeaders = set([
+            "zlib.h",
+            'Availability.h',
+            'notify.h',
+            'AssertMacros.h',
+        ])
+        return self.body in systemFrameworkHeaders
+
+
+def is_include_or_import(line):
+    line = line.strip()
+    if line.startswith('#include '):
+        return True
+    elif line.startswith('#import '):
+        return True
+    else:
+        return False
+
+
+def parse_include(line):
+    remainder = line.strip()
+
+    if remainder.startswith('#include '):
+        isInclude = True
+        remainder = remainder[len('#include '):]
+    elif remainder.startswith('#import '):
+        isInclude = False
+        remainder = remainder[len('#import '):]
+    elif remainder == '//':
+        return None
+    elif not remainder:
+        return None
+    else:
+        return None
+
+    comment = None
+    if remainder.startswith('"'):
+        isQuote = True
+        endIndex = remainder.find('"', 1)
+        if endIndex < 0:
+            print ('Unexpected import or include: '+ line)
+            sys.exit(1)
+        body = remainder[1:endIndex]
+        comment = remainder[endIndex+1:]
+    elif remainder.startswith('<'):
+        isQuote = False
+        endIndex = remainder.find('>', 1)
+        if endIndex < 0:
+            print ('Unexpected import or include: '+ line)
+            sys.exit(1)
+        body = remainder[1:endIndex]
+        comment = remainder[endIndex+1:]
+    else:
+        print ('Unexpected import or include: '+ remainder)
+        sys.exit(1)
+
+    return Include(line, isInclude, isQuote, body, comment)
+
+
+class Target:
+    def __init__(self, name, path):
+        self.name = name
+        self.path = path
+    
+    def isAppOrAppExtension(self):
+        appOrAppExtensionTargets = [ 'Signal', 'SignalShareExtension','NotificationServiceExtension' ]
+        return self.name in appOrAppExtensionTargets
+
+
+class Header:
+    def __init__(self, targetName, path, filename):
+        self.targetName = targetName
+        self.path = path
+        self.filename = filename
+
+
+class SwiftHeader:
+    def __init__(self, targetName, filename):
+        self.targetName = targetName
+        self.filename = filename
+
+
+class HeaderSet:
+    def __init__(self, targets, headers):
+        self.targets = targets
+        self.headers = headers
+        
+        headerMap = {}
+        for header in headers:
+            if header.filename in headerMap:
+                otherHeader = headerMap[header.filename]
+                print 'Header conflict:', header.filename
+                print 'Header 1:', header.path
+                print 'Header 2:', otherHeader.path
+                sys.exit(1)
+            else:
+                headerMap[header.filename] = header
+                
+        self.headerMap = headerMap
+                
+        swiftHeaderMap = {}
+        for target in targets:
+            swiftHeader = SwiftHeader(target.name, target.name + '-Swift.h')
+            swiftHeaderMap[swiftHeader.filename] = swiftHeader
+        self.swiftHeaderMap = swiftHeaderMap
+        
+
+    def find_header(self, text):
+        splits = text.split('/')
+        filename = splits[-1]
+        if filename is None or len(filename) < 1:
+            return None
+        print 'filename:', filename
+        if filename not in self.headerMap:
+            return None
+        header = self.headerMap[filename]
+        return header
+        
+
+    def find_swift_header(self, text):
+        splits = text.split('/')
+        filename = splits[-1]
+        if filename is None or len(filename) < 1:
+            return None
+        print 'filename:', filename
+        if filename not in self.swiftHeaderMap:
+            return None
+        header = self.swiftHeaderMap[filename]
+        return header
+        
+
+def find_headers(targets):
+    headers = []
+
+    for target in targets:
+        for rootdir, dirnames, filenames in os.walk(target.path):
+            for filename in filenames:
+                if not filename.endswith('.h'):
+                    continue
+                file_path = os.path.abspath(os.path.join(rootdir, filename))
+                headers.append(Header(target.name, file_path, filename))
+        
+    return headers
+    
+    
+def normalize_imports_and_includes(targets, headerSet):
+    
+    for target in targets:
+        for rootdir, dirnames, filenames in os.walk(target.path):
+            for filename in filenames:
+                file_ext = os.path.splitext(filename)[1]
+                if file_ext not in ('.h', '.hpp', '.cpp', '.m', '.mm', '.pch'):
+                    continue
+                file_path = os.path.abspath(os.path.join(rootdir, filename))
+                normalize_imports_and_includes_in_file(targets, target, headerSet, file_path, filename)
+                
+    
+def normalize_imports_and_includes_in_file(targets, target, headerSet, file_path, filename):
+
+    short_filepath = file_path[len(git_repo_path):]
+    if short_filepath.startswith(os.sep):
+       short_filepath = short_filepath[len(os.sep):]
+       
+    file_ext = os.path.splitext(filename)[1]
+    is_header_file = file_ext in ('.h', '.hpp', '.pch')
+     
+    print 'Processing:', filename
+
+    with open(file_path, 'rt') as f:
+        text = f.read()
+
+    original_text = text
+
+    lines = text.split('\n')
+
+    new_lines = []
+    for line in lines:
+        include = parse_include(line)
+        if include is None:
+            new_lines.append(line)
+            continue
+            
+        print '\t', 'include or import:', include.body
+        if include.comment is not None and len(include.comment) > 0:
+            print 'Invalid include or import:', include.line
+            sys.exit(1)
+        
+        if include.isSystemFrameworkOrPod():
+            new_lines.append(line)
+            continue
+        
+        def preserve_whitespace(newline):
+            # We only need to preserve _leading_ whitespace.
+            prefix_length = len(include.line) - len(include.line.lstrip())
+            newline = include.line[0:prefix_length] + newline
+            return newline        
+        
+        swiftHeader = headerSet.find_swift_header(include.body)
+        if swiftHeader is not None:
+            # NOTE: Apps and app extensions import the -Swift.h header for their
+            #       own target using short form imports.
+            #       Otherwise we should always use long-form imports for  -Swift.h headers.
+            if swiftHeader.targetName == target.name:
+                if target.isAppOrAppExtension():
+                    newline = '#import "%s"' % ( swiftHeader.filename, )
+                else:
+                    newline = "#import <%s/%s>" % ( swiftHeader.targetName, swiftHeader.filename, )
+            else:
+                newline = "#import <%s/%s>" % ( swiftHeader.targetName, swiftHeader.filename, )
+            newline = preserve_whitespace(newline)
+            new_lines.append(newline)
+            continue
+        
+        header = headerSet.find_header(include.body)
+        if header is None:
+            print
+            print 'Unknown include or import:', include.line
+            print 'Unknown include or import:', include.body
+            print 'In file:', filename
+            print 'If this is a system framework or pod, add it to isSystemFrameworkOrPod().'
+            print
+            sys.exit(1)
+
+        if header.targetName == target.name:
+            # if a _header_ in a _framework_ imports a header _from the same target_, use a long-form import.
+            is_framework_target = not target.isAppOrAppExtension()
+            if is_header_file and is_framework_target:
+                newline = "#import <%s/%s>" % ( header.targetName, header.filename, )
+            else:
+                newline = '#import "%s"' % ( header.filename, )
+        else:
+            newline = "#import <%s/%s>" % ( header.targetName, header.filename, )
+        newline = preserve_whitespace(newline)
+        new_lines.append(newline)
+
+    lines = new_lines
+    
+
+    # shebang = ""
+    # if lines[0].startswith('#!'):
+    #     shebang = lines[0] + '\n'
+    #     lines = lines[1:]
+
+    # while lines and lines[0].startswith('//'):
+    #     lines = lines[1:]
+    text = '\n'.join(lines)
+    text = text.strip()
+    text = text + '\n'
+
+    if original_text == text:
+        return
+
+    print 'Updating:', filename
+
+    with open(file_path, 'wt') as f:
+        f.write(text)
+    # sys.exit(0)
+    
+
+
+if __name__ == "__main__":
+
+    parser = argparse.ArgumentParser(description='Normalize imports and includes script.')
+    # parser.add_argument('--all', action='store_true', help='process all files in or below current dir')
+    # parser.add_argument('--path', help='used to specify a path to process.')
+    # parser.add_argument('--ref', help='process all files that have changed since the given ref')
+    parser.add_argument('--write-header-list', action='store_true', help='Write list of repo headers to file for debugging')
+    args = parser.parse_args()
+
+    clang_format_commit = 'HEAD'
+
+    targets = [ 
+        Target('Signal', 'Signal/src'),
+        Target('Signal', 'Signal/test'),
+        Target('SignalMessaging', 'SignalMessaging'),
+        Target('SignalServiceKit', 'SignalServiceKit/src'),
+        Target('SignalServiceKit', 'SignalServiceKit/tests'),
+        Target('SignalShareExtension', 'SignalShareExtension'),
+        Target('SignalUI', 'SignalUI'),
+        Target('SignalUI', 'SignalUITests'),
+        Target('NotificationServiceExtension', 'NotificationServiceExtension'),
+    ]
+    
+    headers = find_headers(targets)    
+    print 'headers:', len(headers)
+    headerSet = HeaderSet(targets, headers)
+    
+    if args.write_header_list:
+        def write_lines_to_file(lines, filename):
+            for header in headers:
+                lines.append(header.path)
+            lines.sort()
+            text = '\n'.join(lines)
+            text = text + '\n'
+
+            file_path = os.path.abspath(os.path.join(git_repo_path, filename))
+            print 'Header list:', filename
+            with open(file_path, 'wt') as f:
+                f.write(text)
+            
+        lines = []
+        for header in headers:
+            lines.append(header.path)
+        filename = 'import_header_paths.txt'
+        write_lines_to_file(lines, filename)
+            
+        lines = []
+        for header in headers:
+            lines.append(header.filename)
+        filename = 'import_header_filenames.txt'
+        write_lines_to_file(lines, filename)
+
+        
+    normalize_imports_and_includes(targets, headerSet)    
+
+    print 'Complete.'

Scripts/precommit.py

@@ -497,6 +497,6 @@ if __name__ == "__main__":
 
     print 'git clang-format...'
     # we don't want to format .proto files, so we specify every other supported extension
-    print commands.getoutput('git clang-format --extensions "c,h,m,mm,cc,cp,cpp,c++,cxx,hh,hxx,cu,java,js,ts,cs" --commit %s' % clang_format_commit)
-
+    print commands.getoutput('git clang-format -style="{SortIncludes: false}" --extensions "c,h,m,mm,cc,cp,cpp,c++,cxx,hh,hxx,cu,java,js,ts,cs" --commit %s' % clang_format_commit)
+ 
     check_diff_for_keywords()

Signal.xcodeproj/project.pbxproj

@@ -251,7 +251,7 @@
 		34480B361FD0929200BC14EF /* ShareAppExtensionContext.m in Sources */ = {isa = PBXBuildFile; fileRef = 34480B351FD0929200BC14EF /* ShareAppExtensionContext.m */; };
 		34480B551FD0A7A400BC14EF /* DebugLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 34480B4D1FD0A7A300BC14EF /* DebugLogger.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		34480B561FD0A7A400BC14EF /* DebugLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 34480B4E1FD0A7A300BC14EF /* DebugLogger.m */; };
-		34480B571FD0A7A400BC14EF /* OWSScrubbingLogFormatter.h in Headers */ = {isa = PBXBuildFile; fileRef = 34480B4F1FD0A7A300BC14EF /* OWSScrubbingLogFormatter.h */; };
+		34480B571FD0A7A400BC14EF /* OWSScrubbingLogFormatter.h in Headers */ = {isa = PBXBuildFile; fileRef = 34480B4F1FD0A7A300BC14EF /* OWSScrubbingLogFormatter.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		34480B591FD0A7A400BC14EF /* OWSScrubbingLogFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 34480B511FD0A7A400BC14EF /* OWSScrubbingLogFormatter.m */; };
 		34480B5B1FD0A7E300BC14EF /* SignalMessaging-Prefix.pch in Headers */ = {isa = PBXBuildFile; fileRef = 34480B5A1FD0A7E300BC14EF /* SignalMessaging-Prefix.pch */; };
 		3448E15C22133274004B052E /* OnboardingPermissionsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3448E15B22133274004B052E /* OnboardingPermissionsViewController.swift */; };
@@ -1232,10 +1232,8 @@
 		342FFE6F271EF580000AC89F /* UIApplication+OWS.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIApplication+OWS.swift"; sourceTree = "<group>"; };
 		342FFE70271EF580000AC89F /* CNContactViewController+OWS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CNContactViewController+OWS.h"; sourceTree = "<group>"; };
 		342FFE71271EF580000AC89F /* AVAudioSession+OWS.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "AVAudioSession+OWS.m"; sourceTree = "<group>"; };
-		342FFE72271EF580000AC89F /* CNContactViewController+OWS.m.sdsjson */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "CNContactViewController+OWS.m.sdsjson"; sourceTree = "<group>"; };
 		342FFE73271EF580000AC89F /* UIResponder+OWS.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIResponder+OWS.swift"; sourceTree = "<group>"; };
 		342FFE74271EF580000AC89F /* UIStoryboard+OWS.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIStoryboard+OWS.swift"; sourceTree = "<group>"; };
-		342FFE75271EF580000AC89F /* AVAudioSession+OWS.m.sdsjson */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "AVAudioSession+OWS.m.sdsjson"; sourceTree = "<group>"; };
 		342FFE7D271EF5B1000AC89F /* ReturnToCallViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ReturnToCallViewController.swift; sourceTree = "<group>"; };
 		34330A591E7875FB00DF2FB9 /* fontawesome-webfont.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "fontawesome-webfont.ttf"; sourceTree = "<group>"; };
 		343417F02530A7480034FE0C /* CVComponentReactions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CVComponentReactions.swift; sourceTree = "<group>"; };
@@ -2575,10 +2573,8 @@
 				342FFE6F271EF580000AC89F /* UIApplication+OWS.swift */,
 				342FFE70271EF580000AC89F /* CNContactViewController+OWS.h */,
 				342FFE71271EF580000AC89F /* AVAudioSession+OWS.m */,
-				342FFE72271EF580000AC89F /* CNContactViewController+OWS.m.sdsjson */,
 				342FFE73271EF580000AC89F /* UIResponder+OWS.swift */,
 				342FFE74271EF580000AC89F /* UIStoryboard+OWS.swift */,
-				342FFE75271EF580000AC89F /* AVAudioSession+OWS.m.sdsjson */,
 			);
 			name = Categories;
 			path = ViewControllers/Categories;
@@ -6592,7 +6588,6 @@
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -6668,7 +6663,6 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -6752,7 +6746,6 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -6835,7 +6828,6 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -6906,7 +6898,6 @@
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_STYLE = Automatic;
 				COPY_PHASE_STRIP = NO;
@@ -6970,7 +6961,6 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -7042,7 +7032,6 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -7114,7 +7103,6 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;

Signal/src/AppDelegate.m

@@ -3,22 +3,21 @@
 //
 
 #import "AppDelegate.h"
-#import "DebugLogger.h"
 #import "HomeViewController.h"
 #import "MainAppContext.h"
 #import "OWSDeviceProvisioningURLParser.h"
-#import "OWSOrphanDataCleaner.h"
 #import "OWSScreenLockUI.h"
 #import "Pastelog.h"
 #import "Signal-Swift.h"
 #import "SignalApp.h"
-#import "ViewControllerUtils.h"
 #import <Intents/Intents.h>
 #import <SignalCoreKit/SignalCoreKit-Swift.h>
 #import <SignalCoreKit/iOSVersions.h>
 #import <SignalMessaging/AppSetup.h>
+#import <SignalMessaging/DebugLogger.h>
 #import <SignalMessaging/Environment.h>
 #import <SignalMessaging/OWSContactsManager.h>
+#import <SignalMessaging/OWSOrphanDataCleaner.h>
 #import <SignalMessaging/OWSPreferences.h>
 #import <SignalMessaging/OWSProfileManager.h>
 #import <SignalMessaging/SignalMessaging.h>
@@ -38,6 +37,7 @@
 #import <SignalServiceKit/TSAccountManager.h>
 #import <SignalServiceKit/TSPreKeyManager.h>
 #import <SignalUI/OWSNavigationController.h>
+#import <SignalUI/ViewControllerUtils.h>
 #import <UserNotifications/UserNotifications.h>
 #import <WebRTC/WebRTC.h>
 

Signal/src/Calls/UserInterface/RemoteVideoView.m

@@ -3,13 +3,13 @@
 //
 
 #import "RemoteVideoView.h"
-#import "UIFont+OWS.h"
-#import "UIView+SignalUI.h"
 #import <MetalKit/MetalKit.h>
 #import <PureLayout/PureLayout.h>
 #import <SignalCoreKit/Threading.h>
 #import <SignalMessaging/SignalMessaging-Swift.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
+#import <SignalUI/UIFont+OWS.h>
+#import <SignalUI/UIView+SignalUI.h>
 #import <WebRTC/RTCEAGLVideoView.h>
 #import <WebRTC/RTCMTLVideoView.h>
 #import <WebRTC/RTCVideoFrame.h>

Signal/src/Signal-Bridging-Header.h

@@ -13,7 +13,6 @@
 #import "ConversationInputToolbar.h"
 #import "ConversationScrollButton.h"
 #import "ConversationViewController.h"
-#import "DateUtil.h"
 #import "DebugContactsUtils.h"
 #import "DebugUIMessages.h"
 #import "DebugUIPage.h"
@@ -27,7 +26,6 @@
 #import "OWSBezierPathView.h"
 #import "OWSDeviceTableViewCell.h"
 #import "OWSLinkDeviceViewController.h"
-#import "OWSNavigationController.h"
 #import "OWSQuotedMessageView.h"
 #import "OWSWindowManager.h"
 #import "Pastelog.h"
@@ -36,7 +34,6 @@
 #import "RegistrationUtils.h"
 #import "RemoteVideoView.h"
 #import "SignalApp.h"
-#import "ViewControllerUtils.h"
 #import <PureLayout/PureLayout.h>
 #import <SignalCoreKit/Cryptography.h>
 #import <SignalCoreKit/NSData+OWS.h>
@@ -45,6 +42,7 @@
 #import <SignalCoreKit/OWSAsserts.h>
 #import <SignalCoreKit/OWSLogs.h>
 #import <SignalCoreKit/Threading.h>
+#import <SignalMessaging/DateUtil.h>
 #import <SignalMessaging/Environment.h>
 #import <SignalMessaging/OWSContactsManager.h>
 #import <SignalMessaging/OWSPreferences.h>
@@ -98,12 +96,14 @@
 #import <SignalUI/AttachmentSharing.h>
 #import <SignalUI/OWSAnyTouchGestureRecognizer.h>
 #import <SignalUI/OWSAudioPlayer.h>
+#import <SignalUI/OWSNavigationController.h>
 #import <SignalUI/OWSQuotedReplyModel.h>
 #import <SignalUI/OWSViewController.h>
 #import <SignalUI/UIFont+OWS.h>
 #import <SignalUI/UIUtil.h>
 #import <SignalUI/UIView+SignalUI.h>
 #import <SignalUI/UIViewController+OWS.h>
+#import <SignalUI/ViewControllerUtils.h>
 #import <WebRTC/RTCAudioSession.h>
 #import <WebRTC/RTCCameraPreviewView.h>
 #import <YYImage/YYImage.h>

Signal/src/UserInterface/OWSWindowManager.m

@@ -3,13 +3,13 @@
 //
 
 #import "OWSWindowManager.h"
-#import "Environment.h"
 #import "Signal-Swift.h"
-#import "UIFont+OWS.h"
-#import "UIView+SignalUI.h"
+#import <SignalMessaging/Environment.h>
 #import <SignalMessaging/SignalMessaging-Swift.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 #import <SignalUI/SignalUI-Swift.h>
+#import <SignalUI/UIFont+OWS.h>
+#import <SignalUI/UIView+SignalUI.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

Signal/src/ViewControllers/AppSettings/Privacy/BlockListViewController.m

@@ -3,17 +3,17 @@
 //
 
 #import "BlockListViewController.h"
-#import "BlockListUIUtils.h"
-#import "ContactsViewHelper.h"
-#import "PhoneNumber.h"
 #import "Signal-Swift.h"
-#import "UIFont+OWS.h"
-#import "UIView+SignalUI.h"
 #import <SignalMessaging/Environment.h>
 #import <SignalMessaging/OWSContactsManager.h>
 #import <SignalMessaging/SignalMessaging-Swift.h>
+#import <SignalServiceKit/PhoneNumber.h>
 #import <SignalServiceKit/TSGroupThread.h>
+#import <SignalUI/BlockListUIUtils.h>
+#import <SignalUI/ContactsViewHelper.h>
 #import <SignalUI/OWSTableViewController.h>
+#import <SignalUI/UIFont+OWS.h>
+#import <SignalUI/UIView+SignalUI.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

Signal/src/ViewControllers/AppSettings/Privacy/DomainFrontingCountryViewController.m

@@ -3,13 +3,13 @@
 //
 
 #import "DomainFrontingCountryViewController.h"
-#import "OWSCountryMetadata.h"
 #import "Signal-Swift.h"
-#import "UIFont+OWS.h"
-#import "UIView+SignalUI.h"
+#import <SignalServiceKit/OWSCountryMetadata.h>
 #import <SignalServiceKit/OWSSignalService.h>
 #import <SignalUI/OWSTableViewController.h>
 #import <SignalUI/Theme.h>
+#import <SignalUI/UIFont+OWS.h>
+#import <SignalUI/UIView+SignalUI.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

Signal/src/ViewControllers/ConversationView/Cells/OWSQuotedMessageView.h

@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "OWSBubbleView.h"
+#import <SignalUI/OWSBubbleView.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

Signal/src/ViewControllers/ConversationView/Cells/OWSQuotedMessageView.m

@@ -3,8 +3,8 @@
 //
 
 #import "OWSQuotedMessageView.h"
-#import "Environment.h"
 #import "Signal-Swift.h"
+#import <SignalMessaging/Environment.h>
 #import <SignalMessaging/OWSContactsManager.h>
 #import <SignalMessaging/SignalMessaging-Swift.h>
 #import <SignalServiceKit/TSAttachmentStream.h>

Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m

@@ -3,18 +3,18 @@
 //
 
 #import "ConversationInputToolbar.h"
-#import "Environment.h"
-#import "OWSContactsManager.h"
-#import "OWSMath.h"
 #import "Signal-Swift.h"
-#import "UIFont+OWS.h"
-#import "ViewControllerUtils.h"
 #import <SignalCoreKit/SignalCoreKit-Swift.h>
+#import <SignalMessaging/Environment.h>
+#import <SignalMessaging/OWSContactsManager.h>
 #import <SignalMessaging/SignalMessaging-Swift.h>
 #import <SignalServiceKit/NSTimer+OWS.h>
+#import <SignalServiceKit/OWSMath.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 #import <SignalServiceKit/TSQuotedMessage.h>
+#import <SignalUI/UIFont+OWS.h>
 #import <SignalUI/UIView+SignalUI.h>
+#import <SignalUI/ViewControllerUtils.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

Signal/src/ViewControllers/ConversationView/ConversationScrollButton.m

@@ -3,11 +3,11 @@
 //
 
 #import "ConversationScrollButton.h"
-#import "UIFont+OWS.h"
-#import "UIView+SignalUI.h"
 #import <SignalMessaging/SignalMessaging-Swift.h>
 #import <SignalUI/SignalUI-Swift.h>
 #import <SignalUI/Theme.h>
+#import <SignalUI/UIFont+OWS.h>
+#import <SignalUI/UIView+SignalUI.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

Signal/src/ViewControllers/DebugSettingsTableViewController.m

@@ -1,75 +0,0 @@
-//
-//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
-//
-
-#import "DebugSettingsTableViewController.h"
-#import "UIFont+OWS.h"
-#import <SignalServiceKit/TSDatabaseView.h>
-#import <SignalServiceKit/TSStorageManager.h>
-
-@implementation DebugSettingsTableViewController
-
-- (void)loadView
-{
-    self.tableViewStyle = UITableViewStylePlain;
-    [super loadView];
-}
-
-- (void)viewDidLoad
-{
-    [super viewDidLoad];
-
-    [self.navigationController.navigationBar setTranslucent:NO];
-
-    self.title = @"Debugging";
-
-    [self updateTableContents];
-}
-
-- (void)viewWillAppear:(BOOL)animated
-{
-    [super viewWillAppear:animated];
-
-    [self updateTableContents];
-}
-
-- (void)dealloc
-{
-    [[NSNotificationCenter defaultCenter] removeObserver:self];
-}
-
-#pragma mark - Table Contents
-
-- (void)updateTableContents
-{
-    OWSTableContents *contents = [OWSTableContents new];
-    OWSTableSection *section = [OWSTableSection new];
-
-    __block NSUInteger threadCount;
-    __block NSUInteger messageCount;
-    [TSStorageManager.sharedManager.dbReadConnection readWithBlock:^(YapDatabaseReadTransaction *transaction) {
-        threadCount = [[transaction ext:TSThreadDatabaseViewExtensionName] numberOfItemsInAllGroups];
-        messageCount = [[transaction ext:TSMessageDatabaseViewExtensionName] numberOfItemsInAllGroups];
-    }];
-
-    [section addItem:[OWSTableItem labelItemWithText:[NSString stringWithFormat:@"Threads: %zd", threadCount]]];
-    [section addItem:[OWSTableItem labelItemWithText:[NSString stringWithFormat:@"Messages: %zd", messageCount]]];
-
-    [contents addSection:section];
-
-    self.contents = contents;
-}
-
-#pragma mark - Logging
-
-+ (NSString *)tag
-{
-    return [NSString stringWithFormat:@"[%@]", self.class];
-}
-
-- (NSString *)tag
-{
-    return self.class.tag;
-}
-
-@end

Signal/src/ViewControllers/DebugUI/DebugUIContacts.h

@@ -1,5 +1,5 @@
 //
-//  Copyright (c) 2019 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
 #import "DebugUIPage.h"

Signal/src/ViewControllers/DebugUI/DebugUIDiskUsage.h

@@ -1,5 +1,5 @@
 //
-//  Copyright (c) 2019 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
 #import "DebugUIPage.h"

Signal/src/ViewControllers/DebugUI/DebugUIDiskUsage.m

@@ -3,9 +3,9 @@
 //
 
 #import "DebugUIDiskUsage.h"
-#import "OWSOrphanDataCleaner.h"
 #import "Signal-Swift.h"
 #import <SignalCoreKit/NSDate+OWS.h>
+#import <SignalMessaging/OWSOrphanDataCleaner.h>
 #import <SignalServiceKit/TSInteraction.h>
 #import <SignalUI/OWSTableViewController.h>
 

Signal/src/ViewControllers/DebugUI/DebugUIMessages.h

@@ -1,5 +1,5 @@
 //
-//  Copyright (c) 2019 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
 #import "DebugUIPage.h"

Signal/src/ViewControllers/DebugUI/DebugUIMessagesAction.h

@@ -1,5 +1,5 @@
 //
-//  Copyright (c) 2019 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
 #import "DebugUIMessagesUtils.h"

Signal/src/ViewControllers/DebugUI/DebugUIMisc.h

@@ -1,5 +1,5 @@
 //
-//  Copyright (c) 2019 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
 #import "DebugUIPage.h"

Signal/src/ViewControllers/DebugUI/DebugUIMisc.m

@@ -4,11 +4,11 @@
 
 #import "DebugUIMisc.h"
 #import "DebugUIMessagesAssetLoader.h"
-#import "OWSCountryMetadata.h"
 #import "Signal-Swift.h"
-#import "ThreadUtil.h"
 #import <SignalCoreKit/Randomness.h>
 #import <SignalMessaging/Environment.h>
+#import <SignalMessaging/ThreadUtil.h>
+#import <SignalServiceKit/OWSCountryMetadata.h>
 #import <SignalServiceKit/OWSDisappearingMessagesConfiguration.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 #import <SignalServiceKit/TSCall.h>

Signal/src/ViewControllers/DebugUI/DebugUIScreenshots.h

@@ -1,5 +1,5 @@
 //
-//  Copyright (c) 2020 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
 #import "DebugUIPage.h"

Signal/src/ViewControllers/DebugUI/DebugUISessionState.h

@@ -1,5 +1,5 @@
 //
-//  Copyright (c) 2019 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
 #import "DebugUIPage.h"

Signal/src/ViewControllers/DebugUI/DebugUIStress.h

@@ -1,5 +1,5 @@
 //
-//  Copyright (c) 2019 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
 #import "DebugUIPage.h"

Signal/src/ViewControllers/DebugUI/DebugUIStress.m

@@ -3,14 +3,14 @@
 //
 
 #import "DebugUIStress.h"
-#import "MessageSender.h"
 #import "Signal-Swift.h"
 #import "SignalApp.h"
-#import "ThreadUtil.h"
 #import <SignalCoreKit/Cryptography.h>
 #import <SignalCoreKit/NSDate+OWS.h>
 #import <SignalCoreKit/Randomness.h>
 #import <SignalMessaging/Environment.h>
+#import <SignalMessaging/ThreadUtil.h>
+#import <SignalServiceKit/MessageSender.h>
 #import <SignalServiceKit/OWSDynamicOutgoingMessage.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 #import <SignalServiceKit/TSAccountManager.h>

Signal/src/ViewControllers/DebugUI/DebugUISyncMessages.h

@@ -1,5 +1,5 @@
 //
-//  Copyright (c) 2019 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
 #import "DebugUIPage.h"

Signal/src/ViewControllers/DebugUI/DebugUISyncMessages.m

@@ -5,10 +5,10 @@
 #import "DebugUISyncMessages.h"
 #import "DebugUIContacts.h"
 #import "Signal-Swift.h"
-#import "ThreadUtil.h"
 #import <SignalCoreKit/Randomness.h>
 #import <SignalCoreKit/SignalCoreKit-Swift.h>
 #import <SignalMessaging/Environment.h>
+#import <SignalMessaging/ThreadUtil.h>
 #import <SignalServiceKit/OWSDisappearingMessagesConfiguration.h>
 #import <SignalServiceKit/OWSIdentityManager.h>
 #import <SignalServiceKit/OWSReceiptManager.h>

Signal/src/ViewControllers/HomeView/HomeViewController.m

@@ -4,13 +4,9 @@
 
 #import "HomeViewController.h"
 #import "AppDelegate.h"
-#import "OWSNavigationController.h"
 #import "RegistrationUtils.h"
 #import "Signal-Swift.h"
 #import "SignalApp.h"
-#import "TSAccountManager.h"
-#import "TSGroupThread.h"
-#import "ViewControllerUtils.h"
 #import <SignalCoreKit/NSDate+OWS.h>
 #import <SignalCoreKit/SignalCoreKit-Swift.h>
 #import <SignalCoreKit/Threading.h>
@@ -21,9 +17,12 @@
 #import <SignalServiceKit/OWSMessageUtils.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 #import <SignalServiceKit/TSAccountManager.h>
+#import <SignalServiceKit/TSGroupThread.h>
 #import <SignalServiceKit/TSOutgoingMessage.h>
+#import <SignalUI/OWSNavigationController.h>
 #import <SignalUI/Theme.h>
 #import <SignalUI/UIUtil.h>
+#import <SignalUI/ViewControllerUtils.h>
 #import <StoreKit/StoreKit.h>
 
 NS_ASSUME_NONNULL_BEGIN

Signal/src/ViewControllers/MediaGallery/MediaDetailViewController.m

@@ -3,18 +3,18 @@
 //
 
 #import "MediaDetailViewController.h"
-#import "AttachmentSharing.h"
 #import "ConversationViewController.h"
 #import "Signal-Swift.h"
-#import "TSAttachmentStream.h"
-#import "TSInteraction.h"
-#import "UIUtil.h"
-#import "UIView+SignalUI.h"
 #import <AVKit/AVKit.h>
 #import <MediaPlayer/MPMoviePlayerViewController.h>
 #import <MediaPlayer/MediaPlayer.h>
 #import <SignalMessaging/SignalMessaging-Swift.h>
 #import <SignalServiceKit/NSData+Image.h>
+#import <SignalServiceKit/TSAttachmentStream.h>
+#import <SignalServiceKit/TSInteraction.h>
+#import <SignalUI/AttachmentSharing.h>
+#import <SignalUI/UIUtil.h>
+#import <SignalUI/UIView+SignalUI.h>
 #import <YYImage/YYImage.h>
 
 NS_ASSUME_NONNULL_BEGIN

Signal/src/ViewControllers/RecipientPicker/RecipientPickerViewController.m

@@ -3,10 +3,8 @@
 //
 
 #import "RecipientPickerViewController.h"
-#import "ContactsViewHelper.h"
 #import "Signal-Swift.h"
 #import "SignalApp.h"
-#import "UIView+SignalUI.h"
 #import <MessageUI/MessageUI.h>
 #import <SignalCoreKit/SignalCoreKit-Swift.h>
 #import <SignalMessaging/Environment.h>
@@ -16,8 +14,10 @@
 #import <SignalServiceKit/SignalAccount.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 #import <SignalServiceKit/TSAccountManager.h>
+#import <SignalUI/ContactsViewHelper.h>
 #import <SignalUI/OWSTableViewController.h>
 #import <SignalUI/UIUtil.h>
+#import <SignalUI/UIView+SignalUI.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

Signal/src/ViewControllers/ThreadSettings/FingerprintViewController.m

@@ -6,8 +6,6 @@
 #import "FingerprintViewScanController.h"
 #import "OWSBezierPathView.h"
 #import "Signal-Swift.h"
-#import "UIFont+OWS.h"
-#import "UIView+SignalUI.h"
 #import <SignalCoreKit/NSDate+OWS.h>
 #import <SignalMessaging/Environment.h>
 #import <SignalMessaging/OWSContactsManager.h>
@@ -17,7 +15,9 @@
 #import <SignalServiceKit/OWSIdentityManager.h>
 #import <SignalServiceKit/TSAccountManager.h>
 #import <SignalServiceKit/TSInfoMessage.h>
+#import <SignalUI/UIFont+OWS.h>
 #import <SignalUI/UIUtil.h>
+#import <SignalUI/UIView+SignalUI.h>
 
 @import SafariServices;
 

Signal/src/ViewControllers/ThreadSettings/FingerprintViewScanController.m

@@ -4,16 +4,16 @@
 
 #import "FingerprintViewScanController.h"
 #import "Signal-Swift.h"
-#import "UIFont+OWS.h"
-#import "UIView+SignalUI.h"
-#import "UIViewController+Permissions.h"
 #import <SignalMessaging/Environment.h>
 #import <SignalMessaging/OWSContactsManager.h>
 #import <SignalServiceKit/OWSError.h>
 #import <SignalServiceKit/OWSFingerprint.h>
 #import <SignalServiceKit/OWSFingerprintBuilder.h>
 #import <SignalServiceKit/OWSIdentityManager.h>
+#import <SignalUI/UIFont+OWS.h>
 #import <SignalUI/UIUtil.h>
+#import <SignalUI/UIView+SignalUI.h>
+#import <SignalUI/UIViewController+Permissions.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

Signal/src/util/Pastelog.m

@@ -4,14 +4,14 @@
 
 #import "Pastelog.h"
 #import "Signal-Swift.h"
-#import "ThreadUtil.h"
 #import "zlib.h"
 #import <SSZipArchive/SSZipArchive.h>
 #import <SignalCoreKit/Threading.h>
 #import <SignalMessaging/DebugLogger.h>
 #import <SignalMessaging/Environment.h>
+#import <SignalMessaging/ThreadUtil.h>
 #import <SignalServiceKit/AppContext.h>
-#import <SignalServiceKit/MimeTypeUtil.h>
+#import <SignalServiceKit/MIMETypeUtil.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 #import <SignalServiceKit/TSAccountManager.h>
 #import <SignalServiceKit/TSContactThread.h>

Signal/src/util/RegistrationUtils.m

@@ -3,13 +3,13 @@
 //
 
 #import "RegistrationUtils.h"
-#import "OWSNavigationController.h"
 #import "Signal-Swift.h"
 #import <SignalCoreKit/SignalCoreKit-Swift.h>
 #import <SignalMessaging/Environment.h>
 #import <SignalMessaging/OWSPreferences.h>
 #import <SignalMessaging/SignalMessaging-Swift.h>
 #import <SignalServiceKit/TSAccountManager.h>
+#import <SignalUI/OWSNavigationController.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

Signal/src/views/OWSDeviceTableViewCell.m

@@ -3,7 +3,7 @@
 //
 
 #import "OWSDeviceTableViewCell.h"
-#import "DateUtil.h"
+#import <SignalMessaging/DateUtil.h>
 #import <SignalMessaging/SignalMessaging-Swift.h>
 #import <SignalUI/OWSTableViewController.h>
 #import <SignalUI/SignalUI-Swift.h>

Signal/test/SignalBaseTest.m

@@ -3,7 +3,7 @@
 //
 
 #import "SignalBaseTest.h"
-#import "Environment.h"
+#import <SignalMessaging/Environment.h>
 #import <SignalMessaging/SignalMessaging-Swift.h>
 #import <SignalServiceKit/SDSDatabaseStorage+Objc.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>

Signal/test/SignalTests-Bridging-Header.h

@@ -1,5 +1,5 @@
 //
-//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
 #import "Signal-Bridging-Header.h"

Signal/test/mocks/MockEnvironment.h

@@ -1,8 +1,8 @@
 //
-//  Copyright (c) 2019 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "Environment.h"
+#import <SignalMessaging/Environment.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

Signal/test/mocks/MockEnvironment.m

@@ -3,8 +3,8 @@
 //
 
 #import "MockEnvironment.h"
-#import "OWSOrphanDataCleaner.h"
 #import "OWSWindowManager.h"
+#import <SignalMessaging/OWSOrphanDataCleaner.h>
 #import <SignalMessaging/OWSPreferences.h>
 #import <SignalMessaging/OWSSounds.h>
 #import <SignalMessaging/SignalMessaging-Swift.h>

Signal/test/util/ExceptionsTest.h

@@ -1,5 +1,5 @@
 //
-//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
 #import "SignalBaseTest.h"

Signal/test/util/FunctionalUtilTest.m

@@ -1,10 +1,10 @@
 //
-//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "FunctionalUtil.h"
 #import "SignalBaseTest.h"
 #import "TestUtil.h"
+#import <SignalServiceKit/FunctionalUtil.h>
 
 @interface FunctionalUtilTest : SignalBaseTest
 

Signal/test/util/OWSOrphanDataCleanerTest.m

@@ -1,9 +1,9 @@
 //
-//  Copyright (c) 2020 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "OWSOrphanDataCleaner.h"
 #import "SignalBaseTest.h"
+#import <SignalMessaging/OWSOrphanDataCleaner.h>
 #import <SignalServiceKit/OWSDevice.h>
 #import <SignalServiceKit/TSAttachmentStream.h>
 #import <SignalServiceKit/TSContactThread.h>

Signal/test/util/OWSScrubbingLogFormatterTest.m

@@ -2,10 +2,10 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "OWSScrubbingLogFormatter.h"
 #import "SignalBaseTest.h"
 #import <SignalCoreKit/NSData+OWS.h>
 #import <SignalCoreKit/Randomness.h>
+#import <SignalMessaging/OWSScrubbingLogFormatter.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 #import <SignalServiceKit/TSGroupThread.h>
 

Signal/test/util/ProtoParsingTest.m

@@ -1,5 +1,5 @@
 //
-//  Copyright (c) 2020 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
 #import "SignalBaseTest.h"

Signal/test/util/TSStorageIdentityKeyStoreTests.m

@@ -1,95 +0,0 @@
-//
-//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
-//
-
-#import "OWSIdentityManager.h"
-#import "OWSPrimaryStorage.h"
-#import "OWSRecipientIdentity.h"
-#import "OWSUnitTestEnvironment.h"
-#import "SSKBaseTest.h"
-#import "SSKEnvironment.h"
-#import "SecurityUtils.h"
-#import <Curve25519Kit/Curve25519.h>
-
-@interface TSStorageIdentityKeyStoreTests : SSKBaseTest
-
-@end
-
-@implementation TSStorageIdentityKeyStoreTests
-
-- (void)setUp
-{
-    [super setUp];
-
-    [[OWSPrimaryStorage sharedManager] purgeCollection:OWSPrimaryStorageTrustedKeysCollection];
-    [OWSRecipientIdentity removeAllObjectsInCollection];
-}
-
-- (void)tearDown
-{
-    // Put teardown code here. This method is called after the invocation of each test method in the class.
-    [super tearDown];
-}
-
-- (void)testNewEmptyKey
-{
-    NSData *newKey = [SecurityUtils generateRandomBytes:32];
-    NSString *recipientId = @"test@gmail.com";
-
-    XCTAssert([[OWSIdentityManager sharedManager] isTrustedIdentityKey:newKey
-                                                           recipientId:recipientId
-                                                             direction:TSMessageDirectionOutgoing]);
-    XCTAssert([[OWSIdentityManager sharedManager] isTrustedIdentityKey:newKey
-                                                           recipientId:recipientId
-                                                             direction:TSMessageDirectionIncoming]);
-}
-
-- (void)testAlreadyRegisteredKey
-{
-    NSData *newKey = [SecurityUtils generateRandomBytes:32];
-    NSString *recipientId = @"test@gmail.com";
-
-    [[OWSIdentityManager sharedManager] saveRemoteIdentity:newKey recipientId:recipientId];
-
-    XCTAssert([[OWSIdentityManager sharedManager] isTrustedIdentityKey:newKey
-                                                           recipientId:recipientId
-                                                             direction:TSMessageDirectionOutgoing]);
-    XCTAssert([[OWSIdentityManager sharedManager] isTrustedIdentityKey:newKey
-                                                           recipientId:recipientId
-                                                             direction:TSMessageDirectionIncoming]);
-}
-
-
-- (void)testChangedKey
-{
-    NSData *originalKey = [SecurityUtils generateRandomBytes:32];
-    NSString *recipientId = @"test@protonmail.com";
-
-    [[OWSIdentityManager sharedManager] saveRemoteIdentity:originalKey recipientId:recipientId];
-
-    XCTAssert([[OWSIdentityManager sharedManager] isTrustedIdentityKey:originalKey
-                                                           recipientId:recipientId
-                                                             direction:TSMessageDirectionOutgoing]);
-    XCTAssert([[OWSIdentityManager sharedManager] isTrustedIdentityKey:originalKey
-                                                           recipientId:recipientId
-                                                             direction:TSMessageDirectionIncoming]);
-
-    NSData *otherKey = [SecurityUtils generateRandomBytes:32];
-
-    XCTAssertFalse([[OWSIdentityManager sharedManager] isTrustedIdentityKey:otherKey
-                                                                recipientId:recipientId
-                                                                  direction:TSMessageDirectionOutgoing]);
-    XCTAssert([[OWSIdentityManager sharedManager] isTrustedIdentityKey:otherKey
-                                                           recipientId:recipientId
-                                                             direction:TSMessageDirectionIncoming]);
-}
-
-
-- (void)testIdentityKey
-{
-    [[OWSIdentityManager sharedManager] generateNewIdentityKey];
-
-    XCTAssert([[[OWSIdentityManager sharedManager] identityKeyPair].publicKey length] == 32);
-}
-
-@end

Signal/test/util/TSStoragePreKeyStoreTests.m

@@ -1,63 +0,0 @@
-//
-//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
-//
-
-#import "OWSPrimaryStorage+PreKeyStore.h"
-#import "SSKBaseTest.h"
-
-@interface TSStoragePreKeyStoreTests : SSKBaseTest
-
-@end
-
-@implementation TSStoragePreKeyStoreTests
-
-- (void)setUp
-{
-    [super setUp];
-    // Put setup code here. This method is called before the invocation of each test method in the class.
-}
-
-- (void)tearDown
-{
-    // Put teardown code here. This method is called after the invocation of each test method in the class.
-    [super tearDown];
-}
-
-- (void)testGeneratingAndStoringPreKeys
-{
-    NSArray *generatedKeys = [[OWSPrimaryStorage sharedManager] generatePreKeyRecords];
-
-
-    XCTAssert([generatedKeys count] == 100, @"Not hundred keys generated");
-
-    [[OWSPrimaryStorage sharedManager] storePreKeyRecords:generatedKeys];
-
-    PreKeyRecord *lastPreKeyRecord = [generatedKeys lastObject];
-    PreKeyRecord *firstPreKeyRecord = [generatedKeys firstObject];
-
-    XCTAssert([[[OWSPrimaryStorage sharedManager] loadPreKey:lastPreKeyRecord.Id].keyPair.publicKey
-        isEqualToData:lastPreKeyRecord.keyPair.publicKey]);
-
-    XCTAssert([[[OWSPrimaryStorage sharedManager] loadPreKey:firstPreKeyRecord.Id].keyPair.publicKey
-        isEqualToData:firstPreKeyRecord.keyPair.publicKey]);
-}
-
-
-- (void)testRemovingPreKeys
-{
-    NSArray *generatedKeys = [[OWSPrimaryStorage sharedManager] generatePreKeyRecords];
-
-    XCTAssert([generatedKeys count] == 100, @"Not hundred keys generated");
-
-    [[OWSPrimaryStorage sharedManager] storePreKeyRecords:generatedKeys];
-
-    PreKeyRecord *lastPreKeyRecord = [generatedKeys lastObject];
-    PreKeyRecord *firstPreKeyRecord = [generatedKeys firstObject];
-
-    [[OWSPrimaryStorage sharedManager] removePreKey:lastPreKeyRecord.Id];
-
-    XCTAssertThrows([[OWSPrimaryStorage sharedManager] loadPreKey:lastPreKeyRecord.Id]);
-    XCTAssertNoThrow([[OWSPrimaryStorage sharedManager] loadPreKey:firstPreKeyRecord.Id]);
-}
-
-@end

Signal/test/util/TSStorageSignedPreKeyStore.m

@@ -1,25 +0,0 @@
-//
-//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
-//
-
-#import "SSKBaseTest.h"
-
-@interface TSStorageSignedPreKeyStore : SSKBaseTest
-
-@end
-
-@implementation TSStorageSignedPreKeyStore
-
-- (void)setUp
-{
-    [super setUp];
-    // Put setup code here. This method is called before the invocation of each test method in the class.
-}
-
-- (void)tearDown
-{
-    // Put teardown code here. This method is called after the invocation of each test method in the class.
-    [super tearDown];
-}
-
-@end

Signal/test/util/UtilTest.h

@@ -1,5 +1,5 @@
 //
-//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
 #import "SignalBaseTest.h"

Signal/test/util/UtilTest.m

@@ -1,13 +1,13 @@
 //
-//  Copyright (c) 2019 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
 #import "UtilTest.h"
-#import "DateUtil.h"
 #import "TestUtil.h"
 #import <SignalCoreKit/NSDate+OWS.h>
 #import <SignalCoreKit/NSObject+OWS.h>
 #import <SignalCoreKit/NSString+OWS.h>
+#import <SignalMessaging/DateUtil.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 @interface DateUtil (Test)

SignalMessaging/SignalMessaging-Prefix.pch

@@ -1,5 +1,5 @@
 //
-//  Copyright (c) 2020 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
 #import <Availability.h>

SignalMessaging/SignalMessaging.h

@@ -19,6 +19,7 @@ FOUNDATION_EXPORT const unsigned char SignalMessagingVersionString[];
 #import <SignalMessaging/OWSOrphanDataCleaner.h>
 #import <SignalMessaging/OWSPreferences.h>
 #import <SignalMessaging/OWSProfileManager.h>
+#import <SignalMessaging/OWSScrubbingLogFormatter.h>
 #import <SignalMessaging/OWSSounds.h>
 #import <SignalMessaging/OWSSyncManager.h>
 #import <SignalMessaging/ThreadUtil.h>

SignalMessaging/contacts/OWSSyncManager.m

@@ -7,7 +7,6 @@
 #import "OWSContactsManager.h"
 #import "OWSPreferences.h"
 #import "OWSProfileManager.h"
-#import "OWSReceiptManager.h"
 #import <Contacts/Contacts.h>
 #import <SignalCoreKit/Cryptography.h>
 #import <SignalCoreKit/SignalCoreKit-Swift.h>
@@ -17,6 +16,7 @@
 #import <SignalServiceKit/MIMETypeUtil.h>
 #import <SignalServiceKit/MessageSender.h>
 #import <SignalServiceKit/OWSError.h>
+#import <SignalServiceKit/OWSReceiptManager.h>
 #import <SignalServiceKit/OWSSyncConfigurationMessage.h>
 #import <SignalServiceKit/OWSSyncContactsMessage.h>
 #import <SignalServiceKit/OWSSyncFetchLatestMessage.h>

SignalMessaging/environment/AppSetup.m

@@ -4,8 +4,8 @@
 
 #import "AppSetup.h"
 #import "Environment.h"
+#import "OWSProfileManager.h"
 #import "VersionMigrations.h"
-#import <SignalMessaging/OWSProfileManager.h>
 #import <SignalMessaging/SignalMessaging-Swift.h>
 #import <SignalMetadataKit/SignalMetadataKit-Swift.h>
 #import <SignalServiceKit/OWS2FAManager.h>

SignalMessaging/utils/OWSOrphanDataCleaner.m

@@ -4,8 +4,8 @@
 
 #import "OWSOrphanDataCleaner.h"
 #import "DateUtil.h"
+#import "OWSProfileManager.h"
 #import <SignalCoreKit/NSDate+OWS.h>
-#import <SignalMessaging/OWSProfileManager.h>
 #import <SignalMessaging/SignalMessaging-Swift.h>
 #import <SignalServiceKit/AppReadiness.h>
 #import <SignalServiceKit/AppVersion.h>

SignalMessaging/utils/ThreadUtil.m

@@ -3,9 +3,9 @@
 //
 
 #import "ThreadUtil.h"
+#import "OWSProfileManager.h"
 #import <SignalCoreKit/NSDate+OWS.h>
 #import <SignalCoreKit/SignalCoreKit-Swift.h>
-#import <SignalMessaging/OWSProfileManager.h>
 #import <SignalMessaging/SignalMessaging-Swift.h>
 #import <SignalServiceKit/MessageSender.h>
 #import <SignalServiceKit/OWSDisappearingMessagesConfiguration.h>

SignalServiceKit/src/Account/TSAccountManager.m

@@ -3,18 +3,18 @@
 //
 
 #import "TSAccountManager.h"
+#import "AppContext.h"
+#import "AppReadiness.h"
+#import "HTTPUtils.h"
+#import "OWSError.h"
+#import "OWSRequestFactory.h"
+#import "ProfileManagerProtocol.h"
+#import "RemoteAttestation.h"
+#import "SSKEnvironment.h"
+#import "TSPreKeyManager.h"
 #import <SignalCoreKit/NSData+OWS.h>
 #import <SignalCoreKit/Randomness.h>
-#import <SignalServiceKit/AppContext.h>
-#import <SignalServiceKit/AppReadiness.h>
-#import <SignalServiceKit/HTTPUtils.h>
-#import <SignalServiceKit/OWSError.h>
-#import <SignalServiceKit/OWSRequestFactory.h>
-#import <SignalServiceKit/ProfileManagerProtocol.h>
-#import <SignalServiceKit/RemoteAttestation.h>
-#import <SignalServiceKit/SSKEnvironment.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSPreKeyManager.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

SignalServiceKit/src/Account/TSPreKeyManager.m

@@ -2,16 +2,16 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/TSPreKeyManager.h>
+#import "TSPreKeyManager.h"
+#import "AppContext.h"
+#import "HTTPUtils.h"
+#import "OWSIdentityManager.h"
+#import "SSKEnvironment.h"
+#import "SSKPreKeyStore.h"
+#import "SSKSignedPreKeyStore.h"
+#import "SignedPrekeyRecord.h"
 #import <SignalCoreKit/NSDate+OWS.h>
-#import <SignalServiceKit/AppContext.h>
-#import <SignalServiceKit/HTTPUtils.h>
-#import <SignalServiceKit/OWSIdentityManager.h>
-#import <SignalServiceKit/SSKEnvironment.h>
-#import <SignalServiceKit/SSKPreKeyStore.h>
-#import <SignalServiceKit/SSKSignedPreKeyStore.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/SignedPreKeyRecord.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

SignalServiceKit/src/Contacts/Contact.m

@@ -2,15 +2,15 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "Contact.h"
+#import "PhoneNumber.h"
+#import "SSKEnvironment.h"
+#import "SignalRecipient.h"
+#import "TSAccountManager.h"
 #import <Contacts/Contacts.h>
 #import <SignalCoreKit/Cryptography.h>
 #import <SignalCoreKit/NSString+OWS.h>
-#import <SignalServiceKit/Contact.h>
-#import <SignalServiceKit/PhoneNumber.h>
-#import <SignalServiceKit/SSKEnvironment.h>
-#import <SignalServiceKit/SignalRecipient.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSAccountManager.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

SignalServiceKit/src/Contacts/OWSDisappearingMessagesConfiguration.m

@@ -2,9 +2,9 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "OWSDisappearingMessagesConfiguration.h"
 #import <SignalCoreKit/NSDate+OWS.h>
 #import <SignalCoreKit/NSString+OWS.h>
-#import <SignalServiceKit/OWSDisappearingMessagesConfiguration.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN

SignalServiceKit/src/Contacts/PhoneNumber.m

@@ -2,9 +2,9 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/PhoneNumber.h>
+#import "PhoneNumber.h"
 #import "NSString+SSK.h"
-#import <SignalServiceKit/PhoneNumberUtil.h>
+#import "PhoneNumberUtil.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 #import <libPhoneNumber_iOS/NBAsYouTypeFormatter.h>
 #import <libPhoneNumber_iOS/NBMetadataHelper.h>

SignalServiceKit/src/Contacts/PhoneNumberUtil.m

@@ -2,9 +2,9 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/ContactsManagerProtocol.h>
-#import <SignalServiceKit/FunctionalUtil.h>
-#import <SignalServiceKit/PhoneNumberUtil.h>
+#import "PhoneNumberUtil.h"
+#import "ContactsManagerProtocol.h"
+#import "FunctionalUtil.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 #import <libPhoneNumber_iOS/NBPhoneNumber.h>
 

SignalServiceKit/src/Contacts/SignalAccount.m

@@ -2,15 +2,15 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "SignalAccount.h"
+#import "Contact.h"
+#import "ContactsManagerProtocol.h"
 #import "NSData+Image.h"
+#import "SSKEnvironment.h"
+#import "SignalRecipient.h"
 #import "UIImage+OWS.h"
 #import <SignalCoreKit/Cryptography.h>
 #import <SignalCoreKit/NSString+OWS.h>
-#import <SignalServiceKit/Contact.h>
-#import <SignalServiceKit/ContactsManagerProtocol.h>
-#import <SignalServiceKit/SSKEnvironment.h>
-#import <SignalServiceKit/SignalAccount.h>
-#import <SignalServiceKit/SignalRecipient.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN

SignalServiceKit/src/Contacts/SignalRecipient.m

@@ -2,12 +2,12 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/SignalRecipient.h>
-#import <SignalServiceKit/OWSDevice.h>
-#import <SignalServiceKit/ProfileManagerProtocol.h>
-#import <SignalServiceKit/SSKEnvironment.h>
+#import "SignalRecipient.h"
+#import "OWSDevice.h"
+#import "ProfileManagerProtocol.h"
+#import "SSKEnvironment.h"
+#import "TSAccountManager.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSAccountManager.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

SignalServiceKit/src/Contacts/TSThread.m

@@ -3,20 +3,20 @@
 //
 
 #import "TSThread.h"
+#import "AppReadiness.h"
+#import "OWSDisappearingMessagesConfiguration.h"
+#import "OWSReadTracking.h"
+#import "SSKEnvironment.h"
+#import "TSAccountManager.h"
+#import "TSIncomingMessage.h"
+#import "TSInfoMessage.h"
+#import "TSInteraction.h"
+#import "TSInvalidIdentityKeyReceivingErrorMessage.h"
+#import "TSOutgoingMessage.h"
 #import <SignalCoreKit/Cryptography.h>
 #import <SignalCoreKit/NSDate+OWS.h>
 #import <SignalCoreKit/NSString+OWS.h>
-#import <SignalServiceKit/AppReadiness.h>
-#import <SignalServiceKit/OWSDisappearingMessagesConfiguration.h>
-#import <SignalServiceKit/OWSReadTracking.h>
-#import <SignalServiceKit/SSKEnvironment.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSAccountManager.h>
-#import <SignalServiceKit/TSIncomingMessage.h>
-#import <SignalServiceKit/TSInfoMessage.h>
-#import <SignalServiceKit/TSInteraction.h>
-#import <SignalServiceKit/TSInvalidIdentityKeyReceivingErrorMessage.h>
-#import <SignalServiceKit/TSOutgoingMessage.h>
 
 @import Intents;
 

SignalServiceKit/src/Contacts/Threads/TSContactThread.m

@@ -2,12 +2,12 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/ContactsManagerProtocol.h>
-#import <SignalServiceKit/NotificationsProtocol.h>
-#import <SignalServiceKit/OWSIdentityManager.h>
-#import <SignalServiceKit/SSKEnvironment.h>
+#import "TSContactThread.h"
+#import "ContactsManagerProtocol.h"
+#import "NotificationsProtocol.h"
+#import "OWSIdentityManager.h"
+#import "SSKEnvironment.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSContactThread.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

SignalServiceKit/src/Contacts/Threads/TSGroupThread.m

@@ -2,11 +2,11 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "TSGroupThread.h"
+#import "TSAccountManager.h"
+#import "TSAttachmentStream.h"
 #import <SignalCoreKit/NSData+OWS.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSAccountManager.h>
-#import <SignalServiceKit/TSAttachmentStream.h>
-#import <SignalServiceKit/TSGroupThread.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

SignalServiceKit/src/Devices/ConversationSync/OWSChunkedOutputStream.m

@@ -2,8 +2,8 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "OWSChunkedOutputStream.h"
 #import <SignalCoreKit/NSData+OWS.h>
-#import <SignalServiceKit/OWSChunkedOutputStream.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

SignalServiceKit/src/Devices/ConversationSync/OWSContactsOutputStream.m

@@ -2,19 +2,19 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "OWSContactsOutputStream.h"
+#import "Contact.h"
+#import "ContactsManagerProtocol.h"
+#import "MIMETypeUtil.h"
 #import "NSData+Image.h"
 #import "NSData+keyVersionByte.h"
+#import "OWSDisappearingMessagesConfiguration.h"
+#import "OWSRecipientIdentity.h"
+#import "SignalAccount.h"
+#import "TSContactThread.h"
 #import <SignalCoreKit/Cryptography.h>
 #import <SignalCoreKit/NSData+OWS.h>
-#import <SignalServiceKit/Contact.h>
-#import <SignalServiceKit/ContactsManagerProtocol.h>
-#import <SignalServiceKit/MIMETypeUtil.h>
-#import <SignalServiceKit/OWSContactsOutputStream.h>
-#import <SignalServiceKit/OWSDisappearingMessagesConfiguration.h>
-#import <SignalServiceKit/OWSRecipientIdentity.h>
-#import <SignalServiceKit/SignalAccount.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSContactThread.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

SignalServiceKit/src/Devices/ConversationSync/OWSGroupsOutputStream.m

@@ -2,13 +2,13 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/MIMETypeUtil.h>
-#import <SignalServiceKit/NSData+Image.h>
-#import <SignalServiceKit/OWSDisappearingMessagesConfiguration.h>
-#import <SignalServiceKit/OWSGroupsOutputStream.h>
+#import "OWSGroupsOutputStream.h"
+#import "MIMETypeUtil.h"
+#import "NSData+Image.h"
+#import "OWSDisappearingMessagesConfiguration.h"
+#import "TSGroupModel.h"
+#import "TSGroupThread.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSGroupModel.h>
-#import <SignalServiceKit/TSGroupThread.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

SignalServiceKit/src/Devices/OWSBlockedPhoneNumbersMessage.m

@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSBlockedPhoneNumbersMessage.h>
+#import "OWSBlockedPhoneNumbersMessage.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN

SignalServiceKit/src/Devices/OWSDevice.m

@@ -3,14 +3,14 @@
 //
 
 #import "OWSDevice.h"
+#import "AppReadiness.h"
+#import "OWSError.h"
+#import "OWSIdentityManager.h"
+#import "SSKEnvironment.h"
+#import "TSAccountManager.h"
 #import <Mantle/MTLValueTransformer.h>
 #import <SignalCoreKit/NSDate+OWS.h>
-#import <SignalServiceKit/AppReadiness.h>
-#import <SignalServiceKit/OWSError.h>
-#import <SignalServiceKit/OWSIdentityManager.h>
-#import <SignalServiceKit/SSKEnvironment.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSAccountManager.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

SignalServiceKit/src/Devices/OWSDeviceProvisioner.m

@@ -2,9 +2,9 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSDeviceProvisioner.h>
-#import <SignalServiceKit/OWSError.h>
-#import <SignalServiceKit/OWSProvisioningMessage.h>
+#import "OWSDeviceProvisioner.h"
+#import "OWSError.h"
+#import "OWSProvisioningMessage.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN

SignalServiceKit/src/Devices/OWSProvisioningMessage.m

@@ -2,9 +2,9 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "OWSProvisioningMessage.h"
+#import "NSData+keyVersionByte.h"
 #import <Curve25519Kit/Curve25519.h>
-#import <SignalServiceKit/NSData+keyVersionByte.h>
-#import <SignalServiceKit/OWSProvisioningMessage.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN

SignalServiceKit/src/Devices/OWSReadReceiptsForLinkedDevicesMessage.m

@@ -3,7 +3,7 @@
 //
 
 #import "OWSReadReceiptsForLinkedDevicesMessage.h"
-#import <SignalServiceKit/OWSLinkedDeviceReadReceipt.h>
+#import "OWSLinkedDeviceReadReceipt.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN

SignalServiceKit/src/Devices/OWSReceiptsForSenderMessage.m

@@ -3,8 +3,8 @@
 //
 
 #import "OWSReceiptsForSenderMessage.h"
+#import "SignalRecipient.h"
 #import <SignalCoreKit/NSDate+OWS.h>
-#import <SignalServiceKit/SignalRecipient.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN

SignalServiceKit/src/Devices/OWSRecordTranscriptJob.m

@@ -3,20 +3,20 @@
 //
 
 #import "OWSRecordTranscriptJob.h"
-#import <SignalServiceKit/FunctionalUtil.h>
-#import <SignalServiceKit/HTTPUtils.h>
-#import <SignalServiceKit/OWSDisappearingMessagesJob.h>
-#import <SignalServiceKit/OWSIncomingSentMessageTranscript.h>
-#import <SignalServiceKit/OWSReceiptManager.h>
-#import <SignalServiceKit/OWSUnknownProtocolVersionMessage.h>
-#import <SignalServiceKit/SSKEnvironment.h>
+#import "FunctionalUtil.h"
+#import "HTTPUtils.h"
+#import "OWSDisappearingMessagesJob.h"
+#import "OWSIncomingSentMessageTranscript.h"
+#import "OWSReceiptManager.h"
+#import "OWSUnknownProtocolVersionMessage.h"
+#import "SSKEnvironment.h"
+#import "TSAttachmentPointer.h"
+#import "TSGroupThread.h"
+#import "TSInfoMessage.h"
+#import "TSOutgoingMessage.h"
+#import "TSQuotedMessage.h"
+#import "TSThread.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSAttachmentPointer.h>
-#import <SignalServiceKit/TSGroupThread.h>
-#import <SignalServiceKit/TSInfoMessage.h>
-#import <SignalServiceKit/TSOutgoingMessage.h>
-#import <SignalServiceKit/TSQuotedMessage.h>
-#import <SignalServiceKit/TSThread.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

SignalServiceKit/src/Devices/OWSStickerPackSyncMessage.m

@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSStickerPackSyncMessage.h>
+#import "OWSStickerPackSyncMessage.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN

SignalServiceKit/src/Devices/OWSVerificationStateSyncMessage.m

@@ -2,9 +2,9 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "OWSVerificationStateSyncMessage.h"
+#import "OWSIdentityManager.h"
 #import <SignalCoreKit/Cryptography.h>
-#import <SignalServiceKit/OWSIdentityManager.h>
-#import <SignalServiceKit/OWSVerificationStateSyncMessage.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN

SignalServiceKit/src/Devices/OWSViewOnceMessageReadSyncMessage.m

@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSViewOnceMessageReadSyncMessage.h>
+#import "OWSViewOnceMessageReadSyncMessage.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN

SignalServiceKit/src/Devices/OWSViewedReceiptsForLinkedDevicesMessage.m

@@ -3,7 +3,7 @@
 //
 
 #import "OWSViewedReceiptsForLinkedDevicesMessage.h"
-#import <SignalServiceKit/OWSLinkedDeviceReadReceipt.h>
+#import "OWSLinkedDeviceReadReceipt.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN

SignalServiceKit/src/Messages/Attachments/TSAttachment.m

@@ -3,12 +3,12 @@
 //
 
 #import "TSAttachment.h"
+#import "MIMETypeUtil.h"
+#import "TSAttachmentPointer.h"
+#import "TSMessage.h"
 #import <SignalCoreKit/NSString+OWS.h>
 #import <SignalCoreKit/iOSVersions.h>
-#import <SignalServiceKit/MIMETypeUtil.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSAttachmentPointer.h>
-#import <SignalServiceKit/TSMessage.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

SignalServiceKit/src/Messages/Attachments/TSAttachmentPointer.m

@@ -2,11 +2,11 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/MimeTypeUtil.h>
-#import <SignalServiceKit/OWSBackupFragment.h>
+#import "TSAttachmentPointer.h"
+#import "MIMETypeUtil.h"
+#import "OWSBackupFragment.h"
+#import "TSAttachmentStream.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSAttachmentPointer.h>
-#import <SignalServiceKit/TSAttachmentStream.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.m

@@ -3,15 +3,15 @@
 //
 
 #import "TSAttachmentStream.h"
+#import "MIMETypeUtil.h"
 #import "NSData+Image.h"
+#import "OWSError.h"
+#import "OWSFileSystem.h"
+#import "TSAttachmentPointer.h"
+#import "UIImage+OWS.h"
 #import <AVFoundation/AVFoundation.h>
 #import <SignalCoreKit/Threading.h>
-#import <SignalServiceKit/MIMETypeUtil.h>
-#import <SignalServiceKit/OWSError.h>
-#import <SignalServiceKit/OWSFileSystem.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSAttachmentPointer.h>
-#import <SignalServiceKit/UIImage+OWS.h>
 #import <YYImage/YYImage.h>
 
 NS_ASSUME_NONNULL_BEGIN

SignalServiceKit/src/Messages/DeviceSyncing/OWSIncomingSentMessageTranscript.m

@@ -2,16 +2,16 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSContact.h>
-#import <SignalServiceKit/OWSIncomingSentMessageTranscript.h>
-#import <SignalServiceKit/OWSMessageManager.h>
+#import "OWSIncomingSentMessageTranscript.h"
+#import "OWSContact.h"
+#import "OWSMessageManager.h"
+#import "TSContactThread.h"
+#import "TSGroupModel.h"
+#import "TSGroupThread.h"
+#import "TSOutgoingMessage.h"
+#import "TSQuotedMessage.h"
+#import "TSThread.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSContactThread.h>
-#import <SignalServiceKit/TSGroupModel.h>
-#import <SignalServiceKit/TSGroupThread.h>
-#import <SignalServiceKit/TSOutgoingMessage.h>
-#import <SignalServiceKit/TSQuotedMessage.h>
-#import <SignalServiceKit/TSThread.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSentMessageTranscript.m

@@ -2,10 +2,10 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSOutgoingSentMessageTranscript.h>
+#import "OWSOutgoingSentMessageTranscript.h"
+#import "TSOutgoingMessage.h"
+#import "TSThread.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSOutgoingMessage.h>
-#import <SignalServiceKit/TSThread.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSyncMessage.m

@@ -3,9 +3,9 @@
 //
 
 #import "OWSOutgoingSyncMessage.h"
+#import "ProtoUtils.h"
 #import <SignalCoreKit/Cryptography.h>
 #import <SignalCoreKit/NSDate+OWS.h>
-#import <SignalServiceKit/ProtoUtils.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN

SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncConfigurationMessage.m

@@ -2,8 +2,8 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSProvisioningMessage.h>
-#import <SignalServiceKit/OWSSyncConfigurationMessage.h>
+#import "OWSSyncConfigurationMessage.h"
+#import "OWSProvisioningMessage.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN

SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncContactsMessage.m

@@ -2,21 +2,21 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "OWSSyncContactsMessage.h"
+#import "Contact.h"
+#import "ContactsManagerProtocol.h"
+#import "OWSContactsOutputStream.h"
+#import "OWSIdentityManager.h"
+#import "ProfileManagerProtocol.h"
+#import "SSKEnvironment.h"
+#import "SignalAccount.h"
+#import "TSAccountManager.h"
+#import "TSAttachment.h"
+#import "TSAttachmentStream.h"
+#import "TSContactThread.h"
 #import <Contacts/Contacts.h>
 #import <SignalCoreKit/NSDate+OWS.h>
-#import <SignalServiceKit/Contact.h>
-#import <SignalServiceKit/ContactsManagerProtocol.h>
-#import <SignalServiceKit/OWSContactsOutputStream.h>
-#import <SignalServiceKit/OWSIdentityManager.h>
-#import <SignalServiceKit/OWSSyncContactsMessage.h>
-#import <SignalServiceKit/ProfileManagerProtocol.h>
-#import <SignalServiceKit/SSKEnvironment.h>
-#import <SignalServiceKit/SignalAccount.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSAccountManager.h>
-#import <SignalServiceKit/TSAttachment.h>
-#import <SignalServiceKit/TSAttachmentStream.h>
-#import <SignalServiceKit/TSContactThread.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncFetchLatestMessage.m

@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSSyncFetchLatestMessage.h>
+#import "OWSSyncFetchLatestMessage.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN

SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncGroupsMessage.m

@@ -2,15 +2,15 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSSyncGroupsMessage.h>
+#import "OWSSyncGroupsMessage.h"
+#import "OWSGroupsOutputStream.h"
+#import "TSAttachment.h"
+#import "TSAttachmentStream.h"
+#import "TSContactThread.h"
+#import "TSGroupModel.h"
+#import "TSGroupThread.h"
 #import <SignalCoreKit/NSDate+OWS.h>
-#import <SignalServiceKit/OWSGroupsOutputStream.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSAttachment.h>
-#import <SignalServiceKit/TSAttachmentStream.h>
-#import <SignalServiceKit/TSContactThread.h>
-#import <SignalServiceKit/TSGroupModel.h>
-#import <SignalServiceKit/TSGroupThread.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncKeysMessage.m

@@ -2,8 +2,8 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSProvisioningMessage.h>
-#import <SignalServiceKit/OWSSyncKeysMessage.h>
+#import "OWSSyncKeysMessage.h"
+#import "OWSProvisioningMessage.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN

SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncMessageRequestResponseMessage.m

@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSSyncMessageRequestResponseMessage.h>
+#import "OWSSyncMessageRequestResponseMessage.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN

SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncRequestMessage.m

@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSSyncRequestMessage.h>
+#import "OWSSyncRequestMessage.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN

SignalServiceKit/src/Messages/DeviceSyncing/OutgoingPaymentSyncMessage.m

@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OutgoingPaymentSyncMessage.h>
+#import "OutgoingPaymentSyncMessage.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN

SignalServiceKit/src/Messages/Interactions/OWSContact.m

@@ -2,17 +2,17 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "OWSContact.h"
+#import "Contact.h"
+#import "MIMETypeUtil.h"
 #import "OWSContact+Private.h"
+#import "PhoneNumber.h"
+#import "TSAttachment.h"
+#import "TSAttachmentPointer.h"
+#import "TSAttachmentStream.h"
 #import <Contacts/Contacts.h>
 #import <SignalCoreKit/NSString+OWS.h>
-#import <SignalServiceKit/Contact.h>
-#import <SignalServiceKit/MimeTypeUtil.h>
-#import <SignalServiceKit/OWSContact.h>
-#import <SignalServiceKit/PhoneNumber.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSAttachment.h>
-#import <SignalServiceKit/TSAttachmentPointer.h>
-#import <SignalServiceKit/TSAttachmentStream.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

SignalServiceKit/src/Messages/Interactions/OWSDisappearingConfigurationUpdateInfoMessage.m

@@ -2,9 +2,9 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "OWSDisappearingConfigurationUpdateInfoMessage.h"
+#import "OWSDisappearingMessagesConfiguration.h"
 #import <SignalCoreKit/NSString+OWS.h>
-#import <SignalServiceKit/OWSDisappearingConfigurationUpdateInfoMessage.h>
-#import <SignalServiceKit/OWSDisappearingMessagesConfiguration.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN

SignalServiceKit/src/Messages/Interactions/OWSDisappearingMessagesConfigurationMessage.m

@@ -2,9 +2,9 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "OWSDisappearingMessagesConfigurationMessage.h"
+#import "OWSDisappearingMessagesConfiguration.h"
 #import <SignalCoreKit/NSDate+OWS.h>
-#import <SignalServiceKit/OWSDisappearingMessagesConfiguration.h>
-#import <SignalServiceKit/OWSDisappearingMessagesConfigurationMessage.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN

SignalServiceKit/src/Messages/Interactions/OWSEndSessionMessage.m

@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSEndSessionMessage.h>
+#import "OWSEndSessionMessage.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN

SignalServiceKit/src/Messages/Interactions/OWSVerificationStateChangeMessage.m

@@ -2,8 +2,8 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSDisappearingMessagesConfiguration.h>
-#import <SignalServiceKit/OWSVerificationStateChangeMessage.h>
+#import "OWSVerificationStateChangeMessage.h"
+#import "OWSDisappearingMessagesConfiguration.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN

SignalServiceKit/src/Messages/Interactions/TSErrorMessage.m

@@ -3,12 +3,12 @@
 //
 
 #import "TSErrorMessage.h"
+#import "ContactsManagerProtocol.h"
+#import "OWSMessageManager.h"
+#import "SSKEnvironment.h"
+#import "TSContactThread.h"
 #import <SignalCoreKit/NSDate+OWS.h>
-#import <SignalServiceKit/ContactsManagerProtocol.h>
-#import <SignalServiceKit/OWSMessageManager.h>
-#import <SignalServiceKit/SSKEnvironment.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSContactThread.h>
 
 NS_ASSUME_NONNULL_BEGIN