diff --git a/Podfile b/Podfile index 133a7c87a..fe69ab1cf 100644 --- a/Podfile +++ b/Podfile @@ -11,7 +11,7 @@ abstract_target 'GlobalDependencies' do # FIXME: If https://github.com/jedisct1/swift-sodium/pull/249 gets resolved then revert this back to the standard pod pod 'Sodium', :git => 'https://github.com/oxen-io/session-ios-swift-sodium.git', branch: 'session-build' pod 'GRDB.swift/SQLCipher' - pod 'SQLCipher', '~> 4.5.0' # FIXME: Version 4.5.2 is crashing when access DB settings + pod 'SQLCipher', '~> 4.5.3' # FIXME: We want to remove this once it's been long enough since the migration to GRDB pod 'YapDatabase/SQLCipher', :git => 'https://github.com/oxen-io/session-ios-yap-database.git', branch: 'signal-release' diff --git a/Podfile.lock b/Podfile.lock index c47cf02c1..0239f9c29 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -14,9 +14,9 @@ PODS: - AFNetworking/Serialization (4.0.1) - AFNetworking/UIKit (4.0.1): - AFNetworking/NSURLSession - - CocoaLumberjack (3.7.4): - - CocoaLumberjack/Core (= 3.7.4) - - CocoaLumberjack/Core (3.7.4) + - CocoaLumberjack (3.8.0): + - CocoaLumberjack/Core (= 3.8.0) + - CocoaLumberjack/Core (3.8.0) - CryptoSwift (1.4.2) - Curve25519Kit (2.1.0): - CocoaLumberjack @@ -27,7 +27,7 @@ PODS: - DifferenceKit/Core (1.3.0) - DifferenceKit/UIKitExtension (1.3.0): - DifferenceKit/Core - - GRDB.swift/SQLCipher (6.1.0): + - GRDB.swift/SQLCipher (6.10.1): - SQLCipher (>= 3.4.2) - libwebp (1.2.1): - libwebp/demux (= 1.2.1) @@ -61,10 +61,10 @@ PODS: - OpenSSL-Universal - SocketRocket (0.5.1) - Sodium (0.9.1) - - SQLCipher (4.5.0): - - SQLCipher/standard (= 4.5.0) - - SQLCipher/common (4.5.0) - - SQLCipher/standard (4.5.0): + - SQLCipher (4.5.3): + - SQLCipher/standard (= 4.5.3) + - SQLCipher/common (4.5.3) + - SQLCipher/standard (4.5.3): - SQLCipher/common - SwiftProtobuf (1.5.0) - WebRTC-lib (96.0.0) @@ -154,7 +154,7 @@ DEPENDENCIES: - SignalCoreKit (from `https://github.com/oxen-io/session-ios-core-kit`, branch `session-version`) - SocketRocket (~> 0.5.1) - Sodium (from `https://github.com/oxen-io/session-ios-swift-sodium.git`, branch `session-build`) - - SQLCipher (~> 4.5.0) + - SQLCipher (~> 4.5.3) - SwiftProtobuf (~> 1.5.0) - WebRTC-lib - YapDatabase/SQLCipher (from `https://github.com/oxen-io/session-ios-yap-database.git`, branch `signal-release`) @@ -201,7 +201,7 @@ EXTERNAL SOURCES: CHECKOUT OPTIONS: Curve25519Kit: - :commit: b79c2ace600bfd3784e9c33cf1f254b121312edc + :commit: ee1bc83e61d9d672105eed85a4b8fbaec3d376f5 :git: https://github.com/oxen-io/session-ios-curve-25519-kit.git SignalCoreKit: :commit: 4590c2737a2b5dc0ef4ace9f9019b581caccc1de @@ -217,12 +217,12 @@ CHECKOUT OPTIONS: :git: https://github.com/signalapp/YYImage SPEC CHECKSUMS: - AFNetworking: 7864c38297c79aaca1500c33288e429c3451fdce - CocoaLumberjack: 543c79c114dadc3b1aba95641d8738b06b05b646 + AFNetworking: 3bd23d814e976cd148d7d44c3ab78017b744cd58 + CocoaLumberjack: 78abfb691154e2a9df8ded4350d504ee19d90732 CryptoSwift: a532e74ed010f8c95f611d00b8bbae42e9fe7c17 Curve25519Kit: e63f9859ede02438ae3defc5e1a87e09d1ec7ee6 DifferenceKit: ab185c4d7f9cef8af3fcf593e5b387fb81e999ca - GRDB.swift: 611778a5e113385373baeb3e2ce474887d1aadb7 + GRDB.swift: 1cc67278f1a9878d6eb1b849485518112b79cab7 libwebp: 98a37e597e40bfdb4c911fc98f2c53d0b12d05fc Nimble: 5316ef81a170ce87baf72dd961f22f89a602ff84 NVActivityIndicatorView: 1f6c5687f1171810aa27a3296814dc2d7dec3667 @@ -235,13 +235,13 @@ SPEC CHECKSUMS: SignalCoreKit: 1fbd8732163ef76de16cd1107d1fa3684b607e5d SocketRocket: d57c7159b83c3c6655745cd15302aa24b6bae531 Sodium: a7d42cb46e789d2630fa552d35870b416ed055ae - SQLCipher: 98dc22f27c0b1790d39e710d440f22a466ebdb59 + SQLCipher: 57fa9f863fa4a3ed9dd3c90ace52315db8c0fdca SwiftProtobuf: 241400280f912735c1e1b9fe675fdd2c6c4d42e2 WebRTC-lib: 508fe02efa0c1a3a8867082a77d24c9be5d29aeb YapDatabase: b418a4baa6906e8028748938f9159807fd039af4 YYImage: f1ddd15ac032a58b78bbed1e012b50302d318331 ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb -PODFILE CHECKSUM: 7452ce88370eadd58d21fdf6a4c4945d6554ee95 +PODFILE CHECKSUM: 2bf7639359fecebe56e9757d88f4eb48864652d2 COCOAPODS: 1.11.3 diff --git a/SessionMessagingKit/Database/Models/SessionThread.swift b/SessionMessagingKit/Database/Models/SessionThread.swift index dd7a49528..406dc4df4 100644 --- a/SessionMessagingKit/Database/Models/SessionThread.swift +++ b/SessionMessagingKit/Database/Models/SessionThread.swift @@ -226,7 +226,7 @@ public extension SessionThread { /// /// **Note:** In order to use this filter you **MUST** have a `joining(required/optional:)` to the /// `SessionThread.contact` association or it won't work - static func isMessageRequest(userPublicKey: String, includeNonVisible: Bool = false) -> SQLSpecificExpressible { + static func isMessageRequest(userPublicKey: String, includeNonVisible: Bool = false) -> SQLExpression { let thread: TypedTableAlias = TypedTableAlias() let contact: TypedTableAlias = TypedTableAlias() let shouldBeVisibleSQL: SQL = (includeNonVisible ? @@ -241,7 +241,7 @@ public extension SessionThread { \(SQL("\(thread[.id]) != \(userPublicKey)")) AND IFNULL(\(contact[.isApproved]), false) = false """ - ) + ).sqlExpression } func isNoteToSelf(_ db: Database? = nil) -> Bool {