oxen-io
/
session-ios
mirror of https://github.com/oxen-io/session-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix build

This commit is contained in:
nielsandriesse 2020-06-05 13:43:06 +10:00
parent 254e5b4f7f
commit eab26c504c
138 changed files with 211 additions and 211 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Podfile
View File

@ -58,8 +58,8 @@ def shared_pods
# third party pods
###
pod 'AFNetworking', inhibit_warnings: true
pod 'PureLayout', :inhibit_warnings => true
pod 'AFNetworking', '~> 3.2.1', inhibit_warnings: true
pod 'PureLayout', '~> 3.1.4', :inhibit_warnings => true
pod 'Reachability', :inhibit_warnings => true
pod 'YYImage', :inhibit_warnings => true
end
@ -73,7 +73,7 @@ target 'Signal' do
# Loki third party pods
###
pod 'GCDWebServer', '~> 3.0', :inhibit_warnings => true # TODO: We can probably ditch this as we're not doing P2P anymore
pod 'GCDWebServer', '~> 3.5.2', :inhibit_warnings => true # TODO: We can probably ditch this as we're not doing P2P anymore
pod 'FeedKit', '~> 8.1', :inhibit_warnings => true
pod 'CryptoSwift', '~> 1.0', :inhibit_warnings => true
pod 'NVActivityIndicatorView', '~> 4.7', :inhibit_warnings => true

102
Podfile.lock
View File

@ -17,19 +17,19 @@ PODS:
- CocoaLumberjack (3.6.1):
- CocoaLumberjack/Core (= 3.6.1)
- CocoaLumberjack/Core (3.6.1)
- CryptoSwift (1.0.0)
- CryptoSwift (1.3.1)
- FeedKit (8.1.1)
- GCDWebServer (3.5.2):
- GCDWebServer/Core (= 3.5.2)
- GCDWebServer/Core (3.5.2)
- GCDWebServer (3.5.4):
- GCDWebServer/Core (= 3.5.4)
- GCDWebServer/Core (3.5.4)
- GRKOpenSSLFramework (1.0.2.12)
- libPhoneNumber-iOS (0.9.15)
- Mantle (2.1.0):
- Mantle/extobjc (= 2.1.0)
- Mantle/extobjc (2.1.0)
- NVActivityIndicatorView (4.7.0):
- NVActivityIndicatorView/Presenter (= 4.7.0)
- NVActivityIndicatorView/Presenter (4.7.0)
- NVActivityIndicatorView (4.8.0):
- NVActivityIndicatorView/Presenter (= 4.8.0)
- NVActivityIndicatorView/Presenter (4.8.0)
- PromiseKit (6.5.3):
- PromiseKit/CorePromise (= 6.5.3)
- PromiseKit/Foundation (= 6.5.3)
@ -39,19 +39,19 @@ PODS:
- PromiseKit/CorePromise
- PromiseKit/UIKit (6.5.3):
- PromiseKit/CorePromise
- PureLayout (3.1.4)
- PureLayout (3.1.6)
- Reachability (3.2)
- SAMKeychain (1.5.3)
- SessionAxolotlKit (1.0.1):
- SessionAxolotlKit (1.0.2):
- CocoaLumberjack
- SessionCoreKit (~> 1.0.0)
- SessionCurve25519Kit (~> 2.1.1)
- SessionCurve25519Kit (~> 2.1.2)
- SessionHKDFKit (~> 0.0.5)
- SwiftProtobuf (~> 1.5.0)
- SessionAxolotlKit/Tests (1.0.1):
- SessionAxolotlKit/Tests (1.0.2):
- CocoaLumberjack
- SessionCoreKit (~> 1.0.0)
- SessionCurve25519Kit (~> 2.1.1)
- SessionCurve25519Kit (~> 2.1.2)
- SessionHKDFKit (~> 0.0.5)
- SwiftProtobuf (~> 1.5.0)
- SessionCoreKit (1.0.0):
@ -60,10 +60,10 @@ PODS:
- SessionCoreKit/Tests (1.0.0):
- CocoaLumberjack
- GRKOpenSSLFramework
- SessionCurve25519Kit (2.1.1):
- SessionCurve25519Kit (2.1.2):
- CocoaLumberjack
- SessionCoreKit (~> 1.0.0)
- SessionCurve25519Kit/Tests (2.1.1):
- SessionCurve25519Kit/Tests (2.1.2):
- CocoaLumberjack
- SessionCoreKit (~> 1.0.0)
- SessionHKDFKit (0.0.5):
@ -72,20 +72,20 @@ PODS:
- SessionHKDFKit/Tests (0.0.5):
- CocoaLumberjack
- SessionCoreKit
- SessionMetadataKit (1.0.0):
- SessionMetadataKit (1.0.1):
- CocoaLumberjack
- CryptoSwift (~> 1.0)
- SessionAxolotlKit (~> 1.0.1)
- SessionAxolotlKit (~> 1.0.2)
- SessionCoreKit (~> 1.0.0)
- SessionCurve25519Kit (~> 2.1.1)
- SessionCurve25519Kit (~> 2.1.2)
- SessionHKDFKit (~> 0.0.5)
- SwiftProtobuf (~> 1.5.0)
- SessionMetadataKit/Tests (1.0.0):
- SessionMetadataKit/Tests (1.0.1):
- CocoaLumberjack
- CryptoSwift (~> 1.0)
- SessionAxolotlKit (~> 1.0.1)
- SessionAxolotlKit (~> 1.0.2)
- SessionCoreKit (~> 1.0.0)
- SessionCurve25519Kit (~> 2.1.1)
- SessionCurve25519Kit (~> 2.1.2)
- SessionHKDFKit (~> 0.0.5)
- SwiftProtobuf (~> 1.5.0)
- SessionServiceKit (1.0.0):
@ -98,10 +98,10 @@ PODS:
- PromiseKit (~> 6.0)
- Reachability
- SAMKeychain
- SessionAxolotlKit (~> 1.0.1)
- SessionAxolotlKit (~> 1.0.2)
- SessionCoreKit (~> 1.0.0)
- SessionCurve25519Kit (~> 2.1.1)
- SessionMetadataKit (~> 1.0.0)
- SessionCurve25519Kit (~> 2.1.2)
- SessionMetadataKit (~> 1.0.1)
- Starscream
- SwiftProtobuf (~> 1.5.0)
- YapDatabase/SQLCipher
@ -115,19 +115,19 @@ PODS:
- PromiseKit (~> 6.0)
- Reachability
- SAMKeychain
- SessionAxolotlKit (~> 1.0.1)
- SessionAxolotlKit (~> 1.0.2)
- SessionCoreKit (~> 1.0.0)
- SessionCurve25519Kit (~> 2.1.1)
- SessionMetadataKit (~> 1.0.0)
- SessionCurve25519Kit (~> 2.1.2)
- SessionMetadataKit (~> 1.0.1)
- Starscream
- SwiftProtobuf (~> 1.5.0)
- YapDatabase/SQLCipher
- SQLCipher (4.1.0):
- SQLCipher/standard (= 4.1.0)
- SQLCipher/common (4.1.0)
- SQLCipher/standard (4.1.0):
- SQLCipher (4.4.0):
- SQLCipher/standard (= 4.4.0)
- SQLCipher/common (4.4.0)
- SQLCipher/standard (4.4.0):
- SQLCipher/common
- SSZipArchive (2.2.1)
- SSZipArchive (2.2.3)
- Starscream (3.0.6)
- SwiftProtobuf (1.5.0)
- YapDatabase/SQLCipher (3.1.1):
@ -197,15 +197,15 @@ PODS:
- YYImage/Core (1.0.4)
DEPENDENCIES:
- AFNetworking
- AFNetworking (~> 3.2.1)
- CryptoSwift (~> 1.0)
- FeedKit (~> 8.1)
- GCDWebServer (~> 3.0)
- GCDWebServer (~> 3.5.2)
- GRKOpenSSLFramework (from `https://github.com/signalapp/GRKOpenSSLFramework`)
- Mantle (from `https://github.com/signalapp/Mantle`, branch `signal-master`)
- NVActivityIndicatorView (~> 4.7)
- PromiseKit (= 6.5.3)
- PureLayout
- PureLayout (~> 3.1.4)
- Reachability
- SessionAxolotlKit (from `https://github.com/loki-project/session-ios-protocol-kit.git`, branch `master`)
- SessionAxolotlKit/Tests (from `https://github.com/loki-project/session-ios-protocol-kit.git`, branch `master`)
@ -274,57 +274,57 @@ CHECKOUT OPTIONS:
:commit: b799c27e7927e5304ec1e4ad53c6d33c6fd1cae7
:git: https://github.com/signalapp/GRKOpenSSLFramework
Mantle:
:commit: 9599b1d9796280c97cb2f786f34984fc98a3b6ef
:commit: b72c2d1e6132501db906de2cffa8ded7803c54f4
:git: https://github.com/signalapp/Mantle
SessionAxolotlKit:
:commit: bdf16c39ed6af917362c22ebee7653ca25a7bec4
:commit: 0338147cd5faefbb17e0bbf43cd008615ef64fe2
:git: https://github.com/loki-project/session-ios-protocol-kit.git
SessionCoreKit:
:commit: 0d66c90657b62cb66ecd2767c57408a951650f23
:git: https://github.com/loki-project/session-ios-core-kit.git
SessionCurve25519Kit:
:commit: 2c02fae0ddf2d390537b9114183a2e184d688f3e
:commit: ed4ae4576003905267d1573e336a003364564793
:git: https://github.com/loki-project/session-ios-curve-25519-kit
SessionHKDFKit:
:commit: 0dcf8cf8a7995ef8663146f7063e6c1d7f5a3274
:git: https://github.com/nielsandriesse/session-ios-hkdf-kit.git
SessionMetadataKit:
:commit: c7eda0c04764df707fb5bb2b91b7b0e323b623d4
:commit: 048dadf44f6ab4b7024b7ce0683179ee0a494cd8
:git: https://github.com/loki-project/session-ios-metadata-kit
Starscream:
:commit: b09ea163c3cb305152c65b299cb024610f52e735
:git: https://github.com/signalapp/Starscream.git
YapDatabase:
:commit: 8e2b69110efd9499a5b553fda0165d2cea4e818d
:commit: e43ab163b2dcb4c817339c819b07dac545f05fea
:git: https://github.com/signalapp/YapDatabase.git
SPEC CHECKSUMS:
AFNetworking: b6f891fdfaed196b46c7a83cf209e09697b94057
CocoaLumberjack: b17ae15142558d08bbacf69775fa10c4abbebcc9
CryptoSwift: d81eeaa59dc5a8d03720fe919a6fd07b51f7439f
CryptoSwift: f12f037f6d0fcd6d48c96db0071b653de64e6c4d
FeedKit: 3418eed25f0b493b205b4de1b8511ac21d413fa9
GCDWebServer: ead88cd14596dd4eae4f5830b8877c87c8728990
GCDWebServer: 2c156a56c8226e2d5c0c3f208a3621ccffbe3ce4
GRKOpenSSLFramework: 8a3735ad41e7dc1daff460467bccd32ca5d6ae3e
libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75
Mantle: 2fa750afa478cd625a94230fbf1c13462f29395b
NVActivityIndicatorView: b19ddab2576f805cbe0fb2306cba3476e09a1dea
NVActivityIndicatorView: d24b7ebcf80af5dcd994adb650e2b6c93379270f
PromiseKit: c609029bdd801f792551a504c695c7d3098b42cd
PureLayout: f08c01b8dec00bb14a1fefa3de4c7d9c265df85e
PureLayout: bd3c4ec3a3819ad387c99ebb72c6b129c3ed4d2d
Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
SAMKeychain: 483e1c9f32984d50ca961e26818a534283b4cd5c
SessionAxolotlKit: b43235dea1625352d3cfe727f8300e694e938d4e
SessionAxolotlKit: 88f72573df989042510d8a1737bd0c0057dda3da
SessionCoreKit: 778a3f6e3da788b43497734166646025b6392e88
SessionCurve25519Kit: af73adf8d48094e627091eea759f4c64c5f4eb08
SessionCurve25519Kit: cedc6c713f8182e6ee02bf9bd1b337552e00ebbb
SessionHKDFKit: b0f4e669411703ab925aba07491c5611564d1419
SessionMetadataKit: d495323af8f24ef3832b68ffd4a58ecaf5e98707
SessionServiceKit: 1c7c7c7f1c9f9f8de5c2331d406e6be31f388efe
SQLCipher: efbdb52cdbe340bcd892b1b14297df4e07241b7f
SSZipArchive: 8e859da2520142e09166bc9161967db296e9d02f
Starscream: ef3ece99d765eeccb67de105bfa143f929026cf5
SessionMetadataKit: 8de99830e5bb1f5b0a180f41197457f5b4a76ee4
SessionServiceKit: b69bd197f730590b21dc5262bd5af73ce1f70ba0
SQLCipher: e434ed542b24f38ea7b36468a13f9765e1b5c072
SSZipArchive: 62d4947b08730e4cda640473b0066d209ff033c9
Starscream: 8aaf1a7feb805c816d0e7d3190ef23856f6665b9
SwiftProtobuf: 241400280f912735c1e1b9fe675fdd2c6c4d42e2
YapDatabase: b418a4baa6906e8028748938f9159807fd039af4
YYImage: 1e1b62a9997399593e4b9c4ecfbbabbf1d3f3b54
PODFILE CHECKSUM: c8ebeec5bbe6b9ba42d54a32e8547879a76cee30
PODFILE CHECKSUM: e9d54851d6e1df3274eaaf29ca701c3a0ab1070a
COCOAPODS: 1.9.3

2
Signal/src/AppDelegate.m
View File

@ -39,7 +39,7 @@
#import <SessionServiceKit/OWSPrimaryStorage+Calling.h>
#import <SessionServiceKit/OWSReadReceiptManager.h>
#import <SessionServiceKit/SSKEnvironment.h>
#import <SessionServiceKit/SignalServiceKit-Swift.h>
#import <SessionServiceKit/SessionServiceKit-Swift.h>
#import <SessionServiceKit/TSAccountManager.h>
#import <SessionServiceKit/TSDatabaseView.h>
#import <SessionServiceKit/TSPreKeyManager.h>

2
Signal/src/Loki/View Controllers/ScanQRCodeWrapperVC.swift
View File

@ -35,7 +35,7 @@ final class ScanQRCodeWrapperVC : BaseVC {
view.addSubview(scanQRCodeVCView)
scanQRCodeVCView.pin(.leading, to: .leading, of: view)
scanQRCodeVCView.pin(.trailing, to: .trailing, of: view)
scanQRCodeVCView.autoPin(toTopLayoutGuideOf: self, withInset: 0)
scanQRCodeVCView.autoPinEdge(.top, to: .top, of: view)
scanQRCodeVCView.autoPinToSquareAspectRatio()
// Set up bottom view
let bottomView = UIView()

4
Signal/src/ViewControllers/AppSettings/DomainFrontingCountryViewController.m
View File

@ -43,8 +43,8 @@ NS_ASSUME_NONNULL_BEGIN
[self.view addSubview:self.tableViewController.view];
[self.tableViewController.view autoPinEdgeToSuperviewSafeArea:ALEdgeLeading];
[self.tableViewController.view autoPinEdgeToSuperviewSafeArea:ALEdgeTrailing];
[_tableViewController.view autoPinToTopLayoutGuideOfViewController:self withInset:0];
[_tableViewController.view autoPinToBottomLayoutGuideOfViewController:self withInset:0];
[_tableViewController.view autoPinEdge:ALEdgeTop toEdge:ALEdgeTop ofView:self.view withOffset:0.0f];
[_tableViewController.view autoPinEdge:ALEdgeBottom toEdge:ALEdgeBottom ofView:self.view withOffset:0.0f];
[self updateTableContents];
}

2
Signal/src/ViewControllers/AppSettings/OWSLinkDeviceViewController.m
View File

@ -55,7 +55,7 @@ NS_ASSUME_NONNULL_BEGIN
[self.view addSubview:self.qrScanningController.view];
[self.qrScanningController.view autoPinEdgeToSuperviewEdge:ALEdgeLeading];
[self.qrScanningController.view autoPinEdgeToSuperviewEdge:ALEdgeTrailing];
[self.qrScanningController.view autoPinToTopLayoutGuideOfViewController:self withInset:0.f];
[self.qrScanningController.view autoPinEdge:ALEdgeTop toEdge:ALEdgeTop ofView:self.view];
[self.qrScanningController.view autoPinToSquareAspectRatio];
UIView *bottomView = [UIView new];

2
Signal/src/ViewControllers/AppSettings/PrivacySettingsTableViewController.m
View File

@ -13,7 +13,7 @@
#import <SessionServiceKit/NSString+SSK.h>
#import <SessionServiceKit/OWS2FAManager.h>
#import <SessionServiceKit/OWSReadReceiptManager.h>
#import <SessionServiceKit/SignalServiceKit-Swift.h>
#import <SessionServiceKit/SessionServiceKit-Swift.h>
NS_ASSUME_NONNULL_BEGIN

4
Signal/src/ViewControllers/Call/CallViewController.swift
View File

@ -527,8 +527,8 @@
// leaveCallViewButton.autoPinEdge(toSuperviewMargin: .top)
// contactNameLabel.autoPinEdge(toSuperviewMargin: .top)
// } else {
// leaveCallViewButton.autoPin(toTopLayoutGuideOf: self, withInset: 0)
// contactNameLabel.autoPin(toTopLayoutGuideOf: self, withInset: 0)
// leaveCallViewButton.autoPinEdge(.top, to: .top, of: view)
// contactNameLabel.autoPinEdge(.top, to: .top, of: view)
// }
//
// contactNameLabel.autoPinEdge(.leading, to: .trailing, of: leaveCallViewButton, withOffset: 8, relation: .greaterThanOrEqual)

4
Signal/src/ViewControllers/ColorPickerViewController.swift
View File

@ -465,7 +465,7 @@ private class MockIncomingMessage: TSIncomingMessage {
fatalError("init(coder:) has not been implemented")
}
required init(dictionary dictionaryValue: [AnyHashable: Any]!) throws {
required init(dictionary dictionaryValue: [String: Any]!) throws {
fatalError("init(dictionary:) has not been implemented")
}
@ -494,7 +494,7 @@ private class MockOutgoingMessage: TSOutgoingMessage {
fatalError("init(coder:) has not been implemented")
}
required init(dictionary dictionaryValue: [AnyHashable: Any]!) throws {
required init(dictionary dictionaryValue: [String: Any]!) throws {
fatalError("init(dictionary:) has not been implemented")
}

2
Signal/src/ViewControllers/ContactViewController.swift
View File

@ -167,7 +167,7 @@ class ContactViewController: OWSViewController, ContactShareViewHelperDelegate {
let topView = createTopView()
rootView.addSubview(topView)
topView.autoPin(toTopLayoutGuideOf: self, withInset: 0)
topView.autoPinEdge(.top, to: .top, of: view)
topView.autoPinWidthToSuperview()
// This view provides a background "below the fold".

2
Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m
View File

@ -7,7 +7,7 @@
#import "OWSMessageBubbleView.h"
#import "OWSMessageHeaderView.h"
#import "Session-Swift.h"
#import <SessionServiceKit/SignalServiceKit-Swift.h>
#import <SessionServiceKit/SessionServiceKit-Swift.h>
NS_ASSUME_NONNULL_BEGIN

2
Signal/src/ViewControllers/ConversationView/Cells/OWSQuotedMessageView.m
View File

@ -13,7 +13,7 @@
#import <SignalMessaging/UIView+OWS.h>
#import <SessionServiceKit/TSAttachmentStream.h>
#import <SessionServiceKit/TSMessage.h>
#import <SessionServiceKit/SignalServiceKit-Swift.h>
#import <SessionServiceKit/SessionServiceKit-Swift.h>
NS_ASSUME_NONNULL_BEGIN

6
Signal/src/ViewControllers/ConversationView/ConversationViewController.m
View File

@ -78,7 +78,7 @@
#import <SessionServiceKit/OWSPrimaryStorage+Loki.h>
#import <SessionServiceKit/OWSReadReceiptManager.h>
#import <SessionServiceKit/OWSVerificationStateChangeMessage.h>
#import <SessionServiceKit/SignalServiceKit-Swift.h>
#import <SessionServiceKit/SessionServiceKit-Swift.h>
#import <SessionServiceKit/TSAccountManager.h>
#import <SessionServiceKit/TSGroupModel.h>
#import <SessionServiceKit/TSInvalidIdentityKeyReceivingErrorMessage.h>
@ -88,7 +88,7 @@
#import <YapDatabase/YapDatabaseAutoView.h>
#import <YapDatabase/YapDatabaseViewChange.h>
#import <YapDatabase/YapDatabaseViewConnection.h>
#import <SessionMetadataKit/SignalMetadataKit-Swift.h>
#import <SessionMetadataKit/SessionMetadataKit-Swift.h>
@import Photos;
@ -1205,7 +1205,7 @@ typedef enum : NSUInteger {
bannerView.accessibilityIdentifier = ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"banner_close");
[self.view addSubview:bannerView];
[bannerView autoPinToTopLayoutGuideOfViewController:self withInset:10];
[bannerView autoPinEdge:ALEdgeTop toEdge:ALEdgeTop ofView:self.view withOffset:10.0f];
[bannerView autoHCenterInSuperview];
CGFloat labelDesiredWidth = [label sizeThatFits:CGSizeZero].width;

2
Signal/src/ViewControllers/ConversationView/ConversationViewItem.m
View File

@ -16,7 +16,7 @@
#import <SessionServiceKit/OWSContact.h>
#import <SessionServiceKit/TSInteraction.h>
#import <SessionServiceKit/SSKEnvironment.h>
#import <SessionServiceKit/SignalServiceKit-Swift.h>
#import <SessionServiceKit/SessionServiceKit-Swift.h>
NS_ASSUME_NONNULL_BEGIN

2
Signal/src/ViewControllers/ConversationView/TypingIndicatorInteraction.swift
View File

@ -27,7 +27,7 @@ public class TypingIndicatorInteraction: TSInteraction {
@available(*, unavailable, message:"use other constructor instead.")
@objc
public required init(dictionary dictionaryValue: [AnyHashable: Any]!) throws {
public required init(dictionary dictionaryValue: [String: Any]!) throws {
notImplemented()
}

2
Signal/src/ViewControllers/CropScaleImageViewController.swift
View File

@ -199,7 +199,7 @@ import SignalMessaging
contentView.addSubview(titleLabel)
titleLabel.autoPinWidthToSuperview()
let titleLabelMargin = ScaleFromIPhone5(16)
titleLabel.autoPin(toTopLayoutGuideOf: self, withInset: titleLabelMargin)
titleLabel.autoPinEdge(.top, to: .top, of: view, withOffset: titleLabelMargin)
createButtonRow(contentView: contentView)

2
Signal/src/ViewControllers/DebugUI/DebugUIMessagesAssetLoader.m
View File

@ -9,7 +9,7 @@
#import <SessionCoreKit/Randomness.h>
#import <SessionServiceKit/MIMETypeUtil.h>
#import <SessionServiceKit/OWSFileSystem.h>
#import <SessionServiceKit/SignalServiceKit-Swift.h>
#import <SessionServiceKit/SessionServiceKit-Swift.h>
#import <SessionServiceKit/TSAttachment.h>
NS_ASSUME_NONNULL_BEGIN

2
Signal/src/ViewControllers/DebugUI/DebugUIStress.m
View File

@ -13,7 +13,7 @@
#import <SignalMessaging/Environment.h>
#import <SessionServiceKit/OWSDynamicOutgoingMessage.h>
#import <SessionServiceKit/OWSPrimaryStorage.h>
#import <SessionServiceKit/SignalServiceKit-Swift.h>
#import <SessionServiceKit/SessionServiceKit-Swift.h>
#import <SessionServiceKit/TSAccountManager.h>
#import <SessionServiceKit/TSGroupThread.h>
#import <SessionServiceKit/TSThread.h>

2
Signal/src/ViewControllers/DebugUI/DebugUISyncMessages.m
View File

@ -21,7 +21,7 @@
#import <SessionServiceKit/OWSSyncGroupsMessage.h>
#import <SessionServiceKit/OWSSyncGroupsRequestMessage.h>
#import <SessionServiceKit/OWSVerificationStateChangeMessage.h>
#import <SessionServiceKit/SignalServiceKit-Swift.h>
#import <SessionServiceKit/SessionServiceKit-Swift.h>
#import <SessionServiceKit/TSCall.h>
#import <SessionServiceKit/TSDatabaseView.h>
#import <SessionServiceKit/TSIncomingMessage.h>

2
Signal/src/ViewControllers/GifPicker/GifPickerViewController.swift
View File

@ -165,7 +165,7 @@ class GifPickerViewController: OWSViewController, UISearchBarDelegate, UICollect
self.view.addSubview(searchBar)
searchBar.autoPinWidthToSuperview()
searchBar.autoPin(toTopLayoutGuideOf: self, withInset: 0)
searchBar.autoPinEdge(.top, to: .top, of: view)
self.collectionView.delegate = self
self.collectionView.dataSource = self

4
Signal/src/ViewControllers/HomeView/HomeViewController.m
View File

@ -352,7 +352,7 @@ typedef NS_ENUM(NSInteger, HomeViewControllerSection) {
[self createFirstConversationCueView];
[self.view addSubview:self.firstConversationCueView];
[self.firstConversationCueView autoPinToTopLayoutGuideOfViewController:self withInset:0.f];
[self.firstConversationCueView autoPinEdge:ALEdgeTop toEdge:ALEdgeTop ofView:self.view withOffset:0.0f];
// This inset bakes in assumptions about UINavigationBar layout, but I'm not sure
// there's a better way to do it, since it isn't safe to use iOS auto layout with
// UINavigationBar contents.
@ -660,7 +660,7 @@ typedef NS_ENUM(NSInteger, HomeViewControllerSection) {
if (@available(iOS 11, *)) {
[searchResultsController.view autoPinTopToSuperviewMarginWithInset:56];
} else {
[searchResultsController.view autoPinToTopLayoutGuideOfViewController:self withInset:40];
[searchResultsController.view autoPinEdge:ALEdgeTop toEdge:ALEdgeTop ofView:self.view withOffset:40.0f];
}
searchResultsController.view.hidden = YES;

2
Signal/src/ViewControllers/LongTextViewController.swift
View File

@ -171,7 +171,7 @@ public class LongTextViewController: OWSViewController {
view.addSubview(footer)
footer.autoPinWidthToSuperview()
footer.autoPinEdge(.top, to: .bottom, of: messageTextView)
footer.autoPin(toBottomLayoutGuideOf: self, withInset: 0)
footer.autoPinEdge(.bottom, to: .bottom, of: view)
footer.items = [
UIBarButtonItem(barButtonSystemItem: .flexibleSpace, target: nil, action: nil),

2
Signal/src/ViewControllers/MediaDetailViewController.m
View File

@ -259,7 +259,7 @@ NS_ASSUME_NONNULL_BEGIN
self.videoProgressBar = videoProgressBar;
[self.view addSubview:videoProgressBar];
[videoProgressBar autoPinWidthToSuperview];
[videoProgressBar autoPinToTopLayoutGuideOfViewController:self withInset:0];
[videoProgressBar autoPinEdge:ALEdgeTop toEdge:ALEdgeTop ofView:self.view withOffset:0.0f];
CGFloat kVideoProgressBarHeight = 44;
[videoProgressBar autoSetDimension:ALDimensionHeight toSize:kVideoProgressBarHeight];

2
Signal/src/ViewControllers/MediaPageViewController.swift
View File

@ -182,7 +182,7 @@ class MediaPageViewController: UIPageViewController, UIPageViewControllerDataSou
self.view.addSubview(bottomContainer)
bottomContainer.autoPinWidthToSuperview()
bottomContainer.autoPinEdge(toSuperviewEdge: .bottom)
footerBar.autoPin(toBottomLayoutGuideOf: self, withInset: 0)
footerBar.autoPinEdge(.bottom, to: .bottom, of: view)
footerBar.autoSetDimension(.height, toSize: 44)
updateTitle()

2
Signal/src/ViewControllers/MediaTileViewController.swift
View File

@ -533,7 +533,7 @@ public class MediaTileViewController: UICollectionViewController, MediaGalleryDa
// show toolbar
UIView.animate(withDuration: 0.1, delay: 0, options: .curveEaseInOut, animations: {
NSLayoutConstraint.deactivate([self.footerBarBottomConstraint])
self.footerBarBottomConstraint = self.footerBar.autoPin(toBottomLayoutGuideOf: self, withInset: 0)
self.footerBarBottomConstraint = self.footerBar.autoPinEdge(.bottom, to: .bottom, of: self.view)
self.footerBar.superview?.layoutIfNeeded()

4
Signal/src/ViewControllers/MessageDetailViewController.swift
View File

@ -176,7 +176,7 @@ class MessageDetailViewController: OWSViewController, MediaGalleryDataSourceDele
scrollView.autoPinWidthToSuperview(withMargin: 0)
if scrollView.applyInsetsFix() {
scrollView.autoPin(toTopLayoutGuideOf: self, withInset: 0)
scrollView.autoPinEdge(.top, to: .top, of: view)
} else {
scrollView.autoPinEdge(toSuperviewEdge: .top)
}
@ -196,7 +196,7 @@ class MessageDetailViewController: OWSViewController, MediaGalleryDataSourceDele
view.addSubview(footer)
footer.autoPinWidthToSuperview(withMargin: 0)
footer.autoPinEdge(.top, to: .bottom, of: scrollView)
footer.autoPin(toBottomLayoutGuideOf: self, withInset: 0)
footer.autoPinEdge(.bottom, to: .bottom, of: view)
footer.items = [
UIBarButtonItem(barButtonSystemItem: .flexibleSpace, target: nil, action: nil),

4
Signal/src/ViewControllers/NewContactThreadViewController.m
View File

@ -18,7 +18,7 @@
#import <SessionServiceKit/AppVersion.h>
#import <SessionServiceKit/PhoneNumberUtil.h>
#import <SessionServiceKit/SignalAccount.h>
#import <SessionServiceKit/SignalServiceKit-Swift.h>
#import <SessionServiceKit/SessionServiceKit-Swift.h>
#import <SessionServiceKit/TSAccountManager.h>
NS_ASSUME_NONNULL_BEGIN
@ -157,7 +157,7 @@ NS_ASSUME_NONNULL_BEGIN
[self.view addSubview:self.noSignalContactsView];
[self.noSignalContactsView autoPinWidthToSuperview];
[self.noSignalContactsView autoPinEdgeToSuperviewEdge:ALEdgeTop];
[self.noSignalContactsView autoPinToBottomLayoutGuideOfViewController:self withInset:0];
[self.noSignalContactsView autoPinEdge:ALEdgeBottom toEdge:ALEdgeBottom ofView:self.view withOffset:0.0f];
SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, _noSignalContactsView);
UIRefreshControl *pullToRefreshView = [UIRefreshControl new];

2
Signal/src/ViewControllers/NewGroupViewController.m
View File

@ -127,7 +127,7 @@ NS_ASSUME_NONNULL_BEGIN
[self.view addSubview:firstSection];
[firstSection autoSetDimension:ALDimensionHeight toSize:100.f];
[firstSection autoPinWidthToSuperview];
[firstSection autoPinToTopLayoutGuideOfViewController:self withInset:0];
[firstSection autoPinEdge:ALEdgeTop toEdge:ALEdgeTop ofView:self.view withOffset:0.0f];
_tableViewController = [OWSTableViewController new];
_tableViewController.delegate = self;

4
Signal/src/ViewControllers/OWS2FAReminderViewController.swift
View File

@ -53,8 +53,8 @@ public class OWS2FAReminderViewController: UIViewController, PinEntryViewDelegat
view.addSubview(pinEntryView)
pinEntryView.autoPinWidthToSuperview(withMargin: 20)
pinEntryView.autoPin(toTopLayoutGuideOf: self, withInset: ScaleFromIPhone5(16))
pinEntryView.autoPin(toBottomLayoutGuideOf: self, withInset: 0)
pinEntryView.autoPinEdge(.top, to: .top, of: view, withOffset: ScaleFromIPhone5(16))
pinEntryView.autoPinEdge(.bottom, to: .bottom, of: view)
}
// MARK: PinEntryViewDelegate

4
Signal/src/ViewControllers/OWS2FASettingsViewController.m
View File

@ -149,7 +149,7 @@ NS_ASSUME_NONNULL_BEGIN
[self createTableView];
[instructionsLabel autoPinToTopLayoutGuideOfViewController:self withInset:kVSpacing];
[instructionsLabel autoPinEdge:ALEdgeTop toEdge:ALEdgeTop ofView:self.view withOffset:kVSpacing];
[instructionsLabel autoPinEdgeToSuperviewSafeArea:ALEdgeLeading withInset:self.hMargin];
[instructionsLabel autoPinEdgeToSuperviewSafeArea:ALEdgeTrailing withInset:self.hMargin];
@ -159,7 +159,7 @@ NS_ASSUME_NONNULL_BEGIN
toEdge:ALEdgeBottom
ofView:instructionsLabel
withOffset:kVSpacing];
[self.tableViewController.view autoPinToBottomLayoutGuideOfViewController:self withInset:0];
[self.tableViewController.view autoPinEdge:ALEdgeBottom toEdge:ALEdgeBottom ofView:self.view withOffset:0.0f];
[self updateTableContents];
}

2
Signal/src/ViewControllers/ProfileViewController.m
View File

@ -100,7 +100,7 @@ NSString *const kProfileView_LastPresentedDate = @"kProfileView_LastPresentedDat
UIView *contentView = [UIView containerView];
contentView.backgroundColor = Theme.backgroundColor;
[self.view addSubview:contentView];
[contentView autoPinToTopLayoutGuideOfViewController:self withInset:0];
[contentView autoPinEdge:ALEdgeTop toEdge:ALEdgeTop ofView:self.view withOffset:0.0f];
[contentView autoPinWidthToSuperview];
const CGFloat fontSizePoints = ScaleFromIPhone5To7Plus(16.f, 20.f);

2
Signal/src/ViewControllers/Registration/Onboarding2FAViewController.swift
View File

@ -94,7 +94,7 @@ public class Onboarding2FAViewController: OnboardingBaseViewController {
stackView.isLayoutMarginsRelativeArrangement = true
view.addSubview(stackView)
stackView.autoPinWidthToSuperview()
stackView.autoPin(toTopLayoutGuideOf: self, withInset: 0)
stackView.autoPinEdge(.top, to: .top, of: view)
autoPinView(toBottomOfViewControllerOrKeyboard: stackView, avoidNotch: true)
// Ensure whitespace is balanced, so inputs are vertically centered.

2
Signal/src/ViewControllers/Registration/OnboardingCaptchaViewController.swift
View File

@ -56,7 +56,7 @@ public class OnboardingCaptchaViewController: OnboardingBaseViewController {
stackView.isLayoutMarginsRelativeArrangement = true
view.addSubview(stackView)
stackView.autoPinWidthToSuperviewMargins()
stackView.autoPin(toTopLayoutGuideOf: self, withInset: 0)
stackView.autoPinEdge(.top, to: .top, of: view)
autoPinView(toBottomOfViewControllerOrKeyboard: stackView, avoidNotch: true)
NotificationCenter.default.addObserver(self,

4
Signal/src/ViewControllers/Registration/OnboardingPermissionsViewController.swift
View File

@ -52,8 +52,8 @@ public class OnboardingPermissionsViewController: OnboardingBaseViewController {
stackView.isLayoutMarginsRelativeArrangement = true
view.addSubview(stackView)
stackView.autoPinWidthToSuperview()
stackView.autoPin(toTopLayoutGuideOf: self, withInset: 0)
stackView.autoPin(toBottomLayoutGuideOf: self, withInset: 0)
stackView.autoPinEdge(.top, to: .top, of: view)
stackView.autoPinEdge(.bottom, to: .bottom, of: view)
}
// MARK: Request Access

2
Signal/src/ViewControllers/Registration/OnboardingProfileViewController.swift
View File

@ -115,7 +115,7 @@ public class OnboardingProfileViewController: OnboardingBaseViewController {
stackView.isLayoutMarginsRelativeArrangement = true
view.addSubview(stackView)
stackView.autoPinWidthToSuperview()
stackView.autoPin(toTopLayoutGuideOf: self, withInset: 0)
stackView.autoPinEdge(.top, to: .top, of: view)
autoPinView(toBottomOfViewControllerOrKeyboard: stackView, avoidNotch: true)
// Ensure whitespace is balanced, so inputs are vertically centered.

4
Signal/src/ViewControllers/Registration/OnboardingSplashViewController.swift
View File

@ -70,8 +70,8 @@ public class OnboardingSplashViewController: OnboardingBaseViewController {
stackView.isLayoutMarginsRelativeArrangement = true
view.addSubview(stackView)
stackView.autoPinWidthToSuperview()
stackView.autoPin(toTopLayoutGuideOf: self, withInset: 0)
stackView.autoPin(toBottomLayoutGuideOf: self, withInset: 0)
stackView.autoPinEdge(.top, to: .top, of: view)
stackView.autoPinEdge(.bottom, to: .bottom, of: view)
lokiLogoImageView.autoCenterInSuperview()
if UserDefaults.standard.bool(forKey: "wasUnlinked") {

2
Signal/src/ViewControllers/Registration/OnboardingVerificationViewController.swift
View File

@ -326,7 +326,7 @@ public class OnboardingVerificationViewController: OnboardingBaseViewController
stackView.isLayoutMarginsRelativeArrangement = true
view.addSubview(stackView)
stackView.autoPinWidthToSuperview()
stackView.autoPin(toTopLayoutGuideOf: self, withInset: 0)
stackView.autoPinEdge(.top, to: .top, of: view)
autoPinView(toBottomOfViewControllerOrKeyboard: stackView, avoidNotch: true)
// Ensure whitespace is balanced, so inputs are vertically centered.

4
Signal/src/ViewControllers/ThreadSettings/FingerprintViewController.m
View File

@ -192,7 +192,7 @@ typedef void (^CustomLayoutBlock)(void);
action:@selector(verifyUnverifyButtonTapped:)]];
[self.view addSubview:verifyUnverifyButton];
[verifyUnverifyButton autoPinWidthToSuperview];
[verifyUnverifyButton autoPinToBottomLayoutGuideOfViewController:self withInset:0];
[verifyUnverifyButton autoPinEdge:ALEdgeBottom toEdge:ALEdgeBottom ofView:self.view withOffset:0.0f];
SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, verifyUnverifyButton);
UIView *verifyUnverifyPillbox = [UIView new];
@ -336,7 +336,7 @@ typedef void (^CustomLayoutBlock)(void);
// verified.
[verificationStateLabel autoSetDimension:ALDimensionHeight
toSize:round(verificationStateLabel.font.lineHeight * 2.25f)];
[verificationStateLabel autoPinToTopLayoutGuideOfViewController:self withInset:ScaleFromIPhone5To7Plus(15.f, 20.f)];
[verificationStateLabel autoPinEdge:ALEdgeTop toEdge:ALEdgeTop ofView:self.view withOffset:ScaleFromIPhone5To7Plus(15.f, 20.f)];
[verificationStateLabel autoPinEdge:ALEdgeBottom
toEdge:ALEdgeTop
ofView:fingerprintView

4
Signal/src/ViewControllers/ThreadSettings/FingerprintViewScanController.m
View File

@ -74,7 +74,7 @@ NS_ASSUME_NONNULL_BEGIN
self.qrScanningController.scanDelegate = self;
[self.view addSubview:self.qrScanningController.view];
[self.qrScanningController.view autoPinWidthToSuperview];
[self.qrScanningController.view autoPinToTopLayoutGuideOfViewController:self withInset:0];
[self.qrScanningController.view autoPinEdge:ALEdgeTop toEdge:ALEdgeTop ofView:self.view withOffset:0.0f];
UIView *footer = [UIView new];
footer.backgroundColor = [UIColor colorWithWhite:0.25f alpha:1.f];
@ -94,7 +94,7 @@ NS_ASSUME_NONNULL_BEGIN
[footer addSubview:cameraInstructionLabel];
[cameraInstructionLabel autoPinWidthToSuperviewWithMargin:ScaleFromIPhone5To7Plus(16.f, 30.f)];
CGFloat instructionsVMargin = ScaleFromIPhone5To7Plus(10.f, 20.f);
[cameraInstructionLabel autoPinToBottomLayoutGuideOfViewController:self withInset:instructionsVMargin];
[cameraInstructionLabel autoPinEdge:ALEdgeBottom toEdge:ALEdgeBottom ofView:self.view withOffset:instructionsVMargin];
[cameraInstructionLabel autoPinEdgeToSuperviewEdge:ALEdgeTop withInset:instructionsVMargin];
}

2
Signal/src/ViewControllers/ThreadSettings/UpdateGroupViewController.m
View File

@ -116,7 +116,7 @@ NS_ASSUME_NONNULL_BEGIN
[self.view addSubview:firstSection];
[firstSection autoSetDimension:ALDimensionHeight toSize:100.f];
[firstSection autoPinWidthToSuperview];
[firstSection autoPinToTopLayoutGuideOfViewController:self withInset:0];
[firstSection autoPinEdge:ALEdgeTop toEdge:ALEdgeTop ofView:self.view withOffset:0.0f];
_tableViewController = [OWSTableViewController new];
_tableViewController.delegate = self;

2
Signal/src/environment/ExperienceUpgrades/ExperienceUpgrade.swift
View File

@ -49,7 +49,7 @@ import SignalMessaging
super.init(coder: coder)
}
@objc public required init(dictionary dictionaryValue: [AnyHashable: Any]!) throws {
@objc public required init(dictionary dictionaryValue: [String: Any]!) throws {
// This is the unfortunate seam between strict swift and fast-and-loose objc
// we can't leave these properties nil, since we really "don't know" that the superclass
// will assign them.

2
Signal/test/ViewControllers/ConversationViewItemTest.m
View File

@ -7,7 +7,7 @@
#import <MobileCoreServices/MobileCoreServices.h>
#import <SignalMessaging/SignalMessaging-Swift.h>
#import <SessionServiceKit/MIMETypeUtil.h>
#import <SessionServiceKit/SignalServiceKit-Swift.h>
#import <SessionServiceKit/SessionServiceKit-Swift.h>
#import <SessionServiceKit/TSAttachmentStream.h>
#import <SessionServiceKit/TSContactThread.h>
#import <SessionServiceKit/TSOutgoingMessage.h>

2
Signal/test/util/ProtoParsingTest.m
View File

@ -9,7 +9,7 @@
#import <SessionServiceKit/OWSContactsOutputStream.h>
#import <SessionServiceKit/OWSGroupsOutputStream.h>
#import <SessionServiceKit/SignalAccount.h>
#import <SessionServiceKit/SignalServiceKit-Swift.h>
#import <SessionServiceKit/SessionServiceKit-Swift.h>
NS_ASSUME_NONNULL_BEGIN

2
SignalMessaging/ViewControllers/AttachmentApproval/AttachmentPrepViewController.swift
View File

@ -146,7 +146,7 @@ public class AttachmentPrepViewController: OWSViewController, PlayerProgressBarD
// pops the keyboard.
contentContainer.addSubview(progressBar)
progressBar.autoPin(toTopLayoutGuideOf: self, withInset: 0)
progressBar.autoPinEdge(.top, to: .top, of: view)
progressBar.autoPinWidthToSuperview()
progressBar.autoSetDimension(.height, toSize: 44)

2
SignalMessaging/ViewControllers/ContactShareApprovalViewController.swift
View File

@ -368,7 +368,7 @@ public class ContactShareApprovalViewController: OWSViewController, EditContactS
scrollView.layoutMargins = .zero
scrollView.autoPinEdge(toSuperviewSafeArea: .leading)
scrollView.autoPinEdge(toSuperviewSafeArea: .trailing)
scrollView.autoPin(toTopLayoutGuideOf: self, withInset: 0)
scrollView.autoPinEdge(.top, to: .top, of: view)
scrollView.autoPinEdge(toSuperviewEdge: .bottom)
let fieldsView = createFieldsView()

2
SignalMessaging/ViewControllers/EditContactShareNameViewController.swift
View File

@ -257,7 +257,7 @@ public class EditContactShareNameViewController: OWSViewController, ContactNameF
self.view.addSubview(scrollView)
scrollView.layoutMargins = .zero
scrollView.autoPinWidthToSuperview()
scrollView.autoPin(toTopLayoutGuideOf: self, withInset: 0)
scrollView.autoPinEdge(.top, to: .top, of: view)
scrollView.autoPinEdge(toSuperviewEdge: .bottom)
let fieldsView = createFieldsView()

4
SignalMessaging/ViewControllers/MessageApprovalViewController.swift
View File

@ -79,7 +79,7 @@ public class MessageApprovalViewController: OWSViewController, UITextViewDelegat
view.addSubview(recipientRow)
recipientRow.autoPinEdge(toSuperviewSafeArea: .leading)
recipientRow.autoPinEdge(toSuperviewSafeArea: .trailing)
recipientRow.autoPin(toTopLayoutGuideOf: self, withInset: 0)
recipientRow.autoPinEdge(.bottom, to: .bottom, of: view)
// Text View
textView = OWSTextView()
@ -94,7 +94,7 @@ public class MessageApprovalViewController: OWSViewController, UITextViewDelegat
textView.autoPinEdge(toSuperviewSafeArea: .leading)
textView.autoPinEdge(toSuperviewSafeArea: .trailing)
textView.autoPinEdge(.top, to: .bottom, of: recipientRow)
textView.autoPin(toBottomLayoutGuideOf: self, withInset: 0)
textView.autoPinEdge(.bottom, to: .bottom, of: view)
}
private func createRecipientRow() -> UIView {

4
SignalMessaging/ViewControllers/OWSTableViewController.m
View File

@ -579,8 +579,8 @@ NSString *const kOWSTableCellIdentifier = @"kOWSTableCellIdentifier";
// if applyScrollViewInsetsFix disables contentInsetAdjustmentBehavior,
// we need to pin to the top and bottom layout guides since UIKit
// won't adjust our content insets.
[self.tableView autoPinToTopLayoutGuideOfViewController:self withInset:0];
[self.tableView autoPinToBottomLayoutGuideOfViewController:self withInset:0];
[self.tableView autoPinEdge:ALEdgeTop toEdge:ALEdgeTop ofView:self.view withOffset:0];
[self.tableView autoPinEdge:ALEdgeBottom toEdge:ALEdgeBottom ofView:self.view withOffset:0];
[self.tableView autoPinEdgeToSuperviewSafeArea:ALEdgeLeading];
[self.tableView autoPinEdgeToSuperviewSafeArea:ALEdgeTrailing];

2
SignalMessaging/ViewControllers/OWSViewController.m
View File

@ -124,7 +124,7 @@ UIInterfaceOrientationMask DefaultUIInterfaceOrientationMask(void)
self.bottomLayoutView = view;
if (avoidNotch) {
self.bottomLayoutConstraint = [view autoPinToBottomLayoutGuideOfViewController:self withInset:0.f];
self.bottomLayoutConstraint = [view autoPinEdge:ALEdgeBottom toEdge:ALEdgeBottom ofView:self.view withOffset:0];
} else {
self.bottomLayoutConstraint = [view autoPinEdge:ALEdgeBottom toEdge:ALEdgeBottom ofView:self.view];
}

2
SignalMessaging/ViewControllers/SelectRecipientViewController.m
View File

@ -92,7 +92,7 @@ NSString *const kSelectRecipientViewControllerCellIdentifier = @"kSelectRecipien
[self.view addSubview:self.tableViewController.view];
[self.tableViewController.view autoPinEdgeToSuperviewSafeArea:ALEdgeLeading];
[self.tableViewController.view autoPinEdgeToSuperviewSafeArea:ALEdgeTrailing];
[_tableViewController.view autoPinToTopLayoutGuideOfViewController:self withInset:0];
[_tableViewController.view autoPinEdge:ALEdgeTop toEdge:ALEdgeTop ofView:self.view withOffset:0];
[_tableViewController.view autoPinEdgeToSuperviewEdge:ALEdgeBottom];
self.tableViewController.tableView.rowHeight = UITableViewAutomaticDimension;
self.tableViewController.tableView.estimatedRowHeight = 60;

2
SignalMessaging/ViewControllers/SelectThreadViewController.m
View File

@ -112,7 +112,7 @@ NS_ASSUME_NONNULL_BEGIN
}
[self.view addSubview:header];
[header autoPinWidthToSuperview];
[header autoPinToTopLayoutGuideOfViewController:self withInset:0];
[header autoPinEdge:ALEdgeTop toEdge:ALEdgeTop ofView:self.view withOffset:0.0f];
[header setCompressionResistanceVerticalHigh];
[header setContentHuggingVerticalHigh];
*/

2
SignalMessaging/contacts/OWSSyncManager.m
View File

@ -20,7 +20,7 @@
#import <SessionServiceKit/LKSyncOpenGroupsMessage.h>
#import <SessionServiceKit/SSKEnvironment.h>
#import <SessionServiceKit/SignalAccount.h>
#import <SessionServiceKit/SignalServiceKit-Swift.h>
#import <SessionServiceKit/SessionServiceKit-Swift.h>
#import <SessionServiceKit/TSAccountManager.h>
#import <SessionServiceKit/YapDatabaseConnection+OWS.h>
#import <SessionServiceKit/TSContactThread.h>

2
SignalMessaging/environment/AppSetup.m
View File

@ -24,7 +24,7 @@
#import <SessionServiceKit/OWSReadReceiptManager.h>
#import <SessionServiceKit/OWSStorage.h>
#import <SessionServiceKit/SSKEnvironment.h>
#import <SessionServiceKit/SignalServiceKit-Swift.h>
#import <SessionServiceKit/SessionServiceKit-Swift.h>
#import <SessionServiceKit/TSSocketManager.h>
NS_ASSUME_NONNULL_BEGIN

2
SignalMessaging/profiles/OWSUserProfile.m
View File

@ -12,7 +12,7 @@
#import <SessionServiceKit/OWSFileSystem.h>
#import <SessionServiceKit/OWSPrimaryStorage.h>
#import <SessionServiceKit/SSKEnvironment.h>
#import <SessionServiceKit/SignalServiceKit-Swift.h>
#import <SessionServiceKit/SessionServiceKit-Swift.h>
#import <SessionServiceKit/TSAccountManager.h>
#import <YapDatabase/YapDatabaseConnection.h>
#import <YapDatabase/YapDatabaseTransaction.h>

2
SignalMessaging/utils/ThreadUtil.m
View File

@ -9,7 +9,7 @@
#import "OWSUnreadIndicator.h"
#import "TSUnreadIndicatorInteraction.h"
#import <SessionCoreKit/NSDate+OWS.h>
#import <SessionCoreKit/SignalCoreKit-Swift.h>
#import <SessionCoreKit/SessionCoreKit-Swift.h>
#import <SignalMessaging/OWSProfileManager.h>
#import <SignalMessaging/SignalMessaging-Swift.h>
#import <SessionServiceKit/OWSAddToContactsOfferMessage.h>

2
SignalServiceKit/src/Account/TSAccountManager.m
View File

@ -20,7 +20,7 @@
#import <Reachability/Reachability.h>
#import <SessionCoreKit/NSData+OWS.h>
#import <SessionCoreKit/Randomness.h>
#import <SessionServiceKit/SignalServiceKit-Swift.h>
#import <SessionServiceKit/SessionServiceKit-Swift.h>
#import <YapDatabase/YapDatabase.h>
NS_ASSUME_NONNULL_BEGIN

2
SignalServiceKit/src/Account/TSPreKeyManager.m
View File

@ -11,7 +11,7 @@
#import "TSNetworkManager.h"
#import "TSStorageHeaders.h"
#import <SessionCoreKit/NSDate+OWS.h>
#import <SessionServiceKit/SignalServiceKit-Swift.h>
#import <SessionServiceKit/SessionServiceKit-Swift.h>
NS_ASSUME_NONNULL_BEGIN

2
SignalServiceKit/src/Contacts/ContactsUpdater.m
View File

@ -11,7 +11,7 @@
#import "TSNetworkManager.h"
#import <SessionCoreKit/Cryptography.h>
#import <SessionCoreKit/Threading.h>
#import <SessionServiceKit/SignalServiceKit-Swift.h>
#import <SessionServiceKit/SessionServiceKit-Swift.h>
#import <YapDatabase/YapDatabase.h>
NS_ASSUME_NONNULL_BEGIN

2
SignalServiceKit/src/Contacts/SignalRecipient.m
View File

@ -8,7 +8,7 @@
#import "SSKEnvironment.h"
#import "TSAccountManager.h"
#import "TSSocketManager.h"
#import <SessionServiceKit/SignalServiceKit-Swift.h>
#import <SessionServiceKit/SessionServiceKit-Swift.h>
#import <YapDatabase/YapDatabaseConnection.h>
NS_ASSUME_NONNULL_BEGIN

2
SignalServiceKit/src/Contacts/TSThread.m
View File

@ -17,7 +17,7 @@
#import "TSOutgoingMessage.h"
#import <SessionCoreKit/Cryptography.h>
#import <SessionCoreKit/NSDate+OWS.h>
#import <SessionServiceKit/SignalServiceKit-Swift.h>
#import <SessionServiceKit/SessionServiceKit-Swift.h>
#import <YapDatabase/YapDatabase.h>
NS_ASSUME_NONNULL_BEGIN

4
SignalServiceKit/src/Contacts/Threads/TSContactThread.m
View File

@ -8,10 +8,10 @@
#import "NotificationsProtocol.h"
#import "OWSIdentityManager.h"
#import "SSKEnvironment.h"
#import <SessionServiceKit/SignalServiceKit-Swift.h>
#import <SessionServiceKit/SessionServiceKit-Swift.h>
#import <YapDatabase/YapDatabaseConnection.h>
#import <YapDatabase/YapDatabaseTransaction.h>
#import <SessionMetadataKit/SignalMetadataKit-Swift.h>
#import <SessionMetadataKit/SessionMetadataKit-Swift.h>
NS_ASSUME_NONNULL_BEGIN

2
SignalServiceKit/src/Contacts/Threads/TSGroupThread.m
View File

@ -8,7 +8,7 @@
#import <SessionServiceKit/TSAccountManager.h>
#import <YapDatabase/YapDatabaseConnection.h>
#import <YapDatabase/YapDatabaseTransaction.h>
#import <SessionServiceKit/SignalServiceKit-Swift.h>
#import <SessionServiceKit/SessionServiceKit-Swift.h>
#import "OWSPrimaryStorage.h"
NS_ASSUME_NONNULL_BEGIN

2
SignalServiceKit/src/Devices/OWSBlockedPhoneNumbersMessage.m
View File

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

2
SignalServiceKit/src/Devices/OWSContactsOutputStream.m
View File

@ -14,7 +14,7 @@
#import "TSContactThread.h"
#import <SessionCoreKit/Cryptography.h>
#import <SessionCoreKit/NSData+OWS.h>
#import <SessionServiceKit/SignalServiceKit-Swift.h>
#import <SessionServiceKit/SessionServiceKit-Swift.h>
NS_ASSUME_NONNULL_BEGIN

2
SignalServiceKit/src/Devices/OWSDevice.m
View File

@ -14,7 +14,7 @@
#import <Mantle/MTLValueTransformer.h>
#import <SessionCoreKit/NSDate+OWS.h>
#import <SessionServiceKit/OWSIdentityManager.h>
#import <SessionServiceKit/SignalServiceKit-Swift.h>
#import <SessionServiceKit/SessionServiceKit-Swift.h>
NS_ASSUME_NONNULL_BEGIN

2
SignalServiceKit/src/Devices/OWSGroupsOutputStream.m
View File

@ -8,7 +8,7 @@
#import "OWSDisappearingMessagesConfiguration.h"
#import "TSGroupModel.h"
#import "TSGroupThread.h"
#import <SessionServiceKit/SignalServiceKit-Swift.h>
#import <SessionServiceKit/SessionServiceKit-Swift.h>
NS_ASSUME_NONNULL_BEGIN

2
SignalServiceKit/src/Devices/OWSProvisioningMessage.m
View File

@ -7,7 +7,7 @@
#import <SessionAxolotlKit/NSData+keyVersionByte.h>
#import <SessionCurve25519Kit/Curve25519.h>
#import <SessionHKDFKit/HKDFKit.h>
#import <SessionServiceKit/SignalServiceKit-Swift.h>
#import <SessionServiceKit/SessionServiceKit-Swift.h>
NS_ASSUME_NONNULL_BEGIN

2
SignalServiceKit/src/Devices/OWSReadReceiptsForLinkedDevicesMessage.m
View File

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

2
SignalServiceKit/src/Devices/OWSReceiptsForSenderMessage.m
View File

@ -5,7 +5,7 @@
#import "OWSReceiptsForSenderMessage.h"
#import "SignalRecipient.h"
#import <SessionCoreKit/NSDate+OWS.h>
#import <SessionServiceKit/SignalServiceKit-Swift.h>
#import <SessionServiceKit/SessionServiceKit-Swift.h>
NS_ASSUME_NONNULL_BEGIN

2
SignalServiceKit/src/Devices/OWSRecordTranscriptJob.m
View File

@ -16,7 +16,7 @@
#import "TSOutgoingMessage.h"
#import "TSQuotedMessage.h"
#import "TSThread.h"
#import <SessionServiceKit/SignalServiceKit-Swift.h>
#import <SessionServiceKit/SessionServiceKit-Swift.h>
#import "OWSPrimaryStorage+Loki.h"
NS_ASSUME_NONNULL_BEGIN

2
SignalServiceKit/src/Devices/OWSVerificationStateSyncMessage.m
View File

@ -5,7 +5,7 @@
#import "OWSVerificationStateSyncMessage.h"
#import "OWSIdentityManager.h"
#import <SessionCoreKit/Cryptography.h>
#import <SessionServiceKit/SignalServiceKit-Swift.h>
#import <SessionServiceKit/SessionServiceKit-Swift.h>
NS_ASSUME_NONNULL_BEGIN

2
SignalServiceKit/src/Loki/Database/OWSPrimaryStorage+Loki.m
View File

@ -11,7 +11,7 @@
#import "YapDatabaseTransaction+OWS.h"
#import <SessionAxolotlKit/NSData+keyVersionByte.h>
#import "NSObject+Casting.h"
#import <SessionServiceKit/SignalServiceKit-Swift.h>
#import <SessionServiceKit/SessionServiceKit-Swift.h>
@implementation OWSPrimaryStorage (Loki)

2
SignalServiceKit/src/Loki/Protocol/Closed Groups/LKSessionRequestMessage.m
View File

@ -1,6 +1,6 @@
#import "LKSessionRequestMessage.h"
#import <SessionCoreKit/NSDate+OWS.h>
#import <SessionServiceKit/SignalServiceKit-Swift.h>
#import <SessionServiceKit/SessionServiceKit-Swift.h>
@implementation LKSessionRequestMessage

2
SignalServiceKit/src/Loki/Protocol/Friend Requests/LKFriendRequestMessage.m
View File

@ -5,7 +5,7 @@
#import "SSKEnvironment.h"
#import "TSThread.h"
#import <SessionServiceKit/SignalServiceKit-Swift.h>
#import <SessionServiceKit/SessionServiceKit-Swift.h>
@implementation LKFriendRequestMessage

2
SignalServiceKit/src/Loki/Protocol/Meta/LKAddressMessage.m
View File

@ -1,7 +1,7 @@
#import "LKAddressMessage.h"
#import "NSDate+OWS.h"
#import "SignalRecipient.h"
#import <SessionServiceKit/SignalServiceKit-Swift.h>
#import <SessionServiceKit/SessionServiceKit-Swift.h>
@interface LKAddressMessage ()

2
SignalServiceKit/src/Loki/Protocol/Meta/LKEphemeralMessage.m
View File

@ -1,6 +1,6 @@
#import "LKEphemeralMessage.h"
#import <SessionCoreKit/NSDate+OWS.h>
#import <SessionServiceKit/SignalServiceKit-Swift.h>
#import <SessionServiceKit/SessionServiceKit-Swift.h>
@implementation LKEphemeralMessage

2
SignalServiceKit/src/Loki/Protocol/Multi Device/LKDeviceLinkMessage.m
View File

@ -7,7 +7,7 @@
#import "SignalRecipient.h"
#import <SessionCoreKit/NSData+OWS.h>
#import <SessionCoreKit/NSDate+OWS.h>
#import <SessionServiceKit/SignalServiceKit-Swift.h>
#import <SessionServiceKit/SessionServiceKit-Swift.h>
@implementation LKDeviceLinkMessage

2
SignalServiceKit/src/Loki/Protocol/Multi Device/LKUnlinkDeviceMessage.m
View File

@ -1,6 +1,6 @@
#import "LKUnlinkDeviceMessage.h"
#import <SessionCoreKit/NSDate+OWS.h>
#import <SessionServiceKit/SignalServiceKit-Swift.h>
#import <SessionServiceKit/SessionServiceKit-Swift.h>
@implementation LKUnlinkDeviceMessage

2
SignalServiceKit/src/Loki/Protocol/Session Management/LKSessionRestoreMessage.m
View File

@ -1,6 +1,6 @@
#import "LKSessionRestoreMessage.h"
#import <SessionCoreKit/NSDate+OWS.h>
#import <SessionServiceKit/SignalServiceKit-Swift.h>
#import <SessionServiceKit/SessionServiceKit-Swift.h>
@implementation LKSessionRestoreMessage

2
SignalServiceKit/src/Loki/Protocol/Sync Messages/LKSyncOpenGroupsMessage.m
View File

@ -1,6 +1,6 @@
#import "LKSyncOpenGroupsMessage.h"
#import "OWSPrimaryStorage.h"
#import <SessionServiceKit/SignalServiceKit-Swift.h>
#import <SessionServiceKit/SessionServiceKit-Swift.h>
NS_ASSUME_NONNULL_BEGIN

2
SignalServiceKit/src/Messages/Attachments/OWSAttachmentDownloads.m
View File

@ -23,7 +23,7 @@
#import "TSThread.h"
#import <PromiseKit/AnyPromise.h>
#import <SessionCoreKit/Cryptography.h>
#import <SessionServiceKit/SignalServiceKit-Swift.h>
#import <SessionServiceKit/SessionServiceKit-Swift.h>
#import <YapDatabase/YapDatabaseConnection.h>
NS_ASSUME_NONNULL_BEGIN

2
SignalServiceKit/src/Messages/Attachments/TSAttachmentPointer.m
View File

@ -6,7 +6,7 @@
#import "OWSBackupFragment.h"
#import "TSAttachmentStream.h"
#import <SessionServiceKit/MimeTypeUtil.h>
#import <SessionServiceKit/SignalServiceKit-Swift.h>
#import <SessionServiceKit/SessionServiceKit-Swift.h>
#import <YapDatabase/YapDatabase.h>
#import <YapDatabase/YapDatabaseTransaction.h>

2
SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.m
View File

@ -9,7 +9,7 @@
#import "TSAttachmentPointer.h"
#import <AVFoundation/AVFoundation.h>
#import <SessionCoreKit/Threading.h>
#import <SessionServiceKit/SignalServiceKit-Swift.h>
#import <SessionServiceKit/SessionServiceKit-Swift.h>
#import <YapDatabase/YapDatabase.h>
NS_ASSUME_NONNULL_BEGIN

2
SignalServiceKit/src/Messages/DeviceSyncing/OWSIncomingSentMessageTranscript.m
View File

@ -12,7 +12,7 @@
#import "TSOutgoingMessage.h"
#import "TSQuotedMessage.h"
#import "TSThread.h"
#import <SessionServiceKit/SignalServiceKit-Swift.h>
#import <SessionServiceKit/SessionServiceKit-Swift.h>
NS_ASSUME_NONNULL_BEGIN

2
SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSentMessageTranscript.m
View File

@ -5,7 +5,7 @@
#import "OWSOutgoingSentMessageTranscript.h"
#import "TSOutgoingMessage.h"
#import "TSThread.h"
#import <SessionServiceKit/SignalServiceKit-Swift.h>
#import <SessionServiceKit/SessionServiceKit-Swift.h>
NS_ASSUME_NONNULL_BEGIN

2
SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSyncMessage.m
View File

@ -6,7 +6,7 @@
#import "ProtoUtils.h"
#import <SessionCoreKit/Cryptography.h>
#import <SessionCoreKit/NSDate+OWS.h>
#import <SessionServiceKit/SignalServiceKit-Swift.h>
#import <SessionServiceKit/SessionServiceKit-Swift.h>
NS_ASSUME_NONNULL_BEGIN

2
SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncConfigurationMessage.m
View File

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

2
SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncContactsMessage.m
View File

@ -16,7 +16,7 @@
#import "TSAttachmentStream.h"
#import "TSContactThread.h"
#import <SessionCoreKit/NSDate+OWS.h>
#import <SessionServiceKit/SignalServiceKit-Swift.h>
#import <SessionServiceKit/SessionServiceKit-Swift.h>
#import "OWSPrimaryStorage.h"
@import Contacts;

2
SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncGroupsMessage.m
View File

@ -10,7 +10,7 @@
#import "TSGroupModel.h"
#import "TSGroupThread.h"
#import <SessionCoreKit/NSDate+OWS.h>
#import <SessionServiceKit/SignalServiceKit-Swift.h>
#import <SessionServiceKit/SessionServiceKit-Swift.h>
#import "OWSPrimaryStorage.h"
NS_ASSUME_NONNULL_BEGIN

2
SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncGroupsRequestMessage.m
View File

@ -4,7 +4,7 @@
#import "OWSSyncGroupsRequestMessage.h"
#import <SessionCoreKit/NSDate+OWS.h>
#import <SessionServiceKit/SignalServiceKit-Swift.h>
#import <SessionServiceKit/SessionServiceKit-Swift.h>
NS_ASSUME_NONNULL_BEGIN

2
SignalServiceKit/src/Messages/Interactions/OWSContact.m
View File

@ -11,7 +11,7 @@
#import "TSAttachment.h"
#import "TSAttachmentPointer.h"
#import "TSAttachmentStream.h"
#import <SessionServiceKit/SignalServiceKit-Swift.h>
#import <SessionServiceKit/SessionServiceKit-Swift.h>
#import <YapDatabase/YapDatabaseTransaction.h>
@import Contacts;

2
SignalServiceKit/src/Messages/Interactions/OWSDisappearingMessagesConfigurationMessage.m
View File

@ -5,7 +5,7 @@
#import "OWSDisappearingMessagesConfigurationMessage.h"
#import "OWSDisappearingMessagesConfiguration.h"
#import <SessionCoreKit/NSDate+OWS.h>
#import <SessionServiceKit/SignalServiceKit-Swift.h>
#import <SessionServiceKit/SessionServiceKit-Swift.h>
NS_ASSUME_NONNULL_BEGIN

2
SignalServiceKit/src/Messages/Interactions/OWSDynamicOutgoingMessage.m
View File

@ -4,7 +4,7 @@
#import "OWSDynamicOutgoingMessage.h"
#import <SessionCoreKit/NSDate+OWS.h>
#import <SessionServiceKit/SignalServiceKit-Swift.h>
#import <SessionServiceKit/SessionServiceKit-Swift.h>
NS_ASSUME_NONNULL_BEGIN

2
SignalServiceKit/src/Messages/Interactions/OWSEndSessionMessage.m
View File

@ -5,7 +5,7 @@
#import "OWSEndSessionMessage.h"
#import "OWSPrimaryStorage+Loki.h"
#import "SignalRecipient.h"
#import <SessionServiceKit/SignalServiceKit-Swift.h>
#import <SessionServiceKit/SessionServiceKit-Swift.h>
NS_ASSUME_NONNULL_BEGIN

2
SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift
View File

@ -109,7 +109,7 @@ public class OWSLinkPreview: MTLModel {
}
@objc
public required init(dictionary dictionaryValue: [AnyHashable: Any]!) throws {
public required init(dictionary dictionaryValue: [String: Any]!) throws {
try super.init(dictionary: dictionaryValue)
}

2
SignalServiceKit/src/Messages/Interactions/TSErrorMessage.m
View File

@ -9,7 +9,7 @@
#import "TSContactThread.h"
#import "TSErrorMessage_privateConstructor.h"
#import <SessionCoreKit/NSDate+OWS.h>
#import <SessionServiceKit/SignalServiceKit-Swift.h>
#import <SessionServiceKit/SessionServiceKit-Swift.h>
#import <YapDatabase/YapDatabaseConnection.h>
NS_ASSUME_NONNULL_BEGIN

2
SignalServiceKit/src/Messages/Interactions/TSInteraction.m
View File

@ -6,7 +6,7 @@
#import "TSDatabaseSecondaryIndexes.h"
#import "TSThread.h"
#import <SessionCoreKit/NSDate+OWS.h>
#import <SessionServiceKit/SignalServiceKit-Swift.h>
#import <SessionServiceKit/SessionServiceKit-Swift.h>
NS_ASSUME_NONNULL_BEGIN

2
SignalServiceKit/src/Messages/Interactions/TSMessage.m
View File

@ -13,7 +13,7 @@
#import "TSQuotedMessage.h"
#import "TSThread.h"
#import <SessionCoreKit/NSDate+OWS.h>
#import <SessionServiceKit/SignalServiceKit-Swift.h>
#import <SessionServiceKit/SessionServiceKit-Swift.h>
#import <YapDatabase/YapDatabase.h>
#import <YapDatabase/YapDatabaseTransaction.h>
#import "OWSPrimaryStorage+Loki.h"

2
SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m
View File

@ -20,7 +20,7 @@
#import "TSGroupThread.h"
#import "TSQuotedMessage.h"
#import <SessionCoreKit/NSDate+OWS.h>
#import <SessionServiceKit/SignalServiceKit-Swift.h>
#import <SessionServiceKit/SessionServiceKit-Swift.h>
#import <YapDatabase/YapDatabase.h>
#import <YapDatabase/YapDatabaseTransaction.h>

2
SignalServiceKit/src/Messages/Interactions/TSQuotedMessage.m
View File

@ -11,7 +11,7 @@
#import "TSInteraction.h"
#import "TSOutgoingMessage.h"
#import "TSThread.h"
#import <SessionServiceKit/SignalServiceKit-Swift.h>
#import <SessionServiceKit/SessionServiceKit-Swift.h>
#import <YapDatabase/YapDatabaseTransaction.h>
NS_ASSUME_NONNULL_BEGIN

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