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

Update Pods

Browse Source
pull/228/head
nielsandriesse 4 years ago
parent b89fb68a56
commit 7475c7c6b8
6 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File

30
Podfile.lock
Unescape Escape View File

@ -42,13 +42,13 @@ PODS:
- PureLayout (3.1.6) - PureLayout (3.1.6)
- Reachability (3.2) - Reachability (3.2)
- SAMKeychain (1.5.3) - SAMKeychain (1.5.3)
- SessionAxolotlKit (1.0.6): - SessionAxolotlKit (1.0.7):
- CocoaLumberjack - CocoaLumberjack
- SessionCoreKit (~> 1.0.0) - SessionCoreKit (~> 1.0.0)
- SessionCurve25519Kit (~> 2.1.2) - SessionCurve25519Kit (~> 2.1.2)
- SessionHKDFKit (~> 0.0.5) - SessionHKDFKit (~> 0.0.5)
- SwiftProtobuf (~> 1.5.0) - SwiftProtobuf (~> 1.5.0)
- SessionAxolotlKit/Tests (1.0.6): - SessionAxolotlKit/Tests (1.0.7):
- CocoaLumberjack - CocoaLumberjack
- SessionCoreKit (~> 1.0.0) - SessionCoreKit (~> 1.0.0)
- SessionCurve25519Kit (~> 2.1.2) - SessionCurve25519Kit (~> 2.1.2)
@ -72,18 +72,18 @@ PODS:
- SessionHKDFKit/Tests (0.0.5): - SessionHKDFKit/Tests (0.0.5):
- CocoaLumberjack - CocoaLumberjack
- SessionCoreKit - SessionCoreKit
- SessionMetadataKit (1.0.6): - SessionMetadataKit (1.0.7):
- CocoaLumberjack - CocoaLumberjack
- CryptoSwift (~> 1.3) - CryptoSwift (~> 1.3)
- SessionAxolotlKit (~> 1.0.6) - SessionAxolotlKit (~> 1.0.7)
- SessionCoreKit (~> 1.0.0) - SessionCoreKit (~> 1.0.0)
- SessionCurve25519Kit (~> 2.1.2) - SessionCurve25519Kit (~> 2.1.2)
- SessionHKDFKit (~> 0.0.5) - SessionHKDFKit (~> 0.0.5)
- SwiftProtobuf (~> 1.5.0) - SwiftProtobuf (~> 1.5.0)
- SessionMetadataKit/Tests (1.0.6): - SessionMetadataKit/Tests (1.0.7):
- CocoaLumberjack - CocoaLumberjack
- CryptoSwift (~> 1.3) - CryptoSwift (~> 1.3)
- SessionAxolotlKit (~> 1.0.6) - SessionAxolotlKit (~> 1.0.7)
- SessionCoreKit (~> 1.0.0) - SessionCoreKit (~> 1.0.0)
- SessionCurve25519Kit (~> 2.1.2) - SessionCurve25519Kit (~> 2.1.2)
- SessionHKDFKit (~> 0.0.5) - SessionHKDFKit (~> 0.0.5)
@ -98,10 +98,10 @@ PODS:
- PromiseKit (~> 6.0) - PromiseKit (~> 6.0)
- Reachability - Reachability
- SAMKeychain - SAMKeychain
- SessionAxolotlKit (~> 1.0.6) - SessionAxolotlKit (~> 1.0.7)
- SessionCoreKit (~> 1.0.0) - SessionCoreKit (~> 1.0.0)
- SessionCurve25519Kit (~> 2.1.3) - SessionCurve25519Kit (~> 2.1.3)
- SessionMetadataKit (~> 1.0.6) - SessionMetadataKit (~> 1.0.7)
- Starscream - Starscream
- SwiftProtobuf (~> 1.5.0) - SwiftProtobuf (~> 1.5.0)
- YapDatabase/SQLCipher - YapDatabase/SQLCipher
@ -115,10 +115,10 @@ PODS:
- PromiseKit (~> 6.0) - PromiseKit (~> 6.0)
- Reachability - Reachability
- SAMKeychain - SAMKeychain
- SessionAxolotlKit (~> 1.0.6) - SessionAxolotlKit (~> 1.0.7)
- SessionCoreKit (~> 1.0.0) - SessionCoreKit (~> 1.0.0)
- SessionCurve25519Kit (~> 2.1.3) - SessionCurve25519Kit (~> 2.1.3)
- SessionMetadataKit (~> 1.0.6) - SessionMetadataKit (~> 1.0.7)
- Starscream - Starscream
- SwiftProtobuf (~> 1.5.0) - SwiftProtobuf (~> 1.5.0)
- YapDatabase/SQLCipher - YapDatabase/SQLCipher
@ -277,7 +277,7 @@ CHECKOUT OPTIONS:
:commit: b72c2d1e6132501db906de2cffa8ded7803c54f4 :commit: b72c2d1e6132501db906de2cffa8ded7803c54f4
:git: https://github.com/signalapp/Mantle :git: https://github.com/signalapp/Mantle
SessionAxolotlKit: SessionAxolotlKit:
:commit: 663f58f4da7bf4d159e366352c2bb7715049671b :commit: be92fccb6152ee02c8c2658cb3c2e21201f119d1
:git: https://github.com/loki-project/session-ios-protocol-kit.git :git: https://github.com/loki-project/session-ios-protocol-kit.git
SessionCoreKit: SessionCoreKit:
:commit: 0d66c90657b62cb66ecd2767c57408a951650f23 :commit: 0d66c90657b62cb66ecd2767c57408a951650f23
@ -289,7 +289,7 @@ CHECKOUT OPTIONS:
:commit: 0dcf8cf8a7995ef8663146f7063e6c1d7f5a3274 :commit: 0dcf8cf8a7995ef8663146f7063e6c1d7f5a3274
:git: https://github.com/nielsandriesse/session-ios-hkdf-kit.git :git: https://github.com/nielsandriesse/session-ios-hkdf-kit.git
SessionMetadataKit: SessionMetadataKit:
:commit: 935300f1de6c3e6b77fd6f7ad69b7ce3d7ee9ab5 :commit: 43f1de289de7a2fbf629294652dc34a1e9ba76e7
:git: https://github.com/loki-project/session-ios-metadata-kit :git: https://github.com/loki-project/session-ios-metadata-kit
Starscream: Starscream:
:commit: b09ea163c3cb305152c65b299cb024610f52e735 :commit: b09ea163c3cb305152c65b299cb024610f52e735
@ -312,12 +312,12 @@ SPEC CHECKSUMS:
PureLayout: bd3c4ec3a3819ad387c99ebb72c6b129c3ed4d2d PureLayout: bd3c4ec3a3819ad387c99ebb72c6b129c3ed4d2d
Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96 Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
SAMKeychain: 483e1c9f32984d50ca961e26818a534283b4cd5c SAMKeychain: 483e1c9f32984d50ca961e26818a534283b4cd5c
SessionAxolotlKit: f65b7402b63549597e23bc6c8f92c5e2da182ae4 SessionAxolotlKit: f3558573a3cb52ebb921572f2f3b683da5eddad9
SessionCoreKit: 778a3f6e3da788b43497734166646025b6392e88 SessionCoreKit: 778a3f6e3da788b43497734166646025b6392e88
SessionCurve25519Kit: 9bb9afe199e4bc23578a4b15932ad2c57bd047b1 SessionCurve25519Kit: 9bb9afe199e4bc23578a4b15932ad2c57bd047b1
SessionHKDFKit: b0f4e669411703ab925aba07491c5611564d1419 SessionHKDFKit: b0f4e669411703ab925aba07491c5611564d1419
SessionMetadataKit: 1e5dbd59f6229d9238557751bfbc57c0f4b1dd6b SessionMetadataKit: 22629bea760b0c124a6a7a4d0bf0195362bc8e92
SessionServiceKit: 903f4a01384ad4f827e035e693cd87605c223724 SessionServiceKit: 98198f84944d91f585cacbc557de8fc70bee6d1f
SQLCipher: e434ed542b24f38ea7b36468a13f9765e1b5c072 SQLCipher: e434ed542b24f38ea7b36468a13f9765e1b5c072
SSZipArchive: 62d4947b08730e4cda640473b0066d209ff033c9 SSZipArchive: 62d4947b08730e4cda640473b0066d209ff033c9
Starscream: 8aaf1a7feb805c816d0e7d3190ef23856f6665b9 Starscream: 8aaf1a7feb805c816d0e7d3190ef23856f6665b9

2
Pods

@ -1 +1 @@
Subproject commit 6d307f51039509e814d70c48527f69f7b850e6da Subproject commit 86eb31f1da056a80343da53199485104f4bc81e8

4
SessionServiceKit.podspec
Unescape Escape View File

@ -42,7 +42,7 @@ A Swift/Objective-C library for communicating with the Session messaging service
s.dependency 'CocoaLumberjack' s.dependency 'CocoaLumberjack'
s.dependency 'CryptoSwift', '~> 1.3' s.dependency 'CryptoSwift', '~> 1.3'
s.dependency 'AFNetworking' s.dependency 'AFNetworking'
s.dependency 'SessionAxolotlKit', '~> 1.0.6' s.dependency 'SessionAxolotlKit', '~> 1.0.7'
s.dependency 'Mantle' s.dependency 'Mantle'
s.dependency 'YapDatabase/SQLCipher' s.dependency 'YapDatabase/SQLCipher'
s.dependency 'Starscream' s.dependency 'Starscream'
@ -52,7 +52,7 @@ A Swift/Objective-C library for communicating with the Session messaging service
s.dependency 'Reachability' s.dependency 'Reachability'
s.dependency 'SwiftProtobuf', '~> 1.5.0' s.dependency 'SwiftProtobuf', '~> 1.5.0'
s.dependency 'SessionCoreKit', '~> 1.0.0' s.dependency 'SessionCoreKit', '~> 1.0.0'
s.dependency 'SessionMetadataKit', '~> 1.0.6' s.dependency 'SessionMetadataKit', '~> 1.0.7'
s.dependency 'PromiseKit', '~> 6.0' s.dependency 'PromiseKit', '~> 6.0'
s.test_spec 'Tests' do |test_spec| s.test_spec 'Tests' do |test_spec|

2
SignalServiceKit/src/Loki/Protocol/Session Management/LokiSessionResetImplementation.swift
Unescape Escape View File

@ -12,7 +12,7 @@ public class LokiSessionResetImplementation : NSObject, SessionResetProtocol {
case preKeyIDsDontMatch case preKeyIDsDontMatch
} }
public func validatePreKeyForFriendRequestAcceptance(for recipientID: String, whisperMessage: CipherMessage, protocolContext: Any?) throws { public func validatePreKeyWhisperMessage(for recipientID: String, whisperMessage: CipherMessage, protocolContext: Any?) throws {
guard let transaction = protocolContext as? YapDatabaseReadTransaction else { guard let transaction = protocolContext as? YapDatabaseReadTransaction else {
print("[Loki] Invalid transaction.") print("[Loki] Invalid transaction.")
return return

4
SignalServiceKit/src/Loki/Protocol/Sync Messages/SyncMessagesProtocol.swift
Unescape Escape View File

@ -65,8 +65,8 @@ public final class SyncMessagesProtocol : NSObject {
} }
let accounts = Set(publicKeys).map { SignalAccount(recipientId: $0) } let accounts = Set(publicKeys).map { SignalAccount(recipientId: $0) }
let syncManager = SSKEnvironment.shared.syncManager let syncManager = SSKEnvironment.shared.syncManager
let promises = accounts.chunked(by: 3).map { friends -> Promise<Void> in // TODO: Does this always fit? let promises = accounts.chunked(by: 3).map { accounts -> Promise<Void> in // TODO: Does this always fit?
return Promise(syncManager.syncContacts(for: friends)).map2 { _ in } return Promise(syncManager.syncContacts(for: accounts)).map2 { _ in }
} }
return AnyPromise.from(when(fulfilled: promises)) return AnyPromise.from(when(fulfilled: promises))
} }

4
SignalServiceKit/src/Messages/OWSMessageDecrypter.m
Unescape Escape View File

@ -609,9 +609,9 @@ NSError *EnsureDecryptError(NSError *_Nullable error, NSString *fallbackErrorDes
SSKProtoEnvelopeBuilder *envelopeBuilder = [envelope asBuilder]; SSKProtoEnvelopeBuilder *envelopeBuilder = [envelope asBuilder];
[envelopeBuilder setSource:source]; [envelopeBuilder setSource:source];
[envelopeBuilder setSourceDevice:(uint32_t)sourceDeviceId]; [envelopeBuilder setSourceDevice:(uint32_t)sourceDeviceId];
if (decryptResult.messageType == SMKMessageTypeLokiFriendRequest) { if (decryptResult.messageType == SMKMessageTypeFallback) {
[envelopeBuilder setType:SSKProtoEnvelopeTypeFallbackMessage]; [envelopeBuilder setType:SSKProtoEnvelopeTypeFallbackMessage];
OWSLogInfo(@"SMKMessageTypeLokiFriendRequest"); OWSLogInfo(@"SMKMessageTypeFallback");
} }
NSError *envelopeBuilderError; NSError *envelopeBuilderError;
NSData *_Nullable newEnvelopeData = [envelopeBuilder buildSerializedDataAndReturnError:&envelopeBuilderError]; NSData *_Nullable newEnvelopeData = [envelopeBuilder buildSerializedDataAndReturnError:&envelopeBuilderError];

Write Preview
Loading…
Cancel
Save