Skip to content

Commit d956a44

Browse files
Bump to libsignal v0.96.1
1 parent 79140e4 commit d956a44

4 files changed

Lines changed: 27 additions & 16 deletions

File tree

Podfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ source 'https://cdn.cocoapods.org/'
1111
pod 'blurhash', podspec: './ThirdParty/blurhash.podspec'
1212
pod 'SwiftProtobuf', "1.36.1"
1313

14-
ENV['LIBSIGNAL_FFI_PREBUILD_CHECKSUM'] = '79f53932ff82f792b70e30bad3b38801da0b882137adaf65ad54d907a94f3d29'
15-
pod 'LibSignalClient', git: 'https://github.com/signalapp/libsignal.git', tag: 'v0.95.0', testspecs: ["Tests"]
14+
ENV['LIBSIGNAL_FFI_PREBUILD_CHECKSUM'] = '58433a1bde7fd6a5e0de6f072eee7a32133c4de08f43f4299a635eac451fb6f0'
15+
pod 'LibSignalClient', git: 'https://github.com/signalapp/libsignal.git', tag: 'v0.96.1', testspecs: ["Tests"]
1616
# pod 'LibSignalClient', path: '../libsignal', testspecs: ["Tests"]
1717

1818
ENV['RINGRTC_PREBUILD_CHECKSUM'] = 'c19c813ab5255aa3cd7c2af36374100f7cc69c2fd794cae23baebd6ec9dae90c'

Podfile.lock

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ PODS:
99
- LibMobileCoin/CoreHTTP (6.0.2):
1010
- SwiftProtobuf (~> 1.5)
1111
- libPhoneNumber-iOS (1.2.0)
12-
- LibSignalClient (0.95.0)
13-
- LibSignalClient/Tests (0.95.0)
12+
- LibSignalClient (0.96.1)
13+
- LibSignalClient/Tests (0.96.1)
1414
- libwebp (1.5.0):
1515
- libwebp/demux (= 1.5.0)
1616
- libwebp/mux (= 1.5.0)
@@ -52,8 +52,8 @@ DEPENDENCIES:
5252
- GRDB.swift/SQLCipher
5353
- LibMobileCoin/CoreHTTP (from `https://github.com/signalapp/libmobilecoin-ios-artifacts`, tag `signal/6.0.2`)
5454
- libPhoneNumber-iOS (from `https://github.com/signalapp/libPhoneNumber-iOS`, branch `signal-master`)
55-
- LibSignalClient (from `https://github.com/signalapp/libsignal.git`, tag `v0.95.0`)
56-
- LibSignalClient/Tests (from `https://github.com/signalapp/libsignal.git`, tag `v0.95.0`)
55+
- LibSignalClient (from `https://github.com/signalapp/libsignal.git`, tag `v0.96.1`)
56+
- LibSignalClient/Tests (from `https://github.com/signalapp/libsignal.git`, tag `v0.96.1`)
5757
- libwebp
5858
- lottie-ios
5959
- MobileCoin/CoreHTTP (from `https://github.com/mobilecoinofficial/MobileCoin-Swift`, tag `v6.0.3`)
@@ -89,7 +89,7 @@ EXTERNAL SOURCES:
8989
:git: https://github.com/signalapp/libPhoneNumber-iOS
9090
LibSignalClient:
9191
:git: https://github.com/signalapp/libsignal.git
92-
:tag: v0.95.0
92+
:tag: v0.96.1
9393
MobileCoin:
9494
:git: https://github.com/mobilecoinofficial/MobileCoin-Swift
9595
:tag: v6.0.3
@@ -113,7 +113,7 @@ CHECKOUT OPTIONS:
113113
:git: https://github.com/signalapp/libPhoneNumber-iOS
114114
LibSignalClient:
115115
:git: https://github.com/signalapp/libsignal.git
116-
:tag: v0.95.0
116+
:tag: v0.96.1
117117
MobileCoin:
118118
:git: https://github.com/mobilecoinofficial/MobileCoin-Swift
119119
:tag: v6.0.3
@@ -131,7 +131,7 @@ SPEC CHECKSUMS:
131131
GRDB.swift: 1395cb3556df6b16ed69dfc74c3886abc75d2825
132132
LibMobileCoin: 8503f567fa32184a5be7bc038fbd727747dd9991
133133
libPhoneNumber-iOS: 1a34106b49dc6e12a7f37eb9aee7c64011509547
134-
LibSignalClient: a98db1d538243e43ecac040005204bd274cbd8c7
134+
LibSignalClient: 107b8d7edccfb5c02c8ebaef55ff0acb0f328cb2
135135
libwebp: 02b23773aedb6ff1fd38cec7a77b81414c6842a8
136136
Logging: beeb016c9c80cf77042d62e83495816847ef108b
137137
lottie-ios: fcb5e73e17ba4c983140b7d21095c834b3087418
@@ -143,6 +143,6 @@ SPEC CHECKSUMS:
143143
SQLCipher: ff2f045b20d675a73a70f7329395ddd4a2580063
144144
SwiftProtobuf: 9e106a71456f4d3f6a3b0c8fd87ef0be085efc38
145145

146-
PODFILE CHECKSUM: ee98007764e1569e9dbe4f25053510725b19fc88
146+
PODFILE CHECKSUM: b40ee0bca0b41a78c91c9ee3c05a3b7a89b4ab23
147147

148148
COCOAPODS: 1.15.2

SignalServiceKit/KeyTransparency/KeyTransparencyManager.swift

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -502,11 +502,14 @@ public final class KeyTransparencyManager {
502502
)
503503

504504
do {
505-
try await KeyTransparency.resetField(
506-
field,
507-
for: localAci,
508-
store: libSignalStore,
509-
)
505+
try await db.awaitableWrite { tx in
506+
try KeyTransparency.resetField(
507+
field,
508+
for: localAci,
509+
store: libSignalStore,
510+
context: tx,
511+
)
512+
}
510513
} catch {
511514
// We should only end up here if there's malformed data.
512515
owsFailDebug("Failed to reset \(field) for local user!")
@@ -742,6 +745,14 @@ private struct KeyTransparencyStoreForLibSignal: KeyTransparency.Store {
742745
keyTransparencyStore.setKeyTransparencyBlob(data, aci: aci, tx: tx)
743746
}
744747
}
748+
749+
func getAccountData(for aci: Aci, context: StoreContext) -> Data? {
750+
keyTransparencyStore.getKeyTransparencyBlob(aci: aci, tx: context.asTransaction)
751+
}
752+
753+
func setAccountData(_ data: Data, for aci: Aci, context: StoreContext) {
754+
keyTransparencyStore.setKeyTransparencyBlob(data, aci: aci, tx: context.asTransaction)
755+
}
745756
}
746757

747758
// MARK: - KeyTransparencyRecord

0 commit comments

Comments
 (0)