Browse Source

Merge SignalMessaging into SignalUtilitiesKit

pull/311/head
nielsandriesse 2 years ago
parent
commit
ffa64e4747
  1. 2
      Podfile
  2. 2
      Podfile.lock
  3. 2
      Pods
  4. 1954
      Signal.xcodeproj/project.pbxproj
  5. 2
      Signal/src/ViewControllers/ConversationView/ConversationViewController.h
  6. 24
      SignalMessaging/Info.plist
  7. 29
      SignalMessaging/Loki/Migrations/LK002RemoveFriendRequests.swift
  8. 20
      SignalMessaging/SignalMessaging-Prefix.pch
  9. 60
      SignalMessaging/SignalMessaging.h
  10. 0
      SignalUtilitiesKit/AppPreferences.swift
  11. 0
      SignalUtilitiesKit/AppSetup.h
  12. 8
      SignalUtilitiesKit/AppSetup.m
  13. 0
      SignalUtilitiesKit/ApprovalRailCellView.swift
  14. 0
      SignalUtilitiesKit/AttachmentApprovalInputAccessoryView.swift
  15. 0
      SignalUtilitiesKit/AttachmentApprovalViewController.swift
  16. 0
      SignalUtilitiesKit/AttachmentCaptionToolbar.swift
  17. 0
      SignalUtilitiesKit/AttachmentCaptionViewController.swift
  18. 0
      SignalUtilitiesKit/AttachmentItemCollection.swift
  19. 0
      SignalUtilitiesKit/AttachmentPrepViewController.swift
  20. 0
      SignalUtilitiesKit/AttachmentSharing.h
  21. 0
      SignalUtilitiesKit/AttachmentSharing.m
  22. 0
      SignalUtilitiesKit/AttachmentTextToolbar.swift
  23. 0
      SignalUtilitiesKit/AttachmentTextView.swift
  24. 0
      SignalUtilitiesKit/AvatarImageView.swift
  25. 0
      SignalUtilitiesKit/Bench.swift
  26. 0
      SignalUtilitiesKit/BlockListCache.swift
  27. 0
      SignalUtilitiesKit/BlockListUIUtils.h
  28. 6
      SignalUtilitiesKit/BlockListUIUtils.m
  29. 0
      SignalUtilitiesKit/Collection+OWS.swift
  30. 0
      SignalUtilitiesKit/CommonStrings.swift
  31. 0
      SignalUtilitiesKit/ContactCellView.h
  32. 2
      SignalUtilitiesKit/ContactCellView.m
  33. 0
      SignalUtilitiesKit/ContactFieldView.swift
  34. 0
      SignalUtilitiesKit/ContactShareApprovalViewController.swift
  35. 0
      SignalUtilitiesKit/ContactShareViewModel.swift
  36. 0
      SignalUtilitiesKit/ContactTableViewCell.h
  37. 0
      SignalUtilitiesKit/ContactTableViewCell.m
  38. 2
      SignalUtilitiesKit/ContactsUpdater.h
  39. 0
      SignalUtilitiesKit/ContactsViewHelper.h
  40. 4
      SignalUtilitiesKit/ContactsViewHelper.m
  41. 0
      SignalUtilitiesKit/ConversationStyle.swift
  42. 1
      SignalUtilitiesKit/DataSource.m
  43. 0
      SignalUtilitiesKit/DebugLogger.h
  44. 0
      SignalUtilitiesKit/DebugLogger.m
  45. 0
      SignalUtilitiesKit/DeviceSleepManager.swift
  46. 0
      SignalUtilitiesKit/DirectionalPanGestureRecognizer.swift
  47. 0
      SignalUtilitiesKit/DisappearingTimerConfigurationView.swift
  48. 0
      SignalUtilitiesKit/DisplayableText.swift
  49. 0
      SignalUtilitiesKit/EditContactShareNameViewController.swift
  50. 7
      SignalUtilitiesKit/Environment.h
  51. 13
      SignalUtilitiesKit/Environment.m
  52. 0
      SignalUtilitiesKit/FullTextSearcher.swift
  53. 0
      SignalUtilitiesKit/GalleryRailView.swift
  54. 0
      SignalUtilitiesKit/GradientView.swift
  55. 0
      SignalUtilitiesKit/Identicon+ObjC.swift
  56. 0
      SignalUtilitiesKit/ImageCache.swift
  57. 0
      SignalUtilitiesKit/ImageEditorBrushViewController.swift
  58. 0
      SignalUtilitiesKit/ImageEditorCanvasView.swift
  59. 0
      SignalUtilitiesKit/ImageEditorContents.swift
  60. 0
      SignalUtilitiesKit/ImageEditorCropViewController.swift
  61. 0
      SignalUtilitiesKit/ImageEditorItem.swift
  62. 0
      SignalUtilitiesKit/ImageEditorModel.swift
  63. 0
      SignalUtilitiesKit/ImageEditorPaletteView.swift
  64. 0
      SignalUtilitiesKit/ImageEditorPanGestureRecognizer.swift
  65. 0
      SignalUtilitiesKit/ImageEditorPinchGestureRecognizer.swift
  66. 0
      SignalUtilitiesKit/ImageEditorStrokeItem.swift
  67. 0
      SignalUtilitiesKit/ImageEditorTextItem.swift
  68. 0
      SignalUtilitiesKit/ImageEditorTextViewController.swift
  69. 0
      SignalUtilitiesKit/ImageEditorTransform.swift
  70. 0
      SignalUtilitiesKit/ImageEditorView.swift
  71. 2
      SignalUtilitiesKit/LKSyncOpenGroupsMessage.h
  72. 2
      SignalUtilitiesKit/LKUnlinkDeviceMessage.h
  73. 0
      SignalUtilitiesKit/MediaMessageView.swift
  74. 0
      SignalUtilitiesKit/MessageApprovalViewController.swift
  75. 17
      SignalUtilitiesKit/Meta/SignalUtilitiesKit-Prefix.pch
  76. 19
      SignalUtilitiesKit/Meta/SignalUtilitiesKit.h
  77. 0
      SignalUtilitiesKit/ModalActivityIndicatorViewController.swift
  78. 2
      SignalUtilitiesKit/MultiDeviceProtocol.swift
  79. 0
      SignalUtilitiesKit/NSAttributedString+OWS.h
  80. 0
      SignalUtilitiesKit/NSAttributedString+OWS.m
  81. 2
      SignalUtilitiesKit/NewNonContactConversationViewController.h
  82. 2
      SignalUtilitiesKit/NewNonContactConversationViewController.m
  83. 0
      SignalUtilitiesKit/NoopCallMessageHandler.swift
  84. 2
      SignalUtilitiesKit/OWSAddToContactsOfferMessage.h
  85. 2
      SignalUtilitiesKit/OWSAddToProfileWhitelistOfferMessage.h
  86. 0
      SignalUtilitiesKit/OWSAlerts.swift
  87. 2
      SignalUtilitiesKit/OWSAnalytics.h
  88. 0
      SignalUtilitiesKit/OWSAnyTouchGestureRecognizer.h
  89. 0
      SignalUtilitiesKit/OWSAnyTouchGestureRecognizer.m
  90. 0
      SignalUtilitiesKit/OWSAudioPlayer.h
  91. 2
      SignalUtilitiesKit/OWSAudioPlayer.m
  92. 0
      SignalUtilitiesKit/OWSAudioSession.swift
  93. 0
      SignalUtilitiesKit/OWSAvatarBuilder.h
  94. 2
      SignalUtilitiesKit/OWSAvatarBuilder.m
  95. 2
      SignalUtilitiesKit/OWSBackupFragment.h
  96. 2
      SignalUtilitiesKit/OWSBlockedPhoneNumbersMessage.h
  97. 2
      SignalUtilitiesKit/OWSBlockedPhoneNumbersMessage.m
  98. 0
      SignalUtilitiesKit/OWSButton.swift
  99. 2
      SignalUtilitiesKit/OWSContact+Private.h
  100. 2
      SignalUtilitiesKit/OWSContact.h
  101. Some files were not shown because too many files have changed in this diff Show More

2
Podfile

@ -97,11 +97,13 @@ target 'SignalUtilitiesKit' do
pod 'libPhoneNumber-iOS', :inhibit_warnings => true
pod 'Mantle', git: 'https://github.com/signalapp/Mantle', branch: 'signal-master', :inhibit_warnings => true
pod 'PromiseKit', :inhibit_warnings => true
pod 'PureLayout', '~> 3.1.4', :inhibit_warnings => true
pod 'Reachability', :inhibit_warnings => true
pod 'SAMKeychain', :inhibit_warnings => true
pod 'Starscream', git: 'https://github.com/signalapp/Starscream.git', branch: 'signal-release', :inhibit_warnings => true
pod 'SwiftProtobuf', '~> 1.5.0', :inhibit_warnings => true
pod 'YapDatabase/SQLCipher', :git => 'https://github.com/signalapp/YapDatabase.git', branch: 'signal-release', :inhibit_warnings => true
pod 'YYImage', git: 'https://github.com/signalapp/YYImage', :inhibit_warnings => true
end
target 'SessionUIKit' do

2
Podfile.lock

@ -218,6 +218,6 @@ SPEC CHECKSUMS:
YYImage: 6db68da66f20d9f169ceb94dfb9947c3867b9665
ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb
PODFILE CHECKSUM: 99d57680804c51117e98de7f4d4c243750ed26e1
PODFILE CHECKSUM: 678f8b89a861f2a5ff55ee1a2acf0b70e42eff8f
COCOAPODS: 1.10.0.rc.1

2
Pods

@ -1 +1 @@
Subproject commit 323754e2fbc3d87c87538814d3695755818164ac
Subproject commit 0e8cae4ccaa2bb1fe672b771696b988fd1007fbe

1954
Signal.xcodeproj/project.pbxproj

File diff suppressed because it is too large Load Diff

2
Signal/src/ViewControllers/ConversationView/ConversationViewController.h

@ -2,8 +2,6 @@
// Copyright (c) 2019 Open Whisper Systems. All rights reserved.
//
#import <SignalMessaging/OWSViewController.h>
NS_ASSUME_NONNULL_BEGIN
typedef NS_ENUM(NSUInteger, ConversationViewAction) {

24
SignalMessaging/Info.plist

@ -1,24 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>$(MARKETING_VERSION)</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSPrincipalClass</key>
<string></string>
</dict>
</plist>

29
SignalMessaging/Loki/Migrations/LK002RemoveFriendRequests.swift

@ -1,29 +0,0 @@
@objc
public class LK002RemoveFriendRequests : OWSDatabaseMigration {
@objc
class func migrationId() -> String {
return "002"
}
override public func runUp(completion: @escaping OWSDatabaseMigrationCompletion) {
self.doMigrationAsync(completion: completion)
}
private func doMigrationAsync(completion: @escaping OWSDatabaseMigrationCompletion) {
DispatchQueue.global().async {
Storage.writeSync { transaction in
var interactionIDsToRemove: [String] = []
transaction.enumerateRows(inCollection: TSInteraction.collection()) { key, object, _, _ in
if !(object is TSInteraction) {
interactionIDsToRemove.append(key)
}
}
interactionIDsToRemove.forEach { transaction.removeObject(forKey: $0, inCollection: TSInteraction.collection()) }
self.save(with: transaction)
}
completion()
}
}
}

20
SignalMessaging/SignalMessaging-Prefix.pch

@ -1,20 +0,0 @@
//
// Copyright (c) 2018 Open Whisper Systems. All rights reserved.
//
#import <Availability.h>
#ifdef __OBJC__
#import <UIKit/UIKit.h>
#import <Foundation/Foundation.h>
@import CocoaLumberjack;
#ifdef DEBUG
static const NSUInteger ddLogLevel = DDLogLevelAll;
#else
static const NSUInteger ddLogLevel = DDLogLevelInfo;
#endif
#import <SessionProtocolKit/SessionProtocolKit.h>
#import <SignalUtilitiesKit/SignalUtilitiesKit.h>
#endif

60
SignalMessaging/SignalMessaging.h

@ -1,60 +0,0 @@
//
// Copyright (c) 2019 Open Whisper Systems. All rights reserved.
//
#import <UIKit/UIKit.h>
//! Project version number for SignalMessaging.
FOUNDATION_EXPORT double SignalMessagingVersionNumber;
//! Project version string for SignalMessaging.
FOUNDATION_EXPORT const unsigned char SignalMessagingVersionString[];
// The public headers of the framework
#import <SignalMessaging/AppSetup.h>
#import <SignalMessaging/AttachmentSharing.h>
#import <SignalMessaging/BlockListUIUtils.h>
#import <SignalMessaging/ContactCellView.h>
#import <SignalMessaging/ContactTableViewCell.h>
#import <SignalMessaging/ContactsViewHelper.h>
#import <SignalMessaging/DebugLogger.h>
#import <SignalMessaging/Environment.h>
#import <SignalMessaging/NSAttributedString+OWS.h>
#import <SignalMessaging/NewNonContactConversationViewController.h>
#import <SignalMessaging/OWSAnyTouchGestureRecognizer.h>
#import <SignalMessaging/OWSAudioPlayer.h>
#import <SignalMessaging/OWSContactAvatarBuilder.h>
#import <SignalMessaging/OWSContactOffersInteraction.h>
#import <SignalMessaging/OWSContactsManager.h>
#import <SignalMessaging/OWSConversationColor.h>
#import <SignalMessaging/OWSDatabaseMigration.h>
#import <SignalMessaging/OWSFormat.h>
#import <SignalMessaging/OWSGroupAvatarBuilder.h>
#import <SignalMessaging/OWSNavigationController.h>
#import <SignalMessaging/OWSPreferences.h>
#import <SignalMessaging/OWSProfileManager.h>
#import <SignalMessaging/OWSQuotedReplyModel.h>
#import <SignalMessaging/OWSSearchBar.h>
#import <SignalMessaging/OWSSounds.h>
#import <SignalMessaging/OWSSyncManager.h>
#import <SignalMessaging/OWSTableViewController.h>
#import <SignalMessaging/OWSTextField.h>
#import <SignalMessaging/OWSTextView.h>
#import <SignalMessaging/OWSUnreadIndicator.h>
#import <SignalMessaging/OWSUserProfile.h>
#import <SignalMessaging/OWSWindowManager.h>
#import <SignalMessaging/ScreenLockViewController.h>
#import <SignalMessaging/SelectRecipientViewController.h>
#import <SignalMessaging/SharingThreadPickerViewController.h>
#import <SignalMessaging/SignalKeyingStorage.h>
#import <SignalMessaging/Theme.h>
#import <SignalMessaging/ThreadUtil.h>
#import <SignalMessaging/ThreadViewHelper.h>
#import <SignalMessaging/UIColor+OWS.h>
#import <SignalMessaging/UIFont+OWS.h>
#import <SignalMessaging/UIUtil.h>
#import <SignalMessaging/UIView+OWS.h>
#import <SignalMessaging/UIViewController+OWS.h>
#import <SignalMessaging/VersionMigrations.h>
#import <SignalMessaging/ViewControllerUtils.h>
#import <SignalUtilitiesKit/UIImage+OWS.h>

0
SignalMessaging/utils/AppPreferences.swift → SignalUtilitiesKit/AppPreferences.swift

0
SignalMessaging/environment/AppSetup.h → SignalUtilitiesKit/AppSetup.h

8
SignalMessaging/environment/AppSetup.m → SignalUtilitiesKit/AppSetup.m

@ -5,9 +5,9 @@
#import "AppSetup.h"
#import "Environment.h"
#import "VersionMigrations.h"
#import <SignalMessaging/OWSDatabaseMigration.h>
#import <SignalMessaging/OWSProfileManager.h>
#import <SignalMessaging/SignalMessaging-Swift.h>
#import <SignalUtilitiesKit/OWSDatabaseMigration.h>
#import <SignalUtilitiesKit/OWSProfileManager.h>
#import <SessionProtocolKit/SessionProtocolKit-Swift.h>
#import <SignalUtilitiesKit/ContactDiscoveryService.h>
#import <SignalUtilitiesKit/OWS2FAManager.h>
#import <SignalUtilitiesKit/OWSAttachmentDownloads.h>
@ -21,8 +21,10 @@
#import <SignalUtilitiesKit/OWSMessageReceiver.h>
#import <SignalUtilitiesKit/OWSOutgoingReceiptManager.h>
#import <SignalUtilitiesKit/OWSReadReceiptManager.h>
#import <SignalUtilitiesKit/OWSSounds.h>
#import <SignalUtilitiesKit/OWSStorage.h>
#import <SignalUtilitiesKit/SSKEnvironment.h>
#import <SignalUtilitiesKit/OWSSyncManager.h>
#import <SignalUtilitiesKit/SignalUtilitiesKit-Swift.h>
#import <SignalUtilitiesKit/TSSocketManager.h>

0
SignalMessaging/ViewControllers/AttachmentApproval/ApprovalRailCellView.swift → SignalUtilitiesKit/ApprovalRailCellView.swift

0
SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalInputAccessoryView.swift → SignalUtilitiesKit/AttachmentApprovalInputAccessoryView.swift

0
SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift → SignalUtilitiesKit/AttachmentApprovalViewController.swift

0
SignalMessaging/ViewControllers/AttachmentApproval/AttachmentCaptionToolbar.swift → SignalUtilitiesKit/AttachmentCaptionToolbar.swift

0
SignalMessaging/ViewControllers/AttachmentApproval/AttachmentCaptionViewController.swift → SignalUtilitiesKit/AttachmentCaptionViewController.swift

0
SignalMessaging/ViewControllers/AttachmentApproval/AttachmentItemCollection.swift → SignalUtilitiesKit/AttachmentItemCollection.swift

0
SignalMessaging/ViewControllers/AttachmentApproval/AttachmentPrepViewController.swift → SignalUtilitiesKit/AttachmentPrepViewController.swift

0
SignalMessaging/attachments/AttachmentSharing.h → SignalUtilitiesKit/AttachmentSharing.h

0
SignalMessaging/attachments/AttachmentSharing.m → SignalUtilitiesKit/AttachmentSharing.m

0
SignalMessaging/ViewControllers/AttachmentApproval/AttachmentTextToolbar.swift → SignalUtilitiesKit/AttachmentTextToolbar.swift

0
SignalMessaging/ViewControllers/AttachmentApproval/AttachmentTextView.swift → SignalUtilitiesKit/AttachmentTextView.swift

0
SignalMessaging/Views/AvatarImageView.swift → SignalUtilitiesKit/AvatarImageView.swift

0
SignalMessaging/utils/Bench.swift → SignalUtilitiesKit/Bench.swift

0
SignalMessaging/utils/BlockListCache.swift → SignalUtilitiesKit/BlockListCache.swift

0
SignalMessaging/utils/BlockListUIUtils.h → SignalUtilitiesKit/BlockListUIUtils.h

6
SignalMessaging/utils/BlockListUIUtils.m → SignalUtilitiesKit/BlockListUIUtils.m

@ -5,12 +5,16 @@
#import "BlockListUIUtils.h"
#import "OWSContactsManager.h"
#import "PhoneNumber.h"
#import <SignalMessaging/SignalMessaging-Swift.h>
#import "TSContactThread.h"
#import <SignalUtilitiesKit/Contact.h>
#import <SignalUtilitiesKit/OWSBlockingManager.h>
#import <SignalUtilitiesKit/SignalAccount.h>
#import <SignalUtilitiesKit/TSAccountManager.h>
#import <SignalUtilitiesKit/TSGroupThread.h>
#import <SignalUtilitiesKit/UIUtil.h>
#import <SignalUtilitiesKit/ThreadUtil.h>
#import <SignalUtilitiesKit/SignalUtilitiesKit-Swift.h>
#import "UIView+OWS.h"
NS_ASSUME_NONNULL_BEGIN

0
SignalMessaging/categories/Collection+OWS.swift → SignalUtilitiesKit/Collection+OWS.swift

0
SignalMessaging/Views/CommonStrings.swift → SignalUtilitiesKit/CommonStrings.swift

0
SignalMessaging/Views/ContactCellView.h → SignalUtilitiesKit/ContactCellView.h

2
SignalMessaging/Views/ContactCellView.m → SignalUtilitiesKit/ContactCellView.m

@ -7,7 +7,7 @@
#import "OWSContactsManager.h"
#import "UIFont+OWS.h"
#import "UIView+OWS.h"
#import <SignalMessaging/SignalMessaging-Swift.h>
#import <SignalUtilitiesKit/SignalUtilitiesKit-Swift.h>
#import <SignalUtilitiesKit/OWSPrimaryStorage.h>
#import <SignalUtilitiesKit/SignalAccount.h>
#import <SignalUtilitiesKit/TSContactThread.h>

0
SignalMessaging/ViewControllers/ContactFieldView.swift → SignalUtilitiesKit/ContactFieldView.swift

0
SignalMessaging/ViewControllers/ContactShareApprovalViewController.swift → SignalUtilitiesKit/ContactShareApprovalViewController.swift

0
SignalMessaging/ViewModels/ContactShareViewModel.swift → SignalUtilitiesKit/ContactShareViewModel.swift

0
SignalMessaging/Views/ContactTableViewCell.h → SignalUtilitiesKit/ContactTableViewCell.h

0
SignalMessaging/Views/ContactTableViewCell.m → SignalUtilitiesKit/ContactTableViewCell.m

2
SignalUtilitiesKit/ContactsUpdater.h

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

0
SignalMessaging/Views/ContactsViewHelper.h → SignalUtilitiesKit/ContactsViewHelper.h

4
SignalMessaging/Views/ContactsViewHelper.m → SignalUtilitiesKit/ContactsViewHelper.m

@ -5,8 +5,8 @@
#import "ContactsViewHelper.h"
#import "Environment.h"
#import "UIUtil.h"
#import <SignalMessaging/OWSProfileManager.h>
#import <SignalMessaging/SignalMessaging-Swift.h>
#import <SignalUtilitiesKit/OWSProfileManager.h>
#import <SignalUtilitiesKit/SignalUtilitiesKit-Swift.h>
#import <SignalUtilitiesKit/AppContext.h>
#import <SignalUtilitiesKit/Contact.h>
#import <SignalUtilitiesKit/NSString+SSK.h>

0
SignalMessaging/utils/ConversationStyle.swift → SignalUtilitiesKit/ConversationStyle.swift

1
SignalUtilitiesKit/DataSource.m

@ -7,7 +7,6 @@
#import "NSData+Image.h"
#import "OWSFileSystem.h"
#import <SessionProtocolKit/NSString+OWS.h>
#import <SessionProtocolKit/iOSVersions.h>
#import <SignalUtilitiesKit/SignalUtilitiesKit-Swift.h>
NS_ASSUME_NONNULL_BEGIN

0
SignalMessaging/utils/DebugLogger.h → SignalUtilitiesKit/DebugLogger.h

0
SignalMessaging/utils/DebugLogger.m → SignalUtilitiesKit/DebugLogger.m

0
SignalMessaging/utils/DeviceSleepManager.swift → SignalUtilitiesKit/DeviceSleepManager.swift

0
SignalMessaging/Views/DirectionalPanGestureRecognizer.swift → SignalUtilitiesKit/DirectionalPanGestureRecognizer.swift

0
SignalMessaging/Views/DisappearingTimerConfigurationView.swift → SignalUtilitiesKit/DisappearingTimerConfigurationView.swift

0
SignalMessaging/utils/DisplayableText.swift → SignalUtilitiesKit/DisplayableText.swift

0
SignalMessaging/ViewControllers/EditContactShareNameViewController.swift → SignalUtilitiesKit/EditContactShareNameViewController.swift

7
SignalMessaging/environment/Environment.h → SignalUtilitiesKit/Environment.h

@ -1,8 +1,4 @@
//
// Copyright (c) 2019 Open Whisper Systems. All rights reserved.
//
#import <SignalUtilitiesKit/SSKEnvironment.h>
#import <Foundation/Foundation.h>
@class OWSAudioSession;
@class OWSContactsManager;
@ -19,7 +15,6 @@
* It also handles network configuration for testing/deployment server configurations.
*
**/
// TODO: Rename to SMGEnvironment?
@interface Environment : NSObject
- (instancetype)init NS_UNAVAILABLE;

13
SignalMessaging/environment/Environment.m → SignalUtilitiesKit/Environment.m

@ -1,11 +1,10 @@
//
// Copyright (c) 2019 Open Whisper Systems. All rights reserved.
//
#import "Environment.h"
#import <Foundation/Foundation.h>
#import "SSKAsserts.h"
#import "OWSContactsManager.h"
#import "OWSWindowManager.h"
#import <SignalUtilitiesKit/SignalUtilitiesKit-Swift.h>
#import "OWSPreferences.h"
#import <SignalUtilitiesKit/AppContext.h>
#import <SignalUtilitiesKit/SSKEnvironment.h>
#import "OWSSounds.h"
static Environment *sharedEnvironment = nil;

0
SignalMessaging/utils/FullTextSearcher.swift → SignalUtilitiesKit/FullTextSearcher.swift

0
SignalMessaging/Views/GalleryRailView.swift → SignalUtilitiesKit/GalleryRailView.swift

0
SignalMessaging/Views/GradientView.swift → SignalUtilitiesKit/GradientView.swift

0
SignalMessaging/Loki/Redesign/Components/Identicon+ObjC.swift → SignalUtilitiesKit/Identicon+ObjC.swift

0
SignalMessaging/utils/ImageCache.swift → SignalUtilitiesKit/ImageCache.swift

0
SignalMessaging/Views/ImageEditor/ImageEditorBrushViewController.swift → SignalUtilitiesKit/ImageEditorBrushViewController.swift

0
SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift → SignalUtilitiesKit/ImageEditorCanvasView.swift

0
SignalMessaging/Views/ImageEditor/ImageEditorContents.swift → SignalUtilitiesKit/ImageEditorContents.swift

0
SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift → SignalUtilitiesKit/ImageEditorCropViewController.swift

0
SignalMessaging/Views/ImageEditor/ImageEditorItem.swift → SignalUtilitiesKit/ImageEditorItem.swift

0
SignalMessaging/Views/ImageEditor/ImageEditorModel.swift → SignalUtilitiesKit/ImageEditorModel.swift

0
SignalMessaging/Views/ImageEditor/ImageEditorPaletteView.swift → SignalUtilitiesKit/ImageEditorPaletteView.swift

0
SignalMessaging/Views/ImageEditor/ImageEditorPanGestureRecognizer.swift → SignalUtilitiesKit/ImageEditorPanGestureRecognizer.swift

0
SignalMessaging/Views/ImageEditor/ImageEditorPinchGestureRecognizer.swift → SignalUtilitiesKit/ImageEditorPinchGestureRecognizer.swift

0
SignalMessaging/Views/ImageEditor/ImageEditorStrokeItem.swift → SignalUtilitiesKit/ImageEditorStrokeItem.swift

0
SignalMessaging/Views/ImageEditor/ImageEditorTextItem.swift → SignalUtilitiesKit/ImageEditorTextItem.swift

0
SignalMessaging/Views/ImageEditor/ImageEditorTextViewController.swift → SignalUtilitiesKit/ImageEditorTextViewController.swift

0
SignalMessaging/Views/ImageEditor/ImageEditorTransform.swift → SignalUtilitiesKit/ImageEditorTransform.swift

0
SignalMessaging/Views/ImageEditor/ImageEditorView.swift → SignalUtilitiesKit/ImageEditorView.swift

2
SignalUtilitiesKit/LKSyncOpenGroupsMessage.h

@ -1,4 +1,4 @@
#import "OWSOutgoingSyncMessage.h"
#import <SignalUtilitiesKit/OWSOutgoingSyncMessage.h>
NS_ASSUME_NONNULL_BEGIN

2
SignalUtilitiesKit/LKUnlinkDeviceMessage.h

@ -1,4 +1,4 @@
#import "TSOutgoingMessage.h"
#import <SignalUtilitiesKit/TSOutgoingMessage.h>
NS_ASSUME_NONNULL_BEGIN

0
SignalMessaging/ViewControllers/MediaMessageView.swift → SignalUtilitiesKit/MediaMessageView.swift

0
SignalMessaging/ViewControllers/MessageApprovalViewController.swift → SignalUtilitiesKit/MessageApprovalViewController.swift

17
SignalUtilitiesKit/Meta/SignalUtilitiesKit-Prefix.pch

@ -0,0 +1,17 @@
//
// Copyright (c) 2018 Open Whisper Systems. All rights reserved.
//
#import <Availability.h>
#ifdef __OBJC__
#import <UIKit/UIKit.h>
#import <Foundation/Foundation.h>
@import PureLayout;
@import SessionMessagingKit;
@import SessionProtocolKit;
@import SessionSnodeKit;
@import SessionUtilitiesKit;
#endif

19
SignalUtilitiesKit/Meta/SignalUtilitiesKit.h

@ -14,6 +14,7 @@ FOUNDATION_EXPORT const unsigned char SignalUtilitiesKitVersionString[];
#import <SignalUtilitiesKit/ContactDiscoveryService.h>
#import <SignalUtilitiesKit/ContactsUpdater.h>
#import <SignalUtilitiesKit/DataSource.h>
#import <SignalUtilitiesKit/Environment.h>
#import <SignalUtilitiesKit/LKDeviceLinkMessage.h>
#import <SignalUtilitiesKit/LKGroupUtilities.h>
#import <SignalUtilitiesKit/LKSyncOpenGroupsMessage.h>
@ -26,11 +27,16 @@ FOUNDATION_EXPORT const unsigned char SignalUtilitiesKitVersionString[];
#import <SignalUtilitiesKit/NSString+SSK.h>
#import <SignalUtilitiesKit/NSTimer+OWS.h>
#import <SignalUtilitiesKit/NSURLSessionDataTask+StatusCode.h>
#import <SignalUtilitiesKit/OWSAnyTouchGestureRecognizer.h>
#import <SignalUtilitiesKit/OWSAudioPlayer.h>
#import <SignalUtilitiesKit/OWSBackgroundTask.h>
#import <SignalUtilitiesKit/OWSBlockingManager.h>
#import <SignalUtilitiesKit/OWSCallMessageHandler.h>
#import <SignalUtilitiesKit/OWSContact.h>
#import <SignalUtilitiesKit/OWSContact+Private.h>
#import <SignalUtilitiesKit/OWSContactAvatarBuilder.h>
#import <SignalUtilitiesKit/OWSContactsManager.h>
#import <SignalUtilitiesKit/OWSConversationColor.h>
#import <SignalUtilitiesKit/OWSDevice.h>
#import <SignalUtilitiesKit/OWSDisappearingMessagesConfiguration.h>
#import <SignalUtilitiesKit/OWSDisappearingMessagesJob.h>
@ -38,6 +44,7 @@ FOUNDATION_EXPORT const unsigned char SignalUtilitiesKitVersionString[];
#import <SignalUtilitiesKit/OWSEndSessionMessage.h>
#import <SignalUtilitiesKit/OWSError.h>
#import <SignalUtilitiesKit/OWSFileSystem.h>
#import <SignalUtilitiesKit/OWSFormat.h>
#import <SignalUtilitiesKit/OWSHTTPSecurityPolicy.h>
#import <SignalUtilitiesKit/OWSIdentityManager.h>
#import <SignalUtilitiesKit/OWSIncomingSentMessageTranscript.h>
@ -45,24 +52,33 @@ FOUNDATION_EXPORT const unsigned char SignalUtilitiesKitVersionString[];
#import <SignalUtilitiesKit/OWSMessageManager.h>
#import <SignalUtilitiesKit/OWSMessageReceiver.h>
#import <SignalUtilitiesKit/OWSMessageSender.h>
#import <SignalUtilitiesKit/OWSNavigationController.h>
#import <SignalUtilitiesKit/OWSOperation.h>
#import <SignalUtilitiesKit/OWSOutgoingNullMessage.h>
#import <SignalUtilitiesKit/OWSOutgoingSyncMessage.h>
#import <SignalUtilitiesKit/OWSPreferences.h>
#import <SignalUtilitiesKit/OWSPrimaryStorage.h>
#import <SignalUtilitiesKit/OWSPrimaryStorage+Loki.h>
#import <SignalUtilitiesKit/OWSPrimaryStorage+PreKeyStore.h>
#import <SignalUtilitiesKit/OWSPrimaryStorage+SessionStore.h>
#import <SignalUtilitiesKit/OWSPrimaryStorage+SignedPreKeyStore.h>
#import <SignalUtilitiesKit/OWSProfileManager.h>
#import <SignalUtilitiesKit/OWSRequestFactory.h>
#import <SignalUtilitiesKit/OWSSyncManagerProtocol.h>
#import <SignalUtilitiesKit/OWSTextView.h>
#import <SignalUtilitiesKit/OWSUploadOperation.h>
#import <SignalUtilitiesKit/OWSUserProfile.h>
#import <SignalUtilitiesKit/OWSViewController.h>
#import <SignalUtilitiesKit/OWSWindowManager.h>
#import <SignalUtilitiesKit/PhoneNumber.h>
#import <SignalUtilitiesKit/ProfileManagerProtocol.h>
#import <SignalUtilitiesKit/SelectRecipientViewController.h>
#import <SignalUtilitiesKit/SignalAccount.h>
#import <SignalUtilitiesKit/SignalRecipient.h>
#import <SignalUtilitiesKit/SSKAsserts.h>
#import <SignalUtilitiesKit/SSKEnvironment.h>
#import <SignalUtilitiesKit/SSKMessageSenderJobRecord.h>
#import <SignalUtilitiesKit/Theme.h>
#import <SignalUtilitiesKit/TSAttachmentPointer.h>
#import <SignalUtilitiesKit/TSAttachmentStream.h>
#import <SignalUtilitiesKit/TSContactThread.h>
@ -77,6 +93,9 @@ FOUNDATION_EXPORT const unsigned char SignalUtilitiesKitVersionString[];
#import <SignalUtilitiesKit/TSQuotedMessage.h>
#import <SignalUtilitiesKit/TSSocketManager.h>
#import <SignalUtilitiesKit/TSThread.h>
#import <SignalUtilitiesKit/UIFont+OWS.h>
#import <SignalUtilitiesKit/UIImage+OWS.h>
#import <SignalUtilitiesKit/UIView+OWS.h>
#import <SignalUtilitiesKit/ViewControllerUtils.h>
#import <SignalUtilitiesKit/YapDatabaseConnection+OWS.h>
#import <SignalUtilitiesKit/YapDatabaseTransaction+OWS.h>

0
SignalMessaging/ViewControllers/ModalActivityIndicatorViewController.swift → SignalUtilitiesKit/ModalActivityIndicatorViewController.swift

2
SignalUtilitiesKit/MultiDeviceProtocol.swift

@ -134,7 +134,7 @@ public final class MultiDeviceProtocol : NSObject {
}
when(resolved: promises).done(on: OWSDispatch.sendingQueue()) { results in
let errors = results.compactMap { result -> Error? in
if case Result.rejected(let error) = result {
if case PromiseKit.Result.rejected(let error) = result {
return error
} else {
return nil

0
SignalMessaging/categories/NSAttributedString+OWS.h → SignalUtilitiesKit/NSAttributedString+OWS.h

0
SignalMessaging/categories/NSAttributedString+OWS.m → SignalUtilitiesKit/NSAttributedString+OWS.m

2
SignalMessaging/ViewControllers/NewNonContactConversationViewController.h → SignalUtilitiesKit/NewNonContactConversationViewController.h

@ -2,7 +2,7 @@
// Copyright (c) 2018 Open Whisper Systems. All rights reserved.
//
#import "SelectRecipientViewController.h"
#import <SignalUtilitiesKit/SelectRecipientViewController.h>
@protocol NewNonContactConversationViewControllerDelegate <NSObject>

2
SignalMessaging/ViewControllers/NewNonContactConversationViewController.m → SignalUtilitiesKit/NewNonContactConversationViewController.m

@ -5,7 +5,7 @@
#import "NewNonContactConversationViewController.h"
#import "BlockListUIUtils.h"
#import "ContactsViewHelper.h"
#import <SignalMessaging/OWSContactsManager.h>
#import <SignalUtilitiesKit/OWSContactsManager.h>
#import <SignalUtilitiesKit/SignalAccount.h>
NS_ASSUME_NONNULL_BEGIN

0
SignalMessaging/environment/NoopCallMessageHandler.swift → SignalUtilitiesKit/NoopCallMessageHandler.swift

2
SignalUtilitiesKit/OWSAddToContactsOfferMessage.h

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

2
SignalUtilitiesKit/OWSAddToProfileWhitelistOfferMessage.h

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

0
SignalMessaging/Views/OWSAlerts.swift → SignalUtilitiesKit/OWSAlerts.swift

2
SignalUtilitiesKit/OWSAnalytics.h

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

0
SignalMessaging/utils/OWSAnyTouchGestureRecognizer.h → SignalUtilitiesKit/OWSAnyTouchGestureRecognizer.h

0
SignalMessaging/utils/OWSAnyTouchGestureRecognizer.m → SignalUtilitiesKit/OWSAnyTouchGestureRecognizer.m

0
SignalMessaging/utils/OWSAudioPlayer.h → SignalUtilitiesKit/OWSAudioPlayer.h

2
SignalMessaging/utils/OWSAudioPlayer.m → SignalUtilitiesKit/OWSAudioPlayer.m

@ -5,7 +5,7 @@
#import "OWSAudioPlayer.h"
#import "TSAttachmentStream.h"
#import <AVFoundation/AVFoundation.h>
#import <SignalMessaging/SignalMessaging-Swift.h>
#import <SignalUtilitiesKit/SignalUtilitiesKit-Swift.h>
NS_ASSUME_NONNULL_BEGIN

0
SignalMessaging/environment/OWSAudioSession.swift → SignalUtilitiesKit/OWSAudioSession.swift

0
SignalMessaging/utils/OWSAvatarBuilder.h → SignalUtilitiesKit/OWSAvatarBuilder.h

2
SignalMessaging/utils/OWSAvatarBuilder.m → SignalUtilitiesKit/OWSAvatarBuilder.m

@ -11,7 +11,7 @@
#import "UIColor+OWS.h"
#import "UIFont+OWS.h"
#import "UIView+OWS.h"
#import <SignalMessaging/SignalMessaging-Swift.h>
NS_ASSUME_NONNULL_BEGIN

2
SignalUtilitiesKit/OWSBackupFragment.h

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

2
SignalUtilitiesKit/OWSBlockedPhoneNumbersMessage.h

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

2
SignalUtilitiesKit/OWSBlockedPhoneNumbersMessage.m

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

0
SignalMessaging/Views/OWSButton.swift → SignalUtilitiesKit/OWSButton.swift

2
SignalUtilitiesKit/OWSContact+Private.h

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

2
SignalUtilitiesKit/OWSContact.h

@ -3,7 +3,7 @@
//
#import <Mantle/MTLModel.h>
#import "ContactsManagerProtocol.h"
#import <SignalUtilitiesKit/ContactsManagerProtocol.h>
NS_ASSUME_NONNULL_BEGIN

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save