Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion MatrixSDK.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ Pod::Spec.new do |s|
# Requirements for e2e encryption
ss.dependency 'Realm', '10.27.0'
ss.dependency 'libbase58', '~> 0.1.4'
ss.dependency 'MatrixSDKCrypto', '0.11.1', :configurations => ["DEBUG", "RELEASE"], :inhibit_warnings => true
ss.dependency 'MatrixSDKCrypto', '0.17.0', :configurations => ["DEBUG", "RELEASE"], :inhibit_warnings => true
end

s.subspec 'JingleCallStack' do |ss|
Expand Down
6 changes: 5 additions & 1 deletion MatrixSDK/ContentScan/PKMessageWrapper.swift
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,11 @@ import MatrixSDKCrypto
@objc public static func encryptMessage(_ message: String, usingKey key: String) -> PKMessageWrapper? {
do {
let pkEncryption = try PkEncryption.fromBase64(key: key)
return PKMessageWrapper(pkMessage: pkEncryption.encrypt(plaintext: message))
guard let pkMessage = pkEncryption.encrypt(plaintext: message) else {
MXLog.error("[PKMessageWrapper] message didn't encrypt")
return nil
}
return PKMessageWrapper(pkMessage: pkMessage)
} catch {
MXLog.error("[PKMessageWrapper] failed to create pkEncryption", context: error)
return nil
Expand Down
3 changes: 2 additions & 1 deletion MatrixSDK/Crypto/CryptoMachine/MXCryptoMachine.swift
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,8 @@ extension MXCryptoMachine: MXCryptoSyncing {
deviceChanges: deviceChanges,
keyCounts: keyCounts,
unusedFallbackKeys: unusedFallbackKeys,
nextBatchToken: nextBatchToken
nextBatchToken: nextBatchToken,
decryptionSettings: .init(senderDeviceTrustRequirement: .untrusted)
)

var deserialisedToDeviceEvents = [Any]()
Expand Down
3 changes: 2 additions & 1 deletion MatrixSDK/Crypto/Dehydration/DehydrationService.swift
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,8 @@ public class DehydrationService: NSObject {

repeat {
let response = try await retrieveToDeviceEvents(deviceId: deviceId, nextBatch: dehydratedDeviceEventsResponse?.nextBatch)
try rehydratedDevice.receiveEvents(events: MXTools.serialiseJSONObject(response.events))
try rehydratedDevice.receiveEvents(events: MXTools.serialiseJSONObject(response.events),
decryptionSettings: .init(senderDeviceTrustRequirement: .untrusted))
dehydratedDeviceEventsResponse = response

} while !(dehydratedDeviceEventsResponse?.events.isEmpty ?? true)
Expand Down
4 changes: 2 additions & 2 deletions Podfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
source 'https://cdn.cocoapods.org/'
source 'https://github.com/CocoaPods/Specs.git'

# Uncomment this line to define a global platform for your project

Expand All @@ -15,7 +15,7 @@ abstract_target 'MatrixSDK' do

pod 'Realm', '10.27.0'
pod 'libbase58', '~> 0.1.4'
pod 'MatrixSDKCrypto', '0.11.1', :inhibit_warnings => true
pod 'MatrixSDKCrypto', '0.17.0', :inhibit_warnings => true

target 'MatrixSDK-iOS' do
platform :ios, '13.0'
Expand Down
11 changes: 6 additions & 5 deletions Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ PODS:
- AFNetworking/NSURLSession
- GZIP (1.3.2)
- libbase58 (0.1.4)
- MatrixSDKCrypto (0.11.1)
- MatrixSDKCrypto (0.17.0)
- OHHTTPStubs (9.1.0):
- OHHTTPStubs/Default (= 9.1.0)
- OHHTTPStubs/Core (9.1.0)
Expand All @@ -39,17 +39,18 @@ DEPENDENCIES:
- AFNetworking (~> 4.0.0)
- GZIP (~> 1.3.0)
- libbase58 (~> 0.1.4)
- MatrixSDKCrypto (= 0.11.1)
- MatrixSDKCrypto (= 0.17.0)
- OHHTTPStubs (~> 9.1.0)
- Realm (= 10.27.0)
- SwiftyBeaver (= 1.9.5)

SPEC REPOS:
https://github.com/CocoaPods/Specs.git:
- MatrixSDKCrypto
trunk:
- AFNetworking
- GZIP
- libbase58
- MatrixSDKCrypto
- OHHTTPStubs
- Realm
- SwiftyBeaver
Expand All @@ -58,11 +59,11 @@ SPEC CHECKSUMS:
AFNetworking: 3bd23d814e976cd148d7d44c3ab78017b744cd58
GZIP: 3c0abf794bfce8c7cb34ea05a1837752416c8868
libbase58: 7c040313537b8c44b6e2d15586af8e21f7354efd
MatrixSDKCrypto: e44608012cae9befc52f13cd8e56c6f51ac83702
MatrixSDKCrypto: aa38e272e573c7798aa3cd761b2b61ec5c7731b8
OHHTTPStubs: 90eac6d8f2c18317baeca36698523dc67c513831
Realm: 9ca328bd7e700cc19703799785e37f77d1a130f2
SwiftyBeaver: 84069991dd5dca07d7069100985badaca7f0ce82

PODFILE CHECKSUM: 43b5fd9b5489fc93ff6f9121742d30463242345f
PODFILE CHECKSUM: 58cba3b80f4adf96e8094c94a44857a15799e7a4

COCOAPODS: 1.16.2
Loading