From 5f40144ae95190825003672a3623fb93e26eaf89 Mon Sep 17 00:00:00 2001 From: moiseev-signal <122060238+moiseev-signal@users.noreply.github.com> Date: Mon, 12 Aug 2024 11:39:52 -0700 Subject: [PATCH] Upgrade to libsignal 0.55.0 --- dependencies.gradle.kts | 2 +- gradle/verification-metadata.xml | 20 +++++++++---------- .../websocket/ShadowingWebSocketConnection.kt | 7 +------ .../websocket/LibSignalChatConnectionTest.kt | 2 +- 4 files changed, 13 insertions(+), 18 deletions(-) diff --git a/dependencies.gradle.kts b/dependencies.gradle.kts index dbe38c9cc6..cbf1dedbae 100644 --- a/dependencies.gradle.kts +++ b/dependencies.gradle.kts @@ -15,7 +15,7 @@ dependencyResolutionManagement { version("exoplayer", "2.19.0") version("glide", "4.15.1") version("kotlin", "1.9.20") - version("libsignal-client", "0.54.3") + version("libsignal-client", "0.55.0") version("mp4parser", "1.9.39") version("android-gradle-plugin", "8.4.0") version("accompanist", "0.28.0") diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 08142a1c6c..c027519191 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -8760,20 +8760,20 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - - + + - - - + + + - - + + diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/ShadowingWebSocketConnection.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/ShadowingWebSocketConnection.kt index f1ecb2d98d..7d3308a013 100644 --- a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/ShadowingWebSocketConnection.kt +++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/ShadowingWebSocketConnection.kt @@ -148,7 +148,6 @@ class ShadowingWebSocketConnection( if (!goodStatus) { stats.badStatuses.incrementAndGet() } - stats.reconnects.addAndGet(it?.debugInfo?.reconnectCount ?: 0) Log.i(TAG, "$it") }, onFailure = { @@ -187,13 +186,11 @@ class ShadowingWebSocketConnection( requestsCompared: Int = 0, failures: Int = 0, badStatuses: Int = 0, - reconnects: Int = 0, lastNotified: Long = 0 ) { val requestsCompared: AtomicInteger = AtomicInteger(requestsCompared) val failures: AtomicInteger = AtomicInteger(failures) val badStatuses: AtomicInteger = AtomicInteger(badStatuses) - val reconnects: AtomicInteger = AtomicInteger(reconnects) val lastNotified: AtomicLong = AtomicLong(lastNotified) val lastSnapshot: AtomicLong = AtomicLong(0) @@ -201,14 +198,13 @@ class ShadowingWebSocketConnection( requestsCompared.set(0) failures.set(0) badStatuses.set(0) - reconnects.set(0) // Do not reset lastNotified nor lastSnapshot } companion object { fun fromSnapshot(bytes: ByteArray): Stats { val snapshot = Snapshot.ADAPTER.decode(bytes) - return Stats(snapshot.requestsCompared, snapshot.failures, snapshot.badStatuses, snapshot.reconnects, snapshot.lastNotified) + return Stats(snapshot.requestsCompared, snapshot.failures, snapshot.badStatuses, snapshot.lastNotified) } } @@ -218,7 +214,6 @@ class ShadowingWebSocketConnection( .requestsCompared(requestsCompared.get()) .failures(failures.get()) .badStatuses(badStatuses.get()) - .reconnects(reconnects.get()) .lastNotified(lastNotified.get()) .build() .encode() diff --git a/libsignal-service/src/test/java/org/whispersystems/signalservice/internal/websocket/LibSignalChatConnectionTest.kt b/libsignal-service/src/test/java/org/whispersystems/signalservice/internal/websocket/LibSignalChatConnectionTest.kt index 63350eacc7..642645b7d9 100644 --- a/libsignal-service/src/test/java/org/whispersystems/signalservice/internal/websocket/LibSignalChatConnectionTest.kt +++ b/libsignal-service/src/test/java/org/whispersystems/signalservice/internal/websocket/LibSignalChatConnectionTest.kt @@ -239,7 +239,7 @@ class LibSignalChatConnectionTest { } companion object { - private val DEBUG_INFO: DebugInfo = DebugInfo(0, IpType.UNKNOWN, 100, "") + private val DEBUG_INFO: DebugInfo = DebugInfo(IpType.UNKNOWN, 100, "") private val RESPONSE_SUCCESS = LibSignalResponse(200, "", emptyMap(), byteArrayOf()) private val RESPONSE_ERROR = LibSignalResponse(400, "", emptyMap(), byteArrayOf()) private val RESPONSE_SERVER_ERROR = LibSignalResponse(500, "", emptyMap(), byteArrayOf())