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

Merge pull request #204 from loki-project/building-from-source

Browse source 
Fix Dependency Management
This commit is contained in:
Niels Andriesse 2020-06-05 16:12:18 +10:00 committed by GitHub
parent 2e4d0102b9 48d4b87c96
commit 1afb1a52dc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
387 changed files with 1285 additions and 1306 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
SignalServiceKit/src/Loki/Protocol/Friend Requests/FriendRequestProtocolTests.swift → Loki/FriendRequestProtocolTests.swift
View file

0
SignalServiceKit/src/Loki/Utilities/LokiTestUtilities.swift → Loki/LokiTestUtilities.swift
View file

0
SignalServiceKit/src/Loki/Protocol/Multi Device/MultiDeviceProtocolTests.swift → Loki/MultiDeviceProtocolTests.swift
View file

0
SignalServiceKit/src/Loki/API/Onion Requests/OnionRequestAPITests.swift → Loki/OnionRequestAPITests.swift
View file

0
SignalServiceKit/src/Loki/Protocol/Session Management/SessionManagementProtocolTests.swift → Loki/SessionManagementProtocolTests.swift
View file

0
SignalServiceKit/src/Loki/Protocol/Sync Messages/SyncMessagesProtocolTests.swift → Loki/SyncMessagesProtocolTests.swift
View file

0
SignalServiceKit/src/Loki/Utilities/XCTest+Utilities.swift → Loki/XCTest+Utilities.swift
View file

2
LokiPushNotificationService/NotificationServiceExtension.swift
View file

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

2
LokiPushNotificationService/NotificationServiceExtensionContext.swift
View file

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

20
Podfile
View file

@ -10,24 +10,22 @@ def shared_pods
# OWS Pods
###
pod 'SignalCoreKit', git: 'https://github.com/signalapp/SignalCoreKit.git', testspecs: ["Tests"]
pod 'SessionCoreKit', git: 'https://github.com/loki-project/session-ios-core-kit.git', testspecs: ["Tests"] # Fork of SignalCoreKit
# pod 'SignalCoreKit', path: '../SignalCoreKit', testspecs: ["Tests"]
pod 'AxolotlKit', git: 'https://github.com/signalapp/SignalProtocolKit.git', branch: 'master', testspecs: ["Tests"]
pod 'SessionAxolotlKit', git: 'https://github.com/loki-project/session-ios-protocol-kit.git', branch: 'master', testspecs: ["Tests"] # Fork of AxolotlKit
# pod 'AxolotlKit', path: '../SignalProtocolKit', testspecs: ["Tests"]
pod 'HKDFKit', git: 'https://github.com/signalapp/HKDFKit.git', testspecs: ["Tests"]
pod 'SessionHKDFKit', git: 'https://github.com/nielsandriesse/session-ios-hkdf-kit.git', testspecs: ["Tests"] # Fork of HKDFKit
# pod 'HKDFKit', path: '../HKDFKit', testspecs: ["Tests"]
pod 'Curve25519Kit', git: 'https://github.com/signalapp/Curve25519Kit', testspecs: ["Tests"]
pod 'SessionCurve25519Kit', git: 'https://github.com/loki-project/session-ios-curve-25519-kit', testspecs: ["Tests"] # Fork of Curve25519Kit
# pod 'Curve25519Kit', path: '../Curve25519Kit', testspecs: ["Tests"]
# Don't update SignalMetadataKit. There's some Loki specific stuff in there that gets overwritten otherwise.
# FIXME: We should fork this, make it work with Cocoapods, and keep it up to date with Signal's repo.
# pod 'SignalMetadataKit', git: 'https://github.com/signalapp/SignalMetadataKit', testspecs: ["Tests"]
pod 'SessionMetadataKit', git: 'https://github.com/loki-project/session-ios-metadata-kit', testspecs: ["Tests"] # Fork of SignalMetadataKit
# pod 'SignalMetadataKit', path: '../SignalMetadataKit', testspecs: ["Tests"]
pod 'SignalServiceKit', path: '.', testspecs: ["Tests"] # TODO: Signal moved this into the main repo. We should probably do the same eventually.
pod 'SessionServiceKit', path: '.', testspecs: ["Tests"]
# Project does not compile with PromiseKit 6.7.1
# see: https://github.com/mxcl/PromiseKit/issues/990
@ -60,8 +58,8 @@ def shared_pods
# third party pods
###
pod 'AFNetworking', inhibit_warnings: true
pod 'PureLayout', :inhibit_warnings => true
pod 'AFNetworking', '~> 3.2.1', inhibit_warnings: true
pod 'PureLayout', '~> 3.1.4', :inhibit_warnings => true
pod 'Reachability', :inhibit_warnings => true
pod 'YYImage', :inhibit_warnings => true
end
@ -75,7 +73,7 @@ target 'Signal' do
# Loki third party pods
###
pod 'GCDWebServer', '~> 3.0', :inhibit_warnings => true # TODO: We can probably ditch this as we're not doing P2P anymore
pod 'GCDWebServer', '~> 3.5.2', :inhibit_warnings => true # TODO: We can probably ditch this as we're not doing P2P anymore
pod 'FeedKit', '~> 8.1', :inhibit_warnings => true
pod 'CryptoSwift', '~> 1.0', :inhibit_warnings => true
pod 'NVActivityIndicatorView', '~> 4.7', :inhibit_warnings => true

282
Podfile.lock
View file

@ -14,55 +14,22 @@ PODS:
- AFNetworking/Serialization (3.2.1)
- AFNetworking/UIKit (3.2.1):
- AFNetworking/NSURLSession
- AxolotlKit (0.9.0):
- CocoaLumberjack
- Curve25519Kit (~> 2.1.0)
- 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)
- Curve25519Kit (2.1.0):
- CocoaLumberjack
- SignalCoreKit
- Curve25519Kit/Tests (2.1.0):
- CocoaLumberjack
- SignalCoreKit
- Fabric (1.10.1)
- CocoaLumberjack (3.6.1):
- CocoaLumberjack/Core (= 3.6.1)
- CocoaLumberjack/Core (3.6.1)
- CryptoSwift (1.3.1)
- FeedKit (8.1.1)
- FirebaseCore (6.0.2):
- GoogleUtilities/Environment (~> 6.0)
- GoogleUtilities/Logger (~> 6.0)
- GCDWebServer (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
- GCDWebServer (3.5.4):
- GCDWebServer/Core (= 3.5.4)
- GCDWebServer/Core (3.5.4)
- GRKOpenSSLFramework (1.0.2.12)
- HKDFKit (0.0.4):
- CocoaLumberjack
- SignalCoreKit
- HKDFKit/Tests (0.0.4):
- CocoaLumberjack
- SignalCoreKit
- libPhoneNumber-iOS (0.9.13)
- libPhoneNumber-iOS (0.9.15)
- Mantle (2.1.0):
- Mantle/extobjc (= 2.1.0)
- Mantle/extobjc (2.1.0)
- NVActivityIndicatorView (4.7.0):
- NVActivityIndicatorView/Presenter (= 4.7.0)
- NVActivityIndicatorView/Presenter (4.7.0)
- NVActivityIndicatorView (4.8.0):
- NVActivityIndicatorView/Presenter (= 4.8.0)
- NVActivityIndicatorView/Presenter (4.8.0)
- PromiseKit (6.5.3):
- PromiseKit/CorePromise (= 6.5.3)
- PromiseKit/Foundation (= 6.5.3)
@ -72,69 +39,95 @@ PODS:
- PromiseKit/CorePromise
- PromiseKit/UIKit (6.5.3):
- PromiseKit/CorePromise
- PureLayout (3.1.4)
- PureLayout (3.1.6)
- Reachability (3.2)
- SAMKeychain (1.5.3)
- SignalCoreKit (1.0.0):
- SessionAxolotlKit (1.0.2):
- CocoaLumberjack
- SessionCoreKit (~> 1.0.0)
- SessionCurve25519Kit (~> 2.1.2)
- SessionHKDFKit (~> 0.0.5)
- SwiftProtobuf (~> 1.5.0)
- SessionAxolotlKit/Tests (1.0.2):
- CocoaLumberjack
- SessionCoreKit (~> 1.0.0)
- SessionCurve25519Kit (~> 2.1.2)
- SessionHKDFKit (~> 0.0.5)
- SwiftProtobuf (~> 1.5.0)
- SessionCoreKit (1.0.0):
- CocoaLumberjack
- GRKOpenSSLFramework
- SignalCoreKit/Tests (1.0.0):
- SessionCoreKit/Tests (1.0.0):
- CocoaLumberjack
- GRKOpenSSLFramework
- SignalMetadataKit (1.0.0):
- AxolotlKit
- SessionCurve25519Kit (2.1.2):
- CocoaLumberjack
- Curve25519Kit
- HKDFKit
- SignalCoreKit
- SwiftProtobuf
- SignalMetadataKit/Tests (1.0.0):
- AxolotlKit
- SessionCoreKit (~> 1.0.0)
- SessionCurve25519Kit/Tests (2.1.2):
- CocoaLumberjack
- Curve25519Kit
- HKDFKit
- SignalCoreKit
- SwiftProtobuf
- SignalServiceKit (0.9.0):
- SessionCoreKit (~> 1.0.0)
- SessionHKDFKit (0.0.5):
- CocoaLumberjack
- SessionCoreKit
- SessionHKDFKit/Tests (0.0.5):
- CocoaLumberjack
- SessionCoreKit
- SessionMetadataKit (1.0.1):
- CocoaLumberjack
- CryptoSwift (~> 1.0)
- SessionAxolotlKit (~> 1.0.2)
- SessionCoreKit (~> 1.0.0)
- SessionCurve25519Kit (~> 2.1.2)
- SessionHKDFKit (~> 0.0.5)
- SwiftProtobuf (~> 1.5.0)
- SessionMetadataKit/Tests (1.0.1):
- CocoaLumberjack
- CryptoSwift (~> 1.0)
- SessionAxolotlKit (~> 1.0.2)
- SessionCoreKit (~> 1.0.0)
- SessionCurve25519Kit (~> 2.1.2)
- SessionHKDFKit (~> 0.0.5)
- SwiftProtobuf (~> 1.5.0)
- SessionServiceKit (1.0.0):
- AFNetworking
- AxolotlKit
- CocoaLumberjack
- CryptoSwift
- Curve25519Kit
- CryptoSwift (~> 1.0)
- GRKOpenSSLFramework
- libPhoneNumber-iOS
- Mantle
- PromiseKit (~> 6.0)
- Reachability
- SAMKeychain
- SignalCoreKit
- SignalMetadataKit
- SessionAxolotlKit (~> 1.0.2)
- SessionCoreKit (~> 1.0.0)
- SessionCurve25519Kit (~> 2.1.2)
- SessionMetadataKit (~> 1.0.1)
- Starscream
- SwiftProtobuf
- SwiftProtobuf (~> 1.5.0)
- YapDatabase/SQLCipher
- SignalServiceKit/Tests (0.9.0):
- SessionServiceKit/Tests (1.0.0):
- AFNetworking
- AxolotlKit
- CocoaLumberjack
- CryptoSwift
- Curve25519Kit
- CryptoSwift (~> 1.0)
- GRKOpenSSLFramework
- libPhoneNumber-iOS
- Mantle
- PromiseKit (~> 6.0)
- Reachability
- SAMKeychain
- SignalCoreKit
- SignalMetadataKit
- SessionAxolotlKit (~> 1.0.2)
- SessionCoreKit (~> 1.0.0)
- SessionCurve25519Kit (~> 2.1.2)
- SessionMetadataKit (~> 1.0.1)
- Starscream
- SwiftProtobuf
- SwiftProtobuf (~> 1.5.0)
- YapDatabase/SQLCipher
- SQLCipher (4.1.0):
- SQLCipher/standard (= 4.1.0)
- SQLCipher/common (4.1.0)
- SQLCipher/standard (4.1.0):
- SQLCipher (4.4.0):
- SQLCipher/standard (= 4.4.0)
- SQLCipher/common (4.4.0)
- SQLCipher/standard (4.4.0):
- SQLCipher/common
- SSZipArchive (2.2.1)
- SSZipArchive (2.2.3)
- Starscream (3.0.6)
- SwiftProtobuf (1.5.0)
- YapDatabase/SQLCipher (3.1.1):
@ -204,31 +197,28 @@ PODS:
- YYImage/Core (1.0.4)
DEPENDENCIES:
- 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)
- AFNetworking (~> 3.2.1)
- CryptoSwift (~> 1.0)
- Curve25519Kit (from `https://github.com/signalapp/Curve25519Kit`)
- Curve25519Kit/Tests (from `https://github.com/signalapp/Curve25519Kit`)
- Fabric (~> 1.10)
- FeedKit (~> 8.1)
- FirebaseCore (~> 6.0)
- GCDWebServer (~> 3.0)
- GCDWebServer (~> 3.5.2)
- 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`)
- NVActivityIndicatorView (~> 4.7)
- PromiseKit (= 6.5.3)
- PureLayout
- PureLayout (~> 3.1.4)
- Reachability
- SignalCoreKit (from `https://github.com/signalapp/SignalCoreKit.git`)
- SignalCoreKit/Tests (from `https://github.com/signalapp/SignalCoreKit.git`)
- SignalMetadataKit (from `https://github.com/signalapp/SignalMetadataKit`)
- SignalMetadataKit/Tests (from `https://github.com/signalapp/SignalMetadataKit`)
- SignalServiceKit (from `.`)
- SignalServiceKit/Tests (from `.`)
- SessionAxolotlKit (from `https://github.com/loki-project/session-ios-protocol-kit.git`, branch `master`)
- SessionAxolotlKit/Tests (from `https://github.com/loki-project/session-ios-protocol-kit.git`, branch `master`)
- SessionCoreKit (from `https://github.com/loki-project/session-ios-core-kit.git`)
- SessionCoreKit/Tests (from `https://github.com/loki-project/session-ios-core-kit.git`)
- SessionCurve25519Kit (from `https://github.com/loki-project/session-ios-curve-25519-kit`)
- 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)
- SSZipArchive
- Starscream (from `https://github.com/signalapp/Starscream.git`, branch `signal-release`)
@ -239,13 +229,9 @@ SPEC REPOS:
https://github.com/CocoaPods/Specs.git:
- AFNetworking
- CocoaLumberjack
- Crashlytics
- CryptoSwift
- Fabric
- FeedKit
- FirebaseCore
- GCDWebServer
- GoogleUtilities
- libPhoneNumber-iOS
- NVActivityIndicatorView
- PromiseKit
@ -258,23 +244,23 @@ SPEC REPOS:
- YYImage
EXTERNAL SOURCES:
AxolotlKit:
:branch: master
:git: https://github.com/signalapp/SignalProtocolKit.git
Curve25519Kit:
:git: https://github.com/signalapp/Curve25519Kit
GRKOpenSSLFramework:
:git: https://github.com/signalapp/GRKOpenSSLFramework
HKDFKit:
:git: https://github.com/signalapp/HKDFKit.git
Mantle:
:branch: signal-master
:git: https://github.com/signalapp/Mantle
SignalCoreKit:
:git: https://github.com/signalapp/SignalCoreKit.git
SignalMetadataKit:
:git: https://github.com/signalapp/SignalMetadataKit
SignalServiceKit:
SessionAxolotlKit:
:branch: master
:git: https://github.com/loki-project/session-ios-protocol-kit.git
SessionCoreKit:
: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: "."
Starscream:
:branch: signal-release
@ -284,65 +270,61 @@ EXTERNAL SOURCES:
:git: https://github.com/signalapp/YapDatabase.git
CHECKOUT OPTIONS:
AxolotlKit:
:commit: dedb0f987ac98c8edafc8c54d442c01589cafffb
:git: https://github.com/signalapp/SignalProtocolKit.git
Curve25519Kit:
:commit: 9e5663baf4c2c7cb68ac4c0beb0423383c19a7fe
:git: https://github.com/signalapp/Curve25519Kit
GRKOpenSSLFramework:
:commit: b799c27e7927e5304ec1e4ad53c6d33c6fd1cae7
:git: https://github.com/signalapp/GRKOpenSSLFramework
HKDFKit:
:commit: 3e0c2371d125f2d3db26daa498d5d436961b1795
:git: https://github.com/signalapp/HKDFKit.git
Mantle:
:commit: 9599b1d9796280c97cb2f786f34984fc98a3b6ef
:commit: b72c2d1e6132501db906de2cffa8ded7803c54f4
:git: https://github.com/signalapp/Mantle
SignalCoreKit:
:commit: 521615304b0448b5edcab43d7fcef7724c7dd10c
:git: https://github.com/signalapp/SignalCoreKit.git
SignalMetadataKit:
:commit: 56f28fc3a6e35d548d034ef7d0009f233ca0aa62
:git: https://github.com/signalapp/SignalMetadataKit
SessionAxolotlKit:
:commit: 0338147cd5faefbb17e0bbf43cd008615ef64fe2
:git: https://github.com/loki-project/session-ios-protocol-kit.git
SessionCoreKit:
:commit: 0d66c90657b62cb66ecd2767c57408a951650f23
:git: https://github.com/loki-project/session-ios-core-kit.git
SessionCurve25519Kit:
:commit: ed4ae4576003905267d1573e336a003364564793
:git: https://github.com/loki-project/session-ios-curve-25519-kit
SessionHKDFKit:
:commit: 0dcf8cf8a7995ef8663146f7063e6c1d7f5a3274
:git: https://github.com/nielsandriesse/session-ios-hkdf-kit.git
SessionMetadataKit:
:commit: 048dadf44f6ab4b7024b7ce0683179ee0a494cd8
:git: https://github.com/loki-project/session-ios-metadata-kit
Starscream:
:commit: b09ea163c3cb305152c65b299cb024610f52e735
:git: https://github.com/signalapp/Starscream.git
YapDatabase:
:commit: 8e2b69110efd9499a5b553fda0165d2cea4e818d
:commit: e43ab163b2dcb4c817339c819b07dac545f05fea
:git: https://github.com/signalapp/YapDatabase.git
SPEC CHECKSUMS:
AFNetworking: b6f891fdfaed196b46c7a83cf209e09697b94057
AxolotlKit: bb02741a93400b915df1be3365ad13d3768b0103
CocoaLumberjack: 2f44e60eb91c176d471fdba43b9e3eae6a721947
Crashlytics: 5aa8e90dcbf2f34898b4f5a0037787531246cca0
CryptoSwift: d81eeaa59dc5a8d03720fe919a6fd07b51f7439f
Curve25519Kit: b3e77b7152ebe95fee2b3fb6c955449492bc14f7
Fabric: f6f21452846788bb44595d73e9909d79d328e617
CocoaLumberjack: b17ae15142558d08bbacf69775fa10c4abbebcc9
CryptoSwift: f12f037f6d0fcd6d48c96db0071b653de64e6c4d
FeedKit: 3418eed25f0b493b205b4de1b8511ac21d413fa9
FirebaseCore: b0f0262acebfa540e5f97b3832dbb13186980822
GCDWebServer: ead88cd14596dd4eae4f5830b8877c87c8728990
GoogleUtilities: 996e0db07153674fd1b54b220fda3a3dc3547cba
GCDWebServer: 2c156a56c8226e2d5c0c3f208a3621ccffbe3ce4
GRKOpenSSLFramework: 8a3735ad41e7dc1daff460467bccd32ca5d6ae3e
HKDFKit: 3b6dbbb9d59c221cc6c52c3aa915700cbf24e376
libPhoneNumber-iOS: e444379ac18bbfbdefad571da735b2cd7e096caa
libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75
Mantle: 2fa750afa478cd625a94230fbf1c13462f29395b
NVActivityIndicatorView: b19ddab2576f805cbe0fb2306cba3476e09a1dea
NVActivityIndicatorView: d24b7ebcf80af5dcd994adb650e2b6c93379270f
PromiseKit: c609029bdd801f792551a504c695c7d3098b42cd
PureLayout: f08c01b8dec00bb14a1fefa3de4c7d9c265df85e
PureLayout: bd3c4ec3a3819ad387c99ebb72c6b129c3ed4d2d
Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
SAMKeychain: 483e1c9f32984d50ca961e26818a534283b4cd5c
SignalCoreKit: c2d8132cdedb95d35eb2f8ae7eac0957695d0a8b
SignalMetadataKit: 6fa5e9a53c7f104568662521a2f3874672ff7a02
SignalServiceKit: 5c5b63a39d5054201ab59ef6daf0fa0a1a0c7887
SQLCipher: efbdb52cdbe340bcd892b1b14297df4e07241b7f
SSZipArchive: 8e859da2520142e09166bc9161967db296e9d02f
Starscream: ef3ece99d765eeccb67de105bfa143f929026cf5
SessionAxolotlKit: 88f72573df989042510d8a1737bd0c0057dda3da
SessionCoreKit: 778a3f6e3da788b43497734166646025b6392e88
SessionCurve25519Kit: cedc6c713f8182e6ee02bf9bd1b337552e00ebbb
SessionHKDFKit: b0f4e669411703ab925aba07491c5611564d1419
SessionMetadataKit: 8de99830e5bb1f5b0a180f41197457f5b4a76ee4
SessionServiceKit: b69bd197f730590b21dc5262bd5af73ce1f70ba0
SQLCipher: e434ed542b24f38ea7b36468a13f9765e1b5c072
SSZipArchive: 62d4947b08730e4cda640473b0066d209ff033c9
Starscream: 8aaf1a7feb805c816d0e7d3190ef23856f6665b9
SwiftProtobuf: 241400280f912735c1e1b9fe675fdd2c6c4d42e2
YapDatabase: b418a4baa6906e8028748938f9159807fd039af4
YYImage: 1e1b62a9997399593e4b9c4ecfbbabbf1d3f3b54
PODFILE CHECKSUM: 472252f3a4801d0d14d9553ff33cf52ef0846dc3
PODFILE CHECKSUM: e9d54851d6e1df3274eaaf29ca701c3a0ab1070a
COCOAPODS: 1.9.0
COCOAPODS: 1.9.3

2
Pods

@ -1 +1 @@
Subproject commit 731fffac3dcf56c55fc5df68ccc90d1d338f22cc
Subproject commit e30937c1e05477292b6daa919518e021b2b4737c

61
SessionServiceKit.podspec Normal file
View file

@ -0,0 +1,61 @@
#
# Be sure to run `pod lib lint SignalServiceKit.podspec' to ensure this is a
# valid spec before submitting.
#
# Any lines starting with a # are optional, but their use is encouraged
# To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html
#
Pod::Spec.new do |s|
s.name = "SessionServiceKit"
s.version = "1.0.0"
s.summary = "A Swift/Objective-C library for communicating with the Session messaging service."
s.description = <<-DESC
A Swift/Objective-C library for communicating with the Session messaging service.
DESC
s.homepage = "https://github.com/loki-project/session-ios"
s.license = 'GPLv3'
s.author = { "Niels Andriesse" => "niels@loki.network" }
s.source = { :git => "https://github.com/loki-project/session-ios.git", :tag => s.version.to_s }
s.social_media_url = 'https://getsession.org/'
s.platform = :ios, '10.0'
#s.ios.deployment_target = '9.0'
#s.osx.deployment_target = '10.9'
s.requires_arc = true
s.source_files = 'SignalServiceKit/src/**/*.{h,m,mm,swift}'
# We want to use modules to avoid clobbering CocoaLumberjack macros defined
# by other OWS modules which *also* import CocoaLumberjack. But because we
# also use Objective-C++, modules are disabled unless we explicitly enable
# them
s.compiler_flags = "-fcxx-modules"
s.prefix_header_file = 'SignalServiceKit/src/TSPrefix.h'
s.xcconfig = { 'OTHER_CFLAGS' => '$(inherited) -DSQLITE_HAS_CODEC' }
s.resources = ["SignalServiceKit/Resources/Certificates/*", "SignalServiceKit/src/Loki/Mnemonic/*.txt"]
s.dependency 'SessionCurve25519Kit', '~> 2.1.2'
s.dependency 'CocoaLumberjack'
s.dependency 'CryptoSwift', '~> 1.0'
s.dependency 'AFNetworking'
s.dependency 'SessionAxolotlKit', '~> 1.0.2'
s.dependency 'Mantle'
s.dependency 'YapDatabase/SQLCipher'
s.dependency 'Starscream'
s.dependency 'libPhoneNumber-iOS'
s.dependency 'GRKOpenSSLFramework'
s.dependency 'SAMKeychain'
s.dependency 'Reachability'
s.dependency 'SwiftProtobuf', '~> 1.5.0'
s.dependency 'SessionCoreKit', '~> 1.0.0'
s.dependency 'SessionMetadataKit', '~> 1.0.1'
s.dependency 'PromiseKit', '~> 6.0'
s.test_spec 'Tests' do |test_spec|
test_spec.source_files = 'SignalServiceKit/tests/**/*.{h,m,swift}'
end
end

54
Signal.xcodeproj/project.pbxproj
View file

@ -9,7 +9,6 @@
/* Begin PBXBuildFile section */
2400888E239F30A600305217 /* SessionRestorationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2400888D239F30A600305217 /* SessionRestorationView.swift */; };
241C1192245F8878005CB2F4 /* LK001UpdateFriendRequestStatusStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 241C1191245F8878005CB2F4 /* LK001UpdateFriendRequestStatusStorage.swift */; };
241C1194245F8CE2005CB2F4 /* LK001UpdateFriendRequestStatusStorageTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 241C1193245F8C95005CB2F4 /* LK001UpdateFriendRequestStatusStorageTest.swift */; };
241C6314231F64C000B4198E /* JazzIcon.swift in Sources */ = {isa = PBXBuildFile; fileRef = 241C630E231F5AAC00B4198E /* JazzIcon.swift */; };
241C6315231F64CE00B4198E /* CGFloat+Rounding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 241C6312231F5F1D00B4198E /* CGFloat+Rounding.swift */; };
241C6316231F64CE00B4198E /* UIColor+Helper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 241C6310231F5C4400B4198E /* UIColor+Helper.swift */; };
@ -749,7 +748,6 @@
1CE3CD5C23334683BDD3D78C /* Pods-Signal.test.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Signal.test.xcconfig"; path = "Pods/Target Support Files/Pods-Signal/Pods-Signal.test.xcconfig"; sourceTree = "<group>"; };
2400888D239F30A600305217 /* SessionRestorationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SessionRestorationView.swift; sourceTree = "<group>"; };
241C1191245F8878005CB2F4 /* LK001UpdateFriendRequestStatusStorage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LK001UpdateFriendRequestStatusStorage.swift; sourceTree = "<group>"; };
241C1193245F8C95005CB2F4 /* LK001UpdateFriendRequestStatusStorageTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LK001UpdateFriendRequestStatusStorageTest.swift; sourceTree = "<group>"; };
241C630E231F5AAC00B4198E /* JazzIcon.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JazzIcon.swift; sourceTree = "<group>"; };
241C6310231F5C4400B4198E /* UIColor+Helper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIColor+Helper.swift"; sourceTree = "<group>"; };
241C6312231F5F1D00B4198E /* CGFloat+Rounding.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CGFloat+Rounding.swift"; sourceTree = "<group>"; };
@ -1644,7 +1642,6 @@
isa = PBXGroup;
children = (
241C1191245F8878005CB2F4 /* LK001UpdateFriendRequestStatusStorage.swift */,
241C1193245F8C95005CB2F4 /* LK001UpdateFriendRequestStatusStorageTest.swift */,
);
path = Migrations;
sourceTree = "<group>";
@ -3678,15 +3675,11 @@
inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Signal/Pods-Signal-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/AFNetworking/AFNetworking.framework",
"${BUILT_PRODUCTS_DIR}/AxolotlKit/AxolotlKit.framework",
"${BUILT_PRODUCTS_DIR}/CocoaLumberjack/CocoaLumberjack.framework",
"${BUILT_PRODUCTS_DIR}/CryptoSwift/CryptoSwift.framework",
"${BUILT_PRODUCTS_DIR}/Curve25519Kit/Curve25519Kit.framework",
"${BUILT_PRODUCTS_DIR}/FeedKit/FeedKit.framework",
"${BUILT_PRODUCTS_DIR}/GCDWebServer/GCDWebServer.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}/NVActivityIndicatorView/NVActivityIndicatorView.framework",
"${BUILT_PRODUCTS_DIR}/PromiseKit/PromiseKit.framework",
@ -3695,9 +3688,12 @@
"${BUILT_PRODUCTS_DIR}/SAMKeychain/SAMKeychain.framework",
"${BUILT_PRODUCTS_DIR}/SQLCipher/SQLCipher.framework",
"${BUILT_PRODUCTS_DIR}/SSZipArchive/SSZipArchive.framework",
"${BUILT_PRODUCTS_DIR}/SignalCoreKit/SignalCoreKit.framework",
"${BUILT_PRODUCTS_DIR}/SignalMetadataKit/SignalMetadataKit.framework",
"${BUILT_PRODUCTS_DIR}/SignalServiceKit/SignalServiceKit.framework",
"${BUILT_PRODUCTS_DIR}/SessionAxolotlKit/SessionAxolotlKit.framework",
"${BUILT_PRODUCTS_DIR}/SessionCoreKit/SessionCoreKit.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}/SwiftProtobuf/SwiftProtobuf.framework",
"${BUILT_PRODUCTS_DIR}/YYImage/YYImage.framework",
@ -3707,15 +3703,11 @@
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${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}/CryptoSwift.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Curve25519Kit.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FeedKit.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GCDWebServer.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}/NVActivityIndicatorView.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PromiseKit.framework",
@ -3724,9 +3716,12 @@
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SAMKeychain.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SQLCipher.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SSZipArchive.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SignalCoreKit.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SignalMetadataKit.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SignalServiceKit.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SessionAxolotlKit.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SessionCoreKit.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}/SwiftProtobuf.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYImage.framework",
@ -3764,21 +3759,21 @@
inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-SignalTests/Pods-SignalTests-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/AFNetworking/AFNetworking.framework",
"${BUILT_PRODUCTS_DIR}/AxolotlKit/AxolotlKit.framework",
"${BUILT_PRODUCTS_DIR}/CocoaLumberjack/CocoaLumberjack.framework",
"${BUILT_PRODUCTS_DIR}/CryptoSwift/CryptoSwift.framework",
"${BUILT_PRODUCTS_DIR}/Curve25519Kit/Curve25519Kit.framework",
"${PODS_ROOT}/GRKOpenSSLFramework/OpenSSL-iOS/bin/openssl.framework",
"${BUILT_PRODUCTS_DIR}/HKDFKit/HKDFKit.framework",
"${BUILT_PRODUCTS_DIR}/Mantle/Mantle.framework",
"${BUILT_PRODUCTS_DIR}/PromiseKit/PromiseKit.framework",
"${BUILT_PRODUCTS_DIR}/PureLayout/PureLayout.framework",
"${BUILT_PRODUCTS_DIR}/Reachability/Reachability.framework",
"${BUILT_PRODUCTS_DIR}/SAMKeychain/SAMKeychain.framework",
"${BUILT_PRODUCTS_DIR}/SQLCipher/SQLCipher.framework",
"${BUILT_PRODUCTS_DIR}/SignalCoreKit/SignalCoreKit.framework",
"${BUILT_PRODUCTS_DIR}/SignalMetadataKit/SignalMetadataKit.framework",
"${BUILT_PRODUCTS_DIR}/SignalServiceKit/SignalServiceKit.framework",
"${BUILT_PRODUCTS_DIR}/SessionAxolotlKit/SessionAxolotlKit.framework",
"${BUILT_PRODUCTS_DIR}/SessionCoreKit/SessionCoreKit.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}/SwiftProtobuf/SwiftProtobuf.framework",
"${BUILT_PRODUCTS_DIR}/YYImage/YYImage.framework",
@ -3788,21 +3783,21 @@
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${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}/CryptoSwift.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Curve25519Kit.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}/PromiseKit.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PureLayout.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Reachability.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SAMKeychain.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SQLCipher.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SignalCoreKit.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SignalMetadataKit.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SignalServiceKit.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SessionAxolotlKit.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SessionCoreKit.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}/SwiftProtobuf.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYImage.framework",
@ -4295,7 +4290,6 @@
files = (
456F6E2F1E261D1000FD2210 /* PeerConnectionClientTest.swift in Sources */,
3491D9A121022DB7001EF5A1 /* CDSSigningCertificateTest.m in Sources */,
241C1194245F8CE2005CB2F4 /* LK001UpdateFriendRequestStatusStorageTest.swift in Sources */,
34BBC861220E883300857249 /* ImageEditorModelTest.swift in Sources */,
340B02BA1FA0D6C700F9CFEC /* ConversationViewItemTest.m in Sources */,
458E383A1D6699FA0094BD24 /* OWSDeviceProvisioningURLParserTest.m in Sources */,

14
Signal/Signal-Prefix.pch
View file

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

40
Signal/src/AppDelegate.m
View file

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

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

@ -4,7 +4,7 @@
import Foundation
import PromiseKit
import SignalServiceKit
import SessionServiceKit
@objc(OWSMessageFetcherJob)
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.
//
#import <SignalServiceKit/SSKJobRecord.h>
#import <SessionServiceKit/SSKJobRecord.h>
@class TSContactThread;

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

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

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

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

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

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

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

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

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

@ -4,7 +4,7 @@
import Foundation
import PromiseKit
import SignalServiceKit
import SessionServiceKit
/**
* 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 SignalServiceKit
import SessionServiceKit
let CompareSafetyNumbersActivityType = "org.whispersystems.signal.activity.CompareSafetyNumbers"

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

6
Signal/src/ViewControllers/AppSettings/DomainFrontingCountryViewController.m
View file

@ -9,7 +9,7 @@
#import "UIFont+OWS.h"
#import "UIView+OWS.h"
#import <SignalMessaging/Theme.h>
#import <SignalServiceKit/OWSSignalService.h>
#import <SessionServiceKit/OWSSignalService.h>
NS_ASSUME_NONNULL_BEGIN
@ -43,8 +43,8 @@ NS_ASSUME_NONNULL_BEGIN
[self.view addSubview:self.tableViewController.view];
[self.tableViewController.view autoPinEdgeToSuperviewSafeArea:ALEdgeLeading];
[self.tableViewController.view autoPinEdgeToSuperviewSafeArea:ALEdgeTrailing];
[_tableViewController.view autoPinToTopLayoutGuideOfViewController:self withInset:0];
[_tableViewController.view autoPinToBottomLayoutGuideOfViewController:self withInset:0];
[_tableViewController.view autoPinEdge:ALEdgeTop toEdge:ALEdgeTop ofView:self.view withOffset:0.0f];
[_tableViewController.view autoPinEdge:ALEdgeBottom toEdge:ALEdgeBottom ofView:self.view withOffset:0.0f];
[self updateTableContents];
}

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

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

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

@ -6,13 +6,13 @@
#import "OWSDeviceProvisioningURLParser.h"
#import "OWSLinkedDevicesTableViewController.h"
#import "Session-Swift.h"
#import <SignalCoreKit/Cryptography.h>
#import <SessionCoreKit/Cryptography.h>
#import <SignalMessaging/OWSProfileManager.h>
#import <SignalServiceKit/OWSDevice.h>
#import <SignalServiceKit/OWSDeviceProvisioner.h>
#import <SignalServiceKit/OWSIdentityManager.h>
#import <SignalServiceKit/OWSReadReceiptManager.h>
#import <SignalServiceKit/TSAccountManager.h>
#import <SessionServiceKit/OWSDevice.h>
#import <SessionServiceKit/OWSDeviceProvisioner.h>
#import <SessionServiceKit/OWSIdentityManager.h>
#import <SessionServiceKit/OWSReadReceiptManager.h>
#import <SessionServiceKit/TSAccountManager.h>
NS_ASSUME_NONNULL_BEGIN
@ -55,7 +55,7 @@ NS_ASSUME_NONNULL_BEGIN
[self.view addSubview:self.qrScanningController.view];
[self.qrScanningController.view autoPinEdgeToSuperviewEdge:ALEdgeLeading];
[self.qrScanningController.view autoPinEdgeToSuperviewEdge:ALEdgeTrailing];
[self.qrScanningController.view autoPinToTopLayoutGuideOfViewController:self withInset:0.f];
[self.qrScanningController.view autoPinEdge:ALEdgeTop toEdge:ALEdgeTop ofView:self.view];
[self.qrScanningController.view autoPinToSquareAspectRatio];
UIView *bottomView = [UIView new];

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

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

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

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

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

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

6
Signal/src/ViewControllers/Call/CallViewController.swift
View file

@ -5,7 +5,7 @@
//import Foundation
//import WebRTC
//import PromiseKit
//import SignalServiceKit
//import SessionServiceKit
//import SignalMessaging
//
//// TODO: Add category so that button handlers can be defined where button is created.
@ -527,8 +527,8 @@
// leaveCallViewButton.autoPinEdge(toSuperviewMargin: .top)
// contactNameLabel.autoPinEdge(toSuperviewMargin: .top)
// } else {
// leaveCallViewButton.autoPin(toTopLayoutGuideOf: self, withInset: 0)
// contactNameLabel.autoPin(toTopLayoutGuideOf: self, withInset: 0)
// leaveCallViewButton.autoPinEdge(.top, to: .top, of: view)
// contactNameLabel.autoPinEdge(.top, to: .top, of: view)
// }
//
// contactNameLabel.autoPinEdge(.leading, to: .trailing, of: leaveCallViewButton, withOffset: 8, relation: .greaterThanOrEqual)

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

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

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

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

4
Signal/src/ViewControllers/ContactViewController.swift
View file

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -8,8 +8,8 @@
#import "UIColor+OWS.h"
#import "UIView+OWS.h"
#import <QuartzCore/QuartzCore.h>
#import <SignalCoreKit/NSDate+OWS.h>
#import <SignalServiceKit/NSTimer+OWS.h>
#import <SessionCoreKit/NSDate+OWS.h>
#import <SessionServiceKit/NSTimer+OWS.h>
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/UIColor+OWS.h>
#import <SignalMessaging/UIView+OWS.h>
#import <SignalServiceKit/TSAttachmentStream.h>
#import <SignalServiceKit/TSMessage.h>
#import <SignalServiceKit/SignalServiceKit-Swift.h>
#import <SessionServiceKit/TSAttachmentStream.h>
#import <SessionServiceKit/TSMessage.h>
#import <SessionServiceKit/SessionServiceKit-Swift.h>
NS_ASSUME_NONNULL_BEGIN

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

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

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

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

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

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

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

@ -47,8 +47,8 @@
#import <ContactsUI/CNContactViewController.h>
#import <MobileCoreServices/UTCoreTypes.h>
#import <PromiseKit/AnyPromise.h>
#import <SignalCoreKit/NSDate+OWS.h>
#import <SignalCoreKit/Threading.h>
#import <SessionCoreKit/NSDate+OWS.h>
#import <SessionCoreKit/Threading.h>
#import <SignalMessaging/Environment.h>
#import <SignalMessaging/OWSContactOffersInteraction.h>
#import <SignalMessaging/OWSContactsManager.h>
@ -60,35 +60,35 @@
#import <SignalMessaging/ThreadUtil.h>
#import <SignalMessaging/UIUtil.h>
#import <SignalMessaging/UIViewController+OWS.h>
#import <SignalServiceKit/Contact.h>
#import <SignalServiceKit/ContactsUpdater.h>
#import <SignalServiceKit/MimeTypeUtil.h>
#import <SignalServiceKit/NSString+SSK.h>
#import <SignalServiceKit/NSTimer+OWS.h>
#import <SignalServiceKit/OWSAddToContactsOfferMessage.h>
#import <SignalServiceKit/OWSAddToProfileWhitelistOfferMessage.h>
#import <SignalServiceKit/OWSAttachmentDownloads.h>
#import <SignalServiceKit/OWSBlockingManager.h>
#import <SignalServiceKit/OWSDisappearingMessagesConfiguration.h>
#import <SignalServiceKit/OWSIdentityManager.h>
#import <SignalServiceKit/OWSMessageManager.h>
#import <SignalServiceKit/OWSMessageSender.h>
#import <SignalServiceKit/OWSMessageUtils.h>
#import <SignalServiceKit/OWSPrimaryStorage.h>
#import <SignalServiceKit/OWSPrimaryStorage+Loki.h>
#import <SignalServiceKit/OWSReadReceiptManager.h>
#import <SignalServiceKit/OWSVerificationStateChangeMessage.h>
#import <SignalServiceKit/SignalServiceKit-Swift.h>
#import <SignalServiceKit/TSAccountManager.h>
#import <SignalServiceKit/TSGroupModel.h>
#import <SignalServiceKit/TSInvalidIdentityKeyReceivingErrorMessage.h>
#import <SignalServiceKit/TSNetworkManager.h>
#import <SignalServiceKit/TSQuotedMessage.h>
#import <SessionServiceKit/Contact.h>
#import <SessionServiceKit/ContactsUpdater.h>
#import <SessionServiceKit/MimeTypeUtil.h>
#import <SessionServiceKit/NSString+SSK.h>
#import <SessionServiceKit/NSTimer+OWS.h>
#import <SessionServiceKit/OWSAddToContactsOfferMessage.h>
#import <SessionServiceKit/OWSAddToProfileWhitelistOfferMessage.h>
#import <SessionServiceKit/OWSAttachmentDownloads.h>
#import <SessionServiceKit/OWSBlockingManager.h>
#import <SessionServiceKit/OWSDisappearingMessagesConfiguration.h>
#import <SessionServiceKit/OWSIdentityManager.h>
#import <SessionServiceKit/OWSMessageManager.h>
#import <SessionServiceKit/OWSMessageSender.h>
#import <SessionServiceKit/OWSMessageUtils.h>
#import <SessionServiceKit/OWSPrimaryStorage.h>
#import <SessionServiceKit/OWSPrimaryStorage+Loki.h>
#import <SessionServiceKit/OWSReadReceiptManager.h>
#import <SessionServiceKit/OWSVerificationStateChangeMessage.h>
#import <SessionServiceKit/SessionServiceKit-Swift.h>
#import <SessionServiceKit/TSAccountManager.h>
#import <SessionServiceKit/TSGroupModel.h>
#import <SessionServiceKit/TSInvalidIdentityKeyReceivingErrorMessage.h>
#import <SessionServiceKit/TSNetworkManager.h>
#import <SessionServiceKit/TSQuotedMessage.h>
#import <YapDatabase/YapDatabase.h>
#import <YapDatabase/YapDatabaseAutoView.h>
#import <YapDatabase/YapDatabaseViewChange.h>
#import <YapDatabase/YapDatabaseViewConnection.h>
#import <SignalMetaDataKit/SignalMetadataKit-Swift.h>
#import <SessionMetadataKit/SessionMetadataKit-Swift.h>
@import Photos;
@ -1205,7 +1205,7 @@ typedef enum : NSUInteger {
bannerView.accessibilityIdentifier = ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"banner_close");
[self.view addSubview:bannerView];
[bannerView autoPinToTopLayoutGuideOfViewController:self withInset:10];
[bannerView autoPinEdge:ALEdgeTop toEdge:ALEdgeTop ofView:self.view withOffset:10.0f];
[bannerView autoHCenterInSuperview];
CGFloat labelDesiredWidth = [label sizeThatFits:CGSizeZero].width;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

4
Signal/src/ViewControllers/GifPicker/GifPickerViewController.swift
View file

@ -3,7 +3,7 @@
//
import Foundation
import SignalServiceKit
import SessionServiceKit
import Reachability
import SignalMessaging
import PromiseKit
@ -165,7 +165,7 @@ class GifPickerViewController: OWSViewController, UISearchBarDelegate, UICollect
self.view.addSubview(searchBar)
searchBar.autoPinWidthToSuperview()
searchBar.autoPin(toTopLayoutGuideOf: self, withInset: 0)
searchBar.autoPinEdge(.top, to: .top, of: view)
self.collectionView.delegate = self
self.collectionView.dataSource = self

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

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

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

@ -18,18 +18,18 @@
#import "TSGroupThread.h"
#import "ViewControllerUtils.h"
#import <PromiseKit/AnyPromise.h>
#import <SignalCoreKit/NSDate+OWS.h>
#import <SignalCoreKit/Threading.h>
#import <SignalCoreKit/iOSVersions.h>
#import <SessionCoreKit/NSDate+OWS.h>
#import <SessionCoreKit/Threading.h>
#import <SessionCoreKit/iOSVersions.h>
#import <SignalMessaging/OWSContactsManager.h>
#import <SignalMessaging/OWSFormat.h>
#import <SignalMessaging/SignalMessaging-Swift.h>
#import <SignalMessaging/Theme.h>
#import <SignalMessaging/UIUtil.h>
#import <SignalServiceKit/OWSMessageSender.h>
#import <SignalServiceKit/OWSMessageUtils.h>
#import <SignalServiceKit/TSAccountManager.h>
#import <SignalServiceKit/TSOutgoingMessage.h>
#import <SessionServiceKit/OWSMessageSender.h>
#import <SessionServiceKit/OWSMessageUtils.h>
#import <SessionServiceKit/TSAccountManager.h>
#import <SessionServiceKit/TSOutgoingMessage.h>
#import <StoreKit/StoreKit.h>
#import <YapDatabase/YapDatabase.h>
#import <YapDatabase/YapDatabaseViewChange.h>
@ -352,7 +352,7 @@ typedef NS_ENUM(NSInteger, HomeViewControllerSection) {
[self createFirstConversationCueView];
[self.view addSubview:self.firstConversationCueView];
[self.firstConversationCueView autoPinToTopLayoutGuideOfViewController:self withInset:0.f];
[self.firstConversationCueView autoPinEdge:ALEdgeTop toEdge:ALEdgeTop ofView:self.view withOffset:0.0f];
// This inset bakes in assumptions about UINavigationBar layout, but I'm not sure
// there's a better way to do it, since it isn't safe to use iOS auto layout with
// UINavigationBar contents.
@ -660,7 +660,7 @@ typedef NS_ENUM(NSInteger, HomeViewControllerSection) {
if (@available(iOS 11, *)) {
[searchResultsController.view autoPinTopToSuperviewMarginWithInset:56];
} else {
[searchResultsController.view autoPinToTopLayoutGuideOfViewController:self withInset:40];
[searchResultsController.view autoPinEdge:ALEdgeTop toEdge:ALEdgeTop ofView:self.view withOffset:40.0f];
}
searchResultsController.view.hidden = YES;

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

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

4
Signal/src/ViewControllers/LongTextViewController.swift
View file

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

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

@ -17,7 +17,7 @@
#import <MediaPlayer/MPMoviePlayerViewController.h>
#import <MediaPlayer/MediaPlayer.h>
#import <SignalMessaging/SignalMessaging-Swift.h>
#import <SignalServiceKit/NSData+Image.h>
#import <SessionServiceKit/NSData+Image.h>
#import <YYImage/YYImage.h>
NS_ASSUME_NONNULL_BEGIN
@ -259,7 +259,7 @@ NS_ASSUME_NONNULL_BEGIN
self.videoProgressBar = videoProgressBar;
[self.view addSubview:videoProgressBar];
[videoProgressBar autoPinWidthToSuperview];
[videoProgressBar autoPinToTopLayoutGuideOfViewController:self withInset:0];
[videoProgressBar autoPinEdge:ALEdgeTop toEdge:ALEdgeTop ofView:self.view withOffset:0.0f];
CGFloat kVideoProgressBarHeight = 44;
[videoProgressBar autoSetDimension:ALDimensionHeight toSize:kVideoProgressBarHeight];

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

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

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

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

6
Signal/src/ViewControllers/MessageDetailViewController.swift
View file

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

12
Signal/src/ViewControllers/NewContactThreadViewController.m
View file

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

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

@ -8,8 +8,8 @@
#import "OWSNavigationController.h"
#import "Session-Swift.h"
#import "SignalApp.h"
#import <SignalCoreKit/NSDate+OWS.h>
#import <SignalCoreKit/Randomness.h>
#import <SessionCoreKit/NSDate+OWS.h>
#import <SessionCoreKit/Randomness.h>
#import <SignalMessaging/BlockListUIUtils.h>
#import <SignalMessaging/ContactTableViewCell.h>
#import <SignalMessaging/ContactsViewHelper.h>
@ -20,12 +20,12 @@
#import <SignalMessaging/UIUtil.h>
#import <SignalMessaging/UIView+OWS.h>
#import <SignalMessaging/UIViewController+OWS.h>
#import <SignalServiceKit/NSString+SSK.h>
#import <SignalServiceKit/OWSMessageSender.h>
#import <SignalServiceKit/SignalAccount.h>
#import <SignalServiceKit/TSGroupModel.h>
#import <SignalServiceKit/TSGroupThread.h>
#import <SignalServiceKit/TSOutgoingMessage.h>
#import <SessionServiceKit/NSString+SSK.h>
#import <SessionServiceKit/OWSMessageSender.h>
#import <SessionServiceKit/SignalAccount.h>
#import <SessionServiceKit/TSGroupModel.h>
#import <SessionServiceKit/TSGroupThread.h>
#import <SessionServiceKit/TSOutgoingMessage.h>
NS_ASSUME_NONNULL_BEGIN
@ -127,7 +127,7 @@ NS_ASSUME_NONNULL_BEGIN
[self.view addSubview:firstSection];
[firstSection autoSetDimension:ALDimensionHeight toSize:100.f];
[firstSection autoPinWidthToSuperview];
[firstSection autoPinToTopLayoutGuideOfViewController:self withInset:0];
[firstSection autoPinEdge:ALEdgeTop toEdge:ALEdgeTop ofView:self.view withOffset:0.0f];
_tableViewController = [OWSTableViewController new];
_tableViewController.delegate = self;

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

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

8
Signal/src/ViewControllers/OWS2FASettingsViewController.m
View file

@ -11,8 +11,8 @@
#import <SignalMessaging/UIColor+OWS.h>
#import <SignalMessaging/UIFont+OWS.h>
#import <SignalMessaging/UIView+OWS.h>
#import <SignalServiceKit/NSString+SSK.h>
#import <SignalServiceKit/OWS2FAManager.h>
#import <SessionServiceKit/NSString+SSK.h>
#import <SessionServiceKit/OWS2FAManager.h>
NS_ASSUME_NONNULL_BEGIN
@ -149,7 +149,7 @@ NS_ASSUME_NONNULL_BEGIN
[self createTableView];
[instructionsLabel autoPinToTopLayoutGuideOfViewController:self withInset:kVSpacing];
[instructionsLabel autoPinEdge:ALEdgeTop toEdge:ALEdgeTop ofView:self.view withOffset:kVSpacing];
[instructionsLabel autoPinEdgeToSuperviewSafeArea:ALEdgeLeading withInset:self.hMargin];
[instructionsLabel autoPinEdgeToSuperviewSafeArea:ALEdgeTrailing withInset:self.hMargin];
@ -159,7 +159,7 @@ NS_ASSUME_NONNULL_BEGIN
toEdge:ALEdgeBottom
ofView:instructionsLabel
withOffset:kVSpacing];
[self.tableViewController.view autoPinToBottomLayoutGuideOfViewController:self withInset:0];
[self.tableViewController.view autoPinEdge:ALEdgeBottom toEdge:ALEdgeBottom ofView:self.view withOffset:0.0f];
[self updateTableContents];
}

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

@ -12,14 +12,14 @@
#import "UIColor+OWS.h"
#import "UIFont+OWS.h"
#import "UIView+OWS.h"
#import <SignalCoreKit/NSDate+OWS.h>
#import <SessionCoreKit/NSDate+OWS.h>
#import <SignalMessaging/OWSNavigationController.h>
#import <SignalMessaging/OWSProfileManager.h>
#import <SignalMessaging/SignalMessaging-Swift.h>
#import <SignalMessaging/UIUtil.h>
#import <SignalMessaging/UIViewController+OWS.h>
#import <SignalServiceKit/NSString+SSK.h>
#import <SignalServiceKit/OWSPrimaryStorage.h>
#import <SessionServiceKit/NSString+SSK.h>
#import <SessionServiceKit/OWSPrimaryStorage.h>
NS_ASSUME_NONNULL_BEGIN
@ -100,7 +100,7 @@ NSString *const kProfileView_LastPresentedDate = @"kProfileView_LastPresentedDat
UIView *contentView = [UIView containerView];
contentView.backgroundColor = Theme.backgroundColor;
[self.view addSubview:contentView];
[contentView autoPinToTopLayoutGuideOfViewController:self withInset:0];
[contentView autoPinEdge:ALEdgeTop toEdge:ALEdgeTop ofView:self.view withOffset:0.0f];
[contentView autoPinWidthToSuperview];
const CGFloat fontSizePoints = ScaleFromIPhone5To7Plus(16.f, 20.f);

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -9,17 +9,17 @@
#import "UIColor+OWS.h"
#import "UIFont+OWS.h"
#import "UIView+OWS.h"
#import <SignalCoreKit/NSDate+OWS.h>
#import <SessionCoreKit/NSDate+OWS.h>
#import <SignalMessaging/Environment.h>
#import <SignalMessaging/OWSContactsManager.h>
#import <SignalMessaging/UIUtil.h>
#import <SignalServiceKit/OWSError.h>
#import <SignalServiceKit/OWSFingerprint.h>
#import <SignalServiceKit/OWSFingerprintBuilder.h>
#import <SignalServiceKit/OWSIdentityManager.h>
#import <SignalServiceKit/OWSPrimaryStorage+SessionStore.h>
#import <SignalServiceKit/TSAccountManager.h>
#import <SignalServiceKit/TSInfoMessage.h>
#import <SessionServiceKit/OWSError.h>
#import <SessionServiceKit/OWSFingerprint.h>
#import <SessionServiceKit/OWSFingerprintBuilder.h>
#import <SessionServiceKit/OWSIdentityManager.h>
#import <SessionServiceKit/OWSPrimaryStorage+SessionStore.h>
#import <SessionServiceKit/TSAccountManager.h>
#import <SessionServiceKit/TSInfoMessage.h>
NS_ASSUME_NONNULL_BEGIN
@ -192,7 +192,7 @@ typedef void (^CustomLayoutBlock)(void);
action:@selector(verifyUnverifyButtonTapped:)]];
[self.view addSubview:verifyUnverifyButton];
[verifyUnverifyButton autoPinWidthToSuperview];
[verifyUnverifyButton autoPinToBottomLayoutGuideOfViewController:self withInset:0];
[verifyUnverifyButton autoPinEdge:ALEdgeBottom toEdge:ALEdgeBottom ofView:self.view withOffset:0.0f];
SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, verifyUnverifyButton);
UIView *verifyUnverifyPillbox = [UIView new];
@ -336,7 +336,7 @@ typedef void (^CustomLayoutBlock)(void);
// verified.
[verificationStateLabel autoSetDimension:ALDimensionHeight
toSize:round(verificationStateLabel.font.lineHeight * 2.25f)];
[verificationStateLabel autoPinToTopLayoutGuideOfViewController:self withInset:ScaleFromIPhone5To7Plus(15.f, 20.f)];
[verificationStateLabel autoPinEdge:ALEdgeTop toEdge:ALEdgeTop ofView:self.view withOffset:ScaleFromIPhone5To7Plus(15.f, 20.f)];
[verificationStateLabel autoPinEdge:ALEdgeBottom
toEdge:ALEdgeTop
ofView:fingerprintView

12
Signal/src/ViewControllers/ThreadSettings/FingerprintViewScanController.m
View file

@ -12,10 +12,10 @@
#import <SignalMessaging/Environment.h>
#import <SignalMessaging/OWSContactsManager.h>
#import <SignalMessaging/UIUtil.h>
#import <SignalServiceKit/OWSError.h>
#import <SignalServiceKit/OWSFingerprint.h>
#import <SignalServiceKit/OWSFingerprintBuilder.h>
#import <SignalServiceKit/OWSIdentityManager.h>
#import <SessionServiceKit/OWSError.h>
#import <SessionServiceKit/OWSFingerprint.h>
#import <SessionServiceKit/OWSFingerprintBuilder.h>
#import <SessionServiceKit/OWSIdentityManager.h>
NS_ASSUME_NONNULL_BEGIN
@ -74,7 +74,7 @@ NS_ASSUME_NONNULL_BEGIN
self.qrScanningController.scanDelegate = self;
[self.view addSubview:self.qrScanningController.view];
[self.qrScanningController.view autoPinWidthToSuperview];
[self.qrScanningController.view autoPinToTopLayoutGuideOfViewController:self withInset:0];
[self.qrScanningController.view autoPinEdge:ALEdgeTop toEdge:ALEdgeTop ofView:self.view withOffset:0.0f];
UIView *footer = [UIView new];
footer.backgroundColor = [UIColor colorWithWhite:0.25f alpha:1.f];
@ -94,7 +94,7 @@ NS_ASSUME_NONNULL_BEGIN
[footer addSubview:cameraInstructionLabel];
[cameraInstructionLabel autoPinWidthToSuperviewWithMargin:ScaleFromIPhone5To7Plus(16.f, 30.f)];
CGFloat instructionsVMargin = ScaleFromIPhone5To7Plus(10.f, 20.f);
[cameraInstructionLabel autoPinToBottomLayoutGuideOfViewController:self withInset:instructionsVMargin];
[cameraInstructionLabel autoPinEdge:ALEdgeBottom toEdge:ALEdgeBottom ofView:self.view withOffset:instructionsVMargin];
[cameraInstructionLabel autoPinEdgeToSuperviewEdge:ALEdgeTop withInset:instructionsVMargin];
}

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