oxen-io/session-ios
1
0
Fork 0
mirror of https://github.com/oxen-io/session-ios.git synced 2023-12-13 21:30:14 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'charlesmchen/sck'

Browse source
This commit is contained in:
Matthew Chen 2018-10-02 13:17:02 -04:00
parent f0f25aa413 2c4c096d93
commit 935aaa4200
185 changed files with 954 additions and 3188 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
Podfile
View file

@ -5,17 +5,24 @@ use_frameworks!
def shared_pods
# OWS Pods
pod 'SignalCoreKit', git: 'https://github.com/signalapp/SignalCoreKit.git', testspecs: ["Tests"]
# pod 'SignalCoreKit', path: '../SignalCoreKit', testspecs: ["Tests"]
# pod 'SQLCipher', path: '../sqlcipher2'
pod 'SQLCipher', :git => 'https://github.com/sqlcipher/sqlcipher.git', :commit => 'd5c2bec'
# pod 'YapDatabase/SQLCipher', path: '../YapDatabase'
pod 'YapDatabase/SQLCipher', :git => 'https://github.com/signalapp/YapDatabase.git', branch: 'signal-release'
pod 'AxolotlKit', git: 'https://github.com/signalapp/SignalProtocolKit.git', branch: 'release/2.30.2'
# pod 'AxolotlKit', path: '../SignalProtocolKit'
# TODO: Integrate tests.
# pod 'AxolotlKit', git: 'https://github.com/signalapp/SignalProtocolKit.git'
# pod 'AxolotlKit', path: '../SignalProtocolKit', testspecs: ["Tests"]
pod 'AxolotlKit', path: '../SignalProtocolKit'
pod 'HKDFKit', git: 'https://github.com/signalapp/HKDFKit.git', testspecs: ["Tests"]
# pod 'HKDFKit', path: '../HKDFKit', testspecs: ["Tests"]
pod 'Curve25519Kit', git: 'https://github.com/signalapp/Curve25519Kit', testspecs: ["Tests"]
# pod 'Curve25519Kit', path: '../Curve25519Kit', testspecs: ["Tests"]
# TODO: Use public repo.
pod 'SignalMetadataKit', git: 'https://github.com/signalapp/SignalMetadataKit', testspecs: ["Tests"]
# pod 'SignalMetadataKit', path: '../SignalMetadataKit', testspecs: ["Tests"]
pod 'SignalServiceKit', path: '.', testspecs: ["Tests"]
pod 'HKDFKit', git: 'https://github.com/signalapp/HKDFKit.git'
# pod 'HKDFKit', path: '../HKDFKit'
pod 'Curve25519Kit', git: 'https://github.com/signalapp/Curve25519Kit'
# pod 'Curve25519Kit', path: '../Curve25519Kit'
pod 'GRKOpenSSLFramework', git: 'https://github.com/signalapp/GRKOpenSSLFramework'
#pod 'GRKOpenSSLFramework', path: '../GRKOpenSSLFramework'

73
Podfile.lock
View file

@ -18,6 +18,7 @@ PODS:
- CocoaLumberjack
- Curve25519Kit (~> 2.1.0)
- HKDFKit (~> 0.0.3)
- SignalCoreKit
- SwiftProtobuf
- CocoaLumberjack (3.4.2):
- CocoaLumberjack/Default (= 3.4.2)
@ -27,9 +28,17 @@ PODS:
- CocoaLumberjack/Default
- Curve25519Kit (2.1.0):
- CocoaLumberjack
- SignalCoreKit
- Curve25519Kit/Tests (2.1.0):
- CocoaLumberjack
- SignalCoreKit
- GRKOpenSSLFramework (1.0.2.12)
- HKDFKit (0.0.4):
- CocoaLumberjack
- SignalCoreKit
- HKDFKit/Tests (0.0.4):
- CocoaLumberjack
- SignalCoreKit
- libPhoneNumber-iOS (0.9.13)
- Mantle (2.1.0):
- Mantle/extobjc (= 2.1.0)
@ -48,6 +57,26 @@ PODS:
- PureLayout (3.0.2)
- Reachability (3.2)
- SAMKeychain (1.5.3)
- SignalCoreKit (1.0.0):
- CocoaLumberjack
- GRKOpenSSLFramework
- SignalCoreKit/Tests (1.0.0):
- CocoaLumberjack
- GRKOpenSSLFramework
- SignalMetadataKit (1.0.0):
- AxolotlKit
- CocoaLumberjack
- Curve25519Kit
- HKDFKit
- SignalCoreKit
- SwiftProtobuf
- SignalMetadataKit/Tests (1.0.0):
- AxolotlKit
- CocoaLumberjack
- Curve25519Kit
- HKDFKit
- SignalCoreKit
- SwiftProtobuf
- SignalServiceKit (0.9.0):
- AFNetworking
- AxolotlKit
@ -59,6 +88,8 @@ PODS:
- PromiseKit (~> 4.0)
- Reachability
- SAMKeychain
- SignalCoreKit
- SignalMetadataKit
- SocketRocket
- SwiftProtobuf
- YapDatabase/SQLCipher
@ -73,6 +104,8 @@ PODS:
- PromiseKit (~> 4.0)
- Reachability
- SAMKeychain
- SignalCoreKit
- SignalMetadataKit
- SocketRocket
- SwiftProtobuf
- YapDatabase/SQLCipher
@ -152,13 +185,19 @@ PODS:
DEPENDENCIES:
- AFNetworking
- AxolotlKit (from `https://github.com/signalapp/SignalProtocolKit.git`, branch `release/2.30.2`)
- AxolotlKit (from `../SignalProtocolKit`)
- Curve25519Kit (from `https://github.com/signalapp/Curve25519Kit`)
- Curve25519Kit/Tests (from `https://github.com/signalapp/Curve25519Kit`)
- GRKOpenSSLFramework (from `https://github.com/signalapp/GRKOpenSSLFramework`)
- HKDFKit (from `https://github.com/signalapp/HKDFKit.git`)
- HKDFKit/Tests (from `https://github.com/signalapp/HKDFKit.git`)
- Mantle
- PureLayout
- Reachability
- SignalCoreKit (from `https://github.com/signalapp/SignalCoreKit.git`)
- SignalCoreKit/Tests (from `https://github.com/signalapp/SignalCoreKit.git`)
- SignalMetadataKit (from `https://github.com/signalapp/SignalMetadataKit-Private`)
- SignalMetadataKit/Tests (from `https://github.com/signalapp/SignalMetadataKit-Private`)
- SignalServiceKit (from `.`)
- SignalServiceKit/Tests (from `.`)
- SocketRocket (from `https://github.com/signalapp/SocketRocket.git`, branch `mkirk/handle-sec-err`)
@ -183,14 +222,17 @@ SPEC REPOS:
EXTERNAL SOURCES:
AxolotlKit:
:branch: release/2.30.2
:git: https://github.com/signalapp/SignalProtocolKit.git
:path: "../SignalProtocolKit"
Curve25519Kit:
:git: https://github.com/signalapp/Curve25519Kit
GRKOpenSSLFramework:
:git: https://github.com/signalapp/GRKOpenSSLFramework
HKDFKit:
:git: https://github.com/signalapp/HKDFKit.git
SignalCoreKit:
:git: https://github.com/signalapp/SignalCoreKit.git
SignalMetadataKit:
:git: https://github.com/signalapp/SignalMetadataKit-Private
SignalServiceKit:
:path: "."
SocketRocket:
@ -204,18 +246,21 @@ EXTERNAL SOURCES:
:git: https://github.com/signalapp/YapDatabase.git
CHECKOUT OPTIONS:
AxolotlKit:
:commit: 446fbdaa5760cf1b1337441340d4d885beb27beb
:git: https://github.com/signalapp/SignalProtocolKit.git
Curve25519Kit:
:commit: a4f46bd621bb2bcbf1a44b360e8ac4209e410ee9
:commit: 9d0f5e68d52a70e10b2469900ca0e63093e6952a
:git: https://github.com/signalapp/Curve25519Kit
GRKOpenSSLFramework:
:commit: b799c27e7927e5304ec1e4ad53c6d33c6fd1cae7
:git: https://github.com/signalapp/GRKOpenSSLFramework
HKDFKit:
:commit: f6e051a765e0bc819fee72f9b7d18acee33a8b37
:commit: 8b8326cd50bc488663a3d3743f1a92b90f4d85b4
:git: https://github.com/signalapp/HKDFKit.git
SignalCoreKit:
:commit: 358ec16833d9b8b6e1410d83fa47c819c533fe91
:git: https://github.com/signalapp/SignalCoreKit.git
SignalMetadataKit:
:commit: 0434fc7ade6e0eb27540291357a3382476dece52
:git: https://github.com/signalapp/SignalMetadataKit-Private
SocketRocket:
:commit: 9f9563a83cd8960503074aa8de72206f83fb7a69
:git: https://github.com/signalapp/SocketRocket.git
@ -228,18 +273,20 @@ CHECKOUT OPTIONS:
SPEC CHECKSUMS:
AFNetworking: b6f891fdfaed196b46c7a83cf209e09697b94057
AxolotlKit: 3a8d57041c5b162425cc40773ea6276c0c838c9d
AxolotlKit: e3030c15406a2128e4bd8e1f32f1e7711619022a
CocoaLumberjack: db7cc9e464771f12054c22ff6947c5a58d43a0fd
Curve25519Kit: 57ee34550081f405ded707384b3ea9bb3a4c8308
Curve25519Kit: 2b2e55cfa2a72f1152d2733a3058d94cc87f37c3
GRKOpenSSLFramework: 8a3735ad41e7dc1daff460467bccd32ca5d6ae3e
HKDFKit: 0445c3158e15137c845bee690a59755ac4360469
HKDFKit: 3b6dbbb9d59c221cc6c52c3aa915700cbf24e376
libPhoneNumber-iOS: e444379ac18bbfbdefad571da735b2cd7e096caa
Mantle: 2fa750afa478cd625a94230fbf1c13462f29395b
PromiseKit: 743e497a5f505a470d3bbbf4ce0663c1268af0a4
PureLayout: 4d550abe49a94f24c2808b9b95db9131685fe4cd
Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
SAMKeychain: 483e1c9f32984d50ca961e26818a534283b4cd5c
SignalServiceKit: 89940928e278a1b43c40678e651eb547ab4b56d8
SignalCoreKit: c2d8132cdedb95d35eb2f8ae7eac0957695d0a8b
SignalMetadataKit: 6fa5e9a53c7f104568662521a2f3874672ff7a02
SignalServiceKit: cc09be2499a4d6e08e2c3eec80e0aebeeb721f7e
SocketRocket: dbb1554b8fc288ef8ef370d6285aeca7361be31e
SQLCipher: f9fcf29b2e59ced7defc2a2bdd0ebe79b40d4990
SSZipArchive: 51a800ebb77f95a8329b6ced1faaff394b47f509
@ -247,6 +294,6 @@ SPEC CHECKSUMS:
YapDatabase: b418a4baa6906e8028748938f9159807fd039af4
YYImage: 1e1b62a9997399593e4b9c4ecfbbabbf1d3f3b54
PODFILE CHECKSUM: 99cf978c46911aa96f569649e7113245f4ed30b7
PODFILE CHECKSUM: 1ab920e75bea25009213e86621d80f8b707c64ef
COCOAPODS: 1.5.3

67
Scripts/ProtoWrappers.py
View file

@ -405,11 +405,6 @@ class MessageContext(BaseContext):
writer.push_context(self.proto_name, self.swift_name)
if self.args.add_log_tag:
writer.add('fileprivate static let logTag = "%s"' % self.swift_name)
writer.add('fileprivate let logTag = "%s"' % self.swift_name)
writer.newline()
for child in self.enums:
child.generate(writer)
@ -669,6 +664,27 @@ public func serializedData() throws -> Data {
writer.add('// MARK: - %s' % self.swift_builder_name)
writer.newline()
# Required Fields
required_fields = [field for field in self.fields() if field.is_required]
required_init_params = []
required_init_args = []
if len(required_fields) > 0:
for field in required_fields:
if field.rules == 'repeated':
param_type = '[' + self.base_swift_type_for_field(field) + ']'
else:
param_type = self.base_swift_type_for_field(field)
required_init_params.append('%s: %s' % ( field.name_swift, param_type) )
required_init_args.append('%s: %s' % ( field.name_swift, field.name_swift) )
# Convenience accessor.
with writer.braced('@objc public class func builder(%s) -> %s' % (
', '.join(required_init_params),
self.swift_builder_name,
)) as writer:
writer.add('return %s(%s)' % (self.swift_builder_name, ', '.join(required_init_args), ))
writer.newline()
writer.add('@objc public class %s: NSObject {' % self.swift_builder_name)
writer.newline()
@ -679,21 +695,13 @@ public func serializedData() throws -> Data {
writer.newline()
# Initializer
writer.add('@objc public override init() {}')
writer.add('@objc fileprivate override init() {}')
writer.newline()
# Required-Field Initializer
required_fields = [field for field in self.fields() if field.is_required]
if len(required_fields) > 0:
required_init_params = []
for field in required_fields:
if field.rules == 'repeated':
param_type = '[' + self.base_swift_type_for_field(field) + ']'
else:
param_type = self.base_swift_type_for_field(field)
required_init_params.append('%s: %s' % ( field.name_swift, param_type) )
writer.add('// Initializer for required fields')
writer.add('@objc public init(%s) {' % ', '.join(required_init_params))
# writer.add('// Initializer for required fields')
writer.add('@objc fileprivate init(%s) {' % ', '.join(required_init_params))
writer.push_indent()
writer.add('super.init()')
writer.newline()
@ -704,32 +712,7 @@ public func serializedData() throws -> Data {
writer.pop_indent()
writer.add('}')
writer.newline()
# # All-Field Initializer
# if len(required_fields) < len(self.fields()):
# init_params = []
# for field in self.fields():
# if field.is_required:
# if field.rules == 'repeated':
# param_type = '[' + self.base_swift_type_for_field(field) + ']'
# else:
# param_type = self.base_swift_type_for_field(field)
# else:
# param_type = field.type_swift
# init_params.append('%s: %s' % ( field.name_swift, param_type) )
# writer.add('// Initializer for required fields')
# writer.add('@objc public init(%s) {' % ', '.join(init_params))
# writer.push_indent()
# writer.add('super.init()')
# writer.newline()
# for field in self.fields():
# accessor_name = field.name_swift
# accessor_name = 'set' + accessor_name[0].upper() + accessor_name[1:]
# writer.add('%s(%s)' % ( accessor_name, field.name_swift, ) )
# writer.pop_indent()
# writer.add('}')
# writer.newline()
# Setters
for field in self.fields():
if field.rules == 'repeated':

8
Signal.xcodeproj/project.pbxproj
View file

@ -3005,6 +3005,8 @@
"${BUILT_PRODUCTS_DIR}/SAMKeychain/SAMKeychain.framework",
"${BUILT_PRODUCTS_DIR}/SQLCipher/SQLCipher.framework",
"${BUILT_PRODUCTS_DIR}/SSZipArchive/SSZipArchive.framework",
"${BUILT_PRODUCTS_DIR}/SignalCoreKit/SignalCoreKit.framework",
"${BUILT_PRODUCTS_DIR}/SignalMetadataKit/SignalMetadataKit.framework",
"${BUILT_PRODUCTS_DIR}/SignalServiceKit/SignalServiceKit.framework",
"${BUILT_PRODUCTS_DIR}/SocketRocket/SocketRocket.framework",
"${BUILT_PRODUCTS_DIR}/SwiftProtobuf/SwiftProtobuf.framework",
@ -3027,6 +3029,8 @@
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SAMKeychain.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SQLCipher.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SSZipArchive.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SignalCoreKit.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SignalMetadataKit.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SignalServiceKit.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SocketRocket.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftProtobuf.framework",
@ -3076,6 +3080,8 @@
"${BUILT_PRODUCTS_DIR}/Reachability/Reachability.framework",
"${BUILT_PRODUCTS_DIR}/SAMKeychain/SAMKeychain.framework",
"${BUILT_PRODUCTS_DIR}/SQLCipher/SQLCipher.framework",
"${BUILT_PRODUCTS_DIR}/SignalCoreKit/SignalCoreKit.framework",
"${BUILT_PRODUCTS_DIR}/SignalMetadataKit/SignalMetadataKit.framework",
"${BUILT_PRODUCTS_DIR}/SignalServiceKit/SignalServiceKit.framework",
"${BUILT_PRODUCTS_DIR}/SocketRocket/SocketRocket.framework",
"${BUILT_PRODUCTS_DIR}/SwiftProtobuf/SwiftProtobuf.framework",
@ -3097,6 +3103,8 @@
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Reachability.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SAMKeychain.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SQLCipher.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SignalCoreKit.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SignalMetadataKit.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SignalServiceKit.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SocketRocket.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftProtobuf.framework",

54
Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme
View file

@ -28,7 +28,7 @@
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "237277EA071A0C42090E0E10F34EFC45"
BlueprintIdentifier = "4D5E7522A33906C902399C86F0A95AA5"
BuildableName = "SignalServiceKit.framework"
BlueprintName = "SignalServiceKit"
ReferencedContainer = "container:Pods/Pods.xcodeproj">
@ -56,12 +56,62 @@
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "11B0EF2E18D829262A7DF015BEBB0909"
BlueprintIdentifier = "2B6F7011088115EAED369AC7DDFF6016"
BuildableName = "SignalServiceKit-Unit-Tests.xctest"
BlueprintName = "SignalServiceKit-Unit-Tests"
ReferencedContainer = "container:Pods/Pods.xcodeproj">
</BuildableReference>
</TestableReference>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "BC89BC6B06642C78EABF18B43FFB41DE"
BuildableName = "SignalCoreKit-Unit-Tests.xctest"
BlueprintName = "SignalCoreKit-Unit-Tests"
ReferencedContainer = "container:Pods/Pods.xcodeproj">
</BuildableReference>
</TestableReference>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E012D804E31EC876E21973F300B46CCB"
BuildableName = "AxolotlKit-Unit-Tests.xctest"
BlueprintName = "AxolotlKit-Unit-Tests"
ReferencedContainer = "container:Pods/Pods.xcodeproj">
</BuildableReference>
</TestableReference>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "B4A8ABAC14D962F8F42814238460DF44"
BuildableName = "Curve25519Kit-Unit-Tests.xctest"
BlueprintName = "Curve25519Kit-Unit-Tests"
ReferencedContainer = "container:Pods/Pods.xcodeproj">
</BuildableReference>
</TestableReference>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E5C44C64CDE3569B16010274DCD48BCC"
BuildableName = "HKDFKit-Unit-Tests.xctest"
BlueprintName = "HKDFKit-Unit-Tests"
ReferencedContainer = "container:Pods/Pods.xcodeproj">
</BuildableReference>
</TestableReference>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "8D0278E2AE7B02CE43272DFEE6C97FF6"
BuildableName = "SignalMetadataKit-Unit-Tests.xctest"
BlueprintName = "SignalMetadataKit-Unit-Tests"
ReferencedContainer = "container:Pods/Pods.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference

5
Signal/Signal-Prefix.pch
View file

@ -15,7 +15,8 @@
static const NSUInteger ddLogLevel = DDLogLevelInfo;
#endif
#import <SignalServiceKit/OWSAsserts.h>
#import <SignalCoreKit/NSObject+OWS.h>
#import <SignalCoreKit/OWSAsserts.h>
#import <SignalServiceKit/SSKAsserts.h>
#import <SignalServiceKit/OWSAnalytics.h>
#import <SignalServiceKit/NSObject+OWS.h>
#endif

2
Signal/src/AppDelegate.m
View file

@ -21,6 +21,7 @@
#import "ViewControllerUtils.h"
#import <AxolotlKit/SessionCipher.h>
#import <PromiseKit/AnyPromise.h>
#import <SignalCoreKit/iOSVersions.h>
#import <SignalMessaging/AppSetup.h>
#import <SignalMessaging/Environment.h>
#import <SignalMessaging/OWSContactsManager.h>
@ -48,7 +49,6 @@
#import <SignalServiceKit/TSDatabaseView.h>
#import <SignalServiceKit/TSPreKeyManager.h>
#import <SignalServiceKit/TSSocketManager.h>
#import <SignalServiceKit/iOSVersions.h>
#import <YapDatabase/YapDatabaseCryptoUtils.h>
#import <sys/sysctl.h>

39
Signal/src/Generated/WebRTCProto.swift
View file

@ -16,14 +16,17 @@ public enum WebRTCProtoError: Error {
// MARK: - WebRTCProtoConnectedBuilder
@objc public class func builder(id: UInt64) -> WebRTCProtoConnectedBuilder {
return WebRTCProtoConnectedBuilder(id: id)
}
@objc public class WebRTCProtoConnectedBuilder: NSObject {
private var proto = WebRTCProtos_Connected()
@objc public override init() {}
@objc fileprivate override init() {}
// Initializer for required fields
@objc public init(id: UInt64) {
@objc fileprivate init(id: UInt64) {
super.init()
setId(id)
@ -100,14 +103,17 @@ extension WebRTCProtoConnected.WebRTCProtoConnectedBuilder {
// MARK: - WebRTCProtoHangupBuilder
@objc public class func builder(id: UInt64) -> WebRTCProtoHangupBuilder {
return WebRTCProtoHangupBuilder(id: id)
}
@objc public class WebRTCProtoHangupBuilder: NSObject {
private var proto = WebRTCProtos_Hangup()
@objc public override init() {}
@objc fileprivate override init() {}
// Initializer for required fields
@objc public init(id: UInt64) {
@objc fileprivate init(id: UInt64) {
super.init()
setId(id)
@ -184,14 +190,17 @@ extension WebRTCProtoHangup.WebRTCProtoHangupBuilder {
// MARK: - WebRTCProtoVideoStreamingStatusBuilder
@objc public class func builder(id: UInt64) -> WebRTCProtoVideoStreamingStatusBuilder {
return WebRTCProtoVideoStreamingStatusBuilder(id: id)
}
@objc public class WebRTCProtoVideoStreamingStatusBuilder: NSObject {
private var proto = WebRTCProtos_VideoStreamingStatus()
@objc public override init() {}
@objc fileprivate override init() {}
// Initializer for required fields
@objc public init(id: UInt64) {
@objc fileprivate init(id: UInt64) {
super.init()
setId(id)
@ -279,11 +288,15 @@ extension WebRTCProtoVideoStreamingStatus.WebRTCProtoVideoStreamingStatusBuilder
// MARK: - WebRTCProtoDataBuilder
@objc public class func builder() -> WebRTCProtoDataBuilder {
return WebRTCProtoDataBuilder()
}
@objc public class WebRTCProtoDataBuilder: NSObject {
private var proto = WebRTCProtos_Data()
@objc public override init() {}
@objc fileprivate override init() {}
@objc public func setConnected(_ valueParam: WebRTCProtoConnected) {
proto.connected = valueParam.proto
@ -335,17 +348,17 @@ extension WebRTCProtoVideoStreamingStatus.WebRTCProtoVideoStreamingStatusBuilder
}
fileprivate class func parseProto(_ proto: WebRTCProtos_Data) throws -> WebRTCProtoData {
var connected: WebRTCProtoConnected? = nil
var connected: WebRTCProtoConnected?
if proto.hasConnected {
connected = try WebRTCProtoConnected.parseProto(proto.connected)
}
var hangup: WebRTCProtoHangup? = nil
var hangup: WebRTCProtoHangup?
if proto.hasHangup {
hangup = try WebRTCProtoHangup.parseProto(proto.hangup)
}
var videoStreamingStatus: WebRTCProtoVideoStreamingStatus? = nil
var videoStreamingStatus: WebRTCProtoVideoStreamingStatus?
if proto.hasVideoStreamingStatus {
videoStreamingStatus = try WebRTCProtoVideoStreamingStatus.parseProto(proto.videoStreamingStatus)
}

2
Signal/src/Jobs/MessageFetcherJob.swift
View file

@ -143,7 +143,7 @@ public class MessageFetcherJob: NSObject {
throw ParamParser.ParseError.invalidFormat("sourceDevice")
}
let builder = SSKProtoEnvelope.SSKProtoEnvelopeBuilder(type: type, source: source, sourceDevice: sourceDevice, timestamp: timestamp)
let builder = SSKProtoEnvelope.builder(type: type, source: source, sourceDevice: sourceDevice, timestamp: timestamp)
if let legacyMessage = try params.optionalBase64EncodedData(key: "message") {
builder.setLegacyMessage(legacyMessage)

2
Signal/src/Models/OWSDeviceProvisioningURLParser.m
View file

@ -3,8 +3,8 @@
//
#import "OWSDeviceProvisioningURLParser.h"
#import "NSData+OWS.h"
#import <AxolotlKit/NSData+keyVersionByte.h>
#import <SignalCoreKit/NSData+OWS.h>
NS_ASSUME_NONNULL_BEGIN

14
Signal/src/Signal-Bridging-Header.h
View file

@ -48,6 +48,13 @@
#import <AxolotlKit/NSData+keyVersionByte.h>
#import <PureLayout/PureLayout.h>
#import <Reachability/Reachability.h>
#import <SignalCoreKit/Cryptography.h>
#import <SignalCoreKit/NSData+OWS.h>
#import <SignalCoreKit/NSDate+OWS.h>
#import <SignalCoreKit/NSString+SSK.h>
#import <SignalCoreKit/OWSAsserts.h>
#import <SignalCoreKit/OWSLogs.h>
#import <SignalCoreKit/Threading.h>
#import <SignalMessaging/AttachmentSharing.h>
#import <SignalMessaging/ContactTableViewCell.h>
#import <SignalMessaging/Environment.h>
@ -70,18 +77,13 @@
#import <SignalServiceKit/AppVersion.h>
#import <SignalServiceKit/Contact.h>
#import <SignalServiceKit/ContactsUpdater.h>
#import <SignalServiceKit/Cryptography.h>
#import <SignalServiceKit/DataSource.h>
#import <SignalServiceKit/MIMETypeUtil.h>
#import <SignalServiceKit/NSData+Image.h>
#import <SignalServiceKit/NSData+OWS.h>
#import <SignalServiceKit/NSDate+OWS.h>
#import <SignalServiceKit/NSNotificationCenter+OWS.h>
#import <SignalServiceKit/NSString+SSK.h>
#import <SignalServiceKit/NSTimer+OWS.h>
#import <SignalServiceKit/OWSAnalytics.h>
#import <SignalServiceKit/OWSAnalyticsEvents.h>
#import <SignalServiceKit/OWSAsserts.h>
#import <SignalServiceKit/OWSAttachmentsProcessor.h>
#import <SignalServiceKit/OWSBackgroundTask.h>
#import <SignalServiceKit/OWSCallMessageHandler.h>
@ -91,7 +93,6 @@
#import <SignalServiceKit/OWSError.h>
#import <SignalServiceKit/OWSFileSystem.h>
#import <SignalServiceKit/OWSIdentityManager.h>
#import <SignalServiceKit/OWSLogger.h>
#import <SignalServiceKit/OWSMediaGalleryFinder.h>
#import <SignalServiceKit/OWSMessageManager.h>
#import <SignalServiceKit/OWSMessageReceiver.h>
@ -122,7 +123,6 @@
#import <SignalServiceKit/TSPreKeyManager.h>
#import <SignalServiceKit/TSSocketManager.h>
#import <SignalServiceKit/TSThread.h>
#import <SignalServiceKit/Threading.h>
#import <SignalServiceKit/UIImage+OWS.h>
#import <WebRTC/RTCAudioSession.h>
#import <WebRTC/RTCCameraPreviewView.h>

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

@ -3,10 +3,10 @@
//
#import "OWSLinkDeviceViewController.h"
#import "Cryptography.h"
#import "OWSDeviceProvisioningURLParser.h"
#import "OWSLinkedDevicesTableViewController.h"
#import "Signal-Swift.h"
#import <SignalCoreKit/Cryptography.h>
#import <SignalMessaging/OWSProfileManager.h>
#import <SignalServiceKit/OWSDevice.h>
#import <SignalServiceKit/OWSDeviceProvisioner.h>

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

@ -6,10 +6,10 @@
#import "BlockListViewController.h"
#import "OWS2FASettingsViewController.h"
#import "Signal-Swift.h"
#import <SignalCoreKit/NSString+SSK.h>
#import <SignalMessaging/Environment.h>
#import <SignalMessaging/OWSPreferences.h>
#import <SignalMessaging/ThreadUtil.h>
#import <SignalServiceKit/NSString+SSK.h>
#import <SignalServiceKit/OWS2FAManager.h>
#import <SignalServiceKit/OWSReadReceiptManager.h>

2
Signal/src/ViewControllers/ConversationView/Cells/OWSMessageTimerView.m
View file

@ -4,11 +4,11 @@
#import "OWSMessageTimerView.h"
#import "ConversationViewController.h"
#import "NSDate+OWS.h"
#import "OWSMath.h"
#import "UIColor+OWS.h"
#import "UIView+OWS.h"
#import <QuartzCore/QuartzCore.h>
#import <SignalCoreKit/NSDate+OWS.h>
#import <SignalServiceKit/NSTimer+OWS.h>
NS_ASSUME_NONNULL_BEGIN

4
Signal/src/ViewControllers/ConversationView/ConversationViewController.m
View file

@ -46,6 +46,8 @@
#import <ContactsUI/CNContactViewController.h>
#import <MobileCoreServices/UTCoreTypes.h>
#import <PromiseKit/AnyPromise.h>
#import <SignalCoreKit/NSDate+OWS.h>
#import <SignalCoreKit/Threading.h>
#import <SignalMessaging/Environment.h>
#import <SignalMessaging/NSString+OWS.h>
#import <SignalMessaging/OWSContactOffersInteraction.h>
@ -61,7 +63,6 @@
#import <SignalServiceKit/Contact.h>
#import <SignalServiceKit/ContactsUpdater.h>
#import <SignalServiceKit/MimeTypeUtil.h>
#import <SignalServiceKit/NSDate+OWS.h>
#import <SignalServiceKit/NSTimer+OWS.h>
#import <SignalServiceKit/OWSAddToContactsOfferMessage.h>
#import <SignalServiceKit/OWSAddToProfileWhitelistOfferMessage.h>
@ -80,7 +81,6 @@
#import <SignalServiceKit/TSInvalidIdentityKeyReceivingErrorMessage.h>
#import <SignalServiceKit/TSNetworkManager.h>
#import <SignalServiceKit/TSQuotedMessage.h>
#import <SignalServiceKit/Threading.h>
#import <YapDatabase/YapDatabase.h>
#import <YapDatabase/YapDatabaseAutoView.h>
#import <YapDatabase/YapDatabaseViewChange.h>

2
Signal/src/ViewControllers/DebugUI/DebugContactsUtils.m
View file

@ -5,7 +5,7 @@
#import "DebugContactsUtils.h"
#import "Signal-Swift.h"
#import <Contacts/Contacts.h>
#import <Curve25519Kit/Randomness.h>
#import <SignalCoreKit/Randomness.h>
NS_ASSUME_NONNULL_BEGIN

2
Signal/src/ViewControllers/DebugUI/DebugUIBackup.m
View file

@ -6,7 +6,7 @@
#import "OWSBackup.h"
#import "OWSTableViewController.h"
#import "Signal-Swift.h"
#import <Curve25519Kit/Randomness.h>
#import <SignalCoreKit/Randomness.h>
@import CloudKit;

6
Signal/src/ViewControllers/DebugUI/DebugUICalling.swift
View file

@ -33,8 +33,7 @@ class DebugUICalling: DebugUIPage {
let kFakeCallId = UInt64(12345)
var hangupMessage: SSKProtoCallMessageHangup
do {
let hangupBuilder = SSKProtoCallMessageHangup.SSKProtoCallMessageHangupBuilder()
hangupBuilder.setId(kFakeCallId)
let hangupBuilder = SSKProtoCallMessageHangup.builder(id: kFakeCallId)
hangupMessage = try hangupBuilder.build()
} catch {
owsFailDebug("could not build proto")
@ -54,8 +53,7 @@ class DebugUICalling: DebugUIPage {
let kFakeCallId = UInt64(12345)
var busyMessage: SSKProtoCallMessageBusy
do {
let busyBuilder = SSKProtoCallMessageBusy.SSKProtoCallMessageBusyBuilder()
busyBuilder.setId(kFakeCallId)
let busyBuilder = SSKProtoCallMessageBusy.builder(id: kFakeCallId)
busyMessage = try busyBuilder.build()
} catch {
owsFailDebug("Couldn't build proto")

2
Signal/src/ViewControllers/DebugUI/DebugUIContacts.m
View file

@ -8,7 +8,7 @@
#import "Signal-Swift.h"
#import "SignalApp.h"
#import <Contacts/Contacts.h>
#import <Curve25519Kit/Randomness.h>
#import <SignalCoreKit/Randomness.h>
NS_ASSUME_NONNULL_BEGIN

2
Signal/src/ViewControllers/DebugUI/DebugUIDiskUsage.m
View file

@ -6,7 +6,7 @@
#import "OWSOrphanDataCleaner.h"
#import "OWSTableViewController.h"
#import "Signal-Swift.h"
#import <SignalServiceKit/NSDate+OWS.h>
#import <SignalCoreKit/NSDate+OWS.h>
#import <SignalServiceKit/OWSPrimaryStorage.h>
#import <SignalServiceKit/TSDatabaseView.h>
#import <SignalServiceKit/TSInteraction.h>

26
Signal/src/ViewControllers/DebugUI/DebugUIMessages.m
View file

@ -8,10 +8,10 @@
#import "DebugUIMessagesAssetLoader.h"
#import "OWSTableViewController.h"
#import "Signal-Swift.h"
#import <Curve25519Kit/Randomness.h>
#import <SignalCoreKit/NSDate+OWS.h>
#import <SignalCoreKit/Randomness.h>
#import <SignalMessaging/Environment.h>
#import <SignalServiceKit/MIMETypeUtil.h>
#import <SignalServiceKit/NSDate+OWS.h>
#import <SignalServiceKit/OWSBatchMessageProcessor.h>
#import <SignalServiceKit/OWSDisappearingConfigurationUpdateInfoMessage.h>
#import <SignalServiceKit/OWSDisappearingMessagesConfiguration.h>
@ -3379,11 +3379,10 @@ typedef OWSContact * (^OWSContactBlock)(YapDatabaseReadWriteTransaction *transac
}
}();
SSKProtoEnvelopeBuilder *envelopeBuilder =
[[SSKProtoEnvelopeBuilder alloc] initWithType:SSKProtoEnvelopeTypeCiphertext
source:source
sourceDevice:1
timestamp:timestamp];
SSKProtoEnvelopeBuilder *envelopeBuilder = [SSKProtoEnvelope builderWithType:SSKProtoEnvelopeTypeCiphertext
source:source
sourceDevice:1
timestamp:timestamp];
NSError *error;
SSKProtoEnvelope *_Nullable envelope = [envelopeBuilder buildAndReturnError:&error];
if (error || !envelope) {
@ -3869,18 +3868,17 @@ typedef OWSContact * (^OWSContactBlock)(YapDatabaseReadWriteTransaction *transac
NSString *randomText = [self randomText];
NSString *text = [[[@(counter) description] stringByAppendingString:@" "] stringByAppendingString:randomText];
SSKProtoDataMessageBuilder *dataMessageBuilder = [SSKProtoDataMessageBuilder new];
SSKProtoDataMessageBuilder *dataMessageBuilder = [SSKProtoDataMessage builder];
[dataMessageBuilder setBody:text];
if ([thread isKindOfClass:[TSGroupThread class]]) {
TSGroupThread *groupThread = (TSGroupThread *)thread;
SSKProtoGroupContextBuilder *groupBuilder =
[[SSKProtoGroupContextBuilder alloc] initWithId:groupThread.groupModel.groupId
type:SSKProtoGroupContextTypeDeliver];
[SSKProtoGroupContext builderWithId:groupThread.groupModel.groupId type:SSKProtoGroupContextTypeDeliver];
[dataMessageBuilder setGroup:groupBuilder.buildIgnoringErrors];
}
SSKProtoContentBuilder *payloadBuilder = [SSKProtoContentBuilder new];
SSKProtoContentBuilder *payloadBuilder = [SSKProtoContent builder];
[payloadBuilder setDataMessage:dataMessageBuilder.buildIgnoringErrors];
NSData *plaintextData = [payloadBuilder buildIgnoringErrors].serializedDataIgnoringErrors;
@ -3899,10 +3897,8 @@ typedef OWSContact * (^OWSContactBlock)(YapDatabaseReadWriteTransaction *transac
SSKProtoEnvelopeType envelopeType = SSKProtoEnvelopeTypeCiphertext;
NSData *content = plaintextData;
SSKProtoEnvelopeBuilder *envelopeBuilder = [[SSKProtoEnvelopeBuilder alloc] initWithType:envelopeType
source:source
sourceDevice:sourceDevice
timestamp:timestamp];
SSKProtoEnvelopeBuilder *envelopeBuilder =
[SSKProtoEnvelope builderWithType:envelopeType source:source sourceDevice:sourceDevice timestamp:timestamp];
envelopeBuilder.content = content;
NSError *error;
NSData *_Nullable envelopeData = [envelopeBuilder buildSerializedDataAndReturnError:&error];

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

@ -5,7 +5,7 @@
#import "DebugUIMessagesAssetLoader.h"
#import <AFNetworking/AFHTTPSessionManager.h>
#import <AFNetworking/AFNetworking.h>
#import <Curve25519Kit/Randomness.h>
#import <SignalCoreKit/Randomness.h>
#import <SignalServiceKit/MIMETypeUtil.h>
#import <SignalServiceKit/OWSFileSystem.h>
#import <SignalServiceKit/TSAttachment.h>

133
Signal/src/ViewControllers/DebugUI/DebugUIStress.m
View file

@ -7,10 +7,10 @@
#import "OWSTableViewController.h"
#import "SignalApp.h"
#import "ThreadUtil.h"
#import <Curve25519Kit/Randomness.h>
#import <SignalCoreKit/Cryptography.h>
#import <SignalCoreKit/NSDate+OWS.h>
#import <SignalCoreKit/Randomness.h>
#import <SignalMessaging/Environment.h>
#import <SignalServiceKit/Cryptography.h>
#import <SignalServiceKit/NSDate+OWS.h>
#import <SignalServiceKit/OWSDynamicOutgoingMessage.h>
#import <SignalServiceKit/OWSPrimaryStorage.h>
#import <SignalServiceKit/SignalServiceKit-Swift.h>
@ -56,7 +56,7 @@ NS_ASSUME_NONNULL_BEGIN
[DebugUIStress sendStressMessage:thread
block:^(SignalRecipient *recipient) {
SSKProtoContentBuilder *contentBuilder =
[SSKProtoContentBuilder new];
[SSKProtoContent builder];
return [[contentBuilder buildIgnoringErrors]
serializedDataIgnoringErrors];
}];
@ -66,9 +66,9 @@ NS_ASSUME_NONNULL_BEGIN
[DebugUIStress sendStressMessage:thread
block:^(SignalRecipient *recipient) {
SSKProtoContentBuilder *contentBuilder =
[SSKProtoContentBuilder new];
[SSKProtoContent builder];
SSKProtoNullMessageBuilder *nullMessageBuilder =
[SSKProtoNullMessageBuilder new];
[SSKProtoNullMessage builder];
contentBuilder.nullMessage =
[nullMessageBuilder buildIgnoringErrors];
return [[contentBuilder buildIgnoringErrors]
@ -81,9 +81,9 @@ NS_ASSUME_NONNULL_BEGIN
sendStressMessage:thread
block:^(SignalRecipient *recipient) {
SSKProtoContentBuilder *contentBuilder =
[SSKProtoContentBuilder new];
[SSKProtoContent builder];
SSKProtoNullMessageBuilder *nullMessageBuilder =
[SSKProtoNullMessageBuilder new];
[SSKProtoNullMessage builder];
NSUInteger contentLength = arc4random_uniform(32);
nullMessageBuilder.padding =
[Cryptography generateRandomBytes:contentLength];
@ -98,9 +98,9 @@ NS_ASSUME_NONNULL_BEGIN
[DebugUIStress sendStressMessage:thread
block:^(SignalRecipient *recipient) {
SSKProtoContentBuilder *contentBuilder =
[SSKProtoContentBuilder new];
[SSKProtoContent builder];
SSKProtoSyncMessageBuilder *syncMessageBuilder =
[SSKProtoSyncMessageBuilder new];
[SSKProtoSyncMessage builder];
contentBuilder.syncMessage =
[syncMessageBuilder buildIgnoringErrors];
return [[contentBuilder buildIgnoringErrors]
@ -112,11 +112,11 @@ NS_ASSUME_NONNULL_BEGIN
[DebugUIStress sendStressMessage:thread
block:^(SignalRecipient *recipient) {
SSKProtoContentBuilder *contentBuilder =
[SSKProtoContentBuilder new];
[SSKProtoContent builder];
SSKProtoSyncMessageBuilder *syncMessageBuilder =
[SSKProtoSyncMessageBuilder new];
[SSKProtoSyncMessage builder];
SSKProtoSyncMessageSentBuilder *sentBuilder =
[SSKProtoSyncMessageSentBuilder new];
[SSKProtoSyncMessageSent builder];
syncMessageBuilder.sent =
[sentBuilder buildIgnoringErrors];
contentBuilder.syncMessage =
@ -131,9 +131,9 @@ NS_ASSUME_NONNULL_BEGIN
sendStressMessage:thread
block:^(SignalRecipient *recipient) {
SSKProtoContentBuilder *contentBuilder =
[SSKProtoContentBuilder new];
[SSKProtoContent builder];
SSKProtoDataMessageBuilder *dataBuilder =
[SSKProtoDataMessageBuilder new];
[SSKProtoDataMessage builder];
dataBuilder.body = @" ";
[DebugUIStress ensureGroupOfDataBuilder:dataBuilder
thread:thread];
@ -150,12 +150,11 @@ NS_ASSUME_NONNULL_BEGIN
[DebugUIStress
sendStressMessage:thread
block:^(SignalRecipient *recipient) {
SSKProtoContentBuilder *contentBuilder = [SSKProtoContentBuilder new];
SSKProtoDataMessageBuilder *dataBuilder =
[SSKProtoDataMessageBuilder new];
SSKProtoContentBuilder *contentBuilder = [SSKProtoContent builder];
SSKProtoDataMessageBuilder *dataBuilder = [SSKProtoDataMessage builder];
SSKProtoAttachmentPointerBuilder *attachmentPointer =
[SSKProtoAttachmentPointerBuilder new];
[attachmentPointer setId:arc4random_uniform(32) + 1];
[SSKProtoAttachmentPointer
builderWithId:arc4random_uniform(32) + 1];
[attachmentPointer setContentType:@"1"];
[attachmentPointer setSize:arc4random_uniform(32) + 1];
[attachmentPointer setDigest:[Cryptography generateRandomBytes:1]];
@ -172,9 +171,9 @@ NS_ASSUME_NONNULL_BEGIN
sendStressMessage:thread
block:^(SignalRecipient *recipient) {
SSKProtoContentBuilder *contentBuilder =
[SSKProtoContentBuilder new];
[SSKProtoContent builder];
SSKProtoDataMessageBuilder *dataBuilder =
[SSKProtoDataMessageBuilder new];
[SSKProtoDataMessage builder];
dataBuilder.body = @"alice";
[DebugUIStress ensureGroupOfDataBuilder:dataBuilder
thread:thread];
@ -193,9 +192,9 @@ NS_ASSUME_NONNULL_BEGIN
timestamp:timestamp
block:^(SignalRecipient *recipient) {
SSKProtoContentBuilder *contentBuilder =
[SSKProtoContentBuilder new];
[SSKProtoContent builder];
SSKProtoDataMessageBuilder *dataBuilder =
[SSKProtoDataMessageBuilder new];
[SSKProtoDataMessage builder];
dataBuilder.body = [NSString stringWithFormat:@"%@ %d",
[NSUUID UUID].UUIDString,
i];
@ -216,10 +215,9 @@ NS_ASSUME_NONNULL_BEGIN
sendStressMessage:thread
timestamp:timestamp
block:^(SignalRecipient *recipient) {
SSKProtoContentBuilder *contentBuilder =
[SSKProtoContentBuilder new];
SSKProtoContentBuilder *contentBuilder = [SSKProtoContent builder];
SSKProtoDataMessageBuilder *dataBuilder =
[SSKProtoDataMessageBuilder new];
[SSKProtoDataMessage builder];
dataBuilder.body =
[[NSUUID UUID].UUIDString stringByAppendingString:@" now"];
[DebugUIStress ensureGroupOfDataBuilder:dataBuilder thread:thread];
@ -237,10 +235,9 @@ NS_ASSUME_NONNULL_BEGIN
sendStressMessage:thread
timestamp:timestamp
block:^(SignalRecipient *recipient) {
SSKProtoContentBuilder *contentBuilder =
[SSKProtoContentBuilder new];
SSKProtoContentBuilder *contentBuilder = [SSKProtoContent builder];
SSKProtoDataMessageBuilder *dataBuilder =
[SSKProtoDataMessageBuilder new];
[SSKProtoDataMessage builder];
dataBuilder.body =
[[NSUUID UUID].UUIDString stringByAppendingString:@" now"];
[DebugUIStress ensureGroupOfDataBuilder:dataBuilder thread:thread];
@ -258,10 +255,9 @@ NS_ASSUME_NONNULL_BEGIN
sendStressMessage:thread
timestamp:timestamp
block:^(SignalRecipient *recipient) {
SSKProtoContentBuilder *contentBuilder =
[SSKProtoContentBuilder new];
SSKProtoContentBuilder *contentBuilder = [SSKProtoContent builder];
SSKProtoDataMessageBuilder *dataBuilder =
[SSKProtoDataMessageBuilder new];
[SSKProtoDataMessage builder];
dataBuilder.body =
[[NSUUID UUID].UUIDString stringByAppendingString:@" now"];
[DebugUIStress ensureGroupOfDataBuilder:dataBuilder thread:thread];
@ -272,8 +268,8 @@ NS_ASSUME_NONNULL_BEGIN
}]];
[items addObject:[OWSTableItem itemWithTitle:@"Send N text messages with same timestamp"
actionBlock:^{
SSKProtoContentBuilder *contentBuilder = [SSKProtoContentBuilder new];
SSKProtoDataMessageBuilder *dataBuilder = [SSKProtoDataMessageBuilder new];
SSKProtoContentBuilder *contentBuilder = [SSKProtoContent builder];
SSKProtoDataMessageBuilder *dataBuilder = [SSKProtoDataMessage builder];
dataBuilder.body = @"alice";
contentBuilder.dataMessage = [dataBuilder buildIgnoringErrors];
[DebugUIStress ensureGroupOfDataBuilder:dataBuilder thread:thread];
@ -297,15 +293,14 @@ NS_ASSUME_NONNULL_BEGIN
[DebugUIStress
sendStressMessage:thread
block:^(SignalRecipient *recipient) {
SSKProtoContentBuilder *contentBuilder = [SSKProtoContentBuilder new];
SSKProtoContentBuilder *contentBuilder = [SSKProtoContent builder];
SSKProtoSyncMessageBuilder *syncMessageBuilder =
[SSKProtoSyncMessageBuilder new];
[SSKProtoSyncMessage builder];
SSKProtoSyncMessageSentBuilder *sentBuilder =
[SSKProtoSyncMessageSentBuilder new];
[SSKProtoSyncMessageSent builder];
sentBuilder.destination = @"abc";
sentBuilder.timestamp = arc4random_uniform(32) + 1;
SSKProtoDataMessageBuilder *dataBuilder =
[SSKProtoDataMessageBuilder new];
SSKProtoDataMessageBuilder *dataBuilder = [SSKProtoDataMessage builder];
sentBuilder.message = [dataBuilder buildIgnoringErrors];
syncMessageBuilder.sent = [sentBuilder buildIgnoringErrors];
contentBuilder.syncMessage = [syncMessageBuilder buildIgnoringErrors];
@ -320,15 +315,14 @@ NS_ASSUME_NONNULL_BEGIN
[DebugUIStress
sendStressMessage:thread
block:^(SignalRecipient *recipient) {
SSKProtoContentBuilder *contentBuilder = [SSKProtoContentBuilder new];
SSKProtoContentBuilder *contentBuilder = [SSKProtoContent builder];
SSKProtoSyncMessageBuilder *syncMessageBuilder =
[SSKProtoSyncMessageBuilder new];
[SSKProtoSyncMessage builder];
SSKProtoSyncMessageSentBuilder *sentBuilder =
[SSKProtoSyncMessageSentBuilder new];
[SSKProtoSyncMessageSent builder];
sentBuilder.destination = @"abc";
sentBuilder.timestamp = 0;
SSKProtoDataMessageBuilder *dataBuilder =
[SSKProtoDataMessageBuilder new];
SSKProtoDataMessageBuilder *dataBuilder = [SSKProtoDataMessage builder];
sentBuilder.message = [dataBuilder buildIgnoringErrors];
syncMessageBuilder.sent = [sentBuilder buildIgnoringErrors];
contentBuilder.syncMessage = [syncMessageBuilder buildIgnoringErrors];
@ -343,15 +337,14 @@ NS_ASSUME_NONNULL_BEGIN
[DebugUIStress
sendStressMessage:thread
block:^(SignalRecipient *recipient) {
SSKProtoContentBuilder *contentBuilder = [SSKProtoContentBuilder new];
SSKProtoContentBuilder *contentBuilder = [SSKProtoContent builder];
SSKProtoSyncMessageBuilder *syncMessageBuilder =
[SSKProtoSyncMessageBuilder new];
[SSKProtoSyncMessage builder];
SSKProtoSyncMessageSentBuilder *sentBuilder =
[SSKProtoSyncMessageSentBuilder new];
[SSKProtoSyncMessageSent builder];
sentBuilder.destination = @"abc";
sentBuilder.timestamp = 0;
SSKProtoDataMessageBuilder *dataBuilder =
[SSKProtoDataMessageBuilder new];
SSKProtoDataMessageBuilder *dataBuilder = [SSKProtoDataMessage builder];
dataBuilder.body = @" ";
sentBuilder.message = [dataBuilder buildIgnoringErrors];
syncMessageBuilder.sent = [sentBuilder buildIgnoringErrors];
@ -367,19 +360,18 @@ NS_ASSUME_NONNULL_BEGIN
[DebugUIStress
sendStressMessage:thread
block:^(SignalRecipient *recipient) {
SSKProtoContentBuilder *contentBuilder = [SSKProtoContentBuilder new];
SSKProtoContentBuilder *contentBuilder = [SSKProtoContent builder];
SSKProtoSyncMessageBuilder *syncMessageBuilder =
[SSKProtoSyncMessageBuilder new];
[SSKProtoSyncMessage builder];
SSKProtoSyncMessageSentBuilder *sentBuilder =
[SSKProtoSyncMessageSentBuilder new];
[SSKProtoSyncMessageSent builder];
sentBuilder.destination = @"abc";
sentBuilder.timestamp = 0;
SSKProtoDataMessageBuilder *dataBuilder =
[SSKProtoDataMessageBuilder new];
SSKProtoDataMessageBuilder *dataBuilder = [SSKProtoDataMessage builder];
dataBuilder.body = @" ";
SSKProtoGroupContextBuilder *groupBuilder =
[SSKProtoGroupContextBuilder new];
[groupBuilder setId:[Cryptography generateRandomBytes:1]];
SSKProtoGroupContextBuilder *groupBuilder = [SSKProtoGroupContext
builderWithId:[Cryptography generateRandomBytes:1]
type:SSKProtoGroupContextTypeDeliver];
dataBuilder.group = [groupBuilder buildIgnoringErrors];
sentBuilder.message = [dataBuilder buildIgnoringErrors];
syncMessageBuilder.sent = [sentBuilder buildIgnoringErrors];
@ -395,19 +387,18 @@ NS_ASSUME_NONNULL_BEGIN
[DebugUIStress
sendStressMessage:thread
block:^(SignalRecipient *recipient) {
SSKProtoContentBuilder *contentBuilder = [SSKProtoContentBuilder new];
SSKProtoContentBuilder *contentBuilder = [SSKProtoContent builder];
SSKProtoSyncMessageBuilder *syncMessageBuilder =
[SSKProtoSyncMessageBuilder new];
[SSKProtoSyncMessage builder];
SSKProtoSyncMessageSentBuilder *sentBuilder =
[SSKProtoSyncMessageSentBuilder new];
[SSKProtoSyncMessageSent builder];
sentBuilder.destination = @"abc";
sentBuilder.timestamp = 0;
SSKProtoDataMessageBuilder *dataBuilder =
[SSKProtoDataMessageBuilder new];
SSKProtoDataMessageBuilder *dataBuilder = [SSKProtoDataMessage builder];
dataBuilder.body = @" ";
SSKProtoGroupContextBuilder *groupBuilder =
[SSKProtoGroupContextBuilder new];
[groupBuilder setId:[Cryptography generateRandomBytes:1]];
SSKProtoGroupContextBuilder *groupBuilder = [SSKProtoGroupContext
builderWithId:[Cryptography generateRandomBytes:1]
type:SSKProtoGroupContextTypeDeliver];
dataBuilder.group = [groupBuilder buildIgnoringErrors];
sentBuilder.message = [dataBuilder buildIgnoringErrors];
syncMessageBuilder.sent = [sentBuilder buildIgnoringErrors];
@ -421,11 +412,11 @@ NS_ASSUME_NONNULL_BEGIN
[DebugUIStress sendStressMessage:thread
block:^(SignalRecipient *recipient) {
SSKProtoContentBuilder *contentBuilder =
[SSKProtoContentBuilder new];
[SSKProtoContent builder];
SSKProtoSyncMessageBuilder *syncMessageBuilder =
[SSKProtoSyncMessageBuilder new];
[SSKProtoSyncMessage builder];
SSKProtoSyncMessageSentBuilder *sentBuilder =
[SSKProtoSyncMessageSentBuilder new];
[SSKProtoSyncMessageSent builder];
sentBuilder.destination = @"abc";
syncMessageBuilder.sent =
[sentBuilder buildIgnoringErrors];
@ -461,8 +452,8 @@ NS_ASSUME_NONNULL_BEGIN
}
TSGroupThread *groupThread = (TSGroupThread *)thread;
SSKProtoGroupContextBuilder *groupBuilder = [SSKProtoGroupContextBuilder new];
[groupBuilder setType:SSKProtoGroupContextTypeDeliver];
SSKProtoGroupContextBuilder *groupBuilder =
[SSKProtoGroupContext builderWithId:groupThread.groupModel.groupId type:SSKProtoGroupContextTypeDeliver];
[groupBuilder setId:groupThread.groupModel.groupId];
[dataBuilder setGroup:groupBuilder.buildIgnoringErrors];
}

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

@ -8,7 +8,7 @@
#import "Signal-Swift.h"
#import "ThreadUtil.h"
#import <AxolotlKit/PreKeyBundle.h>
#import <Curve25519Kit/Randomness.h>
#import <SignalCoreKit/Randomness.h>
#import <SignalMessaging/Environment.h>
#import <SignalServiceKit/OWSBatchMessageProcessor.h>
#import <SignalServiceKit/OWSBlockingManager.h>

5
Signal/src/ViewControllers/HomeView/HomeViewController.m
View file

@ -19,16 +19,17 @@
#import "TSGroupThread.h"
#import "ViewControllerUtils.h"
#import <PromiseKit/AnyPromise.h>
#import <SignalCoreKit/NSDate+OWS.h>
#import <SignalCoreKit/Threading.h>
#import <SignalCoreKit/iOSVersions.h>
#import <SignalMessaging/OWSContactsManager.h>
#import <SignalMessaging/OWSFormat.h>
#import <SignalMessaging/SignalMessaging-Swift.h>
#import <SignalMessaging/UIUtil.h>
#import <SignalServiceKit/NSDate+OWS.h>
#import <SignalServiceKit/OWSMessageSender.h>
#import <SignalServiceKit/OWSMessageUtils.h>
#import <SignalServiceKit/TSAccountManager.h>
#import <SignalServiceKit/TSOutgoingMessage.h>
#import <SignalServiceKit/Threading.h>
#import <StoreKit/StoreKit.h>
#import <YapDatabase/YapDatabase.h>
#import <YapDatabase/YapDatabaseViewChange.h>

4
Signal/src/ViewControllers/NewGroupViewController.m
View file

@ -8,7 +8,8 @@
#import "OWSNavigationController.h"
#import "Signal-Swift.h"
#import "SignalApp.h"
#import <Curve25519Kit/Randomness.h>
#import <SignalCoreKit/NSDate+OWS.h>
#import <SignalCoreKit/Randomness.h>
#import <SignalMessaging/BlockListUIUtils.h>
#import <SignalMessaging/ContactTableViewCell.h>
#import <SignalMessaging/ContactsViewHelper.h>
@ -20,7 +21,6 @@
#import <SignalMessaging/UIUtil.h>
#import <SignalMessaging/UIView+OWS.h>
#import <SignalMessaging/UIViewController+OWS.h>
#import <SignalServiceKit/NSDate+OWS.h>
#import <SignalServiceKit/OWSMessageSender.h>
#import <SignalServiceKit/SignalAccount.h>
#import <SignalServiceKit/TSGroupModel.h>

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

@ -12,11 +12,11 @@
#import "UIColor+OWS.h"
#import "UIFont+OWS.h"
#import "UIView+OWS.h"
#import <SignalCoreKit/NSDate+OWS.h>
#import <SignalMessaging/NSString+OWS.h>
#import <SignalMessaging/OWSNavigationController.h>
#import <SignalMessaging/OWSProfileManager.h>
#import <SignalMessaging/UIViewController+OWS.h>
#import <SignalServiceKit/NSDate+OWS.h>
#import <SignalServiceKit/OWSPrimaryStorage.h>
NS_ASSUME_NONNULL_BEGIN

2
Signal/src/ViewControllers/ThreadSettings/FingerprintViewController.m
View file

@ -9,10 +9,10 @@
#import "UIColor+OWS.h"
#import "UIFont+OWS.h"
#import "UIView+OWS.h"
#import <SignalCoreKit/NSDate+OWS.h>
#import <SignalMessaging/Environment.h>
#import <SignalMessaging/OWSContactsManager.h>
#import <SignalMessaging/UIUtil.h>
#import <SignalServiceKit/NSDate+OWS.h>
#import <SignalServiceKit/OWSError.h>
#import <SignalServiceKit/OWSFingerprint.h>
#import <SignalServiceKit/OWSFingerprintBuilder.h>

2
Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m
View file

@ -16,6 +16,7 @@
#import "UIView+OWS.h"
#import "UpdateGroupViewController.h"
#import <Curve25519Kit/Curve25519.h>
#import <SignalCoreKit/NSDate+OWS.h>
#import <SignalMessaging/Environment.h>
#import <SignalMessaging/OWSAvatarBuilder.h>
#import <SignalMessaging/OWSContactsManager.h>
@ -24,7 +25,6 @@
#import <SignalMessaging/OWSUserProfile.h>
#import <SignalMessaging/SignalMessaging-Swift.h>
#import <SignalMessaging/UIUtil.h>
#import <SignalServiceKit/NSDate+OWS.h>
#import <SignalServiceKit/OWSDisappearingConfigurationUpdateInfoMessage.h>
#import <SignalServiceKit/OWSDisappearingMessagesConfiguration.h>
#import <SignalServiceKit/OWSMessageSender.h>

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

@ -8,6 +8,7 @@
#import "OWSNavigationController.h"
#import "Signal-Swift.h"
#import "ViewControllerUtils.h"
#import <SignalCoreKit/NSDate+OWS.h>
#import <SignalMessaging/BlockListUIUtils.h>
#import <SignalMessaging/ContactTableViewCell.h>
#import <SignalMessaging/ContactsViewHelper.h>
@ -19,7 +20,6 @@
#import <SignalMessaging/UIUtil.h>
#import <SignalMessaging/UIView+OWS.h>
#import <SignalMessaging/UIViewController+OWS.h>
#import <SignalServiceKit/NSDate+OWS.h>
#import <SignalServiceKit/OWSMessageSender.h>
#import <SignalServiceKit/SignalAccount.h>
#import <SignalServiceKit/TSGroupModel.h>

22
Signal/src/call/CallService.swift
View file

@ -411,7 +411,7 @@ private class SignalCallData: NSObject {
return peerConnectionClient.setLocalSessionDescription(sessionDescription).then {
do {
let offerBuilder = SSKProtoCallMessageOffer.SSKProtoCallMessageOfferBuilder(id: call.signalingId,
let offerBuilder = SSKProtoCallMessageOffer.builder(id: call.signalingId,
sessionDescription: sessionDescription.sdp)
let callMessage = OWSOutgoingCallMessage(thread: call.thread, offerMessage: try offerBuilder.build())
return self.messageSender.sendPromise(message: callMessage)
@ -547,7 +547,7 @@ private class SignalCallData: NSObject {
Logger.info("for call: \(call.identifiersForLogs) thread: \(call.thread.contactIdentifier())")
do {
let busyBuilder = SSKProtoCallMessageBusy.SSKProtoCallMessageBusyBuilder(id: call.signalingId)
let busyBuilder = SSKProtoCallMessageBusy.builder(id: call.signalingId)
let callMessage = OWSOutgoingCallMessage(thread: call.thread, busyMessage: try busyBuilder.build())
let sendPromise = messageSender.sendPromise(message: callMessage)
sendPromise.retainUntilComplete()
@ -717,7 +717,7 @@ private class SignalCallData: NSObject {
Logger.info("session description for incoming call: \(newCall.identifiersForLogs), sdp: \(negotiatedSessionDescription.logSafeDescription).")
do {
let answerBuilder = SSKProtoCallMessageAnswer.SSKProtoCallMessageAnswerBuilder(id: newCall.signalingId,
let answerBuilder = SSKProtoCallMessageAnswer.builder(id: newCall.signalingId,
sessionDescription: negotiatedSessionDescription.sdp)
let callAnswerMessage = OWSOutgoingCallMessage(thread: thread, answerMessage: try answerBuilder.build())
@ -861,7 +861,7 @@ private class SignalCallData: NSObject {
* include network accessibility information from the perspective of each client. Once compatible ICEUpdates have been
* exchanged, the clients can connect.
*/
let iceUpdateBuilder = SSKProtoCallMessageIceUpdate.SSKProtoCallMessageIceUpdateBuilder(id: call.signalingId,
let iceUpdateBuilder = SSKProtoCallMessageIceUpdate.builder(id: call.signalingId,
sdpMid: sdpMid,
sdpMlineIndex: UInt32(iceCandidate.sdpMLineIndex),
sdp: iceCandidate.sdp)
@ -1041,8 +1041,8 @@ private class SignalCallData: NSObject {
var messageData: Data
do {
let connectedBuilder = WebRTCProtoConnected.WebRTCProtoConnectedBuilder(id: call.signalingId)
let dataBuilder = WebRTCProtoData.WebRTCProtoDataBuilder()
let connectedBuilder = WebRTCProtoConnected.builder(id: call.signalingId)
let dataBuilder = WebRTCProtoData.builder()
dataBuilder.setConnected(try connectedBuilder.build())
messageData = try dataBuilder.buildSerializedData()
} catch {
@ -1179,8 +1179,8 @@ private class SignalCallData: NSObject {
var messageData: Data
do {
let hangupBuilder = WebRTCProtoHangup.WebRTCProtoHangupBuilder(id: call.signalingId)
let dataBuilder = WebRTCProtoData.WebRTCProtoDataBuilder()
let hangupBuilder = WebRTCProtoHangup.builder(id: call.signalingId)
let dataBuilder = WebRTCProtoData.builder()
dataBuilder.setHangup(try hangupBuilder.build())
messageData = try dataBuilder.buildSerializedData()
} catch {
@ -1195,7 +1195,7 @@ private class SignalCallData: NSObject {
// If the call hasn't started yet, we don't have a data channel to communicate the hang up. Use Signal Service Message.
do {
let hangupBuilder = SSKProtoCallMessageHangup.SSKProtoCallMessageHangupBuilder(id: call.signalingId)
let hangupBuilder = SSKProtoCallMessageHangup.builder(id: call.signalingId)
let callMessage = OWSOutgoingCallMessage(thread: call.thread, hangupMessage: try hangupBuilder.build())
let sendPromise = self.messageSender.sendPromise(message: callMessage).then {
Logger.debug("successfully sent hangup call message to \(call.thread.contactIdentifier())")
@ -1680,9 +1680,9 @@ private class SignalCallData: NSObject {
var messageData: Data
do {
let videoStreamingStatusBuilder = WebRTCProtoVideoStreamingStatus.WebRTCProtoVideoStreamingStatusBuilder(id: call.signalingId)
let videoStreamingStatusBuilder = WebRTCProtoVideoStreamingStatus.builder(id: call.signalingId)
videoStreamingStatusBuilder.setEnabled(shouldHaveLocalVideoTrack)
let dataBuilder = WebRTCProtoData.WebRTCProtoDataBuilder()
let dataBuilder = WebRTCProtoData.builder()
dataBuilder.setVideoStreamingStatus(try videoStreamingStatusBuilder.build())
messageData = try dataBuilder.buildSerializedData()
} catch {

4
Signal/src/environment/NotificationsManager.m
View file

@ -6,18 +6,18 @@
#import "PushManager.h"
#import "Signal-Swift.h"
#import <AudioToolbox/AudioServices.h>
#import <SignalCoreKit/NSString+SSK.h>
#import <SignalCoreKit/Threading.h>
#import <SignalMessaging/Environment.h>
#import <SignalMessaging/NSString+OWS.h>
#import <SignalMessaging/OWSContactsManager.h>
#import <SignalMessaging/OWSPreferences.h>
#import <SignalMessaging/OWSSounds.h>
#import <SignalServiceKit/NSString+SSK.h>
#import <SignalServiceKit/SSKEnvironment.h>
#import <SignalServiceKit/TSCall.h>
#import <SignalServiceKit/TSContactThread.h>
#import <SignalServiceKit/TSErrorMessage.h>
#import <SignalServiceKit/TSIncomingMessage.h>
#import <SignalServiceKit/Threading.h>
#import <YapDatabase/YapDatabaseTransaction.h>
@interface NotificationsManager ()

2
Signal/src/environment/SignalApp.m
View file

@ -6,12 +6,12 @@
#import "ConversationViewController.h"
#import "HomeViewController.h"
#import "Signal-Swift.h"
#import <SignalCoreKit/Threading.h>
#import <SignalMessaging/DebugLogger.h>
#import <SignalMessaging/Environment.h>
#import <SignalServiceKit/OWSPrimaryStorage.h>
#import <SignalServiceKit/TSContactThread.h>
#import <SignalServiceKit/TSGroupThread.h>
#import <SignalServiceKit/Threading.h>
NS_ASSUME_NONNULL_BEGIN

4
Signal/src/network/PushManager.m
View file

@ -8,10 +8,10 @@
#import "Signal-Swift.h"
#import "SignalApp.h"
#import "ThreadUtil.h"
#import <SignalCoreKit/NSDate+OWS.h>
#import <SignalCoreKit/NSString+SSK.h>
#import <SignalMessaging/OWSContactsManager.h>
#import <SignalServiceKit/AppReadiness.h>
#import <SignalServiceKit/NSDate+OWS.h>
#import <SignalServiceKit/NSString+SSK.h>
#import <SignalServiceKit/OWSDevice.h>
#import <SignalServiceKit/OWSMessageSender.h>
#import <SignalServiceKit/OWSReadReceiptManager.h>

2
Signal/src/util/DateUtil.m
View file

@ -3,9 +3,9 @@
//
#import "DateUtil.h"
#import <SignalCoreKit/NSDate+OWS.h>
#import <SignalMessaging/NSString+OWS.h>
#import <SignalMessaging/OWSFormat.h>
#import <SignalServiceKit/NSDate+OWS.h>
NS_ASSUME_NONNULL_BEGIN

2
Signal/src/util/MainAppContext.m
View file

@ -4,11 +4,11 @@
#import "MainAppContext.h"
#import "Signal-Swift.h"
#import <SignalCoreKit/Threading.h>
#import <SignalMessaging/Environment.h>
#import <SignalMessaging/OWSProfileManager.h>
#import <SignalMessaging/SignalMessaging-Swift.h>
#import <SignalServiceKit/OWSIdentityManager.h>
#import <SignalServiceKit/Threading.h>
NS_ASSUME_NONNULL_BEGIN

2
Signal/src/util/OWSBackup.m
View file

@ -7,7 +7,7 @@
#import "OWSBackupIO.h"
#import "OWSBackupImportJob.h"
#import "Signal-Swift.h"
#import <Curve25519Kit/Randomness.h>
#import <SignalCoreKit/Randomness.h>
#import <SignalServiceKit/YapDatabaseConnection+OWS.h>
NSString *const NSNotificationNameBackupStateDidChange = @"NSNotificationNameBackupStateDidChange";

10
Signal/src/util/OWSBackupExportJob.m
View file

@ -6,8 +6,9 @@
#import "OWSBackupIO.h"
#import "OWSDatabaseMigration.h"
#import "Signal-Swift.h"
#import <SignalServiceKit/NSData+OWS.h>
#import <SignalServiceKit/NSDate+OWS.h>
#import <SignalCoreKit/NSData+OWS.h>
#import <SignalCoreKit/NSDate+OWS.h>
#import <SignalCoreKit/Threading.h>
#import <SignalServiceKit/OWSBackgroundTask.h>
#import <SignalServiceKit/OWSError.h>
#import <SignalServiceKit/OWSFileSystem.h>
@ -15,7 +16,6 @@
#import <SignalServiceKit/TSAttachmentStream.h>
#import <SignalServiceKit/TSMessage.h>
#import <SignalServiceKit/TSThread.h>
#import <SignalServiceKit/Threading.h>
NS_ASSUME_NONNULL_BEGIN
@ -122,11 +122,11 @@ NS_ASSUME_NONNULL_BEGIN
}
if (!self.backupSnapshotBuilder) {
self.backupSnapshotBuilder = [SignalIOSProtoBackupSnapshotBuilder new];
self.backupSnapshotBuilder = [SignalIOSProtoBackupSnapshot builder];
}
SignalIOSProtoBackupSnapshotBackupEntityBuilder *entityBuilder =
[[SignalIOSProtoBackupSnapshotBackupEntityBuilder alloc] initWithType:entityType entityData:data];
[SignalIOSProtoBackupSnapshotBackupEntity builderWithType:entityType entityData:data];
NSError *error;
SignalIOSProtoBackupSnapshotBackupEntity *_Nullable entity = [entityBuilder buildAndReturnError:&error];

2
Signal/src/util/OWSBackupIO.m
View file

@ -3,7 +3,7 @@
//
#import "OWSBackupIO.h"
#import <Curve25519Kit/Randomness.h>
#import <SignalCoreKit/Randomness.h>
#import <SignalServiceKit/OWSFileSystem.h>
@import Compression;

2
Signal/src/util/OWSBackupImportJob.m
View file

@ -7,7 +7,7 @@
#import "OWSDatabaseMigration.h"
#import "OWSDatabaseMigrationRunner.h"
#import "Signal-Swift.h"
#import <SignalServiceKit/NSData+OWS.h>
#import <SignalCoreKit/NSData+OWS.h>
#import <SignalServiceKit/OWSBackgroundTask.h>
#import <SignalServiceKit/OWSFileSystem.h>
#import <SignalServiceKit/TSAttachment.h>

2
Signal/src/util/OWSBackupJob.m
View file

@ -5,7 +5,7 @@
#import "OWSBackupJob.h"
#import "OWSBackupIO.h"
#import "Signal-Swift.h"
#import <Curve25519Kit/Randomness.h>
#import <SignalCoreKit/Randomness.h>
#import <YapDatabase/YapDatabaseCryptoUtils.h>
NS_ASSUME_NONNULL_BEGIN

2
Signal/src/util/OWSOrphanDataCleaner.m
View file

@ -4,11 +4,11 @@
#import "OWSOrphanDataCleaner.h"
#import "DateUtil.h"
#import <SignalCoreKit/NSDate+OWS.h>
#import <SignalMessaging/OWSProfileManager.h>
#import <SignalMessaging/OWSUserProfile.h>
#import <SignalServiceKit/AppReadiness.h>
#import <SignalServiceKit/AppVersion.h>
#import <SignalServiceKit/NSDate+OWS.h>
#import <SignalServiceKit/OWSContact.h>
#import <SignalServiceKit/OWSFileSystem.h>
#import <SignalServiceKit/OWSPrimaryStorage.h>

2
Signal/src/util/Pastelog.m
View file

@ -8,6 +8,7 @@
#import "zlib.h"
#import <AFNetworking/AFNetworking.h>
#import <SSZipArchive/SSZipArchive.h>
#import <SignalCoreKit/Threading.h>
#import <SignalMessaging/AttachmentSharing.h>
#import <SignalMessaging/DebugLogger.h>
#import <SignalMessaging/Environment.h>
@ -16,7 +17,6 @@
#import <SignalServiceKit/OWSPrimaryStorage.h>
#import <SignalServiceKit/TSAccountManager.h>
#import <SignalServiceKit/TSContactThread.h>
#import <SignalServiceKit/Threading.h>
NS_ASSUME_NONNULL_BEGIN

2
Signal/src/util/UIViewController+Permissions.m
View file

@ -6,8 +6,8 @@
#import "Signal-Swift.h"
#import <AVFoundation/AVFoundation.h>
#import <Photos/Photos.h>
#import <SignalCoreKit/Threading.h>
#import <SignalMessaging/UIUtil.h>
#import <SignalServiceKit/Threading.h>
NS_ASSUME_NONNULL_BEGIN

2
Signal/src/views/RemoteVideoView.m
View file

@ -7,7 +7,7 @@
#import "UIView+OWS.h"
#import <MetalKit/MetalKit.h>
#import <PureLayout/PureLayout.h>
#import <SignalServiceKit/Threading.h>
#import <SignalCoreKit/Threading.h>
#import <WebRTC/RTCEAGLVideoView.h>
#import <WebRTC/RTCMTLVideoView.h>
#import <WebRTC/RTCVideoRenderer.h>

2
Signal/test/Models/OWSDeviceProvisioningURLParserTest.m
View file

@ -4,7 +4,7 @@
#import "OWSDeviceProvisioningURLParser.h"
#import "SignalBaseTest.h"
#import <SignalServiceKit/NSData+OWS.h>
#import <SignalCoreKit/NSData+OWS.h>
@interface OWSDeviceProvisioningURLParserTest : SignalBaseTest

22
Signal/test/SSKTests/SSKProtoEnvelopeTest.swift
View file

@ -66,28 +66,14 @@ class SSKProtoEnvelopeTest: SignalBaseTest {
}
}
func testParse_buildVsRequired() {
let builder = SSKProtoEnvelope.SSKProtoEnvelopeBuilder()
XCTAssertThrowsError(try builder.build()) { (error) -> Void in
switch error {
case SSKProtoError.invalidProtobuf:
break
default:
XCTFail("unexpected error: \(error)")
}
}
}
func testParse_roundtrip() {
let builder = SSKProtoEnvelope.SSKProtoEnvelopeBuilder()
let builder = SSKProtoEnvelope.builder(type: SSKProtoEnvelope.SSKProtoEnvelopeType.prekeyBundle,
source: "+13213214321",
sourceDevice: 1,
timestamp: 123)
let phonyContent = "phony data".data(using: .utf8)!
builder.setType(SSKProtoEnvelope.SSKProtoEnvelopeType.prekeyBundle)
builder.setTimestamp(123)
builder.setSource("+13213214321")
builder.setSourceDevice(1)
builder.setContent(phonyContent)
var envelopeData: Data

6
Signal/test/SignalBaseTest.m
View file

@ -31,12 +31,6 @@ NS_ASSUME_NONNULL_BEGIN
{
NSLog(@"%@ tearDown", self.logTag);
[SSKEnvironment.shared.primaryStorage closeStorageForTests];
ClearCurrentAppContextForTests();
[Environment clearSharedForTests];
[SSKEnvironment clearSharedForTests];
[super tearDown];
}

5
Signal/test/call/PeerConnectionClientTest.swift
View file

@ -115,11 +115,10 @@ class PeerConnectionClientTest: SignalBaseTest {
func testDataChannelMessage() {
XCTAssertEqual(0, clientDelegate.dataChannelMessages.count)
let hangupBuilder = WebRTCProtoHangup.WebRTCProtoHangupBuilder()
hangupBuilder.setId(123)
let hangupBuilder = WebRTCProtoHangup.builder(id: 123)
let hangup = try! hangupBuilder.build()
let dataBuilder = WebRTCProtoData.WebRTCProtoDataBuilder()
let dataBuilder = WebRTCProtoData.builder()
dataBuilder.setHangup(hangup)
let hangupData = try! dataBuilder.buildSerializedData()
let hangupBuffer = RTCDataBuffer(data: hangupData, isBinary: false)

2
Signal/test/util/CDSSigningCertificateTest.m
View file

@ -3,8 +3,8 @@
//
#import "SignalBaseTest.h"
#import <SignalCoreKit/NSData+OWS.h>
#import <SignalServiceKit/CDSSigningCertificate.h>
#import <SignalServiceKit/NSData+OWS.h>
@interface CDSSigningCertificateTest : SignalBaseTest

4
Signal/test/util/OWSDatabaseConverterTest.m
View file

@ -3,8 +3,8 @@
//
#import "OWSDatabaseConverterTest.h"
#import <Curve25519Kit/Randomness.h>
#import <SignalServiceKit/NSData+OWS.h>
#import <SignalCoreKit/NSData+OWS.h>
#import <SignalCoreKit/Randomness.h>
#import <SignalServiceKit/OWSFileSystem.h>
#import <SignalServiceKit/OWSStorage.h>
#import <SignalServiceKit/YapDatabaseConnection+OWS.h>

4
Signal/test/util/ProtoParsingTest.m
View file

@ -3,9 +3,9 @@
//
#import "SignalBaseTest.h"
#import <Curve25519Kit/Randomness.h>
#import <SignalCoreKit/NSData+OWS.h>
#import <SignalCoreKit/Randomness.h>
#import <SignalServiceKit/ContactsManagerProtocol.h>
#import <SignalServiceKit/NSData+OWS.h>
#import <SignalServiceKit/OWSContactsOutputStream.h>
#import <SignalServiceKit/OWSGroupsOutputStream.h>
#import <SignalServiceKit/SignalAccount.h>

6
Signal/test/util/UtilTest.m
View file

@ -5,10 +5,10 @@
#import "UtilTest.h"
#import "DateUtil.h"
#import "TestUtil.h"
#import <SignalCoreKit/NSDate+OWS.h>
#import <SignalCoreKit/NSObject+OWS.h>
#import <SignalCoreKit/NSString+SSK.h>
#import <SignalMessaging/NSString+OWS.h>
#import <SignalServiceKit/NSDate+OWS.h>
#import <SignalServiceKit/NSObject+OWS.h>
#import <SignalServiceKit/NSString+SSK.h>
@interface DateUtil (Test)

5
SignalMessaging/SignalMessaging-Prefix.pch
View file

@ -15,7 +15,8 @@
static const NSUInteger ddLogLevel = DDLogLevelInfo;
#endif
#import <SignalServiceKit/OWSAsserts.h>
#import <SignalCoreKit/OWSAsserts.h>
#import <SignalCoreKit/NSObject+OWS.h>
#import <SignalServiceKit/OWSAnalytics.h>
#import <SignalServiceKit/NSObject+OWS.h>
#import <SignalServiceKit/SSKAsserts.h>
#endif

2
SignalMessaging/ViewControllers/SelectThreadViewController.m
View file

@ -7,7 +7,6 @@
#import "ContactTableViewCell.h"
#import "ContactsViewHelper.h"
#import "Environment.h"
#import "NSString+OWS.h"
#import "NewNonContactConversationViewController.h"
#import "OWSContactsManager.h"
#import "OWSSearchBar.h"
@ -16,6 +15,7 @@
#import "UIColor+OWS.h"
#import "UIFont+OWS.h"
#import "UIView+OWS.h"
#import <SignalCoreKit/NSString+SSK.h>
#import <SignalMessaging/SignalMessaging-Swift.h>
#import <SignalServiceKit/PhoneNumber.h>
#import <SignalServiceKit/SignalAccount.h>

2
SignalMessaging/ViewControllers/SharingThreadPickerViewController.m
View file

@ -4,12 +4,12 @@
#import "SharingThreadPickerViewController.h"
#import "Environment.h"
#import "NSString+OWS.h"
#import "SignalApp.h"
#import "ThreadUtil.h"
#import "UIColor+OWS.h"
#import "UIFont+OWS.h"
#import "UIView+OWS.h"
#import <SignalCoreKit/NSString+SSK.h>
#import <SignalMessaging/SignalMessaging-Swift.h>
#import <SignalServiceKit/OWSError.h>
#import <SignalServiceKit/OWSMessageSender.h>

2
SignalMessaging/Views/ContactsViewHelper.m
View file

@ -4,8 +4,8 @@
#import "ContactsViewHelper.h"
#import "Environment.h"
#import "NSString+OWS.h"
#import "UIUtil.h"
#import <SignalCoreKit/NSString+SSK.h>
#import <SignalMessaging/OWSProfileManager.h>
#import <SignalMessaging/SignalMessaging-Swift.h>
#import <SignalServiceKit/AppContext.h>

2
SignalMessaging/attachments/AttachmentSharing.m
View file

@ -4,9 +4,9 @@
#import "AttachmentSharing.h"
#import "UIUtil.h"
#import <SignalCoreKit/Threading.h>
#import <SignalServiceKit/AppContext.h>
#import <SignalServiceKit/TSAttachmentStream.h>
#import <SignalServiceKit/Threading.h>
NS_ASSUME_NONNULL_BEGIN

2
SignalMessaging/categories/NSString+OWS.h
View file

@ -2,7 +2,7 @@
// Copyright (c) 2018 Open Whisper Systems. All rights reserved.
//
#import <SignalServiceKit/NSString+SSK.h>
#import <SignalCoreKit/NSString+SSK.h>
NS_ASSUME_NONNULL_BEGIN

5
SignalMessaging/categories/UIColor+OWS.m
View file

@ -2,10 +2,9 @@
// Copyright (c) 2018 Open Whisper Systems. All rights reserved.
//
#import "UIColor+OWS.h"
#import "OWSMath.h"
#import "Theme.h"
#import <SignalServiceKit/Cryptography.h>
#import "UIColor+OWS.h"
#import <SignalCoreKit/Cryptography.h>
NS_ASSUME_NONNULL_BEGIN

2
SignalMessaging/categories/UIView+OWS.m
View file

@ -4,8 +4,8 @@
#import "UIView+OWS.h"
#import "OWSMath.h"
#import <SignalCoreKit/iOSVersions.h>
#import <SignalServiceKit/AppContext.h>
#import <SignalServiceKit/iOSVersions.h>
NS_ASSUME_NONNULL_BEGIN

2
SignalMessaging/categories/UIViewController+OWS.m
View file

@ -6,8 +6,8 @@
#import "UIColor+OWS.h"
#import "UIView+OWS.h"
#import "UIViewController+OWS.h"
#import <SignalCoreKit/iOSVersions.h>
#import <SignalServiceKit/AppContext.h>
#import <SignalServiceKit/iOSVersions.h>
NS_ASSUME_NONNULL_BEGIN

5
SignalMessaging/contacts/OWSContactsManager.m
View file

@ -9,17 +9,18 @@
#import "OWSProfileManager.h"
#import "OWSUserProfile.h"
#import "ViewControllerUtils.h"
#import <SignalCoreKit/NSDate+OWS.h>
#import <SignalCoreKit/NSString+SSK.h>
#import <SignalCoreKit/iOSVersions.h>
#import <SignalMessaging/SignalMessaging-Swift.h>
#import <SignalMessaging/UIColor+OWS.h>
#import <SignalMessaging/UIFont+OWS.h>
#import <SignalServiceKit/ContactsUpdater.h>
#import <SignalServiceKit/NSNotificationCenter+OWS.h>
#import <SignalServiceKit/NSString+SSK.h>
#import <SignalServiceKit/OWSError.h>
#import <SignalServiceKit/OWSPrimaryStorage.h>
#import <SignalServiceKit/PhoneNumber.h>
#import <SignalServiceKit/SignalAccount.h>
#import <SignalServiceKit/iOSVersions.h>
@import Contacts;

2
SignalMessaging/environment/SignalKeyingStorage.m
View file

@ -3,7 +3,7 @@
//
#import "SignalKeyingStorage.h"
#import <Curve25519Kit/Randomness.h>
#import <SignalCoreKit/Randomness.h>
#import <SignalServiceKit/OWSPrimaryStorage.h>
#import <SignalServiceKit/YapDatabaseConnection+OWS.h>

8
SignalMessaging/profiles/OWSProfileManager.m
View file

@ -4,15 +4,15 @@
#import "OWSProfileManager.h"
#import "Environment.h"
#import "NSString+OWS.h"
#import "OWSUserProfile.h"
#import <SignalCoreKit/Cryptography.h>
#import <SignalCoreKit/NSData+OWS.h>
#import <SignalCoreKit/NSDate+OWS.h>
#import <SignalCoreKit/NSString+SSK.h>
#import <SignalMessaging/SignalMessaging-Swift.h>
#import <SignalServiceKit/AppContext.h>
#import <SignalServiceKit/Cryptography.h>
#import <SignalServiceKit/MIMETypeUtil.h>
#import <SignalServiceKit/NSData+Image.h>
#import <SignalServiceKit/NSData+OWS.h>
#import <SignalServiceKit/NSDate+OWS.h>
#import <SignalServiceKit/NSNotificationCenter+OWS.h>
#import <SignalServiceKit/OWSFileSystem.h>
#import <SignalServiceKit/OWSMessageSender.h>

6
SignalMessaging/profiles/OWSUserProfile.m
View file

@ -3,10 +3,10 @@
//
#import "OWSUserProfile.h"
#import "NSString+OWS.h"
#import <SignalCoreKit/Cryptography.h>
#import <SignalCoreKit/NSData+OWS.h>
#import <SignalCoreKit/NSString+SSK.h>
#import <SignalServiceKit/AppContext.h>
#import <SignalServiceKit/Cryptography.h>
#import <SignalServiceKit/NSData+OWS.h>
#import <SignalServiceKit/NSNotificationCenter+OWS.h>
#import <SignalServiceKit/OWSFileSystem.h>
#import <SignalServiceKit/OWSPrimaryStorage.h>

2
SignalMessaging/utils/DebugLogger.m
View file

@ -4,8 +4,8 @@
#import "DebugLogger.h"
#import "OWSScrubbingLogFormatter.h"
#import <SignalCoreKit/NSDate+OWS.h>
#import <SignalServiceKit/AppContext.h>
#import <SignalServiceKit/NSDate+OWS.h>
#import <SignalServiceKit/OWSFileSystem.h>
#pragma mark Logging - Production logging wants us to write some logs to a file in case we need it for debugging.

1
SignalMessaging/utils/OWSGroupAvatarBuilder.m
View file

@ -8,6 +8,7 @@
#import "UIColor+OWS.h"
#import <SignalMessaging/SignalMessaging-Swift.h>
#import <SignalServiceKit/SSKEnvironment.h>
#import <SignalCoreKit/NSData+OWS.h>
NS_ASSUME_NONNULL_BEGIN

2
SignalMessaging/utils/ThreadUtil.m
View file

@ -8,9 +8,9 @@
#import "OWSQuotedReplyModel.h"
#import "OWSUnreadIndicator.h"
#import "TSUnreadIndicatorInteraction.h"
#import <SignalCoreKit/NSDate+OWS.h>
#import <SignalMessaging/OWSProfileManager.h>
#import <SignalMessaging/SignalMessaging-Swift.h>
#import <SignalServiceKit/NSDate+OWS.h>
#import <SignalServiceKit/OWSAddToContactsOfferMessage.h>
#import <SignalServiceKit/OWSAddToProfileWhitelistOfferMessage.h>
#import <SignalServiceKit/OWSBlockingManager.h>

2
SignalServiceKit.podspec
View file

@ -50,6 +50,8 @@ An Objective-C library for communicating with the Signal messaging service.
s.dependency 'SAMKeychain'
s.dependency 'Reachability'
s.dependency 'SwiftProtobuf'
s.dependency 'SignalCoreKit'
s.dependency 'SignalMetadataKit'
# Avoid PromiseKit 5/6 for now.
# From the maintainer:

4
SignalServiceKit/src/Account/TSAccountManager.m
View file

@ -4,7 +4,6 @@
#import "TSAccountManager.h"
#import "AppContext.h"
#import "NSData+OWS.h"
#import "NSNotificationCenter+OWS.h"
#import "NSURLSessionDataTask+StatusCode.h"
#import "OWSError.h"
@ -15,7 +14,8 @@
#import "TSVerifyCodeRequest.h"
#import "YapDatabaseConnection+OWS.h"
#import "YapDatabaseTransaction+OWS.h"
#import <Curve25519Kit/Randomness.h>
#import <SignalCoreKit/NSData+OWS.h>
#import <SignalCoreKit/Randomness.h>
#import <YapDatabase/YapDatabase.h>
NS_ASSUME_NONNULL_BEGIN

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

@ -4,12 +4,12 @@
#import "TSPreKeyManager.h"
#import "AppContext.h"
#import "NSDate+OWS.h"
#import "NSURLSessionDataTask+StatusCode.h"
#import "OWSIdentityManager.h"
#import "OWSPrimaryStorage+SignedPreKeyStore.h"
#import "TSNetworkManager.h"
#import "TSStorageHeaders.h"
#import <SignalCoreKit/NSDate+OWS.h>
#import <SignalServiceKit/SignalServiceKit-Swift.h>
// Time before deletion of signed prekeys (measured in seconds)

4
SignalServiceKit/src/Contacts/CDSSigningCertificate.m
View file

@ -3,9 +3,9 @@
//
#import "CDSSigningCertificate.h"
#import "Cryptography.h"
#import "NSData+OWS.h"
#import <CommonCrypto/CommonCrypto.h>
#import <SignalCoreKit/Cryptography.h>
#import <SignalCoreKit/NSData+OWS.h>
#import <openssl/x509.h>
NS_ASSUME_NONNULL_BEGIN

4
SignalServiceKit/src/Contacts/Contact.m
View file

@ -3,13 +3,13 @@
//
#import "Contact.h"
#import "Cryptography.h"
#import "NSString+SSK.h"
#import "OWSPrimaryStorage.h"
#import "PhoneNumber.h"
#import "SSKEnvironment.h"
#import "SignalRecipient.h"
#import "TSAccountManager.h"
#import <SignalCoreKit/Cryptography.h>
#import <SignalCoreKit/NSString+SSK.h>
@import Contacts;

6
SignalServiceKit/src/Contacts/ContactDiscoveryService.m
View file

@ -5,14 +5,14 @@
#import "ContactDiscoveryService.h"
#import "CDSQuote.h"
#import "CDSSigningCertificate.h"
#import "Cryptography.h"
#import "NSData+OWS.h"
#import "NSDate+OWS.h"
#import "OWSError.h"
#import "OWSRequestFactory.h"
#import "TSNetworkManager.h"
#import <Curve25519Kit/Curve25519.h>
#import <HKDFKit/HKDFKit.h>
#import <SignalCoreKit/Cryptography.h>
#import <SignalCoreKit/NSData+OWS.h>
#import <SignalCoreKit/NSDate+OWS.h>
NS_ASSUME_NONNULL_BEGIN

4
SignalServiceKit/src/Contacts/ContactsUpdater.m
View file

@ -3,14 +3,14 @@
//
#import "ContactsUpdater.h"
#import "Cryptography.h"
#import "OWSError.h"
#import "OWSPrimaryStorage.h"
#import "OWSRequestFactory.h"
#import "PhoneNumber.h"
#import "SSKEnvironment.h"
#import "TSNetworkManager.h"
#import "Threading.h"
#import <SignalCoreKit/Cryptography.h>
#import <SignalCoreKit/Threading.h>
#import <SignalServiceKit/SignalServiceKit-Swift.h>
#import <YapDatabase/YapDatabase.h>

4
SignalServiceKit/src/Contacts/OWSDisappearingMessagesConfiguration.m
View file

@ -3,8 +3,8 @@
//
#import "OWSDisappearingMessagesConfiguration.h"
#import "NSDate+OWS.h"
#import "NSString+SSK.h"
#import <SignalCoreKit/NSDate+OWS.h>
#import <SignalCoreKit/NSString+SSK.h>
NS_ASSUME_NONNULL_BEGIN

2
SignalServiceKit/src/Contacts/SignalAccount.m
View file

@ -4,9 +4,9 @@
#import "SignalAccount.h"
#import "Contact.h"
#import "NSString+SSK.h"
#import "OWSPrimaryStorage.h"
#import "SignalRecipient.h"
#import <SignalCoreKit/NSString+SSK.h>
NS_ASSUME_NONNULL_BEGIN

6
SignalServiceKit/src/Contacts/TSThread.m
View file

@ -3,9 +3,6 @@
//
#import "TSThread.h"
#import "Cryptography.h"
#import "NSDate+OWS.h"
#import "NSString+SSK.h"
#import "OWSDisappearingMessagesConfiguration.h"
#import "OWSPrimaryStorage.h"
#import "OWSReadTracking.h"
@ -15,6 +12,9 @@
#import "TSInteraction.h"
#import "TSInvalidIdentityKeyReceivingErrorMessage.h"
#import "TSOutgoingMessage.h"
#import <SignalCoreKit/Cryptography.h>
#import <SignalCoreKit/NSDate+OWS.h>
#import <SignalCoreKit/NSString+SSK.h>
#import <YapDatabase/YapDatabase.h>
NS_ASSUME_NONNULL_BEGIN

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

@ -3,8 +3,8 @@
//
#import "TSGroupThread.h"
#import "NSData+OWS.h"
#import "TSAttachmentStream.h"
#import <SignalCoreKit/NSData+OWS.h>
#import <SignalServiceKit/TSAccountManager.h>
#import <YapDatabase/YapDatabaseConnection.h>
#import <YapDatabase/YapDatabaseTransaction.h>

4
SignalServiceKit/src/Devices/OWSBlockedPhoneNumbersMessage.m
View file

@ -36,7 +36,7 @@ NS_ASSUME_NONNULL_BEGIN
- (nullable SSKProtoSyncMessageBuilder *)syncMessageBuilder
{
SSKProtoSyncMessageBlockedBuilder *blockedBuilder = [SSKProtoSyncMessageBlockedBuilder new];
SSKProtoSyncMessageBlockedBuilder *blockedBuilder = [SSKProtoSyncMessageBlocked builder];
[blockedBuilder setNumbers:_phoneNumbers];
[blockedBuilder setGroupIds:_groupIds];
@ -47,7 +47,7 @@ NS_ASSUME_NONNULL_BEGIN
return nil;
}
SSKProtoSyncMessageBuilder *syncMessageBuilder = [SSKProtoSyncMessageBuilder new];
SSKProtoSyncMessageBuilder *syncMessageBuilder = [SSKProtoSyncMessage builder];
[syncMessageBuilder setBlocked:blockedProto];
return syncMessageBuilder;
}

2
SignalServiceKit/src/Devices/OWSChunkedOutputStream.m
View file

@ -3,7 +3,7 @@
//
#import "OWSChunkedOutputStream.h"
#import "NSData+OWS.h"
#import <SignalCoreKit/NSData+OWS.h>
NS_ASSUME_NONNULL_BEGIN

11
SignalServiceKit/src/Devices/OWSContactsOutputStream.m
View file

@ -5,15 +5,15 @@
#import "OWSContactsOutputStream.h"
#import "Contact.h"
#import "ContactsManagerProtocol.h"
#import "Cryptography.h"
#import "MIMETypeUtil.h"
#import "NSData+OWS.h"
#import "NSData+keyVersionByte.h"
#import "OWSBlockingManager.h"
#import "OWSDisappearingMessagesConfiguration.h"
#import "OWSRecipientIdentity.h"
#import "SignalAccount.h"
#import "TSContactThread.h"
#import <SignalCoreKit/Cryptography.h>
#import <SignalCoreKit/NSData+OWS.h>
#import <SignalServiceKit/SignalServiceKit-Swift.h>
NS_ASSUME_NONNULL_BEGIN
@ -31,9 +31,9 @@ disappearingMessagesConfiguration:(nullable OWSDisappearingMessagesConfiguration
OWSAssertDebug(signalAccount.contact);
OWSAssertDebug(contactsManager);
SSKProtoContactDetailsBuilder *contactBuilder = [SSKProtoContactDetailsBuilder new];
SSKProtoContactDetailsBuilder *contactBuilder =
[SSKProtoContactDetails builderWithNumber:signalAccount.recipientId];
[contactBuilder setName:signalAccount.contact.fullName];
[contactBuilder setNumber:signalAccount.recipientId];
[contactBuilder setColor:conversationColorName];
if (recipientIdentity != nil) {
@ -53,8 +53,7 @@ disappearingMessagesConfiguration:(nullable OWSDisappearingMessagesConfiguration
if (rawAvatar) {
avatarPng = UIImagePNGRepresentation(rawAvatar);
if (avatarPng) {
SSKProtoContactDetailsAvatarBuilder *avatarBuilder =
[SSKProtoContactDetailsAvatarBuilder new];
SSKProtoContactDetailsAvatarBuilder *avatarBuilder = [SSKProtoContactDetailsAvatar builder];
[avatarBuilder setContentType:OWSMimeTypeImagePng];
[avatarBuilder setLength:(uint32_t)avatarPng.length];

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

@ -3,13 +3,13 @@
//
#import "OWSDevice.h"
#import "NSDate+OWS.h"
#import "OWSError.h"
#import "OWSPrimaryStorage.h"
#import "YapDatabaseConnection+OWS.h"
#import "YapDatabaseConnection.h"
#import "YapDatabaseTransaction.h"
#import <Mantle/MTLValueTransformer.h>
#import <SignalCoreKit/NSDate+OWS.h>
NS_ASSUME_NONNULL_BEGIN

6
SignalServiceKit/src/Devices/OWSGroupsOutputStream.m
View file

@ -22,8 +22,7 @@ NS_ASSUME_NONNULL_BEGIN
TSGroupModel *group = groupThread.groupModel;
OWSAssertDebug(group);
SSKProtoGroupDetailsBuilder *groupBuilder = [SSKProtoGroupDetailsBuilder new];
[groupBuilder setId:group.groupId];
SSKProtoGroupDetailsBuilder *groupBuilder = [SSKProtoGroupDetails builderWithId:group.groupId];
[groupBuilder setName:group.groupName];
[groupBuilder setMembers:group.groupMemberIds];
[groupBuilder setColor:groupThread.conversationColorName];
@ -34,8 +33,7 @@ NS_ASSUME_NONNULL_BEGIN
NSData *avatarPng;
if (group.groupImage) {
SSKProtoGroupDetailsAvatarBuilder *avatarBuilder =
[SSKProtoGroupDetailsAvatarBuilder new];
SSKProtoGroupDetailsAvatarBuilder *avatarBuilder = [SSKProtoGroupDetailsAvatar builder];
[avatarBuilder setContentType:OWSMimeTypeImagePng];
avatarPng = UIImagePNGRepresentation(group.groupImage);

2
SignalServiceKit/src/Devices/OWSProvisioningCipher.m
View file

@ -6,7 +6,7 @@
#import <CommonCrypto/CommonCrypto.h>
#import <Curve25519Kit/Curve25519.h>
#import <HKDFKit/HKDFKit.h>
#import <SignalServiceKit/Cryptography.h>
#import <SignalCoreKit/Cryptography.h>
NS_ASSUME_NONNULL_BEGIN

18
SignalServiceKit/src/Devices/OWSProvisioningMessage.m
View file

@ -52,13 +52,13 @@ NS_ASSUME_NONNULL_BEGIN
- (nullable NSData *)buildEncryptedMessageBody
{
ProvisioningProtoProvisionMessageBuilder *messageBuilder =
[[ProvisioningProtoProvisionMessageBuilder alloc] initWithIdentityKeyPublic:self.myPublicKey
identityKeyPrivate:self.myPrivateKey
number:self.accountIdentifier
provisioningCode:self.provisioningCode
userAgent:@"OWI"
profileKey:self.profileKey
readReceipts:self.areReadReceiptsEnabled];
[ProvisioningProtoProvisionMessage builderWithIdentityKeyPublic:self.myPublicKey
identityKeyPrivate:self.myPrivateKey
number:self.accountIdentifier
provisioningCode:self.provisioningCode
userAgent:@"OWI"
profileKey:self.profileKey
readReceipts:self.areReadReceiptsEnabled];
NSError *error;
NSData *_Nullable plainTextProvisionMessage = [messageBuilder buildSerializedDataAndReturnError:&error];
@ -76,8 +76,8 @@ NS_ASSUME_NONNULL_BEGIN
// Note that this is a one-time-use *cipher* public key, not our Signal *identity* public key
ProvisioningProtoProvisionEnvelopeBuilder *envelopeBuilder =
[[ProvisioningProtoProvisionEnvelopeBuilder alloc] initWithPublicKey:[cipher.ourPublicKey prependKeyType]
body:encryptedProvisionMessage];
[ProvisioningProtoProvisionEnvelope builderWithPublicKey:[cipher.ourPublicKey prependKeyType]
body:encryptedProvisionMessage];
NSData *_Nullable envelopeData = [envelopeBuilder buildSerializedDataAndReturnError:&error];
if (!envelopeData || error) {

5
SignalServiceKit/src/Devices/OWSReadReceiptsForLinkedDevicesMessage.m
View file

@ -35,11 +35,10 @@ NS_ASSUME_NONNULL_BEGIN
- (nullable SSKProtoSyncMessageBuilder *)syncMessageBuilder
{
SSKProtoSyncMessageBuilder *syncMessageBuilder = [SSKProtoSyncMessageBuilder new];
SSKProtoSyncMessageBuilder *syncMessageBuilder = [SSKProtoSyncMessage builder];
for (OWSLinkedDeviceReadReceipt *readReceipt in self.readReceipts) {
SSKProtoSyncMessageReadBuilder *readProtoBuilder =
[[SSKProtoSyncMessageReadBuilder alloc] initWithSender:readReceipt.senderId
timestamp:readReceipt.messageIdTimestamp];
[SSKProtoSyncMessageRead builderWithSender:readReceipt.senderId timestamp:readReceipt.messageIdTimestamp];
NSError *error;
SSKProtoSyncMessageRead *_Nullable readProto = [readProtoBuilder buildAndReturnError:&error];

7
SignalServiceKit/src/Devices/OWSReadReceiptsForSenderMessage.m
View file

@ -3,8 +3,8 @@
//
#import "OWSReadReceiptsForSenderMessage.h"
#import "NSDate+OWS.h"
#import "SignalRecipient.h"
#import <SignalCoreKit/NSDate+OWS.h>
#import <SignalServiceKit/SignalServiceKit-Swift.h>
NS_ASSUME_NONNULL_BEGIN
@ -64,7 +64,7 @@ NS_ASSUME_NONNULL_BEGIN
return nil;
}
SSKProtoContentBuilder *contentBuilder = [SSKProtoContentBuilder new];
SSKProtoContentBuilder *contentBuilder = [SSKProtoContent builder];
[contentBuilder setReceiptMessage:receiptMessage];
NSError *error;
@ -78,8 +78,7 @@ NS_ASSUME_NONNULL_BEGIN
- (nullable SSKProtoReceiptMessage *)buildReceiptMessage:(NSString *)recipientId
{
SSKProtoReceiptMessageBuilder *builder = [SSKProtoReceiptMessageBuilder new];
[builder setType:SSKProtoReceiptMessageTypeRead];
SSKProtoReceiptMessageBuilder *builder = [SSKProtoReceiptMessage builderWithType:SSKProtoReceiptMessageTypeRead];
OWSAssertDebug(self.messageTimestamps.count > 0);
for (NSNumber *messageTimestamp in self.messageTimestamps) {

4
SignalServiceKit/src/Devices/OWSVerificationStateSyncMessage.m
View file

@ -3,8 +3,8 @@
//
#import "OWSVerificationStateSyncMessage.h"
#import "Cryptography.h"
#import "OWSIdentityManager.h"
#import <SignalCoreKit/Cryptography.h>
#import <SignalServiceKit/SignalServiceKit-Swift.h>
NS_ASSUME_NONNULL_BEGIN
@ -77,7 +77,7 @@ NS_ASSUME_NONNULL_BEGIN
return nil;
}
SSKProtoSyncMessageBuilder *syncMessageBuilder = [SSKProtoSyncMessageBuilder new];
SSKProtoSyncMessageBuilder *syncMessageBuilder = [SSKProtoSyncMessage builder];
[syncMessageBuilder setVerified:verifiedProto];
return syncMessageBuilder;
}

2
SignalServiceKit/src/Messages/Attachments/OWSAttachmentsProcessor.m
View file

@ -4,7 +4,6 @@
#import "OWSAttachmentsProcessor.h"
#import "AppContext.h"
#import "Cryptography.h"
#import "MIMETypeUtil.h"
#import "NSNotificationCenter+OWS.h"
#import "OWSBackgroundTask.h"
@ -21,6 +20,7 @@
#import "TSMessage.h"
#import "TSNetworkManager.h"
#import "TSThread.h"
#import <SignalCoreKit/Cryptography.h>
#import <SignalServiceKit/SignalServiceKit-Swift.h>
#import <YapDatabase/YapDatabaseConnection.h>

4
SignalServiceKit/src/Messages/Attachments/TSAttachment.m
View file

@ -4,8 +4,8 @@
#import "TSAttachment.h"
#import "MIMETypeUtil.h"
#import "NSString+SSK.h"
#import "iOSVersions.h"
#import <SignalCoreKit/NSString+SSK.h>
#import <SignalCoreKit/iOSVersions.h>
NS_ASSUME_NONNULL_BEGIN

6
SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.m
View file

@ -7,8 +7,8 @@
#import "NSData+Image.h"
#import "OWSFileSystem.h"
#import "TSAttachmentPointer.h"
#import "Threading.h"
#import <AVFoundation/AVFoundation.h>
#import <SignalCoreKit/Threading.h>
#import <SignalServiceKit/SignalServiceKit-Swift.h>
#import <YapDatabase/YapDatabase.h>
@ -906,9 +906,7 @@ typedef void (^OWSLoadedThumbnailSuccess)(OWSLoadedThumbnail *loadedThumbnail);
- (nullable SSKProtoAttachmentPointer *)buildProto
{
SSKProtoAttachmentPointerBuilder *builder = [SSKProtoAttachmentPointerBuilder new];
builder.id = self.serverId;
SSKProtoAttachmentPointerBuilder *builder = [SSKProtoAttachmentPointer builderWithId:self.serverId];
OWSAssertDebug(self.contentType.length > 0);
builder.contentType = self.contentType;

4
SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSentMessageTranscript.m
View file

@ -55,7 +55,7 @@ NS_ASSUME_NONNULL_BEGIN
- (nullable SSKProtoSyncMessageBuilder *)syncMessageBuilder
{
SSKProtoSyncMessageSentBuilder *sentBuilder = [SSKProtoSyncMessageSentBuilder new];
SSKProtoSyncMessageSentBuilder *sentBuilder = [SSKProtoSyncMessageSent builder];
[sentBuilder setTimestamp:self.message.timestamp];
[sentBuilder setDestination:self.sentRecipientId];
@ -74,7 +74,7 @@ NS_ASSUME_NONNULL_BEGIN
return nil;
}
SSKProtoSyncMessageBuilder *syncMessageBuilder = [SSKProtoSyncMessageBuilder new];
SSKProtoSyncMessageBuilder *syncMessageBuilder = [SSKProtoSyncMessage builder];
[syncMessageBuilder setSent:sentProto];
return syncMessageBuilder;
}

8
SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSyncMessage.m
View file

@ -3,9 +3,9 @@
//
#import "OWSOutgoingSyncMessage.h"
#import "Cryptography.h"
#import "NSDate+OWS.h"
#import "ProtoUtils.h"
#import <SignalCoreKit/Cryptography.h>
#import <SignalCoreKit/NSDate+OWS.h>
#import <SignalServiceKit/SignalServiceKit-Swift.h>
NS_ASSUME_NONNULL_BEGIN
@ -72,7 +72,7 @@ NS_ASSUME_NONNULL_BEGIN
{
OWSAbstractMethod();
return [SSKProtoSyncMessageBuilder new];
return [SSKProtoSyncMessage builder];
}
- (nullable NSData *)buildPlainTextData:(SignalRecipient *)recipient
@ -82,7 +82,7 @@ NS_ASSUME_NONNULL_BEGIN
return nil;
}
SSKProtoContentBuilder *contentBuilder = [SSKProtoContentBuilder new];
SSKProtoContentBuilder *contentBuilder = [SSKProtoContent builder];
[contentBuilder setSyncMessage:syncMessage];
NSError *error;

5
SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncConfigurationMessage.m
View file

@ -34,8 +34,7 @@ NS_ASSUME_NONNULL_BEGIN
- (nullable SSKProtoSyncMessageBuilder *)syncMessageBuilder
{
SSKProtoSyncMessageConfigurationBuilder *configurationBuilder =
[SSKProtoSyncMessageConfigurationBuilder new];
SSKProtoSyncMessageConfigurationBuilder *configurationBuilder = [SSKProtoSyncMessageConfiguration builder];
configurationBuilder.readReceipts = self.areReadReceiptsEnabled;
NSError *error;
@ -45,7 +44,7 @@ NS_ASSUME_NONNULL_BEGIN
return nil;
}
SSKProtoSyncMessageBuilder *builder = [SSKProtoSyncMessageBuilder new];
SSKProtoSyncMessageBuilder *builder = [SSKProtoSyncMessage builder];
builder.configuration = configurationProto;
return builder;
}

8
SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncContactsMessage.m
View file

@ -5,7 +5,6 @@
#import "OWSSyncContactsMessage.h"
#import "Contact.h"
#import "ContactsManagerProtocol.h"
#import "NSDate+OWS.h"
#import "OWSContactsOutputStream.h"
#import "OWSIdentityManager.h"
#import "ProfileManagerProtocol.h"
@ -14,6 +13,7 @@
#import "TSAttachment.h"
#import "TSAttachmentStream.h"
#import "TSContactThread.h"
#import <SignalCoreKit/NSDate+OWS.h>
#import <SignalServiceKit/SignalServiceKit-Swift.h>
NS_ASSUME_NONNULL_BEGIN
@ -63,9 +63,7 @@ NS_ASSUME_NONNULL_BEGIN
return nil;
}
SSKProtoSyncMessageContactsBuilder *contactsBuilder =
[SSKProtoSyncMessageContactsBuilder new];
[contactsBuilder setBlob:attachmentProto];
SSKProtoSyncMessageContactsBuilder *contactsBuilder = [SSKProtoSyncMessageContacts builderWithBlob:attachmentProto];
[contactsBuilder setIsComplete:YES];
NSError *error;
@ -74,7 +72,7 @@ NS_ASSUME_NONNULL_BEGIN
OWSFailDebug(@"could not build protobuf: %@", error);
return nil;
}
SSKProtoSyncMessageBuilder *syncMessageBuilder = [SSKProtoSyncMessageBuilder new];
SSKProtoSyncMessageBuilder *syncMessageBuilder = [SSKProtoSyncMessage builder];
[syncMessageBuilder setContacts:contactsProto];
return syncMessageBuilder;
}

7
SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncGroupsMessage.m
View file

@ -3,13 +3,13 @@
//
#import "OWSSyncGroupsMessage.h"
#import "NSDate+OWS.h"
#import "OWSGroupsOutputStream.h"
#import "TSAttachment.h"
#import "TSAttachmentStream.h"
#import "TSContactThread.h"
#import "TSGroupModel.h"
#import "TSGroupThread.h"
#import <SignalCoreKit/NSDate+OWS.h>
#import <SignalServiceKit/SignalServiceKit-Swift.h>
NS_ASSUME_NONNULL_BEGIN
@ -40,8 +40,7 @@ NS_ASSUME_NONNULL_BEGIN
return nil;
}
SSKProtoSyncMessageGroupsBuilder *groupsBuilder =
[SSKProtoSyncMessageGroupsBuilder new];
SSKProtoSyncMessageGroupsBuilder *groupsBuilder = [SSKProtoSyncMessageGroups builder];
[groupsBuilder setBlob:attachmentProto];
NSError *error;
@ -51,7 +50,7 @@ NS_ASSUME_NONNULL_BEGIN
return nil;
}
SSKProtoSyncMessageBuilder *syncMessageBuilder = [SSKProtoSyncMessageBuilder new];
SSKProtoSyncMessageBuilder *syncMessageBuilder = [SSKProtoSyncMessage builder];
[syncMessageBuilder setGroups:groupsProto];
return syncMessageBuilder;

6
SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncGroupsRequestMessage.m
View file

@ -3,7 +3,7 @@
//
#import "OWSSyncGroupsRequestMessage.h"
#import "NSDate+OWS.h"
#import <SignalCoreKit/NSDate+OWS.h>
#import <SignalServiceKit/SignalServiceKit-Swift.h>
NS_ASSUME_NONNULL_BEGIN
@ -60,7 +60,7 @@ NS_ASSUME_NONNULL_BEGIN
- (nullable SSKProtoDataMessageBuilder *)dataMessageBuilder
{
SSKProtoGroupContextBuilder *groupContextBuilder =
[[SSKProtoGroupContextBuilder alloc] initWithId:self.groupId type:SSKProtoGroupContextTypeRequestInfo];
[SSKProtoGroupContext builderWithId:self.groupId type:SSKProtoGroupContextTypeRequestInfo];
NSError *error;
SSKProtoGroupContext *_Nullable groupContextProto = [groupContextBuilder buildAndReturnError:&error];
@ -69,7 +69,7 @@ NS_ASSUME_NONNULL_BEGIN
return nil;
}
SSKProtoDataMessageBuilder *builder = [SSKProtoDataMessageBuilder new];
SSKProtoDataMessageBuilder *builder = [SSKProtoDataMessage builder];
[builder setTimestamp:self.timestamp];
[builder setGroup:groupContextProto];

18
SignalServiceKit/src/Messages/Interactions/OWSContact.m
View file

@ -5,12 +5,12 @@
#import "OWSContact.h"
#import "Contact.h"
#import "MimeTypeUtil.h"
#import "NSString+SSK.h"
#import "OWSContact+Private.h"
#import "PhoneNumber.h"
#import "TSAttachment.h"
#import "TSAttachmentPointer.h"
#import "TSAttachmentStream.h"
#import <SignalCoreKit/NSString+SSK.h>
#import <SignalServiceKit/SignalServiceKit-Swift.h>
#import <YapDatabase/YapDatabaseTransaction.h>
@ -770,11 +770,9 @@ NSString *NSStringForContactAddressType(OWSContactAddressType value)
{
OWSAssertDebug(contact);
SSKProtoDataMessageContactBuilder *contactBuilder =
[SSKProtoDataMessageContactBuilder new];
SSKProtoDataMessageContactBuilder *contactBuilder = [SSKProtoDataMessageContact builder];
SSKProtoDataMessageContactNameBuilder *nameBuilder =
[SSKProtoDataMessageContactNameBuilder new];
SSKProtoDataMessageContactNameBuilder *nameBuilder = [SSKProtoDataMessageContactName builder];
OWSContactName *contactName = contact.name;
if (contactName.givenName.ows_stripped.length > 0) {
@ -806,8 +804,7 @@ NSString *NSStringForContactAddressType(OWSContactAddressType value)
}
for (OWSContactPhoneNumber *phoneNumber in contact.phoneNumbers) {
SSKProtoDataMessageContactPhoneBuilder *phoneBuilder =
[SSKProtoDataMessageContactPhoneBuilder new];
SSKProtoDataMessageContactPhoneBuilder *phoneBuilder = [SSKProtoDataMessageContactPhone builder];
phoneBuilder.value = phoneNumber.phoneNumber;
if (phoneNumber.label.ows_stripped.length > 0) {
phoneBuilder.label = phoneNumber.label.ows_stripped;
@ -835,8 +832,7 @@ NSString *NSStringForContactAddressType(OWSContactAddressType value)
}
for (OWSContactEmail *email in contact.emails) {
SSKProtoDataMessageContactEmailBuilder *emailBuilder =
[SSKProtoDataMessageContactEmailBuilder new];
SSKProtoDataMessageContactEmailBuilder *emailBuilder = [SSKProtoDataMessageContactEmail builder];
emailBuilder.value = email.email;
if (email.label.ows_stripped.length > 0) {
emailBuilder.label = email.label.ows_stripped;
@ -865,7 +861,7 @@ NSString *NSStringForContactAddressType(OWSContactAddressType value)
for (OWSContactAddress *address in contact.addresses) {
SSKProtoDataMessageContactPostalAddressBuilder *addressBuilder =
[SSKProtoDataMessageContactPostalAddressBuilder new];
[SSKProtoDataMessageContactPostalAddress builder];
if (address.label.ows_stripped.length > 0) {
addressBuilder.label = address.label.ows_stripped;
}
@ -904,7 +900,7 @@ NSString *NSStringForContactAddressType(OWSContactAddressType value)
if (!attachmentProto) {
OWSLogError(@"could not build protobuf: %@", error);
} else {
SSKProtoDataMessageContactAvatarBuilder *avatarBuilder = [SSKProtoDataMessageContactAvatarBuilder new];
SSKProtoDataMessageContactAvatarBuilder *avatarBuilder = [SSKProtoDataMessageContactAvatar builder];
avatarBuilder.avatar = attachmentProto;
SSKProtoDataMessageContactAvatar *_Nullable avatarProto = [avatarBuilder buildAndReturnError:&error];
if (error || !avatarProto) {

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