From 0d133b8d1e136a7285b8690bbb68c355062a4163 Mon Sep 17 00:00:00 2001 From: Cody Henthorne Date: Fri, 14 Mar 2025 16:13:38 -0400 Subject: [PATCH] Improve stacktraces by not wrapping CDS exceptions in RuntimeExceptions. --- .../securesms/contacts/sync/ContactDiscoveryRefreshV2.kt | 4 ++-- .../java/org/whispersystems/signalservice/api/cds/CdsApi.kt | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/ContactDiscoveryRefreshV2.kt b/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/ContactDiscoveryRefreshV2.kt index e502eb3250..17dcd953cd 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/ContactDiscoveryRefreshV2.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/ContactDiscoveryRefreshV2.kt @@ -123,7 +123,7 @@ object ContactDiscoveryRefreshV2 { } is NetworkResult.NetworkError -> throw result.exception - is NetworkResult.ApplicationError -> throw RuntimeException("Unexpected exception", result.throwable) + is NetworkResult.ApplicationError -> throw result.throwable } return response.results[e164]?.let { item -> @@ -213,7 +213,7 @@ object ContactDiscoveryRefreshV2 { } is NetworkResult.NetworkError -> throw result.exception - is NetworkResult.ApplicationError -> throw RuntimeException("Unexpected exception", result.throwable) + is NetworkResult.ApplicationError -> throw result.throwable } if (!isPartialRefresh && SignalStore.misc.isCdsBlocked) { diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/cds/CdsApi.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/cds/CdsApi.kt index 579abc1986..18ed5f76ac 100644 --- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/cds/CdsApi.kt +++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/cds/CdsApi.kt @@ -72,8 +72,6 @@ class CdsApi(private val authWebSocket: SignalWebSocket.AuthenticatedWebSocket) is TimeoutException -> NetworkResult.NetworkError(IOException("Timed out")) else -> throw e } - } catch (e: Exception) { - throw RuntimeException("Unexpected exception when retrieving registered users!", e) } } }