From d12a582ee3ecce8fc21942a72282735873e1d487 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 30 Mar 2017 22:12:25 -0400 Subject: [PATCH] Rename source directories with a space in their name. // FREEBIE --- Signal.xcodeproj/project.pbxproj | 512 ++++++++---------- .../AboutTableViewController.h | 0 .../AboutTableViewController.m | 0 .../AdvancedSettingsTableViewController.h | 0 .../AdvancedSettingsTableViewController.m | 0 .../AttachmentApprovalViewController.swift | 0 .../AttachmentSharing.h | 0 .../AttachmentSharing.m | 0 .../CallViewController.swift | 0 .../CodeVerificationViewController.h | 0 .../CodeVerificationViewController.m | 0 .../ContactsPicker.swift | 0 .../ContactsPicker.xib | 0 .../CountryCodeViewController.h | 0 .../CountryCodeViewController.m | 0 .../DebugUITableViewController.h | 0 .../DebugUITableViewController.m | 0 ...ExperienceUpgradesPageViewController.swift | 0 .../FingerprintViewController.h | 0 .../FingerprintViewController.m | 0 .../FullImageViewController.h | 0 .../FullImageViewController.m | 0 .../InboxTableViewCell.h | 0 .../InboxTableViewCell.m | 0 .../InboxTableViewCell.xib | 0 .../InviteFlow.swift | 0 .../LockInteractionController.h | 0 .../LockInteractionController.m | 0 .../MessageComposeTableViewController.h | 0 .../MessageComposeTableViewController.m | 0 .../MessagesViewController.h | 0 .../MessagesViewController.m | 0 .../MessagesViewController.xib | 0 .../NewGroupViewController.h | 0 .../NewGroupViewController.m | 0 ...otificationSettingsOptionsViewController.h | 0 ...otificationSettingsOptionsViewController.m | 0 .../NotificationSettingsViewController.h | 0 .../NotificationSettingsViewController.m | 0 ...SConversationSettingsTableViewController.h | 0 ...SConversationSettingsTableViewController.m | 0 .../OWSLinkDeviceViewController.h | 0 .../OWSLinkDeviceViewController.m | 0 .../OWSLinkedDevicesTableViewController.h | 0 .../OWSLinkedDevicesTableViewController.m | 0 .../OWSMessagesToolbarContentView.xib | 0 .../OWSQRCodeScanningViewController.h | 0 .../OWSQRCodeScanningViewController.m | 0 .../OversizeTextMessageViewController.swift | 0 .../PrivacySettingsTableViewController.h | 0 .../PrivacySettingsTableViewController.m | 0 .../RegistrationViewController.h | 0 .../RegistrationViewController.m | 0 .../SettingsTableViewController.h | 0 .../SettingsTableViewController.m | 0 .../ShowGroupMembersViewController.h | 0 .../ShowGroupMembersViewController.m | 0 .../SignalAttachment.swift | 0 .../SignalsNavigationController.h | 0 .../SignalsNavigationController.m | 0 .../SignalsViewController.h | 0 .../SignalsViewController.m | 0 .../GroupContactsResult.h | 0 .../GroupContactsResult.m | 0 .../TSMessageAdapters/TSMessageAdapterTest.m | 0 65 files changed, 240 insertions(+), 272 deletions(-) rename Signal/src/{view controllers => ViewControllers}/AboutTableViewController.h (100%) rename Signal/src/{view controllers => ViewControllers}/AboutTableViewController.m (100%) rename Signal/src/{view controllers => ViewControllers}/AdvancedSettingsTableViewController.h (100%) rename Signal/src/{view controllers => ViewControllers}/AdvancedSettingsTableViewController.m (100%) rename Signal/src/{view controllers => ViewControllers}/AttachmentApprovalViewController.swift (100%) rename Signal/src/{view controllers => ViewControllers}/AttachmentSharing.h (100%) rename Signal/src/{view controllers => ViewControllers}/AttachmentSharing.m (100%) rename Signal/src/{view controllers => ViewControllers}/CallViewController.swift (100%) rename Signal/src/{view controllers => ViewControllers}/CodeVerificationViewController.h (100%) rename Signal/src/{view controllers => ViewControllers}/CodeVerificationViewController.m (100%) rename Signal/src/{view controllers => ViewControllers}/ContactsPicker.swift (100%) rename Signal/src/{view controllers => ViewControllers}/ContactsPicker.xib (100%) rename Signal/src/{view controllers => ViewControllers}/CountryCodeViewController.h (100%) rename Signal/src/{view controllers => ViewControllers}/CountryCodeViewController.m (100%) rename Signal/src/{view controllers => ViewControllers}/DebugUITableViewController.h (100%) rename Signal/src/{view controllers => ViewControllers}/DebugUITableViewController.m (100%) rename Signal/src/{view controllers => ViewControllers}/ExperienceUpgradesPageViewController.swift (100%) rename Signal/src/{view controllers => ViewControllers}/FingerprintViewController.h (100%) rename Signal/src/{view controllers => ViewControllers}/FingerprintViewController.m (100%) rename Signal/src/{view controllers => ViewControllers}/FullImageViewController.h (100%) rename Signal/src/{view controllers => ViewControllers}/FullImageViewController.m (100%) rename Signal/src/{view controllers => ViewControllers}/InboxTableViewCell.h (100%) rename Signal/src/{view controllers => ViewControllers}/InboxTableViewCell.m (100%) rename Signal/src/{view controllers => ViewControllers}/InboxTableViewCell.xib (100%) rename Signal/src/{view controllers => ViewControllers}/InviteFlow.swift (100%) rename Signal/src/{view controllers => ViewControllers}/LockInteractionController.h (100%) rename Signal/src/{view controllers => ViewControllers}/LockInteractionController.m (100%) rename Signal/src/{view controllers => ViewControllers}/MessageComposeTableViewController.h (100%) rename Signal/src/{view controllers => ViewControllers}/MessageComposeTableViewController.m (100%) rename Signal/src/{view controllers => ViewControllers}/MessagesViewController.h (100%) rename Signal/src/{view controllers => ViewControllers}/MessagesViewController.m (100%) rename Signal/src/{view controllers => ViewControllers}/MessagesViewController.xib (100%) rename Signal/src/{view controllers => ViewControllers}/NewGroupViewController.h (100%) rename Signal/src/{view controllers => ViewControllers}/NewGroupViewController.m (100%) rename Signal/src/{view controllers => ViewControllers}/NotificationSettingsOptionsViewController.h (100%) rename Signal/src/{view controllers => ViewControllers}/NotificationSettingsOptionsViewController.m (100%) rename Signal/src/{view controllers => ViewControllers}/NotificationSettingsViewController.h (100%) rename Signal/src/{view controllers => ViewControllers}/NotificationSettingsViewController.m (100%) rename Signal/src/{view controllers => ViewControllers}/OWSConversationSettingsTableViewController.h (100%) rename Signal/src/{view controllers => ViewControllers}/OWSConversationSettingsTableViewController.m (100%) rename Signal/src/{view controllers => ViewControllers}/OWSLinkDeviceViewController.h (100%) rename Signal/src/{view controllers => ViewControllers}/OWSLinkDeviceViewController.m (100%) rename Signal/src/{view controllers => ViewControllers}/OWSLinkedDevicesTableViewController.h (100%) rename Signal/src/{view controllers => ViewControllers}/OWSLinkedDevicesTableViewController.m (100%) rename Signal/src/{view controllers => ViewControllers}/OWSMessagesToolbarContentView.xib (100%) rename Signal/src/{view controllers => ViewControllers}/OWSQRCodeScanningViewController.h (100%) rename Signal/src/{view controllers => ViewControllers}/OWSQRCodeScanningViewController.m (100%) rename Signal/src/{view controllers => ViewControllers}/OversizeTextMessageViewController.swift (100%) rename Signal/src/{view controllers => ViewControllers}/PrivacySettingsTableViewController.h (100%) rename Signal/src/{view controllers => ViewControllers}/PrivacySettingsTableViewController.m (100%) rename Signal/src/{view controllers => ViewControllers}/RegistrationViewController.h (100%) rename Signal/src/{view controllers => ViewControllers}/RegistrationViewController.m (100%) rename Signal/src/{view controllers => ViewControllers}/SettingsTableViewController.h (100%) rename Signal/src/{view controllers => ViewControllers}/SettingsTableViewController.m (100%) rename Signal/src/{view controllers => ViewControllers}/ShowGroupMembersViewController.h (100%) rename Signal/src/{view controllers => ViewControllers}/ShowGroupMembersViewController.m (100%) rename Signal/src/{view controllers => ViewControllers}/SignalAttachment.swift (100%) rename Signal/src/{view controllers => ViewControllers}/SignalsNavigationController.h (100%) rename Signal/src/{view controllers => ViewControllers}/SignalsNavigationController.m (100%) rename Signal/src/{view controllers => ViewControllers}/SignalsViewController.h (100%) rename Signal/src/{view controllers => ViewControllers}/SignalsViewController.m (100%) rename Signal/src/{phone/signaling/number directory => contact}/GroupContactsResult.h (100%) rename Signal/src/{phone/signaling/number directory => contact}/GroupContactsResult.m (100%) rename Signal/test/{view controllers => ViewControllers}/Signals/TSMessageAdapters/TSMessageAdapterTest.m (100%) diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index b29d48ef9..799fab16a 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -7,7 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 340757C21E5602D6001F15DD /* AttachmentSharing.m in Sources */ = {isa = PBXBuildFile; fileRef = 340757C11E5602D6001F15DD /* AttachmentSharing.m */; }; 341BB7491DB727EE001E2975 /* JSQMediaItem+OWS.m in Sources */ = {isa = PBXBuildFile; fileRef = 341BB7481DB727EE001E2975 /* JSQMediaItem+OWS.m */; }; 34330A5A1E7875FB00DF2FB9 /* fontawesome-webfont.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 34330A591E7875FB00DF2FB9 /* fontawesome-webfont.ttf */; }; 34330A5C1E787A9800DF2FB9 /* dripicons-v2.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 34330A5B1E787A9800DF2FB9 /* dripicons-v2.ttf */; }; @@ -18,30 +17,58 @@ 34535D821E256BE9008A4747 /* UIView+OWS.m in Sources */ = {isa = PBXBuildFile; fileRef = 34535D811E256BE9008A4747 /* UIView+OWS.m */; }; 345671011E89A5F1006EE662 /* ThreadUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 345671001E89A5F1006EE662 /* ThreadUtil.m */; }; 3456710A1E8A9F5D006EE662 /* TSGenericAttachmentAdapter.m in Sources */ = {isa = PBXBuildFile; fileRef = 345671091E8A9F5D006EE662 /* TSGenericAttachmentAdapter.m */; }; - 345671231E8B1618006EE662 /* OversizeTextMessageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 345671221E8B1618006EE662 /* OversizeTextMessageViewController.swift */; }; - 34802DD71E899CFB0032EA1D /* DebugUITableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34802DD61E899CFB0032EA1D /* DebugUITableViewController.m */; }; - 348A08421E6A044E0057E290 /* MessagesViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 348A08411E6A044E0057E290 /* MessagesViewController.xib */; }; - 348A08441E6A1D2C0057E290 /* OWSMessagesToolbarContentView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 348A08431E6A1D2C0057E290 /* OWSMessagesToolbarContentView.xib */; }; - 348A08511E6C73490057E290 /* AttachmentApprovalViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 348A08501E6C73490057E290 /* AttachmentApprovalViewController.swift */; }; - 348A08531E6C75590057E290 /* SignalAttachment.swift in Sources */ = {isa = PBXBuildFile; fileRef = 348A08521E6C75590057E290 /* SignalAttachment.swift */; }; + 34B3F8321E8DF11D0035BE1A /* GroupContactsResult.m in Sources */ = {isa = PBXBuildFile; fileRef = 34B3F8311E8DF11D0035BE1A /* GroupContactsResult.m */; }; + 34B3F8711E8DF1700035BE1A /* AboutTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34B3F8351E8DF1700035BE1A /* AboutTableViewController.m */; }; + 34B3F8721E8DF1700035BE1A /* AdvancedSettingsTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34B3F8371E8DF1700035BE1A /* AdvancedSettingsTableViewController.m */; }; + 34B3F8731E8DF1700035BE1A /* AttachmentApprovalViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34B3F8381E8DF1700035BE1A /* AttachmentApprovalViewController.swift */; }; + 34B3F8741E8DF1700035BE1A /* AttachmentSharing.m in Sources */ = {isa = PBXBuildFile; fileRef = 34B3F83A1E8DF1700035BE1A /* AttachmentSharing.m */; }; + 34B3F8751E8DF1700035BE1A /* CallViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34B3F83B1E8DF1700035BE1A /* CallViewController.swift */; }; + 34B3F8761E8DF1700035BE1A /* CodeVerificationViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34B3F83D1E8DF1700035BE1A /* CodeVerificationViewController.m */; }; + 34B3F8771E8DF1700035BE1A /* ContactsPicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34B3F83E1E8DF1700035BE1A /* ContactsPicker.swift */; }; + 34B3F8781E8DF1700035BE1A /* ContactsPicker.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34B3F83F1E8DF1700035BE1A /* ContactsPicker.xib */; }; + 34B3F8791E8DF1700035BE1A /* CountryCodeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34B3F8411E8DF1700035BE1A /* CountryCodeViewController.m */; }; + 34B3F87A1E8DF1700035BE1A /* DebugUITableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34B3F8431E8DF1700035BE1A /* DebugUITableViewController.m */; }; + 34B3F87B1E8DF1700035BE1A /* ExperienceUpgradesPageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34B3F8441E8DF1700035BE1A /* ExperienceUpgradesPageViewController.swift */; }; + 34B3F87C1E8DF1700035BE1A /* FingerprintViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34B3F8461E8DF1700035BE1A /* FingerprintViewController.m */; }; + 34B3F87D1E8DF1700035BE1A /* FullImageViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34B3F8481E8DF1700035BE1A /* FullImageViewController.m */; }; + 34B3F87E1E8DF1700035BE1A /* InboxTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 34B3F84A1E8DF1700035BE1A /* InboxTableViewCell.m */; }; + 34B3F87F1E8DF1700035BE1A /* InboxTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34B3F84B1E8DF1700035BE1A /* InboxTableViewCell.xib */; }; + 34B3F8801E8DF1700035BE1A /* InviteFlow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34B3F84C1E8DF1700035BE1A /* InviteFlow.swift */; }; + 34B3F8811E8DF1700035BE1A /* LockInteractionController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34B3F84E1E8DF1700035BE1A /* LockInteractionController.m */; }; + 34B3F8821E8DF1700035BE1A /* MessageComposeTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34B3F8501E8DF1700035BE1A /* MessageComposeTableViewController.m */; }; + 34B3F8831E8DF1700035BE1A /* MessagesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34B3F8521E8DF1700035BE1A /* MessagesViewController.m */; }; + 34B3F8841E8DF1700035BE1A /* MessagesViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34B3F8531E8DF1700035BE1A /* MessagesViewController.xib */; }; + 34B3F8851E8DF1700035BE1A /* NewGroupViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34B3F8551E8DF1700035BE1A /* NewGroupViewController.m */; }; + 34B3F8861E8DF1700035BE1A /* NotificationSettingsOptionsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34B3F8571E8DF1700035BE1A /* NotificationSettingsOptionsViewController.m */; }; + 34B3F8871E8DF1700035BE1A /* NotificationSettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34B3F8591E8DF1700035BE1A /* NotificationSettingsViewController.m */; }; + 34B3F8881E8DF1700035BE1A /* OversizeTextMessageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34B3F85A1E8DF1700035BE1A /* OversizeTextMessageViewController.swift */; }; + 34B3F8891E8DF1700035BE1A /* OWSConversationSettingsTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34B3F85C1E8DF1700035BE1A /* OWSConversationSettingsTableViewController.m */; }; + 34B3F88A1E8DF1700035BE1A /* OWSLinkDeviceViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34B3F85E1E8DF1700035BE1A /* OWSLinkDeviceViewController.m */; }; + 34B3F88B1E8DF1700035BE1A /* OWSLinkedDevicesTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34B3F8601E8DF1700035BE1A /* OWSLinkedDevicesTableViewController.m */; }; + 34B3F88C1E8DF1700035BE1A /* OWSMessagesToolbarContentView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34B3F8611E8DF1700035BE1A /* OWSMessagesToolbarContentView.xib */; }; + 34B3F88D1E8DF1700035BE1A /* OWSQRCodeScanningViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34B3F8631E8DF1700035BE1A /* OWSQRCodeScanningViewController.m */; }; + 34B3F88E1E8DF1700035BE1A /* PrivacySettingsTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34B3F8651E8DF1700035BE1A /* PrivacySettingsTableViewController.m */; }; + 34B3F88F1E8DF1710035BE1A /* RegistrationViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34B3F8671E8DF1700035BE1A /* RegistrationViewController.m */; }; + 34B3F8901E8DF1710035BE1A /* SettingsTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34B3F8691E8DF1700035BE1A /* SettingsTableViewController.m */; }; + 34B3F8911E8DF1710035BE1A /* ShowGroupMembersViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34B3F86B1E8DF1700035BE1A /* ShowGroupMembersViewController.m */; }; + 34B3F8921E8DF1710035BE1A /* SignalAttachment.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34B3F86C1E8DF1700035BE1A /* SignalAttachment.swift */; }; + 34B3F8931E8DF1710035BE1A /* SignalsNavigationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34B3F86E1E8DF1700035BE1A /* SignalsNavigationController.m */; }; + 34B3F8941E8DF1710035BE1A /* SignalsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34B3F8701E8DF1700035BE1A /* SignalsViewController.m */; }; + 34B3F8991E8DF1B90035BE1A /* TSMessageAdapterTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 34B3F8981E8DF1B90035BE1A /* TSMessageAdapterTest.m */; }; 34FD93701E3BD43A00109093 /* OWSAnyTouchGestureRecognizer.m in Sources */ = {isa = PBXBuildFile; fileRef = 34FD936F1E3BD43A00109093 /* OWSAnyTouchGestureRecognizer.m */; }; 450573FE1E78A06D00615BB4 /* OWS103EnableVideoCalling.m in Sources */ = {isa = PBXBuildFile; fileRef = 450573FD1E78A06D00615BB4 /* OWS103EnableVideoCalling.m */; }; 4505C2BF1E648EA300CEBF41 /* ExperienceUpgrade.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4505C2BE1E648EA300CEBF41 /* ExperienceUpgrade.swift */; }; 4505C2C01E648EA300CEBF41 /* ExperienceUpgrade.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4505C2BE1E648EA300CEBF41 /* ExperienceUpgrade.swift */; }; 4505C2C21E648F7A00CEBF41 /* ExperienceUpgradeFinder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4505C2C11E648F7A00CEBF41 /* ExperienceUpgradeFinder.swift */; }; 4505C2C31E648F7A00CEBF41 /* ExperienceUpgradeFinder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4505C2C11E648F7A00CEBF41 /* ExperienceUpgradeFinder.swift */; }; - 4505C2C51E64977D00CEBF41 /* ExperienceUpgradesPageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4505C2C41E64977D00CEBF41 /* ExperienceUpgradesPageViewController.swift */; }; - 4505C2C61E64977D00CEBF41 /* ExperienceUpgradesPageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4505C2C41E64977D00CEBF41 /* ExperienceUpgradesPageViewController.swift */; }; 450873C31D9D5149006B54F2 /* OWSExpirationTimerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 450873C21D9D5149006B54F2 /* OWSExpirationTimerView.m */; }; 450873C41D9D5149006B54F2 /* OWSExpirationTimerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 450873C21D9D5149006B54F2 /* OWSExpirationTimerView.m */; }; 450873C71D9D867B006B54F2 /* OWSIncomingMessageCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 450873C61D9D867B006B54F2 /* OWSIncomingMessageCollectionViewCell.m */; }; 450873C81D9D867B006B54F2 /* OWSIncomingMessageCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 450873C61D9D867B006B54F2 /* OWSIncomingMessageCollectionViewCell.m */; }; 4509E79A1DD653700025A59F /* WebRTC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4509E7991DD653700025A59F /* WebRTC.framework */; }; - 4509E79C1DD6545B0025A59F /* CallViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4509E79B1DD6545B0025A59F /* CallViewController.swift */; }; 450DF2051E0D74AC003D14BE /* Platform.swift in Sources */ = {isa = PBXBuildFile; fileRef = 450DF2041E0D74AC003D14BE /* Platform.swift */; }; 450DF2091E0DD2C6003D14BE /* UserNotificationsAdaptee.swift in Sources */ = {isa = PBXBuildFile; fileRef = 450DF2081E0DD2C6003D14BE /* UserNotificationsAdaptee.swift */; }; 4516E3FF1DD2193B00DC4206 /* OWS101ExistingUsersBlockOnIdentityChange.m in Sources */ = {isa = PBXBuildFile; fileRef = 4516E3FE1DD2193B00DC4206 /* OWS101ExistingUsersBlockOnIdentityChange.m */; }; - 451764271DE939F300EDB8B9 /* ContactsPicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 451764261DE939F300EDB8B9 /* ContactsPicker.swift */; }; 4517642A1DE939FD00EDB8B9 /* ContactCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 451764281DE939FD00EDB8B9 /* ContactCell.xib */; }; 4517642B1DE939FD00EDB8B9 /* ContactCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 451764291DE939FD00EDB8B9 /* ContactCell.swift */; }; 451A13B11E13DED2000A50FD /* CallNotificationsAdapter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 451A13B01E13DED2000A50FD /* CallNotificationsAdapter.swift */; }; @@ -53,8 +80,6 @@ 452C468F1E427E200087B011 /* OutboundCallInitiator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 452C468E1E427E200087B011 /* OutboundCallInitiator.swift */; }; 452C46901E427E200087B011 /* OutboundCallInitiator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 452C468E1E427E200087B011 /* OutboundCallInitiator.swift */; }; 452D1EE81DCA90D100A57EC4 /* MesssagesBubblesSizeCalculatorTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 452D1EE71DCA90D100A57EC4 /* MesssagesBubblesSizeCalculatorTest.swift */; }; - 452E3C8E1D935C77002A45B0 /* OWSConversationSettingsTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 452E3C8D1D935C77002A45B0 /* OWSConversationSettingsTableViewController.m */; }; - 452E3C8F1D935C77002A45B0 /* OWSConversationSettingsTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 452E3C8D1D935C77002A45B0 /* OWSConversationSettingsTableViewController.m */; }; 452ECA4D1E087E7200E2F016 /* MessageFetcherJob.swift in Sources */ = {isa = PBXBuildFile; fileRef = 452ECA4C1E087E7200E2F016 /* MessageFetcherJob.swift */; }; 452ECA4E1E087E7200E2F016 /* MessageFetcherJob.swift in Sources */ = {isa = PBXBuildFile; fileRef = 452ECA4C1E087E7200E2F016 /* MessageFetcherJob.swift */; }; 4531C9C41DD8E6D800F08304 /* JSQMessagesCollectionViewCell+OWS.m in Sources */ = {isa = PBXBuildFile; fileRef = 4531C9C31DD8E6D800F08304 /* JSQMessagesCollectionViewCell+OWS.m */; }; @@ -63,7 +88,6 @@ 453D28BA1D332DB100D523F0 /* OWSMessagesBubblesSizeCalculator.m in Sources */ = {isa = PBXBuildFile; fileRef = 453D28B91D332DB100D523F0 /* OWSMessagesBubblesSizeCalculator.m */; }; 453D28BB1D332DB100D523F0 /* OWSMessagesBubblesSizeCalculator.m in Sources */ = {isa = PBXBuildFile; fileRef = 453D28B91D332DB100D523F0 /* OWSMessagesBubblesSizeCalculator.m */; }; 45464DBC1DFA041F001D3FD6 /* DataChannelMessage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45464DBB1DFA041F001D3FD6 /* DataChannelMessage.swift */; }; - 45514DE21DDFA183003EFF90 /* InviteFlow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45514DE11DDFA183003EFF90 /* InviteFlow.swift */; }; 45666EC61D99483D008FE134 /* OWSAvatarBuilder.m in Sources */ = {isa = PBXBuildFile; fileRef = 45666EC51D99483D008FE134 /* OWSAvatarBuilder.m */; }; 45666EC91D994C0D008FE134 /* OWSGroupAvatarBuilder.m in Sources */ = {isa = PBXBuildFile; fileRef = 45666EC81D994C0D008FE134 /* OWSGroupAvatarBuilder.m */; }; 45666F561D9B2827008FE134 /* OWSScrubbingLogFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 45666F551D9B2827008FE134 /* OWSScrubbingLogFormatter.m */; }; @@ -93,12 +117,9 @@ 458967111DC117CC00E9DD21 /* AccountManagerTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 458967101DC117CC00E9DD21 /* AccountManagerTest.swift */; }; 458DE9D61DEE3FD00071BB03 /* PeerConnectionClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = 458DE9D51DEE3FD00071BB03 /* PeerConnectionClient.swift */; }; 458DE9D91DEE7B360071BB03 /* OWSWebRTCDataProtos.pb.m in Sources */ = {isa = PBXBuildFile; fileRef = 458DE9D81DEE7B360071BB03 /* OWSWebRTCDataProtos.pb.m */; }; - 458E38311D6682450094BD24 /* OWSQRCodeScanningViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 458E38301D6682450094BD24 /* OWSQRCodeScanningViewController.m */; }; - 458E38341D66873D0094BD24 /* OWSLinkDeviceViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 458E38331D66873D0094BD24 /* OWSLinkDeviceViewController.m */; }; 458E38371D668EBF0094BD24 /* OWSDeviceProvisioningURLParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 458E38361D668EBF0094BD24 /* OWSDeviceProvisioningURLParser.m */; }; 458E383A1D6699FA0094BD24 /* OWSDeviceProvisioningURLParserTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 458E38391D6699FA0094BD24 /* OWSDeviceProvisioningURLParserTest.m */; }; 459311FC1D75C948008DD4F0 /* OWSDeviceTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 459311FB1D75C948008DD4F0 /* OWSDeviceTableViewCell.m */; }; - 459C3F0D1C9B3A1B003ACF51 /* TSMessageAdapterTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 459C3F0C1C9B3A1B003ACF51 /* TSMessageAdapterTest.m */; }; 45AE48511E0732D6004D96C2 /* TurnServerInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45AE48501E0732D6004D96C2 /* TurnServerInfo.swift */; }; 45AE48521E0732D6004D96C2 /* TurnServerInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45AE48501E0732D6004D96C2 /* TurnServerInfo.swift */; }; 45B201761DAECBFE00C461E0 /* HighlightableLabel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45B201751DAECBFE00C461E0 /* HighlightableLabel.swift */; }; @@ -137,7 +158,6 @@ 45E615161E8C590B0018AD52 /* DisplayableTextFilter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45E615151E8C590B0018AD52 /* DisplayableTextFilter.swift */; }; 45E615171E8C59100018AD52 /* DisplayableTextFilter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45E615151E8C590B0018AD52 /* DisplayableTextFilter.swift */; }; 45E7A6A81E71CA7E00D44FB5 /* DisplayableTextFilterTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45E7A6A61E71CA7E00D44FB5 /* DisplayableTextFilterTest.swift */; }; - 45EB32CF1D7465C900735B2E /* OWSLinkedDevicesTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 45EB32CE1D7465C900735B2E /* OWSLinkedDevicesTableViewController.m */; }; 45F170AC1E2F0351003FC1F2 /* CallAudioSession.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45F170AB1E2F0351003FC1F2 /* CallAudioSession.swift */; }; 45F170AD1E2F0351003FC1F2 /* CallAudioSession.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45F170AB1E2F0351003FC1F2 /* CallAudioSession.swift */; }; 45F170AF1E2F0393003FC1F2 /* CallAudioSessionTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45F170AE1E2F0393003FC1F2 /* CallAudioSessionTest.swift */; }; @@ -186,10 +206,8 @@ A1A018531805C60D00A052A6 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D221A091169C9E5E00537ABF /* CoreGraphics.framework */; }; A1C32D5017A06538000A904E /* AddressBookUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A1C32D4F17A06537000A904E /* AddressBookUI.framework */; }; A1C32D5117A06544000A904E /* AddressBook.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A1C32D4D17A0652C000A904E /* AddressBook.framework */; }; - A507A3B11A6C60E300BEED0D /* InboxTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = A507A3AF1A6C60E300BEED0D /* InboxTableViewCell.xib */; }; A5509ECA1A69AB8B00ABA4BC /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A5509EC91A69AB8B00ABA4BC /* Main.storyboard */; }; A5509ECD1A69B1D600ABA4BC /* CountryCodeTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = A5509ECC1A69B1D600ABA4BC /* CountryCodeTableViewCell.m */; }; - A5D0699B1A50E9CB004CB540 /* ShowGroupMembersViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A5D069991A50E9CB004CB540 /* ShowGroupMembersViewController.m */; }; A5E9D4BB1A65FAD800E4481C /* TSVideoAttachmentAdapter.m in Sources */ = {isa = PBXBuildFile; fileRef = A5E9D4B91A65FAD800E4481C /* TSVideoAttachmentAdapter.m */; }; AD41D7B51A6F6F0600241130 /* play_button.png in Resources */ = {isa = PBXBuildFile; fileRef = AD41D7B31A6F6F0600241130 /* play_button.png */; }; AD41D7B61A6F6F0600241130 /* play_button@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AD41D7B41A6F6F0600241130 /* play_button@2x.png */; }; @@ -228,7 +246,6 @@ B660F6DD1C29868000687D6E /* ObservableTest.m in Sources */ = {isa = PBXBuildFile; fileRef = B660F6AF1C29868000687D6E /* ObservableTest.m */; }; B660F6DF1C29868000687D6E /* QueueTest.m in Sources */ = {isa = PBXBuildFile; fileRef = B660F6B21C29868000687D6E /* QueueTest.m */; }; B660F6E01C29868000687D6E /* UtilTest.m in Sources */ = {isa = PBXBuildFile; fileRef = B660F6B41C29868000687D6E /* UtilTest.m */; }; - B660F7161C29988E00687D6E /* GroupContactsResult.m in Sources */ = {isa = PBXBuildFile; fileRef = B671B2451A93B238002BBD9D /* GroupContactsResult.m */; }; B660F7171C29988E00687D6E /* OWSContactsManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 76EB040918170B33006006FC /* OWSContactsManager.m */; }; B660F7181C29988E00687D6E /* CryptoTools.m in Sources */ = {isa = PBXBuildFile; fileRef = 7038632418F70C0700D4A43F /* CryptoTools.m */; }; B660F71B1C29988E00687D6E /* Environment.m in Sources */ = {isa = PBXBuildFile; fileRef = 76EB041318170B33006006FC /* Environment.m */; }; @@ -252,10 +269,7 @@ B660F7871C29988E00687D6E /* StringUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 76EB04F618170B33006006FC /* StringUtil.m */; }; B660F78A1C29988E00687D6E /* UIUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = B97940261832BD2400BD66CB /* UIUtil.m */; }; B660F78C1C29988E00687D6E /* UIDevice+TSHardwareVersion.m in Sources */ = {isa = PBXBuildFile; fileRef = FCC81A971A44558300DFEC7D /* UIDevice+TSHardwareVersion.m */; }; - B66B9F721AEA6D1100E2E609 /* NotificationSettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B66B9F711AEA6D1100E2E609 /* NotificationSettingsViewController.m */; }; - B66B9F7D1AEAF40500E2E609 /* NotificationSettingsOptionsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B66B9F7C1AEAF40500E2E609 /* NotificationSettingsOptionsViewController.m */; }; B66DBF4A19D5BBC8006EA940 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B66DBF4919D5BBC8006EA940 /* Images.xcassets */; }; - B671B2461A93B238002BBD9D /* GroupContactsResult.m in Sources */ = {isa = PBXBuildFile; fileRef = B671B2451A93B238002BBD9D /* GroupContactsResult.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 */; }; B68EF9BA1C0B1EBD009C3DCD /* FLAnimatedImage.m in Sources */ = {isa = PBXBuildFile; fileRef = B68EF9B71C0B1EBD009C3DCD /* FLAnimatedImage.m */; }; @@ -265,7 +279,6 @@ B6B1013C196D213F007E3930 /* SignalKeyingStorage.m in Sources */ = {isa = PBXBuildFile; fileRef = B6B1013B196D213F007E3930 /* SignalKeyingStorage.m */; }; B6B226971BE4B7D200860F4D /* ContactsUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B6B226961BE4B7D200860F4D /* ContactsUI.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; B6B9ECFC198B31BA00C620D3 /* PushManager.m in Sources */ = {isa = PBXBuildFile; fileRef = B6B9ECFB198B31BA00C620D3 /* PushManager.m */; }; - B6BADBE71B88D1AC0086A80D /* LockInteractionController.m in Sources */ = {isa = PBXBuildFile; fileRef = B6BADBE61B88D1AC0086A80D /* LockInteractionController.m */; }; B6C6AE551A305ED1006BAF8F /* redphone.cer in Resources */ = {isa = PBXBuildFile; fileRef = B6C6AE531A305ED1006BAF8F /* redphone.cer */; }; B6C93C4E199567AD00EDF894 /* DebugLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = B6C93C4D199567AD00EDF894 /* DebugLogger.m */; }; B6DA6B071B8A2F9A00CA6F98 /* AppStoreRating.m in Sources */ = {isa = PBXBuildFile; fileRef = B6DA6B061B8A2F9A00CA6F98 /* AppStoreRating.m */; }; @@ -273,7 +286,6 @@ B6FE7EB71ADD62FA00A6D22F /* PushKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B6FE7EB61ADD62FA00A6D22F /* PushKit.framework */; }; B90418E6183E9DD40038554A /* DateUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = B90418E5183E9DD40038554A /* DateUtil.m */; }; B97940271832BD2400BD66CB /* UIUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = B97940261832BD2400BD66CB /* UIUtil.m */; }; - B97CBFA818860EA3008E0DE9 /* CountryCodeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B97CBFA618860EA3008E0DE9 /* CountryCodeViewController.m */; }; B9EB5ABD1884C002007CBB57 /* MessageUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B9EB5ABC1884C002007CBB57 /* MessageUI.framework */; }; BFB074C919A5611000F2947C /* ObservableValue.m in Sources */ = {isa = PBXBuildFile; fileRef = BFB074C619A5611000F2947C /* ObservableValue.m */; }; D202868116DBE0E7009068E9 /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2AEACDB16C426DA00C364C0 /* CFNetwork.framework */; }; @@ -299,30 +311,15 @@ E1370BE518A0686C00826894 /* r.caf in Resources */ = {isa = PBXBuildFile; fileRef = E18AB40C18A05754001A532A /* r.caf */; }; E1370BE618A0686C00826894 /* sonarping.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = E18AB40D18A05754001A532A /* sonarping.mp3 */; }; E32B0699162419B7046BC643 /* libPods-Signal.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7DB8EE72F8522189E3E2CB45 /* libPods-Signal.a */; }; - E94066151DFC5B7B00B15392 /* ContactsPicker.xib in Resources */ = {isa = PBXBuildFile; fileRef = E94066141DFC5B7B00B15392 /* ContactsPicker.xib */; }; EF764C351DB67CC5000D9A87 /* UIViewController+CameraPermissions.m in Sources */ = {isa = PBXBuildFile; fileRef = EF764C341DB67CC5000D9A87 /* UIViewController+CameraPermissions.m */; }; - FC31962A1A067D8F0094C78E /* MessageComposeTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FC3196291A067D8F0094C78E /* MessageComposeTableViewController.m */; }; - FC31962D1A06A2190094C78E /* FingerprintViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FC31962C1A06A2190094C78E /* FingerprintViewController.m */; }; - FC3196301A0814130094C78E /* SettingsTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FC31962F1A0814130094C78E /* SettingsTableViewController.m */; }; FC3BD9881A30A790005B96BB /* Social.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FC3BD9871A30A790005B96BB /* Social.framework */; }; - FC4FA0261A1B9DC600DA100A /* SignalsNavigationController.m in Sources */ = {isa = PBXBuildFile; fileRef = FC4FA0251A1B9DC600DA100A /* SignalsNavigationController.m */; }; FC5CDF391A3393DD00B47253 /* error_white@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FC5CDF371A3393DD00B47253 /* error_white@2x.png */; }; FC5CDF3A1A3393DD00B47253 /* warning_white@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FC5CDF381A3393DD00B47253 /* warning_white@2x.png */; }; FC9120411A39EFB70074545C /* qr@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FC91203F1A39EFB70074545C /* qr@2x.png */; }; - FCAC963C19FEF9280046DFC5 /* SignalsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FCAC963B19FEF9280046DFC5 /* SignalsViewController.m */; }; - FCAC964019FEF99A0046DFC5 /* InboxTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = FCAC963E19FEF99A0046DFC5 /* InboxTableViewCell.m */; }; - FCAC965119FF0A6E0046DFC5 /* MessagesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FCAC965019FF0A6E0046DFC5 /* MessagesViewController.m */; }; FCB11D8C1A129A76002F93FB /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FCB11D8B1A129A76002F93FB /* CoreMedia.framework */; }; - FCB11D931A12A4AA002F93FB /* FullImageViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FCB11D921A12A4AA002F93FB /* FullImageViewController.m */; }; FCC81A981A44558300DFEC7D /* UIDevice+TSHardwareVersion.m in Sources */ = {isa = PBXBuildFile; fileRef = FCC81A971A44558300DFEC7D /* UIDevice+TSHardwareVersion.m */; }; - FCD274E21A5AFD8000202277 /* PrivacySettingsTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FCD274E11A5AFD8000202277 /* PrivacySettingsTableViewController.m */; }; - FCD274E81A5AFDC900202277 /* AdvancedSettingsTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FCD274E71A5AFDC900202277 /* AdvancedSettingsTableViewController.m */; }; - FCD274EB1A5AFDDB00202277 /* AboutTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FCD274EA1A5AFDDB00202277 /* AboutTableViewController.m */; }; FCFA64B41A24F3880007FB87 /* UIColor+OWS.m in Sources */ = {isa = PBXBuildFile; fileRef = FCFA64B31A24F3880007FB87 /* UIColor+OWS.m */; }; FCFA64B71A24F6730007FB87 /* UIFont+OWS.m in Sources */ = {isa = PBXBuildFile; fileRef = FCFA64B61A24F6730007FB87 /* UIFont+OWS.m */; }; - FCFD256F1A151BCB00F4C644 /* NewGroupViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FCFD256E1A151BCB00F4C644 /* NewGroupViewController.m */; }; - FCFD257F1A154B2C00F4C644 /* RegistrationViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FCFD257E1A154B2C00F4C644 /* RegistrationViewController.m */; }; - FCFD25821A154B3800F4C644 /* CodeVerificationViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FCFD25811A154B3800F4C644 /* CodeVerificationViewController.m */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -337,8 +334,6 @@ /* Begin PBXFileReference section */ 1B5E7D6C9007F5E5761D79DD /* libPods-SignalTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-SignalTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - 340757C01E5602D6001F15DD /* AttachmentSharing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AttachmentSharing.h; sourceTree = ""; }; - 340757C11E5602D6001F15DD /* AttachmentSharing.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AttachmentSharing.m; sourceTree = ""; }; 341BB7471DB727EE001E2975 /* JSQMediaItem+OWS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "JSQMediaItem+OWS.h"; sourceTree = ""; }; 341BB7481DB727EE001E2975 /* JSQMediaItem+OWS.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "JSQMediaItem+OWS.m"; sourceTree = ""; }; 34330A591E7875FB00DF2FB9 /* fontawesome-webfont.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "fontawesome-webfont.ttf"; sourceTree = ""; }; @@ -356,32 +351,86 @@ 345671001E89A5F1006EE662 /* ThreadUtil.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ThreadUtil.m; sourceTree = ""; }; 345671081E8A9F5D006EE662 /* TSGenericAttachmentAdapter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TSGenericAttachmentAdapter.h; sourceTree = ""; }; 345671091E8A9F5D006EE662 /* TSGenericAttachmentAdapter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TSGenericAttachmentAdapter.m; sourceTree = ""; }; - 345671221E8B1618006EE662 /* OversizeTextMessageViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OversizeTextMessageViewController.swift; sourceTree = ""; }; - 34802DD51E899CFB0032EA1D /* DebugUITableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DebugUITableViewController.h; sourceTree = ""; }; - 34802DD61E899CFB0032EA1D /* DebugUITableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DebugUITableViewController.m; sourceTree = ""; }; - 348A08411E6A044E0057E290 /* MessagesViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MessagesViewController.xib; sourceTree = ""; }; - 348A08431E6A1D2C0057E290 /* OWSMessagesToolbarContentView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = OWSMessagesToolbarContentView.xib; sourceTree = ""; }; - 348A08501E6C73490057E290 /* AttachmentApprovalViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AttachmentApprovalViewController.swift; sourceTree = ""; }; - 348A08521E6C75590057E290 /* SignalAttachment.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SignalAttachment.swift; sourceTree = ""; }; + 34B3F8301E8DF11D0035BE1A /* GroupContactsResult.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GroupContactsResult.h; sourceTree = ""; }; + 34B3F8311E8DF11D0035BE1A /* GroupContactsResult.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GroupContactsResult.m; sourceTree = ""; }; + 34B3F8341E8DF1700035BE1A /* AboutTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AboutTableViewController.h; sourceTree = ""; }; + 34B3F8351E8DF1700035BE1A /* AboutTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AboutTableViewController.m; sourceTree = ""; }; + 34B3F8361E8DF1700035BE1A /* AdvancedSettingsTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AdvancedSettingsTableViewController.h; sourceTree = ""; }; + 34B3F8371E8DF1700035BE1A /* AdvancedSettingsTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AdvancedSettingsTableViewController.m; sourceTree = ""; }; + 34B3F8381E8DF1700035BE1A /* AttachmentApprovalViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AttachmentApprovalViewController.swift; sourceTree = ""; }; + 34B3F8391E8DF1700035BE1A /* AttachmentSharing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AttachmentSharing.h; sourceTree = ""; }; + 34B3F83A1E8DF1700035BE1A /* AttachmentSharing.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AttachmentSharing.m; sourceTree = ""; }; + 34B3F83B1E8DF1700035BE1A /* CallViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CallViewController.swift; sourceTree = ""; }; + 34B3F83C1E8DF1700035BE1A /* CodeVerificationViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CodeVerificationViewController.h; sourceTree = ""; }; + 34B3F83D1E8DF1700035BE1A /* CodeVerificationViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CodeVerificationViewController.m; sourceTree = ""; }; + 34B3F83E1E8DF1700035BE1A /* ContactsPicker.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ContactsPicker.swift; sourceTree = ""; }; + 34B3F83F1E8DF1700035BE1A /* ContactsPicker.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ContactsPicker.xib; sourceTree = ""; }; + 34B3F8401E8DF1700035BE1A /* CountryCodeViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CountryCodeViewController.h; sourceTree = ""; }; + 34B3F8411E8DF1700035BE1A /* CountryCodeViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CountryCodeViewController.m; sourceTree = ""; }; + 34B3F8421E8DF1700035BE1A /* DebugUITableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DebugUITableViewController.h; sourceTree = ""; }; + 34B3F8431E8DF1700035BE1A /* DebugUITableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DebugUITableViewController.m; sourceTree = ""; }; + 34B3F8441E8DF1700035BE1A /* ExperienceUpgradesPageViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ExperienceUpgradesPageViewController.swift; sourceTree = ""; }; + 34B3F8451E8DF1700035BE1A /* FingerprintViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FingerprintViewController.h; sourceTree = ""; }; + 34B3F8461E8DF1700035BE1A /* FingerprintViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FingerprintViewController.m; sourceTree = ""; }; + 34B3F8471E8DF1700035BE1A /* FullImageViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FullImageViewController.h; sourceTree = ""; }; + 34B3F8481E8DF1700035BE1A /* FullImageViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FullImageViewController.m; sourceTree = ""; }; + 34B3F8491E8DF1700035BE1A /* InboxTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InboxTableViewCell.h; sourceTree = ""; }; + 34B3F84A1E8DF1700035BE1A /* InboxTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = InboxTableViewCell.m; sourceTree = ""; }; + 34B3F84B1E8DF1700035BE1A /* InboxTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = InboxTableViewCell.xib; sourceTree = ""; }; + 34B3F84C1E8DF1700035BE1A /* InviteFlow.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InviteFlow.swift; sourceTree = ""; }; + 34B3F84D1E8DF1700035BE1A /* LockInteractionController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LockInteractionController.h; sourceTree = ""; }; + 34B3F84E1E8DF1700035BE1A /* LockInteractionController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LockInteractionController.m; sourceTree = ""; }; + 34B3F84F1E8DF1700035BE1A /* MessageComposeTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MessageComposeTableViewController.h; sourceTree = ""; }; + 34B3F8501E8DF1700035BE1A /* MessageComposeTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MessageComposeTableViewController.m; sourceTree = ""; }; + 34B3F8511E8DF1700035BE1A /* MessagesViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MessagesViewController.h; sourceTree = ""; }; + 34B3F8521E8DF1700035BE1A /* MessagesViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MessagesViewController.m; sourceTree = ""; }; + 34B3F8531E8DF1700035BE1A /* MessagesViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MessagesViewController.xib; sourceTree = ""; }; + 34B3F8541E8DF1700035BE1A /* NewGroupViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NewGroupViewController.h; sourceTree = ""; }; + 34B3F8551E8DF1700035BE1A /* NewGroupViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NewGroupViewController.m; sourceTree = ""; }; + 34B3F8561E8DF1700035BE1A /* NotificationSettingsOptionsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NotificationSettingsOptionsViewController.h; sourceTree = ""; }; + 34B3F8571E8DF1700035BE1A /* NotificationSettingsOptionsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NotificationSettingsOptionsViewController.m; sourceTree = ""; }; + 34B3F8581E8DF1700035BE1A /* NotificationSettingsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NotificationSettingsViewController.h; sourceTree = ""; }; + 34B3F8591E8DF1700035BE1A /* NotificationSettingsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NotificationSettingsViewController.m; sourceTree = ""; }; + 34B3F85A1E8DF1700035BE1A /* OversizeTextMessageViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OversizeTextMessageViewController.swift; sourceTree = ""; }; + 34B3F85B1E8DF1700035BE1A /* OWSConversationSettingsTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSConversationSettingsTableViewController.h; sourceTree = ""; }; + 34B3F85C1E8DF1700035BE1A /* OWSConversationSettingsTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWSConversationSettingsTableViewController.m; sourceTree = ""; }; + 34B3F85D1E8DF1700035BE1A /* OWSLinkDeviceViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSLinkDeviceViewController.h; sourceTree = ""; }; + 34B3F85E1E8DF1700035BE1A /* OWSLinkDeviceViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWSLinkDeviceViewController.m; sourceTree = ""; }; + 34B3F85F1E8DF1700035BE1A /* OWSLinkedDevicesTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSLinkedDevicesTableViewController.h; sourceTree = ""; }; + 34B3F8601E8DF1700035BE1A /* OWSLinkedDevicesTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWSLinkedDevicesTableViewController.m; sourceTree = ""; }; + 34B3F8611E8DF1700035BE1A /* OWSMessagesToolbarContentView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = OWSMessagesToolbarContentView.xib; sourceTree = ""; }; + 34B3F8621E8DF1700035BE1A /* OWSQRCodeScanningViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSQRCodeScanningViewController.h; sourceTree = ""; }; + 34B3F8631E8DF1700035BE1A /* OWSQRCodeScanningViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWSQRCodeScanningViewController.m; sourceTree = ""; }; + 34B3F8641E8DF1700035BE1A /* PrivacySettingsTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PrivacySettingsTableViewController.h; sourceTree = ""; }; + 34B3F8651E8DF1700035BE1A /* PrivacySettingsTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PrivacySettingsTableViewController.m; sourceTree = ""; }; + 34B3F8661E8DF1700035BE1A /* RegistrationViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RegistrationViewController.h; sourceTree = ""; }; + 34B3F8671E8DF1700035BE1A /* RegistrationViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RegistrationViewController.m; sourceTree = ""; }; + 34B3F8681E8DF1700035BE1A /* SettingsTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SettingsTableViewController.h; sourceTree = ""; }; + 34B3F8691E8DF1700035BE1A /* SettingsTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SettingsTableViewController.m; sourceTree = ""; }; + 34B3F86A1E8DF1700035BE1A /* ShowGroupMembersViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShowGroupMembersViewController.h; sourceTree = ""; }; + 34B3F86B1E8DF1700035BE1A /* ShowGroupMembersViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ShowGroupMembersViewController.m; sourceTree = ""; }; + 34B3F86C1E8DF1700035BE1A /* SignalAttachment.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SignalAttachment.swift; sourceTree = ""; }; + 34B3F86D1E8DF1700035BE1A /* SignalsNavigationController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SignalsNavigationController.h; sourceTree = ""; }; + 34B3F86E1E8DF1700035BE1A /* SignalsNavigationController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SignalsNavigationController.m; sourceTree = ""; }; + 34B3F86F1E8DF1700035BE1A /* SignalsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SignalsViewController.h; sourceTree = ""; }; + 34B3F8701E8DF1700035BE1A /* SignalsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SignalsViewController.m; sourceTree = ""; }; + 34B3F8981E8DF1B90035BE1A /* TSMessageAdapterTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TSMessageAdapterTest.m; sourceTree = ""; }; 34FD936E1E3BD43A00109093 /* OWSAnyTouchGestureRecognizer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OWSAnyTouchGestureRecognizer.h; path = views/OWSAnyTouchGestureRecognizer.h; sourceTree = ""; }; 34FD936F1E3BD43A00109093 /* OWSAnyTouchGestureRecognizer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OWSAnyTouchGestureRecognizer.m; path = views/OWSAnyTouchGestureRecognizer.m; sourceTree = ""; }; 450573FC1E78A06D00615BB4 /* OWS103EnableVideoCalling.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OWS103EnableVideoCalling.h; path = Migrations/OWS103EnableVideoCalling.h; sourceTree = ""; }; 450573FD1E78A06D00615BB4 /* OWS103EnableVideoCalling.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OWS103EnableVideoCalling.m; path = Migrations/OWS103EnableVideoCalling.m; sourceTree = ""; }; 4505C2BE1E648EA300CEBF41 /* ExperienceUpgrade.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ExperienceUpgrade.swift; path = ExperienceUpgrades/ExperienceUpgrade.swift; sourceTree = ""; }; 4505C2C11E648F7A00CEBF41 /* ExperienceUpgradeFinder.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ExperienceUpgradeFinder.swift; sourceTree = ""; }; - 4505C2C41E64977D00CEBF41 /* ExperienceUpgradesPageViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ExperienceUpgradesPageViewController.swift; sourceTree = ""; }; 450873C11D9D5149006B54F2 /* OWSExpirationTimerView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSExpirationTimerView.h; sourceTree = ""; }; 450873C21D9D5149006B54F2 /* OWSExpirationTimerView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWSExpirationTimerView.m; sourceTree = ""; }; 450873C51D9D867B006B54F2 /* OWSIncomingMessageCollectionViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSIncomingMessageCollectionViewCell.h; sourceTree = ""; }; 450873C61D9D867B006B54F2 /* OWSIncomingMessageCollectionViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWSIncomingMessageCollectionViewCell.m; sourceTree = ""; }; 450873C91D9D86F4006B54F2 /* OWSExpirableMessageView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSExpirableMessageView.h; sourceTree = ""; }; 4509E7991DD653700025A59F /* WebRTC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebRTC.framework; path = Carthage/Build/iOS/WebRTC.framework; sourceTree = ""; }; - 4509E79B1DD6545B0025A59F /* CallViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CallViewController.swift; sourceTree = ""; }; 450DF2041E0D74AC003D14BE /* Platform.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Platform.swift; sourceTree = ""; }; 450DF2081E0DD2C6003D14BE /* UserNotificationsAdaptee.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; name = UserNotificationsAdaptee.swift; path = UserInterface/Notifications/UserNotificationsAdaptee.swift; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.swift; }; 4516E3FD1DD2193B00DC4206 /* OWS101ExistingUsersBlockOnIdentityChange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OWS101ExistingUsersBlockOnIdentityChange.h; path = Migrations/OWS101ExistingUsersBlockOnIdentityChange.h; sourceTree = ""; }; 4516E3FE1DD2193B00DC4206 /* OWS101ExistingUsersBlockOnIdentityChange.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OWS101ExistingUsersBlockOnIdentityChange.m; path = Migrations/OWS101ExistingUsersBlockOnIdentityChange.m; sourceTree = ""; }; - 451764261DE939F300EDB8B9 /* ContactsPicker.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ContactsPicker.swift; sourceTree = ""; }; 451764281DE939FD00EDB8B9 /* ContactCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ContactCell.xib; sourceTree = ""; }; 451764291DE939FD00EDB8B9 /* ContactCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ContactCell.swift; sourceTree = ""; }; 451A13B01E13DED2000A50FD /* CallNotificationsAdapter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = CallNotificationsAdapter.swift; path = ../UserInterface/Notifications/CallNotificationsAdapter.swift; sourceTree = ""; }; @@ -391,8 +440,6 @@ 4526BD481CA61C8D00166BC8 /* OWSMessageEditing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSMessageEditing.h; sourceTree = ""; }; 452C468E1E427E200087B011 /* OutboundCallInitiator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OutboundCallInitiator.swift; sourceTree = ""; }; 452D1EE71DCA90D100A57EC4 /* MesssagesBubblesSizeCalculatorTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = MesssagesBubblesSizeCalculatorTest.swift; path = Models/MesssagesBubblesSizeCalculatorTest.swift; sourceTree = ""; }; - 452E3C8C1D935C77002A45B0 /* OWSConversationSettingsTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSConversationSettingsTableViewController.h; sourceTree = ""; }; - 452E3C8D1D935C77002A45B0 /* OWSConversationSettingsTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = OWSConversationSettingsTableViewController.m; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objc; }; 452ECA4C1E087E7200E2F016 /* MessageFetcherJob.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = MessageFetcherJob.swift; path = Jobs/MessageFetcherJob.swift; sourceTree = ""; }; 4531C9C21DD8E6D800F08304 /* JSQMessagesCollectionViewCell+OWS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "JSQMessagesCollectionViewCell+OWS.h"; sourceTree = ""; }; 4531C9C31DD8E6D800F08304 /* JSQMessagesCollectionViewCell+OWS.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "JSQMessagesCollectionViewCell+OWS.m"; sourceTree = ""; }; @@ -405,7 +452,6 @@ 453D28B91D332DB100D523F0 /* OWSMessagesBubblesSizeCalculator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWSMessagesBubblesSizeCalculator.m; sourceTree = ""; }; 45464DBB1DFA041F001D3FD6 /* DataChannelMessage.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DataChannelMessage.swift; sourceTree = ""; }; 454B35071D08EED80026D658 /* mk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = mk; path = translations/mk.lproj/Localizable.strings; sourceTree = ""; }; - 45514DE11DDFA183003EFF90 /* InviteFlow.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InviteFlow.swift; sourceTree = ""; }; 45666EC41D99483D008FE134 /* OWSAvatarBuilder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSAvatarBuilder.h; sourceTree = ""; }; 45666EC51D99483D008FE134 /* OWSAvatarBuilder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWSAvatarBuilder.m; sourceTree = ""; }; 45666EC71D994C0D008FE134 /* OWSGroupAvatarBuilder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSGroupAvatarBuilder.h; sourceTree = ""; }; @@ -436,10 +482,6 @@ 458DE9D51DEE3FD00071BB03 /* PeerConnectionClient.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PeerConnectionClient.swift; sourceTree = ""; }; 458DE9D71DEE7B360071BB03 /* OWSWebRTCDataProtos.pb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSWebRTCDataProtos.pb.h; sourceTree = ""; }; 458DE9D81DEE7B360071BB03 /* OWSWebRTCDataProtos.pb.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWSWebRTCDataProtos.pb.m; sourceTree = ""; }; - 458E382F1D6682450094BD24 /* OWSQRCodeScanningViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSQRCodeScanningViewController.h; sourceTree = ""; }; - 458E38301D6682450094BD24 /* OWSQRCodeScanningViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWSQRCodeScanningViewController.m; sourceTree = ""; }; - 458E38321D66873D0094BD24 /* OWSLinkDeviceViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSLinkDeviceViewController.h; sourceTree = ""; }; - 458E38331D66873D0094BD24 /* OWSLinkDeviceViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWSLinkDeviceViewController.m; sourceTree = ""; }; 458E38351D668EBF0094BD24 /* OWSDeviceProvisioningURLParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSDeviceProvisioningURLParser.h; sourceTree = ""; }; 458E38361D668EBF0094BD24 /* OWSDeviceProvisioningURLParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWSDeviceProvisioningURLParser.m; sourceTree = ""; }; 458E38391D6699FA0094BD24 /* OWSDeviceProvisioningURLParserTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OWSDeviceProvisioningURLParserTest.m; path = Models/OWSDeviceProvisioningURLParserTest.m; sourceTree = ""; }; @@ -447,7 +489,6 @@ 459311FB1D75C948008DD4F0 /* OWSDeviceTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWSDeviceTableViewCell.m; sourceTree = ""; }; 4597E94E1D8313C100040CDE /* sq */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sq; path = translations/sq.lproj/Localizable.strings; sourceTree = ""; }; 4597E94F1D8313CB00040CDE /* bg */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = bg; path = translations/bg.lproj/Localizable.strings; sourceTree = ""; }; - 459C3F0C1C9B3A1B003ACF51 /* TSMessageAdapterTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TSMessageAdapterTest.m; path = "view controllers/Signals/TSMessageAdapters/TSMessageAdapterTest.m"; sourceTree = ""; }; 45AE48501E0732D6004D96C2 /* TurnServerInfo.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TurnServerInfo.swift; sourceTree = ""; }; 45B201741DAECBFD00C461E0 /* Signal-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Signal-Bridging-Header.h"; sourceTree = ""; }; 45B201751DAECBFE00C461E0 /* HighlightableLabel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HighlightableLabel.swift; sourceTree = ""; }; @@ -481,8 +522,6 @@ 45E2E91F1E153B3D00457AA0 /* Strings.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Strings.swift; path = UserInterface/Strings.swift; sourceTree = ""; }; 45E615151E8C590B0018AD52 /* DisplayableTextFilter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DisplayableTextFilter.swift; sourceTree = ""; }; 45E7A6A61E71CA7E00D44FB5 /* DisplayableTextFilterTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DisplayableTextFilterTest.swift; sourceTree = ""; }; - 45EB32CD1D7465C900735B2E /* OWSLinkedDevicesTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSLinkedDevicesTableViewController.h; sourceTree = ""; }; - 45EB32CE1D7465C900735B2E /* OWSLinkedDevicesTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWSLinkedDevicesTableViewController.m; sourceTree = ""; }; 45F170AB1E2F0351003FC1F2 /* CallAudioSession.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CallAudioSession.swift; sourceTree = ""; }; 45F170AE1E2F0393003FC1F2 /* CallAudioSessionTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CallAudioSessionTest.swift; sourceTree = ""; }; 45F170B31E2F0A6A003FC1F2 /* RTCAudioSession.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RTCAudioSession.h; sourceTree = ""; }; @@ -536,12 +575,9 @@ A1C32D4D17A0652C000A904E /* AddressBook.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AddressBook.framework; path = System/Library/Frameworks/AddressBook.framework; sourceTree = SDKROOT; }; A1C32D4F17A06537000A904E /* AddressBookUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AddressBookUI.framework; path = System/Library/Frameworks/AddressBookUI.framework; sourceTree = SDKROOT; }; A1FDCBEE16DAA6C300868894 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; }; - A507A3AF1A6C60E300BEED0D /* InboxTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = InboxTableViewCell.xib; path = "Signal/src/view controllers/InboxTableViewCell.xib"; sourceTree = SOURCE_ROOT; }; A5509EC91A69AB8B00ABA4BC /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = Main.storyboard; path = Storyboard/Main.storyboard; sourceTree = ""; }; A5509ECB1A69B1D600ABA4BC /* CountryCodeTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CountryCodeTableViewCell.h; sourceTree = ""; }; A5509ECC1A69B1D600ABA4BC /* CountryCodeTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CountryCodeTableViewCell.m; sourceTree = ""; }; - A5D069991A50E9CB004CB540 /* ShowGroupMembersViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = ShowGroupMembersViewController.m; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objc; }; - A5D0699A1A50E9CB004CB540 /* ShowGroupMembersViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShowGroupMembersViewController.h; sourceTree = ""; }; A5E9D4B91A65FAD800E4481C /* TSVideoAttachmentAdapter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TSVideoAttachmentAdapter.m; sourceTree = ""; }; A5E9D4BA1A65FAD800E4481C /* TSVideoAttachmentAdapter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TSVideoAttachmentAdapter.h; sourceTree = ""; }; AD2AB1207E8888E4262D781B /* Pods-SignalTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SignalTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-SignalTests/Pods-SignalTests.debug.xcconfig"; sourceTree = ""; }; @@ -603,13 +639,7 @@ B660F6B31C29868000687D6E /* UtilTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UtilTest.h; sourceTree = ""; }; B660F6B41C29868000687D6E /* UtilTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UtilTest.m; sourceTree = ""; }; B661C211198EE2EA00548CA1 /* iOSVersions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = iOSVersions.h; path = src/environment/iOSVersions.h; sourceTree = ""; }; - B66B9F701AEA6D1100E2E609 /* NotificationSettingsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NotificationSettingsViewController.h; sourceTree = ""; }; - B66B9F711AEA6D1100E2E609 /* NotificationSettingsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NotificationSettingsViewController.m; sourceTree = ""; }; - B66B9F7B1AEAF40500E2E609 /* NotificationSettingsOptionsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NotificationSettingsOptionsViewController.h; sourceTree = ""; }; - B66B9F7C1AEAF40500E2E609 /* NotificationSettingsOptionsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NotificationSettingsOptionsViewController.m; sourceTree = ""; }; B66DBF4919D5BBC8006EA940 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; - B671B2441A93B238002BBD9D /* GroupContactsResult.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GroupContactsResult.h; sourceTree = ""; }; - B671B2451A93B238002BBD9D /* GroupContactsResult.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GroupContactsResult.m; sourceTree = ""; }; B676BCEF1AA544E7009637B8 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = translations/de.lproj/Localizable.strings; sourceTree = ""; }; B676BCF01AA544F5009637B8 /* el_GR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = el_GR; path = translations/el_GR.lproj/Localizable.strings; sourceTree = ""; }; B676BCF11AA5451E009637B8 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = translations/es.lproj/Localizable.strings; sourceTree = ""; }; @@ -645,8 +675,6 @@ B6B226961BE4B7D200860F4D /* ContactsUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ContactsUI.framework; path = System/Library/Frameworks/ContactsUI.framework; sourceTree = SDKROOT; }; B6B9ECFA198B31BA00C620D3 /* PushManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = PushManager.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; B6B9ECFB198B31BA00C620D3 /* PushManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = PushManager.m; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objc; }; - B6BADBE51B88D1AC0086A80D /* LockInteractionController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LockInteractionController.h; sourceTree = ""; }; - B6BADBE61B88D1AC0086A80D /* LockInteractionController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LockInteractionController.m; sourceTree = ""; }; B6BC3D0C1AA544B100C2907F /* da */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = da; path = translations/da.lproj/Localizable.strings; sourceTree = ""; }; B6C6AE531A305ED1006BAF8F /* redphone.cer */ = {isa = PBXFileReference; lastKnownFileType = file; path = redphone.cer; sourceTree = ""; }; B6C93C4C199567AD00EDF894 /* DebugLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DebugLogger.h; sourceTree = ""; }; @@ -660,8 +688,6 @@ B90418E5183E9DD40038554A /* DateUtil.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DateUtil.m; sourceTree = ""; }; B97940251832BD2400BD66CB /* UIUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIUtil.h; sourceTree = ""; }; B97940261832BD2400BD66CB /* UIUtil.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIUtil.m; sourceTree = ""; }; - B97CBFA518860EA3008E0DE9 /* CountryCodeViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CountryCodeViewController.h; sourceTree = ""; }; - B97CBFA618860EA3008E0DE9 /* CountryCodeViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CountryCodeViewController.m; sourceTree = ""; }; B9EB5ABC1884C002007CBB57 /* MessageUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MessageUI.framework; path = System/Library/Frameworks/MessageUI.framework; sourceTree = SDKROOT; }; BFB074C519A5611000F2947C /* ObservableValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ObservableValue.h; sourceTree = ""; }; BFB074C619A5611000F2947C /* ObservableValue.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ObservableValue.m; sourceTree = ""; }; @@ -689,48 +715,19 @@ E18AB40D18A05754001A532A /* sonarping.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = sonarping.mp3; sourceTree = ""; }; E1A0AD8B16E13FDD0071E604 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; }; E85DB184824BA9DC302EC8B3 /* Pods-SignalTests.app store release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SignalTests.app store release.xcconfig"; path = "Pods/Target Support Files/Pods-SignalTests/Pods-SignalTests.app store release.xcconfig"; sourceTree = ""; }; - E94066141DFC5B7B00B15392 /* ContactsPicker.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ContactsPicker.xib; sourceTree = ""; }; EF764C331DB67CC5000D9A87 /* UIViewController+CameraPermissions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "UIViewController+CameraPermissions.h"; path = "util/UIViewController+CameraPermissions.h"; sourceTree = ""; }; EF764C341DB67CC5000D9A87 /* UIViewController+CameraPermissions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "UIViewController+CameraPermissions.m"; path = "util/UIViewController+CameraPermissions.m"; sourceTree = ""; }; - FC3196281A067D8F0094C78E /* MessageComposeTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MessageComposeTableViewController.h; sourceTree = ""; }; - FC3196291A067D8F0094C78E /* MessageComposeTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MessageComposeTableViewController.m; sourceTree = ""; }; - FC31962B1A06A2190094C78E /* FingerprintViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = FingerprintViewController.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; - FC31962C1A06A2190094C78E /* FingerprintViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = FingerprintViewController.m; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objc; }; - FC31962E1A0814130094C78E /* SettingsTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SettingsTableViewController.h; sourceTree = ""; }; - FC31962F1A0814130094C78E /* SettingsTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SettingsTableViewController.m; sourceTree = ""; }; FC3BD9871A30A790005B96BB /* Social.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Social.framework; path = System/Library/Frameworks/Social.framework; sourceTree = SDKROOT; }; - FC4FA0241A1B9DC600DA100A /* SignalsNavigationController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SignalsNavigationController.h; sourceTree = ""; }; - FC4FA0251A1B9DC600DA100A /* SignalsNavigationController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SignalsNavigationController.m; sourceTree = ""; }; FC5CDF371A3393DD00B47253 /* error_white@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "error_white@2x.png"; sourceTree = ""; }; FC5CDF381A3393DD00B47253 /* warning_white@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "warning_white@2x.png"; sourceTree = ""; }; FC91203F1A39EFB70074545C /* qr@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "qr@2x.png"; sourceTree = ""; }; - FCAC963A19FEF9280046DFC5 /* SignalsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SignalsViewController.h; sourceTree = ""; }; - FCAC963B19FEF9280046DFC5 /* SignalsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SignalsViewController.m; sourceTree = ""; }; - FCAC963D19FEF99A0046DFC5 /* InboxTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = InboxTableViewCell.h; path = "../view controllers/InboxTableViewCell.h"; sourceTree = ""; }; - FCAC963E19FEF99A0046DFC5 /* InboxTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = InboxTableViewCell.m; path = "../view controllers/InboxTableViewCell.m"; sourceTree = ""; }; - FCAC964F19FF0A6E0046DFC5 /* MessagesViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MessagesViewController.h; sourceTree = ""; }; - FCAC965019FF0A6E0046DFC5 /* MessagesViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = MessagesViewController.m; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objc; }; FCB11D8B1A129A76002F93FB /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; }; - FCB11D911A12A4AA002F93FB /* FullImageViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FullImageViewController.h; sourceTree = ""; }; - FCB11D921A12A4AA002F93FB /* FullImageViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FullImageViewController.m; sourceTree = ""; }; FCC81A961A44558300DFEC7D /* UIDevice+TSHardwareVersion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIDevice+TSHardwareVersion.h"; sourceTree = ""; }; FCC81A971A44558300DFEC7D /* UIDevice+TSHardwareVersion.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIDevice+TSHardwareVersion.m"; sourceTree = ""; }; - FCD274E01A5AFD8000202277 /* PrivacySettingsTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PrivacySettingsTableViewController.h; sourceTree = ""; }; - FCD274E11A5AFD8000202277 /* PrivacySettingsTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = PrivacySettingsTableViewController.m; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objc; }; - FCD274E61A5AFDC900202277 /* AdvancedSettingsTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AdvancedSettingsTableViewController.h; sourceTree = ""; }; - FCD274E71A5AFDC900202277 /* AdvancedSettingsTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AdvancedSettingsTableViewController.m; sourceTree = ""; }; - FCD274E91A5AFDDB00202277 /* AboutTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AboutTableViewController.h; sourceTree = ""; }; - FCD274EA1A5AFDDB00202277 /* AboutTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = AboutTableViewController.m; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objc; }; FCFA64B21A24F3880007FB87 /* UIColor+OWS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIColor+OWS.h"; sourceTree = ""; }; FCFA64B31A24F3880007FB87 /* UIColor+OWS.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIColor+OWS.m"; sourceTree = ""; }; FCFA64B51A24F6730007FB87 /* UIFont+OWS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = "UIFont+OWS.h"; path = "util/UIFont+OWS.h"; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; FCFA64B61A24F6730007FB87 /* UIFont+OWS.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; name = "UIFont+OWS.m"; path = "util/UIFont+OWS.m"; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objc; }; - FCFD256D1A151BCB00F4C644 /* NewGroupViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NewGroupViewController.h; sourceTree = ""; }; - FCFD256E1A151BCB00F4C644 /* NewGroupViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = NewGroupViewController.m; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objc; }; - FCFD257D1A154B2C00F4C644 /* RegistrationViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RegistrationViewController.h; sourceTree = ""; }; - FCFD257E1A154B2C00F4C644 /* RegistrationViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RegistrationViewController.m; sourceTree = ""; }; - FCFD25801A154B3800F4C644 /* CodeVerificationViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CodeVerificationViewController.h; sourceTree = ""; }; - FCFD25811A154B3800F4C644 /* CodeVerificationViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CodeVerificationViewController.m; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -802,6 +799,98 @@ path = Fonts; sourceTree = ""; }; + 34B3F8331E8DF1700035BE1A /* ViewControllers */ = { + isa = PBXGroup; + children = ( + 34B3F8341E8DF1700035BE1A /* AboutTableViewController.h */, + 34B3F8351E8DF1700035BE1A /* AboutTableViewController.m */, + 34B3F8361E8DF1700035BE1A /* AdvancedSettingsTableViewController.h */, + 34B3F8371E8DF1700035BE1A /* AdvancedSettingsTableViewController.m */, + 34B3F8381E8DF1700035BE1A /* AttachmentApprovalViewController.swift */, + 34B3F8391E8DF1700035BE1A /* AttachmentSharing.h */, + 34B3F83A1E8DF1700035BE1A /* AttachmentSharing.m */, + 34B3F83B1E8DF1700035BE1A /* CallViewController.swift */, + 34B3F83C1E8DF1700035BE1A /* CodeVerificationViewController.h */, + 34B3F83D1E8DF1700035BE1A /* CodeVerificationViewController.m */, + 34B3F83E1E8DF1700035BE1A /* ContactsPicker.swift */, + 34B3F83F1E8DF1700035BE1A /* ContactsPicker.xib */, + 34B3F8401E8DF1700035BE1A /* CountryCodeViewController.h */, + 34B3F8411E8DF1700035BE1A /* CountryCodeViewController.m */, + 34B3F8421E8DF1700035BE1A /* DebugUITableViewController.h */, + 34B3F8431E8DF1700035BE1A /* DebugUITableViewController.m */, + 34B3F8441E8DF1700035BE1A /* ExperienceUpgradesPageViewController.swift */, + 34B3F8451E8DF1700035BE1A /* FingerprintViewController.h */, + 34B3F8461E8DF1700035BE1A /* FingerprintViewController.m */, + 34B3F8471E8DF1700035BE1A /* FullImageViewController.h */, + 34B3F8481E8DF1700035BE1A /* FullImageViewController.m */, + 34B3F8491E8DF1700035BE1A /* InboxTableViewCell.h */, + 34B3F84A1E8DF1700035BE1A /* InboxTableViewCell.m */, + 34B3F84B1E8DF1700035BE1A /* InboxTableViewCell.xib */, + 34B3F84C1E8DF1700035BE1A /* InviteFlow.swift */, + 34B3F84D1E8DF1700035BE1A /* LockInteractionController.h */, + 34B3F84E1E8DF1700035BE1A /* LockInteractionController.m */, + 34B3F84F1E8DF1700035BE1A /* MessageComposeTableViewController.h */, + 34B3F8501E8DF1700035BE1A /* MessageComposeTableViewController.m */, + 34B3F8511E8DF1700035BE1A /* MessagesViewController.h */, + 34B3F8521E8DF1700035BE1A /* MessagesViewController.m */, + 34B3F8531E8DF1700035BE1A /* MessagesViewController.xib */, + 34B3F8541E8DF1700035BE1A /* NewGroupViewController.h */, + 34B3F8551E8DF1700035BE1A /* NewGroupViewController.m */, + 34B3F8561E8DF1700035BE1A /* NotificationSettingsOptionsViewController.h */, + 34B3F8571E8DF1700035BE1A /* NotificationSettingsOptionsViewController.m */, + 34B3F8581E8DF1700035BE1A /* NotificationSettingsViewController.h */, + 34B3F8591E8DF1700035BE1A /* NotificationSettingsViewController.m */, + 34B3F85A1E8DF1700035BE1A /* OversizeTextMessageViewController.swift */, + 34B3F85B1E8DF1700035BE1A /* OWSConversationSettingsTableViewController.h */, + 34B3F85C1E8DF1700035BE1A /* OWSConversationSettingsTableViewController.m */, + 34B3F85D1E8DF1700035BE1A /* OWSLinkDeviceViewController.h */, + 34B3F85E1E8DF1700035BE1A /* OWSLinkDeviceViewController.m */, + 34B3F85F1E8DF1700035BE1A /* OWSLinkedDevicesTableViewController.h */, + 34B3F8601E8DF1700035BE1A /* OWSLinkedDevicesTableViewController.m */, + 34B3F8611E8DF1700035BE1A /* OWSMessagesToolbarContentView.xib */, + 34B3F8621E8DF1700035BE1A /* OWSQRCodeScanningViewController.h */, + 34B3F8631E8DF1700035BE1A /* OWSQRCodeScanningViewController.m */, + 34B3F8641E8DF1700035BE1A /* PrivacySettingsTableViewController.h */, + 34B3F8651E8DF1700035BE1A /* PrivacySettingsTableViewController.m */, + 34B3F8661E8DF1700035BE1A /* RegistrationViewController.h */, + 34B3F8671E8DF1700035BE1A /* RegistrationViewController.m */, + 34B3F8681E8DF1700035BE1A /* SettingsTableViewController.h */, + 34B3F8691E8DF1700035BE1A /* SettingsTableViewController.m */, + 34B3F86A1E8DF1700035BE1A /* ShowGroupMembersViewController.h */, + 34B3F86B1E8DF1700035BE1A /* ShowGroupMembersViewController.m */, + 34B3F86C1E8DF1700035BE1A /* SignalAttachment.swift */, + 34B3F86D1E8DF1700035BE1A /* SignalsNavigationController.h */, + 34B3F86E1E8DF1700035BE1A /* SignalsNavigationController.m */, + 34B3F86F1E8DF1700035BE1A /* SignalsViewController.h */, + 34B3F8701E8DF1700035BE1A /* SignalsViewController.m */, + ); + path = ViewControllers; + sourceTree = ""; + }; + 34B3F8951E8DF1B90035BE1A /* ViewControllers */ = { + isa = PBXGroup; + children = ( + 34B3F8961E8DF1B90035BE1A /* Signals */, + ); + path = ViewControllers; + sourceTree = ""; + }; + 34B3F8961E8DF1B90035BE1A /* Signals */ = { + isa = PBXGroup; + children = ( + 34B3F8971E8DF1B90035BE1A /* TSMessageAdapters */, + ); + path = Signals; + sourceTree = ""; + }; + 34B3F8971E8DF1B90035BE1A /* TSMessageAdapters */ = { + isa = PBXGroup; + children = ( + 34B3F8981E8DF1B90035BE1A /* TSMessageAdapterTest.m */, + ); + path = TSMessageAdapters; + sourceTree = ""; + }; 4505C2BD1E648E6E00CEBF41 /* ExperienceUpgrades */ = { isa = PBXGroup; children = ( @@ -814,12 +903,12 @@ 450DF2061E0DD28D003D14BE /* UserInterface */ = { isa = PBXGroup; children = ( + 450DF2071E0DD29E003D14BE /* Notifications */, 34FD936E1E3BD43A00109093 /* OWSAnyTouchGestureRecognizer.h */, 34FD936F1E3BD43A00109093 /* OWSAnyTouchGestureRecognizer.m */, - 450DF2071E0DD29E003D14BE /* Notifications */, - 76EB052B18170B33006006FC /* Views */, - 76EB04FE18170B33006006FC /* View Controllers */, 45E2E91F1E153B3D00457AA0 /* Strings.swift */, + 34B3F8331E8DF1700035BE1A /* ViewControllers */, + 76EB052B18170B33006006FC /* Views */, ); name = UserInterface; sourceTree = ""; @@ -909,14 +998,6 @@ name = Models; sourceTree = ""; }; - 459C3F0E1C9B3A20003ACF51 /* TSMessageAdapters */ = { - isa = PBXGroup; - children = ( - 459C3F0C1C9B3A1B003ACF51 /* TSMessageAdapterTest.m */, - ); - name = TSMessageAdapters; - sourceTree = ""; - }; 45BFFFA51D898AB8004A12A7 /* Observers */ = { isa = PBXGroup; children = ( @@ -1023,7 +1104,8 @@ 76EB040318170B33006006FC /* contact */ = { isa = PBXGroup; children = ( - 76EB04A818170B33006006FC /* number directory */, + 34B3F8301E8DF11D0035BE1A /* GroupContactsResult.h */, + 34B3F8311E8DF11D0035BE1A /* GroupContactsResult.m */, 76EB040818170B33006006FC /* OWSContactsManager.h */, 76EB040918170B33006006FC /* OWSContactsManager.m */, 45843D1D1D2236B30013E85A /* OWSContactsSearcher.h */, @@ -1064,16 +1146,6 @@ path = network; sourceTree = ""; }; - 76EB04A818170B33006006FC /* number directory */ = { - isa = PBXGroup; - children = ( - B671B2441A93B238002BBD9D /* GroupContactsResult.h */, - B671B2451A93B238002BBD9D /* GroupContactsResult.m */, - ); - name = "number directory"; - path = "../phone/signaling/number directory"; - sourceTree = ""; - }; 76EB04C818170B33006006FC /* util */ = { isa = PBXGroup; children = ( @@ -1126,30 +1198,6 @@ path = collections; sourceTree = ""; }; - 76EB04FE18170B33006006FC /* View Controllers */ = { - isa = PBXGroup; - children = ( - 340757C01E5602D6001F15DD /* AttachmentSharing.h */, - 340757C11E5602D6001F15DD /* AttachmentSharing.m */, - 451764261DE939F300EDB8B9 /* ContactsPicker.swift */, - E94066141DFC5B7B00B15392 /* ContactsPicker.xib */, - 34802DD51E899CFB0032EA1D /* DebugUITableViewController.h */, - 34802DD61E899CFB0032EA1D /* DebugUITableViewController.m */, - 4505C2C41E64977D00CEBF41 /* ExperienceUpgradesPageViewController.swift */, - 45514DE11DDFA183003EFF90 /* InviteFlow.swift */, - B6BADBE51B88D1AC0086A80D /* LockInteractionController.h */, - B6BADBE61B88D1AC0086A80D /* LockInteractionController.m */, - 345671221E8B1618006EE662 /* OversizeTextMessageViewController.swift */, - 458E382F1D6682450094BD24 /* OWSQRCodeScanningViewController.h */, - 458E38301D6682450094BD24 /* OWSQRCodeScanningViewController.m */, - FC3196311A08141D0094C78E /* Settings */, - FC3196321A08142D0094C78E /* Signals */, - FCFD25791A1543D500F4C644 /* Signup */, - ); - name = "View Controllers"; - path = "view controllers"; - sourceTree = ""; - }; 76EB052B18170B33006006FC /* Views */ = { isa = PBXGroup; children = ( @@ -1161,8 +1209,6 @@ A5509ECB1A69B1D600ABA4BC /* CountryCodeTableViewCell.h */, A5509ECC1A69B1D600ABA4BC /* CountryCodeTableViewCell.m */, 45B201751DAECBFE00C461E0 /* HighlightableLabel.swift */, - FCAC963D19FEF99A0046DFC5 /* InboxTableViewCell.h */, - FCAC963E19FEF99A0046DFC5 /* InboxTableViewCell.m */, 4531C9C21DD8E6D800F08304 /* JSQMessagesCollectionViewCell+OWS.h */, 4531C9C31DD8E6D800F08304 /* JSQMessagesCollectionViewCell+OWS.m */, 45E1F3A41DEF20A100852CF1 /* NoSignalContactsView.swift */, @@ -1186,20 +1232,11 @@ 45F2B1961D9CA207000D2C69 /* OWSOutgoingMessageCollectionViewCell.xib */, 34330AA11E79686200DF2FB9 /* OWSProgressView.h */, 34330AA21E79686200DF2FB9 /* OWSProgressView.m */, - 76EB053818170B33006006FC /* xibs */, ); name = Views; path = views; sourceTree = ""; }; - 76EB053818170B33006006FC /* xibs */ = { - isa = PBXGroup; - children = ( - A507A3AF1A6C60E300BEED0D /* InboxTableViewCell.xib */, - ); - path = xibs; - sourceTree = ""; - }; 9404664EC513585B05DF1350 /* Pods */ = { isa = PBXGroup; children = ( @@ -1279,15 +1316,15 @@ B660F66C1C29867F00687D6E /* test */ = { isa = PBXGroup; children = ( - 4589670F1DC117CC00E9DD21 /* SignalTests-Bridging-Header.h */, - 458E38381D6699110094BD24 /* Models */, - 459C3F0E1C9B3A20003ACF51 /* TSMessageAdapters */, B660F6731C29867F00687D6E /* call */, B660F6751C29867F00687D6E /* contact */, + 458E38381D6699110094BD24 /* Models */, B660F69B1C29868000687D6E /* push */, + 4589670F1DC117CC00E9DD21 /* SignalTests-Bridging-Header.h */, B660F69D1C29868000687D6E /* Supporting Files */, B660F6A01C29868000687D6E /* TestUtil.h */, B660F6A21C29868000687D6E /* util */, + 34B3F8951E8DF1B90035BE1A /* ViewControllers */, ); path = test; sourceTree = ""; @@ -1477,59 +1514,6 @@ path = AudioFiles; sourceTree = ""; }; - FC3196311A08141D0094C78E /* Settings */ = { - isa = PBXGroup; - children = ( - FC31962E1A0814130094C78E /* SettingsTableViewController.h */, - FC31962F1A0814130094C78E /* SettingsTableViewController.m */, - FCD274E01A5AFD8000202277 /* PrivacySettingsTableViewController.h */, - FCD274E11A5AFD8000202277 /* PrivacySettingsTableViewController.m */, - FCD274E61A5AFDC900202277 /* AdvancedSettingsTableViewController.h */, - FCD274E71A5AFDC900202277 /* AdvancedSettingsTableViewController.m */, - B66B9F701AEA6D1100E2E609 /* NotificationSettingsViewController.h */, - B66B9F711AEA6D1100E2E609 /* NotificationSettingsViewController.m */, - B66B9F7B1AEAF40500E2E609 /* NotificationSettingsOptionsViewController.h */, - B66B9F7C1AEAF40500E2E609 /* NotificationSettingsOptionsViewController.m */, - FCD274E91A5AFDDB00202277 /* AboutTableViewController.h */, - FCD274EA1A5AFDDB00202277 /* AboutTableViewController.m */, - 458E38321D66873D0094BD24 /* OWSLinkDeviceViewController.h */, - 458E38331D66873D0094BD24 /* OWSLinkDeviceViewController.m */, - 45EB32CD1D7465C900735B2E /* OWSLinkedDevicesTableViewController.h */, - 45EB32CE1D7465C900735B2E /* OWSLinkedDevicesTableViewController.m */, - ); - name = Settings; - sourceTree = ""; - }; - FC3196321A08142D0094C78E /* Signals */ = { - isa = PBXGroup; - children = ( - 348A08501E6C73490057E290 /* AttachmentApprovalViewController.swift */, - 4509E79B1DD6545B0025A59F /* CallViewController.swift */, - FC31962B1A06A2190094C78E /* FingerprintViewController.h */, - FC31962C1A06A2190094C78E /* FingerprintViewController.m */, - FCB11D911A12A4AA002F93FB /* FullImageViewController.h */, - FCB11D921A12A4AA002F93FB /* FullImageViewController.m */, - FC3196281A067D8F0094C78E /* MessageComposeTableViewController.h */, - FC3196291A067D8F0094C78E /* MessageComposeTableViewController.m */, - FCAC964F19FF0A6E0046DFC5 /* MessagesViewController.h */, - FCAC965019FF0A6E0046DFC5 /* MessagesViewController.m */, - 348A08411E6A044E0057E290 /* MessagesViewController.xib */, - FCFD256D1A151BCB00F4C644 /* NewGroupViewController.h */, - FCFD256E1A151BCB00F4C644 /* NewGroupViewController.m */, - 452E3C8C1D935C77002A45B0 /* OWSConversationSettingsTableViewController.h */, - 452E3C8D1D935C77002A45B0 /* OWSConversationSettingsTableViewController.m */, - 348A08431E6A1D2C0057E290 /* OWSMessagesToolbarContentView.xib */, - A5D0699A1A50E9CB004CB540 /* ShowGroupMembersViewController.h */, - A5D069991A50E9CB004CB540 /* ShowGroupMembersViewController.m */, - 348A08521E6C75590057E290 /* SignalAttachment.swift */, - FC4FA0241A1B9DC600DA100A /* SignalsNavigationController.h */, - FC4FA0251A1B9DC600DA100A /* SignalsNavigationController.m */, - FCAC963A19FEF9280046DFC5 /* SignalsViewController.h */, - FCAC963B19FEF9280046DFC5 /* SignalsViewController.m */, - ); - name = Signals; - sourceTree = ""; - }; FCFA64B11A24F29E0007FB87 /* UI Categories */ = { isa = PBXGroup; children = ( @@ -1553,19 +1537,6 @@ path = ..; sourceTree = ""; }; - FCFD25791A1543D500F4C644 /* Signup */ = { - isa = PBXGroup; - children = ( - FCFD257D1A154B2C00F4C644 /* RegistrationViewController.h */, - FCFD257E1A154B2C00F4C644 /* RegistrationViewController.m */, - FCFD25801A154B3800F4C644 /* CodeVerificationViewController.h */, - FCFD25811A154B3800F4C644 /* CodeVerificationViewController.m */, - B97CBFA518860EA3008E0DE9 /* CountryCodeViewController.h */, - B97CBFA618860EA3008E0DE9 /* CountryCodeViewController.m */, - ); - name = Signup; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -1718,16 +1689,14 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - E94066151DFC5B7B00B15392 /* ContactsPicker.xib in Resources */, AD41D7B61A6F6F0600241130 /* play_button@2x.png in Resources */, AD83FF3F1A73426500B5C81A /* audio_pause_button_blue.png in Resources */, 34330A5A1E7875FB00DF2FB9 /* fontawesome-webfont.ttf in Resources */, - 348A08421E6A044E0057E290 /* MessagesViewController.xib in Resources */, 45E1F3A31DEF1DF000852CF1 /* NoSignalContactsView.xib in Resources */, A5509ECA1A69AB8B00ABA4BC /* Main.storyboard in Resources */, - A507A3B11A6C60E300BEED0D /* InboxTableViewCell.xib in Resources */, 45F2B1971D9CA207000D2C69 /* OWSIncomingMessageCollectionViewCell.xib in Resources */, AD83FF421A73426500B5C81A /* audio_play_button.png in Resources */, + 34B3F8841E8DF1700035BE1A /* MessagesViewController.xib in Resources */, 45F2B1981D9CA207000D2C69 /* OWSOutgoingMessageCollectionViewCell.xib in Resources */, 45C681C41D305C9E0050903A /* OWSCallCollectionViewCell.xib in Resources */, 34330A5C1E787A9800DF2FB9 /* dripicons-v2.ttf in Resources */, @@ -1745,9 +1714,11 @@ AD83FF401A73426500B5C81A /* audio_pause_button_blue@2x.png in Resources */, B66DBF4A19D5BBC8006EA940 /* Images.xcassets in Resources */, 70B8FEE21909FE360042E3F0 /* 171756__nenadsimic__picked-coin-echo-2.wav in Resources */, + 34B3F87F1E8DF1700035BE1A /* InboxTableViewCell.xib in Resources */, 4517642A1DE939FD00EDB8B9 /* ContactCell.xib in Resources */, AD83FF431A73426500B5C81A /* audio_play_button@2x.png in Resources */, 45CB2FA81CB7146C00E1B343 /* Launch Screen.storyboard in Resources */, + 34B3F8781E8DF1700035BE1A /* ContactsPicker.xib in Resources */, B633C5C31A1D190B0059AC12 /* mute_off@2x.png in Resources */, AD83FF411A73426500B5C81A /* audio_play_button_blue@2x.png in Resources */, FC5CDF3A1A3393DD00B47253 /* warning_white@2x.png in Resources */, @@ -1762,13 +1733,13 @@ B67EBF5D19194AC60084CCFD /* Settings.bundle in Resources */, E1370BE418A0686C00826894 /* outring.mp3 in Resources */, B10C9B601A7049EC00ECA2BF /* pause_icon@2x.png in Resources */, + 34B3F88C1E8DF1700035BE1A /* OWSMessagesToolbarContentView.xib in Resources */, B6C6AE551A305ED1006BAF8F /* redphone.cer in Resources */, E1370BE518A0686C00826894 /* r.caf in Resources */, FC9120411A39EFB70074545C /* qr@2x.png in Resources */, E1370BE618A0686C00826894 /* sonarping.mp3 in Resources */, B10C9B5F1A7049EC00ECA2BF /* pause_icon.png in Resources */, AD83FF471A73428300B5C81A /* audio_play_button_blue.png in Resources */, - 348A08441E6A1D2C0057E290 /* OWSMessagesToolbarContentView.xib in Resources */, 34330A5E1E787BD800DF2FB9 /* ElegantIcons.ttf in Resources */, AD83FF451A73426500B5C81A /* audio_pause_button@2x.png in Resources */, ); @@ -1932,44 +1903,42 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + 34B3F8761E8DF1700035BE1A /* CodeVerificationViewController.m in Sources */, 76EB063E18170B33006006FC /* Operation.m in Sources */, + 34B3F8741E8DF1700035BE1A /* AttachmentSharing.m in Sources */, A5509ECD1A69B1D600ABA4BC /* CountryCodeTableViewCell.m in Sources */, 45C9DEB81DF4E35A0065CA84 /* WebRTCCallMessageHandler.swift in Sources */, - 340757C21E5602D6001F15DD /* AttachmentSharing.m in Sources */, + 34B3F88E1E8DF1700035BE1A /* PrivacySettingsTableViewController.m in Sources */, + 34B3F8831E8DF1700035BE1A /* MessagesViewController.m in Sources */, 4505C2C21E648F7A00CEBF41 /* ExperienceUpgradeFinder.swift in Sources */, 344F2F671E57A932000D9322 /* UIViewController+OWS.m in Sources */, B6DA6B071B8A2F9A00CA6F98 /* AppStoreRating.m in Sources */, - 458E38311D6682450094BD24 /* OWSQRCodeScanningViewController.m in Sources */, 451A13B11E13DED2000A50FD /* CallNotificationsAdapter.swift in Sources */, 3456710A1E8A9F5D006EE662 /* TSGenericAttachmentAdapter.m in Sources */, 450DF2091E0DD2C6003D14BE /* UserNotificationsAdaptee.swift in Sources */, - B6BADBE71B88D1AC0086A80D /* LockInteractionController.m in Sources */, 45CD81F21DC03A22004C9430 /* OWSLogger.m in Sources */, - FCB11D931A12A4AA002F93FB /* FullImageViewController.m in Sources */, B60C16651988999D00E97A6C /* VersionMigrations.m in Sources */, B97940271832BD2400BD66CB /* UIUtil.m in Sources */, - 45514DE21DDFA183003EFF90 /* InviteFlow.swift in Sources */, + 34B3F8791E8DF1700035BE1A /* CountryCodeViewController.m in Sources */, 4CE0E3771B954546007210CF /* TSAnimatedAdapter.m in Sources */, 4531C9C41DD8E6D800F08304 /* JSQMessagesCollectionViewCell+OWS.m in Sources */, 4516E3FF1DD2193B00DC4206 /* OWS101ExistingUsersBlockOnIdentityChange.m in Sources */, 4505C2BF1E648EA300CEBF41 /* ExperienceUpgrade.swift in Sources */, 45387B041E36D650005D00B3 /* OWS102MoveLoggingPreferenceToUserDefaults.m in Sources */, - 348A08511E6C73490057E290 /* AttachmentApprovalViewController.swift in Sources */, EF764C351DB67CC5000D9A87 /* UIViewController+CameraPermissions.m in Sources */, 45CD81EF1DC030E7004C9430 /* AccountManager.swift in Sources */, 45794E861E00620000066731 /* CallUIAdapter.swift in Sources */, FCFA64B71A24F6730007FB87 /* UIFont+OWS.m in Sources */, - 348A08531E6C75590057E290 /* SignalAttachment.swift in Sources */, B6B9ECFC198B31BA00C620D3 /* PushManager.m in Sources */, 45DF5DF21DDB843F00C936C7 /* CompareSafetyNumbersActivity.swift in Sources */, 458DE9D91DEE7B360071BB03 /* OWSWebRTCDataProtos.pb.m in Sources */, B62D53F71A23CCAD009AAF82 /* TSMessageAdapter.m in Sources */, - FCD274EB1A5AFDDB00202277 /* AboutTableViewController.m in Sources */, - FCFD257F1A154B2C00F4C644 /* RegistrationViewController.m in Sources */, 76EB063C18170B33006006FC /* NumberUtil.m in Sources */, B6A3EB4B1A423B3800B2236B /* TSPhotoAdapter.m in Sources */, - 4509E79C1DD6545B0025A59F /* CallViewController.swift in Sources */, + 34B3F88F1E8DF1710035BE1A /* RegistrationViewController.m in Sources */, + 34B3F8901E8DF1710035BE1A /* SettingsTableViewController.m in Sources */, 34FD93701E3BD43A00109093 /* OWSAnyTouchGestureRecognizer.m in Sources */, + 34B3F8931E8DF1710035BE1A /* SignalsNavigationController.m in Sources */, 76EB063A18170B33006006FC /* FunctionalUtil.m in Sources */, 76EB058A18170B33006006FC /* Release.m in Sources */, 45D231771DC7E8F10034FA89 /* SessionResetJob.swift in Sources */, @@ -1984,64 +1953,62 @@ 45843D1F1D2236B30013E85A /* OWSContactsSearcher.m in Sources */, 450873C31D9D5149006B54F2 /* OWSExpirationTimerView.m in Sources */, B6258B331C29E2E60014138E /* NotificationsManager.m in Sources */, + 34B3F87B1E8DF1700035BE1A /* ExperienceUpgradesPageViewController.swift in Sources */, 45666EC91D994C0D008FE134 /* OWSGroupAvatarBuilder.m in Sources */, - FCAC963C19FEF9280046DFC5 /* SignalsViewController.m in Sources */, - 345671231E8B1618006EE662 /* OversizeTextMessageViewController.swift in Sources */, - B66B9F7D1AEAF40500E2E609 /* NotificationSettingsOptionsViewController.m in Sources */, + 34B3F87A1E8DF1700035BE1A /* DebugUITableViewController.m in Sources */, + 34B3F87C1E8DF1700035BE1A /* FingerprintViewController.m in Sources */, 76EB058218170B33006006FC /* Environment.m in Sources */, + 34B3F8921E8DF1710035BE1A /* SignalAttachment.swift in Sources */, 45464DBC1DFA041F001D3FD6 /* DataChannelMessage.swift in Sources */, 450DF2051E0D74AC003D14BE /* Platform.swift in Sources */, 45666F561D9B2827008FE134 /* OWSScrubbingLogFormatter.m in Sources */, 45C0DC1E1E69011F00E04C47 /* UIStoryboard+OWS.swift in Sources */, 45C681C61D305C9E0050903A /* OWSDisplayedMessageCollectionViewCell.m in Sources */, + 34B3F8861E8DF1700035BE1A /* NotificationSettingsOptionsViewController.m in Sources */, 452ECA4D1E087E7200E2F016 /* MessageFetcherJob.swift in Sources */, - A5D0699B1A50E9CB004CB540 /* ShowGroupMembersViewController.m in Sources */, + 34B3F8321E8DF11D0035BE1A /* GroupContactsResult.m in Sources */, 45855F371D9498A40084F340 /* OWSContactAvatarBuilder.m in Sources */, - FC31962D1A06A2190094C78E /* FingerprintViewController.m in Sources */, - FC3196301A0814130094C78E /* SettingsTableViewController.m in Sources */, 45666EC61D99483D008FE134 /* OWSAvatarBuilder.m in Sources */, 45E615161E8C590B0018AD52 /* DisplayableTextFilter.swift in Sources */, + 34B3F88A1E8DF1700035BE1A /* OWSLinkDeviceViewController.m in Sources */, 76EB068618170B34006006FC /* ContactTableViewCell.m in Sources */, - FCAC965119FF0A6E0046DFC5 /* MessagesViewController.m in Sources */, + 34B3F8881E8DF1700035BE1A /* OversizeTextMessageViewController.swift in Sources */, 34330AA31E79686200DF2FB9 /* OWSProgressView.m in Sources */, 453D28BA1D332DB100D523F0 /* OWSMessagesBubblesSizeCalculator.m in Sources */, 45F170AC1E2F0351003FC1F2 /* CallAudioSession.swift in Sources */, + 34B3F8801E8DF1700035BE1A /* InviteFlow.swift in Sources */, B68EF9BB1C0B1EBD009C3DCD /* FLAnimatedImageView.m in Sources */, 45F170CC1E310E22003FC1F2 /* WeakTimer.swift in Sources */, + 34B3F8871E8DF1700035BE1A /* NotificationSettingsViewController.m in Sources */, A5E9D4BB1A65FAD800E4481C /* TSVideoAttachmentAdapter.m in Sources */, - FCAC964019FEF99A0046DFC5 /* InboxTableViewCell.m in Sources */, - 4505C2C51E64977D00CEBF41 /* ExperienceUpgradesPageViewController.swift in Sources */, 458E38371D668EBF0094BD24 /* OWSDeviceProvisioningURLParser.m in Sources */, FCFA64B41A24F3880007FB87 /* UIColor+OWS.m in Sources */, 4517642B1DE939FD00EDB8B9 /* ContactCell.swift in Sources */, - 451764271DE939F300EDB8B9 /* ContactsPicker.swift in Sources */, 450573FE1E78A06D00615BB4 /* OWS103EnableVideoCalling.m in Sources */, + 34B3F8751E8DF1700035BE1A /* CallViewController.swift in Sources */, + 34B3F8851E8DF1700035BE1A /* NewGroupViewController.m in Sources */, B6C93C4E199567AD00EDF894 /* DebugLogger.m in Sources */, + 34B3F8821E8DF1700035BE1A /* MessageComposeTableViewController.m in Sources */, 45F659821E1BE77000444429 /* NonCallKitCallUIAdaptee.swift in Sources */, - 458E38341D66873D0094BD24 /* OWSLinkDeviceViewController.m in Sources */, 45AE48511E0732D6004D96C2 /* TurnServerInfo.swift in Sources */, + 34B3F8771E8DF1700035BE1A /* ContactsPicker.swift in Sources */, 45C0DC1B1E68FE9000E04C47 /* UIApplication+frontmostViewController.swift in Sources */, - 452E3C8E1D935C77002A45B0 /* OWSConversationSettingsTableViewController.m in Sources */, 34535D821E256BE9008A4747 /* UIView+OWS.m in Sources */, - FC31962A1A067D8F0094C78E /* MessageComposeTableViewController.m in Sources */, - FCD274E81A5AFDC900202277 /* AdvancedSettingsTableViewController.m in Sources */, 45F3AEB61DFDE7900080CE33 /* AvatarImageView.swift in Sources */, 7038632718F70C0700D4A43F /* CryptoTools.m in Sources */, 45FBC5C81DF8575700E9B410 /* CallKitCallManager.swift in Sources */, + 34B3F8911E8DF1710035BE1A /* ShowGroupMembersViewController.m in Sources */, 45FBC5D11DF8592E00E9B410 /* SignalCall.swift in Sources */, - B671B2461A93B238002BBD9D /* GroupContactsResult.m in Sources */, - B66B9F721AEA6D1100E2E609 /* NotificationSettingsViewController.m in Sources */, 452C468F1E427E200087B011 /* OutboundCallInitiator.swift in Sources */, - FCFD25821A154B3800F4C644 /* CodeVerificationViewController.m in Sources */, 453D28B71D32BA5F00D523F0 /* OWSDisplayedMessage.m in Sources */, 45F170BB1E2FC5D3003FC1F2 /* CallAudioService.swift in Sources */, - FC4FA0261A1B9DC600DA100A /* SignalsNavigationController.m in Sources */, - 45EB32CF1D7465C900735B2E /* OWSLinkedDevicesTableViewController.m in Sources */, + 34B3F8711E8DF1700035BE1A /* AboutTableViewController.m in Sources */, + 34B3F88D1E8DF1700035BE1A /* OWSQRCodeScanningViewController.m in Sources */, + 34B3F8811E8DF1700035BE1A /* LockInteractionController.m in Sources */, 45F659731E1BD99C00444429 /* CallKitCallUIAdaptee.swift in Sources */, 45BB93381E688E14001E3939 /* UIDevice+featureSupport.swift in Sources */, 458DE9D61DEE3FD00071BB03 /* PeerConnectionClient.swift in Sources */, 451DE9FD1DC1A28200810E42 /* SyncPushTokensJob.swift in Sources */, - FCFD256F1A151BCB00F4C644 /* NewGroupViewController.m in Sources */, 45666F761D9BFE00008FE134 /* OWS100RemoveTSRecipientsMigration.m in Sources */, FCC81A981A44558300DFEC7D /* UIDevice+TSHardwareVersion.m in Sources */, 76EB054018170B33006006FC /* AppDelegate.m in Sources */, @@ -2053,22 +2020,26 @@ B609597C1C2C0FC6004E8797 /* iRate.m in Sources */, 4574A5D61DD6704700C6B692 /* CallService.swift in Sources */, 45E1F3A51DEF20A100852CF1 /* NoSignalContactsView.swift in Sources */, - FCD274E21A5AFD8000202277 /* PrivacySettingsTableViewController.m in Sources */, + 34B3F8721E8DF1700035BE1A /* AdvancedSettingsTableViewController.m in Sources */, 45F170D61E315310003FC1F2 /* Weak.swift in Sources */, - B97CBFA818860EA3008E0DE9 /* CountryCodeViewController.m in Sources */, + 34B3F8891E8DF1700035BE1A /* OWSConversationSettingsTableViewController.m in Sources */, + 34B3F87E1E8DF1700035BE1A /* InboxTableViewCell.m in Sources */, + 34B3F8731E8DF1700035BE1A /* AttachmentApprovalViewController.swift in Sources */, B6B1013C196D213F007E3930 /* SignalKeyingStorage.m in Sources */, B62F5E101C2980B4000D370C /* NSData+ows_StripToken.m in Sources */, 45E2E9201E153B3D00457AA0 /* Strings.swift in Sources */, + 34B3F88B1E8DF1700035BE1A /* OWSLinkedDevicesTableViewController.m in Sources */, 45666F7E1D9C0814008FE134 /* OWSDatabaseMigrationRunner.m in Sources */, 4579431E1E7C8CE9008ED0C0 /* Pastelog.m in Sources */, + 34B3F8941E8DF1710035BE1A /* SignalsViewController.m in Sources */, 45C681BC1D305C080050903A /* OWSCallCollectionViewCell.m in Sources */, 76EB058818170B33006006FC /* PropertyListPreferences.m in Sources */, 34330A611E788EA900DF2FB9 /* AttachmentUploadView.m in Sources */, + 34B3F87D1E8DF1700035BE1A /* FullImageViewController.m in Sources */, 45666F7B1D9C0533008FE134 /* OWSDatabaseMigration.m in Sources */, B90418E6183E9DD40038554A /* DateUtil.m in Sources */, 45B201761DAECBFE00C461E0 /* HighlightableLabel.swift in Sources */, 459311FC1D75C948008DD4F0 /* OWSDeviceTableViewCell.m in Sources */, - 34802DD71E899CFB0032EA1D /* DebugUITableViewController.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2078,7 +2049,6 @@ files = ( 4505C2C31E648F7A00CEBF41 /* ExperienceUpgradeFinder.swift in Sources */, 456F6E241E24133E00FD2210 /* CallKitCallUIAdaptee.swift in Sources */, - 459C3F0D1C9B3A1B003ACF51 /* TSMessageAdapterTest.m in Sources */, 456F6E251E24216100FD2210 /* DataChannelMessage.swift in Sources */, 452ECA4E1E087E7200E2F016 /* MessageFetcherJob.swift in Sources */, 45F170AD1E2F0351003FC1F2 /* CallAudioSession.swift in Sources */, @@ -2087,7 +2057,6 @@ 456F6E2F1E261D1000FD2210 /* PeerConnectionClientTest.swift in Sources */, 452C46901E427E200087B011 /* OutboundCallInitiator.swift in Sources */, 451DE9F81DC18C9500810E42 /* AccountManager.swift in Sources */, - B660F7161C29988E00687D6E /* GroupContactsResult.m in Sources */, B660F7171C29988E00687D6E /* OWSContactsManager.m in Sources */, B660F7181C29988E00687D6E /* CryptoTools.m in Sources */, B660F71B1C29988E00687D6E /* Environment.m in Sources */, @@ -2107,6 +2076,7 @@ 45C681C71D305C9E0050903A /* OWSDisplayedMessageCollectionViewCell.m in Sources */, 451DE9FE1DC1A28200810E42 /* SyncPushTokensJob.swift in Sources */, 45F170AF1E2F0393003FC1F2 /* CallAudioSessionTest.swift in Sources */, + 34B3F8991E8DF1B90035BE1A /* TSMessageAdapterTest.m in Sources */, 456F6E231E24133500FD2210 /* Platform.swift in Sources */, 45843D201D2236B30013E85A /* OWSContactsSearcher.m in Sources */, 45C681BD1D305C080050903A /* OWSCallCollectionViewCell.m in Sources */, @@ -2146,7 +2116,6 @@ B660F6DA1C29868000687D6E /* ExceptionsTest.m in Sources */, 45C9DEB91DF4E35A0065CA84 /* WebRTCCallMessageHandler.swift in Sources */, B660F6DB1C29868000687D6E /* FunctionalUtilTest.m in Sources */, - 452E3C8F1D935C77002A45B0 /* OWSConversationSettingsTableViewController.m in Sources */, 45E7A6A81E71CA7E00D44FB5 /* DisplayableTextFilterTest.swift in Sources */, 456F6E201E2411A000FD2210 /* CallService.swift in Sources */, 45E615171E8C59100018AD52 /* DisplayableTextFilter.swift in Sources */, @@ -2157,7 +2126,6 @@ 45C0DC1F1E69011F00E04C47 /* UIStoryboard+OWS.swift in Sources */, 4505C2C01E648EA300CEBF41 /* ExperienceUpgrade.swift in Sources */, 450873C81D9D867B006B54F2 /* OWSIncomingMessageCollectionViewCell.m in Sources */, - 4505C2C61E64977D00CEBF41 /* ExperienceUpgradesPageViewController.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/Signal/src/view controllers/AboutTableViewController.h b/Signal/src/ViewControllers/AboutTableViewController.h similarity index 100% rename from Signal/src/view controllers/AboutTableViewController.h rename to Signal/src/ViewControllers/AboutTableViewController.h diff --git a/Signal/src/view controllers/AboutTableViewController.m b/Signal/src/ViewControllers/AboutTableViewController.m similarity index 100% rename from Signal/src/view controllers/AboutTableViewController.m rename to Signal/src/ViewControllers/AboutTableViewController.m diff --git a/Signal/src/view controllers/AdvancedSettingsTableViewController.h b/Signal/src/ViewControllers/AdvancedSettingsTableViewController.h similarity index 100% rename from Signal/src/view controllers/AdvancedSettingsTableViewController.h rename to Signal/src/ViewControllers/AdvancedSettingsTableViewController.h diff --git a/Signal/src/view controllers/AdvancedSettingsTableViewController.m b/Signal/src/ViewControllers/AdvancedSettingsTableViewController.m similarity index 100% rename from Signal/src/view controllers/AdvancedSettingsTableViewController.m rename to Signal/src/ViewControllers/AdvancedSettingsTableViewController.m diff --git a/Signal/src/view controllers/AttachmentApprovalViewController.swift b/Signal/src/ViewControllers/AttachmentApprovalViewController.swift similarity index 100% rename from Signal/src/view controllers/AttachmentApprovalViewController.swift rename to Signal/src/ViewControllers/AttachmentApprovalViewController.swift diff --git a/Signal/src/view controllers/AttachmentSharing.h b/Signal/src/ViewControllers/AttachmentSharing.h similarity index 100% rename from Signal/src/view controllers/AttachmentSharing.h rename to Signal/src/ViewControllers/AttachmentSharing.h diff --git a/Signal/src/view controllers/AttachmentSharing.m b/Signal/src/ViewControllers/AttachmentSharing.m similarity index 100% rename from Signal/src/view controllers/AttachmentSharing.m rename to Signal/src/ViewControllers/AttachmentSharing.m diff --git a/Signal/src/view controllers/CallViewController.swift b/Signal/src/ViewControllers/CallViewController.swift similarity index 100% rename from Signal/src/view controllers/CallViewController.swift rename to Signal/src/ViewControllers/CallViewController.swift diff --git a/Signal/src/view controllers/CodeVerificationViewController.h b/Signal/src/ViewControllers/CodeVerificationViewController.h similarity index 100% rename from Signal/src/view controllers/CodeVerificationViewController.h rename to Signal/src/ViewControllers/CodeVerificationViewController.h diff --git a/Signal/src/view controllers/CodeVerificationViewController.m b/Signal/src/ViewControllers/CodeVerificationViewController.m similarity index 100% rename from Signal/src/view controllers/CodeVerificationViewController.m rename to Signal/src/ViewControllers/CodeVerificationViewController.m diff --git a/Signal/src/view controllers/ContactsPicker.swift b/Signal/src/ViewControllers/ContactsPicker.swift similarity index 100% rename from Signal/src/view controllers/ContactsPicker.swift rename to Signal/src/ViewControllers/ContactsPicker.swift diff --git a/Signal/src/view controllers/ContactsPicker.xib b/Signal/src/ViewControllers/ContactsPicker.xib similarity index 100% rename from Signal/src/view controllers/ContactsPicker.xib rename to Signal/src/ViewControllers/ContactsPicker.xib diff --git a/Signal/src/view controllers/CountryCodeViewController.h b/Signal/src/ViewControllers/CountryCodeViewController.h similarity index 100% rename from Signal/src/view controllers/CountryCodeViewController.h rename to Signal/src/ViewControllers/CountryCodeViewController.h diff --git a/Signal/src/view controllers/CountryCodeViewController.m b/Signal/src/ViewControllers/CountryCodeViewController.m similarity index 100% rename from Signal/src/view controllers/CountryCodeViewController.m rename to Signal/src/ViewControllers/CountryCodeViewController.m diff --git a/Signal/src/view controllers/DebugUITableViewController.h b/Signal/src/ViewControllers/DebugUITableViewController.h similarity index 100% rename from Signal/src/view controllers/DebugUITableViewController.h rename to Signal/src/ViewControllers/DebugUITableViewController.h diff --git a/Signal/src/view controllers/DebugUITableViewController.m b/Signal/src/ViewControllers/DebugUITableViewController.m similarity index 100% rename from Signal/src/view controllers/DebugUITableViewController.m rename to Signal/src/ViewControllers/DebugUITableViewController.m diff --git a/Signal/src/view controllers/ExperienceUpgradesPageViewController.swift b/Signal/src/ViewControllers/ExperienceUpgradesPageViewController.swift similarity index 100% rename from Signal/src/view controllers/ExperienceUpgradesPageViewController.swift rename to Signal/src/ViewControllers/ExperienceUpgradesPageViewController.swift diff --git a/Signal/src/view controllers/FingerprintViewController.h b/Signal/src/ViewControllers/FingerprintViewController.h similarity index 100% rename from Signal/src/view controllers/FingerprintViewController.h rename to Signal/src/ViewControllers/FingerprintViewController.h diff --git a/Signal/src/view controllers/FingerprintViewController.m b/Signal/src/ViewControllers/FingerprintViewController.m similarity index 100% rename from Signal/src/view controllers/FingerprintViewController.m rename to Signal/src/ViewControllers/FingerprintViewController.m diff --git a/Signal/src/view controllers/FullImageViewController.h b/Signal/src/ViewControllers/FullImageViewController.h similarity index 100% rename from Signal/src/view controllers/FullImageViewController.h rename to Signal/src/ViewControllers/FullImageViewController.h diff --git a/Signal/src/view controllers/FullImageViewController.m b/Signal/src/ViewControllers/FullImageViewController.m similarity index 100% rename from Signal/src/view controllers/FullImageViewController.m rename to Signal/src/ViewControllers/FullImageViewController.m diff --git a/Signal/src/view controllers/InboxTableViewCell.h b/Signal/src/ViewControllers/InboxTableViewCell.h similarity index 100% rename from Signal/src/view controllers/InboxTableViewCell.h rename to Signal/src/ViewControllers/InboxTableViewCell.h diff --git a/Signal/src/view controllers/InboxTableViewCell.m b/Signal/src/ViewControllers/InboxTableViewCell.m similarity index 100% rename from Signal/src/view controllers/InboxTableViewCell.m rename to Signal/src/ViewControllers/InboxTableViewCell.m diff --git a/Signal/src/view controllers/InboxTableViewCell.xib b/Signal/src/ViewControllers/InboxTableViewCell.xib similarity index 100% rename from Signal/src/view controllers/InboxTableViewCell.xib rename to Signal/src/ViewControllers/InboxTableViewCell.xib diff --git a/Signal/src/view controllers/InviteFlow.swift b/Signal/src/ViewControllers/InviteFlow.swift similarity index 100% rename from Signal/src/view controllers/InviteFlow.swift rename to Signal/src/ViewControllers/InviteFlow.swift diff --git a/Signal/src/view controllers/LockInteractionController.h b/Signal/src/ViewControllers/LockInteractionController.h similarity index 100% rename from Signal/src/view controllers/LockInteractionController.h rename to Signal/src/ViewControllers/LockInteractionController.h diff --git a/Signal/src/view controllers/LockInteractionController.m b/Signal/src/ViewControllers/LockInteractionController.m similarity index 100% rename from Signal/src/view controllers/LockInteractionController.m rename to Signal/src/ViewControllers/LockInteractionController.m diff --git a/Signal/src/view controllers/MessageComposeTableViewController.h b/Signal/src/ViewControllers/MessageComposeTableViewController.h similarity index 100% rename from Signal/src/view controllers/MessageComposeTableViewController.h rename to Signal/src/ViewControllers/MessageComposeTableViewController.h diff --git a/Signal/src/view controllers/MessageComposeTableViewController.m b/Signal/src/ViewControllers/MessageComposeTableViewController.m similarity index 100% rename from Signal/src/view controllers/MessageComposeTableViewController.m rename to Signal/src/ViewControllers/MessageComposeTableViewController.m diff --git a/Signal/src/view controllers/MessagesViewController.h b/Signal/src/ViewControllers/MessagesViewController.h similarity index 100% rename from Signal/src/view controllers/MessagesViewController.h rename to Signal/src/ViewControllers/MessagesViewController.h diff --git a/Signal/src/view controllers/MessagesViewController.m b/Signal/src/ViewControllers/MessagesViewController.m similarity index 100% rename from Signal/src/view controllers/MessagesViewController.m rename to Signal/src/ViewControllers/MessagesViewController.m diff --git a/Signal/src/view controllers/MessagesViewController.xib b/Signal/src/ViewControllers/MessagesViewController.xib similarity index 100% rename from Signal/src/view controllers/MessagesViewController.xib rename to Signal/src/ViewControllers/MessagesViewController.xib diff --git a/Signal/src/view controllers/NewGroupViewController.h b/Signal/src/ViewControllers/NewGroupViewController.h similarity index 100% rename from Signal/src/view controllers/NewGroupViewController.h rename to Signal/src/ViewControllers/NewGroupViewController.h diff --git a/Signal/src/view controllers/NewGroupViewController.m b/Signal/src/ViewControllers/NewGroupViewController.m similarity index 100% rename from Signal/src/view controllers/NewGroupViewController.m rename to Signal/src/ViewControllers/NewGroupViewController.m diff --git a/Signal/src/view controllers/NotificationSettingsOptionsViewController.h b/Signal/src/ViewControllers/NotificationSettingsOptionsViewController.h similarity index 100% rename from Signal/src/view controllers/NotificationSettingsOptionsViewController.h rename to Signal/src/ViewControllers/NotificationSettingsOptionsViewController.h diff --git a/Signal/src/view controllers/NotificationSettingsOptionsViewController.m b/Signal/src/ViewControllers/NotificationSettingsOptionsViewController.m similarity index 100% rename from Signal/src/view controllers/NotificationSettingsOptionsViewController.m rename to Signal/src/ViewControllers/NotificationSettingsOptionsViewController.m diff --git a/Signal/src/view controllers/NotificationSettingsViewController.h b/Signal/src/ViewControllers/NotificationSettingsViewController.h similarity index 100% rename from Signal/src/view controllers/NotificationSettingsViewController.h rename to Signal/src/ViewControllers/NotificationSettingsViewController.h diff --git a/Signal/src/view controllers/NotificationSettingsViewController.m b/Signal/src/ViewControllers/NotificationSettingsViewController.m similarity index 100% rename from Signal/src/view controllers/NotificationSettingsViewController.m rename to Signal/src/ViewControllers/NotificationSettingsViewController.m diff --git a/Signal/src/view controllers/OWSConversationSettingsTableViewController.h b/Signal/src/ViewControllers/OWSConversationSettingsTableViewController.h similarity index 100% rename from Signal/src/view controllers/OWSConversationSettingsTableViewController.h rename to Signal/src/ViewControllers/OWSConversationSettingsTableViewController.h diff --git a/Signal/src/view controllers/OWSConversationSettingsTableViewController.m b/Signal/src/ViewControllers/OWSConversationSettingsTableViewController.m similarity index 100% rename from Signal/src/view controllers/OWSConversationSettingsTableViewController.m rename to Signal/src/ViewControllers/OWSConversationSettingsTableViewController.m diff --git a/Signal/src/view controllers/OWSLinkDeviceViewController.h b/Signal/src/ViewControllers/OWSLinkDeviceViewController.h similarity index 100% rename from Signal/src/view controllers/OWSLinkDeviceViewController.h rename to Signal/src/ViewControllers/OWSLinkDeviceViewController.h diff --git a/Signal/src/view controllers/OWSLinkDeviceViewController.m b/Signal/src/ViewControllers/OWSLinkDeviceViewController.m similarity index 100% rename from Signal/src/view controllers/OWSLinkDeviceViewController.m rename to Signal/src/ViewControllers/OWSLinkDeviceViewController.m diff --git a/Signal/src/view controllers/OWSLinkedDevicesTableViewController.h b/Signal/src/ViewControllers/OWSLinkedDevicesTableViewController.h similarity index 100% rename from Signal/src/view controllers/OWSLinkedDevicesTableViewController.h rename to Signal/src/ViewControllers/OWSLinkedDevicesTableViewController.h diff --git a/Signal/src/view controllers/OWSLinkedDevicesTableViewController.m b/Signal/src/ViewControllers/OWSLinkedDevicesTableViewController.m similarity index 100% rename from Signal/src/view controllers/OWSLinkedDevicesTableViewController.m rename to Signal/src/ViewControllers/OWSLinkedDevicesTableViewController.m diff --git a/Signal/src/view controllers/OWSMessagesToolbarContentView.xib b/Signal/src/ViewControllers/OWSMessagesToolbarContentView.xib similarity index 100% rename from Signal/src/view controllers/OWSMessagesToolbarContentView.xib rename to Signal/src/ViewControllers/OWSMessagesToolbarContentView.xib diff --git a/Signal/src/view controllers/OWSQRCodeScanningViewController.h b/Signal/src/ViewControllers/OWSQRCodeScanningViewController.h similarity index 100% rename from Signal/src/view controllers/OWSQRCodeScanningViewController.h rename to Signal/src/ViewControllers/OWSQRCodeScanningViewController.h diff --git a/Signal/src/view controllers/OWSQRCodeScanningViewController.m b/Signal/src/ViewControllers/OWSQRCodeScanningViewController.m similarity index 100% rename from Signal/src/view controllers/OWSQRCodeScanningViewController.m rename to Signal/src/ViewControllers/OWSQRCodeScanningViewController.m diff --git a/Signal/src/view controllers/OversizeTextMessageViewController.swift b/Signal/src/ViewControllers/OversizeTextMessageViewController.swift similarity index 100% rename from Signal/src/view controllers/OversizeTextMessageViewController.swift rename to Signal/src/ViewControllers/OversizeTextMessageViewController.swift diff --git a/Signal/src/view controllers/PrivacySettingsTableViewController.h b/Signal/src/ViewControllers/PrivacySettingsTableViewController.h similarity index 100% rename from Signal/src/view controllers/PrivacySettingsTableViewController.h rename to Signal/src/ViewControllers/PrivacySettingsTableViewController.h diff --git a/Signal/src/view controllers/PrivacySettingsTableViewController.m b/Signal/src/ViewControllers/PrivacySettingsTableViewController.m similarity index 100% rename from Signal/src/view controllers/PrivacySettingsTableViewController.m rename to Signal/src/ViewControllers/PrivacySettingsTableViewController.m diff --git a/Signal/src/view controllers/RegistrationViewController.h b/Signal/src/ViewControllers/RegistrationViewController.h similarity index 100% rename from Signal/src/view controllers/RegistrationViewController.h rename to Signal/src/ViewControllers/RegistrationViewController.h diff --git a/Signal/src/view controllers/RegistrationViewController.m b/Signal/src/ViewControllers/RegistrationViewController.m similarity index 100% rename from Signal/src/view controllers/RegistrationViewController.m rename to Signal/src/ViewControllers/RegistrationViewController.m diff --git a/Signal/src/view controllers/SettingsTableViewController.h b/Signal/src/ViewControllers/SettingsTableViewController.h similarity index 100% rename from Signal/src/view controllers/SettingsTableViewController.h rename to Signal/src/ViewControllers/SettingsTableViewController.h diff --git a/Signal/src/view controllers/SettingsTableViewController.m b/Signal/src/ViewControllers/SettingsTableViewController.m similarity index 100% rename from Signal/src/view controllers/SettingsTableViewController.m rename to Signal/src/ViewControllers/SettingsTableViewController.m diff --git a/Signal/src/view controllers/ShowGroupMembersViewController.h b/Signal/src/ViewControllers/ShowGroupMembersViewController.h similarity index 100% rename from Signal/src/view controllers/ShowGroupMembersViewController.h rename to Signal/src/ViewControllers/ShowGroupMembersViewController.h diff --git a/Signal/src/view controllers/ShowGroupMembersViewController.m b/Signal/src/ViewControllers/ShowGroupMembersViewController.m similarity index 100% rename from Signal/src/view controllers/ShowGroupMembersViewController.m rename to Signal/src/ViewControllers/ShowGroupMembersViewController.m diff --git a/Signal/src/view controllers/SignalAttachment.swift b/Signal/src/ViewControllers/SignalAttachment.swift similarity index 100% rename from Signal/src/view controllers/SignalAttachment.swift rename to Signal/src/ViewControllers/SignalAttachment.swift diff --git a/Signal/src/view controllers/SignalsNavigationController.h b/Signal/src/ViewControllers/SignalsNavigationController.h similarity index 100% rename from Signal/src/view controllers/SignalsNavigationController.h rename to Signal/src/ViewControllers/SignalsNavigationController.h diff --git a/Signal/src/view controllers/SignalsNavigationController.m b/Signal/src/ViewControllers/SignalsNavigationController.m similarity index 100% rename from Signal/src/view controllers/SignalsNavigationController.m rename to Signal/src/ViewControllers/SignalsNavigationController.m diff --git a/Signal/src/view controllers/SignalsViewController.h b/Signal/src/ViewControllers/SignalsViewController.h similarity index 100% rename from Signal/src/view controllers/SignalsViewController.h rename to Signal/src/ViewControllers/SignalsViewController.h diff --git a/Signal/src/view controllers/SignalsViewController.m b/Signal/src/ViewControllers/SignalsViewController.m similarity index 100% rename from Signal/src/view controllers/SignalsViewController.m rename to Signal/src/ViewControllers/SignalsViewController.m diff --git a/Signal/src/phone/signaling/number directory/GroupContactsResult.h b/Signal/src/contact/GroupContactsResult.h similarity index 100% rename from Signal/src/phone/signaling/number directory/GroupContactsResult.h rename to Signal/src/contact/GroupContactsResult.h diff --git a/Signal/src/phone/signaling/number directory/GroupContactsResult.m b/Signal/src/contact/GroupContactsResult.m similarity index 100% rename from Signal/src/phone/signaling/number directory/GroupContactsResult.m rename to Signal/src/contact/GroupContactsResult.m diff --git a/Signal/test/view controllers/Signals/TSMessageAdapters/TSMessageAdapterTest.m b/Signal/test/ViewControllers/Signals/TSMessageAdapters/TSMessageAdapterTest.m similarity index 100% rename from Signal/test/view controllers/Signals/TSMessageAdapters/TSMessageAdapterTest.m rename to Signal/test/ViewControllers/Signals/TSMessageAdapters/TSMessageAdapterTest.m