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

Update Pods

This commit is contained in:
nielsandriesse 2020-06-05 10:38:44 +10:00
parent 3fc81293a6
commit 74bbe067d8
356 changed files with 1128 additions and 1148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LokiPushNotificationService/NotificationServiceExtension.swift
View File

@ -1,5 +1,5 @@
import UserNotifications import UserNotifications
import SignalServiceKit import SessionServiceKit
import SignalMessaging import SignalMessaging
final class NotificationServiceExtension : UNNotificationServiceExtension { final class NotificationServiceExtension : UNNotificationServiceExtension {

2
LokiPushNotificationService/NotificationServiceExtensionContext.swift
View File

@ -3,7 +3,7 @@
// //
import Foundation import Foundation
import SignalServiceKit import SessionServiceKit
import SignalMessaging import SignalMessaging
final class NotificationServiceExtensionContext : NSObject, AppContext { final class NotificationServiceExtensionContext : NSObject, AppContext {

2
Podfile
View File

@ -19,7 +19,7 @@ def shared_pods
pod 'SessionHKDFKit', git: 'https://github.com/nielsandriesse/session-ios-hkdf-kit.git', testspecs: ["Tests"] # Fork of HKDFKit pod 'SessionHKDFKit', git: 'https://github.com/nielsandriesse/session-ios-hkdf-kit.git', testspecs: ["Tests"] # Fork of HKDFKit
# pod 'HKDFKit', path: '../HKDFKit', testspecs: ["Tests"] # pod 'HKDFKit', path: '../HKDFKit', testspecs: ["Tests"]
pod 'SessionCurve25519Kit', git: 'https://github.com/loki-project/session-ios-curve25519-kit', testspecs: ["Tests"] # Fork of Curve25519Kit pod 'SessionCurve25519Kit', git: 'https://github.com/loki-project/session-ios-curve-25519-kit', testspecs: ["Tests"] # Fork of Curve25519Kit
# pod 'Curve25519Kit', path: '../Curve25519Kit', testspecs: ["Tests"] # pod 'Curve25519Kit', path: '../Curve25519Kit', testspecs: ["Tests"]
pod 'SessionMetadataKit', git: 'https://github.com/loki-project/session-ios-metadata-kit', testspecs: ["Tests"] # Fork of SignalMetadataKit pod 'SessionMetadataKit', git: 'https://github.com/loki-project/session-ios-metadata-kit', testspecs: ["Tests"] # Fork of SignalMetadataKit

232
Podfile.lock
View File

@ -14,49 +14,16 @@ PODS:
- AFNetworking/Serialization (3.2.1) - AFNetworking/Serialization (3.2.1)
- AFNetworking/UIKit (3.2.1): - AFNetworking/UIKit (3.2.1):
- AFNetworking/NSURLSession - AFNetworking/NSURLSession
- AxolotlKit (0.9.0): - CocoaLumberjack (3.6.1):
- CocoaLumberjack - CocoaLumberjack/Core (= 3.6.1)
- Curve25519Kit (~> 2.1.0) - CocoaLumberjack/Core (3.6.1)
- HKDFKit (~> 0.0.3)
- SignalCoreKit
- SwiftProtobuf
- AxolotlKit/Tests (0.9.0):
- CocoaLumberjack
- Curve25519Kit (~> 2.1.0)
- HKDFKit (~> 0.0.3)
- SignalCoreKit
- SwiftProtobuf
- CocoaLumberjack (3.5.3):
- CocoaLumberjack/Core (= 3.5.3)
- CocoaLumberjack/Core (3.5.3)
- Crashlytics (3.13.1):
- Fabric (~> 1.10.1)
- CryptoSwift (1.0.0) - CryptoSwift (1.0.0)
- Curve25519Kit (2.1.0):
- CocoaLumberjack
- SignalCoreKit
- Curve25519Kit/Tests (2.1.0):
- CocoaLumberjack
- SignalCoreKit
- Fabric (1.10.1)
- FeedKit (8.1.1) - FeedKit (8.1.1)
- FirebaseCore (6.0.2):
- GoogleUtilities/Environment (~> 6.0)
- GoogleUtilities/Logger (~> 6.0)
- GCDWebServer (3.5.2): - GCDWebServer (3.5.2):
- GCDWebServer/Core (= 3.5.2) - GCDWebServer/Core (= 3.5.2)
- GCDWebServer/Core (3.5.2) - GCDWebServer/Core (3.5.2)
- GoogleUtilities/Environment (6.2.0)
- GoogleUtilities/Logger (6.2.0):
- GoogleUtilities/Environment
- GRKOpenSSLFramework (1.0.2.12) - GRKOpenSSLFramework (1.0.2.12)
- HKDFKit (0.0.4): - libPhoneNumber-iOS (0.9.15)
- CocoaLumberjack
- SignalCoreKit
- HKDFKit/Tests (0.0.4):
- CocoaLumberjack
- SignalCoreKit
- libPhoneNumber-iOS (0.9.13)
- Mantle (2.1.0): - Mantle (2.1.0):
- Mantle/extobjc (= 2.1.0) - Mantle/extobjc (= 2.1.0)
- Mantle/extobjc (2.1.0) - Mantle/extobjc (2.1.0)
@ -75,59 +42,85 @@ PODS:
- PureLayout (3.1.4) - PureLayout (3.1.4)
- Reachability (3.2) - Reachability (3.2)
- SAMKeychain (1.5.3) - SAMKeychain (1.5.3)
- SignalCoreKit (1.0.0): - SessionAxolotlKit (1.0.1):
- CocoaLumberjack
- SessionCoreKit (~> 1.0.0)
- SessionCurve25519Kit (~> 2.1.1)
- SessionHKDFKit (~> 0.0.5)
- SwiftProtobuf (~> 1.5.0)
- SessionAxolotlKit/Tests (1.0.1):
- CocoaLumberjack
- SessionCoreKit (~> 1.0.0)
- SessionCurve25519Kit (~> 2.1.1)
- SessionHKDFKit (~> 0.0.5)
- SwiftProtobuf (~> 1.5.0)
- SessionCoreKit (1.0.0):
- CocoaLumberjack - CocoaLumberjack
- GRKOpenSSLFramework - GRKOpenSSLFramework
- SignalCoreKit/Tests (1.0.0): - SessionCoreKit/Tests (1.0.0):
- CocoaLumberjack - CocoaLumberjack
- GRKOpenSSLFramework - GRKOpenSSLFramework
- SignalMetadataKit (1.0.0): - SessionCurve25519Kit (2.1.1):
- AxolotlKit
- CocoaLumberjack - CocoaLumberjack
- Curve25519Kit - SessionCoreKit (~> 1.0.0)
- HKDFKit - SessionCurve25519Kit/Tests (2.1.1):
- SignalCoreKit
- SwiftProtobuf
- SignalMetadataKit/Tests (1.0.0):
- AxolotlKit
- CocoaLumberjack - CocoaLumberjack
- Curve25519Kit - SessionCoreKit (~> 1.0.0)
- HKDFKit - SessionHKDFKit (0.0.5):
- SignalCoreKit - CocoaLumberjack
- SwiftProtobuf - SessionCoreKit
- SignalServiceKit (0.9.0): - SessionHKDFKit/Tests (0.0.5):
- CocoaLumberjack
- SessionCoreKit
- SessionMetadataKit (1.0.0):
- CocoaLumberjack
- CryptoSwift (~> 1.0)
- SessionAxolotlKit (~> 1.0.1)
- SessionCoreKit (~> 1.0.0)
- SessionCurve25519Kit (~> 2.1.1)
- SessionHKDFKit (~> 0.0.5)
- SwiftProtobuf (~> 1.5.0)
- SessionMetadataKit/Tests (1.0.0):
- CocoaLumberjack
- CryptoSwift (~> 1.0)
- SessionAxolotlKit (~> 1.0.1)
- SessionCoreKit (~> 1.0.0)
- SessionCurve25519Kit (~> 2.1.1)
- SessionHKDFKit (~> 0.0.5)
- SwiftProtobuf (~> 1.5.0)
- SessionServiceKit (1.0.0):
- AFNetworking - AFNetworking
- AxolotlKit
- CocoaLumberjack - CocoaLumberjack
- CryptoSwift - CryptoSwift (~> 1.0)
- Curve25519Kit
- GRKOpenSSLFramework - GRKOpenSSLFramework
- libPhoneNumber-iOS - libPhoneNumber-iOS
- Mantle - Mantle
- PromiseKit (~> 6.0) - PromiseKit (~> 6.0)
- Reachability - Reachability
- SAMKeychain - SAMKeychain
- SignalCoreKit - SessionAxolotlKit (~> 1.0.1)
- SignalMetadataKit - SessionCoreKit (~> 1.0.0)
- SessionCurve25519Kit (~> 2.1.1)
- SessionMetadataKit (~> 1.0.0)
- Starscream - Starscream
- SwiftProtobuf - SwiftProtobuf (~> 1.5.0)
- YapDatabase/SQLCipher - YapDatabase/SQLCipher
- SignalServiceKit/Tests (0.9.0): - SessionServiceKit/Tests (1.0.0):
- AFNetworking - AFNetworking
- AxolotlKit
- CocoaLumberjack - CocoaLumberjack
- CryptoSwift - CryptoSwift (~> 1.0)
- Curve25519Kit
- GRKOpenSSLFramework - GRKOpenSSLFramework
- libPhoneNumber-iOS - libPhoneNumber-iOS
- Mantle - Mantle
- PromiseKit (~> 6.0) - PromiseKit (~> 6.0)
- Reachability - Reachability
- SAMKeychain - SAMKeychain
- SignalCoreKit - SessionAxolotlKit (~> 1.0.1)
- SignalMetadataKit - SessionCoreKit (~> 1.0.0)
- SessionCurve25519Kit (~> 2.1.1)
- SessionMetadataKit (~> 1.0.0)
- Starscream - Starscream
- SwiftProtobuf - SwiftProtobuf (~> 1.5.0)
- YapDatabase/SQLCipher - YapDatabase/SQLCipher
- SQLCipher (4.1.0): - SQLCipher (4.1.0):
- SQLCipher/standard (= 4.1.0) - SQLCipher/standard (= 4.1.0)
@ -205,30 +198,27 @@ PODS:
DEPENDENCIES: DEPENDENCIES:
- AFNetworking - AFNetworking
- AxolotlKit (from `https://github.com/signalapp/SignalProtocolKit.git`, branch `master`)
- AxolotlKit/Tests (from `https://github.com/signalapp/SignalProtocolKit.git`, branch `master`)
- Crashlytics (~> 3.13)
- CryptoSwift (~> 1.0) - CryptoSwift (~> 1.0)
- Curve25519Kit (from `https://github.com/signalapp/Curve25519Kit`)
- Curve25519Kit/Tests (from `https://github.com/signalapp/Curve25519Kit`)
- Fabric (~> 1.10)
- FeedKit (~> 8.1) - FeedKit (~> 8.1)
- FirebaseCore (~> 6.0)
- GCDWebServer (~> 3.0) - GCDWebServer (~> 3.0)
- GRKOpenSSLFramework (from `https://github.com/signalapp/GRKOpenSSLFramework`) - 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 (from `https://github.com/signalapp/Mantle`, branch `signal-master`) - Mantle (from `https://github.com/signalapp/Mantle`, branch `signal-master`)
- NVActivityIndicatorView (~> 4.7) - NVActivityIndicatorView (~> 4.7)
- PromiseKit (= 6.5.3) - PromiseKit (= 6.5.3)
- PureLayout - PureLayout
- Reachability - Reachability
- SignalCoreKit (from `https://github.com/signalapp/SignalCoreKit.git`) - SessionAxolotlKit (from `https://github.com/loki-project/session-ios-protocol-kit.git`, branch `master`)
- SignalCoreKit/Tests (from `https://github.com/signalapp/SignalCoreKit.git`) - SessionAxolotlKit/Tests (from `https://github.com/loki-project/session-ios-protocol-kit.git`, branch `master`)
- SignalMetadataKit (from `https://github.com/signalapp/SignalMetadataKit`) - SessionCoreKit (from `https://github.com/loki-project/session-ios-core-kit.git`)
- SignalMetadataKit/Tests (from `https://github.com/signalapp/SignalMetadataKit`) - SessionCoreKit/Tests (from `https://github.com/loki-project/session-ios-core-kit.git`)
- SignalServiceKit (from `.`) - SessionCurve25519Kit (from `https://github.com/loki-project/session-ios-curve-25519-kit`)
- SignalServiceKit/Tests (from `.`) - SessionCurve25519Kit/Tests (from `https://github.com/loki-project/session-ios-curve-25519-kit`)
- SessionHKDFKit (from `https://github.com/nielsandriesse/session-ios-hkdf-kit.git`)
- SessionHKDFKit/Tests (from `https://github.com/nielsandriesse/session-ios-hkdf-kit.git`)
- SessionMetadataKit (from `https://github.com/loki-project/session-ios-metadata-kit`)
- SessionMetadataKit/Tests (from `https://github.com/loki-project/session-ios-metadata-kit`)
- SessionServiceKit (from `.`)
- SessionServiceKit/Tests (from `.`)
- SQLCipher (>= 4.0.1) - SQLCipher (>= 4.0.1)
- SSZipArchive - SSZipArchive
- Starscream (from `https://github.com/signalapp/Starscream.git`, branch `signal-release`) - Starscream (from `https://github.com/signalapp/Starscream.git`, branch `signal-release`)
@ -239,13 +229,9 @@ SPEC REPOS:
https://github.com/CocoaPods/Specs.git: https://github.com/CocoaPods/Specs.git:
- AFNetworking - AFNetworking
- CocoaLumberjack - CocoaLumberjack
- Crashlytics
- CryptoSwift - CryptoSwift
- Fabric
- FeedKit - FeedKit
- FirebaseCore
- GCDWebServer - GCDWebServer
- GoogleUtilities
- libPhoneNumber-iOS - libPhoneNumber-iOS
- NVActivityIndicatorView - NVActivityIndicatorView
- PromiseKit - PromiseKit
@ -258,23 +244,23 @@ SPEC REPOS:
- YYImage - YYImage
EXTERNAL SOURCES: EXTERNAL SOURCES:
AxolotlKit:
:branch: master
:git: https://github.com/signalapp/SignalProtocolKit.git
Curve25519Kit:
:git: https://github.com/signalapp/Curve25519Kit
GRKOpenSSLFramework: GRKOpenSSLFramework:
:git: https://github.com/signalapp/GRKOpenSSLFramework :git: https://github.com/signalapp/GRKOpenSSLFramework
HKDFKit:
:git: https://github.com/signalapp/HKDFKit.git
Mantle: Mantle:
:branch: signal-master :branch: signal-master
:git: https://github.com/signalapp/Mantle :git: https://github.com/signalapp/Mantle
SignalCoreKit: SessionAxolotlKit:
:git: https://github.com/signalapp/SignalCoreKit.git :branch: master
SignalMetadataKit: :git: https://github.com/loki-project/session-ios-protocol-kit.git
:git: https://github.com/signalapp/SignalMetadataKit SessionCoreKit:
SignalServiceKit: :git: https://github.com/loki-project/session-ios-core-kit.git
SessionCurve25519Kit:
:git: https://github.com/loki-project/session-ios-curve-25519-kit
SessionHKDFKit:
:git: https://github.com/nielsandriesse/session-ios-hkdf-kit.git
SessionMetadataKit:
:git: https://github.com/loki-project/session-ios-metadata-kit
SessionServiceKit:
:path: "." :path: "."
Starscream: Starscream:
:branch: signal-release :branch: signal-release
@ -284,27 +270,27 @@ EXTERNAL SOURCES:
:git: https://github.com/signalapp/YapDatabase.git :git: https://github.com/signalapp/YapDatabase.git
CHECKOUT OPTIONS: CHECKOUT OPTIONS:
AxolotlKit:
:commit: dedb0f987ac98c8edafc8c54d442c01589cafffb
:git: https://github.com/signalapp/SignalProtocolKit.git
Curve25519Kit:
:commit: 9e5663baf4c2c7cb68ac4c0beb0423383c19a7fe
:git: https://github.com/signalapp/Curve25519Kit
GRKOpenSSLFramework: GRKOpenSSLFramework:
:commit: b799c27e7927e5304ec1e4ad53c6d33c6fd1cae7 :commit: b799c27e7927e5304ec1e4ad53c6d33c6fd1cae7
:git: https://github.com/signalapp/GRKOpenSSLFramework :git: https://github.com/signalapp/GRKOpenSSLFramework
HKDFKit:
:commit: 3e0c2371d125f2d3db26daa498d5d436961b1795
:git: https://github.com/signalapp/HKDFKit.git
Mantle: Mantle:
:commit: 9599b1d9796280c97cb2f786f34984fc98a3b6ef :commit: 9599b1d9796280c97cb2f786f34984fc98a3b6ef
:git: https://github.com/signalapp/Mantle :git: https://github.com/signalapp/Mantle
SignalCoreKit: SessionAxolotlKit:
:commit: 521615304b0448b5edcab43d7fcef7724c7dd10c :commit: bdf16c39ed6af917362c22ebee7653ca25a7bec4
:git: https://github.com/signalapp/SignalCoreKit.git :git: https://github.com/loki-project/session-ios-protocol-kit.git
SignalMetadataKit: SessionCoreKit:
:commit: 56f28fc3a6e35d548d034ef7d0009f233ca0aa62 :commit: 0d66c90657b62cb66ecd2767c57408a951650f23
:git: https://github.com/signalapp/SignalMetadataKit :git: https://github.com/loki-project/session-ios-core-kit.git
SessionCurve25519Kit:
:commit: 2c02fae0ddf2d390537b9114183a2e184d688f3e
:git: https://github.com/loki-project/session-ios-curve-25519-kit
SessionHKDFKit:
:commit: 0dcf8cf8a7995ef8663146f7063e6c1d7f5a3274
:git: https://github.com/nielsandriesse/session-ios-hkdf-kit.git
SessionMetadataKit:
:commit: c7eda0c04764df707fb5bb2b91b7b0e323b623d4
:git: https://github.com/loki-project/session-ios-metadata-kit
Starscream: Starscream:
:commit: b09ea163c3cb305152c65b299cb024610f52e735 :commit: b09ea163c3cb305152c65b299cb024610f52e735
:git: https://github.com/signalapp/Starscream.git :git: https://github.com/signalapp/Starscream.git
@ -314,28 +300,24 @@ CHECKOUT OPTIONS:
SPEC CHECKSUMS: SPEC CHECKSUMS:
AFNetworking: b6f891fdfaed196b46c7a83cf209e09697b94057 AFNetworking: b6f891fdfaed196b46c7a83cf209e09697b94057
AxolotlKit: bb02741a93400b915df1be3365ad13d3768b0103 CocoaLumberjack: b17ae15142558d08bbacf69775fa10c4abbebcc9
CocoaLumberjack: 2f44e60eb91c176d471fdba43b9e3eae6a721947
Crashlytics: 5aa8e90dcbf2f34898b4f5a0037787531246cca0
CryptoSwift: d81eeaa59dc5a8d03720fe919a6fd07b51f7439f CryptoSwift: d81eeaa59dc5a8d03720fe919a6fd07b51f7439f
Curve25519Kit: b3e77b7152ebe95fee2b3fb6c955449492bc14f7
Fabric: f6f21452846788bb44595d73e9909d79d328e617
FeedKit: 3418eed25f0b493b205b4de1b8511ac21d413fa9 FeedKit: 3418eed25f0b493b205b4de1b8511ac21d413fa9
FirebaseCore: b0f0262acebfa540e5f97b3832dbb13186980822
GCDWebServer: ead88cd14596dd4eae4f5830b8877c87c8728990 GCDWebServer: ead88cd14596dd4eae4f5830b8877c87c8728990
GoogleUtilities: 996e0db07153674fd1b54b220fda3a3dc3547cba
GRKOpenSSLFramework: 8a3735ad41e7dc1daff460467bccd32ca5d6ae3e GRKOpenSSLFramework: 8a3735ad41e7dc1daff460467bccd32ca5d6ae3e
HKDFKit: 3b6dbbb9d59c221cc6c52c3aa915700cbf24e376 libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75
libPhoneNumber-iOS: e444379ac18bbfbdefad571da735b2cd7e096caa
Mantle: 2fa750afa478cd625a94230fbf1c13462f29395b Mantle: 2fa750afa478cd625a94230fbf1c13462f29395b
NVActivityIndicatorView: b19ddab2576f805cbe0fb2306cba3476e09a1dea NVActivityIndicatorView: b19ddab2576f805cbe0fb2306cba3476e09a1dea
PromiseKit: c609029bdd801f792551a504c695c7d3098b42cd PromiseKit: c609029bdd801f792551a504c695c7d3098b42cd
PureLayout: f08c01b8dec00bb14a1fefa3de4c7d9c265df85e PureLayout: f08c01b8dec00bb14a1fefa3de4c7d9c265df85e
Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96 Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
SAMKeychain: 483e1c9f32984d50ca961e26818a534283b4cd5c SAMKeychain: 483e1c9f32984d50ca961e26818a534283b4cd5c
SignalCoreKit: c2d8132cdedb95d35eb2f8ae7eac0957695d0a8b SessionAxolotlKit: b43235dea1625352d3cfe727f8300e694e938d4e
SignalMetadataKit: 6fa5e9a53c7f104568662521a2f3874672ff7a02 SessionCoreKit: 778a3f6e3da788b43497734166646025b6392e88
SignalServiceKit: 5c5b63a39d5054201ab59ef6daf0fa0a1a0c7887 SessionCurve25519Kit: af73adf8d48094e627091eea759f4c64c5f4eb08
SessionHKDFKit: b0f4e669411703ab925aba07491c5611564d1419
SessionMetadataKit: d495323af8f24ef3832b68ffd4a58ecaf5e98707
SessionServiceKit: 1c7c7c7f1c9f9f8de5c2331d406e6be31f388efe
SQLCipher: efbdb52cdbe340bcd892b1b14297df4e07241b7f SQLCipher: efbdb52cdbe340bcd892b1b14297df4e07241b7f
SSZipArchive: 8e859da2520142e09166bc9161967db296e9d02f SSZipArchive: 8e859da2520142e09166bc9161967db296e9d02f
Starscream: ef3ece99d765eeccb67de105bfa143f929026cf5 Starscream: ef3ece99d765eeccb67de105bfa143f929026cf5
@ -343,6 +325,6 @@ SPEC CHECKSUMS:
YapDatabase: b418a4baa6906e8028748938f9159807fd039af4 YapDatabase: b418a4baa6906e8028748938f9159807fd039af4
YYImage: 1e1b62a9997399593e4b9c4ecfbbabbf1d3f3b54 YYImage: 1e1b62a9997399593e4b9c4ecfbbabbf1d3f3b54
PODFILE CHECKSUM: 472252f3a4801d0d14d9553ff33cf52ef0846dc3 PODFILE CHECKSUM: c8ebeec5bbe6b9ba42d54a32e8547879a76cee30
COCOAPODS: 1.9.0 COCOAPODS: 1.9.3

50
Signal.xcodeproj/project.pbxproj
View File

@ -3675,15 +3675,11 @@
inputPaths = ( inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Signal/Pods-Signal-frameworks.sh", "${PODS_ROOT}/Target Support Files/Pods-Signal/Pods-Signal-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/AFNetworking/AFNetworking.framework", "${BUILT_PRODUCTS_DIR}/AFNetworking/AFNetworking.framework",
"${BUILT_PRODUCTS_DIR}/AxolotlKit/AxolotlKit.framework",
"${BUILT_PRODUCTS_DIR}/CocoaLumberjack/CocoaLumberjack.framework", "${BUILT_PRODUCTS_DIR}/CocoaLumberjack/CocoaLumberjack.framework",
"${BUILT_PRODUCTS_DIR}/CryptoSwift/CryptoSwift.framework", "${BUILT_PRODUCTS_DIR}/CryptoSwift/CryptoSwift.framework",
"${BUILT_PRODUCTS_DIR}/Curve25519Kit/Curve25519Kit.framework",
"${BUILT_PRODUCTS_DIR}/FeedKit/FeedKit.framework", "${BUILT_PRODUCTS_DIR}/FeedKit/FeedKit.framework",
"${BUILT_PRODUCTS_DIR}/GCDWebServer/GCDWebServer.framework", "${BUILT_PRODUCTS_DIR}/GCDWebServer/GCDWebServer.framework",
"${PODS_ROOT}/GRKOpenSSLFramework/OpenSSL-iOS/bin/openssl.framework", "${PODS_ROOT}/GRKOpenSSLFramework/OpenSSL-iOS/bin/openssl.framework",
"${BUILT_PRODUCTS_DIR}/GoogleUtilities/GoogleUtilities.framework",
"${BUILT_PRODUCTS_DIR}/HKDFKit/HKDFKit.framework",
"${BUILT_PRODUCTS_DIR}/Mantle/Mantle.framework", "${BUILT_PRODUCTS_DIR}/Mantle/Mantle.framework",
"${BUILT_PRODUCTS_DIR}/NVActivityIndicatorView/NVActivityIndicatorView.framework", "${BUILT_PRODUCTS_DIR}/NVActivityIndicatorView/NVActivityIndicatorView.framework",
"${BUILT_PRODUCTS_DIR}/PromiseKit/PromiseKit.framework", "${BUILT_PRODUCTS_DIR}/PromiseKit/PromiseKit.framework",
@ -3692,9 +3688,12 @@
"${BUILT_PRODUCTS_DIR}/SAMKeychain/SAMKeychain.framework", "${BUILT_PRODUCTS_DIR}/SAMKeychain/SAMKeychain.framework",
"${BUILT_PRODUCTS_DIR}/SQLCipher/SQLCipher.framework", "${BUILT_PRODUCTS_DIR}/SQLCipher/SQLCipher.framework",
"${BUILT_PRODUCTS_DIR}/SSZipArchive/SSZipArchive.framework", "${BUILT_PRODUCTS_DIR}/SSZipArchive/SSZipArchive.framework",
"${BUILT_PRODUCTS_DIR}/SignalCoreKit/SignalCoreKit.framework", "${BUILT_PRODUCTS_DIR}/SessionAxolotlKit/SessionAxolotlKit.framework",
"${BUILT_PRODUCTS_DIR}/SignalMetadataKit/SignalMetadataKit.framework", "${BUILT_PRODUCTS_DIR}/SessionCoreKit/SessionCoreKit.framework",
"${BUILT_PRODUCTS_DIR}/SignalServiceKit/SignalServiceKit.framework", "${BUILT_PRODUCTS_DIR}/SessionCurve25519Kit/SessionCurve25519Kit.framework",
"${BUILT_PRODUCTS_DIR}/SessionHKDFKit/SessionHKDFKit.framework",
"${BUILT_PRODUCTS_DIR}/SessionMetadataKit/SessionMetadataKit.framework",
"${BUILT_PRODUCTS_DIR}/SessionServiceKit/SessionServiceKit.framework",
"${BUILT_PRODUCTS_DIR}/Starscream/Starscream.framework", "${BUILT_PRODUCTS_DIR}/Starscream/Starscream.framework",
"${BUILT_PRODUCTS_DIR}/SwiftProtobuf/SwiftProtobuf.framework", "${BUILT_PRODUCTS_DIR}/SwiftProtobuf/SwiftProtobuf.framework",
"${BUILT_PRODUCTS_DIR}/YYImage/YYImage.framework", "${BUILT_PRODUCTS_DIR}/YYImage/YYImage.framework",
@ -3704,15 +3703,11 @@
name = "[CP] Embed Pods Frameworks"; name = "[CP] Embed Pods Frameworks";
outputPaths = ( outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AFNetworking.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AFNetworking.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AxolotlKit.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CocoaLumberjack.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CocoaLumberjack.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CryptoSwift.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CryptoSwift.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Curve25519Kit.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FeedKit.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FeedKit.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GCDWebServer.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GCDWebServer.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/openssl.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/openssl.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleUtilities.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/HKDFKit.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Mantle.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Mantle.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/NVActivityIndicatorView.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/NVActivityIndicatorView.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PromiseKit.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PromiseKit.framework",
@ -3721,9 +3716,12 @@
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SAMKeychain.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SAMKeychain.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SQLCipher.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SQLCipher.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SSZipArchive.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SSZipArchive.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SignalCoreKit.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SessionAxolotlKit.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SignalMetadataKit.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SessionCoreKit.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SignalServiceKit.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SessionCurve25519Kit.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SessionHKDFKit.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SessionMetadataKit.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SessionServiceKit.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Starscream.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Starscream.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftProtobuf.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftProtobuf.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYImage.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYImage.framework",
@ -3761,21 +3759,21 @@
inputPaths = ( inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-SignalTests/Pods-SignalTests-frameworks.sh", "${PODS_ROOT}/Target Support Files/Pods-SignalTests/Pods-SignalTests-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/AFNetworking/AFNetworking.framework", "${BUILT_PRODUCTS_DIR}/AFNetworking/AFNetworking.framework",
"${BUILT_PRODUCTS_DIR}/AxolotlKit/AxolotlKit.framework",
"${BUILT_PRODUCTS_DIR}/CocoaLumberjack/CocoaLumberjack.framework", "${BUILT_PRODUCTS_DIR}/CocoaLumberjack/CocoaLumberjack.framework",
"${BUILT_PRODUCTS_DIR}/CryptoSwift/CryptoSwift.framework", "${BUILT_PRODUCTS_DIR}/CryptoSwift/CryptoSwift.framework",
"${BUILT_PRODUCTS_DIR}/Curve25519Kit/Curve25519Kit.framework",
"${PODS_ROOT}/GRKOpenSSLFramework/OpenSSL-iOS/bin/openssl.framework", "${PODS_ROOT}/GRKOpenSSLFramework/OpenSSL-iOS/bin/openssl.framework",
"${BUILT_PRODUCTS_DIR}/HKDFKit/HKDFKit.framework",
"${BUILT_PRODUCTS_DIR}/Mantle/Mantle.framework", "${BUILT_PRODUCTS_DIR}/Mantle/Mantle.framework",
"${BUILT_PRODUCTS_DIR}/PromiseKit/PromiseKit.framework", "${BUILT_PRODUCTS_DIR}/PromiseKit/PromiseKit.framework",
"${BUILT_PRODUCTS_DIR}/PureLayout/PureLayout.framework", "${BUILT_PRODUCTS_DIR}/PureLayout/PureLayout.framework",
"${BUILT_PRODUCTS_DIR}/Reachability/Reachability.framework", "${BUILT_PRODUCTS_DIR}/Reachability/Reachability.framework",
"${BUILT_PRODUCTS_DIR}/SAMKeychain/SAMKeychain.framework", "${BUILT_PRODUCTS_DIR}/SAMKeychain/SAMKeychain.framework",
"${BUILT_PRODUCTS_DIR}/SQLCipher/SQLCipher.framework", "${BUILT_PRODUCTS_DIR}/SQLCipher/SQLCipher.framework",
"${BUILT_PRODUCTS_DIR}/SignalCoreKit/SignalCoreKit.framework", "${BUILT_PRODUCTS_DIR}/SessionAxolotlKit/SessionAxolotlKit.framework",
"${BUILT_PRODUCTS_DIR}/SignalMetadataKit/SignalMetadataKit.framework", "${BUILT_PRODUCTS_DIR}/SessionCoreKit/SessionCoreKit.framework",
"${BUILT_PRODUCTS_DIR}/SignalServiceKit/SignalServiceKit.framework", "${BUILT_PRODUCTS_DIR}/SessionCurve25519Kit/SessionCurve25519Kit.framework",
"${BUILT_PRODUCTS_DIR}/SessionHKDFKit/SessionHKDFKit.framework",
"${BUILT_PRODUCTS_DIR}/SessionMetadataKit/SessionMetadataKit.framework",
"${BUILT_PRODUCTS_DIR}/SessionServiceKit/SessionServiceKit.framework",
"${BUILT_PRODUCTS_DIR}/Starscream/Starscream.framework", "${BUILT_PRODUCTS_DIR}/Starscream/Starscream.framework",
"${BUILT_PRODUCTS_DIR}/SwiftProtobuf/SwiftProtobuf.framework", "${BUILT_PRODUCTS_DIR}/SwiftProtobuf/SwiftProtobuf.framework",
"${BUILT_PRODUCTS_DIR}/YYImage/YYImage.framework", "${BUILT_PRODUCTS_DIR}/YYImage/YYImage.framework",
@ -3785,21 +3783,21 @@
name = "[CP] Embed Pods Frameworks"; name = "[CP] Embed Pods Frameworks";
outputPaths = ( outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AFNetworking.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AFNetworking.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AxolotlKit.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CocoaLumberjack.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CocoaLumberjack.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CryptoSwift.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CryptoSwift.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Curve25519Kit.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/openssl.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/openssl.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/HKDFKit.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Mantle.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Mantle.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PromiseKit.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PromiseKit.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PureLayout.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PureLayout.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Reachability.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Reachability.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SAMKeychain.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SAMKeychain.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SQLCipher.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SQLCipher.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SignalCoreKit.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SessionAxolotlKit.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SignalMetadataKit.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SessionCoreKit.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SignalServiceKit.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SessionCurve25519Kit.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SessionHKDFKit.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SessionMetadataKit.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SessionServiceKit.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Starscream.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Starscream.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftProtobuf.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftProtobuf.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYImage.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYImage.framework",

14
Signal/Signal-Prefix.pch
View File

@ -15,11 +15,11 @@
static const NSUInteger ddLogLevel = DDLogLevelInfo; static const NSUInteger ddLogLevel = DDLogLevelInfo;
#endif #endif
#import <SignalCoreKit/NSObject+OWS.h> #import <SessionCoreKit/NSObject+OWS.h>
#import <SignalCoreKit/OWSAsserts.h> #import <SessionCoreKit/OWSAsserts.h>
#import <SignalServiceKit/SSKAsserts.h> #import <SessionServiceKit/SSKAsserts.h>
#import <SignalServiceKit/OWSAnalytics.h> #import <SessionServiceKit/OWSAnalytics.h>
#import <SignalServiceKit/NSArray+Functional.h> #import <SessionServiceKit/NSArray+Functional.h>
#import <SignalServiceKit/NSSet+Functional.h> #import <SessionServiceKit/NSSet+Functional.h>
#import <SignalServiceKit/NSObject+Casting.h> #import <SessionServiceKit/NSObject+Casting.h>
#endif #endif

40
Signal/src/AppDelegate.m
View File

@ -16,7 +16,7 @@
#import "SignalsNavigationController.h" #import "SignalsNavigationController.h"
#import "ViewControllerUtils.h" #import "ViewControllerUtils.h"
#import <PromiseKit/AnyPromise.h> #import <PromiseKit/AnyPromise.h>
#import <SignalCoreKit/iOSVersions.h> #import <SessionCoreKit/iOSVersions.h>
#import <SignalMessaging/AppSetup.h> #import <SignalMessaging/AppSetup.h>
#import <SignalMessaging/Environment.h> #import <SignalMessaging/Environment.h>
#import <SignalMessaging/OWSContactsManager.h> #import <SignalMessaging/OWSContactsManager.h>
@ -25,25 +25,25 @@
#import <SignalMessaging/OWSProfileManager.h> #import <SignalMessaging/OWSProfileManager.h>
#import <SignalMessaging/SignalMessaging.h> #import <SignalMessaging/SignalMessaging.h>
#import <SignalMessaging/VersionMigrations.h> #import <SignalMessaging/VersionMigrations.h>
#import <SignalServiceKit/AppReadiness.h> #import <SessionServiceKit/AppReadiness.h>
#import <SignalServiceKit/NSUserDefaults+OWS.h> #import <SessionServiceKit/NSUserDefaults+OWS.h>
#import <SignalServiceKit/OWS2FAManager.h> #import <SessionServiceKit/OWS2FAManager.h>
#import <SignalServiceKit/OWSBatchMessageProcessor.h> #import <SessionServiceKit/OWSBatchMessageProcessor.h>
#import <SignalServiceKit/OWSDisappearingMessagesJob.h> #import <SessionServiceKit/OWSDisappearingMessagesJob.h>
#import <SignalServiceKit/OWSFailedAttachmentDownloadsJob.h> #import <SessionServiceKit/OWSFailedAttachmentDownloadsJob.h>
#import <SignalServiceKit/OWSFailedMessagesJob.h> #import <SessionServiceKit/OWSFailedMessagesJob.h>
#import <SignalServiceKit/OWSIncompleteCallsJob.h> #import <SessionServiceKit/OWSIncompleteCallsJob.h>
#import <SignalServiceKit/OWSMath.h> #import <SessionServiceKit/OWSMath.h>
#import <SignalServiceKit/OWSMessageManager.h> #import <SessionServiceKit/OWSMessageManager.h>
#import <SignalServiceKit/OWSMessageSender.h> #import <SessionServiceKit/OWSMessageSender.h>
#import <SignalServiceKit/OWSPrimaryStorage+Calling.h> #import <SessionServiceKit/OWSPrimaryStorage+Calling.h>
#import <SignalServiceKit/OWSReadReceiptManager.h> #import <SessionServiceKit/OWSReadReceiptManager.h>
#import <SignalServiceKit/SSKEnvironment.h> #import <SessionServiceKit/SSKEnvironment.h>
#import <SignalServiceKit/SignalServiceKit-Swift.h> #import <SessionServiceKit/SignalServiceKit-Swift.h>
#import <SignalServiceKit/TSAccountManager.h> #import <SessionServiceKit/TSAccountManager.h>
#import <SignalServiceKit/TSDatabaseView.h> #import <SessionServiceKit/TSDatabaseView.h>
#import <SignalServiceKit/TSPreKeyManager.h> #import <SessionServiceKit/TSPreKeyManager.h>
#import <SignalServiceKit/TSSocketManager.h> #import <SessionServiceKit/TSSocketManager.h>
#import <YapDatabase/YapDatabaseCryptoUtils.h> #import <YapDatabase/YapDatabaseCryptoUtils.h>
#import <sys/utsname.h> #import <sys/utsname.h>

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

@ -4,7 +4,7 @@
import Foundation import Foundation
import PromiseKit import PromiseKit
import SignalServiceKit import SessionServiceKit
@objc(OWSMessageFetcherJob) @objc(OWSMessageFetcherJob)
public class MessageFetcherJob: NSObject { public class MessageFetcherJob: NSObject {

2
Signal/src/Jobs/OWSSessionResetJobRecord.h
View File

@ -2,7 +2,7 @@
// Copyright (c) 2018 Open Whisper Systems. All rights reserved. // Copyright (c) 2018 Open Whisper Systems. All rights reserved.
// //
#import <SignalServiceKit/SSKJobRecord.h> #import <SessionServiceKit/SSKJobRecord.h>
@class TSContactThread; @class TSContactThread;

2
Signal/src/Jobs/OWSSessionResetJobRecord.m
View File

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

2
Signal/src/Jobs/SessionResetJob.swift
View File

@ -4,7 +4,7 @@
import Foundation import Foundation
import PromiseKit import PromiseKit
import SignalServiceKit import SessionServiceKit
@objc(OWSSessionResetJobQueue) @objc(OWSSessionResetJobQueue)
public class SessionResetJobQueue: NSObject, JobQueue { public class SessionResetJobQueue: NSObject, JobQueue {

2
Signal/src/Jobs/SyncPushTokensJob.swift
View File

@ -3,7 +3,7 @@
// //
import PromiseKit import PromiseKit
import SignalServiceKit import SessionServiceKit
@objc(OWSSyncPushTokensJob) @objc(OWSSyncPushTokensJob)
class SyncPushTokensJob: NSObject { class SyncPushTokensJob: NSObject {

2
Signal/src/Models/AccountManager.swift
View File

@ -4,7 +4,7 @@
import Foundation import Foundation
import PromiseKit import PromiseKit
import SignalServiceKit import SessionServiceKit
/** /**
* Signal is actually two services - textSecure for messages and red phone (for calls). * Signal is actually two services - textSecure for messages and red phone (for calls).

2
Signal/src/Models/CompareSafetyNumbersActivity.swift
View File

@ -3,7 +3,7 @@
// //
import Foundation import Foundation
import SignalServiceKit import SessionServiceKit
let CompareSafetyNumbersActivityType = "org.whispersystems.signal.activity.CompareSafetyNumbers" let CompareSafetyNumbersActivityType = "org.whispersystems.signal.activity.CompareSafetyNumbers"

4
Signal/src/Models/OWSDeviceProvisioningURLParser.m
View File

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

2
Signal/src/Models/PhoneNumberValidator.swift
View File

@ -3,7 +3,7 @@
// //
import Foundation import Foundation
import SignalServiceKit import SessionServiceKit
@objc @objc
public enum ValidatedPhoneCountryCodes: UInt { public enum ValidatedPhoneCountryCodes: UInt {

120
Signal/src/Signal-Bridging-Header.h
View File

@ -48,15 +48,15 @@
#import "SignalApp.h" #import "SignalApp.h"
#import "UIViewController+Permissions.h" #import "UIViewController+Permissions.h"
#import "ViewControllerUtils.h" #import "ViewControllerUtils.h"
#import <AxolotlKit/NSData+keyVersionByte.h> #import <SessionAxolotlKit/NSData+keyVersionByte.h>
#import <PureLayout/PureLayout.h> #import <PureLayout/PureLayout.h>
#import <Reachability/Reachability.h> #import <Reachability/Reachability.h>
#import <SignalCoreKit/Cryptography.h> #import <SessionCoreKit/Cryptography.h>
#import <SignalCoreKit/NSData+OWS.h> #import <SessionCoreKit/NSData+OWS.h>
#import <SignalCoreKit/NSDate+OWS.h> #import <SessionCoreKit/NSDate+OWS.h>
#import <SignalCoreKit/OWSAsserts.h> #import <SessionCoreKit/OWSAsserts.h>
#import <SignalCoreKit/OWSLogs.h> #import <SessionCoreKit/OWSLogs.h>
#import <SignalCoreKit/Threading.h> #import <SessionCoreKit/Threading.h>
#import <SignalMessaging/AttachmentSharing.h> #import <SignalMessaging/AttachmentSharing.h>
#import <SignalMessaging/ContactTableViewCell.h> #import <SignalMessaging/ContactTableViewCell.h>
#import <SignalMessaging/Environment.h> #import <SignalMessaging/Environment.h>
@ -75,59 +75,59 @@
#import <SignalMessaging/UIUtil.h> #import <SignalMessaging/UIUtil.h>
#import <SignalMessaging/UIView+OWS.h> #import <SignalMessaging/UIView+OWS.h>
#import <SignalMessaging/UIViewController+OWS.h> #import <SignalMessaging/UIViewController+OWS.h>
#import <SignalServiceKit/AppVersion.h> #import <SessionServiceKit/AppVersion.h>
#import <SignalServiceKit/Contact.h> #import <SessionServiceKit/Contact.h>
#import <SignalServiceKit/ContactsUpdater.h> #import <SessionServiceKit/ContactsUpdater.h>
#import <SignalServiceKit/DataSource.h> #import <SessionServiceKit/DataSource.h>
#import <SignalServiceKit/MIMETypeUtil.h> #import <SessionServiceKit/MIMETypeUtil.h>
#import <SignalServiceKit/NSData+Image.h> #import <SessionServiceKit/NSData+Image.h>
#import <SignalServiceKit/NSNotificationCenter+OWS.h> #import <SessionServiceKit/NSNotificationCenter+OWS.h>
#import <SignalServiceKit/NSString+SSK.h> #import <SessionServiceKit/NSString+SSK.h>
#import <SignalServiceKit/NSTimer+OWS.h> #import <SessionServiceKit/NSTimer+OWS.h>
#import <SignalServiceKit/OWSAnalytics.h> #import <SessionServiceKit/OWSAnalytics.h>
#import <SignalServiceKit/OWSAnalyticsEvents.h> #import <SessionServiceKit/OWSAnalyticsEvents.h>
#import <SignalServiceKit/OWSBackgroundTask.h> #import <SessionServiceKit/OWSBackgroundTask.h>
#import <SignalServiceKit/OWSCallMessageHandler.h> #import <SessionServiceKit/OWSCallMessageHandler.h>
#import <SignalServiceKit/OWSContactsOutputStream.h> #import <SessionServiceKit/OWSContactsOutputStream.h>
#import <SignalServiceKit/OWSDispatch.h> #import <SessionServiceKit/OWSDispatch.h>
#import <SignalServiceKit/OWSEndSessionMessage.h> #import <SessionServiceKit/OWSEndSessionMessage.h>
#import <SignalServiceKit/LKEphemeralMessage.h> #import <SessionServiceKit/LKEphemeralMessage.h>
#import <SignalServiceKit/LKDeviceLinkMessage.h> #import <SessionServiceKit/LKDeviceLinkMessage.h>
#import <SignalServiceKit/OWSError.h> #import <SessionServiceKit/OWSError.h>
#import <SignalServiceKit/OWSFileSystem.h> #import <SessionServiceKit/OWSFileSystem.h>
#import <SignalServiceKit/LKFriendRequestMessage.h> #import <SessionServiceKit/LKFriendRequestMessage.h>
#import <SignalServiceKit/OWSIdentityManager.h> #import <SessionServiceKit/OWSIdentityManager.h>
#import <SignalServiceKit/OWSMediaGalleryFinder.h> #import <SessionServiceKit/OWSMediaGalleryFinder.h>
#import <SignalServiceKit/OWSMessageManager.h> #import <SessionServiceKit/OWSMessageManager.h>
#import <SignalServiceKit/OWSMessageReceiver.h> #import <SessionServiceKit/OWSMessageReceiver.h>
#import <SignalServiceKit/OWSMessageSender.h> #import <SessionServiceKit/OWSMessageSender.h>
#import <SignalServiceKit/OWSOutgoingCallMessage.h> #import <SessionServiceKit/OWSOutgoingCallMessage.h>
#import <SignalServiceKit/OWSPrimaryStorage+Calling.h> #import <SessionServiceKit/OWSPrimaryStorage+Calling.h>
#import <SignalServiceKit/OWSPrimaryStorage+SessionStore.h> #import <SessionServiceKit/OWSPrimaryStorage+SessionStore.h>
#import <SignalServiceKit/OWSProfileKeyMessage.h> #import <SessionServiceKit/OWSProfileKeyMessage.h>
#import <SignalServiceKit/OWSRecipientIdentity.h> #import <SessionServiceKit/OWSRecipientIdentity.h>
#import <SignalServiceKit/OWSRequestFactory.h> #import <SessionServiceKit/OWSRequestFactory.h>
#import <SignalServiceKit/OWSSignalService.h> #import <SessionServiceKit/OWSSignalService.h>
#import <SignalServiceKit/PhoneNumber.h> #import <SessionServiceKit/PhoneNumber.h>
#import <SignalServiceKit/SignalAccount.h> #import <SessionServiceKit/SignalAccount.h>
#import <SignalServiceKit/SignalRecipient.h> #import <SessionServiceKit/SignalRecipient.h>
#import <SignalServiceKit/TSAccountManager.h> #import <SessionServiceKit/TSAccountManager.h>
#import <SignalServiceKit/TSAttachment.h> #import <SessionServiceKit/TSAttachment.h>
#import <SignalServiceKit/TSAttachmentPointer.h> #import <SessionServiceKit/TSAttachmentPointer.h>
#import <SignalServiceKit/TSAttachmentStream.h> #import <SessionServiceKit/TSAttachmentStream.h>
#import <SignalServiceKit/TSCall.h> #import <SessionServiceKit/TSCall.h>
#import <SignalServiceKit/TSContactThread.h> #import <SessionServiceKit/TSContactThread.h>
#import <SignalServiceKit/TSErrorMessage.h> #import <SessionServiceKit/TSErrorMessage.h>
#import <SignalServiceKit/TSGroupThread.h> #import <SessionServiceKit/TSGroupThread.h>
#import <SignalServiceKit/TSIncomingMessage.h> #import <SessionServiceKit/TSIncomingMessage.h>
#import <SignalServiceKit/TSInfoMessage.h> #import <SessionServiceKit/TSInfoMessage.h>
#import <SignalServiceKit/TSNetworkManager.h> #import <SessionServiceKit/TSNetworkManager.h>
#import <SignalServiceKit/TSOutgoingMessage.h> #import <SessionServiceKit/TSOutgoingMessage.h>
#import <SignalServiceKit/TSPreKeyManager.h> #import <SessionServiceKit/TSPreKeyManager.h>
#import <SignalServiceKit/TSSocketManager.h> #import <SessionServiceKit/TSSocketManager.h>
#import <SignalServiceKit/TSThread.h> #import <SessionServiceKit/TSThread.h>
#import <SignalServiceKit/LKGroupUtilities.h> #import <SessionServiceKit/LKGroupUtilities.h>
#import <SignalServiceKit/UIImage+OWS.h> #import <SessionServiceKit/UIImage+OWS.h>
#import <WebRTC/RTCAudioSession.h> #import <WebRTC/RTCAudioSession.h>
#import <WebRTC/RTCCameraPreviewView.h> #import <WebRTC/RTCCameraPreviewView.h>
#import <YYImage/YYImage.h> #import <YYImage/YYImage.h>

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

@ -8,8 +8,8 @@
#import <SignalMessaging/Environment.h> #import <SignalMessaging/Environment.h>
#import <SignalMessaging/OWSPreferences.h> #import <SignalMessaging/OWSPreferences.h>
#import <SignalMessaging/UIUtil.h> #import <SignalMessaging/UIUtil.h>
#import <SignalServiceKit/OWSPrimaryStorage.h> #import <SessionServiceKit/OWSPrimaryStorage.h>
#import <SignalServiceKit/TSDatabaseView.h> #import <SessionServiceKit/TSDatabaseView.h>
@implementation AboutTableViewController @implementation AboutTableViewController

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

@ -6,7 +6,7 @@
#import "BlockListUIUtils.h" #import "BlockListUIUtils.h"
#import "ContactsViewHelper.h" #import "ContactsViewHelper.h"
#import <SignalMessaging/OWSContactsManager.h> #import <SignalMessaging/OWSContactsManager.h>
#import <SignalServiceKit/SignalAccount.h> #import <SessionServiceKit/SignalAccount.h>
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN

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

@ -13,7 +13,7 @@
#import <Reachability/Reachability.h> #import <Reachability/Reachability.h>
#import <SignalMessaging/Environment.h> #import <SignalMessaging/Environment.h>
#import <SignalMessaging/OWSPreferences.h> #import <SignalMessaging/OWSPreferences.h>
#import <SignalServiceKit/OWSSignalService.h> #import <SessionServiceKit/OWSSignalService.h>
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN

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

@ -19,8 +19,8 @@
#import <SignalMessaging/Environment.h> #import <SignalMessaging/Environment.h>
#import <SignalMessaging/OWSContactsManager.h> #import <SignalMessaging/OWSContactsManager.h>
#import <SignalMessaging/UIUtil.h> #import <SignalMessaging/UIUtil.h>
#import <SignalServiceKit/TSAccountManager.h> #import <SessionServiceKit/TSAccountManager.h>
#import <SignalServiceKit/TSSocketManager.h> #import <SessionServiceKit/TSSocketManager.h>
#import "Session-Swift.h" #import "Session-Swift.h"
@interface AppSettingsViewController () @interface AppSettingsViewController ()

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

@ -14,8 +14,8 @@
#import "UIView+OWS.h" #import "UIView+OWS.h"
#import <SignalMessaging/Environment.h> #import <SignalMessaging/Environment.h>
#import <SignalMessaging/OWSContactsManager.h> #import <SignalMessaging/OWSContactsManager.h>
#import <SignalServiceKit/OWSBlockingManager.h> #import <SessionServiceKit/OWSBlockingManager.h>
#import <SignalServiceKit/TSGroupThread.h> #import <SessionServiceKit/TSGroupThread.h>
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN

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

@ -9,7 +9,7 @@
#import "UIFont+OWS.h" #import "UIFont+OWS.h"
#import "UIView+OWS.h" #import "UIView+OWS.h"
#import <SignalMessaging/Theme.h> #import <SignalMessaging/Theme.h>
#import <SignalServiceKit/OWSSignalService.h> #import <SessionServiceKit/OWSSignalService.h>
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN

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

@ -13,7 +13,7 @@
#import <SignalMessaging/UIColor+OWS.h> #import <SignalMessaging/UIColor+OWS.h>
#import <SignalMessaging/UIFont+OWS.h> #import <SignalMessaging/UIFont+OWS.h>
#import <SignalMessaging/UIView+OWS.h> #import <SignalMessaging/UIView+OWS.h>
#import <SignalServiceKit/MIMETypeUtil.h> #import <SessionServiceKit/MIMETypeUtil.h>
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN

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

@ -6,13 +6,13 @@
#import "OWSDeviceProvisioningURLParser.h" #import "OWSDeviceProvisioningURLParser.h"
#import "OWSLinkedDevicesTableViewController.h" #import "OWSLinkedDevicesTableViewController.h"
#import "Session-Swift.h" #import "Session-Swift.h"
#import <SignalCoreKit/Cryptography.h> #import <SessionCoreKit/Cryptography.h>
#import <SignalMessaging/OWSProfileManager.h> #import <SignalMessaging/OWSProfileManager.h>
#import <SignalServiceKit/OWSDevice.h> #import <SessionServiceKit/OWSDevice.h>
#import <SignalServiceKit/OWSDeviceProvisioner.h> #import <SessionServiceKit/OWSDeviceProvisioner.h>
#import <SignalServiceKit/OWSIdentityManager.h> #import <SessionServiceKit/OWSIdentityManager.h>
#import <SignalServiceKit/OWSReadReceiptManager.h> #import <SessionServiceKit/OWSReadReceiptManager.h>
#import <SignalServiceKit/TSAccountManager.h> #import <SessionServiceKit/TSAccountManager.h>
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN

10
Signal/src/ViewControllers/AppSettings/OWSLinkedDevicesTableViewController.m
View File

@ -7,11 +7,11 @@
#import "OWSLinkDeviceViewController.h" #import "OWSLinkDeviceViewController.h"
#import "Session-Swift.h" #import "Session-Swift.h"
#import "UIViewController+Permissions.h" #import "UIViewController+Permissions.h"
#import <SignalServiceKit/NSTimer+OWS.h> #import <SessionServiceKit/NSTimer+OWS.h>
#import <SignalServiceKit/OWSDevice.h> #import <SessionServiceKit/OWSDevice.h>
#import <SignalServiceKit/OWSDevicesService.h> #import <SessionServiceKit/OWSDevicesService.h>
#import <SignalServiceKit/OWSPrimaryStorage.h> #import <SessionServiceKit/OWSPrimaryStorage.h>
#import <SignalServiceKit/TSDatabaseView.h> #import <SessionServiceKit/TSDatabaseView.h>
#import <YapDatabase/YapDatabase.h> #import <YapDatabase/YapDatabase.h>
#import <YapDatabase/YapDatabaseViewConnection.h> #import <YapDatabase/YapDatabaseViewConnection.h>
#import <YapDatabase/YapDatabaseViewMappings.h> #import <YapDatabase/YapDatabaseViewMappings.h>

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

@ -10,10 +10,10 @@
#import <SignalMessaging/OWSPreferences.h> #import <SignalMessaging/OWSPreferences.h>
#import <SignalMessaging/ThreadUtil.h> #import <SignalMessaging/ThreadUtil.h>
#import <SignalMessaging/UIColor+OWS.h> #import <SignalMessaging/UIColor+OWS.h>
#import <SignalServiceKit/NSString+SSK.h> #import <SessionServiceKit/NSString+SSK.h>
#import <SignalServiceKit/OWS2FAManager.h> #import <SessionServiceKit/OWS2FAManager.h>
#import <SignalServiceKit/OWSReadReceiptManager.h> #import <SessionServiceKit/OWSReadReceiptManager.h>
#import <SignalServiceKit/SignalServiceKit-Swift.h> #import <SessionServiceKit/SignalServiceKit-Swift.h>
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN

8
Signal/src/ViewControllers/AvatarViewHelper.m
View File

@ -8,10 +8,10 @@
#import <MobileCoreServices/UTCoreTypes.h> #import <MobileCoreServices/UTCoreTypes.h>
#import <SignalMessaging/OWSContactsManager.h> #import <SignalMessaging/OWSContactsManager.h>
#import <SignalMessaging/UIUtil.h> #import <SignalMessaging/UIUtil.h>
#import <SignalServiceKit/PhoneNumber.h> #import <SessionServiceKit/PhoneNumber.h>
#import <SignalServiceKit/TSGroupModel.h> #import <SessionServiceKit/TSGroupModel.h>
#import <SignalServiceKit/TSGroupThread.h> #import <SessionServiceKit/TSGroupThread.h>
#import <SignalServiceKit/TSThread.h> #import <SessionServiceKit/TSThread.h>
#import <SignalMessaging/SignalMessaging-Swift.h> #import <SignalMessaging/SignalMessaging-Swift.h>
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN

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

@ -5,7 +5,7 @@
//import Foundation //import Foundation
//import WebRTC //import WebRTC
//import PromiseKit //import PromiseKit
//import SignalServiceKit //import SessionServiceKit
//import SignalMessaging //import SignalMessaging
// //
//// TODO: Add category so that button handlers can be defined where button is created. //// TODO: Add category so that button handlers can be defined where button is created.

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

@ -3,7 +3,7 @@
// //
import Foundation import Foundation
import SignalServiceKit import SessionServiceKit
import ContactsUI import ContactsUI
import MessageUI import MessageUI

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

@ -3,7 +3,7 @@
// //
import Foundation import Foundation
import SignalServiceKit import SessionServiceKit
import SignalMessaging import SignalMessaging
import Reachability import Reachability
import ContactsUI import ContactsUI

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

@ -9,7 +9,7 @@
import UIKit import UIKit
import Contacts import Contacts
import SignalServiceKit import SessionServiceKit
@objc @objc
public protocol ContactsPickerDelegate: class { public protocol ContactsPickerDelegate: class {

6
Signal/src/ViewControllers/ConversationView/Cells/AttachmentUploadView.m
View File

@ -7,9 +7,9 @@
#import "OWSProgressView.h" #import "OWSProgressView.h"
#import <SignalMessaging/UIFont+OWS.h> #import <SignalMessaging/UIFont+OWS.h>
#import <SignalMessaging/UIView+OWS.h> #import <SignalMessaging/UIView+OWS.h>
#import <SignalServiceKit/AppContext.h> #import <SessionServiceKit/AppContext.h>
#import <SignalServiceKit/OWSUploadOperation.h> #import <SessionServiceKit/OWSUploadOperation.h>
#import <SignalServiceKit/TSAttachmentStream.h> #import <SessionServiceKit/TSAttachmentStream.h>
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN

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

@ -9,7 +9,7 @@
#import "ViewControllerUtils.h" #import "ViewControllerUtils.h"
#import <SignalMessaging/OWSFormat.h> #import <SignalMessaging/OWSFormat.h>
#import <SignalMessaging/UIColor+OWS.h> #import <SignalMessaging/UIColor+OWS.h>
#import <SignalServiceKit/MIMETypeUtil.h> #import <SessionServiceKit/MIMETypeUtil.h>
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN

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

@ -10,7 +10,7 @@
#import <SignalMessaging/Environment.h> #import <SignalMessaging/Environment.h>
#import <SignalMessaging/SignalMessaging-Swift.h> #import <SignalMessaging/SignalMessaging-Swift.h>
#import <SignalMessaging/UIColor+OWS.h> #import <SignalMessaging/UIColor+OWS.h>
#import <SignalServiceKit/OWSContact.h> #import <SessionServiceKit/OWSContact.h>
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN

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

@ -11,7 +11,7 @@
#import <SignalMessaging/Environment.h> #import <SignalMessaging/Environment.h>
#import <SignalMessaging/SignalMessaging-Swift.h> #import <SignalMessaging/SignalMessaging-Swift.h>
#import <SignalMessaging/UIColor+OWS.h> #import <SignalMessaging/UIColor+OWS.h>
#import <SignalServiceKit/OWSContact.h> #import <SessionServiceKit/OWSContact.h>
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN

6
Signal/src/ViewControllers/ConversationView/Cells/OWSGenericAttachmentView.m
View File

@ -10,9 +10,9 @@
#import "ViewControllerUtils.h" #import "ViewControllerUtils.h"
#import <SignalMessaging/OWSFormat.h> #import <SignalMessaging/OWSFormat.h>
#import <SignalMessaging/UIColor+OWS.h> #import <SignalMessaging/UIColor+OWS.h>
#import <SignalServiceKit/MimeTypeUtil.h> #import <SessionServiceKit/MimeTypeUtil.h>
#import <SignalServiceKit/NSString+SSK.h> #import <SessionServiceKit/NSString+SSK.h>
#import <SignalServiceKit/TSAttachmentStream.h> #import <SessionServiceKit/TSAttachmentStream.h>
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN

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

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

4
Signal/src/ViewControllers/ConversationView/Cells/OWSMessageTimerView.m
View File

@ -8,8 +8,8 @@
#import "UIColor+OWS.h" #import "UIColor+OWS.h"
#import "UIView+OWS.h" #import "UIView+OWS.h"
#import <QuartzCore/QuartzCore.h> #import <QuartzCore/QuartzCore.h>
#import <SignalCoreKit/NSDate+OWS.h> #import <SessionCoreKit/NSDate+OWS.h>
#import <SignalServiceKit/NSTimer+OWS.h> #import <SessionServiceKit/NSTimer+OWS.h>
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN

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

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

8
Signal/src/ViewControllers/ConversationView/Cells/OWSSystemMessageCell.m
View File

@ -11,10 +11,10 @@
#import "UIView+OWS.h" #import "UIView+OWS.h"
#import <SignalMessaging/Environment.h> #import <SignalMessaging/Environment.h>
#import <SignalMessaging/OWSContactsManager.h> #import <SignalMessaging/OWSContactsManager.h>
#import <SignalServiceKit/OWSVerificationStateChangeMessage.h> #import <SessionServiceKit/OWSVerificationStateChangeMessage.h>
#import <SignalServiceKit/TSCall.h> #import <SessionServiceKit/TSCall.h>
#import <SignalServiceKit/TSErrorMessage.h> #import <SessionServiceKit/TSErrorMessage.h>
#import <SignalServiceKit/TSInfoMessage.h> #import <SessionServiceKit/TSInfoMessage.h>
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN

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

@ -4,7 +4,7 @@
#import "ConversationInputTextView.h" #import "ConversationInputTextView.h"
#import "Session-Swift.h" #import "Session-Swift.h"
#import <SignalServiceKit/NSString+SSK.h> #import <SessionServiceKit/NSString+SSK.h>
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN

4
Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m
View File

@ -15,8 +15,8 @@
#import <SignalMessaging/OWSFormat.h> #import <SignalMessaging/OWSFormat.h>
#import <SignalMessaging/SignalMessaging-Swift.h> #import <SignalMessaging/SignalMessaging-Swift.h>
#import <SignalMessaging/UIView+OWS.h> #import <SignalMessaging/UIView+OWS.h>
#import <SignalServiceKit/NSTimer+OWS.h> #import <SessionServiceKit/NSTimer+OWS.h>
#import <SignalServiceKit/TSQuotedMessage.h> #import <SessionServiceKit/TSQuotedMessage.h>
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN

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

@ -47,8 +47,8 @@
#import <ContactsUI/CNContactViewController.h> #import <ContactsUI/CNContactViewController.h>
#import <MobileCoreServices/UTCoreTypes.h> #import <MobileCoreServices/UTCoreTypes.h>
#import <PromiseKit/AnyPromise.h> #import <PromiseKit/AnyPromise.h>
#import <SignalCoreKit/NSDate+OWS.h> #import <SessionCoreKit/NSDate+OWS.h>
#import <SignalCoreKit/Threading.h> #import <SessionCoreKit/Threading.h>
#import <SignalMessaging/Environment.h> #import <SignalMessaging/Environment.h>
#import <SignalMessaging/OWSContactOffersInteraction.h> #import <SignalMessaging/OWSContactOffersInteraction.h>
#import <SignalMessaging/OWSContactsManager.h> #import <SignalMessaging/OWSContactsManager.h>
@ -60,35 +60,35 @@
#import <SignalMessaging/ThreadUtil.h> #import <SignalMessaging/ThreadUtil.h>
#import <SignalMessaging/UIUtil.h> #import <SignalMessaging/UIUtil.h>
#import <SignalMessaging/UIViewController+OWS.h> #import <SignalMessaging/UIViewController+OWS.h>
#import <SignalServiceKit/Contact.h> #import <SessionServiceKit/Contact.h>
#import <SignalServiceKit/ContactsUpdater.h> #import <SessionServiceKit/ContactsUpdater.h>
#import <SignalServiceKit/MimeTypeUtil.h> #import <SessionServiceKit/MimeTypeUtil.h>
#import <SignalServiceKit/NSString+SSK.h> #import <SessionServiceKit/NSString+SSK.h>
#import <SignalServiceKit/NSTimer+OWS.h> #import <SessionServiceKit/NSTimer+OWS.h>
#import <SignalServiceKit/OWSAddToContactsOfferMessage.h> #import <SessionServiceKit/OWSAddToContactsOfferMessage.h>
#import <SignalServiceKit/OWSAddToProfileWhitelistOfferMessage.h> #import <SessionServiceKit/OWSAddToProfileWhitelistOfferMessage.h>
#import <SignalServiceKit/OWSAttachmentDownloads.h> #import <SessionServiceKit/OWSAttachmentDownloads.h>
#import <SignalServiceKit/OWSBlockingManager.h> #import <SessionServiceKit/OWSBlockingManager.h>
#import <SignalServiceKit/OWSDisappearingMessagesConfiguration.h> #import <SessionServiceKit/OWSDisappearingMessagesConfiguration.h>
#import <SignalServiceKit/OWSIdentityManager.h> #import <SessionServiceKit/OWSIdentityManager.h>
#import <SignalServiceKit/OWSMessageManager.h> #import <SessionServiceKit/OWSMessageManager.h>
#import <SignalServiceKit/OWSMessageSender.h> #import <SessionServiceKit/OWSMessageSender.h>
#import <SignalServiceKit/OWSMessageUtils.h> #import <SessionServiceKit/OWSMessageUtils.h>
#import <SignalServiceKit/OWSPrimaryStorage.h> #import <SessionServiceKit/OWSPrimaryStorage.h>
#import <SignalServiceKit/OWSPrimaryStorage+Loki.h> #import <SessionServiceKit/OWSPrimaryStorage+Loki.h>
#import <SignalServiceKit/OWSReadReceiptManager.h> #import <SessionServiceKit/OWSReadReceiptManager.h>
#import <SignalServiceKit/OWSVerificationStateChangeMessage.h> #import <SessionServiceKit/OWSVerificationStateChangeMessage.h>
#import <SignalServiceKit/SignalServiceKit-Swift.h> #import <SessionServiceKit/SignalServiceKit-Swift.h>
#import <SignalServiceKit/TSAccountManager.h> #import <SessionServiceKit/TSAccountManager.h>
#import <SignalServiceKit/TSGroupModel.h> #import <SessionServiceKit/TSGroupModel.h>
#import <SignalServiceKit/TSInvalidIdentityKeyReceivingErrorMessage.h> #import <SessionServiceKit/TSInvalidIdentityKeyReceivingErrorMessage.h>
#import <SignalServiceKit/TSNetworkManager.h> #import <SessionServiceKit/TSNetworkManager.h>
#import <SignalServiceKit/TSQuotedMessage.h> #import <SessionServiceKit/TSQuotedMessage.h>
#import <YapDatabase/YapDatabase.h> #import <YapDatabase/YapDatabase.h>
#import <YapDatabase/YapDatabaseAutoView.h> #import <YapDatabase/YapDatabaseAutoView.h>
#import <YapDatabase/YapDatabaseViewChange.h> #import <YapDatabase/YapDatabaseViewChange.h>
#import <YapDatabase/YapDatabaseViewConnection.h> #import <YapDatabase/YapDatabaseViewConnection.h>
#import <SignalMetaDataKit/SignalMetadataKit-Swift.h> #import <SessionMetadataKit/SignalMetadataKit-Swift.h>
@import Photos; @import Photos;

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

@ -11,12 +11,12 @@
#import "Session-Swift.h" #import "Session-Swift.h"
#import "AnyPromise.h" #import "AnyPromise.h"
#import <SignalMessaging/OWSUnreadIndicator.h> #import <SignalMessaging/OWSUnreadIndicator.h>
#import <SignalServiceKit/NSData+Image.h> #import <SessionServiceKit/NSData+Image.h>
#import <SignalServiceKit/NSString+SSK.h> #import <SessionServiceKit/NSString+SSK.h>
#import <SignalServiceKit/OWSContact.h> #import <SessionServiceKit/OWSContact.h>
#import <SignalServiceKit/TSInteraction.h> #import <SessionServiceKit/TSInteraction.h>
#import <SignalServiceKit/SSKEnvironment.h> #import <SessionServiceKit/SSKEnvironment.h>
#import <SignalServiceKit/SignalServiceKit-Swift.h> #import <SessionServiceKit/SignalServiceKit-Swift.h>
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN

20
Signal/src/ViewControllers/ConversationView/ConversationViewModel.m
View File

@ -8,21 +8,21 @@
#import "OWSMessageBubbleView.h" #import "OWSMessageBubbleView.h"
#import "OWSQuotedReplyModel.h" #import "OWSQuotedReplyModel.h"
#import "Session-Swift.h" #import "Session-Swift.h"
#import <SignalCoreKit/NSDate+OWS.h> #import <SessionCoreKit/NSDate+OWS.h>
#import <SignalMessaging/OWSContactOffersInteraction.h> #import <SignalMessaging/OWSContactOffersInteraction.h>
#import <SignalMessaging/OWSContactsManager.h> #import <SignalMessaging/OWSContactsManager.h>
#import <SignalMessaging/OWSUnreadIndicator.h> #import <SignalMessaging/OWSUnreadIndicator.h>
#import <SignalMessaging/SignalMessaging-Swift.h> #import <SignalMessaging/SignalMessaging-Swift.h>
#import <SignalMessaging/ThreadUtil.h> #import <SignalMessaging/ThreadUtil.h>
#import <SignalServiceKit/OWSBlockingManager.h> #import <SessionServiceKit/OWSBlockingManager.h>
#import <SignalServiceKit/OWSPrimaryStorage.h> #import <SessionServiceKit/OWSPrimaryStorage.h>
#import <SignalServiceKit/SSKEnvironment.h> #import <SessionServiceKit/SSKEnvironment.h>
#import <SignalServiceKit/TSDatabaseView.h> #import <SessionServiceKit/TSDatabaseView.h>
#import <SignalServiceKit/TSIncomingMessage.h> #import <SessionServiceKit/TSIncomingMessage.h>
#import <SignalServiceKit/TSOutgoingMessage.h> #import <SessionServiceKit/TSOutgoingMessage.h>
#import <SignalServiceKit/TSThread.h> #import <SessionServiceKit/TSThread.h>
#import <SignalServiceKit/TSGroupThread.h> #import <SessionServiceKit/TSGroupThread.h>
#import <SignalServiceKit/TSGroupModel.h> #import <SessionServiceKit/TSGroupModel.h>
#import <YapDatabase/YapDatabase.h> #import <YapDatabase/YapDatabase.h>
#import <YapDatabase/YapDatabaseAutoView.h> #import <YapDatabase/YapDatabaseAutoView.h>
#import <YapDatabase/YapDatabaseViewChange.h> #import <YapDatabase/YapDatabaseViewChange.h>

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

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

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

@ -7,7 +7,7 @@
#import "OWSTableViewController.h" #import "OWSTableViewController.h"
#import "Session-Swift.h" #import "Session-Swift.h"
#import <PromiseKit/AnyPromise.h> #import <PromiseKit/AnyPromise.h>
#import <SignalCoreKit/Randomness.h> #import <SessionCoreKit/Randomness.h>
@import CloudKit; @import CloudKit;

2
Signal/src/ViewControllers/DebugUI/DebugUICalling.swift
View File

@ -3,7 +3,7 @@
// //
import Foundation import Foundation
import SignalServiceKit import SessionServiceKit
import SignalMessaging import SignalMessaging
class DebugUICalling: DebugUIPage { class DebugUICalling: DebugUIPage {

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

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

8
Signal/src/ViewControllers/DebugUI/DebugUIDiskUsage.m
View File

@ -6,10 +6,10 @@
#import "OWSOrphanDataCleaner.h" #import "OWSOrphanDataCleaner.h"
#import "OWSTableViewController.h" #import "OWSTableViewController.h"
#import "Session-Swift.h" #import "Session-Swift.h"
#import <SignalCoreKit/NSDate+OWS.h> #import <SessionCoreKit/NSDate+OWS.h>
#import <SignalServiceKit/OWSPrimaryStorage.h> #import <SessionServiceKit/OWSPrimaryStorage.h>
#import <SignalServiceKit/TSDatabaseView.h> #import <SessionServiceKit/TSDatabaseView.h>
#import <SignalServiceKit/TSInteraction.h> #import <SessionServiceKit/TSInteraction.h>
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN

28
Signal/src/ViewControllers/DebugUI/DebugUIMessages.m
View File

@ -9,21 +9,21 @@
#import "DebugUIMessagesAssetLoader.h" #import "DebugUIMessagesAssetLoader.h"
#import "OWSTableViewController.h" #import "OWSTableViewController.h"
#import "Session-Swift.h" #import "Session-Swift.h"
#import <SignalCoreKit/NSDate+OWS.h> #import <SessionCoreKit/NSDate+OWS.h>
#import <SignalCoreKit/Randomness.h> #import <SessionCoreKit/Randomness.h>
#import <SignalMessaging/Environment.h> #import <SignalMessaging/Environment.h>
#import <SignalServiceKit/MIMETypeUtil.h> #import <SessionServiceKit/MIMETypeUtil.h>
#import <SignalServiceKit/OWSBatchMessageProcessor.h> #import <SessionServiceKit/OWSBatchMessageProcessor.h>
#import <SignalServiceKit/OWSDisappearingConfigurationUpdateInfoMessage.h> #import <SessionServiceKit/OWSDisappearingConfigurationUpdateInfoMessage.h>
#import <SignalServiceKit/OWSDisappearingMessagesConfiguration.h> #import <SessionServiceKit/OWSDisappearingMessagesConfiguration.h>
#import <SignalServiceKit/OWSMessageUtils.h> #import <SessionServiceKit/OWSMessageUtils.h>
#import <SignalServiceKit/OWSPrimaryStorage+SessionStore.h> #import <SessionServiceKit/OWSPrimaryStorage+SessionStore.h>
#import <SignalServiceKit/OWSSyncGroupsRequestMessage.h> #import <SessionServiceKit/OWSSyncGroupsRequestMessage.h>
#import <SignalServiceKit/OWSVerificationStateChangeMessage.h> #import <SessionServiceKit/OWSVerificationStateChangeMessage.h>
#import <SignalServiceKit/TSIncomingMessage.h> #import <SessionServiceKit/TSIncomingMessage.h>
#import <SignalServiceKit/TSInvalidIdentityKeyReceivingErrorMessage.h> #import <SessionServiceKit/TSInvalidIdentityKeyReceivingErrorMessage.h>
#import <SignalServiceKit/TSOutgoingMessage.h> #import <SessionServiceKit/TSOutgoingMessage.h>
#import <SignalServiceKit/TSThread.h> #import <SessionServiceKit/TSThread.h>
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN

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

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

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

@ -6,11 +6,11 @@
#import <AFNetworking/AFHTTPSessionManager.h> #import <AFNetworking/AFHTTPSessionManager.h>
#import <AFNetworking/AFNetworking.h> #import <AFNetworking/AFNetworking.h>
#import <PromiseKit/AnyPromise.h> #import <PromiseKit/AnyPromise.h>
#import <SignalCoreKit/Randomness.h> #import <SessionCoreKit/Randomness.h>
#import <SignalServiceKit/MIMETypeUtil.h> #import <SessionServiceKit/MIMETypeUtil.h>
#import <SignalServiceKit/OWSFileSystem.h> #import <SessionServiceKit/OWSFileSystem.h>
#import <SignalServiceKit/SignalServiceKit-Swift.h> #import <SessionServiceKit/SignalServiceKit-Swift.h>
#import <SignalServiceKit/TSAttachment.h> #import <SessionServiceKit/TSAttachment.h>
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN

18
Signal/src/ViewControllers/DebugUI/DebugUIMisc.m
View File

@ -9,17 +9,17 @@
#import "OWSTableViewController.h" #import "OWSTableViewController.h"
#import "Session-Swift.h" #import "Session-Swift.h"
#import "ThreadUtil.h" #import "ThreadUtil.h"
#import <AxolotlKit/PreKeyBundle.h> #import <SessionAxolotlKit/PreKeyBundle.h>
#import <SignalMessaging/AttachmentSharing.h> #import <SignalMessaging/AttachmentSharing.h>
#import <SignalMessaging/Environment.h> #import <SignalMessaging/Environment.h>
#import <SignalServiceKit/OWSDisappearingConfigurationUpdateInfoMessage.h> #import <SessionServiceKit/OWSDisappearingConfigurationUpdateInfoMessage.h>
#import <SignalServiceKit/OWSDisappearingMessagesConfiguration.h> #import <SessionServiceKit/OWSDisappearingMessagesConfiguration.h>
#import <SignalServiceKit/OWSPrimaryStorage+SessionStore.h> #import <SessionServiceKit/OWSPrimaryStorage+SessionStore.h>
#import <SignalServiceKit/OWSVerificationStateChangeMessage.h> #import <SessionServiceKit/OWSVerificationStateChangeMessage.h>
#import <SignalServiceKit/TSCall.h> #import <SessionServiceKit/TSCall.h>
#import <SignalServiceKit/TSInvalidIdentityKeyReceivingErrorMessage.h> #import <SessionServiceKit/TSInvalidIdentityKeyReceivingErrorMessage.h>
#import <SignalServiceKit/TSThread.h> #import <SessionServiceKit/TSThread.h>
#import <SignalServiceKit/UIImage+OWS.h> #import <SessionServiceKit/UIImage+OWS.h>
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN

2
Signal/src/ViewControllers/DebugUI/DebugUINotifications.swift
View File

@ -3,7 +3,7 @@
// //
import Foundation import Foundation
import SignalServiceKit import SessionServiceKit
import SignalMessaging import SignalMessaging
import PromiseKit import PromiseKit

2
Signal/src/ViewControllers/DebugUI/DebugUIProfile.swift
View File

@ -3,7 +3,7 @@
// //
import Foundation import Foundation
import SignalServiceKit import SessionServiceKit
import SignalMessaging import SignalMessaging
class DebugUIProfile: DebugUIPage { class DebugUIProfile: DebugUIPage {

6
Signal/src/ViewControllers/DebugUI/DebugUISessionState.m
View File

@ -5,9 +5,9 @@
#import "DebugUISessionState.h" #import "DebugUISessionState.h"
#import "OWSTableViewController.h" #import "OWSTableViewController.h"
#import "Session-Swift.h" #import "Session-Swift.h"
#import <SignalServiceKit/OWSIdentityManager.h> #import <SessionServiceKit/OWSIdentityManager.h>
#import <SignalServiceKit/OWSPrimaryStorage+SessionStore.h> #import <SessionServiceKit/OWSPrimaryStorage+SessionStore.h>
#import <SignalServiceKit/TSContactThread.h> #import <SessionServiceKit/TSContactThread.h>
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN

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

@ -7,16 +7,16 @@
#import "OWSTableViewController.h" #import "OWSTableViewController.h"
#import "SignalApp.h" #import "SignalApp.h"
#import "ThreadUtil.h" #import "ThreadUtil.h"
#import <SignalCoreKit/Cryptography.h> #import <SessionCoreKit/Cryptography.h>
#import <SignalCoreKit/NSDate+OWS.h> #import <SessionCoreKit/NSDate+OWS.h>
#import <SignalCoreKit/Randomness.h> #import <SessionCoreKit/Randomness.h>
#import <SignalMessaging/Environment.h> #import <SignalMessaging/Environment.h>
#import <SignalServiceKit/OWSDynamicOutgoingMessage.h> #import <SessionServiceKit/OWSDynamicOutgoingMessage.h>
#import <SignalServiceKit/OWSPrimaryStorage.h> #import <SessionServiceKit/OWSPrimaryStorage.h>
#import <SignalServiceKit/SignalServiceKit-Swift.h> #import <SessionServiceKit/SignalServiceKit-Swift.h>
#import <SignalServiceKit/TSAccountManager.h> #import <SessionServiceKit/TSAccountManager.h>
#import <SignalServiceKit/TSGroupThread.h> #import <SessionServiceKit/TSGroupThread.h>
#import <SignalServiceKit/TSThread.h> #import <SessionServiceKit/TSThread.h>
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN

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

@ -7,26 +7,26 @@
#import "OWSTableViewController.h" #import "OWSTableViewController.h"
#import "Session-Swift.h" #import "Session-Swift.h"
#import "ThreadUtil.h" #import "ThreadUtil.h"
#import <AxolotlKit/PreKeyBundle.h> #import <SessionAxolotlKit/PreKeyBundle.h>
#import <PromiseKit/AnyPromise.h> #import <PromiseKit/AnyPromise.h>
#import <SignalCoreKit/Randomness.h> #import <SessionCoreKit/Randomness.h>
#import <SignalMessaging/Environment.h> #import <SignalMessaging/Environment.h>
#import <SignalServiceKit/OWSBatchMessageProcessor.h> #import <SessionServiceKit/OWSBatchMessageProcessor.h>
#import <SignalServiceKit/OWSBlockingManager.h> #import <SessionServiceKit/OWSBlockingManager.h>
#import <SignalServiceKit/OWSDisappearingConfigurationUpdateInfoMessage.h> #import <SessionServiceKit/OWSDisappearingConfigurationUpdateInfoMessage.h>
#import <SignalServiceKit/OWSDisappearingMessagesConfiguration.h> #import <SessionServiceKit/OWSDisappearingMessagesConfiguration.h>
#import <SignalServiceKit/OWSPrimaryStorage+SessionStore.h> #import <SessionServiceKit/OWSPrimaryStorage+SessionStore.h>
#import <SignalServiceKit/OWSPrimaryStorage.h> #import <SessionServiceKit/OWSPrimaryStorage.h>
#import <SignalServiceKit/OWSReadReceiptManager.h> #import <SessionServiceKit/OWSReadReceiptManager.h>
#import <SignalServiceKit/OWSSyncGroupsMessage.h> #import <SessionServiceKit/OWSSyncGroupsMessage.h>
#import <SignalServiceKit/OWSSyncGroupsRequestMessage.h> #import <SessionServiceKit/OWSSyncGroupsRequestMessage.h>
#import <SignalServiceKit/OWSVerificationStateChangeMessage.h> #import <SessionServiceKit/OWSVerificationStateChangeMessage.h>
#import <SignalServiceKit/SignalServiceKit-Swift.h> #import <SessionServiceKit/SignalServiceKit-Swift.h>
#import <SignalServiceKit/TSCall.h> #import <SessionServiceKit/TSCall.h>
#import <SignalServiceKit/TSDatabaseView.h> #import <SessionServiceKit/TSDatabaseView.h>
#import <SignalServiceKit/TSIncomingMessage.h> #import <SessionServiceKit/TSIncomingMessage.h>
#import <SignalServiceKit/TSInvalidIdentityKeyReceivingErrorMessage.h> #import <SessionServiceKit/TSInvalidIdentityKeyReceivingErrorMessage.h>
#import <SignalServiceKit/TSThread.h> #import <SessionServiceKit/TSThread.h>
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN

4
Signal/src/ViewControllers/DebugUI/DebugUITableViewController.m
View File

@ -12,8 +12,8 @@
#import "DebugUIStress.h" #import "DebugUIStress.h"
#import "DebugUISyncMessages.h" #import "DebugUISyncMessages.h"
#import "Session-Swift.h" #import "Session-Swift.h"
#import <SignalServiceKit/TSContactThread.h> #import <SessionServiceKit/TSContactThread.h>
#import <SignalServiceKit/TSThread.h> #import <SessionServiceKit/TSThread.h>
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN

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

@ -4,7 +4,7 @@
import Foundation import Foundation
import PromiseKit import PromiseKit
import SignalServiceKit import SessionServiceKit
import SignalMessaging import SignalMessaging
import YYImage import YYImage

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

@ -3,7 +3,7 @@
// //
import Foundation import Foundation
import SignalServiceKit import SessionServiceKit
import Reachability import Reachability
import SignalMessaging import SignalMessaging
import PromiseKit import PromiseKit

8
Signal/src/ViewControllers/HomeView/HomeViewCell.m
View File

@ -8,10 +8,10 @@
#import <SignalMessaging/OWSFormat.h> #import <SignalMessaging/OWSFormat.h>
#import <SignalMessaging/OWSUserProfile.h> #import <SignalMessaging/OWSUserProfile.h>
#import <SignalMessaging/SignalMessaging-Swift.h> #import <SignalMessaging/SignalMessaging-Swift.h>
#import <SignalServiceKit/OWSMath.h> #import <SessionServiceKit/OWSMath.h>
#import <SignalServiceKit/OWSMessageManager.h> #import <SessionServiceKit/OWSMessageManager.h>
#import <SignalServiceKit/TSContactThread.h> #import <SessionServiceKit/TSContactThread.h>
#import <SignalServiceKit/TSGroupThread.h> #import <SessionServiceKit/TSGroupThread.h>
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN

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

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

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

@ -6,7 +6,7 @@ import Foundation
import Social import Social
import ContactsUI import ContactsUI
import MessageUI import MessageUI
import SignalServiceKit import SessionServiceKit
@objc(OWSInviteFlow) @objc(OWSInviteFlow)
class InviteFlow: NSObject, MFMessageComposeViewControllerDelegate, MFMailComposeViewControllerDelegate, ContactsPickerDelegate { class InviteFlow: NSObject, MFMessageComposeViewControllerDelegate, MFMailComposeViewControllerDelegate, ContactsPickerDelegate {

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

@ -3,7 +3,7 @@
// //
import Foundation import Foundation
import SignalServiceKit import SessionServiceKit
import SignalMessaging import SignalMessaging
@objc @objc

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

@ -17,7 +17,7 @@
#import <MediaPlayer/MPMoviePlayerViewController.h> #import <MediaPlayer/MPMoviePlayerViewController.h>
#import <MediaPlayer/MediaPlayer.h> #import <MediaPlayer/MediaPlayer.h>
#import <SignalMessaging/SignalMessaging-Swift.h> #import <SignalMessaging/SignalMessaging-Swift.h>
#import <SignalServiceKit/NSData+Image.h> #import <SessionServiceKit/NSData+Image.h>
#import <YYImage/YYImage.h> #import <YYImage/YYImage.h>
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN

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

@ -3,7 +3,7 @@
// //
import Foundation import Foundation
import SignalServiceKit import SessionServiceKit
import SignalMessaging import SignalMessaging
@objc @objc

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

@ -15,11 +15,11 @@
#import <MessageUI/MessageUI.h> #import <MessageUI/MessageUI.h>
#import <SignalMessaging/Environment.h> #import <SignalMessaging/Environment.h>
#import <SignalMessaging/UIUtil.h> #import <SignalMessaging/UIUtil.h>
#import <SignalServiceKit/AppVersion.h> #import <SessionServiceKit/AppVersion.h>
#import <SignalServiceKit/PhoneNumberUtil.h> #import <SessionServiceKit/PhoneNumberUtil.h>
#import <SignalServiceKit/SignalAccount.h> #import <SessionServiceKit/SignalAccount.h>
#import <SignalServiceKit/SignalServiceKit-Swift.h> #import <SessionServiceKit/SignalServiceKit-Swift.h>
#import <SignalServiceKit/TSAccountManager.h> #import <SessionServiceKit/TSAccountManager.h>
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN

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

@ -8,8 +8,8 @@
#import "OWSNavigationController.h" #import "OWSNavigationController.h"
#import "Session-Swift.h" #import "Session-Swift.h"
#import "SignalApp.h" #import "SignalApp.h"
#import <SignalCoreKit/NSDate+OWS.h> #import <SessionCoreKit/NSDate+OWS.h>
#import <SignalCoreKit/Randomness.h> #import <SessionCoreKit/Randomness.h>
#import <SignalMessaging/BlockListUIUtils.h> #import <SignalMessaging/BlockListUIUtils.h>
#import <SignalMessaging/ContactTableViewCell.h> #import <SignalMessaging/ContactTableViewCell.h>
#import <SignalMessaging/ContactsViewHelper.h> #import <SignalMessaging/ContactsViewHelper.h>
@ -20,12 +20,12 @@
#import <SignalMessaging/UIUtil.h> #import <SignalMessaging/UIUtil.h>
#import <SignalMessaging/UIView+OWS.h> #import <SignalMessaging/UIView+OWS.h>
#import <SignalMessaging/UIViewController+OWS.h> #import <SignalMessaging/UIViewController+OWS.h>
#import <SignalServiceKit/NSString+SSK.h> #import <SessionServiceKit/NSString+SSK.h>
#import <SignalServiceKit/OWSMessageSender.h> #import <SessionServiceKit/OWSMessageSender.h>
#import <SignalServiceKit/SignalAccount.h> #import <SessionServiceKit/SignalAccount.h>
#import <SignalServiceKit/TSGroupModel.h> #import <SessionServiceKit/TSGroupModel.h>
#import <SignalServiceKit/TSGroupThread.h> #import <SessionServiceKit/TSGroupThread.h>
#import <SignalServiceKit/TSOutgoingMessage.h> #import <SessionServiceKit/TSOutgoingMessage.h>
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN

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

@ -11,8 +11,8 @@
#import <SignalMessaging/UIColor+OWS.h> #import <SignalMessaging/UIColor+OWS.h>
#import <SignalMessaging/UIFont+OWS.h> #import <SignalMessaging/UIFont+OWS.h>
#import <SignalMessaging/UIView+OWS.h> #import <SignalMessaging/UIView+OWS.h>
#import <SignalServiceKit/NSString+SSK.h> #import <SessionServiceKit/NSString+SSK.h>
#import <SignalServiceKit/OWS2FAManager.h> #import <SessionServiceKit/OWS2FAManager.h>
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN

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

@ -12,14 +12,14 @@
#import "UIColor+OWS.h" #import "UIColor+OWS.h"
#import "UIFont+OWS.h" #import "UIFont+OWS.h"
#import "UIView+OWS.h" #import "UIView+OWS.h"
#import <SignalCoreKit/NSDate+OWS.h> #import <SessionCoreKit/NSDate+OWS.h>
#import <SignalMessaging/OWSNavigationController.h> #import <SignalMessaging/OWSNavigationController.h>
#import <SignalMessaging/OWSProfileManager.h> #import <SignalMessaging/OWSProfileManager.h>
#import <SignalMessaging/SignalMessaging-Swift.h> #import <SignalMessaging/SignalMessaging-Swift.h>
#import <SignalMessaging/UIUtil.h> #import <SignalMessaging/UIUtil.h>
#import <SignalMessaging/UIViewController+OWS.h> #import <SignalMessaging/UIViewController+OWS.h>
#import <SignalServiceKit/NSString+SSK.h> #import <SessionServiceKit/NSString+SSK.h>
#import <SignalServiceKit/OWSPrimaryStorage.h> #import <SessionServiceKit/OWSPrimaryStorage.h>
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN

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

@ -3,7 +3,7 @@
// //
import Foundation import Foundation
import SignalServiceKit import SessionServiceKit
@objc @objc
public class SafetyNumberConfirmationAlert: NSObject { public class SafetyNumberConfirmationAlert: NSObject {

6
Signal/src/ViewControllers/SignalsNavigationController.m
View File

@ -5,9 +5,9 @@
#import "SignalsNavigationController.h" #import "SignalsNavigationController.h"
#import "Session-Swift.h" #import "Session-Swift.h"
#import <SignalMessaging/UIUtil.h> #import <SignalMessaging/UIUtil.h>
#import <SignalServiceKit/NSTimer+OWS.h> #import <SessionServiceKit/NSTimer+OWS.h>
#import <SignalServiceKit/OWSSignalService.h> #import <SessionServiceKit/OWSSignalService.h>
#import <SignalServiceKit/TSSocketManager.h> #import <SessionServiceKit/TSSocketManager.h>
static double const STALLED_PROGRESS = 0.9; static double const STALLED_PROGRESS = 0.9;

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

@ -7,7 +7,7 @@
#import "ContactsViewHelper.h" #import "ContactsViewHelper.h"
#import "Session-Swift.h" #import "Session-Swift.h"
#import <SignalMessaging/OWSContactsManager.h> #import <SignalMessaging/OWSContactsManager.h>
#import <SignalServiceKit/SignalAccount.h> #import <SessionServiceKit/SignalAccount.h>
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN

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

@ -9,17 +9,17 @@
#import "UIColor+OWS.h" #import "UIColor+OWS.h"
#import "UIFont+OWS.h" #import "UIFont+OWS.h"
#import "UIView+OWS.h" #import "UIView+OWS.h"
#import <SignalCoreKit/NSDate+OWS.h> #import <SessionCoreKit/NSDate+OWS.h>
#import <SignalMessaging/Environment.h> #import <SignalMessaging/Environment.h>
#import <SignalMessaging/OWSContactsManager.h> #import <SignalMessaging/OWSContactsManager.h>
#import <SignalMessaging/UIUtil.h> #import <SignalMessaging/UIUtil.h>
#import <SignalServiceKit/OWSError.h> #import <SessionServiceKit/OWSError.h>
#import <SignalServiceKit/OWSFingerprint.h> #import <SessionServiceKit/OWSFingerprint.h>
#import <SignalServiceKit/OWSFingerprintBuilder.h> #import <SessionServiceKit/OWSFingerprintBuilder.h>
#import <SignalServiceKit/OWSIdentityManager.h> #import <SessionServiceKit/OWSIdentityManager.h>
#import <SignalServiceKit/OWSPrimaryStorage+SessionStore.h> #import <SessionServiceKit/OWSPrimaryStorage+SessionStore.h>
#import <SignalServiceKit/TSAccountManager.h> #import <SessionServiceKit/TSAccountManager.h>
#import <SignalServiceKit/TSInfoMessage.h> #import <SessionServiceKit/TSInfoMessage.h>
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN

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

@ -12,10 +12,10 @@
#import <SignalMessaging/Environment.h> #import <SignalMessaging/Environment.h>
#import <SignalMessaging/OWSContactsManager.h> #import <SignalMessaging/OWSContactsManager.h>
#import <SignalMessaging/UIUtil.h> #import <SignalMessaging/UIUtil.h>
#import <SignalServiceKit/OWSError.h> #import <SessionServiceKit/OWSError.h>
#import <SignalServiceKit/OWSFingerprint.h> #import <SessionServiceKit/OWSFingerprint.h>
#import <SignalServiceKit/OWSFingerprintBuilder.h> #import <SessionServiceKit/OWSFingerprintBuilder.h>
#import <SignalServiceKit/OWSIdentityManager.h> #import <SessionServiceKit/OWSIdentityManager.h>
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN

18
Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m
View File

@ -15,8 +15,8 @@
#import "UIFont+OWS.h" #import "UIFont+OWS.h"
#import "UIView+OWS.h" #import "UIView+OWS.h"
#import "UpdateGroupViewController.h" #import "UpdateGroupViewController.h"
#import <Curve25519Kit/Curve25519.h> #import <SessionCurve25519Kit/Curve25519.h>
#import <SignalCoreKit/NSDate+OWS.h> #import <SessionCoreKit/NSDate+OWS.h>
#import <SignalMessaging/Environment.h> #import <SignalMessaging/Environment.h>
#import <SignalMessaging/OWSAvatarBuilder.h> #import <SignalMessaging/OWSAvatarBuilder.h>
#import <SignalMessaging/OWSContactsManager.h> #import <SignalMessaging/OWSContactsManager.h>
@ -25,13 +25,13 @@
#import <SignalMessaging/OWSUserProfile.h> #import <SignalMessaging/OWSUserProfile.h>
#import <SignalMessaging/SignalMessaging-Swift.h> #import <SignalMessaging/SignalMessaging-Swift.h>
#import <SignalMessaging/UIUtil.h> #import <SignalMessaging/UIUtil.h>
#import <SignalServiceKit/OWSDisappearingConfigurationUpdateInfoMessage.h> #import <SessionServiceKit/OWSDisappearingConfigurationUpdateInfoMessage.h>
#import <SignalServiceKit/OWSDisappearingMessagesConfiguration.h> #import <SessionServiceKit/OWSDisappearingMessagesConfiguration.h>
#import <SignalServiceKit/OWSMessageSender.h> #import <SessionServiceKit/OWSMessageSender.h>
#import <SignalServiceKit/OWSPrimaryStorage.h> #import <SessionServiceKit/OWSPrimaryStorage.h>
#import <SignalServiceKit/TSGroupThread.h> #import <SessionServiceKit/TSGroupThread.h>
#import <SignalServiceKit/TSOutgoingMessage.h> #import <SessionServiceKit/TSOutgoingMessage.h>
#import <SignalServiceKit/TSThread.h> #import <SessionServiceKit/TSThread.h>
@import ContactsUI; @import ContactsUI;

8
Signal/src/ViewControllers/ThreadSettings/ShowGroupMembersViewController.m
View File

@ -12,10 +12,10 @@
#import <SignalMessaging/Environment.h> #import <SignalMessaging/Environment.h>
#import <SignalMessaging/OWSContactsManager.h> #import <SignalMessaging/OWSContactsManager.h>
#import <SignalMessaging/UIUtil.h> #import <SignalMessaging/UIUtil.h>
#import <SignalServiceKit/OWSBlockingManager.h> #import <SessionServiceKit/OWSBlockingManager.h>
#import <SignalServiceKit/SignalAccount.h> #import <SessionServiceKit/SignalAccount.h>
#import <SignalServiceKit/TSGroupModel.h> #import <SessionServiceKit/TSGroupModel.h>
#import <SignalServiceKit/TSGroupThread.h> #import <SessionServiceKit/TSGroupThread.h>
@import ContactsUI; @import ContactsUI;

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

@ -8,7 +8,7 @@
#import "OWSNavigationController.h" #import "OWSNavigationController.h"
#import "Session-Swift.h" #import "Session-Swift.h"
#import "ViewControllerUtils.h" #import "ViewControllerUtils.h"
#import <SignalCoreKit/NSDate+OWS.h> #import <SessionCoreKit/NSDate+OWS.h>
#import <SignalMessaging/BlockListUIUtils.h> #import <SignalMessaging/BlockListUIUtils.h>
#import <SignalMessaging/ContactTableViewCell.h> #import <SignalMessaging/ContactTableViewCell.h>
#import <SignalMessaging/ContactsViewHelper.h> #import <SignalMessaging/ContactsViewHelper.h>
@ -19,12 +19,12 @@
#import <SignalMessaging/UIUtil.h> #import <SignalMessaging/UIUtil.h>
#import <SignalMessaging/UIView+OWS.h> #import <SignalMessaging/UIView+OWS.h>
#import <SignalMessaging/UIViewController+OWS.h> #import <SignalMessaging/UIViewController+OWS.h>
#import <SignalServiceKit/NSString+SSK.h> #import <SessionServiceKit/NSString+SSK.h>
#import <SignalServiceKit/OWSMessageSender.h> #import <SessionServiceKit/OWSMessageSender.h>
#import <SignalServiceKit/SignalAccount.h> #import <SessionServiceKit/SignalAccount.h>
#import <SignalServiceKit/TSGroupModel.h> #import <SessionServiceKit/TSGroupModel.h>
#import <SignalServiceKit/TSGroupThread.h> #import <SessionServiceKit/TSGroupThread.h>
#import <SignalServiceKit/TSOutgoingMessage.h> #import <SessionServiceKit/TSOutgoingMessage.h>
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN

2
Signal/src/ViewControllers/Utils/MessageRecipientStatusUtils.swift
View File

@ -3,7 +3,7 @@
// //
import Foundation import Foundation
import SignalServiceKit import SessionServiceKit
import SignalMessaging import SignalMessaging
@objc public enum MessageReceiptStatus: Int { @objc public enum MessageReceiptStatus: Int {

2
Signal/src/call/CallAudioService.swift
View File

@ -4,7 +4,7 @@
// //
//import Foundation //import Foundation
//import AVFoundation //import AVFoundation
//import SignalServiceKit //import SessionServiceKit
//import SignalMessaging //import SignalMessaging
// //
//struct AudioSource: Hashable { //struct AudioSource: Hashable {

2
Signal/src/call/CallService.swift
View File

@ -5,7 +5,7 @@
//import Foundation //import Foundation
//import PromiseKit //import PromiseKit
//import WebRTC //import WebRTC
//import SignalServiceKit //import SessionServiceKit
//import SignalMessaging //import SignalMessaging
// //
///** ///**

2
Signal/src/call/NonCallKitCallUIAdaptee.swift
View File

@ -3,7 +3,7 @@
//// ////
// //
//import Foundation //import Foundation
//import SignalServiceKit //import SessionServiceKit
//import SignalMessaging //import SignalMessaging
// //
///** ///**

2
Signal/src/call/OutboundCallInitiator.swift
View File

@ -3,7 +3,7 @@
//// ////
// //
//import Foundation //import Foundation
//import SignalServiceKit //import SessionServiceKit
//import SignalMessaging //import SignalMessaging
// //
///** ///**

2
Signal/src/call/PeerConnectionClient.swift
View File

@ -5,7 +5,7 @@
//import Foundation //import Foundation
//import PromiseKit //import PromiseKit
//import WebRTC //import WebRTC
//import SignalServiceKit //import SessionServiceKit
//import SignalMessaging //import SignalMessaging
// //
//// HACK - Seeing crazy SEGFAULTs on iOS9 when accessing these objc externs. //// HACK - Seeing crazy SEGFAULTs on iOS9 when accessing these objc externs.

2
Signal/src/call/SignalCall.swift
View File

@ -3,7 +3,7 @@
//// ////
// //
//import Foundation //import Foundation
//import SignalServiceKit //import SessionServiceKit
// //
//public enum CallState: String { //public enum CallState: String {
// case idle // case idle

2
Signal/src/call/Speakerbox/CallKitCallManager.swift
View File

@ -4,7 +4,7 @@
// //
//import UIKit //import UIKit
//import CallKit //import CallKit
//import SignalServiceKit //import SessionServiceKit
// //
///** ///**
// * Requests actions from CallKit // * Requests actions from CallKit

2
Signal/src/call/Speakerbox/CallKitCallUIAdaptee.swift
View File

@ -6,7 +6,7 @@
//import UIKit //import UIKit
//import CallKit //import CallKit
//import AVFoundation //import AVFoundation
//import SignalServiceKit //import SessionServiceKit
//import SignalMessaging //import SignalMessaging
// //
///** ///**

2
Signal/src/call/UserInterface/CallUIAdapter.swift
View File

@ -5,7 +5,7 @@
//import Foundation //import Foundation
//import PromiseKit //import PromiseKit
//import CallKit //import CallKit
//import SignalServiceKit //import SessionServiceKit
//import SignalMessaging //import SignalMessaging
//import WebRTC //import WebRTC
// //

2
Signal/src/call/WebRTCCallMessageHandler.swift
View File

@ -3,7 +3,7 @@
// //
import Foundation import Foundation
import SignalServiceKit import SessionServiceKit
import SignalMessaging import SignalMessaging
@objc(OWSWebRTCCallMessageHandler) @objc(OWSWebRTCCallMessageHandler)

2
Signal/src/environment/AppEnvironment.swift
View File

@ -3,7 +3,7 @@
// //
import Foundation import Foundation
import SignalServiceKit import SessionServiceKit
import SignalMessaging import SignalMessaging
@objc public class AppEnvironment: NSObject { @objc public class AppEnvironment: NSObject {

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

@ -3,7 +3,7 @@
// //
import Foundation import Foundation
import SignalServiceKit import SessionServiceKit
import SignalMessaging import SignalMessaging
@objc public class ExperienceUpgrade: TSYapDatabaseObject { @objc public class ExperienceUpgrade: TSYapDatabaseObject {

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

@ -3,7 +3,7 @@
// //
import Foundation import Foundation
import SignalServiceKit import SessionServiceKit
enum ExperienceUpgradeId: String { enum ExperienceUpgradeId: String {
case videoCalling = "001", case videoCalling = "001",

2
Signal/src/environment/PushRegistrationManager.swift
View File

@ -5,7 +5,7 @@
import Foundation import Foundation
import PromiseKit import PromiseKit
import PushKit import PushKit
import SignalServiceKit import SessionServiceKit
import SignalMessaging import SignalMessaging
public enum PushRegistrationError: Error { public enum PushRegistrationError: Error {

8
Signal/src/environment/SignalApp.m
View File

@ -7,12 +7,12 @@
#import "ConversationViewController.h" #import "ConversationViewController.h"
#import "Session-Swift.h" #import "Session-Swift.h"
#import "SignalsNavigationController.h" #import "SignalsNavigationController.h"
#import <SignalCoreKit/Threading.h> #import <SessionCoreKit/Threading.h>
#import <SignalMessaging/DebugLogger.h> #import <SignalMessaging/DebugLogger.h>
#import <SignalMessaging/Environment.h> #import <SignalMessaging/Environment.h>
#import <SignalServiceKit/OWSPrimaryStorage.h> #import <SessionServiceKit/OWSPrimaryStorage.h>
#import <SignalServiceKit/TSContactThread.h> #import <SessionServiceKit/TSContactThread.h>
#import <SignalServiceKit/TSGroupThread.h> #import <SessionServiceKit/TSGroupThread.h>
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN

2
Signal/src/network/GiphyDownloader.swift
View File

@ -3,7 +3,7 @@
// //
import Foundation import Foundation
import SignalServiceKit import SessionServiceKit
@objc @objc
public class GiphyDownloader: ProxiedContentDownloader { public class GiphyDownloader: ProxiedContentDownloader {

6
Signal/src/util/Backup/OWSBackup.m
View File

@ -8,9 +8,9 @@
#import "OWSBackupImportJob.h" #import "OWSBackupImportJob.h"
#import "Session-Swift.h" #import "Session-Swift.h"
#import <PromiseKit/AnyPromise.h> #import <PromiseKit/AnyPromise.h>
#import <SignalCoreKit/Randomness.h> #import <SessionCoreKit/Randomness.h>
#import <SignalServiceKit/OWSIdentityManager.h> #import <SessionServiceKit/OWSIdentityManager.h>
#import <SignalServiceKit/YapDatabaseConnection+OWS.h> #import <SessionServiceKit/YapDatabaseConnection+OWS.h>
@import CloudKit; @import CloudKit;

2
Signal/src/util/Backup/OWSBackupAPI.swift
View File

@ -3,7 +3,7 @@
// //
import Foundation import Foundation
import SignalServiceKit import SessionServiceKit
import CloudKit import CloudKit
import PromiseKit import PromiseKit

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