diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/CheckoutFlowActivityTest__RecurringDonations.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/CheckoutFlowActivityTest__RecurringDonations.kt index d28df7d8fc..2e8f34d734 100644 --- a/app/src/androidTest/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/CheckoutFlowActivityTest__RecurringDonations.kt +++ b/app/src/androidTest/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/CheckoutFlowActivityTest__RecurringDonations.kt @@ -16,6 +16,7 @@ import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith import org.signal.donations.InAppPaymentType +import org.signal.network.NetworkResult import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentsRepository import org.thoughtcrime.securesms.database.model.InAppPaymentSubscriberRecord @@ -26,7 +27,6 @@ import org.thoughtcrime.securesms.testing.InAppPaymentsRule import org.thoughtcrime.securesms.testing.RxTestSchedulerRule import org.thoughtcrime.securesms.testing.SignalActivityRule import org.thoughtcrime.securesms.testing.actions.RecyclerViewScrollToBottomAction -import org.whispersystems.signalservice.api.NetworkResult import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription import org.whispersystems.signalservice.api.subscriptions.SubscriberId import java.math.BigDecimal diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/jobs/BackupDeleteJobTest.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/jobs/BackupDeleteJobTest.kt index d6cc2a02ab..a1e92f3f22 100644 --- a/app/src/androidTest/java/org/thoughtcrime/securesms/jobs/BackupDeleteJobTest.kt +++ b/app/src/androidTest/java/org/thoughtcrime/securesms/jobs/BackupDeleteJobTest.kt @@ -19,6 +19,8 @@ import org.junit.After import org.junit.Before import org.junit.Rule import org.junit.Test +import org.signal.network.NetworkResult +import org.signal.network.exceptions.NonSuccessfulResponseCodeException import org.thoughtcrime.securesms.backup.DeletionState import org.thoughtcrime.securesms.backup.v2.BackupRepository import org.thoughtcrime.securesms.backup.v2.MessageBackupTier @@ -27,8 +29,6 @@ import org.thoughtcrime.securesms.jobs.protos.BackupDeleteJobData import org.thoughtcrime.securesms.keyvalue.SignalStore import org.thoughtcrime.securesms.testing.SignalActivityRule import org.thoughtcrime.securesms.util.RemoteConfig -import org.whispersystems.signalservice.api.NetworkResult -import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException class BackupDeleteJobTest { diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/jobs/BackupSubscriptionCheckJobTest.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/jobs/BackupSubscriptionCheckJobTest.kt index 706fdb8e0a..1512eb7b56 100644 --- a/app/src/androidTest/java/org/thoughtcrime/securesms/jobs/BackupSubscriptionCheckJobTest.kt +++ b/app/src/androidTest/java/org/thoughtcrime/securesms/jobs/BackupSubscriptionCheckJobTest.kt @@ -27,6 +27,8 @@ import org.signal.core.util.billing.BillingPurchaseState import org.signal.core.util.billing.BillingResponseCode import org.signal.core.util.money.FiatMoney import org.signal.donations.InAppPaymentType +import org.signal.network.NetworkResult +import org.signal.network.exceptions.NonSuccessfulResponseCodeException import org.thoughtcrime.securesms.backup.DeletionState import org.thoughtcrime.securesms.backup.v2.BackupRepository import org.thoughtcrime.securesms.backup.v2.MessageBackupTier @@ -42,8 +44,6 @@ import org.thoughtcrime.securesms.keyvalue.SignalStore import org.thoughtcrime.securesms.net.SignalNetwork import org.thoughtcrime.securesms.testing.SignalActivityRule import org.thoughtcrime.securesms.util.RemoteConfig -import org.whispersystems.signalservice.api.NetworkResult -import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException import org.whispersystems.signalservice.api.storage.IAPSubscriptionId import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription.ChargeFailure diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/testing/InAppPaymentsRule.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/testing/InAppPaymentsRule.kt index 6c89db6c06..807bc78f99 100644 --- a/app/src/androidTest/java/org/thoughtcrime/securesms/testing/InAppPaymentsRule.kt +++ b/app/src/androidTest/java/org/thoughtcrime/securesms/testing/InAppPaymentsRule.kt @@ -8,9 +8,9 @@ package org.thoughtcrime.securesms.testing import androidx.test.platform.app.InstrumentationRegistry import io.mockk.every import org.junit.rules.ExternalResource +import org.signal.network.NetworkResult import org.thoughtcrime.securesms.dependencies.AppDependencies import org.thoughtcrime.securesms.util.JsonUtils -import org.whispersystems.signalservice.api.NetworkResult import org.whispersystems.signalservice.internal.push.SubscriptionsConfiguration /** diff --git a/app/src/benchmarkShared/java/org/signal/benchmark/BenchmarkCommandReceiver.kt b/app/src/benchmarkShared/java/org/signal/benchmark/BenchmarkCommandReceiver.kt index ade5db4479..61be90fbc1 100644 --- a/app/src/benchmarkShared/java/org/signal/benchmark/BenchmarkCommandReceiver.kt +++ b/app/src/benchmarkShared/java/org/signal/benchmark/BenchmarkCommandReceiver.kt @@ -23,7 +23,7 @@ import org.thoughtcrime.securesms.groups.GroupId import org.thoughtcrime.securesms.recipients.Recipient import org.whispersystems.signalservice.internal.push.Envelope import org.whispersystems.signalservice.internal.websocket.BenchmarkWebSocketConnection -import org.whispersystems.signalservice.internal.websocket.WebSocketRequestMessage +import org.signal.network.websocket.WebSocketRequestMessage import kotlin.random.Random /** diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/BackupRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/BackupRepository.kt index 3931d11e34..55d11d799e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/BackupRepository.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/BackupRepository.kt @@ -66,7 +66,11 @@ import org.signal.libsignal.messagebackup.BackupForwardSecrecyToken import org.signal.libsignal.zkgroup.VerificationFailedException import org.signal.libsignal.zkgroup.backups.BackupLevel import org.signal.libsignal.zkgroup.profiles.ProfileKey +import org.signal.network.ApplicationErrorAction +import org.signal.network.NetworkResult +import org.signal.network.StatusCodeErrorAction import org.signal.network.api.SvrBApi +import org.signal.network.exceptions.NonSuccessfulResponseCodeException import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.attachments.AttachmentId import org.thoughtcrime.securesms.attachments.Cdn @@ -145,9 +149,6 @@ import org.thoughtcrime.securesms.util.RemoteConfig import org.thoughtcrime.securesms.util.ServiceUtil import org.thoughtcrime.securesms.util.TextSecurePreferences import org.thoughtcrime.securesms.util.toMillis -import org.whispersystems.signalservice.api.ApplicationErrorAction -import org.whispersystems.signalservice.api.NetworkResult -import org.whispersystems.signalservice.api.StatusCodeErrorAction import org.whispersystems.signalservice.api.archive.ArchiveGetMediaItemsResponse import org.whispersystems.signalservice.api.archive.ArchiveKeyRotationLimitResponse import org.whispersystems.signalservice.api.archive.ArchiveMediaRequest @@ -161,7 +162,6 @@ import org.whispersystems.signalservice.api.crypto.AttachmentCipherStreamUtil import org.whispersystems.signalservice.api.link.TransferArchiveResponse import org.whispersystems.signalservice.api.messages.AttachmentTransferProgress import org.whispersystems.signalservice.api.messages.SignalServiceAttachment.ProgressListener -import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException import org.whispersystems.signalservice.internal.crypto.PaddingInputStream import org.whispersystems.signalservice.internal.push.AttachmentUploadForm import org.whispersystems.signalservice.internal.push.AuthCredentials diff --git a/app/src/main/java/org/thoughtcrime/securesms/calls/new/NewCallViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/calls/new/NewCallViewModel.kt index f915e3dd68..bf3f9083de 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/calls/new/NewCallViewModel.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/calls/new/NewCallViewModel.kt @@ -15,6 +15,7 @@ import kotlinx.coroutines.flow.update import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import org.signal.core.util.logging.Log +import org.signal.network.NetworkResult import org.thoughtcrime.securesms.calls.new.NewCallUiState.CallType import org.thoughtcrime.securesms.calls.new.NewCallUiState.UserMessage import org.thoughtcrime.securesms.contacts.sync.ContactDiscovery @@ -25,7 +26,6 @@ import org.thoughtcrime.securesms.recipients.Recipient import org.thoughtcrime.securesms.recipients.RecipientId import org.thoughtcrime.securesms.recipients.RecipientRepository import org.thoughtcrime.securesms.recipients.ui.RecipientSelection -import org.whispersystems.signalservice.api.NetworkResult class NewCallViewModel : ViewModel() { companion object { diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/export/ExportAccountDataRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/export/ExportAccountDataRepository.kt index 267c514a20..0afcd372dc 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/export/ExportAccountDataRepository.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/export/ExportAccountDataRepository.kt @@ -5,10 +5,10 @@ import com.fasterxml.jackson.databind.JsonNode import com.fasterxml.jackson.databind.node.ObjectNode import io.reactivex.rxjava3.core.Single import io.reactivex.rxjava3.schedulers.Schedulers +import org.signal.network.NetworkResult import org.thoughtcrime.securesms.net.SignalNetwork import org.thoughtcrime.securesms.providers.BlobProvider import org.thoughtcrime.securesms.util.JsonUtils -import org.whispersystems.signalservice.api.NetworkResult class ExportAccountDataRepository { diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/BackupStateObserver.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/BackupStateObserver.kt index 6485203cfc..41449b09af 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/BackupStateObserver.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/BackupStateObserver.kt @@ -21,6 +21,7 @@ import org.signal.core.util.logging.Log import org.signal.core.util.money.FiatMoney import org.signal.core.util.throttleLatest import org.signal.donations.InAppPaymentType +import org.signal.network.NetworkResult import org.thoughtcrime.securesms.backup.v2.BackupRepository import org.thoughtcrime.securesms.backup.v2.MessageBackupTier import org.thoughtcrime.securesms.backup.v2.ui.subscription.MessageBackupsType @@ -33,7 +34,6 @@ import org.thoughtcrime.securesms.database.model.InAppPaymentSubscriberRecord import org.thoughtcrime.securesms.dependencies.AppDependencies import org.thoughtcrime.securesms.keyvalue.SignalStore import org.thoughtcrime.securesms.util.InternetConnectionObserver -import org.whispersystems.signalservice.api.NetworkResult import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription import java.math.BigDecimal import java.util.Currency diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/remote/BackupKeyDisplayViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/remote/BackupKeyDisplayViewModel.kt index 71a6954602..ed6430d792 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/remote/BackupKeyDisplayViewModel.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/remote/BackupKeyDisplayViewModel.kt @@ -16,12 +16,12 @@ import kotlinx.coroutines.withContext import org.signal.core.models.AccountEntropyPool import org.signal.core.util.concurrent.SignalDispatchers import org.signal.core.util.logging.Log +import org.signal.network.NetworkResult import org.thoughtcrime.securesms.backup.v2.BackupRepository import org.thoughtcrime.securesms.backup.v2.StagedBackupKeyRotations import org.thoughtcrime.securesms.dependencies.AppDependencies import org.thoughtcrime.securesms.jobs.RestoreOptimizedMediaJob import org.thoughtcrime.securesms.keyvalue.SignalStore -import org.whispersystems.signalservice.api.NetworkResult class BackupKeyDisplayViewModel : ViewModel(), BackupKeyCredentialManagerHandler { diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/remote/RemoteBackupsSettingsViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/remote/RemoteBackupsSettingsViewModel.kt index 7147c6ea0a..b328431323 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/remote/RemoteBackupsSettingsViewModel.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/remote/RemoteBackupsSettingsViewModel.kt @@ -29,6 +29,7 @@ import org.signal.core.util.logging.Log import org.signal.core.util.mebiBytes import org.signal.core.util.throttleLatest import org.signal.donations.InAppPaymentType +import org.signal.network.NetworkResult import org.thoughtcrime.securesms.backup.ArchiveUploadProgress import org.thoughtcrime.securesms.backup.DeletionState import org.thoughtcrime.securesms.backup.v2.ArchiveRestoreProgress @@ -51,7 +52,6 @@ import org.thoughtcrime.securesms.keyvalue.protos.ArchiveUploadProgressState import org.thoughtcrime.securesms.util.Environment import org.thoughtcrime.securesms.util.RemoteConfig import org.thoughtcrime.securesms.util.TextSecurePreferences -import org.whispersystems.signalservice.api.NetworkResult import kotlin.time.Duration.Companion.days import kotlin.time.Duration.Companion.milliseconds import kotlin.time.Duration.Companion.seconds diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberRepository.kt index 64e805aeb7..0ac0f97cee 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberRepository.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberRepository.kt @@ -21,6 +21,7 @@ import org.signal.libsignal.protocol.state.SignalProtocolStore import org.signal.libsignal.protocol.state.SignedPreKeyRecord import org.signal.libsignal.protocol.util.KeyHelper import org.signal.libsignal.protocol.util.Medium +import org.signal.network.NetworkResult import org.thoughtcrime.securesms.crypto.PreKeyUtil import org.thoughtcrime.securesms.database.IdentityTable import org.thoughtcrime.securesms.database.SignalDatabase @@ -36,7 +37,6 @@ import org.thoughtcrime.securesms.pin.SvrWrongPinException import org.thoughtcrime.securesms.recipients.Recipient import org.thoughtcrime.securesms.registration.viewmodel.SvrAuthCredentialSet import org.thoughtcrime.securesms.storage.StorageSyncHelper -import org.whispersystems.signalservice.api.NetworkResult import org.whispersystems.signalservice.api.SignalServiceAccountManager import org.whispersystems.signalservice.api.SignalServiceMessageSender import org.whispersystems.signalservice.api.SvrNoDataException diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberResult.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberResult.kt index 1ae6dba84f..3e0ed33aa3 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberResult.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberResult.kt @@ -5,11 +5,11 @@ package org.thoughtcrime.securesms.components.settings.app.changenumber +import org.signal.network.NetworkResult +import org.signal.network.exceptions.NonSuccessfulResponseCodeException import org.thoughtcrime.securesms.pin.SvrWrongPinException import org.thoughtcrime.securesms.registration.data.network.RegistrationResult -import org.whispersystems.signalservice.api.NetworkResult import org.whispersystems.signalservice.api.SvrNoDataException -import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException import org.whispersystems.signalservice.api.svr.Svr3Credentials import org.whispersystems.signalservice.internal.push.AuthCredentials import org.whispersystems.signalservice.internal.push.PushServiceSocket.RegistrationLockFailure diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/backup/InternalBackupPlaygroundViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/backup/InternalBackupPlaygroundViewModel.kt index 4218f89b26..2bab3392af 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/backup/InternalBackupPlaygroundViewModel.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/backup/InternalBackupPlaygroundViewModel.kt @@ -37,6 +37,7 @@ import org.signal.core.util.readNBytesOrThrow import org.signal.core.util.roundedString import org.signal.core.util.stream.LimitedInputStream import org.signal.libsignal.zkgroup.profiles.ProfileKey +import org.signal.network.NetworkResult import org.signal.network.api.SvrBApi import org.thoughtcrime.securesms.attachments.AttachmentId import org.thoughtcrime.securesms.attachments.DatabaseAttachment @@ -58,7 +59,6 @@ import org.thoughtcrime.securesms.keyvalue.protos.LocalBackupCreationProgress import org.thoughtcrime.securesms.net.SignalNetwork import org.thoughtcrime.securesms.providers.BlobProvider import org.thoughtcrime.securesms.recipients.Recipient -import org.whispersystems.signalservice.api.NetworkResult import java.io.FileOutputStream import java.io.IOException import java.io.InputStream diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/RecurringInAppPaymentRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/RecurringInAppPaymentRepository.kt index f1aa80127a..a6ffb85eb5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/RecurringInAppPaymentRepository.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/RecurringInAppPaymentRepository.kt @@ -7,6 +7,7 @@ import io.reactivex.rxjava3.core.Single import io.reactivex.rxjava3.schedulers.Schedulers import org.signal.core.util.logging.Log import org.signal.donations.PaymentSourceType +import org.signal.network.NetworkResult import org.thoughtcrime.securesms.backup.v2.MessageBackupTier import org.thoughtcrime.securesms.badges.Badges import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentsRepository.requireSubscriberType @@ -29,7 +30,6 @@ import org.thoughtcrime.securesms.storage.StorageSyncHelper import org.thoughtcrime.securesms.subscription.LevelUpdate import org.thoughtcrime.securesms.subscription.LevelUpdateOperation import org.thoughtcrime.securesms.subscription.Subscription -import org.whispersystems.signalservice.api.NetworkResult import org.whispersystems.signalservice.api.storage.IAPSubscriptionId import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription import org.whispersystems.signalservice.api.subscriptions.IdempotencyKey diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/DonationCheckoutViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/DonationCheckoutViewModel.kt index 6a9314ef05..7fe0eee68b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/DonationCheckoutViewModel.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/DonationCheckoutViewModel.kt @@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.components.settings.app.subscription.donate import androidx.lifecycle.ViewModel import org.signal.core.util.logging.Log +import org.signal.network.util.Preconditions import org.thoughtcrime.securesms.database.InAppPaymentTable -import org.whispersystems.signalservice.api.util.Preconditions /** * State holder for the checkout flow when utilizing Google Pay. diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/paypal/PayPalPaymentInProgressViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/paypal/PayPalPaymentInProgressViewModel.kt index e8c98a17b7..e4ce6e346b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/paypal/PayPalPaymentInProgressViewModel.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/paypal/PayPalPaymentInProgressViewModel.kt @@ -14,6 +14,7 @@ import org.signal.core.util.logging.Log import org.signal.donations.InAppPaymentType import org.signal.donations.PayPalPaymentSource import org.signal.donations.PaymentSourceType +import org.signal.network.util.Preconditions import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentsRepository import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentsRepository.requireSubscriberType import org.thoughtcrime.securesms.components.settings.app.subscription.RecurringInAppPaymentRepository @@ -26,7 +27,6 @@ import org.thoughtcrime.securesms.database.model.InAppPaymentSubscriberRecord import org.thoughtcrime.securesms.jobs.MultiDeviceSubscriptionSyncRequestJob import org.thoughtcrime.securesms.keyvalue.SignalStore import org.thoughtcrime.securesms.util.rx.RxStore -import org.whispersystems.signalservice.api.util.Preconditions class PayPalPaymentInProgressViewModel : ViewModel() { diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/stripe/StripePaymentInProgressViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/stripe/StripePaymentInProgressViewModel.kt index 0590013ae7..59fdea99a0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/stripe/StripePaymentInProgressViewModel.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/stripe/StripePaymentInProgressViewModel.kt @@ -16,6 +16,7 @@ import org.signal.donations.InAppPaymentType import org.signal.donations.PaymentSource import org.signal.donations.PaymentSourceType import org.signal.donations.StripeApi +import org.signal.network.util.Preconditions import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentsRepository import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentsRepository.requireSubscriberType import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentsRepository.toErrorSource @@ -29,7 +30,6 @@ import org.thoughtcrime.securesms.database.InAppPaymentTable import org.thoughtcrime.securesms.database.SignalDatabase import org.thoughtcrime.securesms.database.model.InAppPaymentSubscriberRecord import org.thoughtcrime.securesms.util.rx.RxStore -import org.whispersystems.signalservice.api.util.Preconditions class StripePaymentInProgressViewModel : ViewModel() { diff --git a/app/src/main/java/org/thoughtcrime/securesms/contacts/paged/ContactSearchViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/contacts/paged/ContactSearchViewModel.kt index 5b5ebea5dc..c37ea14925 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/contacts/paged/ContactSearchViewModel.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/contacts/paged/ContactSearchViewModel.kt @@ -25,6 +25,7 @@ import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.stateIn import kotlinx.coroutines.flow.update import kotlinx.coroutines.launch +import org.signal.network.util.Preconditions import org.signal.paging.PagedData import org.signal.paging.PagingConfig import org.signal.paging.PagingController @@ -37,7 +38,6 @@ import org.thoughtcrime.securesms.search.SearchFilter import org.thoughtcrime.securesms.search.SearchRepository import org.thoughtcrime.securesms.util.adapter.mapping.MappingModelList import org.thoughtcrime.securesms.util.adapter.mapping.PagingMappingAdapter -import org.whispersystems.signalservice.api.util.Preconditions /** * Manages paged contact search data, query/filter state, and contact selection. Drives 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 d2e5c9dd77..a024f85e84 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 @@ -5,6 +5,7 @@ import androidx.annotation.WorkerThread import org.signal.contacts.SystemContactsRepository import org.signal.core.util.Stopwatch import org.signal.core.util.logging.Log +import org.signal.network.NetworkResult import org.thoughtcrime.securesms.contacts.sync.FuzzyPhoneNumberHelper.InputResult import org.thoughtcrime.securesms.contacts.sync.FuzzyPhoneNumberHelper.OutputResult import org.thoughtcrime.securesms.database.RecipientTable.CdsV2Result @@ -16,7 +17,6 @@ import org.thoughtcrime.securesms.recipients.Recipient import org.thoughtcrime.securesms.recipients.RecipientId import org.thoughtcrime.securesms.util.RemoteConfig import org.thoughtcrime.securesms.util.SignalE164Util -import org.whispersystems.signalservice.api.NetworkResult import org.whispersystems.signalservice.api.cds.CdsiV2Service import org.whispersystems.signalservice.api.push.exceptions.CdsiInvalidTokenException import org.whispersystems.signalservice.api.push.exceptions.CdsiResourceExhaustedException diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationIntents.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationIntents.java index 42b4b4039a..bb18ae58e4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationIntents.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationIntents.java @@ -18,7 +18,7 @@ import org.thoughtcrime.securesms.database.ThreadTable; import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.recipients.RecipientId; import org.thoughtcrime.securesms.stickers.StickerLocator; -import org.whispersystems.signalservice.api.util.Preconditions; +import org.signal.network.util.Preconditions; import java.util.ArrayList; import java.util.Collection; diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/NewConversationViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/NewConversationViewModel.kt index e040368ec1..3ba15ec769 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/NewConversationViewModel.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/NewConversationViewModel.kt @@ -16,6 +16,7 @@ import kotlinx.coroutines.launch import kotlinx.coroutines.rx3.await import kotlinx.coroutines.withContext import org.signal.core.util.logging.Log +import org.signal.network.NetworkResult import org.thoughtcrime.securesms.contacts.management.ContactsManagementRepository import org.thoughtcrime.securesms.contacts.sync.ContactDiscovery import org.thoughtcrime.securesms.conversation.NewConversationUiState.UserMessage.Info @@ -27,7 +28,6 @@ import org.thoughtcrime.securesms.recipients.Recipient import org.thoughtcrime.securesms.recipients.RecipientId import org.thoughtcrime.securesms.recipients.RecipientRepository import org.thoughtcrime.securesms.recipients.ui.RecipientSelection -import org.whispersystems.signalservice.api.NetworkResult class NewConversationViewModel : ViewModel() { companion object { diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/forward/MultiselectForwardRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/forward/MultiselectForwardRepository.kt index df8ef252bc..8fed574719 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/forward/MultiselectForwardRepository.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/forward/MultiselectForwardRepository.kt @@ -3,6 +3,7 @@ package org.thoughtcrime.securesms.conversation.mutiselect.forward import io.reactivex.rxjava3.core.Single import io.reactivex.rxjava3.schedulers.Schedulers import org.signal.core.util.concurrent.SignalExecutors +import org.signal.network.util.Preconditions import org.thoughtcrime.securesms.contacts.paged.ContactSearchKey import org.thoughtcrime.securesms.database.SignalDatabase import org.thoughtcrime.securesms.recipients.Recipient @@ -10,7 +11,6 @@ import org.thoughtcrime.securesms.recipients.RecipientId import org.thoughtcrime.securesms.sharing.MultiShareArgs import org.thoughtcrime.securesms.sharing.MultiShareSender import org.thoughtcrime.securesms.stories.Stories -import org.whispersystems.signalservice.api.util.Preconditions import java.util.Optional class MultiselectForwardRepository { diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/chatfilter/ProgressVelocityTracker.kt b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/chatfilter/ProgressVelocityTracker.kt index e5b189f462..3b10ae81f1 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/chatfilter/ProgressVelocityTracker.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/chatfilter/ProgressVelocityTracker.kt @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.conversationlist.chatfilter import androidx.annotation.FloatRange -import org.whispersystems.signalservice.api.util.Preconditions +import org.signal.network.util.Preconditions import kotlin.time.Duration /** diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/RemappedRecords.java b/app/src/main/java/org/thoughtcrime/securesms/database/RemappedRecords.java index fb97049171..77c2ce6a16 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/RemappedRecords.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/RemappedRecords.java @@ -4,7 +4,7 @@ import androidx.annotation.NonNull; import org.signal.core.util.logging.Log; import org.thoughtcrime.securesms.recipients.RecipientId; -import org.whispersystems.signalservice.api.util.Preconditions; +import org.signal.network.util.Preconditions; import java.util.Collection; import java.util.LinkedHashSet; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/TransformPropertiesUtil.kt b/app/src/main/java/org/thoughtcrime/securesms/database/TransformPropertiesUtil.kt index 42ceb5215e..2dfc29bd2e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/TransformPropertiesUtil.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/TransformPropertiesUtil.kt @@ -8,8 +8,8 @@ package org.thoughtcrime.securesms.database import kotlinx.serialization.json.Json import org.signal.core.models.media.TransformProperties import org.signal.core.util.logging.Log +import org.signal.network.util.JsonUtil import org.thoughtcrime.securesms.mms.SentMediaQuality -import org.whispersystems.signalservice.internal.util.JsonUtil import java.io.IOException import java.util.Optional diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/UnknownStorageIdTable.java b/app/src/main/java/org/thoughtcrime/securesms/database/UnknownStorageIdTable.java index 4059b85d82..95d1fc5c33 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/UnknownStorageIdTable.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/UnknownStorageIdTable.java @@ -12,7 +12,7 @@ import org.signal.core.util.Base64; import org.signal.core.util.SqlUtil; import org.whispersystems.signalservice.api.storage.SignalStorageRecord; import org.whispersystems.signalservice.api.storage.StorageId; -import org.whispersystems.signalservice.api.util.Preconditions; +import org.signal.network.util.Preconditions; import java.io.IOException; import java.util.ArrayList; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/model/ThreadRecord.java b/app/src/main/java/org/thoughtcrime/securesms/database/model/ThreadRecord.java index b01e05a79c..249d198a97 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/model/ThreadRecord.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/model/ThreadRecord.java @@ -29,7 +29,7 @@ import org.thoughtcrime.securesms.database.model.databaseprotos.BodyRangeList; import org.thoughtcrime.securesms.database.model.databaseprotos.MessageExtras; import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.recipients.RecipientId; -import org.whispersystems.signalservice.api.util.Preconditions; +import org.signal.network.util.Preconditions; import java.util.Objects; diff --git a/app/src/main/java/org/thoughtcrime/securesms/delete/DeleteAccountRepository.java b/app/src/main/java/org/thoughtcrime/securesms/delete/DeleteAccountRepository.java index ba2c335fbb..8611ca459b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/delete/DeleteAccountRepository.java +++ b/app/src/main/java/org/thoughtcrime/securesms/delete/DeleteAccountRepository.java @@ -18,7 +18,7 @@ import org.thoughtcrime.securesms.groups.GroupManager; import org.thoughtcrime.securesms.net.SignalNetwork; import org.thoughtcrime.securesms.util.ServiceUtil; import org.whispersystems.signalservice.api.NetworkResultUtil; -import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException; +import org.signal.network.exceptions.NonSuccessfulResponseCodeException; import org.whispersystems.signalservice.internal.EmptyResponse; import org.whispersystems.signalservice.internal.ServiceResponse; diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/memberlabel/MemberLabelRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/groups/memberlabel/MemberLabelRepository.kt index 8f3d91d5fa..54dc5ccafb 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/memberlabel/MemberLabelRepository.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/memberlabel/MemberLabelRepository.kt @@ -11,6 +11,7 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import org.signal.core.models.ServiceId import org.signal.core.util.orNull +import org.signal.network.NetworkResult import org.thoughtcrime.securesms.conversation.colors.ColorizerV2 import org.thoughtcrime.securesms.conversation.colors.NameColor import org.thoughtcrime.securesms.database.GroupTable @@ -25,7 +26,6 @@ import org.thoughtcrime.securesms.keyvalue.UiHintValues import org.thoughtcrime.securesms.recipients.Recipient import org.thoughtcrime.securesms.recipients.RecipientId import org.thoughtcrime.securesms.recipients.RecipientUtil -import org.whispersystems.signalservice.api.NetworkResult /** * Handles the retrieval and modification of group member labels. diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/memberlabel/MemberLabelViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/groups/memberlabel/MemberLabelViewModel.kt index 83b31158ff..cd7fdae648 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/memberlabel/MemberLabelViewModel.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/memberlabel/MemberLabelViewModel.kt @@ -15,6 +15,7 @@ import kotlinx.coroutines.launch import org.signal.core.util.StringUtil import org.signal.core.util.concurrent.SignalDispatchers import org.signal.core.util.isNotNullOrBlank +import org.signal.network.NetworkResult import org.thoughtcrime.securesms.conversation.colors.NameColor import org.thoughtcrime.securesms.dependencies.AppDependencies import org.thoughtcrime.securesms.groups.GroupId @@ -23,7 +24,6 @@ import org.thoughtcrime.securesms.groups.memberlabel.MemberLabelUiState.SaveStat import org.thoughtcrime.securesms.groups.ui.GroupMemberOrder import org.thoughtcrime.securesms.recipients.Recipient import org.thoughtcrime.securesms.recipients.RecipientId -import org.whispersystems.signalservice.api.NetworkResult private val MEMBER_ORDER: Comparator = GroupMemberOrder.comparator( isSelf = { it.recipient.isSelf }, diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/v2/processing/GroupsV2StateProcessor.kt b/app/src/main/java/org/thoughtcrime/securesms/groups/v2/processing/GroupsV2StateProcessor.kt index d1cd652ef8..021a44762c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/v2/processing/GroupsV2StateProcessor.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/v2/processing/GroupsV2StateProcessor.kt @@ -16,6 +16,7 @@ import org.signal.libsignal.zkgroup.InvalidInputException import org.signal.libsignal.zkgroup.VerificationFailedException import org.signal.libsignal.zkgroup.groups.GroupMasterKey import org.signal.libsignal.zkgroup.groups.GroupSecretParams +import org.signal.network.NetworkResult import org.signal.storageservice.storage.protos.groups.local.DecryptedGroup import org.signal.storageservice.storage.protos.groups.local.DecryptedGroupChange import org.thoughtcrime.securesms.database.GroupTable @@ -45,7 +46,6 @@ import org.thoughtcrime.securesms.recipients.Recipient import org.thoughtcrime.securesms.recipients.RecipientId import org.thoughtcrime.securesms.storage.StorageSyncHelper import org.thoughtcrime.securesms.util.TextSecurePreferences -import org.whispersystems.signalservice.api.NetworkResult import org.whispersystems.signalservice.api.groupsv2.DecryptedGroupUtil import org.whispersystems.signalservice.api.groupsv2.GroupChangeReconstruct import org.whispersystems.signalservice.api.groupsv2.GroupHistoryPage diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/ArchiveAttachmentReconciliationJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/ArchiveAttachmentReconciliationJob.kt index 1790fc43c1..3e6a88ad90 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/ArchiveAttachmentReconciliationJob.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/ArchiveAttachmentReconciliationJob.kt @@ -21,6 +21,7 @@ import org.signal.core.util.Stopwatch import org.signal.core.util.forEach import org.signal.core.util.logging.Log import org.signal.core.util.nullIfBlank +import org.signal.network.NetworkResult import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.backup.v2.ArchivedMediaObject import org.thoughtcrime.securesms.backup.v2.BackupRepository @@ -37,7 +38,6 @@ import org.thoughtcrime.securesms.notifications.NotificationChannels import org.thoughtcrime.securesms.notifications.NotificationIds import org.thoughtcrime.securesms.util.RemoteConfig import org.thoughtcrime.securesms.wallpaper.WallpaperStorage -import org.whispersystems.signalservice.api.NetworkResult import org.whispersystems.signalservice.api.archive.ArchiveGetMediaItemsResponse import kotlin.time.Duration.Companion.days import kotlin.time.Duration.Companion.hours diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/ArchiveBackupIdReservationJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/ArchiveBackupIdReservationJob.kt index d30bc3f7aa..3cac4a6baf 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/ArchiveBackupIdReservationJob.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/ArchiveBackupIdReservationJob.kt @@ -6,13 +6,13 @@ package org.thoughtcrime.securesms.jobs import org.signal.core.util.logging.Log +import org.signal.network.NetworkResult import org.thoughtcrime.securesms.backup.v2.BackupRepository import org.thoughtcrime.securesms.jobmanager.Job import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint import org.thoughtcrime.securesms.keyvalue.SignalStore import org.thoughtcrime.securesms.util.RemoteConfig import org.thoughtcrime.securesms.util.TextSecurePreferences -import org.whispersystems.signalservice.api.NetworkResult /** * Reserves backupIds for both text+media. The intention is that every registered user should be doing this, so it should happen post-registration diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/ArchiveCommitAttachmentDeletesJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/ArchiveCommitAttachmentDeletesJob.kt index 3212da7692..195e437482 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/ArchiveCommitAttachmentDeletesJob.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/ArchiveCommitAttachmentDeletesJob.kt @@ -8,6 +8,7 @@ package org.thoughtcrime.securesms.jobs import org.signal.core.models.backup.MediaId import org.signal.core.util.Base64 import org.signal.core.util.logging.Log +import org.signal.network.NetworkResult import org.thoughtcrime.securesms.backup.v2.ArchivedMediaObject import org.thoughtcrime.securesms.backup.v2.BackupRepository import org.thoughtcrime.securesms.database.BackupMediaSnapshotTable @@ -15,7 +16,6 @@ import org.thoughtcrime.securesms.database.SignalDatabase import org.thoughtcrime.securesms.jobmanager.Job import org.thoughtcrime.securesms.keyvalue.SignalStore import org.thoughtcrime.securesms.util.RemoteConfig -import org.whispersystems.signalservice.api.NetworkResult import java.lang.RuntimeException import kotlin.time.Duration.Companion.days import kotlin.time.Duration.Companion.hours diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/ArchiveThumbnailUploadJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/ArchiveThumbnailUploadJob.kt index e7a1ebf835..8dae9442cd 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/ArchiveThumbnailUploadJob.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/ArchiveThumbnailUploadJob.kt @@ -8,6 +8,7 @@ package org.thoughtcrime.securesms.jobs import org.signal.core.util.Util import org.signal.core.util.logging.Log import org.signal.glide.decryptableuri.DecryptableUri +import org.signal.network.NetworkResult import org.thoughtcrime.securesms.attachments.AttachmentId import org.thoughtcrime.securesms.attachments.AttachmentUploadUtil import org.thoughtcrime.securesms.attachments.DatabaseAttachment @@ -29,7 +30,6 @@ import org.thoughtcrime.securesms.net.SignalNetwork import org.thoughtcrime.securesms.util.ImageCompressionUtil import org.thoughtcrime.securesms.util.MediaUtil import org.thoughtcrime.securesms.util.RemoteConfig -import org.whispersystems.signalservice.api.NetworkResult import org.whispersystems.signalservice.api.attachment.AttachmentUploadResult import org.whispersystems.signalservice.api.crypto.AttachmentCipherStreamUtil import org.whispersystems.signalservice.api.messages.SignalServiceAttachment diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentDownloadJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentDownloadJob.kt index 48559806f8..9e4c92d0c2 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentDownloadJob.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentDownloadJob.kt @@ -14,6 +14,8 @@ import org.signal.core.util.Util import org.signal.core.util.logging.Log import org.signal.libsignal.protocol.InvalidMacException import org.signal.libsignal.protocol.InvalidMessageException +import org.signal.network.exceptions.NonSuccessfulResponseCodeException +import org.signal.network.exceptions.PushNetworkException import org.thoughtcrime.securesms.attachments.Attachment import org.thoughtcrime.securesms.attachments.AttachmentId import org.thoughtcrime.securesms.attachments.Cdn @@ -44,8 +46,6 @@ import org.whispersystems.signalservice.api.messages.SignalServiceAttachment import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentPointer import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentRemoteId import org.whispersystems.signalservice.api.push.exceptions.MissingConfigurationException -import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException -import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException import org.whispersystems.signalservice.api.push.exceptions.RangeException import org.whispersystems.signalservice.internal.crypto.PaddingInputStream import java.io.File diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/AvatarGroupsV1DownloadJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/AvatarGroupsV1DownloadJob.java index b459d33982..5997fb4b09 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/AvatarGroupsV1DownloadJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/AvatarGroupsV1DownloadJob.java @@ -21,7 +21,7 @@ import org.whispersystems.signalservice.api.crypto.AttachmentCipherInputStream.I import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentPointer; import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentRemoteId; import org.whispersystems.signalservice.api.push.exceptions.MissingConfigurationException; -import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException; +import org.signal.network.exceptions.NonSuccessfulResponseCodeException; import java.io.File; import java.io.IOException; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/AvatarGroupsV2DownloadJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/AvatarGroupsV2DownloadJob.java index 33eb9435b9..c12a40daca 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/AvatarGroupsV2DownloadJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/AvatarGroupsV2DownloadJob.java @@ -24,7 +24,7 @@ import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.util.ByteUnit; import org.whispersystems.signalservice.api.SignalServiceMessageReceiver; import org.whispersystems.signalservice.api.groupsv2.GroupsV2Operations; -import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException; +import org.signal.network.exceptions.NonSuccessfulResponseCodeException; import java.io.ByteArrayInputStream; import java.io.File; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/BackupDeleteJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/BackupDeleteJob.kt index f279f9cb20..b1e31e6b0e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/BackupDeleteJob.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/BackupDeleteJob.kt @@ -6,6 +6,7 @@ package org.thoughtcrime.securesms.jobs import org.signal.core.util.logging.Log +import org.signal.network.NetworkResult import org.thoughtcrime.securesms.backup.DeletionState import org.thoughtcrime.securesms.backup.v2.BackupRepository import org.thoughtcrime.securesms.backup.v2.MessageBackupTier @@ -21,7 +22,6 @@ import org.thoughtcrime.securesms.jobs.protos.BackupDeleteJobData import org.thoughtcrime.securesms.keyvalue.SignalStore import org.thoughtcrime.securesms.recipients.Recipient import org.thoughtcrime.securesms.storage.StorageSyncHelper -import org.whispersystems.signalservice.api.NetworkResult import kotlin.time.Duration.Companion.seconds /** diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/BackupMessagesJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/BackupMessagesJob.kt index 2cbed6d2eb..d2ba478e0f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/BackupMessagesJob.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/BackupMessagesJob.kt @@ -23,6 +23,7 @@ import org.signal.core.util.logging.logW import org.signal.libsignal.messagebackup.BackupForwardSecrecyToken import org.signal.libsignal.net.SvrBStoreResponse import org.signal.libsignal.zkgroup.VerificationFailedException +import org.signal.network.NetworkResult import org.signal.network.api.SvrBApi import org.signal.protos.resumableuploads.ResumableUpload import org.thoughtcrime.securesms.R @@ -52,7 +53,6 @@ import org.thoughtcrime.securesms.recipients.Recipient import org.thoughtcrime.securesms.storage.StorageSyncHelper import org.thoughtcrime.securesms.util.MediaUtil import org.thoughtcrime.securesms.util.RemoteConfig -import org.whispersystems.signalservice.api.NetworkResult import org.whispersystems.signalservice.api.messages.AttachmentTransferProgress import org.whispersystems.signalservice.api.messages.SignalServiceAttachment import org.whispersystems.signalservice.api.push.exceptions.ResumeLocationInvalidException diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/BackupRefreshJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/BackupRefreshJob.kt index 21a547d883..8a6ef9e5cd 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/BackupRefreshJob.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/BackupRefreshJob.kt @@ -6,12 +6,12 @@ package org.thoughtcrime.securesms.jobs import org.signal.core.util.logging.Log +import org.signal.network.NetworkResult import org.thoughtcrime.securesms.backup.v2.BackupRepository import org.thoughtcrime.securesms.dependencies.AppDependencies import org.thoughtcrime.securesms.jobmanager.Job import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint import org.thoughtcrime.securesms.keyvalue.SignalStore -import org.whispersystems.signalservice.api.NetworkResult import kotlin.time.Duration.Companion.days import kotlin.time.Duration.Companion.milliseconds diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/BackupSubscriptionCheckJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/BackupSubscriptionCheckJob.kt index 37075a4f5e..282775fc7b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/BackupSubscriptionCheckJob.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/BackupSubscriptionCheckJob.kt @@ -11,6 +11,7 @@ import org.signal.core.util.billing.BillingPurchaseResult import org.signal.core.util.logging.Log import org.signal.core.util.money.FiatMoney import org.signal.donations.InAppPaymentType +import org.signal.network.NetworkResult import org.thoughtcrime.securesms.backup.DeletionState import org.thoughtcrime.securesms.backup.v2.BackupRepository import org.thoughtcrime.securesms.backup.v2.MessageBackupTier @@ -29,7 +30,6 @@ import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint import org.thoughtcrime.securesms.keyvalue.SignalStore import org.thoughtcrime.securesms.net.SignalNetwork import org.thoughtcrime.securesms.recipients.Recipient -import org.whispersystems.signalservice.api.NetworkResult import org.whispersystems.signalservice.api.storage.IAPSubscriptionId import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription import org.whispersystems.signalservice.internal.push.SubscriptionsConfiguration diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/BuildExpirationConfirmationJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/BuildExpirationConfirmationJob.kt index 1fc3340d8b..f890d9d6b6 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/BuildExpirationConfirmationJob.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/BuildExpirationConfirmationJob.kt @@ -7,12 +7,12 @@ package org.thoughtcrime.securesms.jobs import org.signal.core.util.Util import org.signal.core.util.logging.Log +import org.signal.network.NetworkResult import org.thoughtcrime.securesms.BuildConfig import org.thoughtcrime.securesms.jobmanager.Job import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint import org.thoughtcrime.securesms.keyvalue.SignalStore import org.thoughtcrime.securesms.net.SignalNetwork -import org.whispersystems.signalservice.api.NetworkResult import org.whispersystems.signalservice.api.remoteconfig.RemoteConfigResult import kotlin.time.Duration.Companion.days diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/CallLinkUpdateSendJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/CallLinkUpdateSendJob.kt index 840c00a4d4..d216c52d1b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/CallLinkUpdateSendJob.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/CallLinkUpdateSendJob.kt @@ -7,6 +7,7 @@ package org.thoughtcrime.securesms.jobs import okio.ByteString.Companion.toByteString import org.signal.core.util.logging.Log +import org.signal.network.exceptions.PushNetworkException import org.thoughtcrime.securesms.database.SignalDatabase import org.thoughtcrime.securesms.dependencies.AppDependencies import org.thoughtcrime.securesms.jobmanager.Job @@ -15,7 +16,6 @@ import org.thoughtcrime.securesms.jobmanager.impl.SealedSenderConstraint import org.thoughtcrime.securesms.jobs.protos.CallLinkUpdateSendJobData import org.thoughtcrime.securesms.service.webrtc.links.CallLinkRoomId import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSyncMessage -import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException import org.whispersystems.signalservice.api.push.exceptions.ServerRejectedException import org.whispersystems.signalservice.internal.push.SyncMessage.CallLinkUpdate import java.util.concurrent.TimeUnit diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/CallLogEventSendJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/CallLogEventSendJob.kt index b56ec589f5..ee7cf5a17f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/CallLogEventSendJob.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/CallLogEventSendJob.kt @@ -7,6 +7,7 @@ package org.thoughtcrime.securesms.jobs import androidx.annotation.WorkerThread import okio.ByteString.Companion.toByteString +import org.signal.network.exceptions.PushNetworkException import org.thoughtcrime.securesms.database.CallTable import org.thoughtcrime.securesms.dependencies.AppDependencies import org.thoughtcrime.securesms.jobmanager.Job @@ -15,7 +16,6 @@ import org.thoughtcrime.securesms.jobmanager.impl.SealedSenderConstraint import org.thoughtcrime.securesms.jobs.protos.CallLogEventSendJobData import org.thoughtcrime.securesms.recipients.Recipient import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSyncMessage -import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException import org.whispersystems.signalservice.api.push.exceptions.ServerRejectedException import org.whispersystems.signalservice.internal.push.SyncMessage import java.util.concurrent.TimeUnit diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/CallQualitySurveySubmissionJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/CallQualitySurveySubmissionJob.kt index 021254800f..23c82b8149 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/CallQualitySurveySubmissionJob.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/CallQualitySurveySubmissionJob.kt @@ -6,13 +6,13 @@ package org.thoughtcrime.securesms.jobs import org.signal.core.util.logging.Log +import org.signal.network.NetworkResult import org.signal.storageservice.protos.calls.quality.SubmitCallQualitySurveyRequest import org.thoughtcrime.securesms.dependencies.AppDependencies import org.thoughtcrime.securesms.jobmanager.Job import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint import org.thoughtcrime.securesms.jobs.protos.CallQualitySurveySubmissionJobData import org.thoughtcrime.securesms.logsubmit.SubmitDebugLogRepository -import org.whispersystems.signalservice.api.NetworkResult import kotlin.jvm.optionals.getOrNull import kotlin.time.Duration.Companion.hours diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/CopyAttachmentToArchiveJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/CopyAttachmentToArchiveJob.kt index 866590bfd1..dcd0528e3d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/CopyAttachmentToArchiveJob.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/CopyAttachmentToArchiveJob.kt @@ -8,6 +8,7 @@ import org.signal.core.util.bytes import org.signal.core.util.logging.Log import org.signal.core.util.logging.logW import org.signal.libsignal.zkgroup.VerificationFailedException +import org.signal.network.NetworkResult import org.thoughtcrime.securesms.attachments.AttachmentId import org.thoughtcrime.securesms.attachments.Cdn import org.thoughtcrime.securesms.attachments.DatabaseAttachment @@ -25,7 +26,6 @@ import org.thoughtcrime.securesms.jobs.protos.CopyAttachmentToArchiveJobData import org.thoughtcrime.securesms.keyvalue.SignalStore import org.thoughtcrime.securesms.util.MediaUtil import org.thoughtcrime.securesms.util.RemoteConfig -import org.whispersystems.signalservice.api.NetworkResult import java.util.concurrent.TimeUnit /** diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/DirectoryRefreshJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/DirectoryRefreshJob.java index 7f79b262da..c9db40027c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/DirectoryRefreshJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/DirectoryRefreshJob.java @@ -10,7 +10,7 @@ import org.thoughtcrime.securesms.jobmanager.Job; import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint; import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.recipients.RecipientId; -import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException; +import org.signal.network.exceptions.PushNetworkException; import java.io.IOException; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/EmojiSearchIndexDownloadJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/EmojiSearchIndexDownloadJob.java index d9f6912fce..0bcfcf56b9 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/EmojiSearchIndexDownloadJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/EmojiSearchIndexDownloadJob.java @@ -15,8 +15,8 @@ import org.thoughtcrime.securesms.keyvalue.EmojiValues; import org.thoughtcrime.securesms.keyvalue.SignalStore; import org.thoughtcrime.securesms.s3.S3; import org.thoughtcrime.securesms.util.dynamiclanguage.DynamicLanguageContextWrapper; -import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException; -import org.whispersystems.signalservice.internal.util.JsonUtil; +import org.signal.network.exceptions.NonSuccessfulResponseCodeException; +import org.signal.network.util.JsonUtil; import java.io.IOException; import java.util.Arrays; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/FcmRefreshJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/FcmRefreshJob.java index 8af65ea7fa..76d94d466b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/FcmRefreshJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/FcmRefreshJob.java @@ -43,7 +43,7 @@ import org.thoughtcrime.securesms.notifications.NotificationChannels; import org.thoughtcrime.securesms.notifications.NotificationIds; import org.thoughtcrime.securesms.transport.RetryLaterException; import org.whispersystems.signalservice.api.NetworkResultUtil; -import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException; +import org.signal.network.exceptions.NonSuccessfulResponseCodeException; import java.io.IOException; import java.util.Optional; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/ForceUpdateGroupV2WorkerJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/ForceUpdateGroupV2WorkerJob.java index 6d7e952681..2cfacbfdcb 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/ForceUpdateGroupV2WorkerJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/ForceUpdateGroupV2WorkerJob.java @@ -15,7 +15,7 @@ import org.thoughtcrime.securesms.jobmanager.Job; import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint; import org.thoughtcrime.securesms.recipients.Recipient; import org.whispersystems.signalservice.api.groupsv2.NoCredentialForRedemptionTimeException; -import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException; +import org.signal.network.exceptions.PushNetworkException; import java.io.IOException; import java.util.Optional; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/GroupV2UpdateSelfProfileKeyJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/GroupV2UpdateSelfProfileKeyJob.java index a6c4145a81..d4834528c5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/GroupV2UpdateSelfProfileKeyJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/GroupV2UpdateSelfProfileKeyJob.java @@ -23,7 +23,7 @@ import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint; import org.thoughtcrime.securesms.keyvalue.SignalStore; import org.thoughtcrime.securesms.recipients.Recipient; import org.whispersystems.signalservice.api.groupsv2.NoCredentialForRedemptionTimeException; -import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException; +import org.signal.network.exceptions.PushNetworkException; import java.io.IOException; import java.util.Optional; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/InAppPaymentRecurringContextJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/InAppPaymentRecurringContextJob.kt index 4cea5c1142..2ce38a6b52 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/InAppPaymentRecurringContextJob.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/InAppPaymentRecurringContextJob.kt @@ -13,6 +13,8 @@ import org.signal.libsignal.zkgroup.receipts.ReceiptCredential import org.signal.libsignal.zkgroup.receipts.ReceiptCredentialPresentation import org.signal.libsignal.zkgroup.receipts.ReceiptCredentialRequestContext import org.signal.libsignal.zkgroup.receipts.ReceiptCredentialResponse +import org.signal.network.NetworkResult +import org.signal.network.exceptions.NonSuccessfulResponseCodeException import org.thoughtcrime.securesms.backup.v2.BackupRepository import org.thoughtcrime.securesms.backup.v2.MessageBackupTier import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentsRepository @@ -28,8 +30,6 @@ import org.thoughtcrime.securesms.jobmanager.Job import org.thoughtcrime.securesms.jobmanager.JobManager.Chain import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint import org.thoughtcrime.securesms.keyvalue.SignalStore -import org.whispersystems.signalservice.api.NetworkResult -import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription.ChargeFailure import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription.Subscription diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MessageFetchJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MessageFetchJob.java index a9257c5f07..ab8b942b22 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MessageFetchJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MessageFetchJob.java @@ -15,7 +15,7 @@ import org.thoughtcrime.securesms.messages.WebSocketDrainer; import org.thoughtcrime.securesms.notifications.NotificationChannels; import org.thoughtcrime.securesms.service.GenericForegroundService; import org.thoughtcrime.securesms.util.AppForegroundObserver; -import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException; +import org.signal.network.exceptions.PushNetworkException; import java.io.IOException; import java.util.concurrent.atomic.AtomicReference; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceBlockedUpdateJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceBlockedUpdateJob.kt index 0013f96a5c..a4630cb118 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceBlockedUpdateJob.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceBlockedUpdateJob.kt @@ -1,6 +1,7 @@ package org.thoughtcrime.securesms.jobs import org.signal.core.util.logging.Log +import org.signal.network.exceptions.PushNetworkException import org.thoughtcrime.securesms.database.SignalDatabase import org.thoughtcrime.securesms.database.model.RecipientRecord import org.thoughtcrime.securesms.dependencies.AppDependencies @@ -13,7 +14,6 @@ import org.thoughtcrime.securesms.recipients.Recipient import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException import org.whispersystems.signalservice.api.messages.multidevice.BlockedListMessage import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSyncMessage -import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException import org.whispersystems.signalservice.api.push.exceptions.ServerRejectedException import java.io.IOException import java.util.concurrent.TimeUnit diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceCallLinkSyncJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceCallLinkSyncJob.kt index 61cbb911b7..5a3831af48 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceCallLinkSyncJob.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceCallLinkSyncJob.kt @@ -7,13 +7,13 @@ package org.thoughtcrime.securesms.jobs import okio.ByteString.Companion.toByteString import org.signal.core.util.logging.Log +import org.signal.network.exceptions.PushNetworkException import org.thoughtcrime.securesms.dependencies.AppDependencies import org.thoughtcrime.securesms.jobmanager.Job import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint import org.thoughtcrime.securesms.jobmanager.impl.SealedSenderConstraint import org.thoughtcrime.securesms.service.webrtc.links.CallLinkCredentials import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSyncMessage -import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException import org.whispersystems.signalservice.internal.push.SyncMessage.CallLinkUpdate import kotlin.time.Duration.Companion.days diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceConfigurationUpdateJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceConfigurationUpdateJob.java index 704319b4b0..3eadf23ffc 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceConfigurationUpdateJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceConfigurationUpdateJob.java @@ -18,7 +18,7 @@ import org.whispersystems.signalservice.api.SignalServiceMessageSender; import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException; import org.whispersystems.signalservice.api.messages.multidevice.ConfigurationMessage; import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSyncMessage; -import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException; +import org.signal.network.exceptions.PushNetworkException; import org.whispersystems.signalservice.api.push.exceptions.ServerRejectedException; import java.io.IOException; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java index 17e89ed477..30228b87f1 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java @@ -47,7 +47,7 @@ import org.whispersystems.signalservice.api.messages.multidevice.DeviceContactsO import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSyncMessage; import org.whispersystems.signalservice.api.messages.multidevice.VerifiedMessage; import org.whispersystems.signalservice.api.push.SignalServiceAddress; -import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException; +import org.signal.network.exceptions.PushNetworkException; import org.whispersystems.signalservice.api.push.exceptions.ServerRejectedException; import org.whispersystems.signalservice.api.util.InvalidNumberException; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceKeysUpdateJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceKeysUpdateJob.kt index 10a809515f..98ab83708e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceKeysUpdateJob.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceKeysUpdateJob.kt @@ -1,6 +1,7 @@ package org.thoughtcrime.securesms.jobs import org.signal.core.util.logging.Log +import org.signal.network.exceptions.PushNetworkException import org.thoughtcrime.securesms.dependencies.AppDependencies import org.thoughtcrime.securesms.jobmanager.Job import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint @@ -11,7 +12,6 @@ import org.thoughtcrime.securesms.recipients.Recipient import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException import org.whispersystems.signalservice.api.messages.multidevice.KeysMessage import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSyncMessage -import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException import org.whispersystems.signalservice.api.push.exceptions.ServerRejectedException import java.io.IOException diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceMessageRequestResponseJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceMessageRequestResponseJob.java index 36086d860c..9e4304d888 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceMessageRequestResponseJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceMessageRequestResponseJob.java @@ -20,7 +20,7 @@ import org.whispersystems.signalservice.api.SignalServiceMessageSender; import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException; import org.whispersystems.signalservice.api.messages.multidevice.MessageRequestResponseMessage; import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSyncMessage; -import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException; +import org.signal.network.exceptions.PushNetworkException; import org.whispersystems.signalservice.api.push.exceptions.ServerRejectedException; import java.io.IOException; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceOutgoingPaymentSyncJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceOutgoingPaymentSyncJob.java index e2c2bfeb11..d6170aafe3 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceOutgoingPaymentSyncJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceOutgoingPaymentSyncJob.java @@ -19,7 +19,7 @@ import org.thoughtcrime.securesms.recipients.RecipientUtil; import org.whispersystems.signalservice.api.messages.multidevice.OutgoingPaymentMessage; import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSyncMessage; import org.signal.core.models.ServiceId; -import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException; +import org.signal.network.exceptions.PushNetworkException; import org.whispersystems.signalservice.api.push.exceptions.ServerRejectedException; import java.util.Optional; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceProfileContentUpdateJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceProfileContentUpdateJob.java index 4f0a7106b1..bfdab14fc9 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceProfileContentUpdateJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceProfileContentUpdateJob.java @@ -14,7 +14,7 @@ import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.util.TextSecurePreferences; import org.whispersystems.signalservice.api.SignalServiceMessageSender; import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSyncMessage; -import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException; +import org.signal.network.exceptions.PushNetworkException; import org.whispersystems.signalservice.api.push.exceptions.ServerRejectedException; public class MultiDeviceProfileContentUpdateJob extends BaseJob { diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceProfileKeyUpdateJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceProfileKeyUpdateJob.java index 1dcc1c4ed8..5f0ecee1d5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceProfileKeyUpdateJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceProfileKeyUpdateJob.java @@ -26,7 +26,7 @@ import org.whispersystems.signalservice.api.messages.multidevice.ContactsMessage import org.whispersystems.signalservice.api.messages.multidevice.DeviceContact; import org.whispersystems.signalservice.api.messages.multidevice.DeviceContactsOutputStream; import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSyncMessage; -import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException; +import org.signal.network.exceptions.PushNetworkException; import org.whispersystems.signalservice.api.push.exceptions.ServerRejectedException; import org.whispersystems.signalservice.internal.push.http.ResumableUploadSpec; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceReadUpdateJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceReadUpdateJob.java index 25ba6b5494..3378e00879 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceReadUpdateJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceReadUpdateJob.java @@ -27,7 +27,7 @@ import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException; import org.whispersystems.signalservice.api.messages.multidevice.ReadMessage; import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSyncMessage; import org.signal.core.models.ServiceId; -import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException; +import org.signal.network.exceptions.PushNetworkException; import org.whispersystems.signalservice.api.push.exceptions.ServerRejectedException; import java.io.IOException; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceStickerPackOperationJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceStickerPackOperationJob.java index 434e293be5..ed83e7897e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceStickerPackOperationJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceStickerPackOperationJob.java @@ -15,7 +15,7 @@ import org.thoughtcrime.securesms.util.TextSecurePreferences; import org.whispersystems.signalservice.api.SignalServiceMessageSender; import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSyncMessage; import org.whispersystems.signalservice.api.messages.multidevice.StickerPackOperationMessage; -import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException; +import org.signal.network.exceptions.PushNetworkException; import org.whispersystems.signalservice.api.push.exceptions.ServerRejectedException; import java.util.Collections; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceStickerPackSyncJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceStickerPackSyncJob.java index 04f1db9826..cbf986e9ef 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceStickerPackSyncJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceStickerPackSyncJob.java @@ -19,7 +19,7 @@ import org.thoughtcrime.securesms.util.TextSecurePreferences; import org.whispersystems.signalservice.api.SignalServiceMessageSender; import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSyncMessage; import org.whispersystems.signalservice.api.messages.multidevice.StickerPackOperationMessage; -import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException; +import org.signal.network.exceptions.PushNetworkException; import org.whispersystems.signalservice.api.push.exceptions.ServerRejectedException; import java.util.LinkedList; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceStorageSyncRequestJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceStorageSyncRequestJob.java index 265f5b7e43..beab6c40a7 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceStorageSyncRequestJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceStorageSyncRequestJob.java @@ -14,7 +14,7 @@ import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.util.TextSecurePreferences; import org.whispersystems.signalservice.api.SignalServiceMessageSender; import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSyncMessage; -import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException; +import org.signal.network.exceptions.PushNetworkException; import org.whispersystems.signalservice.api.push.exceptions.ServerRejectedException; public class MultiDeviceStorageSyncRequestJob extends BaseJob { diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceSubscriptionSyncRequestJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceSubscriptionSyncRequestJob.kt index 319bb12e8a..4010dfe45b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceSubscriptionSyncRequestJob.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceSubscriptionSyncRequestJob.kt @@ -1,6 +1,7 @@ package org.thoughtcrime.securesms.jobs import org.signal.core.util.logging.Log +import org.signal.network.exceptions.PushNetworkException import org.thoughtcrime.securesms.dependencies.AppDependencies import org.thoughtcrime.securesms.jobmanager.Job import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint @@ -9,7 +10,6 @@ import org.thoughtcrime.securesms.keyvalue.SignalStore import org.thoughtcrime.securesms.net.NotPushRegisteredException import org.thoughtcrime.securesms.recipients.Recipient import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSyncMessage -import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException import org.whispersystems.signalservice.api.push.exceptions.ServerRejectedException /** diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceVerifiedUpdateJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceVerifiedUpdateJob.java index cbcc0eab2e..b27572e44c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceVerifiedUpdateJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceVerifiedUpdateJob.java @@ -25,7 +25,7 @@ import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException; import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSyncMessage; import org.whispersystems.signalservice.api.messages.multidevice.VerifiedMessage; import org.whispersystems.signalservice.api.push.SignalServiceAddress; -import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException; +import org.signal.network.exceptions.PushNetworkException; import org.whispersystems.signalservice.api.push.exceptions.ServerRejectedException; import java.io.IOException; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceViewOnceOpenJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceViewOnceOpenJob.java index 08f15181ae..d3f5562ab9 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceViewOnceOpenJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceViewOnceOpenJob.java @@ -23,7 +23,7 @@ import org.whispersystems.signalservice.api.SignalServiceMessageSender; import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException; import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSyncMessage; import org.whispersystems.signalservice.api.messages.multidevice.ViewOnceOpenMessage; -import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException; +import org.signal.network.exceptions.PushNetworkException; import org.whispersystems.signalservice.api.push.exceptions.ServerRejectedException; import java.io.IOException; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceViewedUpdateJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceViewedUpdateJob.java index 92fe350671..28899840fe 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceViewedUpdateJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceViewedUpdateJob.java @@ -27,7 +27,7 @@ import org.whispersystems.signalservice.api.SignalServiceMessageSender; import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException; import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSyncMessage; import org.whispersystems.signalservice.api.messages.multidevice.ViewedMessage; -import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException; +import org.signal.network.exceptions.PushNetworkException; import org.whispersystems.signalservice.api.push.exceptions.ServerRejectedException; import java.io.IOException; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/NullMessageSendJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/NullMessageSendJob.java index ed5d732932..2f7564e42f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/NullMessageSendJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/NullMessageSendJob.java @@ -16,7 +16,7 @@ import org.thoughtcrime.securesms.recipients.RecipientUtil; import org.whispersystems.signalservice.api.SignalServiceMessageSender; import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException; import org.whispersystems.signalservice.api.push.SignalServiceAddress; -import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException; +import org.signal.network.exceptions.PushNetworkException; import java.util.concurrent.TimeUnit; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/PaymentTransactionCheckJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/PaymentTransactionCheckJob.java index 2a6ef98378..bc0ff76348 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/PaymentTransactionCheckJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/PaymentTransactionCheckJob.java @@ -16,7 +16,7 @@ import org.thoughtcrime.securesms.payments.PaymentTransactionId; import org.thoughtcrime.securesms.payments.Payments; import org.thoughtcrime.securesms.payments.Wallet; import org.thoughtcrime.securesms.util.RemoteConfig; -import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException; +import org.signal.network.exceptions.NonSuccessfulResponseCodeException; import java.io.IOException; import java.util.Objects; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/PreKeysSyncJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/PreKeysSyncJob.kt index 96b811216a..80a9bf4a00 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/PreKeysSyncJob.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/PreKeysSyncJob.kt @@ -10,6 +10,8 @@ import org.signal.libsignal.protocol.state.KyberPreKeyRecord import org.signal.libsignal.protocol.state.PreKeyRecord import org.signal.libsignal.protocol.state.SignalProtocolStore import org.signal.libsignal.protocol.state.SignedPreKeyRecord +import org.signal.network.NetworkResult +import org.signal.network.exceptions.NonSuccessfulResponseCodeException import org.thoughtcrime.securesms.crypto.PreKeyUtil import org.thoughtcrime.securesms.crypto.storage.PreKeyMetadataStore import org.thoughtcrime.securesms.dependencies.AppDependencies @@ -20,11 +22,9 @@ import org.thoughtcrime.securesms.keyvalue.SignalStore import org.thoughtcrime.securesms.net.SignalNetwork import org.thoughtcrime.securesms.util.RemoteConfig import org.thoughtcrime.securesms.util.isRetryableIOException -import org.whispersystems.signalservice.api.NetworkResult import org.whispersystems.signalservice.api.SignalServiceAccountDataStore import org.whispersystems.signalservice.api.account.PreKeyUpload import org.whispersystems.signalservice.api.push.ServiceIdType -import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException import java.io.IOException import java.net.ProtocolException import java.util.concurrent.TimeUnit diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushProcessMessageJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushProcessMessageJob.kt index 463d04f5e8..1c3acdc721 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushProcessMessageJob.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushProcessMessageJob.kt @@ -5,6 +5,7 @@ import okio.ByteString.Companion.toByteString import org.signal.core.models.ServiceId import org.signal.core.util.logging.Log import org.signal.libsignal.protocol.message.CiphertextMessage +import org.signal.network.exceptions.PushNetworkException import org.thoughtcrime.securesms.database.SignalDatabase.Companion.groups import org.thoughtcrime.securesms.dependencies.AppDependencies import org.thoughtcrime.securesms.groups.GroupChangeBusyException @@ -21,7 +22,6 @@ import org.thoughtcrime.securesms.util.SignalLocalMetrics import org.whispersystems.signalservice.api.crypto.EnvelopeMetadata import org.whispersystems.signalservice.api.crypto.protos.CompleteMessage import org.whispersystems.signalservice.api.groupsv2.NoCredentialForRedemptionTimeException -import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException import org.whispersystems.signalservice.internal.push.Content import org.whispersystems.signalservice.internal.push.Envelope import org.whispersystems.signalservice.internal.util.Util diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshAttributesJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshAttributesJob.java index 8c495edd97..b8e6a36d62 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshAttributesJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshAttributesJob.java @@ -22,7 +22,7 @@ import org.thoughtcrime.securesms.util.TextSecurePreferences; import org.whispersystems.signalservice.api.NetworkResultUtil; import org.whispersystems.signalservice.api.account.AccountAttributes; import org.whispersystems.signalservice.api.crypto.UnidentifiedAccess; -import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException; +import org.signal.network.exceptions.NonSuccessfulResponseCodeException; import java.io.IOException; import java.nio.charset.StandardCharsets; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshDonationSubscriptionStatusJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshDonationSubscriptionStatusJob.kt index 067abe1af0..8a622b57a8 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshDonationSubscriptionStatusJob.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshDonationSubscriptionStatusJob.kt @@ -1,6 +1,7 @@ package org.thoughtcrime.securesms.jobs import org.signal.core.util.logging.Log +import org.signal.network.exceptions.PushNetworkException import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentsRepository import org.thoughtcrime.securesms.database.model.InAppPaymentSubscriberRecord import org.thoughtcrime.securesms.dependencies.AppDependencies @@ -9,7 +10,6 @@ import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint import org.thoughtcrime.securesms.keyvalue.SignalStore import org.thoughtcrime.securesms.net.NotPushRegisteredException import org.thoughtcrime.securesms.recipients.Recipient -import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException /** * Refreshes the local view of the user's recurring donation subscription by querying diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshOwnProfileJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshOwnProfileJob.kt index d0a453661f..f0440cf365 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshOwnProfileJob.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshOwnProfileJob.kt @@ -9,6 +9,7 @@ import org.signal.libsignal.usernames.BaseUsernameException import org.signal.libsignal.usernames.Username import org.signal.libsignal.zkgroup.profiles.ExpiringProfileKeyCredential import org.signal.libsignal.zkgroup.profiles.ProfileKey +import org.signal.network.exceptions.PushNetworkException import org.thoughtcrime.securesms.badges.BadgeRepository import org.thoughtcrime.securesms.badges.Badges import org.thoughtcrime.securesms.badges.models.Badge @@ -32,7 +33,6 @@ import org.whispersystems.signalservice.api.crypto.InvalidCiphertextException import org.whispersystems.signalservice.api.crypto.ProfileCipher import org.whispersystems.signalservice.api.profiles.ProfileAndCredential import org.whispersystems.signalservice.api.profiles.SignalServiceProfile -import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException import org.whispersystems.signalservice.api.util.ExpiringProfileCredentialUtil import java.io.IOException diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshSvrCredentialsJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshSvrCredentialsJob.kt index 40175201a7..5b4e3afe7c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshSvrCredentialsJob.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshSvrCredentialsJob.kt @@ -1,12 +1,12 @@ package org.thoughtcrime.securesms.jobs import org.signal.core.util.logging.Log +import org.signal.network.exceptions.NonSuccessfulResponseCodeException import org.thoughtcrime.securesms.dependencies.AppDependencies import org.thoughtcrime.securesms.jobmanager.Job import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint import org.thoughtcrime.securesms.keyvalue.SignalStore import org.thoughtcrime.securesms.pin.SvrRepository -import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException import java.io.IOException import kotlin.time.Duration import kotlin.time.Duration.Companion.days diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/RemoteConfigRefreshJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/RemoteConfigRefreshJob.kt index b440d5f7d0..cc9f72a42f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/RemoteConfigRefreshJob.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/RemoteConfigRefreshJob.kt @@ -2,12 +2,12 @@ package org.thoughtcrime.securesms.jobs import org.signal.core.util.isNotNullOrBlank import org.signal.core.util.logging.Log +import org.signal.network.NetworkResult import org.thoughtcrime.securesms.jobmanager.Job import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint import org.thoughtcrime.securesms.keyvalue.SignalStore import org.thoughtcrime.securesms.net.SignalNetwork import org.thoughtcrime.securesms.util.RemoteConfig -import org.whispersystems.signalservice.api.NetworkResult import org.whispersystems.signalservice.api.websocket.SignalWebSocket import kotlin.time.Duration.Companion.days diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/ReportSpamJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/ReportSpamJob.java index 029d95bb37..37a3877c28 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/ReportSpamJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/ReportSpamJob.java @@ -16,7 +16,7 @@ import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.recipients.RecipientId; import org.whispersystems.signalservice.api.NetworkResultUtil; import org.signal.core.models.ServiceId; -import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException; +import org.signal.network.exceptions.NonSuccessfulResponseCodeException; import org.whispersystems.signalservice.api.push.exceptions.ServerRejectedException; import java.io.IOException; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/RequestGroupV2InfoWorkerJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/RequestGroupV2InfoWorkerJob.java index f9a903d43e..ffb6991917 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/RequestGroupV2InfoWorkerJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/RequestGroupV2InfoWorkerJob.java @@ -17,7 +17,7 @@ import org.thoughtcrime.securesms.jobmanager.Job; import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint; import org.thoughtcrime.securesms.recipients.Recipient; import org.whispersystems.signalservice.api.groupsv2.NoCredentialForRedemptionTimeException; -import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException; +import org.signal.network.exceptions.PushNetworkException; import java.io.IOException; import java.util.Optional; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/ResendMessageJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/ResendMessageJob.java index 4f8143a5b1..83b69e38ae 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/ResendMessageJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/ResendMessageJob.java @@ -27,7 +27,7 @@ import org.whispersystems.signalservice.api.crypto.SealedSenderAccess; import org.whispersystems.signalservice.api.messages.SendMessageResult; import org.whispersystems.signalservice.api.push.DistributionId; import org.whispersystems.signalservice.api.push.SignalServiceAddress; -import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException; +import org.signal.network.exceptions.PushNetworkException; import org.whispersystems.signalservice.internal.push.Content; import java.io.IOException; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/RestoreAttachmentJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/RestoreAttachmentJob.kt index c3dbb001ab..844185282c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/RestoreAttachmentJob.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/RestoreAttachmentJob.kt @@ -19,6 +19,8 @@ import org.signal.core.util.isNotNullOrBlank import org.signal.core.util.logging.Log import org.signal.libsignal.protocol.InvalidMacException import org.signal.libsignal.protocol.InvalidMessageException +import org.signal.network.exceptions.NonSuccessfulResponseCodeException +import org.signal.network.exceptions.PushNetworkException import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.attachments.AttachmentId import org.thoughtcrime.securesms.attachments.DatabaseAttachment @@ -56,8 +58,6 @@ import org.whispersystems.signalservice.api.crypto.AttachmentCipherInputStream.I import org.whispersystems.signalservice.api.messages.AttachmentTransferProgress import org.whispersystems.signalservice.api.messages.SignalServiceAttachment import org.whispersystems.signalservice.api.push.exceptions.MissingConfigurationException -import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException -import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException import org.whispersystems.signalservice.api.push.exceptions.RangeException import java.io.File import java.io.IOException diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/RestoreAttachmentThumbnailJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/RestoreAttachmentThumbnailJob.kt index 6e5e948210..82691383a6 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/RestoreAttachmentThumbnailJob.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/RestoreAttachmentThumbnailJob.kt @@ -6,6 +6,7 @@ package org.thoughtcrime.securesms.jobs import org.signal.core.util.logging.Log import org.signal.libsignal.protocol.InvalidMessageException +import org.signal.network.exceptions.NonSuccessfulResponseCodeException import org.thoughtcrime.securesms.attachments.AttachmentId import org.thoughtcrime.securesms.attachments.InvalidAttachmentException import org.thoughtcrime.securesms.backup.v2.ArchiveDatabaseExecutor @@ -24,7 +25,6 @@ import org.thoughtcrime.securesms.util.RemoteConfig import org.whispersystems.signalservice.api.messages.AttachmentTransferProgress import org.whispersystems.signalservice.api.messages.SignalServiceAttachment import org.whispersystems.signalservice.api.push.exceptions.MissingConfigurationException -import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException import java.io.File import java.io.IOException import java.util.concurrent.TimeUnit diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java index 71818d0437..baf6c82d89 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java @@ -23,8 +23,8 @@ import org.thoughtcrime.securesms.profiles.AvatarHelper; import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.recipients.RecipientId; import org.whispersystems.signalservice.api.SignalServiceMessageReceiver; -import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException; -import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException; +import org.signal.network.exceptions.NonSuccessfulResponseCodeException; +import org.signal.network.exceptions.PushNetworkException; import java.io.File; import java.io.IOException; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/SendDeliveryReceiptJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/SendDeliveryReceiptJob.java index 48b7dd1cc1..fbb91b802f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/SendDeliveryReceiptJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/SendDeliveryReceiptJob.java @@ -25,7 +25,7 @@ import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException; import org.whispersystems.signalservice.api.messages.SendMessageResult; import org.whispersystems.signalservice.api.messages.SignalServiceReceiptMessage; import org.whispersystems.signalservice.api.push.SignalServiceAddress; -import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException; +import org.signal.network.exceptions.PushNetworkException; import org.whispersystems.signalservice.api.push.exceptions.ServerRejectedException; import java.io.IOException; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/SendJobExtensions.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/SendJobExtensions.kt index 72c4a4cf12..cb4918fc17 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/SendJobExtensions.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/SendJobExtensions.kt @@ -8,12 +8,12 @@ package org.thoughtcrime.securesms.jobs import org.signal.core.util.logging.Log +import org.signal.network.exceptions.NonSuccessfulResponseCodeException import org.thoughtcrime.securesms.jobmanager.Job import org.thoughtcrime.securesms.jobmanager.JobLogger import org.thoughtcrime.securesms.jobmanager.impl.BackoffUtil import org.thoughtcrime.securesms.transport.RetryLaterException import org.thoughtcrime.securesms.util.RemoteConfig.serverErrorMaxBackoff -import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException import org.whispersystems.signalservice.api.push.exceptions.ProofRequiredException import org.whispersystems.signalservice.api.push.exceptions.RateLimitException import org.whispersystems.signalservice.api.push.exceptions.RetryNetworkException diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/SendReadReceiptJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/SendReadReceiptJob.java index 917a87b601..e2c541eeff 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/SendReadReceiptJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/SendReadReceiptJob.java @@ -30,7 +30,7 @@ import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException; import org.whispersystems.signalservice.api.messages.SendMessageResult; import org.whispersystems.signalservice.api.messages.SignalServiceReceiptMessage; import org.whispersystems.signalservice.api.push.SignalServiceAddress; -import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException; +import org.signal.network.exceptions.PushNetworkException; import org.whispersystems.signalservice.api.push.exceptions.ServerRejectedException; import java.io.IOException; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/SendRetryReceiptJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/SendRetryReceiptJob.java index d36bdb4011..9a6e03774b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/SendRetryReceiptJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/SendRetryReceiptJob.java @@ -18,7 +18,7 @@ import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.recipients.RecipientId; import org.thoughtcrime.securesms.recipients.RecipientUtil; import org.whispersystems.signalservice.api.push.SignalServiceAddress; -import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException; +import org.signal.network.exceptions.PushNetworkException; import org.whispersystems.signalservice.api.push.exceptions.RateLimitException; import java.util.Optional; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/SendViewedReceiptJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/SendViewedReceiptJob.java index 1cd7dbf6e8..431a77b606 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/SendViewedReceiptJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/SendViewedReceiptJob.java @@ -32,7 +32,7 @@ import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException; import org.whispersystems.signalservice.api.messages.SendMessageResult; import org.whispersystems.signalservice.api.messages.SignalServiceReceiptMessage; import org.whispersystems.signalservice.api.push.SignalServiceAddress; -import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException; +import org.signal.network.exceptions.PushNetworkException; import org.whispersystems.signalservice.api.push.exceptions.ServerRejectedException; import java.io.IOException; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/StickerDownloadJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/StickerDownloadJob.java index 4f3ed9a489..4124c6e46b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/StickerDownloadJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/StickerDownloadJob.java @@ -15,7 +15,7 @@ import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint; import org.thoughtcrime.securesms.mms.PartAuthority; import org.signal.core.util.Hex; import org.whispersystems.signalservice.api.SignalServiceMessageReceiver; -import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException; +import org.signal.network.exceptions.PushNetworkException; import java.io.FileNotFoundException; import java.io.InputStream; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/StickerPackDownloadJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/StickerPackDownloadJob.java index 05674297d9..cb9aa2aadb 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/StickerPackDownloadJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/StickerPackDownloadJob.java @@ -19,7 +19,7 @@ import org.signal.core.util.Hex; import org.whispersystems.signalservice.api.SignalServiceMessageReceiver; import org.whispersystems.signalservice.api.messages.SignalServiceStickerManifest; import org.whispersystems.signalservice.api.messages.SignalServiceStickerManifest.StickerInfo; -import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException; +import org.signal.network.exceptions.PushNetworkException; import java.io.IOException; import java.util.ArrayList; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageAccountRestoreJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageAccountRestoreJob.kt index d52643f9e6..f3e2dd713d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageAccountRestoreJob.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageAccountRestoreJob.kt @@ -1,6 +1,7 @@ package org.thoughtcrime.securesms.jobs import org.signal.core.util.logging.Log +import org.signal.network.exceptions.PushNetworkException import org.signal.network.service.StorageServiceService import org.signal.network.service.StorageServiceService.ManifestResult import org.thoughtcrime.securesms.database.SignalDatabase @@ -12,7 +13,6 @@ import org.thoughtcrime.securesms.net.SignalNetwork import org.thoughtcrime.securesms.profiles.manage.UsernameRepository.reclaimUsernameIfNecessary import org.thoughtcrime.securesms.recipients.Recipient.Companion.self import org.thoughtcrime.securesms.storage.StorageSyncHelper -import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException import org.whispersystems.signalservice.api.storage.SignalAccountRecord import org.whispersystems.signalservice.api.storage.SignalStorageManifest import org.whispersystems.signalservice.api.storage.SignalStorageRecord diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageForcePushJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageForcePushJob.kt index 68d651c693..598e79cb19 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageForcePushJob.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageForcePushJob.kt @@ -3,6 +3,8 @@ package org.thoughtcrime.securesms.jobs import org.signal.core.util.SqlUtil import org.signal.core.util.logging.Log import org.signal.core.util.logging.logI +import org.signal.network.NetworkResult +import org.signal.network.exceptions.PushNetworkException import org.signal.network.service.StorageServiceService import org.thoughtcrime.securesms.components.settings.app.chats.folders.ChatFolderId import org.thoughtcrime.securesms.database.ChatFolderTables.ChatFolderTable @@ -20,8 +22,6 @@ import org.thoughtcrime.securesms.storage.StorageSyncHelper import org.thoughtcrime.securesms.storage.StorageSyncModels import org.thoughtcrime.securesms.storage.StorageSyncValidations import org.thoughtcrime.securesms.transport.RetryLaterException -import org.whispersystems.signalservice.api.NetworkResult -import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException import org.whispersystems.signalservice.api.storage.RecordIkm import org.whispersystems.signalservice.api.storage.SignalStorageManifest import org.whispersystems.signalservice.api.storage.SignalStorageRecord diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/StoryOnboardingDownloadJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/StoryOnboardingDownloadJob.kt index 30c7b581ef..0f241aafd6 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/StoryOnboardingDownloadJob.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/StoryOnboardingDownloadJob.kt @@ -5,6 +5,7 @@ import com.fasterxml.jackson.core.JsonParseException import org.json.JSONArray import org.json.JSONObject import org.signal.core.util.logging.Log +import org.signal.network.exceptions.NonSuccessfulResponseCodeException import org.thoughtcrime.securesms.database.MessageTable import org.thoughtcrime.securesms.database.SignalDatabase import org.thoughtcrime.securesms.database.model.StoryType @@ -16,7 +17,6 @@ import org.thoughtcrime.securesms.recipients.Recipient import org.thoughtcrime.securesms.releasechannel.ReleaseChannel import org.thoughtcrime.securesms.s3.S3 import org.thoughtcrime.securesms.transport.RetryLaterException -import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException import java.util.Locale /** diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/Svr2MirrorJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/Svr2MirrorJob.kt index 85473a5457..5ee12c28ed 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/Svr2MirrorJob.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/Svr2MirrorJob.kt @@ -5,6 +5,7 @@ package org.thoughtcrime.securesms.jobs import org.signal.core.util.logging.Log +import org.signal.network.exceptions.NonSuccessfulResponseCodeException import org.thoughtcrime.securesms.BuildConfig import org.thoughtcrime.securesms.dependencies.AppDependencies import org.thoughtcrime.securesms.jobmanager.Job @@ -13,7 +14,6 @@ import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint import org.thoughtcrime.securesms.keyvalue.SignalStore import org.thoughtcrime.securesms.pin.Svr3Migration import org.thoughtcrime.securesms.pin.SvrRepository -import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException import org.whispersystems.signalservice.api.svr.SecureValueRecovery.BackupResponse import org.whispersystems.signalservice.api.svr.SecureValueRecovery.PinChangeSession import org.whispersystems.signalservice.api.svr.SecureValueRecoveryV2 diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/Svr3MirrorJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/Svr3MirrorJob.kt index c7d69000a8..1de5673240 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/Svr3MirrorJob.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/Svr3MirrorJob.kt @@ -5,6 +5,7 @@ package org.thoughtcrime.securesms.jobs import org.signal.core.util.logging.Log +import org.signal.network.exceptions.NonSuccessfulResponseCodeException import org.thoughtcrime.securesms.dependencies.AppDependencies import org.thoughtcrime.securesms.jobmanager.Job import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint @@ -12,7 +13,6 @@ import org.thoughtcrime.securesms.jobs.protos.Svr3MirrorJobData import org.thoughtcrime.securesms.keyvalue.SignalStore import org.thoughtcrime.securesms.pin.Svr3Migration import org.thoughtcrime.securesms.pin.SvrRepository -import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException import org.whispersystems.signalservice.api.svr.SecureValueRecovery.BackupResponse import org.whispersystems.signalservice.api.svr.SecureValueRecovery.PinChangeSession import org.whispersystems.signalservice.api.svr.SecureValueRecoveryV3 diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/UploadAttachmentToArchiveJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/UploadAttachmentToArchiveJob.kt index bd4719ea7f..79f8d91548 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/UploadAttachmentToArchiveJob.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/UploadAttachmentToArchiveJob.kt @@ -13,6 +13,7 @@ import org.signal.core.util.inRoundedDays import org.signal.core.util.isNotNullOrBlank import org.signal.core.util.logging.Log import org.signal.core.util.readLength +import org.signal.network.NetworkResult import org.signal.protos.resumableuploads.ResumableUpload import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.attachments.AttachmentId @@ -33,7 +34,6 @@ import org.thoughtcrime.securesms.net.SignalNetwork import org.thoughtcrime.securesms.service.AttachmentProgressService import org.thoughtcrime.securesms.util.MediaUtil import org.thoughtcrime.securesms.util.RemoteConfig -import org.whispersystems.signalservice.api.NetworkResult import org.whispersystems.signalservice.api.archive.ArchiveMediaUploadFormStatusCodes import org.whispersystems.signalservice.api.attachment.AttachmentUploadResult import org.whispersystems.signalservice.api.crypto.AttachmentCipherStreamUtil diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/BackupValues.kt b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/BackupValues.kt index 5b7eae26da..f14c0d443d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/BackupValues.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/BackupValues.kt @@ -8,6 +8,7 @@ import org.signal.core.models.backup.MediaRootBackupKey import org.signal.core.models.backup.MessageBackupKey import org.signal.core.util.LongSerializer import org.signal.core.util.logging.Log +import org.signal.network.util.JsonUtil import org.thoughtcrime.securesms.backup.DeletionState import org.thoughtcrime.securesms.backup.RestoreState import org.thoughtcrime.securesms.backup.v2.MessageBackupTier @@ -21,7 +22,6 @@ import org.thoughtcrime.securesms.keyvalue.protos.BackupDownloadNotifierState import org.thoughtcrime.securesms.util.Environment import org.whispersystems.signalservice.api.archive.ArchiveServiceCredential import org.whispersystems.signalservice.api.archive.GetArchiveCdnCredentialsResponse -import org.whispersystems.signalservice.internal.util.JsonUtil import java.io.IOException import java.util.concurrent.locks.ReentrantLock import kotlin.time.Duration diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/InAppPaymentValues.kt b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/InAppPaymentValues.kt index 01c2b001b0..898c11835c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/InAppPaymentValues.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/InAppPaymentValues.kt @@ -8,6 +8,7 @@ import io.reactivex.rxjava3.subjects.Subject import org.signal.core.util.logging.Log import org.signal.donations.PaymentSourceType import org.signal.donations.StripeApi +import org.signal.network.util.JsonUtil import org.thoughtcrime.securesms.backup.v2.MessageBackupTier import org.thoughtcrime.securesms.badges.Badges import org.thoughtcrime.securesms.badges.models.Badge @@ -25,7 +26,6 @@ import org.thoughtcrime.securesms.subscription.LevelUpdateOperation import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription import org.whispersystems.signalservice.api.subscriptions.IdempotencyKey import org.whispersystems.signalservice.api.subscriptions.SubscriberId -import org.whispersystems.signalservice.internal.util.JsonUtil import java.util.Currency import java.util.Locale import java.util.Optional diff --git a/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceRepository.kt index 4df0cd718f..09eb1c8c7a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceRepository.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceRepository.kt @@ -13,6 +13,7 @@ import org.signal.core.util.toByteArray import org.signal.libsignal.net.RequestResult import org.signal.libsignal.protocol.InvalidKeyException import org.signal.libsignal.protocol.ecc.ECPublicKey +import org.signal.network.NetworkResult import org.thoughtcrime.securesms.attachments.AttachmentUploadUtil import org.thoughtcrime.securesms.backup.BackupFileIOError import org.thoughtcrime.securesms.backup.v2.ArchiveValidator @@ -28,7 +29,6 @@ import org.thoughtcrime.securesms.linkdevice.LinkDeviceRepository.createAndUploa import org.thoughtcrime.securesms.net.SignalNetwork import org.thoughtcrime.securesms.providers.BlobProvider import org.thoughtcrime.securesms.registration.secondary.DeviceNameCipher -import org.whispersystems.signalservice.api.NetworkResult import org.whispersystems.signalservice.api.link.LinkedDeviceVerificationCodeResponse import org.whispersystems.signalservice.api.link.TransferArchiveError import org.whispersystems.signalservice.api.link.WaitForLinkedDeviceResponse diff --git a/app/src/main/java/org/thoughtcrime/securesms/lock/v2/CreateSvrPinViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/lock/v2/CreateSvrPinViewModel.java index 59654663a6..bbd02c357d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/lock/v2/CreateSvrPinViewModel.java +++ b/app/src/main/java/org/thoughtcrime/securesms/lock/v2/CreateSvrPinViewModel.java @@ -8,7 +8,7 @@ import androidx.lifecycle.ViewModel; import org.thoughtcrime.securesms.util.SingleLiveEvent; import org.whispersystems.signalservice.api.kbs.PinValidityChecker; -import org.whispersystems.signalservice.api.util.Preconditions; +import org.signal.network.util.Preconditions; public final class CreateSvrPinViewModel extends ViewModel implements BaseSvrPinViewModel { diff --git a/app/src/main/java/org/thoughtcrime/securesms/messagedetails/InternalMessageDetailsViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/messagedetails/InternalMessageDetailsViewModel.kt index e432d8894c..9198a3b3d5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/messagedetails/InternalMessageDetailsViewModel.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/messagedetails/InternalMessageDetailsViewModel.kt @@ -12,9 +12,9 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch +import org.signal.network.util.JsonUtil import org.thoughtcrime.securesms.database.SignalDatabase import org.thoughtcrime.securesms.recipients.RecipientId -import org.whispersystems.signalservice.internal.util.JsonUtil class InternalMessageDetailsViewModel(val messageId: Long) : ViewModel() { diff --git a/app/src/main/java/org/thoughtcrime/securesms/messages/DataMessageProcessor.kt b/app/src/main/java/org/thoughtcrime/securesms/messages/DataMessageProcessor.kt index b43437020a..ec27eb08f3 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/messages/DataMessageProcessor.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/messages/DataMessageProcessor.kt @@ -14,6 +14,7 @@ import org.signal.core.util.logging.Log import org.signal.core.util.orNull import org.signal.core.util.toOptional import org.signal.libsignal.zkgroup.receipts.ReceiptCredentialPresentation +import org.signal.network.util.Preconditions import org.thoughtcrime.securesms.attachments.Attachment import org.thoughtcrime.securesms.attachments.LocalStickerAttachment import org.thoughtcrime.securesms.attachments.PointerAttachment @@ -107,7 +108,6 @@ import org.thoughtcrime.securesms.util.hasGiftBadge import org.thoughtcrime.securesms.util.isStory import org.whispersystems.signalservice.api.crypto.EnvelopeMetadata import org.whispersystems.signalservice.api.payments.Money -import org.whispersystems.signalservice.api.util.Preconditions import org.whispersystems.signalservice.internal.push.BodyRange import org.whispersystems.signalservice.internal.push.Content import org.whispersystems.signalservice.internal.push.DataMessage diff --git a/app/src/main/java/org/thoughtcrime/securesms/messages/GroupSendUtil.java b/app/src/main/java/org/thoughtcrime/securesms/messages/GroupSendUtil.java index 5381702fb3..117630ff3f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/messages/GroupSendUtil.java +++ b/app/src/main/java/org/thoughtcrime/securesms/messages/GroupSendUtil.java @@ -54,7 +54,7 @@ import org.whispersystems.signalservice.api.push.DistributionId; import org.signal.core.models.ServiceId; import org.whispersystems.signalservice.api.push.SignalServiceAddress; import org.whispersystems.signalservice.api.push.exceptions.NotFoundException; -import org.whispersystems.signalservice.api.util.Preconditions; +import org.signal.network.util.Preconditions; import org.whispersystems.signalservice.internal.push.exceptions.InvalidUnidentifiedAccessHeaderException; import org.whispersystems.signalservice.internal.push.http.CancelationSignal; import org.whispersystems.signalservice.internal.push.http.PartialSendBatchCompleteListener; diff --git a/app/src/main/java/org/thoughtcrime/securesms/migrations/FixChangeNumberErrorMigrationJob.kt b/app/src/main/java/org/thoughtcrime/securesms/migrations/FixChangeNumberErrorMigrationJob.kt index 42a603b8d1..c37c775c45 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/migrations/FixChangeNumberErrorMigrationJob.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/migrations/FixChangeNumberErrorMigrationJob.kt @@ -2,11 +2,11 @@ package org.thoughtcrime.securesms.migrations import org.signal.core.models.ServiceId import org.signal.core.util.logging.Log +import org.signal.network.NetworkResult import org.thoughtcrime.securesms.components.settings.app.changenumber.ChangeNumberRepository import org.thoughtcrime.securesms.jobmanager.Job import org.thoughtcrime.securesms.keyvalue.SignalStore import org.thoughtcrime.securesms.net.SignalNetwork -import org.whispersystems.signalservice.api.NetworkResult import org.whispersystems.signalservice.internal.push.WhoAmIResponse import java.io.IOException diff --git a/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/PaymentsHomeRepository.java b/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/PaymentsHomeRepository.java index 56c6223617..ca490e9b31 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/PaymentsHomeRepository.java +++ b/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/PaymentsHomeRepository.java @@ -12,7 +12,7 @@ import org.thoughtcrime.securesms.jobs.SendPaymentsActivatedJob; import org.thoughtcrime.securesms.keyvalue.SignalStore; import org.thoughtcrime.securesms.util.AsynchronousCallback; import org.thoughtcrime.securesms.util.ProfileUtil; -import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException; +import org.signal.network.exceptions.NonSuccessfulResponseCodeException; import org.whispersystems.signalservice.internal.push.exceptions.PaymentsRegionException; import java.io.IOException; diff --git a/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/UsernameRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/UsernameRepository.kt index 157c185958..97ef69271a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/UsernameRepository.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/UsernameRepository.kt @@ -16,6 +16,7 @@ import org.signal.libsignal.usernames.BaseUsernameException import org.signal.libsignal.usernames.Username import org.signal.libsignal.usernames.UsernameLinkInvalidEntropyDataLength import org.signal.libsignal.usernames.UsernameLinkInvalidLinkData +import org.signal.network.NetworkResult import org.thoughtcrime.securesms.components.settings.app.usernamelinks.main.UsernameLinkResetResult import org.thoughtcrime.securesms.database.SignalDatabase import org.thoughtcrime.securesms.dependencies.AppDependencies @@ -26,7 +27,6 @@ import org.thoughtcrime.securesms.recipients.Recipient import org.thoughtcrime.securesms.storage.StorageSyncHelper import org.thoughtcrime.securesms.util.NetworkUtil import org.thoughtcrime.securesms.util.UsernameUtil -import org.whispersystems.signalservice.api.NetworkResult import org.whispersystems.signalservice.api.SignalServiceAccountManager import org.whispersystems.signalservice.api.push.UsernameLinkComponents import org.whispersystems.signalservice.api.util.Usernames diff --git a/app/src/main/java/org/thoughtcrime/securesms/profiles/spoofing/ReviewCardViewHolder.java b/app/src/main/java/org/thoughtcrime/securesms/profiles/spoofing/ReviewCardViewHolder.java index fd83d113f6..f0441f5463 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/profiles/spoofing/ReviewCardViewHolder.java +++ b/app/src/main/java/org/thoughtcrime/securesms/profiles/spoofing/ReviewCardViewHolder.java @@ -19,7 +19,7 @@ import androidx.recyclerview.widget.RecyclerView; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.databinding.ReviewCardBinding; import org.thoughtcrime.securesms.util.SpanUtil; -import org.whispersystems.signalservice.api.util.Preconditions; +import org.signal.network.util.Preconditions; import java.util.ArrayList; import java.util.Arrays; diff --git a/app/src/main/java/org/thoughtcrime/securesms/ratelimit/ProofRequiredExceptionHandler.kt b/app/src/main/java/org/thoughtcrime/securesms/ratelimit/ProofRequiredExceptionHandler.kt index ad784241a6..ded672ad3c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/ratelimit/ProofRequiredExceptionHandler.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/ratelimit/ProofRequiredExceptionHandler.kt @@ -11,6 +11,7 @@ import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode import org.signal.core.util.logging.Log +import org.signal.network.NetworkResult import org.thoughtcrime.securesms.database.SignalDatabase import org.thoughtcrime.securesms.database.model.ParentStoryId import org.thoughtcrime.securesms.dependencies.AppDependencies @@ -19,7 +20,6 @@ import org.thoughtcrime.securesms.keyvalue.SignalStore import org.thoughtcrime.securesms.net.SignalNetwork import org.thoughtcrime.securesms.notifications.v2.ConversationId import org.thoughtcrime.securesms.recipients.Recipient -import org.whispersystems.signalservice.api.NetworkResult import org.whispersystems.signalservice.api.push.exceptions.ProofRequiredException import java.util.concurrent.CountDownLatch import java.util.concurrent.TimeUnit diff --git a/app/src/main/java/org/thoughtcrime/securesms/reactions/any/ReactWithAnyEmojiPage.java b/app/src/main/java/org/thoughtcrime/securesms/reactions/any/ReactWithAnyEmojiPage.java index 4e474e7d93..915f0b4a71 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/reactions/any/ReactWithAnyEmojiPage.java +++ b/app/src/main/java/org/thoughtcrime/securesms/reactions/any/ReactWithAnyEmojiPage.java @@ -4,7 +4,7 @@ import androidx.annotation.AttrRes; import androidx.annotation.NonNull; import androidx.annotation.StringRes; -import org.whispersystems.signalservice.api.util.Preconditions; +import org.signal.network.util.Preconditions; import java.util.List; import java.util.Objects; diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/data/QuickRegistrationRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/data/QuickRegistrationRepository.kt index e2df76721d..849c6f3f00 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registration/data/QuickRegistrationRepository.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/registration/data/QuickRegistrationRepository.kt @@ -16,13 +16,13 @@ import org.signal.core.util.isNotNullOrBlank import org.signal.core.util.logging.Log import org.signal.libsignal.protocol.InvalidKeyException import org.signal.libsignal.protocol.ecc.ECPublicKey +import org.signal.network.NetworkResult import org.signal.registration.proto.RegistrationProvisionMessage import org.thoughtcrime.securesms.backup.v2.MessageBackupTier import org.thoughtcrime.securesms.database.SignalDatabase import org.thoughtcrime.securesms.dependencies.AppDependencies import org.thoughtcrime.securesms.keyvalue.SignalStore import org.thoughtcrime.securesms.net.SignalNetwork -import org.whispersystems.signalservice.api.NetworkResult import org.whispersystems.signalservice.api.provisioning.RestoreMethod import java.io.IOException import kotlin.coroutines.coroutineContext diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/data/RegistrationRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/data/RegistrationRepository.kt index 953cca95f5..628abe3875 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registration/data/RegistrationRepository.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/registration/data/RegistrationRepository.kt @@ -30,6 +30,7 @@ import org.signal.core.util.logging.Log import org.signal.libsignal.protocol.IdentityKeyPair import org.signal.libsignal.protocol.util.KeyHelper import org.signal.libsignal.zkgroup.profiles.ProfileKey +import org.signal.network.NetworkResult import org.thoughtcrime.securesms.AppCapabilities import org.thoughtcrime.securesms.crypto.PreKeyUtil import org.thoughtcrime.securesms.crypto.ProfileKeyUtil @@ -74,7 +75,6 @@ import org.thoughtcrime.securesms.registration.viewmodel.SvrAuthCredentialSet import org.thoughtcrime.securesms.service.DirectoryRefreshListener import org.thoughtcrime.securesms.service.RotateSignedPreKeyListener import org.thoughtcrime.securesms.util.TextSecurePreferences -import org.whispersystems.signalservice.api.NetworkResult import org.whispersystems.signalservice.api.SvrNoDataException import org.whispersystems.signalservice.api.account.AccountAttributes import org.whispersystems.signalservice.api.account.PreKeyCollection diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/data/network/BackupAuthCheckResult.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/data/network/BackupAuthCheckResult.kt index 9df74e2b8b..3338beb43b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registration/data/network/BackupAuthCheckResult.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/registration/data/network/BackupAuthCheckResult.kt @@ -5,7 +5,7 @@ package org.thoughtcrime.securesms.registration.data.network -import org.whispersystems.signalservice.api.NetworkResult +import org.signal.network.NetworkResult import org.whispersystems.signalservice.api.svr.Svr3Credentials import org.whispersystems.signalservice.internal.push.AuthCredentials import org.whispersystems.signalservice.internal.push.BackupV2AuthCheckResponse diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/data/network/RegisterAccountResult.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/data/network/RegisterAccountResult.kt index af8b7bc3d2..61734c8670 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registration/data/network/RegisterAccountResult.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/registration/data/network/RegisterAccountResult.kt @@ -5,13 +5,13 @@ package org.thoughtcrime.securesms.registration.data.network +import org.signal.network.NetworkResult +import org.signal.network.exceptions.MalformedRequestException import org.thoughtcrime.securesms.pin.SvrWrongPinException import org.thoughtcrime.securesms.registration.data.AccountRegistrationResult -import org.whispersystems.signalservice.api.NetworkResult import org.whispersystems.signalservice.api.SvrNoDataException import org.whispersystems.signalservice.api.push.exceptions.AuthorizationFailedException import org.whispersystems.signalservice.api.push.exceptions.IncorrectRegistrationRecoveryPasswordException -import org.whispersystems.signalservice.api.push.exceptions.MalformedRequestException import org.whispersystems.signalservice.api.push.exceptions.RateLimitException import org.whispersystems.signalservice.api.svr.Svr3Credentials import org.whispersystems.signalservice.internal.push.AuthCredentials diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/data/network/RegistrationSessionResult.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/data/network/RegistrationSessionResult.kt index b7f12b3d2d..95ab858da3 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registration/data/network/RegistrationSessionResult.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/registration/data/network/RegistrationSessionResult.kt @@ -6,8 +6,8 @@ package org.thoughtcrime.securesms.registration.data.network import org.signal.core.util.orNull -import org.whispersystems.signalservice.api.NetworkResult -import org.whispersystems.signalservice.api.push.exceptions.MalformedRequestException +import org.signal.network.NetworkResult +import org.signal.network.exceptions.MalformedRequestException import org.whispersystems.signalservice.api.push.exceptions.NoSuchSessionException import org.whispersystems.signalservice.api.push.exceptions.NotFoundException import org.whispersystems.signalservice.api.push.exceptions.RateLimitException diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/data/network/SubmitCaptchaResult.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/data/network/SubmitCaptchaResult.kt index 5102e83302..3e759bbde7 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registration/data/network/SubmitCaptchaResult.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/registration/data/network/SubmitCaptchaResult.kt @@ -6,7 +6,7 @@ package org.thoughtcrime.securesms.registration.data.network import org.signal.core.util.logging.Log -import org.whispersystems.signalservice.api.NetworkResult +import org.signal.network.NetworkResult import org.whispersystems.signalservice.internal.push.RegistrationSessionMetadataResponse sealed class SubmitCaptchaResult(cause: Throwable?) : RegistrationResult(cause) { diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/data/network/VerificationCodeRequestResult.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/data/network/VerificationCodeRequestResult.kt index 8c9d2b6f49..44e140291a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registration/data/network/VerificationCodeRequestResult.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/registration/data/network/VerificationCodeRequestResult.kt @@ -7,13 +7,13 @@ package org.thoughtcrime.securesms.registration.data.network import org.signal.core.util.logging.Log import org.signal.core.util.orNull -import org.whispersystems.signalservice.api.NetworkResult +import org.signal.network.NetworkResult +import org.signal.network.exceptions.MalformedRequestException import org.whispersystems.signalservice.api.push.exceptions.AlreadyVerifiedException import org.whispersystems.signalservice.api.push.exceptions.ChallengeRequiredException import org.whispersystems.signalservice.api.push.exceptions.ExternalServiceFailureException import org.whispersystems.signalservice.api.push.exceptions.ImpossiblePhoneNumberException import org.whispersystems.signalservice.api.push.exceptions.InvalidTransportModeException -import org.whispersystems.signalservice.api.push.exceptions.MalformedRequestException import org.whispersystems.signalservice.api.push.exceptions.NoSuchSessionException import org.whispersystems.signalservice.api.push.exceptions.NonNormalizedPhoneNumberException import org.whispersystems.signalservice.api.push.exceptions.RateLimitException diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/RegistrationViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/RegistrationViewModel.kt index c002ca6ae8..b98c00f032 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/RegistrationViewModel.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/RegistrationViewModel.kt @@ -35,6 +35,7 @@ import org.signal.libsignal.protocol.IdentityKey import org.signal.libsignal.protocol.IdentityKeyPair import org.signal.libsignal.protocol.ecc.ECPrivateKey import org.signal.libsignal.zkgroup.profiles.ProfileKey +import org.signal.network.NetworkResult import org.signal.registration.proto.RegistrationProvisionMessage import org.thoughtcrime.securesms.backup.v2.BackupRepository import org.thoughtcrime.securesms.backup.v2.RestoreTimestampResult @@ -86,7 +87,6 @@ import org.thoughtcrime.securesms.registration.viewmodel.SvrAuthCredentialSet import org.thoughtcrime.securesms.util.RemoteConfig import org.thoughtcrime.securesms.util.TextSecurePreferences import org.thoughtcrime.securesms.util.dualsim.MccMncProducer -import org.whispersystems.signalservice.api.NetworkResult import org.whispersystems.signalservice.api.SvrNoDataException import org.whispersystems.signalservice.api.messages.multidevice.RequestMessage import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSyncMessage diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/RemoteRestoreViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/RemoteRestoreViewModel.kt index 7867b64b49..522fcc8742 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/RemoteRestoreViewModel.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/RemoteRestoreViewModel.kt @@ -17,6 +17,7 @@ import kotlinx.coroutines.withContext import org.signal.core.util.ByteSize import org.signal.core.util.bytes import org.signal.core.util.logging.Log +import org.signal.network.NetworkResult import org.thoughtcrime.securesms.backup.v2.BackupRepository import org.thoughtcrime.securesms.backup.v2.MessageBackupTier import org.thoughtcrime.securesms.backup.v2.RemoteRestoreResult @@ -27,7 +28,6 @@ import org.thoughtcrime.securesms.keyvalue.Completed import org.thoughtcrime.securesms.keyvalue.SignalStore import org.thoughtcrime.securesms.keyvalue.Skipped import org.thoughtcrime.securesms.registration.data.QuickRegistrationRepository -import org.whispersystems.signalservice.api.NetworkResult import org.whispersystems.signalservice.api.provisioning.RestoreMethod import kotlin.time.Duration import kotlin.time.Duration.Companion.days diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/v2/AppRegistrationNetworkController.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/v2/AppRegistrationNetworkController.kt index 2511be697a..60ec5d4011 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registration/v2/AppRegistrationNetworkController.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/registration/v2/AppRegistrationNetworkController.kt @@ -21,6 +21,7 @@ import org.signal.libsignal.net.RequestResult import org.signal.libsignal.protocol.IdentityKey import org.signal.libsignal.protocol.IdentityKeyPair import org.signal.libsignal.protocol.ecc.ECPrivateKey +import org.signal.network.NetworkResult import org.signal.registration.NetworkController import org.signal.registration.NetworkController.AccountAttributes import org.signal.registration.NetworkController.BackupMasterKeyError @@ -57,7 +58,6 @@ import org.thoughtcrime.securesms.pin.SvrRepository import org.thoughtcrime.securesms.pin.SvrWrongPinException import org.thoughtcrime.securesms.registration.fcm.PushChallengeRequest import org.thoughtcrime.securesms.registration.viewmodel.SvrAuthCredentialSet -import org.whispersystems.signalservice.api.NetworkResult import org.whispersystems.signalservice.api.SvrNoDataException import org.whispersystems.signalservice.api.archive.ArchiveServiceAccess import org.whispersystems.signalservice.api.provisioning.ProvisioningSocket diff --git a/app/src/main/java/org/thoughtcrime/securesms/s3/S3.kt b/app/src/main/java/org/thoughtcrime/securesms/s3/S3.kt index 53f5373e2c..305b56e970 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/s3/S3.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/s3/S3.kt @@ -9,10 +9,10 @@ import okio.HashingSink import okio.sink import org.signal.core.util.Hex import org.signal.core.util.logging.Log +import org.signal.network.exceptions.NonSuccessfulResponseCodeException import org.thoughtcrime.securesms.dependencies.AppDependencies import org.thoughtcrime.securesms.util.EncryptedStreamUtils import org.thoughtcrime.securesms.util.JsonUtils -import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException import org.whispersystems.signalservice.internal.ServiceResponse import org.whispersystems.signalservice.internal.websocket.DefaultErrorMapper import org.whispersystems.signalservice.internal.websocket.DefaultResponseMapper diff --git a/app/src/main/java/org/thoughtcrime/securesms/safety/SafetyNumberBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/safety/SafetyNumberBottomSheet.kt index b33e0ad4d9..24b18775b8 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/safety/SafetyNumberBottomSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/safety/SafetyNumberBottomSheet.kt @@ -4,6 +4,7 @@ import android.content.Context import android.os.Bundle import androidx.fragment.app.FragmentManager import org.signal.core.util.getParcelableCompat +import org.signal.network.util.Preconditions import org.thoughtcrime.securesms.contacts.paged.ContactSearchKey import org.thoughtcrime.securesms.conversation.ui.error.SafetyNumberChangeDialog import org.thoughtcrime.securesms.database.model.IdentityRecord @@ -12,7 +13,6 @@ import org.thoughtcrime.securesms.database.model.MessageRecord import org.thoughtcrime.securesms.database.model.MmsMessageRecord import org.thoughtcrime.securesms.recipients.Recipient import org.thoughtcrime.securesms.recipients.RecipientId -import org.whispersystems.signalservice.api.util.Preconditions /** * Object responsible for the construction of SafetyNumberBottomSheetFragment and Arg objects. diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/GenericForegroundService.kt b/app/src/main/java/org/thoughtcrime/securesms/service/GenericForegroundService.kt index b2f8b72b23..d4b94bfc7c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/GenericForegroundService.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/service/GenericForegroundService.kt @@ -14,12 +14,12 @@ import androidx.core.app.ServiceCompat import androidx.core.content.IntentCompat import org.signal.core.util.PendingIntentFlags.mutable import org.signal.core.util.logging.Log +import org.signal.network.util.Preconditions import org.thoughtcrime.securesms.MainActivity import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.jobs.ForegroundServiceUtil import org.thoughtcrime.securesms.jobs.UnableToStartException import org.thoughtcrime.securesms.notifications.NotificationChannels -import org.whispersystems.signalservice.api.util.Preconditions import java.util.concurrent.atomic.AtomicInteger import java.util.concurrent.locks.ReentrantLock import kotlin.concurrent.withLock diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/SignalCallManager.java b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/SignalCallManager.java index d5fa8b5f21..3453af5c0e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/SignalCallManager.java +++ b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/SignalCallManager.java @@ -76,7 +76,7 @@ import org.thoughtcrime.securesms.webrtc.CallNotificationBuilder; import org.thoughtcrime.securesms.webrtc.audio.SignalAudioManager; import org.thoughtcrime.securesms.webrtc.locks.LockManager; import org.webrtc.PeerConnection; -import org.whispersystems.signalservice.api.NetworkResult; +import org.signal.network.NetworkResult; import org.whispersystems.signalservice.api.NetworkResultUtil; import org.whispersystems.signalservice.api.crypto.SealedSenderAccess; import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException; diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/links/SignalCallLinkManager.kt b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/links/SignalCallLinkManager.kt index 6cd7519e14..d28a9c0bd8 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/links/SignalCallLinkManager.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/links/SignalCallLinkManager.kt @@ -14,6 +14,7 @@ import org.signal.libsignal.zkgroup.calllinks.CreateCallLinkCredential import org.signal.libsignal.zkgroup.calllinks.CreateCallLinkCredentialPresentation import org.signal.libsignal.zkgroup.calllinks.CreateCallLinkCredentialRequestContext import org.signal.libsignal.zkgroup.calllinks.CreateCallLinkCredentialResponse +import org.signal.network.NetworkResult import org.signal.ringrtc.CallLinkRootKey import org.signal.ringrtc.CallLinkState import org.signal.ringrtc.CallLinkState.Restrictions @@ -22,7 +23,6 @@ import org.thoughtcrime.securesms.dependencies.AppDependencies import org.thoughtcrime.securesms.keyvalue.SignalStore import org.thoughtcrime.securesms.net.SignalNetwork import org.thoughtcrime.securesms.recipients.Recipient -import org.whispersystems.signalservice.api.NetworkResult import java.io.IOException /** diff --git a/app/src/main/java/org/thoughtcrime/securesms/sms/MessageSender.java b/app/src/main/java/org/thoughtcrime/securesms/sms/MessageSender.java index ceda3a76be..598f14712d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/sms/MessageSender.java +++ b/app/src/main/java/org/thoughtcrime/securesms/sms/MessageSender.java @@ -68,7 +68,7 @@ import org.thoughtcrime.securesms.recipients.RecipientUtil; import org.thoughtcrime.securesms.util.ParcelUtil; import org.thoughtcrime.securesms.util.SignalLocalMetrics; import org.whispersystems.signalservice.api.push.DistributionId; -import org.whispersystems.signalservice.api.util.Preconditions; +import org.signal.network.util.Preconditions; import java.io.IOException; import java.util.ArrayList; diff --git a/app/src/main/java/org/thoughtcrime/securesms/stickers/BlessedPacks.kt b/app/src/main/java/org/thoughtcrime/securesms/stickers/BlessedPacks.kt index 65bed70f57..04fff1e5ed 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/stickers/BlessedPacks.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/stickers/BlessedPacks.kt @@ -1,9 +1,9 @@ package org.thoughtcrime.securesms.stickers import com.fasterxml.jackson.annotation.JsonProperty +import org.signal.network.util.JsonUtil import org.thoughtcrime.securesms.jobmanager.Job import org.thoughtcrime.securesms.jobs.StickerPackDownloadJob -import org.whispersystems.signalservice.internal.util.JsonUtil /** * Maintains a list of "blessed" sticker packs that essentially serve as defaults. diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/BlurTransformation.java b/app/src/main/java/org/thoughtcrime/securesms/util/BlurTransformation.java index 485b6346ab..a97c95220e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/BlurTransformation.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/BlurTransformation.java @@ -13,7 +13,7 @@ import androidx.annotation.NonNull; import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool; import com.bumptech.glide.load.resource.bitmap.BitmapTransformation; -import org.whispersystems.signalservice.api.util.Preconditions; +import org.signal.network.util.Preconditions; import java.security.MessageDigest; import java.util.Locale; diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/DefaultValueLiveData.java b/app/src/main/java/org/thoughtcrime/securesms/util/DefaultValueLiveData.java index 2f6eb1ef7a..1a50de7581 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/DefaultValueLiveData.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/DefaultValueLiveData.java @@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.util; import androidx.annotation.NonNull; import androidx.lifecycle.MutableLiveData; -import org.whispersystems.signalservice.api.util.Preconditions; +import org.signal.network.util.Preconditions; /** diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/ExceptionExtensions.kt b/app/src/main/java/org/thoughtcrime/securesms/util/ExceptionExtensions.kt index f6dfee3372..06bef66cc9 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/ExceptionExtensions.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/util/ExceptionExtensions.kt @@ -7,7 +7,7 @@ package org.thoughtcrime.securesms.util -import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException +import org.signal.network.exceptions.NonSuccessfulResponseCodeException import java.io.IOException /** diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/ProfileUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/ProfileUtil.java index dada994400..f5d3032e28 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/ProfileUtil.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/ProfileUtil.java @@ -37,7 +37,7 @@ import org.thoughtcrime.securesms.profiles.AvatarHelper; import org.thoughtcrime.securesms.profiles.ProfileName; import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.recipients.RecipientUtil; -import org.whispersystems.signalservice.api.NetworkResult; +import org.signal.network.NetworkResult; import org.whispersystems.signalservice.api.NetworkResultUtil; import org.whispersystems.signalservice.api.crypto.InvalidCiphertextException; import org.whispersystems.signalservice.api.crypto.ProfileCipher; diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/livedata/LiveDataUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/livedata/LiveDataUtil.java index 193696c22f..757786ea8a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/livedata/LiveDataUtil.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/livedata/LiveDataUtil.java @@ -12,7 +12,7 @@ import androidx.lifecycle.Transformations; import org.signal.core.util.concurrent.SignalExecutors; import org.thoughtcrime.securesms.util.concurrent.SerialMonoLifoExecutor; -import org.whispersystems.signalservice.api.util.Preconditions; +import org.signal.network.util.Preconditions; import java.util.LinkedHashSet; import java.util.List; diff --git a/app/src/main/java/org/thoughtcrime/securesms/webrtc/audio/SignalAudioManager.kt b/app/src/main/java/org/thoughtcrime/securesms/webrtc/audio/SignalAudioManager.kt index 1f6207f7ca..ebd6d91331 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/webrtc/audio/SignalAudioManager.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/webrtc/audio/SignalAudioManager.kt @@ -18,13 +18,13 @@ import org.signal.core.util.ThreadUtil import org.signal.core.util.concurrent.SignalExecutors import org.signal.core.util.logging.Log import org.signal.core.util.safeUnregisterReceiver +import org.signal.network.util.Preconditions import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.audio.AudioDeviceUpdatedListener import org.thoughtcrime.securesms.audio.SignalBluetoothManager import org.thoughtcrime.securesms.dependencies.AppDependencies import org.thoughtcrime.securesms.recipients.RecipientId import org.thoughtcrime.securesms.service.webrtc.AndroidTelecomUtil -import org.whispersystems.signalservice.api.util.Preconditions private val TAG = Log.tag(SignalAudioManager::class.java) diff --git a/app/src/spinner/java/org/thoughtcrime/securesms/ApiPlugin.kt b/app/src/spinner/java/org/thoughtcrime/securesms/ApiPlugin.kt index 0efe2082fe..aa4407ebc7 100644 --- a/app/src/spinner/java/org/thoughtcrime/securesms/ApiPlugin.kt +++ b/app/src/spinner/java/org/thoughtcrime/securesms/ApiPlugin.kt @@ -12,6 +12,7 @@ import org.signal.core.util.Hex import org.signal.core.util.logging.Log import org.signal.core.util.orNull import org.signal.libsignal.zkgroup.groups.GroupMasterKey +import org.signal.network.util.JsonUtil import org.signal.spinner.Plugin import org.signal.spinner.PluginResult import org.signal.storageservice.storage.protos.groups.Member @@ -33,7 +34,6 @@ import org.thoughtcrime.securesms.profiles.ProfileName import org.thoughtcrime.securesms.recipients.Recipient import org.thoughtcrime.securesms.recipients.RecipientId import org.whispersystems.signalservice.api.profiles.SignalServiceProfile -import org.whispersystems.signalservice.internal.util.JsonUtil class ApiPlugin : Plugin { companion object { diff --git a/app/src/spinner/java/org/thoughtcrime/securesms/BackupPlugin.kt b/app/src/spinner/java/org/thoughtcrime/securesms/BackupPlugin.kt index 26f48646b4..86953b6b04 100644 --- a/app/src/spinner/java/org/thoughtcrime/securesms/BackupPlugin.kt +++ b/app/src/spinner/java/org/thoughtcrime/securesms/BackupPlugin.kt @@ -14,6 +14,7 @@ import org.signal.core.util.bytes import org.signal.core.util.decodeOrNull import org.signal.core.util.logging.Log import org.signal.libsignal.zkgroup.profiles.ProfileKey +import org.signal.network.NetworkResult import org.signal.network.api.SvrBApi import org.signal.spinner.Plugin import org.signal.spinner.PluginResult @@ -24,7 +25,6 @@ import org.thoughtcrime.securesms.keyvalue.SignalStore import org.thoughtcrime.securesms.net.SignalNetwork import org.thoughtcrime.securesms.providers.BlobProvider import org.thoughtcrime.securesms.recipients.Recipient -import org.whispersystems.signalservice.api.NetworkResult import java.io.IOException import java.text.SimpleDateFormat import java.util.Date diff --git a/app/src/test/java/org/thoughtcrime/securesms/components/settings/app/account/export/ExportAccountDataTest.kt b/app/src/test/java/org/thoughtcrime/securesms/components/settings/app/account/export/ExportAccountDataTest.kt index 2876deb136..214f55300a 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/components/settings/app/account/export/ExportAccountDataTest.kt +++ b/app/src/test/java/org/thoughtcrime/securesms/components/settings/app/account/export/ExportAccountDataTest.kt @@ -17,11 +17,11 @@ import org.junit.Test import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner import org.robolectric.annotation.Config +import org.signal.network.NetworkResult import org.thoughtcrime.securesms.net.SignalNetwork import org.thoughtcrime.securesms.providers.BlobProvider import org.thoughtcrime.securesms.testutil.MockAppDependenciesRule import org.thoughtcrime.securesms.util.JsonUtils -import org.whispersystems.signalservice.api.NetworkResult import java.io.IOException @RunWith(RobolectricTestRunner::class) diff --git a/app/src/test/java/org/thoughtcrime/securesms/components/settings/app/subscription/InAppPaymentsTestRule.kt b/app/src/test/java/org/thoughtcrime/securesms/components/settings/app/subscription/InAppPaymentsTestRule.kt index a3861c54b3..9020a90d7a 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/components/settings/app/subscription/InAppPaymentsTestRule.kt +++ b/app/src/test/java/org/thoughtcrime/securesms/components/settings/app/subscription/InAppPaymentsTestRule.kt @@ -18,6 +18,8 @@ import org.signal.core.util.money.FiatMoney import org.signal.donations.InAppPaymentType import org.signal.donations.PaymentSourceType import org.signal.libsignal.zkgroup.receipts.ReceiptCredentialResponse +import org.signal.network.exceptions.NonSuccessfulResponseCodeException +import org.signal.network.util.JsonUtil import org.thoughtcrime.securesms.components.settings.app.subscription.DonationSerializationHelper.toFiatValue import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentsRepository.toPaymentMethodType import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentsRepository.toPaymentSourceType @@ -28,12 +30,10 @@ import org.thoughtcrime.securesms.database.model.databaseprotos.InAppPaymentData import org.thoughtcrime.securesms.dependencies.AppDependencies import org.thoughtcrime.securesms.keyvalue.SignalStore import org.thoughtcrime.securesms.util.RemoteConfig -import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription.ChargeFailure import org.whispersystems.signalservice.internal.ServiceResponse import org.whispersystems.signalservice.internal.push.SubscriptionsConfiguration -import org.whispersystems.signalservice.internal.util.JsonUtil import java.math.BigDecimal import java.util.Currency import java.util.concurrent.atomic.AtomicReference diff --git a/app/src/test/java/org/thoughtcrime/securesms/components/settings/app/subscription/SubscriptionsConfigurationExtensionsKtTest.kt b/app/src/test/java/org/thoughtcrime/securesms/components/settings/app/subscription/SubscriptionsConfigurationExtensionsKtTest.kt index 901137f016..56793dc4b0 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/components/settings/app/subscription/SubscriptionsConfigurationExtensionsKtTest.kt +++ b/app/src/test/java/org/thoughtcrime/securesms/components/settings/app/subscription/SubscriptionsConfigurationExtensionsKtTest.kt @@ -11,9 +11,9 @@ import org.junit.Test import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner import org.robolectric.annotation.Config +import org.signal.network.util.JsonUtil import org.thoughtcrime.securesms.dependencies.AppDependencies import org.whispersystems.signalservice.internal.push.SubscriptionsConfiguration -import org.whispersystems.signalservice.internal.util.JsonUtil import java.util.Currency @RunWith(RobolectricTestRunner::class) diff --git a/app/src/test/java/org/thoughtcrime/securesms/contacts/paged/SafetyNumberRepositoryTest.kt b/app/src/test/java/org/thoughtcrime/securesms/contacts/paged/SafetyNumberRepositoryTest.kt index b038e05d2b..4e35d2a82c 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/contacts/paged/SafetyNumberRepositoryTest.kt +++ b/app/src/test/java/org/thoughtcrime/securesms/contacts/paged/SafetyNumberRepositoryTest.kt @@ -18,6 +18,7 @@ import org.robolectric.RobolectricTestRunner import org.robolectric.annotation.Config import org.signal.core.util.logging.Log import org.signal.libsignal.protocol.IdentityKeyPair +import org.signal.network.exceptions.NonSuccessfulResponseCodeException import org.thoughtcrime.securesms.crypto.storage.SignalIdentityKeyStore import org.thoughtcrime.securesms.database.IdentityTable import org.thoughtcrime.securesms.database.RecipientDatabaseTestUtils @@ -27,7 +28,6 @@ import org.thoughtcrime.securesms.recipients.RecipientId import org.thoughtcrime.securesms.testutil.MockAppDependenciesRule import org.thoughtcrime.securesms.testutil.SystemOutLogger import org.thoughtcrime.securesms.util.IdentityUtil -import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException import org.whispersystems.signalservice.api.services.ProfileService import org.whispersystems.signalservice.internal.ServiceResponse import org.whispersystems.signalservice.internal.push.IdentityCheckResponse diff --git a/app/src/test/java/org/thoughtcrime/securesms/groups/memberlabel/MemberLabelViewModelTest.kt b/app/src/test/java/org/thoughtcrime/securesms/groups/memberlabel/MemberLabelViewModelTest.kt index c503464a5b..5060e76e3d 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/groups/memberlabel/MemberLabelViewModelTest.kt +++ b/app/src/test/java/org/thoughtcrime/securesms/groups/memberlabel/MemberLabelViewModelTest.kt @@ -19,6 +19,7 @@ import org.junit.Assert.assertTrue import org.junit.Before import org.junit.Rule import org.junit.Test +import org.signal.network.NetworkResult import org.thoughtcrime.securesms.conversation.colors.NameColor import org.thoughtcrime.securesms.groups.GroupId import org.thoughtcrime.securesms.groups.GroupInsufficientRightsException @@ -26,7 +27,6 @@ import org.thoughtcrime.securesms.groups.memberlabel.MemberLabelUiState.SaveStat import org.thoughtcrime.securesms.recipients.Recipient import org.thoughtcrime.securesms.recipients.RecipientId import org.thoughtcrime.securesms.testing.CoroutineDispatcherRule -import org.whispersystems.signalservice.api.NetworkResult import java.io.IOException @OptIn(ExperimentalCoroutinesApi::class) diff --git a/app/src/test/java/org/thoughtcrime/securesms/groups/v2/processing/GroupsV2StateProcessorTest.kt b/app/src/test/java/org/thoughtcrime/securesms/groups/v2/processing/GroupsV2StateProcessorTest.kt index b5c7dddb6f..9d3fefe667 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/groups/v2/processing/GroupsV2StateProcessorTest.kt +++ b/app/src/test/java/org/thoughtcrime/securesms/groups/v2/processing/GroupsV2StateProcessorTest.kt @@ -32,6 +32,8 @@ import org.signal.libsignal.protocol.logging.SignalProtocolLoggerProvider import org.signal.libsignal.zkgroup.VerificationFailedException import org.signal.libsignal.zkgroup.groups.GroupMasterKey import org.signal.libsignal.zkgroup.groups.GroupSecretParams +import org.signal.network.NetworkResult +import org.signal.network.exceptions.NonSuccessfulResponseCodeException import org.signal.storageservice.storage.protos.groups.local.DecryptedGroup import org.signal.storageservice.storage.protos.groups.local.DecryptedGroupChange import org.signal.storageservice.storage.protos.groups.local.DecryptedMember @@ -66,7 +68,6 @@ import org.thoughtcrime.securesms.recipients.RecipientId import org.thoughtcrime.securesms.storage.StorageSyncHelper import org.thoughtcrime.securesms.testutil.MockAppDependenciesRule import org.thoughtcrime.securesms.testutil.SystemOutLogger -import org.whispersystems.signalservice.api.NetworkResult import org.whispersystems.signalservice.api.groupsv2.DecryptedGroupResponse import org.whispersystems.signalservice.api.groupsv2.DecryptedGroupUtil import org.whispersystems.signalservice.api.groupsv2.GroupsV2Api @@ -74,7 +75,6 @@ import org.whispersystems.signalservice.api.groupsv2.GroupsV2Operations import org.whispersystems.signalservice.api.groupsv2.NotAbleToApplyGroupV2ChangeException import org.whispersystems.signalservice.api.groupsv2.ReceivedGroupSendEndorsements import org.whispersystems.signalservice.api.push.ServiceIds -import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException import org.whispersystems.signalservice.internal.push.exceptions.NotInGroupException import java.io.IOException import java.util.Optional diff --git a/app/src/test/java/org/thoughtcrime/securesms/jobs/InAppPaymentRecurringContextJobTest.kt b/app/src/test/java/org/thoughtcrime/securesms/jobs/InAppPaymentRecurringContextJobTest.kt index d998e54509..2e6f7fbc30 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/jobs/InAppPaymentRecurringContextJobTest.kt +++ b/app/src/test/java/org/thoughtcrime/securesms/jobs/InAppPaymentRecurringContextJobTest.kt @@ -22,6 +22,7 @@ import org.robolectric.annotation.Config import org.signal.core.util.logging.Log import org.signal.donations.InAppPaymentType import org.signal.donations.PaymentSourceType +import org.signal.network.NetworkResult import org.thoughtcrime.securesms.backup.v2.BackupRepository import org.thoughtcrime.securesms.backup.v2.MessageBackupTier import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentsRepository @@ -39,7 +40,6 @@ import org.thoughtcrime.securesms.storage.StorageSyncHelper import org.thoughtcrime.securesms.testutil.MockAppDependenciesRule import org.thoughtcrime.securesms.testutil.MockSignalStoreRule import org.thoughtcrime.securesms.testutil.SystemOutLogger -import org.whispersystems.signalservice.api.NetworkResult import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription.ChargeFailure import org.whispersystems.signalservice.api.subscriptions.SubscriberId diff --git a/app/src/test/java/org/thoughtcrime/securesms/registration/v2/PinHashKbsDataTest.kt b/app/src/test/java/org/thoughtcrime/securesms/registration/v2/PinHashKbsDataTest.kt index 3f3507c7c5..5974e35131 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/registration/v2/PinHashKbsDataTest.kt +++ b/app/src/test/java/org/thoughtcrime/securesms/registration/v2/PinHashKbsDataTest.kt @@ -9,11 +9,11 @@ import org.junit.Test import org.signal.core.models.MasterKey import org.signal.core.util.StreamUtil import org.signal.libsignal.svr2.PinHash +import org.signal.network.util.JsonUtil import org.thoughtcrime.securesms.registration.v2.testdata.KbsTestVector import org.thoughtcrime.securesms.testutil.SecureRandomTestUtil import org.whispersystems.signalservice.api.kbs.PinHashUtil.createNewKbsData import org.whispersystems.signalservice.api.kbs.PinHashUtil.decryptSvrDataIVCipherText -import org.whispersystems.signalservice.internal.util.JsonUtil class PinHashKbsDataTest { @Test diff --git a/app/src/test/java/org/thoughtcrime/securesms/registration/v2/PinHashUtil_normalize_Test.java b/app/src/test/java/org/thoughtcrime/securesms/registration/v2/PinHashUtil_normalize_Test.java index 9b005c2848..6105cceb83 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/registration/v2/PinHashUtil_normalize_Test.java +++ b/app/src/test/java/org/thoughtcrime/securesms/registration/v2/PinHashUtil_normalize_Test.java @@ -5,7 +5,7 @@ import org.signal.core.util.Hex; import org.signal.core.util.StreamUtil; import org.thoughtcrime.securesms.registration.testdata.PinSanitationVector; import org.whispersystems.signalservice.api.kbs.PinHashUtil; -import org.whispersystems.signalservice.internal.util.JsonUtil; +import org.signal.network.util.JsonUtil; import java.io.IOException; import java.io.InputStream; diff --git a/app/src/test/java/org/thoughtcrime/securesms/registration/v2/PinValidityChecker_validity_Test.java b/app/src/test/java/org/thoughtcrime/securesms/registration/v2/PinValidityChecker_validity_Test.java index 611b8f6628..e39ed3d976 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/registration/v2/PinValidityChecker_validity_Test.java +++ b/app/src/test/java/org/thoughtcrime/securesms/registration/v2/PinValidityChecker_validity_Test.java @@ -4,7 +4,7 @@ import org.junit.Test; import org.signal.core.util.StreamUtil; import org.thoughtcrime.securesms.registration.testdata.PinValidityVector; import org.whispersystems.signalservice.api.kbs.PinValidityChecker; -import org.whispersystems.signalservice.internal.util.JsonUtil; +import org.signal.network.util.JsonUtil; import java.io.IOException; import java.io.InputStream; diff --git a/core/network/build.gradle.kts b/core/network/build.gradle.kts new file mode 100644 index 0000000000..4d848d05d1 --- /dev/null +++ b/core/network/build.gradle.kts @@ -0,0 +1,81 @@ +/* + * Copyright 2026 Signal Messenger, LLC + * SPDX-License-Identifier: AGPL-3.0-only + */ + +import org.gradle.api.tasks.SourceSetContainer + +plugins { + id("java-library") + id("org.jetbrains.kotlin.jvm") + id("ktlint") + id("com.squareup.wire") +} + +java { + sourceCompatibility = JavaVersion.toVersion(libs.versions.javaVersion.get()) + targetCompatibility = JavaVersion.toVersion(libs.versions.javaVersion.get()) +} + +kotlin { + jvmToolchain { + languageVersion = JavaLanguageVersion.of(libs.versions.kotlinJvmTarget.get()) + } +} + +afterEvaluate { + listOf( + "runKtlintCheckOverMainSourceSet", + "runKtlintFormatOverMainSourceSet" + ).forEach { taskName -> + tasks.named(taskName) { + mustRunAfter(tasks.named("generateMainProtos")) + } + } +} + +wire { + kotlin { + javaInterop = true + } + + sourcePath { + srcDir("src/main/protowire") + } +} + +tasks.runKtlintCheckOverMainSourceSet { + dependsOn(":core:network:generateMainProtos") +} + +val sourceSets = extensions.getByName("sourceSets") as SourceSetContainer +sourceSets.named("main") { + output.dir( + mapOf("builtBy" to tasks.named("compileKotlin")), + "$buildDir/classes/kotlin/main" + ) +} +sourceSets.named("test") { + output.dir( + mapOf("builtBy" to tasks.named("compileTestKotlin")), + "$buildDir/classes/kotlin/test" + ) +} + +dependencies { + api(libs.jackson.core) + api(libs.jackson.module.kotlin) + api(libs.rxjava3.rxjava) + api(libs.square.okio) + + implementation(libs.google.jsr305) + implementation(libs.kotlinx.coroutines.core) + implementation(libs.kotlinx.coroutines.core.jvm) + implementation(libs.libsignal.client) + + implementation(project(":core:util-jvm")) + implementation(project(":core:models-jvm")) + + testImplementation(testLibs.junit.junit) + testImplementation(testLibs.assertk) +} diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/NetworkResult.kt b/core/network/src/main/java/org/signal/network/NetworkResult.kt similarity index 85% rename from lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/NetworkResult.kt rename to core/network/src/main/java/org/signal/network/NetworkResult.kt index b1f7f1fd95..1aaf8caed8 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/NetworkResult.kt +++ b/core/network/src/main/java/org/signal/network/NetworkResult.kt @@ -3,21 +3,17 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -package org.whispersystems.signalservice.api +package org.signal.network import io.reactivex.rxjava3.core.Single import org.signal.core.util.concurrent.safeBlockingGet -import org.whispersystems.signalservice.api.NetworkResult.ApplicationError -import org.whispersystems.signalservice.api.NetworkResult.Companion.fromWebSocket -import org.whispersystems.signalservice.api.NetworkResult.StatusCodeError -import org.whispersystems.signalservice.api.push.exceptions.MalformedRequestException -import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException -import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException -import org.whispersystems.signalservice.api.websocket.SignalWebSocket -import org.whispersystems.signalservice.internal.util.JsonUtil -import org.whispersystems.signalservice.internal.websocket.WebSocketConnection -import org.whispersystems.signalservice.internal.websocket.WebSocketRequestMessage -import org.whispersystems.signalservice.internal.websocket.WebsocketResponse +import org.signal.network.NetworkResult.ApplicationError +import org.signal.network.NetworkResult.StatusCodeError +import org.signal.network.exceptions.MalformedRequestException +import org.signal.network.exceptions.NonSuccessfulResponseCodeException +import org.signal.network.exceptions.PushNetworkException +import org.signal.network.util.JsonUtil +import org.signal.network.websocket.WebsocketResponse import java.io.IOException import java.util.concurrent.TimeoutException import kotlin.reflect.KClass @@ -102,55 +98,6 @@ sealed class NetworkResult( } } - /** - * A convenience method to convert a websocket request into a network result. - * Common HTTP errors will be translated to [StatusCodeError]s. - */ - @JvmStatic - fun fromWebSocketRequest( - signalWebSocket: SignalWebSocket, - request: WebSocketRequestMessage, - timeout: Duration = WebSocketConnection.DEFAULT_SEND_TIMEOUT - ): NetworkResult = fromWebSocketRequest( - signalWebSocket = signalWebSocket, - request = request, - timeout = timeout, - clazz = Unit::class - ) - - /** - * A convenience method to convert a websocket request into a network result with simple conversion of the response body to the desired class. - * Common HTTP errors will be translated to [StatusCodeError]s. - */ - @JvmStatic - fun fromWebSocketRequest( - signalWebSocket: SignalWebSocket, - request: WebSocketRequestMessage, - clazz: KClass, - timeout: Duration = WebSocketConnection.DEFAULT_SEND_TIMEOUT - ): NetworkResult { - return fromWebSocketRequest( - signalWebSocket = signalWebSocket, - request = request, - timeout = timeout, - webSocketResponseConverter = DefaultWebSocketConverter(clazz) - ) - } - - /** - * A convenience method to convert a websocket request into a network result with the ability to fully customize the conversion of the response. - * Common HTTP errors will be translated to [StatusCodeError]s. - */ - @JvmStatic - fun fromWebSocketRequest( - signalWebSocket: SignalWebSocket, - request: WebSocketRequestMessage, - timeout: Duration = WebSocketConnection.DEFAULT_SEND_TIMEOUT, - webSocketResponseConverter: WebSocketResponseConverter - ): NetworkResult { - return fromWebSocket(webSocketResponseConverter) { signalWebSocket.request(request, timeout) } - } - /** * Coroutine-friendly variant of the [fromWebSocket] overload that takes a [WebSocketResponseConverter]. */ diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/MalformedRequestException.kt b/core/network/src/main/java/org/signal/network/exceptions/MalformedRequestException.kt similarity index 73% rename from lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/MalformedRequestException.kt rename to core/network/src/main/java/org/signal/network/exceptions/MalformedRequestException.kt index c027e20dc7..c8ffd248bf 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/MalformedRequestException.kt +++ b/core/network/src/main/java/org/signal/network/exceptions/MalformedRequestException.kt @@ -3,6 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -package org.whispersystems.signalservice.api.push.exceptions +package org.signal.network.exceptions class MalformedRequestException : NonSuccessfulResponseCodeException(400) diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/MalformedResponseException.java b/core/network/src/main/java/org/signal/network/exceptions/MalformedResponseException.java similarity index 85% rename from lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/MalformedResponseException.java rename to core/network/src/main/java/org/signal/network/exceptions/MalformedResponseException.java index 719fa738da..519c847eb0 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/MalformedResponseException.java +++ b/core/network/src/main/java/org/signal/network/exceptions/MalformedResponseException.java @@ -1,4 +1,4 @@ -package org.whispersystems.signalservice.api.push.exceptions; +package org.signal.network.exceptions; import java.io.IOException; diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NonSuccessfulResponseCodeException.kt b/core/network/src/main/java/org/signal/network/exceptions/NonSuccessfulResponseCodeException.kt similarity index 96% rename from lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NonSuccessfulResponseCodeException.kt rename to core/network/src/main/java/org/signal/network/exceptions/NonSuccessfulResponseCodeException.kt index d5b3a5d8c1..c59f34d787 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NonSuccessfulResponseCodeException.kt +++ b/core/network/src/main/java/org/signal/network/exceptions/NonSuccessfulResponseCodeException.kt @@ -3,7 +3,7 @@ * * Licensed according to the LICENSE file in this repository. */ -package org.whispersystems.signalservice.api.push.exceptions +package org.signal.network.exceptions import java.io.IOException diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/PushNetworkException.java b/core/network/src/main/java/org/signal/network/exceptions/PushNetworkException.java similarity index 85% rename from lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/PushNetworkException.java rename to core/network/src/main/java/org/signal/network/exceptions/PushNetworkException.java index 22f9a65892..bf3bf5af95 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/PushNetworkException.java +++ b/core/network/src/main/java/org/signal/network/exceptions/PushNetworkException.java @@ -4,7 +4,7 @@ * Licensed according to the LICENSE file in this repository. */ -package org.whispersystems.signalservice.api.push.exceptions; +package org.signal.network.exceptions; import java.io.IOException; diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/util/JsonUtil.java b/core/network/src/main/java/org/signal/network/util/JsonUtil.java similarity index 97% rename from lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/util/JsonUtil.java rename to core/network/src/main/java/org/signal/network/util/JsonUtil.java index 58541e1708..b85d897b18 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/util/JsonUtil.java +++ b/core/network/src/main/java/org/signal/network/util/JsonUtil.java @@ -4,7 +4,7 @@ * Licensed according to the LICENSE file in this repository. */ -package org.whispersystems.signalservice.internal.util; +package org.signal.network.util; import com.fasterxml.jackson.core.JsonGenerator; @@ -26,7 +26,7 @@ import org.signal.libsignal.protocol.logging.Log; import org.signal.core.models.MasterKey; import org.signal.core.models.ServiceId; import org.signal.core.models.ServiceId.ACI; -import org.whispersystems.signalservice.api.push.exceptions.MalformedResponseException; +import org.signal.network.exceptions.MalformedResponseException; import org.signal.core.util.UuidUtil; import java.io.IOException; diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/Preconditions.java b/core/network/src/main/java/org/signal/network/util/Preconditions.java similarity index 94% rename from lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/Preconditions.java rename to core/network/src/main/java/org/signal/network/util/Preconditions.java index aaf02c9c54..fcb7e476f9 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/Preconditions.java +++ b/core/network/src/main/java/org/signal/network/util/Preconditions.java @@ -1,4 +1,4 @@ -package org.whispersystems.signalservice.api.util; +package org.signal.network.util; /** * Convenient ways to assert expected state. diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/WebSocketRequestExt.kt b/core/network/src/main/java/org/signal/network/websocket/WebSocketRequestExt.kt similarity index 92% rename from lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/WebSocketRequestExt.kt rename to core/network/src/main/java/org/signal/network/websocket/WebSocketRequestExt.kt index 8e14a4bb2b..1ed5f216fe 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/WebSocketRequestExt.kt +++ b/core/network/src/main/java/org/signal/network/websocket/WebSocketRequestExt.kt @@ -3,11 +3,11 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -package org.whispersystems.signalservice.internal +package org.signal.network.websocket import okio.ByteString.Companion.toByteString -import org.whispersystems.signalservice.internal.util.JsonUtil -import org.whispersystems.signalservice.internal.websocket.WebSocketRequestMessage +import org.signal.network.util.JsonUtil +import org.signal.network.websocket.WebSocketRequestMessage import java.security.SecureRandom /** diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/WebsocketResponse.java b/core/network/src/main/java/org/signal/network/websocket/WebsocketResponse.java similarity index 85% rename from lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/WebsocketResponse.java rename to core/network/src/main/java/org/signal/network/websocket/WebsocketResponse.java index 5fcb14728e..263488ce31 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/WebsocketResponse.java +++ b/core/network/src/main/java/org/signal/network/websocket/WebsocketResponse.java @@ -1,8 +1,8 @@ -package org.whispersystems.signalservice.internal.websocket; +package org.signal.network.websocket; -import org.whispersystems.signalservice.api.util.Preconditions; +import org.signal.network.util.Preconditions; import java.util.HashMap; import java.util.List; @@ -15,11 +15,11 @@ public class WebsocketResponse { private final Map headers; private final boolean unidentified; - WebsocketResponse(int status, String body, List headers, boolean unidentified) { + public WebsocketResponse(int status, String body, List headers, boolean unidentified) { this(status, body, parseHeaders(headers), unidentified); } - WebsocketResponse(int status, String body, Map headerMap, boolean unidentified) { + public WebsocketResponse(int status, String body, Map headerMap, boolean unidentified) { this.status = status; this.body = body; this.headers = headerMap; diff --git a/lib/libsignal-service/src/main/protowire/WebSocketResources.proto b/core/network/src/main/protowire/WebSocketResources.proto similarity index 91% rename from lib/libsignal-service/src/main/protowire/WebSocketResources.proto rename to core/network/src/main/protowire/WebSocketResources.proto index 46ea45326f..03a669c886 100644 --- a/lib/libsignal-service/src/main/protowire/WebSocketResources.proto +++ b/core/network/src/main/protowire/WebSocketResources.proto @@ -7,7 +7,7 @@ syntax = "proto2"; package signalservice; -option java_package = "org.whispersystems.signalservice.internal.websocket"; +option java_package = "org.signal.network.websocket"; option java_outer_classname = "WebSocketProtos"; message WebSocketRequestMessage { diff --git a/lib/libsignal-service/build.gradle.kts b/lib/libsignal-service/build.gradle.kts index b1f4b3dad9..735228e989 100644 --- a/lib/libsignal-service/build.gradle.kts +++ b/lib/libsignal-service/build.gradle.kts @@ -114,6 +114,7 @@ dependencies { implementation(libs.kotlinx.coroutines.core) implementation(libs.kotlinx.coroutines.core.jvm) + api(project(":core:network")) implementation(project(":core:util-jvm")) implementation(project(":core:models-jvm")) diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/NetworkResultExtensions.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/NetworkResultExtensions.kt new file mode 100644 index 0000000000..6a136462a4 --- /dev/null +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/NetworkResultExtensions.kt @@ -0,0 +1,59 @@ +/* + * Copyright 2026 Signal Messenger, LLC + * SPDX-License-Identifier: AGPL-3.0-only + */ + +package org.whispersystems.signalservice.api + +import org.signal.network.NetworkResult +import org.signal.network.websocket.WebSocketRequestMessage +import org.whispersystems.signalservice.api.websocket.SignalWebSocket +import org.whispersystems.signalservice.internal.websocket.WebSocketConnection +import kotlin.reflect.KClass +import kotlin.time.Duration + +/** + * A convenience method to convert a websocket request into a network result. + * Common HTTP errors will be translated to [NetworkResult.StatusCodeError]s. + */ +fun NetworkResult.Companion.fromWebSocketRequest( + signalWebSocket: SignalWebSocket, + request: WebSocketRequestMessage, + timeout: Duration = WebSocketConnection.DEFAULT_SEND_TIMEOUT +): NetworkResult = fromWebSocketRequest( + signalWebSocket = signalWebSocket, + request = request, + timeout = timeout, + clazz = Unit::class +) + +/** + * A convenience method to convert a websocket request into a network result with simple conversion of the response body to the desired class. + * Common HTTP errors will be translated to [NetworkResult.StatusCodeError]s. + */ +fun NetworkResult.Companion.fromWebSocketRequest( + signalWebSocket: SignalWebSocket, + request: WebSocketRequestMessage, + clazz: KClass, + timeout: Duration = WebSocketConnection.DEFAULT_SEND_TIMEOUT +): NetworkResult { + return fromWebSocketRequest( + signalWebSocket = signalWebSocket, + request = request, + timeout = timeout, + webSocketResponseConverter = NetworkResult.DefaultWebSocketConverter(clazz) + ) +} + +/** + * A convenience method to convert a websocket request into a network result with the ability to fully customize the conversion of the response. + * Common HTTP errors will be translated to [NetworkResult.StatusCodeError]s. + */ +fun NetworkResult.Companion.fromWebSocketRequest( + signalWebSocket: SignalWebSocket, + request: WebSocketRequestMessage, + timeout: Duration = WebSocketConnection.DEFAULT_SEND_TIMEOUT, + webSocketResponseConverter: NetworkResult.WebSocketResponseConverter +): NetworkResult { + return NetworkResult.fromWebSocket(webSocketResponseConverter) { signalWebSocket.request(request, timeout) } +} diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/NetworkResultUtil.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/NetworkResultUtil.kt index d09c534770..db09899aa7 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/NetworkResultUtil.kt +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/NetworkResultUtil.kt @@ -5,8 +5,9 @@ package org.whispersystems.signalservice.api +import org.signal.network.NetworkResult +import org.signal.network.exceptions.NonSuccessfulResponseCodeException import org.whispersystems.signalservice.api.push.exceptions.AuthorizationFailedException -import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException import org.whispersystems.signalservice.api.push.exceptions.NotFoundException import org.whispersystems.signalservice.api.push.exceptions.ProofRequiredException import org.whispersystems.signalservice.api.push.exceptions.RateLimitException diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageReceiver.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageReceiver.java index 214d781b1c..8643a20930 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageReceiver.java +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageReceiver.java @@ -6,6 +6,8 @@ package org.whispersystems.signalservice.api; +import org.signal.network.NetworkResult; + import org.signal.core.util.StreamUtil; import org.signal.libsignal.protocol.InvalidMessageException; import org.signal.libsignal.zkgroup.profiles.ProfileKey; diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java index 6abea2c9cc..cda9534042 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java @@ -5,6 +5,8 @@ */ package org.whispersystems.signalservice.api; +import org.signal.network.NetworkResult; + import org.signal.core.models.ServiceId; import org.signal.core.models.ServiceId.PNI; import org.signal.core.util.Base64; @@ -84,9 +86,9 @@ import org.whispersystems.signalservice.api.messages.shared.SharedContact; import org.whispersystems.signalservice.api.push.DistributionId; import org.whispersystems.signalservice.api.push.SignalServiceAddress; import org.whispersystems.signalservice.api.push.exceptions.AuthorizationFailedException; -import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException; +import org.signal.network.exceptions.NonSuccessfulResponseCodeException; import org.whispersystems.signalservice.api.push.exceptions.ProofRequiredException; -import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException; +import org.signal.network.exceptions.PushNetworkException; import org.whispersystems.signalservice.api.push.exceptions.RateLimitException; import org.whispersystems.signalservice.api.push.exceptions.RetryNetworkException; import org.whispersystems.signalservice.api.push.exceptions.ServerRejectedException; @@ -94,7 +96,7 @@ import org.whispersystems.signalservice.api.push.exceptions.UnknownGroupSendExce import org.whispersystems.signalservice.api.push.exceptions.UnregisteredUserException; import org.whispersystems.signalservice.api.util.AttachmentPointerUtil; import org.whispersystems.signalservice.api.util.CredentialsProvider; -import org.whispersystems.signalservice.api.util.Preconditions; +import org.signal.network.util.Preconditions; import org.whispersystems.signalservice.api.util.Uint64RangeException; import org.whispersystems.signalservice.api.util.Uint64Util; import org.whispersystems.signalservice.api.websocket.WebSocketUnavailableException; diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/account/AccountApi.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/account/AccountApi.kt index 2991d2b344..b4ac80da9e 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/account/AccountApi.kt +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/account/AccountApi.kt @@ -9,11 +9,14 @@ import org.signal.core.util.Base64 import org.signal.core.util.Base64.encodeUrlSafeWithoutPadding import org.signal.libsignal.usernames.BaseUsernameException import org.signal.libsignal.usernames.Username -import org.whispersystems.signalservice.api.NetworkResult +import org.signal.network.NetworkResult +import org.signal.network.websocket.WebSocketRequestMessage +import org.signal.network.websocket.delete +import org.signal.network.websocket.get +import org.signal.network.websocket.put +import org.whispersystems.signalservice.api.fromWebSocketRequest import org.whispersystems.signalservice.api.push.UsernameLinkComponents import org.whispersystems.signalservice.api.websocket.SignalWebSocket -import org.whispersystems.signalservice.internal.delete -import org.whispersystems.signalservice.internal.get import org.whispersystems.signalservice.internal.push.ConfirmUsernameRequest import org.whispersystems.signalservice.internal.push.ConfirmUsernameResponse import org.whispersystems.signalservice.internal.push.GcmRegistrationId @@ -24,8 +27,6 @@ import org.whispersystems.signalservice.internal.push.SetUsernameLinkRequestBody import org.whispersystems.signalservice.internal.push.SetUsernameLinkResponseBody import org.whispersystems.signalservice.internal.push.VerifyAccountResponse import org.whispersystems.signalservice.internal.push.WhoAmIResponse -import org.whispersystems.signalservice.internal.put -import org.whispersystems.signalservice.internal.websocket.WebSocketRequestMessage import java.security.SecureRandom import java.util.UUID diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/account/ChangePhoneNumberRequest.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/account/ChangePhoneNumberRequest.java index 15aba7abd6..6534bf6f4b 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/account/ChangePhoneNumberRequest.java +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/account/ChangePhoneNumberRequest.java @@ -8,7 +8,7 @@ import org.signal.libsignal.protocol.IdentityKey; import org.whispersystems.signalservice.api.push.SignedPreKeyEntity; import org.whispersystems.signalservice.internal.push.KyberPreKeyEntity; import org.whispersystems.signalservice.internal.push.OutgoingPushMessage; -import org.whispersystems.signalservice.internal.util.JsonUtil; +import org.signal.network.util.JsonUtil; import java.util.List; import java.util.Map; diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/account/PniKeyDistributionRequest.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/account/PniKeyDistributionRequest.java index ca8c266c96..5396ebe328 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/account/PniKeyDistributionRequest.java +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/account/PniKeyDistributionRequest.java @@ -8,7 +8,7 @@ import org.signal.libsignal.protocol.IdentityKey; import org.whispersystems.signalservice.api.push.SignedPreKeyEntity; import org.whispersystems.signalservice.internal.push.KyberPreKeyEntity; import org.whispersystems.signalservice.internal.push.OutgoingPushMessage; -import org.whispersystems.signalservice.internal.util.JsonUtil; +import org.signal.network.util.JsonUtil; import java.util.List; import java.util.Map; diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/attachment/AttachmentApi.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/attachment/AttachmentApi.kt index 190508d9fd..7627b1640a 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/attachment/AttachmentApi.kt +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/attachment/AttachmentApi.kt @@ -10,7 +10,7 @@ import org.signal.core.util.logging.Log import org.signal.libsignal.net.AuthMessagesService import org.signal.libsignal.net.RequestResult import org.signal.libsignal.net.UploadTooLargeException -import org.whispersystems.signalservice.api.NetworkResult +import org.signal.network.NetworkResult import org.whispersystems.signalservice.api.crypto.AttachmentCipherStreamUtil import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentRemoteId import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentStream diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/cds/CdsiV2Service.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/cds/CdsiV2Service.java index 6e53e9c742..63d207144e 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/cds/CdsiV2Service.java +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/cds/CdsiV2Service.java @@ -9,14 +9,14 @@ import org.signal.libsignal.net.CdsiLookupRequest; import org.signal.libsignal.net.CdsiLookupResponse; import org.signal.libsignal.net.Network; import org.signal.libsignal.zkgroup.profiles.ProfileKey; -import org.whispersystems.signalservice.api.NetworkResult; +import org.signal.network.NetworkResult; import org.signal.core.models.ServiceId; import org.signal.core.models.ServiceId.ACI; import org.signal.core.models.ServiceId.PNI; import org.whispersystems.signalservice.api.push.exceptions.CdsiInvalidArgumentException; import org.whispersystems.signalservice.api.push.exceptions.CdsiInvalidTokenException; import org.whispersystems.signalservice.api.push.exceptions.CdsiResourceExhaustedException; -import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException; +import org.signal.network.exceptions.NonSuccessfulResponseCodeException; import java.io.IOException; import java.util.Collections; diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/donations/DonationsApi.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/donations/DonationsApi.kt index 58d4fe3b54..3df5c29941 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/donations/DonationsApi.kt +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/donations/DonationsApi.kt @@ -10,8 +10,14 @@ import org.signal.core.util.urlEncode import org.signal.libsignal.zkgroup.receipts.ReceiptCredentialPresentation import org.signal.libsignal.zkgroup.receipts.ReceiptCredentialRequest import org.signal.libsignal.zkgroup.receipts.ReceiptCredentialResponse -import org.whispersystems.signalservice.api.NetworkResult -import org.whispersystems.signalservice.api.push.exceptions.MalformedResponseException +import org.signal.network.NetworkResult +import org.signal.network.exceptions.MalformedResponseException +import org.signal.network.websocket.WebSocketRequestMessage +import org.signal.network.websocket.delete +import org.signal.network.websocket.get +import org.signal.network.websocket.post +import org.signal.network.websocket.put +import org.whispersystems.signalservice.api.fromWebSocketRequest import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription import org.whispersystems.signalservice.api.subscriptions.PayPalConfirmPaymentIntentResponse import org.whispersystems.signalservice.api.subscriptions.PayPalCreatePaymentIntentResponse @@ -19,14 +25,9 @@ import org.whispersystems.signalservice.api.subscriptions.PayPalCreatePaymentMet import org.whispersystems.signalservice.api.subscriptions.StripeClientSecret import org.whispersystems.signalservice.api.subscriptions.SubscriberId import org.whispersystems.signalservice.api.websocket.SignalWebSocket -import org.whispersystems.signalservice.internal.delete -import org.whispersystems.signalservice.internal.get -import org.whispersystems.signalservice.internal.post import org.whispersystems.signalservice.internal.push.BankMandate import org.whispersystems.signalservice.internal.push.DonationProcessor import org.whispersystems.signalservice.internal.push.SubscriptionsConfiguration -import org.whispersystems.signalservice.internal.put -import org.whispersystems.signalservice.internal.websocket.WebSocketRequestMessage import java.util.Locale /** diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Api.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Api.java index 75ac7421e7..82f6f6d056 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Api.java +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Api.java @@ -22,7 +22,7 @@ import org.signal.storageservice.storage.protos.groups.GroupResponse; import org.signal.storageservice.storage.protos.groups.local.DecryptedGroup; import org.signal.storageservice.storage.protos.groups.local.DecryptedGroupChange; import org.signal.storageservice.storage.protos.groups.local.DecryptedGroupJoinInfo; -import org.whispersystems.signalservice.api.NetworkResult; +import org.signal.network.NetworkResult; import org.signal.core.models.ServiceId.ACI; import org.signal.core.models.ServiceId.PNI; import org.whispersystems.signalservice.api.websocket.SignalWebSocket; diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2ApiHelper.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2ApiHelper.kt index a5b9647da1..b0bb44f5b1 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2ApiHelper.kt +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2ApiHelper.kt @@ -5,10 +5,11 @@ package org.whispersystems.signalservice.api.groupsv2 -import org.whispersystems.signalservice.api.NetworkResult +import org.signal.network.NetworkResult +import org.signal.network.websocket.WebSocketRequestMessage +import org.signal.network.websocket.get +import org.whispersystems.signalservice.api.fromWebSocketRequest import org.whispersystems.signalservice.api.websocket.SignalWebSocket -import org.whispersystems.signalservice.internal.get -import org.whispersystems.signalservice.internal.websocket.WebSocketRequestMessage import java.io.IOException import kotlin.time.Duration.Companion.days diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/keys/KeysApi.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/keys/KeysApi.kt index 662de493e4..22eb6cb708 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/keys/KeysApi.kt +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/keys/KeysApi.kt @@ -14,24 +14,25 @@ import org.signal.libsignal.protocol.ecc.ECPublicKey import org.signal.libsignal.protocol.kem.KEMPublicKey import org.signal.libsignal.protocol.state.PreKeyBundle import org.signal.libsignal.protocol.state.PreKeyRecord +import org.signal.network.NetworkResult +import org.signal.network.websocket.WebSocketRequestMessage +import org.signal.network.websocket.get +import org.signal.network.websocket.post +import org.signal.network.websocket.put import org.whispersystems.signalservice.api.InvalidPreKeyException -import org.whispersystems.signalservice.api.NetworkResult import org.whispersystems.signalservice.api.account.PreKeyUpload import org.whispersystems.signalservice.api.crypto.SealedSenderAccess +import org.whispersystems.signalservice.api.fromWebSocketRequest import org.whispersystems.signalservice.api.push.ServiceIdType import org.whispersystems.signalservice.api.push.SignalServiceAddress import org.whispersystems.signalservice.api.push.SignedPreKeyEntity import org.whispersystems.signalservice.api.push.exceptions.UnregisteredUserException import org.whispersystems.signalservice.api.websocket.SignalWebSocket -import org.whispersystems.signalservice.internal.get -import org.whispersystems.signalservice.internal.post import org.whispersystems.signalservice.internal.push.CheckRepeatedUsedPreKeysRequest import org.whispersystems.signalservice.internal.push.KyberPreKeyEntity import org.whispersystems.signalservice.internal.push.PreKeyEntity import org.whispersystems.signalservice.internal.push.PreKeyResponse import org.whispersystems.signalservice.internal.push.PreKeyState -import org.whispersystems.signalservice.internal.put -import org.whispersystems.signalservice.internal.websocket.WebSocketRequestMessage import java.security.MessageDigest import java.util.LinkedList diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/keys/PreKeyRepository.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/keys/PreKeyRepository.kt index 166db473d0..7b9a8757e9 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/keys/PreKeyRepository.kt +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/keys/PreKeyRepository.kt @@ -19,7 +19,7 @@ import org.signal.libsignal.protocol.SessionBuilder import org.signal.libsignal.protocol.SignalProtocolAddress import org.signal.libsignal.protocol.UntrustedIdentityException import org.signal.libsignal.protocol.state.PreKeyBundle -import org.whispersystems.signalservice.api.NetworkResult +import org.signal.network.NetworkResult import org.whispersystems.signalservice.api.SignalServiceAccountDataStore import org.whispersystems.signalservice.api.SignalSessionLock import org.whispersystems.signalservice.api.crypto.SealedSenderAccess diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/message/MessageApi.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/message/MessageApi.kt index 8faa305bf0..4f96a456d0 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/message/MessageApi.kt +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/message/MessageApi.kt @@ -12,15 +12,16 @@ import org.signal.libsignal.net.MultiRecipientSendAuthorization import org.signal.libsignal.net.MultiRecipientSendFailure import org.signal.libsignal.net.RequestResult import org.signal.libsignal.net.UnauthMessagesService -import org.whispersystems.signalservice.api.NetworkResult +import org.signal.network.NetworkResult +import org.signal.network.websocket.WebSocketRequestMessage +import org.signal.network.websocket.WebsocketResponse +import org.signal.network.websocket.post +import org.signal.network.websocket.put import org.whispersystems.signalservice.api.crypto.SealedSenderAccess +import org.whispersystems.signalservice.api.fromWebSocketRequest import org.whispersystems.signalservice.api.websocket.SignalWebSocket -import org.whispersystems.signalservice.internal.post import org.whispersystems.signalservice.internal.push.OutgoingPushMessageList import org.whispersystems.signalservice.internal.push.SendMessageResponse -import org.whispersystems.signalservice.internal.put -import org.whispersystems.signalservice.internal.websocket.WebSocketRequestMessage -import org.whispersystems.signalservice.internal.websocket.WebsocketResponse /** * Collection of endpoints for operating on messages. diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/EnvelopeResponse.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/EnvelopeResponse.kt index 801f1743ce..76ae3cd30c 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/EnvelopeResponse.kt +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/EnvelopeResponse.kt @@ -1,7 +1,7 @@ package org.whispersystems.signalservice.api.messages +import org.signal.network.websocket.WebSocketRequestMessage import org.whispersystems.signalservice.internal.push.Envelope -import org.whispersystems.signalservice.internal.websocket.WebSocketRequestMessage /** * Represents an envelope off the wire, paired with the metadata needed to process it. diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceGroupV2.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceGroupV2.java index 03d53ab5a9..88c2850c54 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceGroupV2.java +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceGroupV2.java @@ -2,7 +2,7 @@ package org.whispersystems.signalservice.api.messages; import org.signal.libsignal.zkgroup.InvalidInputException; import org.signal.libsignal.zkgroup.groups.GroupMasterKey; -import org.whispersystems.signalservice.api.util.Preconditions; +import org.signal.network.util.Preconditions; import org.whispersystems.signalservice.internal.push.GroupContextV2; import io.reactivex.rxjava3.annotations.NonNull; diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/profiles/ProfileApi.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/profiles/ProfileApi.kt index a2c0e2caf0..a9cd82885d 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/profiles/ProfileApi.kt +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/profiles/ProfileApi.kt @@ -13,22 +13,23 @@ import org.signal.libsignal.zkgroup.profiles.ClientZkProfileOperations import org.signal.libsignal.zkgroup.profiles.ExpiringProfileKeyCredential import org.signal.libsignal.zkgroup.profiles.ProfileKey import org.signal.libsignal.zkgroup.profiles.ProfileKeyCredentialRequestContext -import org.whispersystems.signalservice.api.NetworkResult +import org.signal.network.NetworkResult +import org.signal.network.util.JsonUtil +import org.signal.network.websocket.WebSocketRequestMessage +import org.signal.network.websocket.WebsocketResponse +import org.signal.network.websocket.get +import org.signal.network.websocket.put import org.whispersystems.signalservice.api.crypto.ProfileCipher import org.whispersystems.signalservice.api.crypto.ProfileCipherOutputStream import org.whispersystems.signalservice.api.crypto.SealedSenderAccess +import org.whispersystems.signalservice.api.fromWebSocketRequest import org.whispersystems.signalservice.api.services.ProfileService import org.whispersystems.signalservice.api.websocket.SignalWebSocket -import org.whispersystems.signalservice.internal.get import org.whispersystems.signalservice.internal.push.PaymentAddress import org.whispersystems.signalservice.internal.push.ProfileAvatarData import org.whispersystems.signalservice.internal.push.ProfileAvatarUploadAttributes import org.whispersystems.signalservice.internal.push.PushServiceSocket import org.whispersystems.signalservice.internal.push.http.ProfileCipherOutputStreamFactory -import org.whispersystems.signalservice.internal.put -import org.whispersystems.signalservice.internal.util.JsonUtil -import org.whispersystems.signalservice.internal.websocket.WebSocketRequestMessage -import org.whispersystems.signalservice.internal.websocket.WebsocketResponse import java.security.SecureRandom /** diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/profiles/ProfileRepository.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/profiles/ProfileRepository.kt index 32b4e17206..03f9355092 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/profiles/ProfileRepository.kt +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/profiles/ProfileRepository.kt @@ -18,7 +18,7 @@ import org.signal.core.util.logging.Log import org.signal.libsignal.zkgroup.VerificationFailedException import org.signal.libsignal.zkgroup.profiles.ExpiringProfileKeyCredential import org.signal.libsignal.zkgroup.profiles.ProfileKey -import org.whispersystems.signalservice.api.NetworkResult +import org.signal.network.NetworkResult import org.whispersystems.signalservice.api.crypto.SealedSenderAccess import org.whispersystems.signalservice.api.push.exceptions.RateLimitException import kotlin.time.Duration diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/profiles/SignalServiceProfile.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/profiles/SignalServiceProfile.java index cac1c2965b..670c1e8c4a 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/profiles/SignalServiceProfile.java +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/profiles/SignalServiceProfile.java @@ -11,7 +11,7 @@ import org.signal.libsignal.protocol.logging.Log; import org.signal.libsignal.zkgroup.InvalidInputException; import org.signal.libsignal.zkgroup.profiles.ExpiringProfileKeyCredentialResponse; import org.signal.core.models.ServiceId; -import org.whispersystems.signalservice.internal.util.JsonUtil; +import org.signal.network.util.JsonUtil; import java.math.BigDecimal; import java.util.List; diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/provisioning/ProvisioningSocket.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/provisioning/ProvisioningSocket.kt index 00c0ab724f..51a3d7007b 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/provisioning/ProvisioningSocket.kt +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/provisioning/ProvisioningSocket.kt @@ -25,6 +25,9 @@ import okio.ByteString.Companion.toByteString import org.signal.core.util.Base64 import org.signal.core.util.logging.Log import org.signal.libsignal.protocol.IdentityKeyPair +import org.signal.network.websocket.WebSocketMessage +import org.signal.network.websocket.WebSocketRequestMessage +import org.signal.network.websocket.WebSocketResponseMessage import org.signal.registration.proto.RegistrationProvisionEnvelope import org.whispersystems.signalservice.api.buildOkHttpClient import org.whispersystems.signalservice.api.chooseUrl @@ -32,9 +35,6 @@ import org.whispersystems.signalservice.internal.configuration.SignalServiceConf import org.whispersystems.signalservice.internal.crypto.SecondaryProvisioningCipher import org.whispersystems.signalservice.internal.push.ProvisionEnvelope import org.whispersystems.signalservice.internal.push.ProvisioningAddress -import org.whispersystems.signalservice.internal.websocket.WebSocketMessage -import org.whispersystems.signalservice.internal.websocket.WebSocketRequestMessage -import org.whispersystems.signalservice.internal.websocket.WebSocketResponseMessage import java.io.Closeable import java.io.IOException import java.net.SocketTimeoutException @@ -179,17 +179,19 @@ class ProvisioningSocket private constructor( override fun onMessage(webSocket: WebSocket, bytes: ByteString) { val message: WebSocketMessage = WebSocketMessage.ADAPTER.decode(bytes) - if (message.response != null && message.response.id == lastKeepAliveId) { + val response = message.response + if (response != null && response.id == lastKeepAliveId) { Log.d(TAG, "[$id] [onMessage] Keep alive received") return } - if (message.request == null) { + val request = message.request + if (request == null) { Log.w(TAG, "[$id] [onMessage] Received null request") return } - val success = webSocket.send(message.request.toResponse().encode().toByteString()) + val success = webSocket.send(request.toResponse().encode().toByteString()) if (!success) { Log.w(TAG, "[$id] [onMessage] Failed to send response") @@ -199,10 +201,11 @@ class ProvisioningSocket private constructor( Log.d(TAG, "[$id] [onMessage] Processing request") - if (message.request.verb == "PUT" && message.request.body != null) { - when (message.request.path) { + val body = request.body + if (request.verb == "PUT" && body != null) { + when (request.path) { "/v1/address" -> { - val address = ProvisioningAddress.ADAPTER.decode(message.request.body).address + val address = ProvisioningAddress.ADAPTER.decode(body).address if (address != null) { provisioningUrlDeferral.complete(generateProvisioningUrl(address)) } else { @@ -212,8 +215,8 @@ class ProvisioningSocket private constructor( "/v1/message" -> { when (mode) { - Mode.REREG -> provisioningMessageDeferral.complete(cipher.decrypt(RegistrationProvisionEnvelope.ADAPTER.decode(message.request.body)) as SecondaryProvisioningCipher.ProvisioningDecryptResult) - Mode.LINK -> provisioningMessageDeferral.complete(cipher.decrypt(ProvisionEnvelope.ADAPTER.decode(message.request.body)) as SecondaryProvisioningCipher.ProvisioningDecryptResult) + Mode.REREG -> provisioningMessageDeferral.complete(cipher.decrypt(RegistrationProvisionEnvelope.ADAPTER.decode(body)) as SecondaryProvisioningCipher.ProvisioningDecryptResult) + Mode.LINK -> provisioningMessageDeferral.complete(cipher.decrypt(ProvisionEnvelope.ADAPTER.decode(body)) as SecondaryProvisioningCipher.ProvisioningDecryptResult) } } diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/SignalServiceAddress.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/SignalServiceAddress.java index 6085dc45d4..d2e0d62937 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/SignalServiceAddress.java +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/SignalServiceAddress.java @@ -8,7 +8,7 @@ package org.whispersystems.signalservice.api.push; import org.signal.core.models.ServiceId; import org.whispersystems.signalservice.api.util.OptionalUtil; -import org.whispersystems.signalservice.api.util.Preconditions; +import org.signal.network.util.Preconditions; import org.signal.core.util.UuidUtil; import java.util.Objects; diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/AlreadyVerifiedException.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/AlreadyVerifiedException.kt index cbe35eedf3..2ad3b38982 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/AlreadyVerifiedException.kt +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/AlreadyVerifiedException.kt @@ -1,3 +1,5 @@ package org.whispersystems.signalservice.api.push.exceptions +import org.signal.network.exceptions.NonSuccessfulResponseCodeException + class AlreadyVerifiedException : NonSuccessfulResponseCodeException(409) diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/AuthorizationFailedException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/AuthorizationFailedException.java index 758fbca987..399930b6bf 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/AuthorizationFailedException.java +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/AuthorizationFailedException.java @@ -6,6 +6,8 @@ package org.whispersystems.signalservice.api.push.exceptions; +import org.signal.network.exceptions.NonSuccessfulResponseCodeException; + public class AuthorizationFailedException extends NonSuccessfulResponseCodeException { public AuthorizationFailedException(int code, String s) { super(code, s); diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/CdsiInvalidArgumentException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/CdsiInvalidArgumentException.java index 1fd5e02aef..2e9df2d228 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/CdsiInvalidArgumentException.java +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/CdsiInvalidArgumentException.java @@ -1,5 +1,7 @@ package org.whispersystems.signalservice.api.push.exceptions; +import org.signal.network.exceptions.NonSuccessfulResponseCodeException; + /** * Indicates that something about our request was wrong. Could be: diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/CdsiInvalidTokenException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/CdsiInvalidTokenException.java index e1bbe4bae1..c3b8b79a70 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/CdsiInvalidTokenException.java +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/CdsiInvalidTokenException.java @@ -1,5 +1,7 @@ package org.whispersystems.signalservice.api.push.exceptions; +import org.signal.network.exceptions.NonSuccessfulResponseCodeException; + /** * Indicates that you provided a bad token to CDSI. diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/CdsiResourceExhaustedException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/CdsiResourceExhaustedException.java index 13ee02ff10..f3f49170ab 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/CdsiResourceExhaustedException.java +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/CdsiResourceExhaustedException.java @@ -1,5 +1,7 @@ package org.whispersystems.signalservice.api.push.exceptions; +import org.signal.network.exceptions.NonSuccessfulResponseCodeException; + /** * A 4008 responses from CDSI indicating we've exhausted our quota. */ diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ChallengeRequiredException.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ChallengeRequiredException.kt index 4c4cdfd3e6..05e2b41011 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ChallengeRequiredException.kt +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ChallengeRequiredException.kt @@ -5,6 +5,7 @@ package org.whispersystems.signalservice.api.push.exceptions +import org.signal.network.exceptions.NonSuccessfulResponseCodeException import org.whispersystems.signalservice.internal.push.RegistrationSessionMetadataResponse /** diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ConflictException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ConflictException.java index e817180c97..92f767aedc 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ConflictException.java +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ConflictException.java @@ -1,5 +1,7 @@ package org.whispersystems.signalservice.api.push.exceptions; +import org.signal.network.exceptions.NonSuccessfulResponseCodeException; + /** * Represents a 409 http conflict error. */ diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/DeprecatedVersionException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/DeprecatedVersionException.java index b4e218c24c..92e9ccf4b4 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/DeprecatedVersionException.java +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/DeprecatedVersionException.java @@ -1,5 +1,7 @@ package org.whispersystems.signalservice.api.push.exceptions; +import org.signal.network.exceptions.NonSuccessfulResponseCodeException; + public class DeprecatedVersionException extends NonSuccessfulResponseCodeException { public DeprecatedVersionException() { super(499); diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ExpectationFailedException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ExpectationFailedException.java index 01d753485b..cb36abec82 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ExpectationFailedException.java +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ExpectationFailedException.java @@ -5,6 +5,8 @@ */ package org.whispersystems.signalservice.api.push.exceptions; +import org.signal.network.exceptions.NonSuccessfulResponseCodeException; + public class ExpectationFailedException extends NonSuccessfulResponseCodeException { public ExpectationFailedException() { super(417); diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ExternalServiceFailureException.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ExternalServiceFailureException.kt index 93c6ddb6f7..ccf629212e 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ExternalServiceFailureException.kt +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ExternalServiceFailureException.kt @@ -1,5 +1,7 @@ package org.whispersystems.signalservice.api.push.exceptions +import org.signal.network.exceptions.NonSuccessfulResponseCodeException + /** * known possible values for @property[reason]: * providerRejected - indicates that the provider understood the request, but declined to deliver a verification SMS/call (potentially due to fraud prevention rules) diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/HttpConflictException.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/HttpConflictException.kt index e163a86e96..08f25b85d1 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/HttpConflictException.kt +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/HttpConflictException.kt @@ -1,3 +1,5 @@ package org.whispersystems.signalservice.api.push.exceptions +import org.signal.network.exceptions.NonSuccessfulResponseCodeException + class HttpConflictException : NonSuccessfulResponseCodeException(409) diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ImpossiblePhoneNumberException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ImpossiblePhoneNumberException.java index ba6de25d03..12817971c2 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ImpossiblePhoneNumberException.java +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ImpossiblePhoneNumberException.java @@ -1,5 +1,7 @@ package org.whispersystems.signalservice.api.push.exceptions; +import org.signal.network.exceptions.NonSuccessfulResponseCodeException; + /** * An exception indicating that the server believes the number provided is 'impossible', meaning it fails the most basic libphonenumber checks. */ diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/IncorrectCodeException.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/IncorrectCodeException.kt index 1772184dd4..5c2af21311 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/IncorrectCodeException.kt +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/IncorrectCodeException.kt @@ -1,3 +1,5 @@ package org.whispersystems.signalservice.api.push.exceptions +import org.signal.network.exceptions.NonSuccessfulResponseCodeException + class IncorrectCodeException : NonSuccessfulResponseCodeException(403) diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/IncorrectRegistrationRecoveryPasswordException.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/IncorrectRegistrationRecoveryPasswordException.kt index 1d34d6465c..c5ce33752d 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/IncorrectRegistrationRecoveryPasswordException.kt +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/IncorrectRegistrationRecoveryPasswordException.kt @@ -1,3 +1,5 @@ package org.whispersystems.signalservice.api.push.exceptions +import org.signal.network.exceptions.NonSuccessfulResponseCodeException + class IncorrectRegistrationRecoveryPasswordException : NonSuccessfulResponseCodeException(403) diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/InvalidRegistrationSessionIdException.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/InvalidRegistrationSessionIdException.kt index 1e6c88ddc0..f5f064ede9 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/InvalidRegistrationSessionIdException.kt +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/InvalidRegistrationSessionIdException.kt @@ -5,4 +5,6 @@ package org.whispersystems.signalservice.api.push.exceptions +import org.signal.network.exceptions.NonSuccessfulResponseCodeException + class InvalidRegistrationSessionIdException : NonSuccessfulResponseCodeException(400) diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/InvalidTransportModeException.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/InvalidTransportModeException.kt index fbb9207603..c3fb16eefe 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/InvalidTransportModeException.kt +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/InvalidTransportModeException.kt @@ -1,3 +1,5 @@ package org.whispersystems.signalservice.api.push.exceptions +import org.signal.network.exceptions.NonSuccessfulResponseCodeException + class InvalidTransportModeException : NonSuccessfulResponseCodeException(400) diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/MustRequestNewCodeException.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/MustRequestNewCodeException.kt index 7a2141acef..fd36106e99 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/MustRequestNewCodeException.kt +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/MustRequestNewCodeException.kt @@ -1,3 +1,5 @@ package org.whispersystems.signalservice.api.push.exceptions +import org.signal.network.exceptions.NonSuccessfulResponseCodeException + class MustRequestNewCodeException : NonSuccessfulResponseCodeException(409) diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NoContentException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NoContentException.java index 181dc249fb..cbb288bc43 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NoContentException.java +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NoContentException.java @@ -6,6 +6,8 @@ package org.whispersystems.signalservice.api.push.exceptions; +import org.signal.network.exceptions.NonSuccessfulResponseCodeException; + public class NoContentException extends NonSuccessfulResponseCodeException { public NoContentException(String s) { super(204, s); diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NoSuchSessionException.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NoSuchSessionException.kt index 205bb6da3f..62c91e9152 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NoSuchSessionException.kt +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NoSuchSessionException.kt @@ -1,3 +1,5 @@ package org.whispersystems.signalservice.api.push.exceptions +import org.signal.network.exceptions.NonSuccessfulResponseCodeException + class NoSuchSessionException : NonSuccessfulResponseCodeException(404) diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NonNormalizedPhoneNumberException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NonNormalizedPhoneNumberException.java index 2ae6bc71d0..15b8e9dc60 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NonNormalizedPhoneNumberException.java +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NonNormalizedPhoneNumberException.java @@ -1,8 +1,12 @@ package org.whispersystems.signalservice.api.push.exceptions; +import org.signal.network.exceptions.MalformedResponseException; + +import org.signal.network.exceptions.NonSuccessfulResponseCodeException; + import com.fasterxml.jackson.annotation.JsonProperty; -import org.whispersystems.signalservice.internal.util.JsonUtil; +import org.signal.network.util.JsonUtil; import io.reactivex.rxjava3.annotations.NonNull; diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NonSuccessfulResumableUploadResponseCodeException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NonSuccessfulResumableUploadResponseCodeException.java index 121c30cf3b..2c76924132 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NonSuccessfulResumableUploadResponseCodeException.java +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NonSuccessfulResumableUploadResponseCodeException.java @@ -1,5 +1,7 @@ package org.whispersystems.signalservice.api.push.exceptions; +import org.signal.network.exceptions.NonSuccessfulResponseCodeException; + public class NonSuccessfulResumableUploadResponseCodeException extends NonSuccessfulResponseCodeException { public NonSuccessfulResumableUploadResponseCodeException(int code, String s) { super(code, s); diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NotFoundException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NotFoundException.java index 1129e7f86b..6ffffb05cc 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NotFoundException.java +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NotFoundException.java @@ -6,6 +6,8 @@ package org.whispersystems.signalservice.api.push.exceptions; +import org.signal.network.exceptions.NonSuccessfulResponseCodeException; + public class NotFoundException extends NonSuccessfulResponseCodeException { public NotFoundException(String s) { super(404, s); diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ProofRequiredException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ProofRequiredException.java index 32bb56e623..1265f95901 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ProofRequiredException.java +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ProofRequiredException.java @@ -1,5 +1,7 @@ package org.whispersystems.signalservice.api.push.exceptions; +import org.signal.network.exceptions.NonSuccessfulResponseCodeException; + import org.signal.libsignal.protocol.logging.Log; import org.whispersystems.signalservice.internal.push.ProofRequiredResponse; diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/RangeException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/RangeException.java index d1db9619ff..f5195aa295 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/RangeException.java +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/RangeException.java @@ -6,6 +6,8 @@ package org.whispersystems.signalservice.api.push.exceptions; +import org.signal.network.exceptions.NonSuccessfulResponseCodeException; + public final class RangeException extends NonSuccessfulResponseCodeException { public RangeException(long requested) { diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/RateLimitException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/RateLimitException.java index 88a7255d41..86f45fc314 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/RateLimitException.java +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/RateLimitException.java @@ -6,6 +6,8 @@ package org.whispersystems.signalservice.api.push.exceptions; +import org.signal.network.exceptions.NonSuccessfulResponseCodeException; + import java.util.Optional; diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/RemoteAttestationResponseExpiredException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/RemoteAttestationResponseExpiredException.java index f6f5f4ac38..dcc9627766 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/RemoteAttestationResponseExpiredException.java +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/RemoteAttestationResponseExpiredException.java @@ -6,6 +6,8 @@ package org.whispersystems.signalservice.api.push.exceptions; +import org.signal.network.exceptions.NonSuccessfulResponseCodeException; + public class RemoteAttestationResponseExpiredException extends NonSuccessfulResponseCodeException { public RemoteAttestationResponseExpiredException(String message) { super(409, message); diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/RequestVerificationCodeRateLimitException.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/RequestVerificationCodeRateLimitException.kt index 8a39a5555a..6509728ee9 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/RequestVerificationCodeRateLimitException.kt +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/RequestVerificationCodeRateLimitException.kt @@ -5,6 +5,7 @@ package org.whispersystems.signalservice.api.push.exceptions +import org.signal.network.exceptions.NonSuccessfulResponseCodeException import org.whispersystems.signalservice.internal.push.RegistrationSessionMetadataResponse /** diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ServerRejectedException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ServerRejectedException.java index 59ef771473..02e8c06263 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ServerRejectedException.java +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ServerRejectedException.java @@ -1,5 +1,7 @@ package org.whispersystems.signalservice.api.push.exceptions; +import org.signal.network.exceptions.NonSuccessfulResponseCodeException; + /** * Indicates the server has rejected the request and we should stop retrying. */ diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/SubmitVerificationCodeRateLimitException.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/SubmitVerificationCodeRateLimitException.kt index c4a2e92498..f5435a5ed6 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/SubmitVerificationCodeRateLimitException.kt +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/SubmitVerificationCodeRateLimitException.kt @@ -5,6 +5,7 @@ package org.whispersystems.signalservice.api.push.exceptions +import org.signal.network.exceptions.NonSuccessfulResponseCodeException import org.whispersystems.signalservice.internal.push.RegistrationSessionMetadataResponse /** diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/TokenNotAcceptedException.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/TokenNotAcceptedException.kt index c8973e1ee3..58c496ade8 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/TokenNotAcceptedException.kt +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/TokenNotAcceptedException.kt @@ -1,5 +1,7 @@ package org.whispersystems.signalservice.api.push.exceptions +import org.signal.network.exceptions.NonSuccessfulResponseCodeException + /** * Exception representing that the submitted information was not accepted (e.g. the push challenge token or captcha did not match) */ diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/UsernameIsNotReservedException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/UsernameIsNotReservedException.java index 7885e6a2b0..3d9e02e3e6 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/UsernameIsNotReservedException.java +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/UsernameIsNotReservedException.java @@ -1,5 +1,7 @@ package org.whispersystems.signalservice.api.push.exceptions; +import org.signal.network.exceptions.NonSuccessfulResponseCodeException; + public class UsernameIsNotReservedException extends NonSuccessfulResponseCodeException { public UsernameIsNotReservedException() { super(409, "The given username is not associated with an account."); diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/UsernameMalformedException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/UsernameMalformedException.java index e8f39a1275..e97214f5e9 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/UsernameMalformedException.java +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/UsernameMalformedException.java @@ -1,5 +1,7 @@ package org.whispersystems.signalservice.api.push.exceptions; +import org.signal.network.exceptions.NonSuccessfulResponseCodeException; + public class UsernameMalformedException extends NonSuccessfulResponseCodeException { public UsernameMalformedException() { super(400); diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/UsernameTakenException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/UsernameTakenException.java index d90d6cfa38..59ca4ed59f 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/UsernameTakenException.java +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/UsernameTakenException.java @@ -1,5 +1,7 @@ package org.whispersystems.signalservice.api.push.exceptions; +import org.signal.network.exceptions.NonSuccessfulResponseCodeException; + public class UsernameTakenException extends NonSuccessfulResponseCodeException { public UsernameTakenException() { super(409); diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/registration/RegistrationApi.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/registration/RegistrationApi.kt index cb12da9cf8..43ad0029e1 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/registration/RegistrationApi.kt +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/registration/RegistrationApi.kt @@ -5,7 +5,7 @@ package org.whispersystems.signalservice.api.registration -import org.whispersystems.signalservice.api.NetworkResult +import org.signal.network.NetworkResult import org.whispersystems.signalservice.api.account.AccountAttributes import org.whispersystems.signalservice.api.account.PreKeyCollection import org.whispersystems.signalservice.api.messages.multidevice.RegisterAsSecondaryDeviceResponse diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/services/DonationsService.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/services/DonationsService.java index 96ed06aabc..dfb787ffde 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/services/DonationsService.java +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/services/DonationsService.java @@ -4,10 +4,10 @@ import org.signal.libsignal.protocol.logging.Log; import org.signal.libsignal.zkgroup.receipts.ReceiptCredentialPresentation; import org.signal.libsignal.zkgroup.receipts.ReceiptCredentialRequest; import org.signal.libsignal.zkgroup.receipts.ReceiptCredentialResponse; -import org.whispersystems.signalservice.api.NetworkResult; +import org.signal.network.NetworkResult; import org.whispersystems.signalservice.api.NetworkResultUtil; import org.whispersystems.signalservice.api.donations.DonationsApi; -import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException; +import org.signal.network.exceptions.NonSuccessfulResponseCodeException; import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription; import org.whispersystems.signalservice.api.subscriptions.PayPalConfirmPaymentIntentResponse; import org.whispersystems.signalservice.api.subscriptions.PayPalCreatePaymentIntentResponse; diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/services/ProfileService.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/services/ProfileService.java index 657c4e606f..2b6e99c403 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/services/ProfileService.java +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/services/ProfileService.java @@ -16,7 +16,7 @@ import org.whispersystems.signalservice.api.profiles.SignalServiceProfile; import org.signal.core.models.ServiceId; import org.signal.core.models.ServiceId.ACI; import org.whispersystems.signalservice.api.push.SignalServiceAddress; -import org.whispersystems.signalservice.api.push.exceptions.MalformedResponseException; +import org.signal.network.exceptions.MalformedResponseException; import org.whispersystems.signalservice.api.websocket.SignalWebSocket; import org.whispersystems.signalservice.internal.ServiceResponse; import org.whispersystems.signalservice.internal.ServiceResponseProcessor; @@ -24,10 +24,10 @@ import org.whispersystems.signalservice.internal.push.IdentityCheckRequest; import org.whispersystems.signalservice.internal.push.IdentityCheckRequest.ServiceIdFingerprintPair; import org.whispersystems.signalservice.internal.push.IdentityCheckResponse; import org.whispersystems.signalservice.internal.push.http.AcceptLanguagesUtil; -import org.whispersystems.signalservice.internal.util.JsonUtil; +import org.signal.network.util.JsonUtil; import org.whispersystems.signalservice.internal.websocket.DefaultResponseMapper; import org.whispersystems.signalservice.internal.websocket.ResponseMapper; -import org.whispersystems.signalservice.internal.websocket.WebSocketRequestMessage; +import org.signal.network.websocket.WebSocketRequestMessage; import java.security.SecureRandom; import java.util.Collections; diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/StorageId.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/StorageId.java index fe5588cb87..58efeea316 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/StorageId.java +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/StorageId.java @@ -1,7 +1,7 @@ package org.whispersystems.signalservice.api.storage; -import org.whispersystems.signalservice.api.util.Preconditions; +import org.signal.network.util.Preconditions; import org.whispersystems.signalservice.internal.storage.protos.ManifestRecord; import java.util.Arrays; diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/StorageServiceApi.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/StorageServiceApi.kt index eb0518a47d..618238a010 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/StorageServiceApi.kt +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/StorageServiceApi.kt @@ -6,15 +6,16 @@ package org.whispersystems.signalservice.api.storage import okhttp3.Credentials -import org.whispersystems.signalservice.api.NetworkResult +import org.signal.network.NetworkResult +import org.signal.network.websocket.WebSocketRequestMessage +import org.signal.network.websocket.get +import org.whispersystems.signalservice.api.fromWebSocketRequest import org.whispersystems.signalservice.api.websocket.SignalWebSocket -import org.whispersystems.signalservice.internal.get import org.whispersystems.signalservice.internal.push.PushServiceSocket import org.whispersystems.signalservice.internal.storage.protos.ReadOperation import org.whispersystems.signalservice.internal.storage.protos.StorageItems import org.whispersystems.signalservice.internal.storage.protos.StorageManifest import org.whispersystems.signalservice.internal.storage.protos.WriteOperation -import org.whispersystems.signalservice.internal.websocket.WebSocketRequestMessage /** * Class to interact with storage service endpoints. diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/subscriptions/IdempotencyKey.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/subscriptions/IdempotencyKey.java index 1c6de11c05..b95388b08e 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/subscriptions/IdempotencyKey.java +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/subscriptions/IdempotencyKey.java @@ -2,7 +2,7 @@ package org.whispersystems.signalservice.api.subscriptions; import org.signal.core.util.Base64; -import org.whispersystems.signalservice.api.util.Preconditions; +import org.signal.network.util.Preconditions; import java.security.SecureRandom; import java.util.Arrays; diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/subscriptions/SubscriberId.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/subscriptions/SubscriberId.java index b6d75f0d41..65cd749088 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/subscriptions/SubscriberId.java +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/subscriptions/SubscriberId.java @@ -2,7 +2,7 @@ package org.whispersystems.signalservice.api.subscriptions; import org.signal.core.util.Base64; -import org.whispersystems.signalservice.api.util.Preconditions; +import org.signal.network.util.Preconditions; import java.io.IOException; import java.security.SecureRandom; diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/SecureValueRecoveryV2.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/SecureValueRecoveryV2.kt index 7094ff968f..fdbda831ab 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/SecureValueRecoveryV2.kt +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/SecureValueRecoveryV2.kt @@ -8,15 +8,19 @@ import org.signal.core.models.MasterKey import org.signal.core.util.Hex import org.signal.libsignal.protocol.logging.Log import org.signal.libsignal.svr2.PinHash +import org.signal.network.NetworkResult +import org.signal.network.exceptions.NonSuccessfulResponseCodeException +import org.signal.network.util.JsonUtil +import org.signal.network.websocket.WebSocketRequestMessage +import org.signal.network.websocket.get import org.signal.svr2.proto.BackupRequest import org.signal.svr2.proto.DeleteRequest import org.signal.svr2.proto.ExposeRequest import org.signal.svr2.proto.Request import org.signal.svr2.proto.RestoreRequest -import org.whispersystems.signalservice.api.NetworkResult import org.whispersystems.signalservice.api.crypto.InvalidCiphertextException +import org.whispersystems.signalservice.api.fromWebSocketRequest import org.whispersystems.signalservice.api.kbs.PinHashUtil -import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException import org.whispersystems.signalservice.api.svr.SecureValueRecovery.BackupResponse import org.whispersystems.signalservice.api.svr.SecureValueRecovery.DeleteResponse import org.whispersystems.signalservice.api.svr.SecureValueRecovery.InvalidRequestException @@ -25,10 +29,7 @@ import org.whispersystems.signalservice.api.svr.SecureValueRecovery.RestoreRespo import org.whispersystems.signalservice.api.svr.SecureValueRecovery.SvrVersion import org.whispersystems.signalservice.api.websocket.SignalWebSocket import org.whispersystems.signalservice.internal.configuration.SignalServiceConfiguration -import org.whispersystems.signalservice.internal.get import org.whispersystems.signalservice.internal.push.AuthCredentials -import org.whispersystems.signalservice.internal.util.JsonUtil -import org.whispersystems.signalservice.internal.websocket.WebSocketRequestMessage import java.io.IOException import kotlin.time.Duration.Companion.seconds import org.signal.svr2.proto.BackupResponse as ProtoBackupResponse diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/SecureValueRecoveryV3.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/SecureValueRecoveryV3.kt index cdf7f543b1..363378834e 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/SecureValueRecoveryV3.kt +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/SecureValueRecoveryV3.kt @@ -11,20 +11,21 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize import org.signal.core.models.MasterKey import org.signal.core.util.logging.Log import org.signal.libsignal.net.Network -import org.whispersystems.signalservice.api.NetworkResult -import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException +import org.signal.network.NetworkResult +import org.signal.network.exceptions.NonSuccessfulResponseCodeException +import org.signal.network.util.JsonUtil +import org.signal.network.websocket.WebSocketRequestMessage +import org.signal.network.websocket.get +import org.whispersystems.signalservice.api.fromWebSocketRequest import org.whispersystems.signalservice.api.svr.SecureValueRecovery.BackupResponse import org.whispersystems.signalservice.api.svr.SecureValueRecovery.DeleteResponse import org.whispersystems.signalservice.api.svr.SecureValueRecovery.PinChangeSession import org.whispersystems.signalservice.api.svr.SecureValueRecovery.RestoreResponse import org.whispersystems.signalservice.api.svr.SecureValueRecovery.SvrVersion import org.whispersystems.signalservice.api.websocket.SignalWebSocket -import org.whispersystems.signalservice.internal.get import org.whispersystems.signalservice.internal.push.AuthCredentials import org.whispersystems.signalservice.internal.push.ByteArrayDeserializerBase64 import org.whispersystems.signalservice.internal.push.ByteArraySerializerBase64NoPadding -import org.whispersystems.signalservice.internal.util.JsonUtil -import org.whispersystems.signalservice.internal.websocket.WebSocketRequestMessage import java.io.IOException /** diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/Svr2Socket.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/Svr2Socket.kt index 0d848e2a13..05616b70cd 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/Svr2Socket.kt +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/Svr2Socket.kt @@ -11,9 +11,9 @@ import org.signal.libsignal.attest.AttestationDataException import org.signal.libsignal.protocol.logging.Log import org.signal.libsignal.sgxsession.SgxCommunicationFailureException import org.signal.libsignal.svr2.Svr2Client +import org.signal.network.exceptions.NonSuccessfulResponseCodeException import org.whispersystems.signalservice.api.buildOkHttpClient import org.whispersystems.signalservice.api.chooseUrl -import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException import org.whispersystems.signalservice.internal.configuration.SignalServiceConfiguration import org.whispersystems.signalservice.internal.configuration.SignalSvr2Url import org.whispersystems.signalservice.internal.push.AuthCredentials diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/websocket/SignalWebSocket.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/websocket/SignalWebSocket.kt index 5bac0f70cb..74372178eb 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/websocket/SignalWebSocket.kt +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/websocket/SignalWebSocket.kt @@ -26,15 +26,15 @@ import org.signal.libsignal.net.BadRequestError import org.signal.libsignal.net.ChatConnection import org.signal.libsignal.net.RequestResult import org.signal.libsignal.net.UnauthenticatedChatConnection +import org.signal.network.websocket.WebSocketRequestMessage +import org.signal.network.websocket.WebSocketResponseMessage +import org.signal.network.websocket.WebsocketResponse import org.whispersystems.signalservice.api.crypto.SealedSenderAccess import org.whispersystems.signalservice.api.messages.EnvelopeResponse import org.whispersystems.signalservice.api.util.SleepTimer import org.whispersystems.signalservice.internal.push.Envelope import org.whispersystems.signalservice.internal.util.awaitRequest import org.whispersystems.signalservice.internal.websocket.WebSocketConnection -import org.whispersystems.signalservice.internal.websocket.WebSocketRequestMessage -import org.whispersystems.signalservice.internal.websocket.WebSocketResponseMessage -import org.whispersystems.signalservice.internal.websocket.WebsocketResponse import java.io.IOException import java.util.concurrent.CancellationException import java.util.concurrent.CompletionException diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/ServiceResponse.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/ServiceResponse.java index 3d73fdf6e2..5979de3909 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/ServiceResponse.java +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/ServiceResponse.java @@ -2,10 +2,10 @@ package org.whispersystems.signalservice.internal; -import org.whispersystems.signalservice.api.NetworkResult; -import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException; -import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException; -import org.whispersystems.signalservice.api.util.Preconditions; +import org.signal.network.NetworkResult; +import org.signal.network.exceptions.NonSuccessfulResponseCodeException; +import org.signal.network.exceptions.PushNetworkException; +import org.signal.network.util.Preconditions; import java.io.IOException; import java.util.Optional; diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/ServiceResponseProcessor.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/ServiceResponseProcessor.java index 8ff9dd6d47..8e2589e1ae 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/ServiceResponseProcessor.java +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/ServiceResponseProcessor.java @@ -2,9 +2,9 @@ package org.whispersystems.signalservice.internal; import org.signal.libsignal.net.ChatServiceException; -import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException; +import org.signal.network.exceptions.NonSuccessfulResponseCodeException; import org.whispersystems.signalservice.api.util.OptionalUtil; -import org.whispersystems.signalservice.api.util.Preconditions; +import org.signal.network.util.Preconditions; import java.io.IOException; import java.util.concurrent.TimeoutException; diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ConfirmUsernameResponse.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ConfirmUsernameResponse.kt index 49a8edd8f0..9a3499fe54 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ConfirmUsernameResponse.kt +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ConfirmUsernameResponse.kt @@ -2,7 +2,7 @@ package org.whispersystems.signalservice.internal.push import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.databind.annotation.JsonDeserialize -import org.whispersystems.signalservice.internal.util.JsonUtil +import org.signal.network.util.JsonUtil import java.util.UUID /** Response body for confirming a username reservation. */ diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/DeviceLimitExceededException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/DeviceLimitExceededException.java index 791731ec64..db367e4dba 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/DeviceLimitExceededException.java +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/DeviceLimitExceededException.java @@ -1,6 +1,6 @@ package org.whispersystems.signalservice.internal.push; -import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException; +import org.signal.network.exceptions.NonSuccessfulResponseCodeException; public class DeviceLimitExceededException extends NonSuccessfulResponseCodeException { diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/IdentityCheckRequest.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/IdentityCheckRequest.java index d15b94b3b9..9207e5b583 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/IdentityCheckRequest.java +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/IdentityCheckRequest.java @@ -5,7 +5,7 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize; import org.signal.libsignal.protocol.IdentityKey; import org.signal.core.models.ServiceId; -import org.whispersystems.signalservice.internal.util.JsonUtil; +import org.signal.network.util.JsonUtil; import org.signal.core.util.Base64; import java.security.MessageDigest; diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/IdentityCheckResponse.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/IdentityCheckResponse.java index 873921d2e0..397a58c00d 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/IdentityCheckResponse.java +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/IdentityCheckResponse.java @@ -5,7 +5,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.signal.libsignal.protocol.IdentityKey; import org.signal.core.models.ServiceId; -import org.whispersystems.signalservice.internal.util.JsonUtil; +import org.signal.network.util.JsonUtil; import java.util.List; diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/LockedException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/LockedException.java index 53ad86a2c1..e1d939ded3 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/LockedException.java +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/LockedException.java @@ -1,7 +1,7 @@ package org.whispersystems.signalservice.internal.push; -import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException; +import org.signal.network.exceptions.NonSuccessfulResponseCodeException; import org.whispersystems.signalservice.api.svr.Svr3Credentials; public final class LockedException extends NonSuccessfulResponseCodeException { diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PreKeyResponse.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PreKeyResponse.java index b9ad9367c9..536b1c4a69 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PreKeyResponse.java +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PreKeyResponse.java @@ -11,7 +11,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import org.signal.libsignal.protocol.IdentityKey; -import org.whispersystems.signalservice.internal.util.JsonUtil; +import org.signal.network.util.JsonUtil; import java.util.List; diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PreKeyState.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PreKeyState.java index 22ec7d519c..c346f3565d 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PreKeyState.java +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PreKeyState.java @@ -6,7 +6,7 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize; import org.signal.libsignal.protocol.IdentityKey; import org.whispersystems.signalservice.api.push.SignedPreKeyEntity; -import org.whispersystems.signalservice.internal.util.JsonUtil; +import org.signal.network.util.JsonUtil; import java.util.List; diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PushServiceSocket.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PushServiceSocket.java index 062485088f..ea395436ae 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PushServiceSocket.java +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PushServiceSocket.java @@ -23,7 +23,7 @@ import org.signal.storageservice.storage.protos.groups.GroupChanges; import org.signal.storageservice.storage.protos.groups.GroupJoinInfo; import org.signal.storageservice.storage.protos.groups.GroupResponse; import org.signal.storageservice.storage.protos.groups.Member; -import org.whispersystems.signalservice.api.NetworkResult; +import org.signal.network.NetworkResult; import org.whispersystems.signalservice.api.account.AccountAttributes; import org.whispersystems.signalservice.api.account.PreKeyCollection; import org.whispersystems.signalservice.api.crypto.SealedSenderAccess; @@ -47,17 +47,17 @@ import org.whispersystems.signalservice.api.push.exceptions.HttpConflictExceptio import org.whispersystems.signalservice.api.push.exceptions.IncorrectRegistrationRecoveryPasswordException; import org.whispersystems.signalservice.api.push.exceptions.InvalidRegistrationSessionIdException; import org.whispersystems.signalservice.api.push.exceptions.InvalidTransportModeException; -import org.whispersystems.signalservice.api.push.exceptions.MalformedRequestException; -import org.whispersystems.signalservice.api.push.exceptions.MalformedResponseException; +import org.signal.network.exceptions.MalformedRequestException; +import org.signal.network.exceptions.MalformedResponseException; import org.whispersystems.signalservice.api.push.exceptions.MissingConfigurationException; import org.whispersystems.signalservice.api.push.exceptions.MustRequestNewCodeException; import org.whispersystems.signalservice.api.push.exceptions.NoContentException; import org.whispersystems.signalservice.api.push.exceptions.NoSuchSessionException; -import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException; +import org.signal.network.exceptions.NonSuccessfulResponseCodeException; import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResumableUploadResponseCodeException; import org.whispersystems.signalservice.api.push.exceptions.NotFoundException; import org.whispersystems.signalservice.api.push.exceptions.ProofRequiredException; -import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException; +import org.signal.network.exceptions.PushNetworkException; import org.whispersystems.signalservice.api.push.exceptions.RangeException; import org.whispersystems.signalservice.api.push.exceptions.RateLimitException; import org.whispersystems.signalservice.api.push.exceptions.RequestVerificationCodeRateLimitException; @@ -94,7 +94,7 @@ import org.whispersystems.signalservice.internal.storage.protos.StorageItems; import org.whispersystems.signalservice.internal.storage.protos.StorageManifest; import org.whispersystems.signalservice.internal.storage.protos.WriteOperation; import org.whispersystems.signalservice.internal.util.BlacklistingTrustManager; -import org.whispersystems.signalservice.internal.util.JsonUtil; +import org.signal.network.util.JsonUtil; import org.whispersystems.signalservice.internal.util.Util; import java.io.ByteArrayInputStream; diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SetUsernameLinkResponseBody.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SetUsernameLinkResponseBody.kt index a2d71b9177..9a28ae35c2 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SetUsernameLinkResponseBody.kt +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SetUsernameLinkResponseBody.kt @@ -2,7 +2,7 @@ package org.whispersystems.signalservice.internal.push import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.databind.annotation.JsonDeserialize -import org.whispersystems.signalservice.internal.util.JsonUtil.UuidDeserializer +import org.signal.network.util.JsonUtil.UuidDeserializer import java.util.UUID /** Response body for setting a username link on the service. */ diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/CaptchaRejectedException.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/CaptchaRejectedException.kt index 8ae9e289c8..7d8b560b3e 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/CaptchaRejectedException.kt +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/CaptchaRejectedException.kt @@ -5,7 +5,7 @@ package org.whispersystems.signalservice.internal.push.exceptions -import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException +import org.signal.network.exceptions.NonSuccessfulResponseCodeException /** * Indicates that the captcha we submitted was not accepted by the server. diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/ForbiddenException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/ForbiddenException.java index dff8f066e4..f838607df8 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/ForbiddenException.java +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/ForbiddenException.java @@ -1,7 +1,7 @@ package org.whispersystems.signalservice.internal.push.exceptions; -import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException; +import org.signal.network.exceptions.NonSuccessfulResponseCodeException; import java.util.Optional; diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/GroupExistsException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/GroupExistsException.java index 4c596e66ac..1e500eea22 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/GroupExistsException.java +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/GroupExistsException.java @@ -1,6 +1,6 @@ package org.whispersystems.signalservice.internal.push.exceptions; -import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException; +import org.signal.network.exceptions.NonSuccessfulResponseCodeException; public final class GroupExistsException extends NonSuccessfulResponseCodeException { public GroupExistsException() { diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/GroupMismatchedDevicesException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/GroupMismatchedDevicesException.java index d3faba07d9..da1292d36f 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/GroupMismatchedDevicesException.java +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/GroupMismatchedDevicesException.java @@ -1,6 +1,6 @@ package org.whispersystems.signalservice.internal.push.exceptions; -import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException; +import org.signal.network.exceptions.NonSuccessfulResponseCodeException; import org.whispersystems.signalservice.internal.push.GroupMismatchedDevices; import java.util.Arrays; diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/GroupNotFoundException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/GroupNotFoundException.java index f36f1ae133..c40a364515 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/GroupNotFoundException.java +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/GroupNotFoundException.java @@ -1,6 +1,6 @@ package org.whispersystems.signalservice.internal.push.exceptions; -import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException; +import org.signal.network.exceptions.NonSuccessfulResponseCodeException; public final class GroupNotFoundException extends NonSuccessfulResponseCodeException { public GroupNotFoundException() { diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/GroupPatchNotAcceptedException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/GroupPatchNotAcceptedException.java index 24096d7c76..535f479c78 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/GroupPatchNotAcceptedException.java +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/GroupPatchNotAcceptedException.java @@ -1,6 +1,6 @@ package org.whispersystems.signalservice.internal.push.exceptions; -import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException; +import org.signal.network.exceptions.NonSuccessfulResponseCodeException; import javax.annotation.Nonnull; diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/GroupStaleDevicesException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/GroupStaleDevicesException.java index 3740bbcf30..27b4aa856d 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/GroupStaleDevicesException.java +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/GroupStaleDevicesException.java @@ -1,6 +1,6 @@ package org.whispersystems.signalservice.internal.push.exceptions; -import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException; +import org.signal.network.exceptions.NonSuccessfulResponseCodeException; import org.whispersystems.signalservice.internal.push.GroupStaleDevices; import java.util.Arrays; diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/GroupTerminatedException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/GroupTerminatedException.java index 0a1c9fc94e..b4b6b19263 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/GroupTerminatedException.java +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/GroupTerminatedException.java @@ -1,6 +1,6 @@ package org.whispersystems.signalservice.internal.push.exceptions; -import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException; +import org.signal.network.exceptions.NonSuccessfulResponseCodeException; public final class GroupTerminatedException extends NonSuccessfulResponseCodeException { public GroupTerminatedException() { diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/InAppPaymentProcessorError.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/InAppPaymentProcessorError.kt index 987280e37c..8316f62d07 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/InAppPaymentProcessorError.kt +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/InAppPaymentProcessorError.kt @@ -6,7 +6,7 @@ package org.whispersystems.signalservice.internal.push.exceptions import com.fasterxml.jackson.annotation.JsonCreator -import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException +import org.signal.network.exceptions.NonSuccessfulResponseCodeException import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription.ChargeFailure import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription.Processor diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/InAppPaymentReceiptCredentialError.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/InAppPaymentReceiptCredentialError.kt index 64b4cc2233..8f1cc37fba 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/InAppPaymentReceiptCredentialError.kt +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/InAppPaymentReceiptCredentialError.kt @@ -6,7 +6,7 @@ package org.whispersystems.signalservice.internal.push.exceptions import com.fasterxml.jackson.annotation.JsonCreator -import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException +import org.signal.network.exceptions.NonSuccessfulResponseCodeException import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription.ChargeFailure /** diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/InvalidUnidentifiedAccessHeaderException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/InvalidUnidentifiedAccessHeaderException.java index 7e638eb72c..b6f431918c 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/InvalidUnidentifiedAccessHeaderException.java +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/InvalidUnidentifiedAccessHeaderException.java @@ -1,6 +1,6 @@ package org.whispersystems.signalservice.internal.push.exceptions; -import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException; +import org.signal.network.exceptions.NonSuccessfulResponseCodeException; /** * Indicates that the unidentified authorization header provided to the multi_recipient endpoint diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/MismatchedDevicesException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/MismatchedDevicesException.java index 494e4c1b93..e5ae2fdf9f 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/MismatchedDevicesException.java +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/MismatchedDevicesException.java @@ -6,7 +6,7 @@ package org.whispersystems.signalservice.internal.push.exceptions; -import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException; +import org.signal.network.exceptions.NonSuccessfulResponseCodeException; import org.whispersystems.signalservice.internal.push.MismatchedDevices; public class MismatchedDevicesException extends NonSuccessfulResponseCodeException { diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/NotInGroupException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/NotInGroupException.java index 2c3c01a9f2..6330ae5b9c 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/NotInGroupException.java +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/NotInGroupException.java @@ -1,6 +1,6 @@ package org.whispersystems.signalservice.internal.push.exceptions; -import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException; +import org.signal.network.exceptions.NonSuccessfulResponseCodeException; public final class NotInGroupException extends NonSuccessfulResponseCodeException { public NotInGroupException() { diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/PaymentsRegionException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/PaymentsRegionException.java index f1bfa5371b..56ebc6298d 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/PaymentsRegionException.java +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/PaymentsRegionException.java @@ -1,6 +1,6 @@ package org.whispersystems.signalservice.internal.push.exceptions; -import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException; +import org.signal.network.exceptions.NonSuccessfulResponseCodeException; import java.util.function.Function; diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/StaleDevicesException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/StaleDevicesException.java index f6120914df..4b7dc4f705 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/StaleDevicesException.java +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/StaleDevicesException.java @@ -6,7 +6,7 @@ package org.whispersystems.signalservice.internal.push.exceptions; -import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException; +import org.signal.network.exceptions.NonSuccessfulResponseCodeException; import org.whispersystems.signalservice.internal.push.StaleDevices; public class StaleDevicesException extends NonSuccessfulResponseCodeException { diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/DefaultErrorMapper.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/DefaultErrorMapper.java index a83fea1fbc..f094dd4532 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/DefaultErrorMapper.java +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/DefaultErrorMapper.java @@ -1,12 +1,14 @@ package org.whispersystems.signalservice.internal.websocket; +import org.signal.network.websocket.WebsocketResponse; + import org.whispersystems.signalservice.api.push.exceptions.AuthorizationFailedException; import org.whispersystems.signalservice.api.push.exceptions.DeprecatedVersionException; import org.whispersystems.signalservice.api.push.exceptions.ExpectationFailedException; -import org.whispersystems.signalservice.api.push.exceptions.MalformedResponseException; -import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException; +import org.signal.network.exceptions.MalformedResponseException; +import org.signal.network.exceptions.NonSuccessfulResponseCodeException; import org.whispersystems.signalservice.api.push.exceptions.NotFoundException; import org.whispersystems.signalservice.api.push.exceptions.ProofRequiredException; import org.whispersystems.signalservice.api.push.exceptions.RateLimitException; @@ -20,7 +22,7 @@ import org.whispersystems.signalservice.internal.push.PushServiceSocket; import org.whispersystems.signalservice.internal.push.StaleDevices; import org.whispersystems.signalservice.internal.push.exceptions.MismatchedDevicesException; import org.whispersystems.signalservice.internal.push.exceptions.StaleDevicesException; -import org.whispersystems.signalservice.internal.util.JsonUtil; +import org.signal.network.util.JsonUtil; import org.whispersystems.signalservice.internal.util.Util; import java.util.Collections; diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/DefaultResponseMapper.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/DefaultResponseMapper.java index 2fab2ec610..b7abc62b0c 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/DefaultResponseMapper.java +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/DefaultResponseMapper.java @@ -1,9 +1,9 @@ package org.whispersystems.signalservice.internal.websocket; -import org.whispersystems.signalservice.api.push.exceptions.MalformedResponseException; +import org.signal.network.exceptions.MalformedResponseException; import org.whispersystems.signalservice.internal.ServiceResponse; -import org.whispersystems.signalservice.internal.util.JsonUtil; +import org.signal.network.util.JsonUtil; import java.util.Objects; import java.util.function.Function; diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/ErrorMapper.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/ErrorMapper.java index fecc60230b..e8a5998758 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/ErrorMapper.java +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/ErrorMapper.java @@ -1,7 +1,7 @@ package org.whispersystems.signalservice.internal.websocket; -import org.whispersystems.signalservice.api.push.exceptions.MalformedResponseException; +import org.signal.network.exceptions.MalformedResponseException; import java.util.function.Function; diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/LibSignalChatConnection.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/LibSignalChatConnection.kt index 5418c17a19..80f25dc9f9 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/LibSignalChatConnection.kt +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/LibSignalChatConnection.kt @@ -25,7 +25,10 @@ import org.signal.libsignal.net.ConnectionInvalidatedException import org.signal.libsignal.net.DeviceDeregisteredException import org.signal.libsignal.net.Network import org.signal.libsignal.net.UnauthenticatedChatConnection -import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException +import org.signal.network.exceptions.NonSuccessfulResponseCodeException +import org.signal.network.websocket.WebSocketRequestMessage +import org.signal.network.websocket.WebSocketResponseMessage +import org.signal.network.websocket.WebsocketResponse import org.whispersystems.signalservice.api.util.CredentialsProvider import org.whispersystems.signalservice.api.websocket.HealthMonitor import org.whispersystems.signalservice.api.websocket.WebSocketConnectionState diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/LibSignalResponseExtension.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/LibSignalResponseExtension.kt index 6979a84bf3..a45e4bd123 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/LibSignalResponseExtension.kt +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/LibSignalResponseExtension.kt @@ -6,6 +6,7 @@ package org.whispersystems.signalservice.internal.websocket import org.signal.libsignal.net.ChatConnection.Response +import org.signal.network.websocket.WebsocketResponse fun Response.toWebsocketResponse(isUnidentified: Boolean): WebsocketResponse { return WebsocketResponse( diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/OkHttpWebSocketConnection.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/OkHttpWebSocketConnection.java index 94f04e9563..fb21baf4d5 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/OkHttpWebSocketConnection.java +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/OkHttpWebSocketConnection.java @@ -1,9 +1,14 @@ package org.whispersystems.signalservice.internal.websocket; +import org.signal.network.websocket.WebSocketRequestMessage; +import org.signal.network.websocket.WebSocketResponseMessage; +import org.signal.network.websocket.WebSocketMessage; +import org.signal.network.websocket.WebsocketResponse; + import org.jetbrains.annotations.NotNull; import org.signal.libsignal.protocol.logging.Log; import org.whispersystems.signalservice.api.push.TrustStore; -import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException; +import org.signal.network.exceptions.NonSuccessfulResponseCodeException; import org.whispersystems.signalservice.api.util.CredentialsProvider; import org.whispersystems.signalservice.api.util.Tls12SocketFactory; import org.whispersystems.signalservice.api.util.TlsProxySocketFactory; diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/ResponseMapper.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/ResponseMapper.java index a33fc2a935..d4a0ff175b 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/ResponseMapper.java +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/ResponseMapper.java @@ -1,5 +1,7 @@ package org.whispersystems.signalservice.internal.websocket; +import org.signal.network.websocket.WebsocketResponse; + import org.whispersystems.signalservice.internal.ServiceResponse; diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/WebSocketConnection.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/WebSocketConnection.kt index 92f0bdf20e..ec842f0df9 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/WebSocketConnection.kt +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/WebSocketConnection.kt @@ -2,6 +2,9 @@ package org.whispersystems.signalservice.internal.websocket import io.reactivex.rxjava3.core.Observable import io.reactivex.rxjava3.core.Single +import org.signal.network.websocket.WebSocketRequestMessage +import org.signal.network.websocket.WebSocketResponseMessage +import org.signal.network.websocket.WebsocketResponse import org.whispersystems.signalservice.api.websocket.WebSocketConnectionState import java.io.IOException import java.util.Optional diff --git a/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/NetworkResultTest.kt b/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/NetworkResultTest.kt index c473b06912..b07910a468 100644 --- a/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/NetworkResultTest.kt +++ b/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/NetworkResultTest.kt @@ -9,8 +9,9 @@ import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse import org.junit.Assert.assertTrue import org.junit.Test -import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException -import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException +import org.signal.network.NetworkResult +import org.signal.network.exceptions.NonSuccessfulResponseCodeException +import org.signal.network.exceptions.PushNetworkException class NetworkResultTest { @Test diff --git a/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/services/DonationsServiceTest.kt b/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/services/DonationsServiceTest.kt index bc29104610..e7baadd33d 100644 --- a/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/services/DonationsServiceTest.kt +++ b/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/services/DonationsServiceTest.kt @@ -7,9 +7,9 @@ import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse import org.junit.Assert.assertTrue import org.junit.Test -import org.whispersystems.signalservice.api.NetworkResult +import org.signal.network.NetworkResult +import org.signal.network.exceptions.NonSuccessfulResponseCodeException import org.whispersystems.signalservice.api.donations.DonationsApi -import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription import org.whispersystems.signalservice.api.subscriptions.SubscriberId diff --git a/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/subscriptions/ActiveSubscriptionTest.java b/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/subscriptions/ActiveSubscriptionTest.java index c1caaf093f..c2bf6b3646 100644 --- a/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/subscriptions/ActiveSubscriptionTest.java +++ b/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/subscriptions/ActiveSubscriptionTest.java @@ -1,7 +1,7 @@ package org.whispersystems.signalservice.api.subscriptions; import org.junit.Test; -import org.whispersystems.signalservice.internal.util.JsonUtil; +import org.signal.network.util.JsonUtil; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/internal/push/GroupMismatchedDevicesTest.kt b/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/internal/push/GroupMismatchedDevicesTest.kt index a54b6dd48d..6c010532f2 100644 --- a/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/internal/push/GroupMismatchedDevicesTest.kt +++ b/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/internal/push/GroupMismatchedDevicesTest.kt @@ -5,7 +5,7 @@ import assertk.assertions.containsExactly import assertk.assertions.hasSize import assertk.assertions.isEqualTo import org.junit.Test -import org.whispersystems.signalservice.internal.util.JsonUtil +import org.signal.network.util.JsonUtil class GroupMismatchedDevicesTest { @Test diff --git a/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/internal/push/GroupStaleDevicesTest.kt b/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/internal/push/GroupStaleDevicesTest.kt index 9d132db405..418bf6a2bf 100644 --- a/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/internal/push/GroupStaleDevicesTest.kt +++ b/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/internal/push/GroupStaleDevicesTest.kt @@ -10,7 +10,7 @@ import assertk.assertions.containsExactly import assertk.assertions.hasSize import assertk.assertions.isEqualTo import org.junit.Test -import org.whispersystems.signalservice.internal.util.JsonUtil +import org.signal.network.util.JsonUtil class GroupStaleDevicesTest { @Test diff --git a/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/internal/push/exceptions/InAppPaymentProcessorErrorTest.kt b/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/internal/push/exceptions/InAppPaymentProcessorErrorTest.kt index afb2eb3408..1bf710043e 100644 --- a/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/internal/push/exceptions/InAppPaymentProcessorErrorTest.kt +++ b/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/internal/push/exceptions/InAppPaymentProcessorErrorTest.kt @@ -7,8 +7,8 @@ package org.whispersystems.signalservice.internal.push.exceptions import org.junit.Assert.assertEquals import org.junit.Test +import org.signal.network.util.JsonUtil import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription -import org.whispersystems.signalservice.internal.util.JsonUtil class InAppPaymentProcessorErrorTest { diff --git a/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/internal/websocket/LibSignalChatConnectionTest.kt b/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/internal/websocket/LibSignalChatConnectionTest.kt index f171e9d89f..29d7378aba 100644 --- a/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/internal/websocket/LibSignalChatConnectionTest.kt +++ b/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/internal/websocket/LibSignalChatConnectionTest.kt @@ -20,6 +20,9 @@ import org.signal.libsignal.net.ChatConnectionListener import org.signal.libsignal.net.ChatServiceException import org.signal.libsignal.net.Network import org.signal.libsignal.net.UnauthenticatedChatConnection +import org.signal.network.websocket.WebSocketRequestMessage +import org.signal.network.websocket.WebSocketResponseMessage +import org.signal.network.websocket.WebsocketResponse import org.whispersystems.signalservice.api.websocket.HealthMonitor import org.whispersystems.signalservice.api.websocket.WebSocketConnectionState import java.io.IOException diff --git a/lib/network/build.gradle.kts b/lib/network/build.gradle.kts index 7a6c234199..d5addc8fb6 100644 --- a/lib/network/build.gradle.kts +++ b/lib/network/build.gradle.kts @@ -52,6 +52,7 @@ dependencies { implementation(libs.kotlinx.coroutines.core) implementation(libs.kotlinx.coroutines.core.jvm) + api(project(":core:network")) implementation(project(":core:util-jvm")) implementation(project(":core:models-jvm")) diff --git a/lib/network/src/main/java/org/signal/network/api/ArchiveApi.kt b/lib/network/src/main/java/org/signal/network/api/ArchiveApi.kt index a1aff89e29..9e511294b2 100644 --- a/lib/network/src/main/java/org/signal/network/api/ArchiveApi.kt +++ b/lib/network/src/main/java/org/signal/network/api/ArchiveApi.kt @@ -17,7 +17,12 @@ import org.signal.libsignal.zkgroup.GenericServerPublicParams import org.signal.libsignal.zkgroup.backups.BackupAuthCredential import org.signal.libsignal.zkgroup.backups.BackupAuthCredentialRequestContext import org.signal.libsignal.zkgroup.backups.BackupAuthCredentialResponse -import org.whispersystems.signalservice.api.NetworkResult +import org.signal.network.NetworkResult +import org.signal.network.websocket.WebSocketRequestMessage +import org.signal.network.websocket.delete +import org.signal.network.websocket.get +import org.signal.network.websocket.post +import org.signal.network.websocket.put import org.whispersystems.signalservice.api.archive.ArchiveCredentialPresentation import org.whispersystems.signalservice.api.archive.ArchiveGetBackupInfoResponse import org.whispersystems.signalservice.api.archive.ArchiveGetMediaItemsResponse @@ -33,16 +38,12 @@ import org.whispersystems.signalservice.api.archive.BatchArchiveMediaRequest import org.whispersystems.signalservice.api.archive.BatchArchiveMediaResponse import org.whispersystems.signalservice.api.archive.DeleteArchivedMediaRequest import org.whispersystems.signalservice.api.archive.GetArchiveCdnCredentialsResponse +import org.whispersystems.signalservice.api.fromWebSocketRequest import org.whispersystems.signalservice.api.messages.SignalServiceAttachment import org.whispersystems.signalservice.api.websocket.SignalWebSocket -import org.whispersystems.signalservice.internal.delete -import org.whispersystems.signalservice.internal.get -import org.whispersystems.signalservice.internal.post import org.whispersystems.signalservice.internal.push.AttachmentUploadForm import org.whispersystems.signalservice.internal.push.AuthCredentials import org.whispersystems.signalservice.internal.push.PushServiceSocket -import org.whispersystems.signalservice.internal.put -import org.whispersystems.signalservice.internal.websocket.WebSocketRequestMessage import java.io.InputStream import java.time.Instant import kotlin.time.Duration.Companion.days diff --git a/lib/network/src/main/java/org/signal/network/api/CallingApi.kt b/lib/network/src/main/java/org/signal/network/api/CallingApi.kt index 2c44c5cfb3..8661bd2d6b 100644 --- a/lib/network/src/main/java/org/signal/network/api/CallingApi.kt +++ b/lib/network/src/main/java/org/signal/network/api/CallingApi.kt @@ -7,19 +7,20 @@ package org.signal.network.api import org.signal.libsignal.zkgroup.calllinks.CreateCallLinkCredentialRequest import org.signal.libsignal.zkgroup.calllinks.CreateCallLinkCredentialResponse +import org.signal.network.NetworkResult +import org.signal.network.websocket.WebSocketRequestMessage +import org.signal.network.websocket.get +import org.signal.network.websocket.post +import org.signal.network.websocket.putCustom import org.signal.storageservice.protos.calls.quality.SubmitCallQualitySurveyRequest -import org.whispersystems.signalservice.api.NetworkResult +import org.whispersystems.signalservice.api.fromWebSocketRequest import org.whispersystems.signalservice.api.messages.calls.CallingResponse import org.whispersystems.signalservice.api.messages.calls.TurnServerInfo import org.whispersystems.signalservice.api.websocket.SignalWebSocket -import org.whispersystems.signalservice.internal.get -import org.whispersystems.signalservice.internal.post import org.whispersystems.signalservice.internal.push.CreateCallLinkAuthRequest import org.whispersystems.signalservice.internal.push.CreateCallLinkAuthResponse import org.whispersystems.signalservice.internal.push.GetCallingRelaysResponse import org.whispersystems.signalservice.internal.push.PushServiceSocket -import org.whispersystems.signalservice.internal.putCustom -import org.whispersystems.signalservice.internal.websocket.WebSocketRequestMessage /** * Provide calling specific network apis. diff --git a/lib/network/src/main/java/org/signal/network/api/CdsApi.kt b/lib/network/src/main/java/org/signal/network/api/CdsApi.kt index 82cbede3c1..b292108bbd 100644 --- a/lib/network/src/main/java/org/signal/network/api/CdsApi.kt +++ b/lib/network/src/main/java/org/signal/network/api/CdsApi.kt @@ -10,13 +10,14 @@ import org.signal.core.util.logging.Log import org.signal.libsignal.net.CdsiProtocolException import org.signal.libsignal.net.Network import org.signal.libsignal.zkgroup.profiles.ProfileKey -import org.whispersystems.signalservice.api.NetworkResult +import org.signal.network.NetworkResult +import org.signal.network.websocket.WebSocketRequestMessage +import org.signal.network.websocket.get import org.whispersystems.signalservice.api.cds.CdsiV2Service +import org.whispersystems.signalservice.api.fromWebSocketRequest import org.whispersystems.signalservice.api.push.exceptions.CdsiInvalidTokenException import org.whispersystems.signalservice.api.websocket.SignalWebSocket -import org.whispersystems.signalservice.internal.get import org.whispersystems.signalservice.internal.push.CdsiAuthResponse -import org.whispersystems.signalservice.internal.websocket.WebSocketRequestMessage import java.io.IOException import java.util.Optional import java.util.concurrent.TimeUnit @@ -39,7 +40,7 @@ class CdsApi(private val authWebSocket: SignalWebSocket.AuthenticatedWebSocket) * - 200: Success * - 401: Not authenticated * - * And then CDS websocket communications, can return the following within [org.whispersystems.signalservice.api.NetworkResult.StatusCodeError] + * And then CDS websocket communications, can return the following within [org.signal.network.NetworkResult.StatusCodeError] * - [org.whispersystems.signalservice.api.push.exceptions.CdsiResourceExhaustedException]: Rate limited * - [org.whispersystems.signalservice.api.push.exceptions.CdsiInvalidTokenException]: Token no longer valid */ diff --git a/lib/network/src/main/java/org/signal/network/api/CertificateApi.kt b/lib/network/src/main/java/org/signal/network/api/CertificateApi.kt index f5b89c21b1..9830edb6ab 100644 --- a/lib/network/src/main/java/org/signal/network/api/CertificateApi.kt +++ b/lib/network/src/main/java/org/signal/network/api/CertificateApi.kt @@ -15,10 +15,11 @@ import com.fasterxml.jackson.databind.SerializerProvider import com.fasterxml.jackson.databind.annotation.JsonDeserialize import com.fasterxml.jackson.databind.annotation.JsonSerialize import org.signal.core.util.Base64 -import org.whispersystems.signalservice.api.NetworkResult +import org.signal.network.NetworkResult +import org.signal.network.websocket.WebSocketRequestMessage +import org.signal.network.websocket.get +import org.whispersystems.signalservice.api.fromWebSocketRequest import org.whispersystems.signalservice.api.websocket.SignalWebSocket -import org.whispersystems.signalservice.internal.get -import org.whispersystems.signalservice.internal.websocket.WebSocketRequestMessage /** * Endpoints to get sender certificates. diff --git a/lib/network/src/main/java/org/signal/network/api/LinkDeviceApi.kt b/lib/network/src/main/java/org/signal/network/api/LinkDeviceApi.kt index 76bd87b7fa..d4426bacc6 100644 --- a/lib/network/src/main/java/org/signal/network/api/LinkDeviceApi.kt +++ b/lib/network/src/main/java/org/signal/network/api/LinkDeviceApi.kt @@ -17,7 +17,12 @@ import org.signal.core.util.urlEncode import org.signal.libsignal.protocol.IdentityKeyPair import org.signal.libsignal.protocol.ecc.ECPublicKey import org.signal.libsignal.zkgroup.profiles.ProfileKey -import org.whispersystems.signalservice.api.NetworkResult +import org.signal.network.NetworkResult +import org.signal.network.websocket.WebSocketRequestMessage +import org.signal.network.websocket.delete +import org.signal.network.websocket.get +import org.signal.network.websocket.put +import org.whispersystems.signalservice.api.fromWebSocketRequest import org.whispersystems.signalservice.api.link.LinkedDeviceVerificationCodeResponse import org.whispersystems.signalservice.api.link.SetDeviceNameRequest import org.whispersystems.signalservice.api.link.SetLinkedDeviceTransferArchiveRequest @@ -28,13 +33,9 @@ import org.whispersystems.signalservice.api.messages.multidevice.DeviceInfo import org.whispersystems.signalservice.api.provisioning.ProvisioningMessage import org.whispersystems.signalservice.api.websocket.SignalWebSocket import org.whispersystems.signalservice.internal.crypto.PrimaryProvisioningCipher -import org.whispersystems.signalservice.internal.delete -import org.whispersystems.signalservice.internal.get import org.whispersystems.signalservice.internal.push.DeviceInfoList import org.whispersystems.signalservice.internal.push.ProvisionMessage import org.whispersystems.signalservice.internal.push.ProvisioningVersion -import org.whispersystems.signalservice.internal.put -import org.whispersystems.signalservice.internal.websocket.WebSocketRequestMessage import kotlin.time.Duration import kotlin.time.Duration.Companion.seconds diff --git a/lib/network/src/main/java/org/signal/network/api/PaymentsApi.kt b/lib/network/src/main/java/org/signal/network/api/PaymentsApi.kt index 5f17846710..35321e1738 100644 --- a/lib/network/src/main/java/org/signal/network/api/PaymentsApi.kt +++ b/lib/network/src/main/java/org/signal/network/api/PaymentsApi.kt @@ -5,12 +5,13 @@ package org.signal.network.api -import org.whispersystems.signalservice.api.NetworkResult +import org.signal.network.NetworkResult +import org.signal.network.websocket.WebSocketRequestMessage +import org.signal.network.websocket.get +import org.whispersystems.signalservice.api.fromWebSocketRequest import org.whispersystems.signalservice.api.payments.CurrencyConversions import org.whispersystems.signalservice.api.websocket.SignalWebSocket -import org.whispersystems.signalservice.internal.get import org.whispersystems.signalservice.internal.push.AuthCredentials -import org.whispersystems.signalservice.internal.websocket.WebSocketRequestMessage /** * Provide payments specific network apis. diff --git a/lib/network/src/main/java/org/signal/network/api/ProvisioningApi.kt b/lib/network/src/main/java/org/signal/network/api/ProvisioningApi.kt index e49c30d28d..932cff5d02 100644 --- a/lib/network/src/main/java/org/signal/network/api/ProvisioningApi.kt +++ b/lib/network/src/main/java/org/signal/network/api/ProvisioningApi.kt @@ -8,16 +8,17 @@ package org.signal.network.api import org.signal.core.util.Base64 import org.signal.core.util.urlEncode import org.signal.libsignal.protocol.ecc.ECPublicKey +import org.signal.network.NetworkResult +import org.signal.network.websocket.WebSocketRequestMessage +import org.signal.network.websocket.get +import org.signal.network.websocket.put import org.signal.registration.proto.RegistrationProvisionMessage -import org.whispersystems.signalservice.api.NetworkResult +import org.whispersystems.signalservice.api.fromWebSocketRequest import org.whispersystems.signalservice.api.provisioning.ProvisioningMessage import org.whispersystems.signalservice.api.provisioning.RestoreMethod import org.whispersystems.signalservice.api.registration.RestoreMethodBody import org.whispersystems.signalservice.api.websocket.SignalWebSocket import org.whispersystems.signalservice.internal.crypto.PrimaryProvisioningCipher -import org.whispersystems.signalservice.internal.get -import org.whispersystems.signalservice.internal.put -import org.whispersystems.signalservice.internal.websocket.WebSocketRequestMessage import kotlin.time.Duration.Companion.seconds /** diff --git a/lib/network/src/main/java/org/signal/network/api/RateLimitChallengeApi.kt b/lib/network/src/main/java/org/signal/network/api/RateLimitChallengeApi.kt index 850391c700..90b8d6fde1 100644 --- a/lib/network/src/main/java/org/signal/network/api/RateLimitChallengeApi.kt +++ b/lib/network/src/main/java/org/signal/network/api/RateLimitChallengeApi.kt @@ -6,11 +6,12 @@ package org.signal.network.api import com.fasterxml.jackson.annotation.JsonProperty -import org.whispersystems.signalservice.api.NetworkResult +import org.signal.network.NetworkResult +import org.signal.network.websocket.WebSocketRequestMessage +import org.signal.network.websocket.post +import org.signal.network.websocket.put +import org.whispersystems.signalservice.api.fromWebSocketRequest import org.whispersystems.signalservice.api.websocket.SignalWebSocket -import org.whispersystems.signalservice.internal.post -import org.whispersystems.signalservice.internal.put -import org.whispersystems.signalservice.internal.websocket.WebSocketRequestMessage /** * Calls for requesting and submitting rate limit triggered challenges. diff --git a/lib/network/src/main/java/org/signal/network/api/RemoteConfigApi.kt b/lib/network/src/main/java/org/signal/network/api/RemoteConfigApi.kt index 1cf931e8ec..4ecaea0b53 100644 --- a/lib/network/src/main/java/org/signal/network/api/RemoteConfigApi.kt +++ b/lib/network/src/main/java/org/signal/network/api/RemoteConfigApi.kt @@ -6,14 +6,15 @@ package org.signal.network.api import com.fasterxml.jackson.annotation.JsonProperty -import org.whispersystems.signalservice.api.NetworkResult +import org.signal.network.NetworkResult +import org.signal.network.util.JsonUtil +import org.signal.network.websocket.WebSocketRequestMessage +import org.signal.network.websocket.WebsocketResponse +import org.signal.network.websocket.get +import org.whispersystems.signalservice.api.fromWebSocketRequest import org.whispersystems.signalservice.api.remoteconfig.RemoteConfigResult import org.whispersystems.signalservice.api.websocket.SignalWebSocket -import org.whispersystems.signalservice.internal.get import org.whispersystems.signalservice.internal.push.PushServiceSocket -import org.whispersystems.signalservice.internal.util.JsonUtil -import org.whispersystems.signalservice.internal.websocket.WebSocketRequestMessage -import org.whispersystems.signalservice.internal.websocket.WebsocketResponse import java.util.Locale /** diff --git a/lib/network/src/main/java/org/signal/network/api/SvrBApi.kt b/lib/network/src/main/java/org/signal/network/api/SvrBApi.kt index d3ac0c5c98..e98b8a0d8d 100644 --- a/lib/network/src/main/java/org/signal/network/api/SvrBApi.kt +++ b/lib/network/src/main/java/org/signal/network/api/SvrBApi.kt @@ -47,7 +47,7 @@ class SvrBApi(private val network: Network) { * See [org.signal.libsignal.net.SvrB.store]. * * Handling this one is funny because the underlying protocols don't use status codes, instead favoring complex results. - * As a result, responses are only [org.whispersystems.signalservice.api.NetworkResult.Success] and [org.whispersystems.signalservice.api.NetworkResult.NetworkError], with errors being accounted for + * As a result, responses are only [org.signal.network.NetworkResult.Success] and [org.signal.network.NetworkResult.NetworkError], with errors being accounted for * in the success case via the sealed result class. */ fun store(auth: AuthCredentials, backupKey: MessageBackupKey, previousSecretData: ByteArray): StoreResult { @@ -79,7 +79,7 @@ class SvrBApi(private val network: Network) { * See [org.signal.libsignal.net.SvrB.restore] * * Handling this one is funny because the underlying protocols don't use status codes, instead favoring complex results. - * As a result, responses are only [org.whispersystems.signalservice.api.NetworkResult.Success] and [org.whispersystems.signalservice.api.NetworkResult.NetworkError], with errors being accounted for + * As a result, responses are only [org.signal.network.NetworkResult.Success] and [org.signal.network.NetworkResult.NetworkError], with errors being accounted for * in the success case via the sealed result class. */ fun restore(auth: AuthCredentials, backupKey: MessageBackupKey, forwardSecrecyMetadata: ByteArray): RestoreResult { diff --git a/lib/network/src/main/java/org/signal/network/service/StorageServiceService.kt b/lib/network/src/main/java/org/signal/network/service/StorageServiceService.kt index 07063f0f8a..42ce236a0c 100644 --- a/lib/network/src/main/java/org/signal/network/service/StorageServiceService.kt +++ b/lib/network/src/main/java/org/signal/network/service/StorageServiceService.kt @@ -14,8 +14,8 @@ import org.signal.core.util.bytes import org.signal.core.util.isNotEmpty import org.signal.core.util.logging.Log import org.signal.libsignal.protocol.InvalidKeyException -import org.whispersystems.signalservice.api.NetworkResult -import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException +import org.signal.network.NetworkResult +import org.signal.network.exceptions.NonSuccessfulResponseCodeException import org.whispersystems.signalservice.api.storage.RecordIkm import org.whispersystems.signalservice.api.storage.SignalStorageCipher import org.whispersystems.signalservice.api.storage.SignalStorageManifest diff --git a/settings.gradle.kts b/settings.gradle.kts index 73cbe45913..8e7c81b3c1 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -69,6 +69,7 @@ include(":core:util") include(":core:util-jvm") include(":core:models") include(":core:models-jvm") +include(":core:network") include(":core:ui") include(":core:serialization")