diff --git a/app/build.gradle b/app/build.gradle index d6904c8950..5e261b2947 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -457,7 +457,7 @@ dependencies { implementation project(':donations') implementation project(':contacts') - implementation libs.signal.client.android + implementation libs.libsignal.android implementation libs.google.protobuf.javalite implementation(libs.mobilecoin) { diff --git a/app/proguard/proguard.cfg b/app/proguard/proguard.cfg index 04d97b2cbe..4bfb92c495 100644 --- a/app/proguard/proguard.cfg +++ b/app/proguard/proguard.cfg @@ -2,6 +2,7 @@ -dontobfuscate -keepattributes SourceFile,LineNumberTable -keep class org.whispersystems.** { *; } +-keep class org.signal.libsignal.protocol.** { *; } -keep class org.thoughtcrime.securesms.** { *; } -keepclassmembers class ** { public void onEvent*(**); diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientDatabaseTest_merges.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientDatabaseTest_merges.kt index 3266f35cde..dc44b8446e 100644 --- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientDatabaseTest_merges.kt +++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientDatabaseTest_merges.kt @@ -12,9 +12,12 @@ import org.junit.Assert.assertNull import org.junit.Before import org.junit.Test import org.junit.runner.RunWith +import org.signal.libsignal.protocol.IdentityKey +import org.signal.libsignal.protocol.SignalProtocolAddress +import org.signal.libsignal.protocol.state.SessionRecord +import org.signal.libsignal.zkgroup.groups.GroupMasterKey import org.signal.storageservice.protos.groups.local.DecryptedGroup import org.signal.storageservice.protos.groups.local.DecryptedMember -import org.signal.zkgroup.groups.GroupMasterKey import org.thoughtcrime.securesms.conversation.colors.AvatarColor import org.thoughtcrime.securesms.database.model.DistributionListId import org.thoughtcrime.securesms.database.model.DistributionListRecord @@ -30,9 +33,6 @@ import org.thoughtcrime.securesms.recipients.Recipient import org.thoughtcrime.securesms.recipients.RecipientId import org.thoughtcrime.securesms.sms.IncomingTextMessage import org.thoughtcrime.securesms.util.CursorUtil -import org.whispersystems.libsignal.IdentityKey -import org.whispersystems.libsignal.SignalProtocolAddress -import org.whispersystems.libsignal.state.SessionRecord import org.whispersystems.signalservice.api.push.ACI import org.whispersystems.signalservice.api.push.PNI import org.whispersystems.signalservice.api.util.UuidUtil diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/database/SmsDatabaseTest_collapseJoinRequestEventsIfPossible.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/database/SmsDatabaseTest_collapseJoinRequestEventsIfPossible.kt index 197a52d520..5f0d3596db 100644 --- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/SmsDatabaseTest_collapseJoinRequestEventsIfPossible.kt +++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/SmsDatabaseTest_collapseJoinRequestEventsIfPossible.kt @@ -8,7 +8,7 @@ import org.hamcrest.Matchers.nullValue import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.signal.zkgroup.groups.GroupMasterKey +import org.signal.libsignal.zkgroup.groups.GroupMasterKey import org.thoughtcrime.securesms.database.model.databaseprotos.DecryptedGroupV2Context import org.thoughtcrime.securesms.database.model.databaseprotos.addMember import org.thoughtcrime.securesms.database.model.databaseprotos.addRequestingMember diff --git a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java index bc3bbb211e..8e6ad574c3 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java +++ b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java @@ -35,6 +35,7 @@ import org.signal.core.util.logging.AndroidLogger; import org.signal.core.util.logging.Log; import org.signal.core.util.tracing.Tracer; import org.signal.glide.SignalGlideCodecs; +import org.signal.libsignal.protocol.logging.SignalProtocolLoggerProvider; import org.signal.ringrtc.CallManager; import org.thoughtcrime.securesms.avatar.AvatarPickerStorage; import org.thoughtcrime.securesms.crypto.AttachmentSecretProvider; @@ -92,7 +93,6 @@ import org.thoughtcrime.securesms.util.TextSecurePreferences; import org.thoughtcrime.securesms.util.Util; import org.thoughtcrime.securesms.util.VersionTracker; import org.thoughtcrime.securesms.util.dynamiclanguage.DynamicLanguageContextWrapper; -import org.whispersystems.libsignal.logging.SignalProtocolLoggerProvider; import java.net.SocketException; import java.net.SocketTimeoutException; diff --git a/app/src/main/java/org/thoughtcrime/securesms/DeviceActivity.java b/app/src/main/java/org/thoughtcrime/securesms/DeviceActivity.java index b1232ba414..ea91748738 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/DeviceActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/DeviceActivity.java @@ -20,7 +20,11 @@ import androidx.appcompat.widget.Toolbar; import org.signal.core.util.ThreadUtil; import org.signal.core.util.logging.Log; -import org.signal.zkgroup.profiles.ProfileKey; +import org.signal.libsignal.protocol.IdentityKeyPair; +import org.signal.libsignal.protocol.InvalidKeyException; +import org.signal.libsignal.protocol.ecc.Curve; +import org.signal.libsignal.protocol.ecc.ECPublicKey; +import org.signal.libsignal.zkgroup.profiles.ProfileKey; import org.thoughtcrime.securesms.crypto.ProfileKeyUtil; import org.thoughtcrime.securesms.dependencies.ApplicationDependencies; import org.thoughtcrime.securesms.keyvalue.SignalStore; @@ -32,10 +36,6 @@ import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme; import org.thoughtcrime.securesms.util.DynamicTheme; import org.thoughtcrime.securesms.util.TextSecurePreferences; import org.thoughtcrime.securesms.util.task.ProgressDialogAsyncTask; -import org.whispersystems.libsignal.IdentityKeyPair; -import org.whispersystems.libsignal.InvalidKeyException; -import org.whispersystems.libsignal.ecc.Curve; -import org.whispersystems.libsignal.ecc.ECPublicKey; import org.whispersystems.signalservice.api.SignalServiceAccountManager; import org.whispersystems.signalservice.api.push.exceptions.NotFoundException; import org.whispersystems.signalservice.internal.push.DeviceLimitExceededException; diff --git a/app/src/main/java/org/thoughtcrime/securesms/WebRtcCallActivity.java b/app/src/main/java/org/thoughtcrime/securesms/WebRtcCallActivity.java index c9e9dc869a..be5f10b7b0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/WebRtcCallActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/WebRtcCallActivity.java @@ -49,6 +49,7 @@ import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; import org.signal.core.util.concurrent.SignalExecutors; import org.signal.core.util.logging.Log; +import org.signal.libsignal.protocol.IdentityKey; import org.thoughtcrime.securesms.components.TooltipPopup; import org.thoughtcrime.securesms.components.sensors.DeviceOrientationMonitor; import org.thoughtcrime.securesms.components.webrtc.CallParticipantsListUpdatePopupWindow; @@ -78,7 +79,6 @@ import org.thoughtcrime.securesms.util.Util; import org.thoughtcrime.securesms.util.livedata.LiveDataUtil; import org.thoughtcrime.securesms.webrtc.CallParticipantsViewState; import org.thoughtcrime.securesms.webrtc.audio.SignalAudioManager; -import org.whispersystems.libsignal.IdentityKey; import org.whispersystems.signalservice.api.messages.calls.HangupMessage; import java.util.List; diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupBase.java b/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupBase.java index 1ca838b468..d4effce360 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupBase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupBase.java @@ -5,7 +5,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import org.greenrobot.eventbus.EventBus; -import org.whispersystems.libsignal.util.ByteUtil; +import org.signal.libsignal.protocol.util.ByteUtil; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.java b/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.java index c0cf4c0497..dcbf238664 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.java +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.java @@ -18,6 +18,8 @@ import net.zetetic.database.sqlcipher.SQLiteDatabase; import org.greenrobot.eventbus.EventBus; import org.signal.core.util.Conversions; import org.signal.core.util.logging.Log; +import org.signal.libsignal.protocol.kdf.HKDFv3; +import org.signal.libsignal.protocol.util.ByteUtil; import org.thoughtcrime.securesms.attachments.AttachmentId; import org.thoughtcrime.securesms.crypto.AttachmentSecret; import org.thoughtcrime.securesms.crypto.ClassicDecryptingPartInputStream; @@ -51,8 +53,6 @@ import org.thoughtcrime.securesms.util.SetUtil; import org.thoughtcrime.securesms.util.Stopwatch; import org.thoughtcrime.securesms.util.TextSecurePreferences; import org.thoughtcrime.securesms.util.Util; -import org.whispersystems.libsignal.kdf.HKDFv3; -import org.whispersystems.libsignal.util.ByteUtil; import java.io.File; import java.io.FileOutputStream; diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.java b/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.java index 75676e90e1..3a394119b7 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.java +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.java @@ -17,6 +17,8 @@ import org.greenrobot.eventbus.EventBus; import org.signal.core.util.Conversions; import org.signal.core.util.StreamUtil; import org.signal.core.util.logging.Log; +import org.signal.libsignal.protocol.kdf.HKDFv3; +import org.signal.libsignal.protocol.util.ByteUtil; import org.thoughtcrime.securesms.backup.BackupProtos.Attachment; import org.thoughtcrime.securesms.backup.BackupProtos.BackupFrame; import org.thoughtcrime.securesms.backup.BackupProtos.DatabaseVersion; @@ -37,8 +39,6 @@ import org.thoughtcrime.securesms.profiles.AvatarHelper; import org.thoughtcrime.securesms.recipients.RecipientId; import org.thoughtcrime.securesms.util.BackupUtil; import org.signal.core.util.SqlUtil; -import org.whispersystems.libsignal.kdf.HKDFv3; -import org.whispersystems.libsignal.util.ByteUtil; import java.io.ByteArrayOutputStream; import java.io.File; diff --git a/app/src/main/java/org/thoughtcrime/securesms/badges/Badges.kt b/app/src/main/java/org/thoughtcrime/securesms/badges/Badges.kt index 976190923b..98fb35fa02 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/badges/Badges.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/badges/Badges.kt @@ -9,13 +9,13 @@ import com.google.android.flexbox.FlexboxLayoutManager import com.google.android.flexbox.JustifyContent import org.signal.core.util.DimensionUnit import org.signal.core.util.logging.Log +import org.signal.libsignal.protocol.util.Pair import org.thoughtcrime.securesms.BuildConfig import org.thoughtcrime.securesms.badges.models.Badge import org.thoughtcrime.securesms.badges.models.Badge.Category.Companion.fromCode import org.thoughtcrime.securesms.components.settings.DSLConfiguration import org.thoughtcrime.securesms.database.model.databaseprotos.BadgeList import org.thoughtcrime.securesms.util.ScreenDensity -import org.whispersystems.libsignal.util.Pair import org.whispersystems.signalservice.api.profiles.SignalServiceProfile import java.math.BigDecimal import java.sql.Timestamp diff --git a/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactRepository.java b/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactRepository.java index e267ae8370..98358acbe9 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactRepository.java +++ b/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactRepository.java @@ -10,13 +10,13 @@ import android.text.TextUtils; import androidx.annotation.NonNull; import androidx.annotation.WorkerThread; +import org.signal.libsignal.protocol.util.Pair; import org.thoughtcrime.securesms.database.RecipientDatabase; import org.thoughtcrime.securesms.database.SignalDatabase; import org.thoughtcrime.securesms.phonenumbers.PhoneNumberFormatter; import org.thoughtcrime.securesms.recipients.Recipient; import org.signal.core.util.CursorUtil; import org.thoughtcrime.securesms.util.Util; -import org.whispersystems.libsignal.util.Pair; import java.util.ArrayList; import java.util.HashMap; diff --git a/app/src/main/java/org/thoughtcrime/securesms/contacts/avatars/ProfileContactPhoto.java b/app/src/main/java/org/thoughtcrime/securesms/contacts/avatars/ProfileContactPhoto.java index 6dd7a080c4..2088c9cd23 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/contacts/avatars/ProfileContactPhoto.java +++ b/app/src/main/java/org/thoughtcrime/securesms/contacts/avatars/ProfileContactPhoto.java @@ -7,10 +7,10 @@ import android.net.Uri; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import org.signal.libsignal.protocol.util.ByteUtil; import org.thoughtcrime.securesms.dependencies.ApplicationDependencies; import org.thoughtcrime.securesms.profiles.AvatarHelper; import org.thoughtcrime.securesms.recipients.Recipient; -import org.whispersystems.libsignal.util.ByteUtil; import java.io.IOException; import java.io.InputStream; diff --git a/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/ContactDiscoveryV2.java b/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/ContactDiscoveryV2.java index 6fbb3ec54a..b53a03ab09 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/ContactDiscoveryV2.java +++ b/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/ContactDiscoveryV2.java @@ -9,12 +9,12 @@ import com.annimon.stream.Collectors; import com.annimon.stream.Stream; import org.signal.core.util.logging.Log; +import org.signal.libsignal.protocol.InvalidKeyException; import org.thoughtcrime.securesms.BuildConfig; import org.thoughtcrime.securesms.contacts.sync.DirectoryHelper.DirectoryResult; import org.thoughtcrime.securesms.dependencies.ApplicationDependencies; import org.thoughtcrime.securesms.push.IasTrustStore; import org.thoughtcrime.securesms.util.SetUtil; -import org.whispersystems.libsignal.InvalidKeyException; import org.whispersystems.signalservice.api.SignalServiceAccountManager; import org.whispersystems.signalservice.api.push.ACI; import org.whispersystems.signalservice.api.push.TrustStore; diff --git a/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/DirectoryHelper.java b/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/DirectoryHelper.java index 107e399618..28edd801a8 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/DirectoryHelper.java +++ b/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/DirectoryHelper.java @@ -16,6 +16,8 @@ import com.annimon.stream.Stream; import org.signal.contacts.SystemContactsRepository; import org.signal.contacts.SystemContactsRepository.ContactDetails; import org.signal.core.util.logging.Log; +import org.signal.libsignal.protocol.SignalProtocolAddress; +import org.signal.libsignal.protocol.util.Pair; import org.thoughtcrime.securesms.BuildConfig; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.database.MessageDatabase.InsertResult; @@ -41,8 +43,6 @@ import org.thoughtcrime.securesms.util.ProfileUtil; import org.thoughtcrime.securesms.util.SetUtil; import org.thoughtcrime.securesms.util.Stopwatch; import org.thoughtcrime.securesms.util.TextSecurePreferences; -import org.whispersystems.libsignal.SignalProtocolAddress; -import org.whispersystems.libsignal.util.Pair; import org.whispersystems.signalservice.api.profiles.ProfileAndCredential; import org.whispersystems.signalservice.api.profiles.SignalServiceProfile; import org.whispersystems.signalservice.api.push.ACI; diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java index a79912701e..609e3fc356 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java @@ -100,6 +100,8 @@ import org.greenrobot.eventbus.ThreadMode; import org.signal.core.util.ThreadUtil; import org.signal.core.util.concurrent.SignalExecutors; import org.signal.core.util.logging.Log; +import org.signal.libsignal.protocol.InvalidMessageException; +import org.signal.libsignal.protocol.util.Pair; import org.thoughtcrime.securesms.BlockUnblockDialog; import org.thoughtcrime.securesms.GroupMembersDialog; import org.thoughtcrime.securesms.MainActivity; @@ -296,8 +298,6 @@ import org.thoughtcrime.securesms.util.concurrent.SimpleTask; import org.thoughtcrime.securesms.util.views.Stub; import org.thoughtcrime.securesms.wallpaper.ChatWallpaper; import org.thoughtcrime.securesms.wallpaper.ChatWallpaperDimLevelUtil; -import org.whispersystems.libsignal.InvalidMessageException; -import org.whispersystems.libsignal.util.Pair; import org.whispersystems.signalservice.api.SignalSessionLock; import java.io.IOException; diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationViewModel.java index 27751f4988..572849e8da 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationViewModel.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationViewModel.java @@ -25,6 +25,7 @@ import org.signal.paging.PagedData; import org.signal.paging.PagingConfig; import org.signal.paging.PagingController; import org.signal.paging.ProxyPagingController; +import org.signal.libsignal.protocol.util.Pair; import org.thoughtcrime.securesms.components.settings.app.notifications.profiles.NotificationProfilesRepository; import org.thoughtcrime.securesms.conversation.colors.ChatColors; import org.thoughtcrime.securesms.conversation.colors.ChatColorsPalette; @@ -50,7 +51,6 @@ import org.thoughtcrime.securesms.util.ViewUtil; import org.thoughtcrime.securesms.util.livedata.LiveDataUtil; import org.thoughtcrime.securesms.util.livedata.Store; import org.thoughtcrime.securesms.wallpaper.ChatWallpaper; -import org.whispersystems.libsignal.util.Pair; import java.util.Collections; import java.util.HashMap; diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/MessageCountsViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/MessageCountsViewModel.java index 6178fdfb18..13c9d01f66 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/MessageCountsViewModel.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/MessageCountsViewModel.java @@ -10,12 +10,12 @@ import androidx.lifecycle.Transformations; import androidx.lifecycle.ViewModel; import org.signal.core.util.concurrent.SignalExecutors; +import org.signal.libsignal.protocol.util.Pair; import org.thoughtcrime.securesms.database.DatabaseObserver; import org.thoughtcrime.securesms.database.SignalDatabase; import org.thoughtcrime.securesms.database.model.ThreadRecord; import org.thoughtcrime.securesms.dependencies.ApplicationDependencies; import org.thoughtcrime.securesms.util.concurrent.SerialMonoLifoExecutor; -import org.whispersystems.libsignal.util.Pair; import java.util.concurrent.Executor; diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ui/error/SafetyNumberChangeRepository.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ui/error/SafetyNumberChangeRepository.java index d351ffd87e..3094265f73 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ui/error/SafetyNumberChangeRepository.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ui/error/SafetyNumberChangeRepository.java @@ -12,6 +12,8 @@ import com.annimon.stream.Stream; import org.signal.core.util.concurrent.SignalExecutors; import org.signal.core.util.logging.Log; +import org.signal.libsignal.protocol.IdentityKey; +import org.signal.libsignal.protocol.SignalProtocolAddress; import org.thoughtcrime.securesms.crypto.ReentrantSessionLock; import org.thoughtcrime.securesms.crypto.storage.SignalIdentityKeyStore; import org.thoughtcrime.securesms.database.IdentityDatabase; @@ -26,8 +28,6 @@ import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.recipients.RecipientId; import org.thoughtcrime.securesms.sms.MessageSender; import org.thoughtcrime.securesms.util.Util; -import org.whispersystems.libsignal.IdentityKey; -import org.whispersystems.libsignal.SignalProtocolAddress; import org.whispersystems.signalservice.api.SignalSessionLock; import org.whispersystems.signalservice.api.push.SignalServiceAddress; diff --git a/app/src/main/java/org/thoughtcrime/securesms/crypto/AsymmetricMasterCipher.java b/app/src/main/java/org/thoughtcrime/securesms/crypto/AsymmetricMasterCipher.java index 5a6b1dfe59..a7d6d6ad67 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/crypto/AsymmetricMasterCipher.java +++ b/app/src/main/java/org/thoughtcrime/securesms/crypto/AsymmetricMasterCipher.java @@ -18,14 +18,14 @@ package org.thoughtcrime.securesms.crypto; import org.signal.core.util.Conversions; +import org.signal.libsignal.protocol.InvalidKeyException; +import org.signal.libsignal.protocol.InvalidMessageException; +import org.signal.libsignal.protocol.ecc.Curve; +import org.signal.libsignal.protocol.ecc.ECKeyPair; +import org.signal.libsignal.protocol.ecc.ECPrivateKey; +import org.signal.libsignal.protocol.ecc.ECPublicKey; import org.thoughtcrime.securesms.util.Base64; import org.thoughtcrime.securesms.util.Util; -import org.whispersystems.libsignal.InvalidKeyException; -import org.whispersystems.libsignal.InvalidMessageException; -import org.whispersystems.libsignal.ecc.Curve; -import org.whispersystems.libsignal.ecc.ECKeyPair; -import org.whispersystems.libsignal.ecc.ECPrivateKey; -import org.whispersystems.libsignal.ecc.ECPublicKey; import java.io.IOException; import java.security.NoSuchAlgorithmException; diff --git a/app/src/main/java/org/thoughtcrime/securesms/crypto/AsymmetricMasterSecret.java b/app/src/main/java/org/thoughtcrime/securesms/crypto/AsymmetricMasterSecret.java index 36dfe4b1d8..d6efe8008a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/crypto/AsymmetricMasterSecret.java +++ b/app/src/main/java/org/thoughtcrime/securesms/crypto/AsymmetricMasterSecret.java @@ -17,8 +17,8 @@ */ package org.thoughtcrime.securesms.crypto; -import org.whispersystems.libsignal.ecc.ECPrivateKey; -import org.whispersystems.libsignal.ecc.ECPublicKey; +import org.signal.libsignal.protocol.ecc.ECPrivateKey; +import org.signal.libsignal.protocol.ecc.ECPublicKey; /** * When a user first initializes TextSecure, a few secrets diff --git a/app/src/main/java/org/thoughtcrime/securesms/crypto/IdentityKeyParcelable.java b/app/src/main/java/org/thoughtcrime/securesms/crypto/IdentityKeyParcelable.java index 8965e10940..c7827f26de 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/crypto/IdentityKeyParcelable.java +++ b/app/src/main/java/org/thoughtcrime/securesms/crypto/IdentityKeyParcelable.java @@ -22,8 +22,8 @@ import android.os.Parcelable; import androidx.annotation.Nullable; import org.thoughtcrime.securesms.util.ParcelUtil; -import org.whispersystems.libsignal.IdentityKey; -import org.whispersystems.libsignal.InvalidKeyException; +import org.signal.libsignal.protocol.IdentityKey; +import org.signal.libsignal.protocol.InvalidKeyException; public class IdentityKeyParcelable implements Parcelable { diff --git a/app/src/main/java/org/thoughtcrime/securesms/crypto/IdentityKeyUtil.java b/app/src/main/java/org/thoughtcrime/securesms/crypto/IdentityKeyUtil.java index 7e82474c53..f028211923 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/crypto/IdentityKeyUtil.java +++ b/app/src/main/java/org/thoughtcrime/securesms/crypto/IdentityKeyUtil.java @@ -17,11 +17,11 @@ */ package org.thoughtcrime.securesms.crypto; -import org.whispersystems.libsignal.IdentityKey; -import org.whispersystems.libsignal.IdentityKeyPair; -import org.whispersystems.libsignal.ecc.Curve; -import org.whispersystems.libsignal.ecc.ECKeyPair; -import org.whispersystems.libsignal.ecc.ECPrivateKey; +import org.signal.libsignal.protocol.IdentityKey; +import org.signal.libsignal.protocol.IdentityKeyPair; +import org.signal.libsignal.protocol.ecc.Curve; +import org.signal.libsignal.protocol.ecc.ECKeyPair; +import org.signal.libsignal.protocol.ecc.ECPrivateKey; /** * Utility class for working with identity keys. diff --git a/app/src/main/java/org/thoughtcrime/securesms/crypto/MasterCipher.java b/app/src/main/java/org/thoughtcrime/securesms/crypto/MasterCipher.java index c9804dd805..b19be31194 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/crypto/MasterCipher.java +++ b/app/src/main/java/org/thoughtcrime/securesms/crypto/MasterCipher.java @@ -20,11 +20,11 @@ package org.thoughtcrime.securesms.crypto; import androidx.annotation.NonNull; import org.signal.core.util.logging.Log; +import org.signal.libsignal.protocol.InvalidMessageException; +import org.signal.libsignal.protocol.ecc.Curve; +import org.signal.libsignal.protocol.ecc.ECPrivateKey; import org.thoughtcrime.securesms.util.Base64; import org.signal.core.util.Hex; -import org.whispersystems.libsignal.InvalidMessageException; -import org.whispersystems.libsignal.ecc.Curve; -import org.whispersystems.libsignal.ecc.ECPrivateKey; import java.io.IOException; import java.security.GeneralSecurityException; @@ -86,12 +86,12 @@ public class MasterCipher { } public ECPrivateKey decryptKey(byte[] key) - throws org.whispersystems.libsignal.InvalidKeyException + throws org.signal.libsignal.protocol.InvalidKeyException { try { return Curve.decodePrivatePoint(decryptBytes(key)); } catch (InvalidMessageException ime) { - throw new org.whispersystems.libsignal.InvalidKeyException(ime); + throw new org.signal.libsignal.protocol.InvalidKeyException(ime); } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/crypto/MasterSecretUtil.java b/app/src/main/java/org/thoughtcrime/securesms/crypto/MasterSecretUtil.java index 9458106522..b003634ff1 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/crypto/MasterSecretUtil.java +++ b/app/src/main/java/org/thoughtcrime/securesms/crypto/MasterSecretUtil.java @@ -25,13 +25,13 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import org.signal.core.util.logging.Log; +import org.signal.libsignal.protocol.InvalidKeyException; +import org.signal.libsignal.protocol.ecc.Curve; +import org.signal.libsignal.protocol.ecc.ECKeyPair; +import org.signal.libsignal.protocol.ecc.ECPrivateKey; +import org.signal.libsignal.protocol.ecc.ECPublicKey; import org.thoughtcrime.securesms.util.Base64; import org.thoughtcrime.securesms.util.Util; -import org.whispersystems.libsignal.InvalidKeyException; -import org.whispersystems.libsignal.ecc.Curve; -import org.whispersystems.libsignal.ecc.ECKeyPair; -import org.whispersystems.libsignal.ecc.ECPrivateKey; -import org.whispersystems.libsignal.ecc.ECPublicKey; import java.io.IOException; import java.security.GeneralSecurityException; diff --git a/app/src/main/java/org/thoughtcrime/securesms/crypto/PreKeyUtil.java b/app/src/main/java/org/thoughtcrime/securesms/crypto/PreKeyUtil.java index ca7bdfcdf1..85448a8cce 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/crypto/PreKeyUtil.java +++ b/app/src/main/java/org/thoughtcrime/securesms/crypto/PreKeyUtil.java @@ -20,15 +20,15 @@ package org.thoughtcrime.securesms.crypto; import androidx.annotation.NonNull; import org.signal.core.util.logging.Log; +import org.signal.libsignal.protocol.InvalidKeyException; +import org.signal.libsignal.protocol.InvalidKeyIdException; +import org.signal.libsignal.protocol.ecc.Curve; +import org.signal.libsignal.protocol.ecc.ECKeyPair; +import org.signal.libsignal.protocol.state.PreKeyRecord; +import org.signal.libsignal.protocol.state.SignalProtocolStore; +import org.signal.libsignal.protocol.state.SignedPreKeyRecord; +import org.signal.libsignal.protocol.util.Medium; import org.thoughtcrime.securesms.crypto.storage.PreKeyMetadataStore; -import org.whispersystems.libsignal.InvalidKeyException; -import org.whispersystems.libsignal.InvalidKeyIdException; -import org.whispersystems.libsignal.ecc.Curve; -import org.whispersystems.libsignal.ecc.ECKeyPair; -import org.whispersystems.libsignal.state.PreKeyRecord; -import org.whispersystems.libsignal.state.SignalProtocolStore; -import org.whispersystems.libsignal.state.SignedPreKeyRecord; -import org.whispersystems.libsignal.util.Medium; import java.util.Comparator; import java.util.LinkedList; diff --git a/app/src/main/java/org/thoughtcrime/securesms/crypto/ProfileKeyUtil.java b/app/src/main/java/org/thoughtcrime/securesms/crypto/ProfileKeyUtil.java index de09ed873c..bb421de855 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/crypto/ProfileKeyUtil.java +++ b/app/src/main/java/org/thoughtcrime/securesms/crypto/ProfileKeyUtil.java @@ -4,9 +4,9 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import org.signal.core.util.logging.Log; -import org.signal.zkgroup.InvalidInputException; -import org.signal.zkgroup.profiles.ProfileKey; -import org.signal.zkgroup.profiles.ProfileKeyCredential; +import org.signal.libsignal.zkgroup.InvalidInputException; +import org.signal.libsignal.zkgroup.profiles.ProfileKey; +import org.signal.libsignal.zkgroup.profiles.ProfileKeyCredential; import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.util.Util; diff --git a/app/src/main/java/org/thoughtcrime/securesms/crypto/PublicKey.java b/app/src/main/java/org/thoughtcrime/securesms/crypto/PublicKey.java index 2b7f99a382..8ff0dad6bc 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/crypto/PublicKey.java +++ b/app/src/main/java/org/thoughtcrime/securesms/crypto/PublicKey.java @@ -20,10 +20,10 @@ package org.thoughtcrime.securesms.crypto; import org.signal.core.util.Conversions; import org.signal.core.util.logging.Log; import org.signal.core.util.Hex; +import org.signal.libsignal.protocol.InvalidKeyException; +import org.signal.libsignal.protocol.ecc.Curve; +import org.signal.libsignal.protocol.ecc.ECPublicKey; import org.thoughtcrime.securesms.util.Util; -import org.whispersystems.libsignal.InvalidKeyException; -import org.whispersystems.libsignal.ecc.Curve; -import org.whispersystems.libsignal.ecc.ECPublicKey; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; diff --git a/app/src/main/java/org/thoughtcrime/securesms/crypto/SenderKeyUtil.java b/app/src/main/java/org/thoughtcrime/securesms/crypto/SenderKeyUtil.java index d4d65289d5..6cf1507b1a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/crypto/SenderKeyUtil.java +++ b/app/src/main/java/org/thoughtcrime/securesms/crypto/SenderKeyUtil.java @@ -2,10 +2,10 @@ package org.thoughtcrime.securesms.crypto; import androidx.annotation.NonNull; +import org.signal.libsignal.protocol.SignalProtocolAddress; import org.thoughtcrime.securesms.database.SignalDatabase; import org.thoughtcrime.securesms.dependencies.ApplicationDependencies; import org.thoughtcrime.securesms.keyvalue.SignalStore; -import org.whispersystems.libsignal.SignalProtocolAddress; import org.whispersystems.signalservice.api.SignalSessionLock; import org.whispersystems.signalservice.api.push.DistributionId; diff --git a/app/src/main/java/org/thoughtcrime/securesms/crypto/UnidentifiedAccessUtil.java b/app/src/main/java/org/thoughtcrime/securesms/crypto/UnidentifiedAccessUtil.java index 6047e7629e..2e1bfeb1fb 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/crypto/UnidentifiedAccessUtil.java +++ b/app/src/main/java/org/thoughtcrime/securesms/crypto/UnidentifiedAccessUtil.java @@ -12,7 +12,10 @@ import com.annimon.stream.Stream; import org.signal.core.util.logging.Log; import org.signal.libsignal.metadata.certificate.CertificateValidator; import org.signal.libsignal.metadata.certificate.InvalidCertificateException; -import org.signal.zkgroup.profiles.ProfileKey; +import org.signal.libsignal.protocol.InvalidKeyException; +import org.signal.libsignal.protocol.ecc.Curve; +import org.signal.libsignal.protocol.ecc.ECPublicKey; +import org.signal.libsignal.zkgroup.profiles.ProfileKey; import org.thoughtcrime.securesms.BuildConfig; import org.thoughtcrime.securesms.keyvalue.CertificateType; import org.thoughtcrime.securesms.keyvalue.PhoneNumberPrivacyValues; @@ -22,9 +25,6 @@ import org.thoughtcrime.securesms.recipients.RecipientId; import org.thoughtcrime.securesms.util.Base64; import org.thoughtcrime.securesms.util.TextSecurePreferences; import org.thoughtcrime.securesms.util.Util; -import org.whispersystems.libsignal.InvalidKeyException; -import org.whispersystems.libsignal.ecc.Curve; -import org.whispersystems.libsignal.ecc.ECPublicKey; import org.whispersystems.signalservice.api.crypto.UnidentifiedAccess; import org.whispersystems.signalservice.api.crypto.UnidentifiedAccessPair; diff --git a/app/src/main/java/org/thoughtcrime/securesms/crypto/storage/SignalBaseIdentityKeyStore.java b/app/src/main/java/org/thoughtcrime/securesms/crypto/storage/SignalBaseIdentityKeyStore.java index 5bb37b9c59..7228a4dfd5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/crypto/storage/SignalBaseIdentityKeyStore.java +++ b/app/src/main/java/org/thoughtcrime/securesms/crypto/storage/SignalBaseIdentityKeyStore.java @@ -6,6 +6,9 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import org.signal.core.util.logging.Log; +import org.signal.libsignal.protocol.IdentityKey; +import org.signal.libsignal.protocol.SignalProtocolAddress; +import org.signal.libsignal.protocol.state.IdentityKeyStore; import org.thoughtcrime.securesms.crypto.storage.SignalIdentityKeyStore.SaveResult; import org.thoughtcrime.securesms.database.IdentityDatabase; import org.thoughtcrime.securesms.database.IdentityDatabase.VerifiedStatus; @@ -19,9 +22,6 @@ import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.recipients.RecipientId; import org.thoughtcrime.securesms.util.IdentityUtil; import org.thoughtcrime.securesms.util.LRUCache; -import org.whispersystems.libsignal.IdentityKey; -import org.whispersystems.libsignal.SignalProtocolAddress; -import org.whispersystems.libsignal.state.IdentityKeyStore; import org.whispersystems.signalservice.api.push.ServiceId; import java.util.ArrayList; diff --git a/app/src/main/java/org/thoughtcrime/securesms/crypto/storage/SignalIdentityKeyStore.java b/app/src/main/java/org/thoughtcrime/securesms/crypto/storage/SignalIdentityKeyStore.java index 3e2391b721..0ca25d2c18 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/crypto/storage/SignalIdentityKeyStore.java +++ b/app/src/main/java/org/thoughtcrime/securesms/crypto/storage/SignalIdentityKeyStore.java @@ -2,15 +2,15 @@ package org.thoughtcrime.securesms.crypto.storage; import androidx.annotation.NonNull; +import org.signal.libsignal.protocol.IdentityKey; +import org.signal.libsignal.protocol.IdentityKeyPair; +import org.signal.libsignal.protocol.SignalProtocolAddress; +import org.signal.libsignal.protocol.state.IdentityKeyStore; import org.thoughtcrime.securesms.database.IdentityDatabase.VerifiedStatus; import org.thoughtcrime.securesms.database.identity.IdentityRecordList; import org.thoughtcrime.securesms.database.model.IdentityRecord; import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.recipients.RecipientId; -import org.whispersystems.libsignal.IdentityKey; -import org.whispersystems.libsignal.IdentityKeyPair; -import org.whispersystems.libsignal.SignalProtocolAddress; -import org.whispersystems.libsignal.state.IdentityKeyStore; import java.util.List; import java.util.Optional; diff --git a/app/src/main/java/org/thoughtcrime/securesms/crypto/storage/SignalSenderKeyStore.java b/app/src/main/java/org/thoughtcrime/securesms/crypto/storage/SignalSenderKeyStore.java index a5cf862f8c..10beaf9cba 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/crypto/storage/SignalSenderKeyStore.java +++ b/app/src/main/java/org/thoughtcrime/securesms/crypto/storage/SignalSenderKeyStore.java @@ -4,9 +4,9 @@ import android.content.Context; import androidx.annotation.NonNull; +import org.signal.libsignal.protocol.SignalProtocolAddress; +import org.signal.libsignal.protocol.groups.state.SenderKeyRecord; import org.thoughtcrime.securesms.database.SignalDatabase; -import org.whispersystems.libsignal.SignalProtocolAddress; -import org.whispersystems.libsignal.groups.state.SenderKeyRecord; import org.whispersystems.signalservice.api.SignalServiceSenderKeyStore; import org.whispersystems.signalservice.api.push.DistributionId; diff --git a/app/src/main/java/org/thoughtcrime/securesms/crypto/storage/SignalServiceAccountDataStoreImpl.java b/app/src/main/java/org/thoughtcrime/securesms/crypto/storage/SignalServiceAccountDataStoreImpl.java index 317c9c03ce..4e292948df 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/crypto/storage/SignalServiceAccountDataStoreImpl.java +++ b/app/src/main/java/org/thoughtcrime/securesms/crypto/storage/SignalServiceAccountDataStoreImpl.java @@ -4,16 +4,16 @@ import android.content.Context; import androidx.annotation.NonNull; +import org.signal.libsignal.protocol.IdentityKey; +import org.signal.libsignal.protocol.IdentityKeyPair; +import org.signal.libsignal.protocol.InvalidKeyIdException; +import org.signal.libsignal.protocol.NoSessionException; +import org.signal.libsignal.protocol.SignalProtocolAddress; +import org.signal.libsignal.protocol.groups.state.SenderKeyRecord; +import org.signal.libsignal.protocol.state.PreKeyRecord; +import org.signal.libsignal.protocol.state.SessionRecord; +import org.signal.libsignal.protocol.state.SignedPreKeyRecord; import org.thoughtcrime.securesms.util.TextSecurePreferences; -import org.whispersystems.libsignal.IdentityKey; -import org.whispersystems.libsignal.IdentityKeyPair; -import org.whispersystems.libsignal.InvalidKeyIdException; -import org.whispersystems.libsignal.NoSessionException; -import org.whispersystems.libsignal.SignalProtocolAddress; -import org.whispersystems.libsignal.groups.state.SenderKeyRecord; -import org.whispersystems.libsignal.state.PreKeyRecord; -import org.whispersystems.libsignal.state.SessionRecord; -import org.whispersystems.libsignal.state.SignedPreKeyRecord; import org.whispersystems.signalservice.api.SignalServiceAccountDataStore; import org.whispersystems.signalservice.api.push.DistributionId; diff --git a/app/src/main/java/org/thoughtcrime/securesms/crypto/storage/TextSecurePreKeyStore.java b/app/src/main/java/org/thoughtcrime/securesms/crypto/storage/TextSecurePreKeyStore.java index b5877948d4..7a7e9219e0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/crypto/storage/TextSecurePreKeyStore.java +++ b/app/src/main/java/org/thoughtcrime/securesms/crypto/storage/TextSecurePreKeyStore.java @@ -3,12 +3,12 @@ package org.thoughtcrime.securesms.crypto.storage; import androidx.annotation.NonNull; import org.signal.core.util.logging.Log; +import org.signal.libsignal.protocol.InvalidKeyIdException; +import org.signal.libsignal.protocol.state.PreKeyRecord; +import org.signal.libsignal.protocol.state.PreKeyStore; +import org.signal.libsignal.protocol.state.SignedPreKeyRecord; +import org.signal.libsignal.protocol.state.SignedPreKeyStore; import org.thoughtcrime.securesms.database.SignalDatabase; -import org.whispersystems.libsignal.InvalidKeyIdException; -import org.whispersystems.libsignal.state.PreKeyRecord; -import org.whispersystems.libsignal.state.PreKeyStore; -import org.whispersystems.libsignal.state.SignedPreKeyRecord; -import org.whispersystems.libsignal.state.SignedPreKeyStore; import org.whispersystems.signalservice.api.push.ServiceId; import java.util.List; diff --git a/app/src/main/java/org/thoughtcrime/securesms/crypto/storage/TextSecureSessionStore.java b/app/src/main/java/org/thoughtcrime/securesms/crypto/storage/TextSecureSessionStore.java index 7abd00d20d..9ecc91073d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/crypto/storage/TextSecureSessionStore.java +++ b/app/src/main/java/org/thoughtcrime/securesms/crypto/storage/TextSecureSessionStore.java @@ -4,14 +4,14 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import org.signal.core.util.logging.Log; +import org.signal.libsignal.protocol.NoSessionException; +import org.signal.libsignal.protocol.SignalProtocolAddress; +import org.signal.libsignal.protocol.message.CiphertextMessage; +import org.signal.libsignal.protocol.state.SessionRecord; import org.thoughtcrime.securesms.database.SessionDatabase; import org.thoughtcrime.securesms.database.SignalDatabase; import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.recipients.RecipientId; -import org.whispersystems.libsignal.NoSessionException; -import org.whispersystems.libsignal.SignalProtocolAddress; -import org.whispersystems.libsignal.protocol.CiphertextMessage; -import org.whispersystems.libsignal.state.SessionRecord; import org.whispersystems.signalservice.api.SignalServiceSessionStore; import org.whispersystems.signalservice.api.push.ServiceId; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/GroupDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/GroupDatabase.java index c9bc21a3fc..695ba7ea40 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/GroupDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/GroupDatabase.java @@ -14,13 +14,13 @@ import com.annimon.stream.Stream; import com.google.protobuf.InvalidProtocolBufferException; import org.signal.core.util.logging.Log; +import org.signal.libsignal.zkgroup.InvalidInputException; +import org.signal.libsignal.zkgroup.groups.GroupMasterKey; import org.signal.storageservice.protos.groups.AccessControl; import org.signal.storageservice.protos.groups.Member; import org.signal.storageservice.protos.groups.local.DecryptedGroup; import org.signal.storageservice.protos.groups.local.DecryptedGroupChange; import org.signal.storageservice.protos.groups.local.EnabledState; -import org.signal.zkgroup.InvalidInputException; -import org.signal.zkgroup.groups.GroupMasterKey; import org.thoughtcrime.securesms.crypto.SenderKeyUtil; import org.thoughtcrime.securesms.dependencies.ApplicationDependencies; import org.thoughtcrime.securesms.groups.BadGroupIdException; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/GroupReceiptDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/GroupReceiptDatabase.java index 2131b1ecc4..de6cd4b3d9 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/GroupReceiptDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/GroupReceiptDatabase.java @@ -7,9 +7,9 @@ import android.database.Cursor; import androidx.annotation.NonNull; +import org.signal.libsignal.protocol.util.Pair; import org.thoughtcrime.securesms.recipients.RecipientId; import org.signal.core.util.SqlUtil; -import org.whispersystems.libsignal.util.Pair; import java.util.ArrayList; import java.util.Collection; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/IdentityDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/IdentityDatabase.java index 6054838322..d6bec856c8 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/IdentityDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/IdentityDatabase.java @@ -25,6 +25,8 @@ import androidx.annotation.Nullable; import org.greenrobot.eventbus.EventBus; import org.signal.core.util.logging.Log; +import org.signal.libsignal.protocol.IdentityKey; +import org.signal.libsignal.protocol.InvalidKeyException; import org.thoughtcrime.securesms.database.model.IdentityRecord; import org.thoughtcrime.securesms.database.model.IdentityStoreRecord; import org.thoughtcrime.securesms.dependencies.ApplicationDependencies; @@ -34,8 +36,6 @@ import org.thoughtcrime.securesms.util.Base64; import org.signal.core.util.CursorUtil; import org.thoughtcrime.securesms.util.IdentityUtil; import org.signal.core.util.SqlUtil; -import org.whispersystems.libsignal.IdentityKey; -import org.whispersystems.libsignal.InvalidKeyException; import org.whispersystems.signalservice.api.util.UuidUtil; import java.io.IOException; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/MessageDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/MessageDatabase.java index d5c3e1e793..14daaf2b4f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/MessageDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/MessageDatabase.java @@ -13,6 +13,8 @@ import com.google.android.mms.pdu_alt.NotificationInd; import net.zetetic.database.sqlcipher.SQLiteStatement; import org.signal.core.util.logging.Log; +import org.signal.libsignal.protocol.IdentityKey; +import org.signal.libsignal.protocol.util.Pair; import org.thoughtcrime.securesms.database.documents.Document; import org.thoughtcrime.securesms.database.documents.IdentityKeyMismatch; import org.thoughtcrime.securesms.database.documents.IdentityKeyMismatchSet; @@ -35,8 +37,6 @@ import org.signal.core.util.CursorUtil; import org.thoughtcrime.securesms.util.JsonUtils; import org.signal.core.util.SqlUtil; import org.thoughtcrime.securesms.util.Util; -import org.whispersystems.libsignal.IdentityKey; -import org.whispersystems.libsignal.util.Pair; import java.io.Closeable; import java.io.IOException; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java index 4fcac87719..a81c7fe881 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java @@ -37,6 +37,7 @@ import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; import org.signal.core.util.logging.Log; +import org.signal.libsignal.protocol.util.Pair; import org.thoughtcrime.securesms.attachments.Attachment; import org.thoughtcrime.securesms.attachments.AttachmentId; import org.thoughtcrime.securesms.attachments.DatabaseAttachment; @@ -84,7 +85,6 @@ import org.thoughtcrime.securesms.util.MediaUtil; import org.signal.core.util.SqlUtil; import org.thoughtcrime.securesms.util.TextSecurePreferences; import org.thoughtcrime.securesms.util.Util; -import org.whispersystems.libsignal.util.Pair; import org.whispersystems.signalservice.api.push.ServiceId; import java.io.IOException; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsDatabase.java index 052821c272..c8463a0587 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsDatabase.java @@ -28,6 +28,7 @@ import com.annimon.stream.Stream; import net.zetetic.database.sqlcipher.SQLiteQueryBuilder; import org.signal.core.util.logging.Log; +import org.signal.libsignal.protocol.util.Pair; import org.thoughtcrime.securesms.database.MessageDatabase.MessageUpdate; import org.thoughtcrime.securesms.database.MessageDatabase.SyncMessageId; import org.thoughtcrime.securesms.database.model.MessageRecord; @@ -37,7 +38,6 @@ import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.recipients.RecipientId; import org.signal.core.util.CursorUtil; import org.signal.core.util.SqlUtil; -import org.whispersystems.libsignal.util.Pair; import org.whispersystems.signalservice.api.messages.multidevice.ReadMessage; import java.io.Closeable; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/OneTimePreKeyDatabase.kt b/app/src/main/java/org/thoughtcrime/securesms/database/OneTimePreKeyDatabase.kt index 4f91ad1078..5259d45352 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/OneTimePreKeyDatabase.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/OneTimePreKeyDatabase.kt @@ -5,11 +5,11 @@ import androidx.core.content.contentValuesOf import org.signal.core.util.SqlUtil import org.signal.core.util.logging.Log import org.signal.core.util.requireNonNullString +import org.signal.libsignal.protocol.InvalidKeyException +import org.signal.libsignal.protocol.ecc.Curve +import org.signal.libsignal.protocol.ecc.ECKeyPair +import org.signal.libsignal.protocol.state.PreKeyRecord import org.thoughtcrime.securesms.util.Base64 -import org.whispersystems.libsignal.InvalidKeyException -import org.whispersystems.libsignal.ecc.Curve -import org.whispersystems.libsignal.ecc.ECKeyPair -import org.whispersystems.libsignal.state.PreKeyRecord import org.whispersystems.signalservice.api.push.ServiceId import java.io.IOException diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.kt b/app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.kt index aaa893c8ce..445bcefd67 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.kt @@ -24,10 +24,12 @@ import org.signal.core.util.requireInt import org.signal.core.util.requireLong import org.signal.core.util.requireNonNullString import org.signal.core.util.requireString +import org.signal.libsignal.protocol.IdentityKey +import org.signal.libsignal.protocol.InvalidKeyException +import org.signal.libsignal.zkgroup.InvalidInputException +import org.signal.libsignal.zkgroup.profiles.ProfileKey +import org.signal.libsignal.zkgroup.profiles.ProfileKeyCredential import org.signal.storageservice.protos.groups.local.DecryptedGroup -import org.signal.zkgroup.InvalidInputException -import org.signal.zkgroup.profiles.ProfileKey -import org.signal.zkgroup.profiles.ProfileKeyCredential import org.thoughtcrime.securesms.badges.Badges import org.thoughtcrime.securesms.badges.Badges.toDatabaseBadge import org.thoughtcrime.securesms.badges.models.Badge @@ -87,9 +89,6 @@ import org.thoughtcrime.securesms.util.Util import org.thoughtcrime.securesms.wallpaper.ChatWallpaper import org.thoughtcrime.securesms.wallpaper.ChatWallpaperFactory import org.thoughtcrime.securesms.wallpaper.WallpaperStorage -import org.whispersystems.libsignal.IdentityKey -import org.whispersystems.libsignal.InvalidKeyException -import org.whispersystems.libsignal.util.Pair import org.whispersystems.signalservice.api.profiles.SignalServiceProfile import org.whispersystems.signalservice.api.push.ACI import org.whispersystems.signalservice.api.push.PNI @@ -483,8 +482,8 @@ open class RecipientDatabase(context: Context, databaseHelper: SignalDatabase) : } if (remapped != null) { - Recipient.live(remapped.first()).refresh(remapped.second()) - ApplicationDependencies.getRecipientCache().remap(remapped.first(), remapped.second()) + Recipient.live(remapped.first).refresh(remapped.second) + ApplicationDependencies.getRecipientCache().remap(remapped.first, remapped.second) } if (recipientsNeedingRefresh.isNotEmpty() || remapped != null) { @@ -1701,9 +1700,9 @@ open class RecipientDatabase(context: Context, databaseHelper: SignalDatabase) : val rowsUpdated = database.update(TABLE_NAME, values, where, null) if (rowsUpdated == idWithWallpaper.size) { for (pair in idWithWallpaper) { - ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(pair.first()) - if (pair.second() != null) { - WallpaperStorage.onWallpaperDeselected(context, Uri.parse(pair.second())) + ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(pair.first) + if (pair.second != null) { + WallpaperStorage.onWallpaperDeselected(context, Uri.parse(pair.second)) } } } else { diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/SenderKeyDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/SenderKeyDatabase.java index 5a3a791b67..08fb2ff46e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/SenderKeyDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/SenderKeyDatabase.java @@ -9,11 +9,12 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import org.signal.core.util.logging.Log; +import org.signal.libsignal.protocol.InvalidMessageException; +import org.signal.libsignal.protocol.SignalProtocolAddress; +import org.signal.libsignal.protocol.groups.state.SenderKeyRecord; import org.thoughtcrime.securesms.keyvalue.SignalStore; import org.signal.core.util.CursorUtil; import org.signal.core.util.SqlUtil; -import org.whispersystems.libsignal.SignalProtocolAddress; -import org.whispersystems.libsignal.groups.state.SenderKeyRecord; import org.whispersystems.signalservice.api.push.DistributionId; import java.io.IOException; @@ -89,7 +90,7 @@ public class SenderKeyDatabase extends Database { if (cursor.moveToFirst()) { try { return new SenderKeyRecord(CursorUtil.requireBlob(cursor, RECORD)); - } catch (IOException e) { + } catch (InvalidMessageException e) { Log.w(TAG, e); } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/SenderKeySharedDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/SenderKeySharedDatabase.java index 2e44882b58..ea93ef3bdb 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/SenderKeySharedDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/SenderKeySharedDatabase.java @@ -8,11 +8,11 @@ import android.database.Cursor; import androidx.annotation.NonNull; import org.signal.core.util.logging.Log; +import org.signal.libsignal.protocol.SignalProtocolAddress; import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.recipients.RecipientId; import org.signal.core.util.CursorUtil; import org.signal.core.util.SqlUtil; -import org.whispersystems.libsignal.SignalProtocolAddress; import org.whispersystems.signalservice.api.push.DistributionId; import java.util.Collection; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/SessionDatabase.kt b/app/src/main/java/org/thoughtcrime/securesms/database/SessionDatabase.kt index 884f794221..04878035eb 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/SessionDatabase.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/SessionDatabase.kt @@ -7,8 +7,8 @@ import org.signal.core.util.logging.Log import org.signal.core.util.requireInt import org.signal.core.util.requireNonNullBlob import org.signal.core.util.requireNonNullString -import org.whispersystems.libsignal.SignalProtocolAddress -import org.whispersystems.libsignal.state.SessionRecord +import org.signal.libsignal.protocol.SignalProtocolAddress +import org.signal.libsignal.protocol.state.SessionRecord import org.whispersystems.signalservice.api.push.ServiceId import org.whispersystems.signalservice.api.push.SignalServiceAddress import java.io.IOException diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/SignedPreKeyDatabase.kt b/app/src/main/java/org/thoughtcrime/securesms/database/SignedPreKeyDatabase.kt index 4c9a7b1e04..46cc98eff0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/SignedPreKeyDatabase.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/SignedPreKeyDatabase.kt @@ -7,11 +7,11 @@ import org.signal.core.util.logging.Log import org.signal.core.util.requireInt import org.signal.core.util.requireLong import org.signal.core.util.requireNonNullString +import org.signal.libsignal.protocol.InvalidKeyException +import org.signal.libsignal.protocol.ecc.Curve +import org.signal.libsignal.protocol.ecc.ECKeyPair +import org.signal.libsignal.protocol.state.SignedPreKeyRecord import org.thoughtcrime.securesms.util.Base64 -import org.whispersystems.libsignal.InvalidKeyException -import org.whispersystems.libsignal.ecc.Curve -import org.whispersystems.libsignal.ecc.ECKeyPair -import org.whispersystems.libsignal.state.SignedPreKeyRecord import org.whispersystems.signalservice.api.push.ServiceId import java.io.IOException import java.util.LinkedList diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java index 5dcb918a8e..7478f4e23b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java @@ -33,6 +33,7 @@ import com.google.protobuf.ByteString; import net.zetetic.database.sqlcipher.SQLiteStatement; import org.signal.core.util.logging.Log; +import org.signal.libsignal.protocol.util.Pair; import org.thoughtcrime.securesms.database.documents.IdentityKeyMismatch; import org.thoughtcrime.securesms.database.documents.IdentityKeyMismatchSet; import org.thoughtcrime.securesms.database.documents.NetworkFailure; @@ -62,7 +63,6 @@ import org.thoughtcrime.securesms.util.JsonUtils; import org.signal.core.util.SqlUtil; import org.thoughtcrime.securesms.util.TextSecurePreferences; import org.thoughtcrime.securesms.util.Util; -import org.whispersystems.libsignal.util.Pair; import java.io.Closeable; import java.io.IOException; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java index a35516c773..12d4d355b6 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java @@ -32,8 +32,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; import org.jsoup.helper.StringUtil; import org.signal.core.util.logging.Log; -import org.signal.zkgroup.InvalidInputException; -import org.signal.zkgroup.groups.GroupMasterKey; +import org.signal.libsignal.zkgroup.InvalidInputException; +import org.signal.libsignal.zkgroup.groups.GroupMasterKey; import org.thoughtcrime.securesms.database.MessageDatabase.MarkedMessageInfo; import org.thoughtcrime.securesms.database.model.MediaMmsMessageRecord; import org.thoughtcrime.securesms.database.model.MessageRecord; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/documents/IdentityKeyMismatch.java b/app/src/main/java/org/thoughtcrime/securesms/database/documents/IdentityKeyMismatch.java index 237d98791c..ba05bece8c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/documents/IdentityKeyMismatch.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/documents/IdentityKeyMismatch.java @@ -17,11 +17,11 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import org.signal.core.util.logging.Log; +import org.signal.libsignal.protocol.IdentityKey; +import org.signal.libsignal.protocol.InvalidKeyException; import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.recipients.RecipientId; import org.thoughtcrime.securesms.util.Base64; -import org.whispersystems.libsignal.IdentityKey; -import org.whispersystems.libsignal.InvalidKeyException; import java.io.IOException; import java.util.Objects; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/ClassicOpenHelper.java b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/ClassicOpenHelper.java index 38f6193a47..43e1f5a8d7 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/ClassicOpenHelper.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/ClassicOpenHelper.java @@ -22,6 +22,8 @@ import com.google.i18n.phonenumbers.ShortNumberInfo; import org.signal.core.util.StreamUtil; import org.signal.core.util.logging.Log; +import org.signal.libsignal.protocol.IdentityKey; +import org.signal.libsignal.protocol.InvalidMessageException; import org.thoughtcrime.securesms.crypto.AttachmentSecret; import org.thoughtcrime.securesms.crypto.ClassicDecryptingPartInputStream; import org.thoughtcrime.securesms.crypto.MasterCipher; @@ -49,8 +51,6 @@ import org.thoughtcrime.securesms.util.JsonUtils; import org.thoughtcrime.securesms.util.MediaUtil; import org.thoughtcrime.securesms.util.TextSecurePreferences; import org.thoughtcrime.securesms.util.Util; -import org.whispersystems.libsignal.IdentityKey; -import org.whispersystems.libsignal.InvalidMessageException; import java.io.File; import java.io.FileInputStream; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/PreKeyMigrationHelper.java b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/PreKeyMigrationHelper.java index eff389542c..5a6380e2ee 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/PreKeyMigrationHelper.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/PreKeyMigrationHelper.java @@ -12,14 +12,15 @@ import net.zetetic.database.sqlcipher.SQLiteDatabase; import org.signal.core.util.Conversions; import org.signal.core.util.logging.Log; +import org.signal.libsignal.protocol.InvalidKeyException; +import org.signal.libsignal.protocol.InvalidMessageException; +import org.signal.libsignal.protocol.state.PreKeyRecord; +import org.signal.libsignal.protocol.state.SignedPreKeyRecord; import org.thoughtcrime.securesms.database.OneTimePreKeyDatabase; import org.thoughtcrime.securesms.database.SignedPreKeyDatabase; import org.thoughtcrime.securesms.keyvalue.SignalStore; import org.thoughtcrime.securesms.util.Base64; import org.thoughtcrime.securesms.util.JsonUtils; -import org.whispersystems.libsignal.InvalidMessageException; -import org.whispersystems.libsignal.state.PreKeyRecord; -import org.whispersystems.libsignal.state.SignedPreKeyRecord; import java.io.File; import java.io.FileInputStream; @@ -52,7 +53,7 @@ public final class PreKeyMigrationHelper { contentValues.put(OneTimePreKeyDatabase.PRIVATE_KEY, Base64.encodeBytes(preKey.getKeyPair().getPrivateKey().serialize())); database.insert(OneTimePreKeyDatabase.TABLE_NAME, null, contentValues); Log.i(TAG, "Migrated one-time prekey: " + preKey.getId()); - } catch (IOException | InvalidMessageException e) { + } catch (IOException | InvalidMessageException | InvalidKeyException e) { Log.w(TAG, e); clean = false; } diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherMigrationHelper.java b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherMigrationHelper.java index 02b2077794..145d67a859 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherMigrationHelper.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherMigrationHelper.java @@ -15,6 +15,7 @@ import com.annimon.stream.function.BiFunction; import net.zetetic.database.sqlcipher.SQLiteDatabase; import org.signal.core.util.logging.Log; +import org.signal.libsignal.protocol.InvalidMessageException; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.crypto.AsymmetricMasterCipher; import org.thoughtcrime.securesms.crypto.AttachmentSecretProvider; @@ -25,7 +26,6 @@ import org.thoughtcrime.securesms.migrations.LegacyMigrationJob; import org.thoughtcrime.securesms.service.GenericForegroundService; import org.thoughtcrime.securesms.util.Base64; import org.thoughtcrime.securesms.util.TextSecurePreferences; -import org.whispersystems.libsignal.InvalidMessageException; import java.io.IOException; import java.util.HashSet; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SessionStoreMigrationHelper.java b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SessionStoreMigrationHelper.java index 2adb317c85..86e43299eb 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SessionStoreMigrationHelper.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SessionStoreMigrationHelper.java @@ -8,8 +8,9 @@ import net.zetetic.database.sqlcipher.SQLiteDatabase; import org.signal.core.util.Conversions; import org.signal.core.util.logging.Log; +import org.signal.libsignal.protocol.InvalidMessageException; +import org.signal.libsignal.protocol.state.SessionRecord; import org.thoughtcrime.securesms.database.SessionDatabase; -import org.whispersystems.libsignal.state.SessionRecord; import org.whispersystems.signalservice.api.push.SignalServiceAddress; import java.io.File; @@ -78,7 +79,7 @@ public final class SessionStoreMigrationHelper { contentValues.put(SessionDatabase.RECORD, sessionRecord.serialize()); database.insert(SessionDatabase.TABLE_NAME, null, contentValues); - } catch (NumberFormatException | IOException e) { + } catch (NumberFormatException | IOException | InvalidMessageException e) { Log.w(TAG, e); } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/loaders/DeviceListLoader.java b/app/src/main/java/org/thoughtcrime/securesms/database/loaders/DeviceListLoader.java index 5c27ee13ed..4b06bb5773 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/loaders/DeviceListLoader.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/loaders/DeviceListLoader.java @@ -9,16 +9,16 @@ import androidx.annotation.VisibleForTesting; import com.annimon.stream.Stream; import org.signal.core.util.logging.Log; +import org.signal.libsignal.protocol.IdentityKeyPair; +import org.signal.libsignal.protocol.InvalidKeyException; +import org.signal.libsignal.protocol.ecc.Curve; +import org.signal.libsignal.protocol.ecc.ECPrivateKey; +import org.signal.libsignal.protocol.ecc.ECPublicKey; +import org.signal.libsignal.protocol.util.ByteUtil; import org.thoughtcrime.securesms.devicelist.Device; import org.thoughtcrime.securesms.keyvalue.SignalStore; import org.thoughtcrime.securesms.util.AsyncLoader; import org.thoughtcrime.securesms.util.Base64; -import org.whispersystems.libsignal.IdentityKeyPair; -import org.whispersystems.libsignal.InvalidKeyException; -import org.whispersystems.libsignal.ecc.Curve; -import org.whispersystems.libsignal.ecc.ECPrivateKey; -import org.whispersystems.libsignal.ecc.ECPublicKey; -import org.whispersystems.libsignal.util.ByteUtil; import org.whispersystems.signalservice.api.SignalServiceAccountManager; import org.whispersystems.signalservice.api.messages.multidevice.DeviceInfo; import org.whispersystems.signalservice.api.push.SignalServiceAddress; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/model/IdentityRecord.kt b/app/src/main/java/org/thoughtcrime/securesms/database/model/IdentityRecord.kt index 1ab14413d9..7e07893c85 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/model/IdentityRecord.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/model/IdentityRecord.kt @@ -1,8 +1,8 @@ package org.thoughtcrime.securesms.database.model +import org.signal.libsignal.protocol.IdentityKey import org.thoughtcrime.securesms.database.IdentityDatabase import org.thoughtcrime.securesms.recipients.RecipientId -import org.whispersystems.libsignal.IdentityKey data class IdentityRecord( val recipientId: RecipientId, diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/model/IdentityStoreRecord.kt b/app/src/main/java/org/thoughtcrime/securesms/database/model/IdentityStoreRecord.kt index c7764fd325..65327da8aa 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/model/IdentityStoreRecord.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/model/IdentityStoreRecord.kt @@ -1,8 +1,8 @@ package org.thoughtcrime.securesms.database.model +import org.signal.libsignal.protocol.IdentityKey import org.thoughtcrime.securesms.database.IdentityDatabase import org.thoughtcrime.securesms.recipients.RecipientId -import org.whispersystems.libsignal.IdentityKey data class IdentityStoreRecord( val addressName: String, diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/model/RecipientRecord.kt b/app/src/main/java/org/thoughtcrime/securesms/database/model/RecipientRecord.kt index c397a7a4bb..21ba1362c5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/model/RecipientRecord.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/model/RecipientRecord.kt @@ -1,8 +1,8 @@ package org.thoughtcrime.securesms.database.model import android.net.Uri -import org.signal.zkgroup.groups.GroupMasterKey -import org.signal.zkgroup.profiles.ProfileKeyCredential +import org.signal.libsignal.zkgroup.groups.GroupMasterKey +import org.signal.libsignal.zkgroup.profiles.ProfileKeyCredential import org.thoughtcrime.securesms.badges.models.Badge import org.thoughtcrime.securesms.conversation.colors.AvatarColor import org.thoughtcrime.securesms.conversation.colors.ChatColors diff --git a/app/src/main/java/org/thoughtcrime/securesms/dependencies/ApplicationDependencies.java b/app/src/main/java/org/thoughtcrime/securesms/dependencies/ApplicationDependencies.java index d10881dff2..8f3fed31be 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/dependencies/ApplicationDependencies.java +++ b/app/src/main/java/org/thoughtcrime/securesms/dependencies/ApplicationDependencies.java @@ -7,7 +7,7 @@ import androidx.annotation.NonNull; import androidx.annotation.VisibleForTesting; import org.signal.core.util.concurrent.DeadlockDetector; -import org.signal.zkgroup.receipts.ClientZkReceiptOperations; +import org.signal.libsignal.zkgroup.receipts.ClientZkReceiptOperations; import org.thoughtcrime.securesms.KbsEnclave; import org.thoughtcrime.securesms.components.TypingStatusRepository; import org.thoughtcrime.securesms.components.TypingStatusSender; diff --git a/app/src/main/java/org/thoughtcrime/securesms/dependencies/ApplicationDependencyProvider.java b/app/src/main/java/org/thoughtcrime/securesms/dependencies/ApplicationDependencyProvider.java index 3ec81ab789..965247b6e6 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/dependencies/ApplicationDependencyProvider.java +++ b/app/src/main/java/org/thoughtcrime/securesms/dependencies/ApplicationDependencyProvider.java @@ -8,7 +8,7 @@ import androidx.annotation.NonNull; import org.signal.core.util.concurrent.DeadlockDetector; import org.signal.core.util.concurrent.SignalExecutors; -import org.signal.zkgroup.receipts.ClientZkReceiptOperations; +import org.signal.libsignal.zkgroup.receipts.ClientZkReceiptOperations; import org.thoughtcrime.securesms.BuildConfig; import org.thoughtcrime.securesms.components.TypingStatusRepository; import org.thoughtcrime.securesms.components.TypingStatusSender; diff --git a/app/src/main/java/org/thoughtcrime/securesms/events/CallParticipant.kt b/app/src/main/java/org/thoughtcrime/securesms/events/CallParticipant.kt index 98161d9060..98f019630e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/events/CallParticipant.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/events/CallParticipant.kt @@ -1,11 +1,11 @@ package org.thoughtcrime.securesms.events import android.content.Context +import org.signal.libsignal.protocol.IdentityKey import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.components.webrtc.BroadcastVideoSink import org.thoughtcrime.securesms.recipients.Recipient import org.thoughtcrime.securesms.ringrtc.CameraState -import org.whispersystems.libsignal.IdentityKey data class CallParticipant constructor( val callParticipantId: CallParticipantId = CallParticipantId(Recipient.UNKNOWN), diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/GroupId.java b/app/src/main/java/org/thoughtcrime/securesms/groups/GroupId.java index f96a005a57..d269665e93 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/GroupId.java +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/GroupId.java @@ -3,13 +3,13 @@ package org.thoughtcrime.securesms.groups; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import org.signal.zkgroup.InvalidInputException; -import org.signal.zkgroup.groups.GroupIdentifier; -import org.signal.zkgroup.groups.GroupMasterKey; -import org.signal.zkgroup.groups.GroupSecretParams; import org.signal.core.util.Hex; +import org.signal.libsignal.protocol.kdf.HKDFv3; +import org.signal.libsignal.zkgroup.InvalidInputException; +import org.signal.libsignal.zkgroup.groups.GroupIdentifier; +import org.signal.libsignal.zkgroup.groups.GroupMasterKey; +import org.signal.libsignal.zkgroup.groups.GroupSecretParams; import org.thoughtcrime.securesms.util.Util; -import org.whispersystems.libsignal.kdf.HKDFv3; import java.io.IOException; import java.security.SecureRandom; diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/GroupManager.java b/app/src/main/java/org/thoughtcrime/securesms/groups/GroupManager.java index 7cfe01c6a9..e5ef6efdd8 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/GroupManager.java +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/GroupManager.java @@ -9,12 +9,12 @@ import androidx.annotation.WorkerThread; import com.google.protobuf.ByteString; import org.signal.core.util.logging.Log; +import org.signal.libsignal.zkgroup.VerificationFailedException; +import org.signal.libsignal.zkgroup.groups.GroupMasterKey; +import org.signal.libsignal.zkgroup.groups.UuidCiphertext; import org.signal.storageservice.protos.groups.GroupExternalCredential; import org.signal.storageservice.protos.groups.local.DecryptedGroup; import org.signal.storageservice.protos.groups.local.DecryptedGroupJoinInfo; -import org.signal.zkgroup.VerificationFailedException; -import org.signal.zkgroup.groups.GroupMasterKey; -import org.signal.zkgroup.groups.UuidCiphertext; import org.thoughtcrime.securesms.database.GroupDatabase; import org.thoughtcrime.securesms.database.SignalDatabase; import org.thoughtcrime.securesms.groups.v2.GroupInviteLinkUrl; diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/GroupManagerV2.java b/app/src/main/java/org/thoughtcrime/securesms/groups/GroupManagerV2.java index 5826b8e17d..b3816d62d2 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/GroupManagerV2.java +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/GroupManagerV2.java @@ -13,6 +13,14 @@ import com.google.protobuf.ByteString; import com.google.protobuf.InvalidProtocolBufferException; import org.signal.core.util.logging.Log; +import org.signal.libsignal.zkgroup.InvalidInputException; +import org.signal.libsignal.zkgroup.VerificationFailedException; +import org.signal.libsignal.zkgroup.groups.ClientZkGroupCipher; +import org.signal.libsignal.zkgroup.groups.GroupMasterKey; +import org.signal.libsignal.zkgroup.groups.GroupSecretParams; +import org.signal.libsignal.zkgroup.groups.UuidCiphertext; +import org.signal.libsignal.zkgroup.profiles.ProfileKey; +import org.signal.libsignal.zkgroup.profiles.ProfileKeyCredential; import org.signal.storageservice.protos.groups.AccessControl; import org.signal.storageservice.protos.groups.GroupChange; import org.signal.storageservice.protos.groups.GroupExternalCredential; @@ -23,14 +31,6 @@ import org.signal.storageservice.protos.groups.local.DecryptedGroupJoinInfo; import org.signal.storageservice.protos.groups.local.DecryptedMember; import org.signal.storageservice.protos.groups.local.DecryptedPendingMember; import org.signal.storageservice.protos.groups.local.DecryptedRequestingMember; -import org.signal.zkgroup.InvalidInputException; -import org.signal.zkgroup.VerificationFailedException; -import org.signal.zkgroup.groups.ClientZkGroupCipher; -import org.signal.zkgroup.groups.GroupMasterKey; -import org.signal.zkgroup.groups.GroupSecretParams; -import org.signal.zkgroup.groups.UuidCiphertext; -import org.signal.zkgroup.profiles.ProfileKey; -import org.signal.zkgroup.profiles.ProfileKeyCredential; import org.thoughtcrime.securesms.crypto.ProfileKeyUtil; import org.thoughtcrime.securesms.database.GroupDatabase; import org.thoughtcrime.securesms.database.SignalDatabase; diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/GroupProtoUtil.java b/app/src/main/java/org/thoughtcrime/securesms/groups/GroupProtoUtil.java index ef7e631888..b170b1dd0b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/GroupProtoUtil.java +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/GroupProtoUtil.java @@ -8,12 +8,12 @@ import androidx.annotation.WorkerThread; import com.google.protobuf.ByteString; +import org.signal.libsignal.zkgroup.groups.GroupMasterKey; import org.signal.storageservice.protos.groups.GroupChange; import org.signal.storageservice.protos.groups.local.DecryptedGroup; import org.signal.storageservice.protos.groups.local.DecryptedGroupChange; import org.signal.storageservice.protos.groups.local.DecryptedMember; import org.signal.storageservice.protos.groups.local.DecryptedPendingMember; -import org.signal.zkgroup.groups.GroupMasterKey; import org.thoughtcrime.securesms.database.model.databaseprotos.DecryptedGroupV2Context; import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.recipients.RecipientId; diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/GroupsV1MigrationUtil.java b/app/src/main/java/org/thoughtcrime/securesms/groups/GroupsV1MigrationUtil.java index 7d26fdcc2c..8fcd5a6ad6 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/GroupsV1MigrationUtil.java +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/GroupsV1MigrationUtil.java @@ -8,8 +8,8 @@ import androidx.annotation.Nullable; import com.annimon.stream.Stream; import org.signal.core.util.logging.Log; +import org.signal.libsignal.zkgroup.groups.GroupMasterKey; import org.signal.storageservice.protos.groups.local.DecryptedGroup; -import org.signal.zkgroup.groups.GroupMasterKey; import org.thoughtcrime.securesms.database.GroupDatabase; import org.thoughtcrime.securesms.database.RecipientDatabase; import org.thoughtcrime.securesms.database.SignalDatabase; diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/GroupsV2Authorization.java b/app/src/main/java/org/thoughtcrime/securesms/groups/GroupsV2Authorization.java index 89712d5742..ab1b99c62b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/GroupsV2Authorization.java +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/GroupsV2Authorization.java @@ -3,9 +3,9 @@ package org.thoughtcrime.securesms.groups; import androidx.annotation.NonNull; import org.signal.core.util.logging.Log; -import org.signal.zkgroup.VerificationFailedException; -import org.signal.zkgroup.auth.AuthCredentialResponse; -import org.signal.zkgroup.groups.GroupSecretParams; +import org.signal.libsignal.zkgroup.VerificationFailedException; +import org.signal.libsignal.zkgroup.auth.AuthCredentialResponse; +import org.signal.libsignal.zkgroup.groups.GroupSecretParams; import org.whispersystems.signalservice.api.groupsv2.GroupsV2Api; import org.whispersystems.signalservice.api.groupsv2.GroupsV2AuthorizationString; import org.whispersystems.signalservice.api.groupsv2.NoCredentialForRedemptionTimeException; diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/GroupsV2AuthorizationMemoryValueCache.java b/app/src/main/java/org/thoughtcrime/securesms/groups/GroupsV2AuthorizationMemoryValueCache.java index 5d5ebf1a2d..46506418e6 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/GroupsV2AuthorizationMemoryValueCache.java +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/GroupsV2AuthorizationMemoryValueCache.java @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.groups; import androidx.annotation.NonNull; -import org.signal.zkgroup.auth.AuthCredentialResponse; +import org.signal.libsignal.zkgroup.auth.AuthCredentialResponse; import java.util.Collections; import java.util.HashMap; diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/GroupMemberEntry.java b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/GroupMemberEntry.java index 338edfc7b8..e73c0173a6 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/GroupMemberEntry.java +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/GroupMemberEntry.java @@ -4,7 +4,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.lifecycle.LiveData; -import org.signal.zkgroup.groups.UuidCiphertext; +import org.signal.libsignal.zkgroup.groups.UuidCiphertext; import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.util.DefaultValueLiveData; diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/invitesandrequests/invited/PendingMemberInvitesRepository.java b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/invitesandrequests/invited/PendingMemberInvitesRepository.java index d3e794ab25..c2547e6511 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/invitesandrequests/invited/PendingMemberInvitesRepository.java +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/invitesandrequests/invited/PendingMemberInvitesRepository.java @@ -11,10 +11,10 @@ import com.google.protobuf.ByteString; import org.signal.core.util.concurrent.SignalExecutors; import org.signal.core.util.logging.Log; +import org.signal.libsignal.zkgroup.InvalidInputException; +import org.signal.libsignal.zkgroup.groups.UuidCiphertext; import org.signal.storageservice.protos.groups.local.DecryptedGroup; import org.signal.storageservice.protos.groups.local.DecryptedPendingMember; -import org.signal.zkgroup.InvalidInputException; -import org.signal.zkgroup.groups.UuidCiphertext; import org.thoughtcrime.securesms.database.GroupDatabase; import org.thoughtcrime.securesms.database.SignalDatabase; import org.thoughtcrime.securesms.groups.GroupChangeException; diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/invitesandrequests/invited/PendingMemberInvitesViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/invitesandrequests/invited/PendingMemberInvitesViewModel.java index 2ce0294692..6b0cd707a1 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/invitesandrequests/invited/PendingMemberInvitesViewModel.java +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/invitesandrequests/invited/PendingMemberInvitesViewModel.java @@ -8,7 +8,7 @@ import androidx.lifecycle.LiveData; import androidx.lifecycle.ViewModel; import androidx.lifecycle.ViewModelProvider; -import org.signal.zkgroup.groups.UuidCiphertext; +import org.signal.libsignal.zkgroup.groups.UuidCiphertext; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.groups.GroupId; import org.thoughtcrime.securesms.groups.ui.GroupMemberEntry; diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/invitesandrequests/joining/GroupJoinRepository.java b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/invitesandrequests/joining/GroupJoinRepository.java index 528a87ee18..d3761d12e0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/invitesandrequests/joining/GroupJoinRepository.java +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/invitesandrequests/joining/GroupJoinRepository.java @@ -8,8 +8,8 @@ import androidx.annotation.WorkerThread; import org.signal.core.util.concurrent.SignalExecutors; import org.signal.core.util.logging.Log; +import org.signal.libsignal.zkgroup.VerificationFailedException; import org.signal.storageservice.protos.groups.local.DecryptedGroupJoinInfo; -import org.signal.zkgroup.VerificationFailedException; import org.thoughtcrime.securesms.groups.GroupChangeBusyException; import org.thoughtcrime.securesms.groups.GroupChangeFailedException; import org.thoughtcrime.securesms.groups.GroupManager; diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/v2/GroupCandidateHelper.java b/app/src/main/java/org/thoughtcrime/securesms/groups/v2/GroupCandidateHelper.java index 7b29cea3ad..683ded546b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/v2/GroupCandidateHelper.java +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/v2/GroupCandidateHelper.java @@ -6,8 +6,8 @@ import androidx.annotation.NonNull; import androidx.annotation.WorkerThread; import org.signal.core.util.logging.Log; -import org.signal.zkgroup.profiles.ProfileKey; -import org.signal.zkgroup.profiles.ProfileKeyCredential; +import org.signal.libsignal.zkgroup.profiles.ProfileKey; +import org.signal.libsignal.zkgroup.profiles.ProfileKeyCredential; import org.thoughtcrime.securesms.crypto.ProfileKeyUtil; import org.thoughtcrime.securesms.database.RecipientDatabase; import org.thoughtcrime.securesms.database.SignalDatabase; diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/v2/GroupInviteLinkUrl.java b/app/src/main/java/org/thoughtcrime/securesms/groups/v2/GroupInviteLinkUrl.java index 40ee561b9d..8332a96144 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/v2/GroupInviteLinkUrl.java +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/v2/GroupInviteLinkUrl.java @@ -5,10 +5,10 @@ import androidx.annotation.Nullable; import com.google.protobuf.ByteString; +import org.signal.libsignal.zkgroup.InvalidInputException; +import org.signal.libsignal.zkgroup.groups.GroupMasterKey; import org.signal.storageservice.protos.groups.GroupInviteLink; import org.signal.storageservice.protos.groups.local.DecryptedGroup; -import org.signal.zkgroup.InvalidInputException; -import org.signal.zkgroup.groups.GroupMasterKey; import org.whispersystems.util.Base64UrlSafe; import java.io.IOException; diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/v2/ProfileKeySet.java b/app/src/main/java/org/thoughtcrime/securesms/groups/v2/ProfileKeySet.java index a578c876fc..35ac4542ca 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/v2/ProfileKeySet.java +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/v2/ProfileKeySet.java @@ -6,12 +6,12 @@ import androidx.annotation.Nullable; import com.google.protobuf.ByteString; import org.signal.core.util.logging.Log; +import org.signal.libsignal.zkgroup.InvalidInputException; +import org.signal.libsignal.zkgroup.profiles.ProfileKey; import org.signal.storageservice.protos.groups.local.DecryptedGroup; import org.signal.storageservice.protos.groups.local.DecryptedGroupChange; import org.signal.storageservice.protos.groups.local.DecryptedMember; import org.signal.storageservice.protos.groups.local.DecryptedRequestingMember; -import org.signal.zkgroup.InvalidInputException; -import org.signal.zkgroup.profiles.ProfileKey; import org.whispersystems.signalservice.api.push.ServiceId; import org.whispersystems.signalservice.api.util.UuidUtil; diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/v2/processing/GroupsV2StateProcessor.java b/app/src/main/java/org/thoughtcrime/securesms/groups/v2/processing/GroupsV2StateProcessor.java index d3a33cc69f..eff5dd8bf5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/v2/processing/GroupsV2StateProcessor.java +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/v2/processing/GroupsV2StateProcessor.java @@ -11,13 +11,13 @@ import androidx.annotation.WorkerThread; import com.annimon.stream.Stream; import org.signal.core.util.logging.Log; +import org.signal.libsignal.zkgroup.VerificationFailedException; +import org.signal.libsignal.zkgroup.groups.GroupMasterKey; +import org.signal.libsignal.zkgroup.groups.GroupSecretParams; import org.signal.storageservice.protos.groups.local.DecryptedGroup; import org.signal.storageservice.protos.groups.local.DecryptedGroupChange; import org.signal.storageservice.protos.groups.local.DecryptedMember; import org.signal.storageservice.protos.groups.local.DecryptedPendingMember; -import org.signal.zkgroup.VerificationFailedException; -import org.signal.zkgroup.groups.GroupMasterKey; -import org.signal.zkgroup.groups.GroupSecretParams; import org.thoughtcrime.securesms.database.GroupDatabase; import org.thoughtcrime.securesms.database.GroupDatabase.GroupRecord; import org.thoughtcrime.securesms.database.MessageDatabase; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentDownloadJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentDownloadJob.java index 609604036a..829ebfddcb 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentDownloadJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentDownloadJob.java @@ -7,6 +7,7 @@ import androidx.annotation.VisibleForTesting; import org.greenrobot.eventbus.EventBus; import org.signal.core.util.logging.Log; +import org.signal.libsignal.protocol.InvalidMessageException; import org.thoughtcrime.securesms.attachments.Attachment; import org.thoughtcrime.securesms.attachments.AttachmentId; import org.thoughtcrime.securesms.attachments.DatabaseAttachment; @@ -26,7 +27,6 @@ import org.thoughtcrime.securesms.util.AttachmentUtil; import org.thoughtcrime.securesms.util.Base64; import org.signal.core.util.Hex; import org.thoughtcrime.securesms.util.Util; -import org.whispersystems.libsignal.InvalidMessageException; import org.whispersystems.signalservice.api.SignalServiceMessageReceiver; import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentPointer; import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentRemoteId; 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 cf77bc8ea3..221a48da93 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/AvatarGroupsV1DownloadJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/AvatarGroupsV1DownloadJob.java @@ -3,6 +3,7 @@ package org.thoughtcrime.securesms.jobs; import androidx.annotation.NonNull; import org.signal.core.util.logging.Log; +import org.signal.libsignal.protocol.InvalidMessageException; import org.thoughtcrime.securesms.database.GroupDatabase; import org.thoughtcrime.securesms.database.GroupDatabase.GroupRecord; import org.thoughtcrime.securesms.database.SignalDatabase; @@ -13,7 +14,6 @@ import org.thoughtcrime.securesms.jobmanager.Job; import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint; import org.thoughtcrime.securesms.profiles.AvatarHelper; import org.signal.core.util.Hex; -import org.whispersystems.libsignal.InvalidMessageException; import org.whispersystems.signalservice.api.SignalServiceMessageReceiver; import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentPointer; import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentRemoteId; 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 55cdd50078..013b27d186 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/AvatarGroupsV2DownloadJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/AvatarGroupsV2DownloadJob.java @@ -7,8 +7,8 @@ import androidx.annotation.Nullable; import org.signal.core.util.StreamUtil; import org.signal.core.util.logging.Log; -import org.signal.zkgroup.groups.GroupMasterKey; -import org.signal.zkgroup.groups.GroupSecretParams; +import org.signal.libsignal.zkgroup.groups.GroupMasterKey; +import org.signal.libsignal.zkgroup.groups.GroupSecretParams; import org.thoughtcrime.securesms.database.GroupDatabase; import org.thoughtcrime.securesms.database.GroupDatabase.GroupRecord; import org.thoughtcrime.securesms.database.SignalDatabase; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/BoostReceiptRequestResponseJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/BoostReceiptRequestResponseJob.java index 7dfe46ad49..746f5ece94 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/BoostReceiptRequestResponseJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/BoostReceiptRequestResponseJob.java @@ -8,14 +8,14 @@ import androidx.annotation.VisibleForTesting; import org.signal.core.util.logging.Log; import org.signal.donations.StripeApi; -import org.signal.zkgroup.InvalidInputException; -import org.signal.zkgroup.VerificationFailedException; -import org.signal.zkgroup.receipts.ClientZkReceiptOperations; -import org.signal.zkgroup.receipts.ReceiptCredential; -import org.signal.zkgroup.receipts.ReceiptCredentialPresentation; -import org.signal.zkgroup.receipts.ReceiptCredentialRequestContext; -import org.signal.zkgroup.receipts.ReceiptCredentialResponse; -import org.signal.zkgroup.receipts.ReceiptSerial; +import org.signal.libsignal.zkgroup.InvalidInputException; +import org.signal.libsignal.zkgroup.VerificationFailedException; +import org.signal.libsignal.zkgroup.receipts.ClientZkReceiptOperations; +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.libsignal.zkgroup.receipts.ReceiptSerial; import org.thoughtcrime.securesms.components.settings.app.subscription.errors.DonationError; import org.thoughtcrime.securesms.components.settings.app.subscription.errors.DonationErrorSource; import org.thoughtcrime.securesms.dependencies.ApplicationDependencies; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/CleanPreKeysJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/CleanPreKeysJob.java index 520581a3f1..177008d562 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/CleanPreKeysJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/CleanPreKeysJob.java @@ -3,13 +3,13 @@ package org.thoughtcrime.securesms.jobs; import androidx.annotation.NonNull; import org.signal.core.util.logging.Log; +import org.signal.libsignal.protocol.state.SignalProtocolStore; import org.thoughtcrime.securesms.crypto.PreKeyUtil; import org.thoughtcrime.securesms.crypto.storage.PreKeyMetadataStore; import org.thoughtcrime.securesms.dependencies.ApplicationDependencies; import org.thoughtcrime.securesms.jobmanager.Data; import org.thoughtcrime.securesms.jobmanager.Job; import org.thoughtcrime.securesms.keyvalue.SignalStore; -import org.whispersystems.libsignal.state.SignalProtocolStore; /** * Deprecated. Only exists for previously-enqueued jobs. diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/CreateSignedPreKeyJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/CreateSignedPreKeyJob.java index 8bdc67a05d..a0c4d2e711 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/CreateSignedPreKeyJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/CreateSignedPreKeyJob.java @@ -4,6 +4,8 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import org.signal.core.util.logging.Log; +import org.signal.libsignal.protocol.state.SignalProtocolStore; +import org.signal.libsignal.protocol.state.SignedPreKeyRecord; import org.thoughtcrime.securesms.crypto.PreKeyUtil; import org.thoughtcrime.securesms.crypto.storage.PreKeyMetadataStore; import org.thoughtcrime.securesms.dependencies.ApplicationDependencies; @@ -11,8 +13,6 @@ import org.thoughtcrime.securesms.jobmanager.Data; import org.thoughtcrime.securesms.jobmanager.Job; import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint; import org.thoughtcrime.securesms.keyvalue.SignalStore; -import org.whispersystems.libsignal.state.SignalProtocolStore; -import org.whispersystems.libsignal.state.SignedPreKeyRecord; import org.whispersystems.signalservice.api.SignalServiceAccountManager; import org.whispersystems.signalservice.api.push.ServiceId; import org.whispersystems.signalservice.api.push.ServiceIdType; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/DonationReceiptRedemptionJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/DonationReceiptRedemptionJob.java index 04a2c0ad9c..1949e0f57c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/DonationReceiptRedemptionJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/DonationReceiptRedemptionJob.java @@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.jobs; import androidx.annotation.NonNull; import org.signal.core.util.logging.Log; -import org.signal.zkgroup.receipts.ReceiptCredentialPresentation; +import org.signal.libsignal.zkgroup.receipts.ReceiptCredentialPresentation; import org.thoughtcrime.securesms.components.settings.app.subscription.errors.DonationError; import org.thoughtcrime.securesms.components.settings.app.subscription.errors.DonationErrorSource; import org.thoughtcrime.securesms.dependencies.ApplicationDependencies; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MmsReceiveJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MmsReceiveJob.java index d196d7e519..0de143aa7e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MmsReceiveJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MmsReceiveJob.java @@ -8,6 +8,7 @@ import com.google.android.mms.pdu_alt.PduHeaders; import com.google.android.mms.pdu_alt.PduParser; import org.signal.core.util.logging.Log; +import org.signal.libsignal.protocol.util.Pair; import org.thoughtcrime.securesms.database.MessageDatabase; import org.thoughtcrime.securesms.database.SignalDatabase; import org.thoughtcrime.securesms.dependencies.ApplicationDependencies; @@ -16,7 +17,6 @@ import org.thoughtcrime.securesms.jobmanager.Job; import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.util.Base64; import org.thoughtcrime.securesms.util.Util; -import org.whispersystems.libsignal.util.Pair; import java.io.IOException; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceContactSyncJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceContactSyncJob.kt index 0ca9f01c60..37e6f40575 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceContactSyncJob.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceContactSyncJob.kt @@ -1,6 +1,7 @@ package org.thoughtcrime.securesms.jobs import org.signal.core.util.logging.Log +import org.signal.libsignal.protocol.InvalidMessageException import org.thoughtcrime.securesms.database.IdentityDatabase.VerifiedStatus import org.thoughtcrime.securesms.database.SignalDatabase import org.thoughtcrime.securesms.dependencies.ApplicationDependencies @@ -11,7 +12,6 @@ import org.thoughtcrime.securesms.net.NotPushRegisteredException import org.thoughtcrime.securesms.profiles.AvatarHelper import org.thoughtcrime.securesms.providers.BlobProvider import org.thoughtcrime.securesms.recipients.Recipient -import org.whispersystems.libsignal.InvalidMessageException import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentPointer import org.whispersystems.signalservice.api.messages.multidevice.DeviceContact import org.whispersystems.signalservice.api.messages.multidevice.DeviceContactsInputStream 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 a24bf18de2..aef5a109ba 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java @@ -11,7 +11,8 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import org.signal.core.util.logging.Log; -import org.signal.zkgroup.profiles.ProfileKey; +import org.signal.libsignal.protocol.IdentityKey; +import org.signal.libsignal.zkgroup.profiles.ProfileKey; import org.thoughtcrime.securesms.conversation.colors.ChatColorsMapper; import org.thoughtcrime.securesms.crypto.ProfileKeyUtil; import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil; @@ -31,7 +32,6 @@ import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.recipients.RecipientId; import org.thoughtcrime.securesms.recipients.RecipientUtil; import org.thoughtcrime.securesms.util.TextSecurePreferences; -import org.whispersystems.libsignal.IdentityKey; import org.whispersystems.signalservice.api.SignalServiceMessageSender; import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException; import org.whispersystems.signalservice.api.messages.SignalServiceAttachment; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDevicePniIdentityUpdateJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDevicePniIdentityUpdateJob.java index 7c8667d6d8..1ceae16b64 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDevicePniIdentityUpdateJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDevicePniIdentityUpdateJob.java @@ -6,6 +6,7 @@ import androidx.annotation.NonNull; import com.google.protobuf.ByteString; import org.signal.core.util.logging.Log; +import org.signal.libsignal.protocol.IdentityKeyPair; import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil; import org.thoughtcrime.securesms.dependencies.ApplicationDependencies; import org.thoughtcrime.securesms.jobmanager.Data; @@ -15,7 +16,6 @@ import org.thoughtcrime.securesms.keyvalue.SignalStore; import org.thoughtcrime.securesms.net.NotPushRegisteredException; import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.util.TextSecurePreferences; -import org.whispersystems.libsignal.IdentityKeyPair; import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException; import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSyncMessage; import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException; 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 196c883cda..a4cd18ec64 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceProfileKeyUpdateJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceProfileKeyUpdateJob.java @@ -4,7 +4,7 @@ package org.thoughtcrime.securesms.jobs; import androidx.annotation.NonNull; import org.signal.core.util.logging.Log; -import org.signal.zkgroup.profiles.ProfileKey; +import org.signal.libsignal.zkgroup.profiles.ProfileKey; import org.thoughtcrime.securesms.crypto.ProfileKeyUtil; import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil; import org.thoughtcrime.securesms.dependencies.ApplicationDependencies; 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 144586df3e..a75b21f3e1 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceVerifiedUpdateJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceVerifiedUpdateJob.java @@ -4,6 +4,8 @@ package org.thoughtcrime.securesms.jobs; import androidx.annotation.NonNull; import org.signal.core.util.logging.Log; +import org.signal.libsignal.protocol.IdentityKey; +import org.signal.libsignal.protocol.InvalidKeyException; import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil; import org.thoughtcrime.securesms.database.IdentityDatabase.VerifiedStatus; import org.thoughtcrime.securesms.dependencies.ApplicationDependencies; @@ -16,8 +18,6 @@ import org.thoughtcrime.securesms.recipients.RecipientId; import org.thoughtcrime.securesms.recipients.RecipientUtil; import org.thoughtcrime.securesms.util.Base64; import org.thoughtcrime.securesms.util.TextSecurePreferences; -import org.whispersystems.libsignal.IdentityKey; -import org.whispersystems.libsignal.InvalidKeyException; import org.whispersystems.signalservice.api.SignalServiceMessageSender; import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException; import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSyncMessage; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushDecryptMessageJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushDecryptMessageJob.java index 4175f3ec7a..b5f66cf0d5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushDecryptMessageJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushDecryptMessageJob.java @@ -8,6 +8,8 @@ import androidx.core.app.NotificationCompat; import androidx.core.app.NotificationManagerCompat; import org.signal.core.util.logging.Log; +import org.signal.libsignal.protocol.SignalProtocolAddress; +import org.signal.libsignal.protocol.message.SenderKeyDistributionMessage; import org.thoughtcrime.securesms.MainActivity; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.dependencies.ApplicationDependencies; @@ -20,8 +22,6 @@ import org.thoughtcrime.securesms.notifications.NotificationChannels; import org.thoughtcrime.securesms.notifications.NotificationIds; import org.thoughtcrime.securesms.transport.RetryLaterException; import org.thoughtcrime.securesms.util.TextSecurePreferences; -import org.whispersystems.libsignal.SignalProtocolAddress; -import org.whispersystems.libsignal.protocol.SenderKeyDistributionMessage; import org.whispersystems.signalservice.api.SignalServiceMessageSender; import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope; import org.whispersystems.signalservice.api.push.SignalServiceAddress; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java index 7491489d61..c8ecbe50a2 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java @@ -11,6 +11,7 @@ import com.annimon.stream.Stream; import com.google.protobuf.ByteString; import org.signal.core.util.logging.Log; +import org.signal.libsignal.protocol.util.Pair; import org.thoughtcrime.securesms.attachments.Attachment; import org.thoughtcrime.securesms.database.GroupDatabase; import org.thoughtcrime.securesms.database.GroupReceiptDatabase; @@ -46,7 +47,6 @@ import org.thoughtcrime.securesms.util.GroupUtil; import org.thoughtcrime.securesms.util.RecipientAccessList; import org.thoughtcrime.securesms.util.SetUtil; import org.thoughtcrime.securesms.util.SignalLocalMetrics; -import org.whispersystems.libsignal.util.Pair; import org.whispersystems.signalservice.api.crypto.ContentHint; import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException; import org.whispersystems.signalservice.api.messages.SendMessageResult; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshOwnProfileJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshOwnProfileJob.java index e7fb34cb89..30eba1f9e7 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshOwnProfileJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshOwnProfileJob.java @@ -6,8 +6,8 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import org.signal.core.util.logging.Log; -import org.signal.zkgroup.profiles.ProfileKey; -import org.signal.zkgroup.profiles.ProfileKeyCredential; +import org.signal.libsignal.zkgroup.profiles.ProfileKey; +import org.signal.libsignal.zkgroup.profiles.ProfileKeyCredential; import org.thoughtcrime.securesms.badges.BadgeRepository; import org.thoughtcrime.securesms.badges.Badges; import org.thoughtcrime.securesms.badges.models.Badge; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshPreKeysJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshPreKeysJob.java index cd4e18f392..489679ee5d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshPreKeysJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshPreKeysJob.java @@ -3,6 +3,10 @@ package org.thoughtcrime.securesms.jobs; import androidx.annotation.NonNull; import org.signal.core.util.logging.Log; +import org.signal.libsignal.protocol.IdentityKeyPair; +import org.signal.libsignal.protocol.state.PreKeyRecord; +import org.signal.libsignal.protocol.state.SignalProtocolStore; +import org.signal.libsignal.protocol.state.SignedPreKeyRecord; import org.thoughtcrime.securesms.crypto.PreKeyUtil; import org.thoughtcrime.securesms.crypto.storage.PreKeyMetadataStore; import org.thoughtcrime.securesms.dependencies.ApplicationDependencies; @@ -10,10 +14,6 @@ import org.thoughtcrime.securesms.jobmanager.Data; import org.thoughtcrime.securesms.jobmanager.Job; import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint; import org.thoughtcrime.securesms.keyvalue.SignalStore; -import org.whispersystems.libsignal.IdentityKeyPair; -import org.whispersystems.libsignal.state.PreKeyRecord; -import org.whispersystems.libsignal.state.SignalProtocolStore; -import org.whispersystems.libsignal.state.SignedPreKeyRecord; import org.whispersystems.signalservice.api.SignalServiceAccountManager; import org.whispersystems.signalservice.api.push.ServiceIdType; import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException; 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 084e512bff..6e9ec40eee 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/ResendMessageJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/ResendMessageJob.java @@ -8,6 +8,8 @@ import com.google.protobuf.InvalidProtocolBufferException; import org.signal.core.util.ThreadUtil; import org.signal.core.util.logging.Log; +import org.signal.libsignal.protocol.SignalProtocolAddress; +import org.signal.libsignal.protocol.message.SenderKeyDistributionMessage; import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil; import org.thoughtcrime.securesms.database.GroupDatabase.GroupRecord; import org.thoughtcrime.securesms.database.SignalDatabase; @@ -20,8 +22,6 @@ import org.thoughtcrime.securesms.keyvalue.SignalStore; import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.recipients.RecipientId; import org.thoughtcrime.securesms.recipients.RecipientUtil; -import org.whispersystems.libsignal.SignalProtocolAddress; -import org.whispersystems.libsignal.protocol.SenderKeyDistributionMessage; import org.whispersystems.signalservice.api.SignalServiceMessageSender; import org.whispersystems.signalservice.api.crypto.ContentHint; import org.whispersystems.signalservice.api.crypto.UnidentifiedAccessPair; 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 dcadd2272b..730af1697a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java @@ -6,7 +6,7 @@ import android.text.TextUtils; import androidx.annotation.NonNull; import org.signal.core.util.logging.Log; -import org.signal.zkgroup.profiles.ProfileKey; +import org.signal.libsignal.zkgroup.profiles.ProfileKey; import org.thoughtcrime.securesms.crypto.ProfileKeyUtil; import org.thoughtcrime.securesms.database.RecipientDatabase; import org.thoughtcrime.securesms.database.SignalDatabase; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileJob.java index 3e7646f1c5..13f5341753 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileJob.java @@ -14,8 +14,11 @@ import com.annimon.stream.Stream; import org.signal.core.util.ListUtil; import org.signal.core.util.concurrent.SignalExecutors; import org.signal.core.util.logging.Log; -import org.signal.zkgroup.profiles.ProfileKey; -import org.signal.zkgroup.profiles.ProfileKeyCredential; +import org.signal.libsignal.protocol.IdentityKey; +import org.signal.libsignal.protocol.InvalidKeyException; +import org.signal.libsignal.protocol.util.Pair; +import org.signal.libsignal.zkgroup.profiles.ProfileKey; +import org.signal.libsignal.zkgroup.profiles.ProfileKeyCredential; import org.thoughtcrime.securesms.badges.Badges; import org.thoughtcrime.securesms.badges.models.Badge; import org.thoughtcrime.securesms.crypto.ProfileKeyUtil; @@ -40,9 +43,6 @@ import org.thoughtcrime.securesms.util.ProfileUtil; import org.thoughtcrime.securesms.util.SetUtil; import org.thoughtcrime.securesms.util.Stopwatch; import org.thoughtcrime.securesms.util.Util; -import org.whispersystems.libsignal.IdentityKey; -import org.whispersystems.libsignal.InvalidKeyException; -import org.whispersystems.libsignal.util.Pair; import org.whispersystems.signalservice.api.crypto.InvalidCiphertextException; import org.whispersystems.signalservice.api.crypto.ProfileCipher; import org.whispersystems.signalservice.api.profiles.ProfileAndCredential; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/RotateProfileKeyJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/RotateProfileKeyJob.java index 5fa82d793d..68f4d2d4cc 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/RotateProfileKeyJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/RotateProfileKeyJob.java @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.jobs; import androidx.annotation.NonNull; -import org.signal.zkgroup.profiles.ProfileKey; +import org.signal.libsignal.zkgroup.profiles.ProfileKey; import org.thoughtcrime.securesms.crypto.ProfileKeyUtil; import org.thoughtcrime.securesms.database.SignalDatabase; import org.thoughtcrime.securesms.jobmanager.Data; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/RotateSignedPreKeyJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/RotateSignedPreKeyJob.java index 8afa58655f..e1f5f77ffe 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/RotateSignedPreKeyJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/RotateSignedPreKeyJob.java @@ -4,6 +4,8 @@ package org.thoughtcrime.securesms.jobs; import androidx.annotation.NonNull; import org.signal.core.util.logging.Log; +import org.signal.libsignal.protocol.state.SignalProtocolStore; +import org.signal.libsignal.protocol.state.SignedPreKeyRecord; import org.thoughtcrime.securesms.crypto.PreKeyUtil; import org.thoughtcrime.securesms.crypto.storage.PreKeyMetadataStore; import org.thoughtcrime.securesms.dependencies.ApplicationDependencies; @@ -11,8 +13,6 @@ import org.thoughtcrime.securesms.jobmanager.Data; import org.thoughtcrime.securesms.jobmanager.Job; import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint; import org.thoughtcrime.securesms.keyvalue.SignalStore; -import org.whispersystems.libsignal.state.SignalProtocolStore; -import org.whispersystems.libsignal.state.SignedPreKeyRecord; import org.whispersystems.signalservice.api.SignalServiceAccountManager; import org.whispersystems.signalservice.api.push.ACI; import org.whispersystems.signalservice.api.push.PNI; 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 d43cc15267..53cc5b3855 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/SendRetryReceiptJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/SendRetryReceiptJob.java @@ -3,6 +3,8 @@ package org.thoughtcrime.securesms.jobs; import androidx.annotation.NonNull; import org.signal.core.util.logging.Log; +import org.signal.libsignal.protocol.InvalidMessageException; +import org.signal.libsignal.protocol.message.DecryptionErrorMessage; import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil; import org.thoughtcrime.securesms.dependencies.ApplicationDependencies; import org.thoughtcrime.securesms.groups.GroupId; @@ -12,8 +14,6 @@ import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint; import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.recipients.RecipientId; import org.thoughtcrime.securesms.recipients.RecipientUtil; -import org.whispersystems.libsignal.InvalidMessageException; -import org.whispersystems.libsignal.protocol.DecryptionErrorMessage; import org.whispersystems.signalservice.api.crypto.UnidentifiedAccessPair; import org.whispersystems.signalservice.api.push.SignalServiceAddress; import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/SenderKeyDistributionSendJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/SenderKeyDistributionSendJob.java index a9b03573f3..e997a2b6b2 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/SenderKeyDistributionSendJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/SenderKeyDistributionSendJob.java @@ -3,6 +3,8 @@ package org.thoughtcrime.securesms.jobs; import androidx.annotation.NonNull; import org.signal.core.util.logging.Log; +import org.signal.libsignal.protocol.SignalProtocolAddress; +import org.signal.libsignal.protocol.message.SenderKeyDistributionMessage; import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil; import org.thoughtcrime.securesms.database.GroupDatabase; import org.thoughtcrime.securesms.database.SignalDatabase; @@ -14,8 +16,6 @@ import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint; import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.recipients.RecipientId; import org.thoughtcrime.securesms.recipients.RecipientUtil; -import org.whispersystems.libsignal.SignalProtocolAddress; -import org.whispersystems.libsignal.protocol.SenderKeyDistributionMessage; import org.whispersystems.signalservice.api.SignalServiceMessageSender; import org.whispersystems.signalservice.api.crypto.UnidentifiedAccessPair; import org.whispersystems.signalservice.api.messages.SendMessageResult; 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 a80741090b..f1fc4e3f23 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/StickerPackDownloadJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/StickerPackDownloadJob.java @@ -4,6 +4,7 @@ import androidx.annotation.NonNull; import androidx.core.util.Preconditions; import org.signal.core.util.logging.Log; +import org.signal.libsignal.protocol.InvalidMessageException; import org.thoughtcrime.securesms.database.SignalDatabase; import org.thoughtcrime.securesms.database.StickerDatabase; import org.thoughtcrime.securesms.database.model.IncomingSticker; @@ -14,7 +15,6 @@ import org.thoughtcrime.securesms.jobmanager.JobManager; import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint; import org.thoughtcrime.securesms.stickers.BlessedPacks; import org.signal.core.util.Hex; -import org.whispersystems.libsignal.InvalidMessageException; import org.whispersystems.signalservice.api.SignalServiceMessageReceiver; import org.whispersystems.signalservice.api.messages.SignalServiceStickerManifest; import org.whispersystems.signalservice.api.messages.SignalServiceStickerManifest.StickerInfo; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageForcePushJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageForcePushJob.java index 6e19d1e0fe..8809a33c18 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageForcePushJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageForcePushJob.java @@ -5,6 +5,7 @@ import androidx.annotation.NonNull; import com.annimon.stream.Stream; import org.signal.core.util.logging.Log; +import org.signal.libsignal.protocol.InvalidKeyException; import org.thoughtcrime.securesms.database.RecipientDatabase; import org.thoughtcrime.securesms.database.SignalDatabase; import org.thoughtcrime.securesms.database.UnknownStorageIdDatabase; @@ -19,7 +20,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.libsignal.InvalidKeyException; import org.whispersystems.signalservice.api.SignalServiceAccountManager; import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException; import org.whispersystems.signalservice.api.storage.SignalStorageManifest; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageSyncJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageSyncJob.java index 5764cee66b..b46075418f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageSyncJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageSyncJob.java @@ -9,6 +9,7 @@ import com.annimon.stream.Stream; import net.zetetic.database.sqlcipher.SQLiteDatabase; import org.signal.core.util.logging.Log; +import org.signal.libsignal.protocol.InvalidKeyException; import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil; import org.thoughtcrime.securesms.database.RecipientDatabase; import org.thoughtcrime.securesms.database.SignalDatabase; @@ -35,7 +36,6 @@ import org.thoughtcrime.securesms.transport.RetryLaterException; import org.thoughtcrime.securesms.util.Stopwatch; import org.thoughtcrime.securesms.util.TextSecurePreferences; import org.thoughtcrime.securesms.util.Util; -import org.whispersystems.libsignal.InvalidKeyException; import org.whispersystems.signalservice.api.SignalServiceAccountManager; import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException; import org.whispersystems.signalservice.api.messages.multidevice.RequestMessage; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/SubscriptionReceiptRequestResponseJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/SubscriptionReceiptRequestResponseJob.java index 0ac3931ad1..47631571cf 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/SubscriptionReceiptRequestResponseJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/SubscriptionReceiptRequestResponseJob.java @@ -5,14 +5,14 @@ import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; import org.signal.core.util.logging.Log; -import org.signal.zkgroup.InvalidInputException; -import org.signal.zkgroup.VerificationFailedException; -import org.signal.zkgroup.receipts.ClientZkReceiptOperations; -import org.signal.zkgroup.receipts.ReceiptCredential; -import org.signal.zkgroup.receipts.ReceiptCredentialPresentation; -import org.signal.zkgroup.receipts.ReceiptCredentialRequestContext; -import org.signal.zkgroup.receipts.ReceiptCredentialResponse; -import org.signal.zkgroup.receipts.ReceiptSerial; +import org.signal.libsignal.zkgroup.InvalidInputException; +import org.signal.libsignal.zkgroup.VerificationFailedException; +import org.signal.libsignal.zkgroup.receipts.ClientZkReceiptOperations; +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.libsignal.zkgroup.receipts.ReceiptSerial; import org.thoughtcrime.securesms.components.settings.app.subscription.errors.DonationError; import org.thoughtcrime.securesms.components.settings.app.subscription.errors.DonationErrorSource; import org.thoughtcrime.securesms.database.SignalDatabase; diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyboard/sticker/StickerKeyboardPageFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/keyboard/sticker/StickerKeyboardPageFragment.kt index e5f516728c..ee31689e9a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/keyboard/sticker/StickerKeyboardPageFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/keyboard/sticker/StickerKeyboardPageFragment.kt @@ -10,6 +10,7 @@ import androidx.recyclerview.widget.LinearSmoothScroller import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView.SmoothScroller import com.google.android.material.appbar.AppBarLayout +import org.signal.libsignal.protocol.util.Pair import org.thoughtcrime.securesms.LoggingFragment import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.database.DatabaseObserver @@ -26,7 +27,6 @@ import org.thoughtcrime.securesms.util.adapter.mapping.MappingModel import org.thoughtcrime.securesms.util.adapter.mapping.MappingModelList import org.thoughtcrime.securesms.util.fragments.findListener import org.thoughtcrime.securesms.util.fragments.requireListener -import org.whispersystems.libsignal.util.Pair import java.util.Optional import kotlin.math.abs import kotlin.math.max diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/AccountValues.kt b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/AccountValues.kt index 3455c07852..7cc436dfc9 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/AccountValues.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/AccountValues.kt @@ -5,6 +5,10 @@ import android.content.SharedPreferences import android.preference.PreferenceManager import androidx.annotation.VisibleForTesting import org.signal.core.util.logging.Log +import org.signal.libsignal.protocol.IdentityKey +import org.signal.libsignal.protocol.IdentityKeyPair +import org.signal.libsignal.protocol.ecc.Curve +import org.signal.libsignal.protocol.util.Medium import org.thoughtcrime.securesms.crypto.IdentityKeyUtil import org.thoughtcrime.securesms.crypto.MasterCipher import org.thoughtcrime.securesms.crypto.ProfileKeyUtil @@ -16,10 +20,6 @@ import org.thoughtcrime.securesms.service.KeyCachingService import org.thoughtcrime.securesms.util.Base64 import org.thoughtcrime.securesms.util.TextSecurePreferences import org.thoughtcrime.securesms.util.Util -import org.whispersystems.libsignal.IdentityKey -import org.whispersystems.libsignal.IdentityKeyPair -import org.whispersystems.libsignal.ecc.Curve -import org.whispersystems.libsignal.util.Medium import org.whispersystems.signalservice.api.push.ACI import org.whispersystems.signalservice.api.push.PNI import org.whispersystems.signalservice.api.push.SignalServiceAddress diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/GroupsV2AuthorizationSignalStoreCache.java b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/GroupsV2AuthorizationSignalStoreCache.java index 88ccd44b6b..4cd616b8d2 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/GroupsV2AuthorizationSignalStoreCache.java +++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/GroupsV2AuthorizationSignalStoreCache.java @@ -6,8 +6,8 @@ import com.google.protobuf.ByteString; import com.google.protobuf.InvalidProtocolBufferException; import org.signal.core.util.logging.Log; -import org.signal.zkgroup.InvalidInputException; -import org.signal.zkgroup.auth.AuthCredentialResponse; +import org.signal.libsignal.zkgroup.InvalidInputException; +import org.signal.libsignal.zkgroup.auth.AuthCredentialResponse; import org.thoughtcrime.securesms.database.model.databaseprotos.TemporalAuthCredentialResponse; import org.thoughtcrime.securesms.database.model.databaseprotos.TemporalAuthCredentialResponses; import org.thoughtcrime.securesms.groups.GroupsV2Authorization; diff --git a/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewRepository.java b/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewRepository.java index 7efe1475bb..6be0154847 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewRepository.java +++ b/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewRepository.java @@ -13,9 +13,11 @@ import com.bumptech.glide.load.engine.DiskCacheStrategy; import org.signal.core.util.concurrent.SignalExecutors; import org.signal.core.util.logging.Log; +import org.signal.libsignal.protocol.InvalidMessageException; +import org.signal.libsignal.protocol.util.Pair; +import org.signal.libsignal.zkgroup.VerificationFailedException; +import org.signal.libsignal.zkgroup.groups.GroupMasterKey; import org.signal.storageservice.protos.groups.local.DecryptedGroupJoinInfo; -import org.signal.zkgroup.VerificationFailedException; -import org.signal.zkgroup.groups.GroupMasterKey; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.attachments.Attachment; import org.thoughtcrime.securesms.attachments.UriAttachment; @@ -44,8 +46,6 @@ import org.thoughtcrime.securesms.util.ByteUnit; import org.signal.core.util.Hex; import org.thoughtcrime.securesms.util.MediaUtil; import org.thoughtcrime.securesms.util.OkHttpUtil; -import org.whispersystems.libsignal.InvalidMessageException; -import org.whispersystems.libsignal.util.Pair; import org.whispersystems.signalservice.api.SignalServiceMessageReceiver; import org.whispersystems.signalservice.api.groupsv2.GroupLinkNotActiveException; import org.whispersystems.signalservice.api.messages.SignalServiceStickerManifest; diff --git a/app/src/main/java/org/thoughtcrime/securesms/lock/v2/ConfirmKbsPinRepository.java b/app/src/main/java/org/thoughtcrime/securesms/lock/v2/ConfirmKbsPinRepository.java index b2d14b6eb3..7cd417b353 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/lock/v2/ConfirmKbsPinRepository.java +++ b/app/src/main/java/org/thoughtcrime/securesms/lock/v2/ConfirmKbsPinRepository.java @@ -6,10 +6,10 @@ import androidx.annotation.NonNull; import androidx.core.util.Consumer; import org.signal.core.util.logging.Log; +import org.signal.libsignal.protocol.InvalidKeyException; import org.thoughtcrime.securesms.dependencies.ApplicationDependencies; import org.thoughtcrime.securesms.pin.PinState; import org.thoughtcrime.securesms.util.concurrent.SimpleTask; -import org.whispersystems.libsignal.InvalidKeyException; import org.whispersystems.signalservice.internal.contacts.crypto.UnauthenticatedResponseException; import java.io.IOException; diff --git a/app/src/main/java/org/thoughtcrime/securesms/logging/CustomSignalProtocolLogger.java b/app/src/main/java/org/thoughtcrime/securesms/logging/CustomSignalProtocolLogger.java index e8296ea660..a9d0222ae9 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/logging/CustomSignalProtocolLogger.java +++ b/app/src/main/java/org/thoughtcrime/securesms/logging/CustomSignalProtocolLogger.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.logging; import org.signal.core.util.logging.Log; -import org.whispersystems.libsignal.logging.SignalProtocolLogger; +import org.signal.libsignal.protocol.logging.SignalProtocolLogger; public class CustomSignalProtocolLogger implements SignalProtocolLogger { @Override diff --git a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionPermissions.java b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionPermissions.java index e147f793cc..61ef5e305d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionPermissions.java +++ b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionPermissions.java @@ -6,8 +6,8 @@ import android.content.pm.PackageManager; import androidx.annotation.NonNull; +import org.signal.libsignal.protocol.util.Pair; import org.thoughtcrime.securesms.BuildConfig; -import org.whispersystems.libsignal.util.Pair; import java.util.ArrayList; import java.util.Collections; diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaGalleryAllAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaGalleryAllAdapter.java index 157b758e57..0e26d78512 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaGalleryAllAdapter.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaGalleryAllAdapter.java @@ -34,6 +34,7 @@ import com.annimon.stream.Collectors; import com.annimon.stream.Stream; import com.codewaves.stickyheadergrid.StickyHeaderGridAdapter; +import org.signal.libsignal.protocol.util.Pair; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.attachments.AttachmentId; import org.thoughtcrime.securesms.components.AudioView; @@ -51,7 +52,6 @@ import org.thoughtcrime.securesms.util.DateUtils; import org.thoughtcrime.securesms.util.MediaUtil; import org.thoughtcrime.securesms.util.Util; import org.thoughtcrime.securesms.util.livedata.LiveDataPair; -import org.whispersystems.libsignal.util.Pair; import java.util.Collection; import java.util.HashMap; diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaOverviewActivity.java b/app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaOverviewActivity.java index 6167f32b13..7f962b36d2 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaOverviewActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaOverviewActivity.java @@ -35,6 +35,7 @@ import androidx.viewpager.widget.ViewPager; import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.google.android.material.tabs.TabLayout; +import org.signal.libsignal.protocol.util.Pair; import org.thoughtcrime.securesms.PassphraseRequiredActivity; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.components.AnimatingToggle; @@ -47,7 +48,6 @@ import org.thoughtcrime.securesms.database.loaders.MediaLoader; import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme; import org.thoughtcrime.securesms.util.DynamicTheme; import org.thoughtcrime.securesms.util.concurrent.SimpleTask; -import org.whispersystems.libsignal.util.Pair; import java.util.ArrayList; import java.util.List; 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 9b9a0a7213..1d92c9596a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/messages/GroupSendUtil.java +++ b/app/src/main/java/org/thoughtcrime/securesms/messages/GroupSendUtil.java @@ -7,6 +7,9 @@ import androidx.annotation.Nullable; import androidx.annotation.WorkerThread; import org.signal.core.util.logging.Log; +import org.signal.libsignal.protocol.InvalidKeyException; +import org.signal.libsignal.protocol.InvalidRegistrationIdException; +import org.signal.libsignal.protocol.NoSessionException; import org.thoughtcrime.securesms.crypto.SenderKeyUtil; import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil; import org.thoughtcrime.securesms.database.GroupDatabase.GroupRecord; @@ -24,9 +27,6 @@ import org.thoughtcrime.securesms.util.FeatureFlags; import org.thoughtcrime.securesms.util.RecipientAccessList; import org.thoughtcrime.securesms.util.SignalLocalMetrics; import org.thoughtcrime.securesms.util.TextSecurePreferences; -import org.whispersystems.libsignal.InvalidKeyException; -import org.whispersystems.libsignal.InvalidRegistrationIdException; -import org.whispersystems.libsignal.NoSessionException; import org.whispersystems.signalservice.api.CancelationException; import org.whispersystems.signalservice.api.SignalServiceMessageSender; import org.whispersystems.signalservice.api.SignalServiceMessageSender.LegacyGroupEvents; diff --git a/app/src/main/java/org/thoughtcrime/securesms/messages/MessageContentProcessor.java b/app/src/main/java/org/thoughtcrime/securesms/messages/MessageContentProcessor.java index 8b869e7a59..dd0718a1c2 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/messages/MessageContentProcessor.java +++ b/app/src/main/java/org/thoughtcrime/securesms/messages/MessageContentProcessor.java @@ -13,8 +13,12 @@ import com.annimon.stream.Stream; import com.mobilecoin.lib.exceptions.SerializationException; import org.signal.core.util.logging.Log; +import org.signal.libsignal.protocol.SignalProtocolAddress; +import org.signal.libsignal.protocol.ecc.ECPublicKey; +import org.signal.libsignal.protocol.message.DecryptionErrorMessage; +import org.signal.libsignal.protocol.state.SessionRecord; +import org.signal.libsignal.zkgroup.profiles.ProfileKey; import org.signal.ringrtc.CallId; -import org.signal.zkgroup.profiles.ProfileKey; import org.thoughtcrime.securesms.attachments.Attachment; import org.thoughtcrime.securesms.attachments.DatabaseAttachment; import org.thoughtcrime.securesms.attachments.PointerAttachment; @@ -128,10 +132,6 @@ import org.thoughtcrime.securesms.util.MediaUtil; import org.thoughtcrime.securesms.util.RemoteDeleteUtil; import org.thoughtcrime.securesms.util.TextSecurePreferences; import org.thoughtcrime.securesms.util.Util; -import org.whispersystems.libsignal.SignalProtocolAddress; -import org.whispersystems.libsignal.ecc.ECPublicKey; -import org.whispersystems.libsignal.protocol.DecryptionErrorMessage; -import org.whispersystems.libsignal.state.SessionRecord; import org.whispersystems.signalservice.api.messages.SignalServiceAttachment; import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentPointer; import org.whispersystems.signalservice.api.messages.SignalServiceContent; @@ -1861,8 +1861,8 @@ public final class MessageContentProcessor { } } - List> unidentifiedStatus = Stream.of(members) - .map(m -> new org.whispersystems.libsignal.util.Pair<>(m.getId(), message.isUnidentified(m.requireServiceId().toString()))) + List> unidentifiedStatus = Stream.of(members) + .map(m -> new org.signal.libsignal.protocol.util.Pair<>(m.getId(), message.isUnidentified(m.requireServiceId().toString()))) .toList(); receiptDatabase.setUnidentified(unidentifiedStatus, messageId); } diff --git a/app/src/main/java/org/thoughtcrime/securesms/messages/MessageDecryptionUtil.java b/app/src/main/java/org/thoughtcrime/securesms/messages/MessageDecryptionUtil.java index cc06be759f..484a3a4b53 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/messages/MessageDecryptionUtil.java +++ b/app/src/main/java/org/thoughtcrime/securesms/messages/MessageDecryptionUtil.java @@ -22,6 +22,8 @@ import org.signal.libsignal.metadata.ProtocolLegacyMessageException; import org.signal.libsignal.metadata.ProtocolNoSessionException; import org.signal.libsignal.metadata.ProtocolUntrustedIdentityException; import org.signal.libsignal.metadata.SelfSendException; +import org.signal.libsignal.protocol.message.CiphertextMessage; +import org.signal.libsignal.protocol.message.DecryptionErrorMessage; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.crypto.ReentrantSessionLock; import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil; @@ -42,8 +44,6 @@ import org.thoughtcrime.securesms.notifications.NotificationIds; import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.util.FeatureFlags; import org.thoughtcrime.securesms.util.GroupUtil; -import org.whispersystems.libsignal.protocol.CiphertextMessage; -import org.whispersystems.libsignal.protocol.DecryptionErrorMessage; import org.whispersystems.signalservice.api.InvalidMessageStructureException; import org.whispersystems.signalservice.api.SignalServiceAccountDataStore; import org.whispersystems.signalservice.api.crypto.ContentHint; diff --git a/app/src/main/java/org/thoughtcrime/securesms/migrations/PniAccountInitializationMigrationJob.java b/app/src/main/java/org/thoughtcrime/securesms/migrations/PniAccountInitializationMigrationJob.java index 0d4a070c2b..e02a6a37d8 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/migrations/PniAccountInitializationMigrationJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/migrations/PniAccountInitializationMigrationJob.java @@ -3,6 +3,9 @@ package org.thoughtcrime.securesms.migrations; import androidx.annotation.NonNull; import org.signal.core.util.logging.Log; +import org.signal.libsignal.protocol.state.PreKeyRecord; +import org.signal.libsignal.protocol.state.SignalProtocolStore; +import org.signal.libsignal.protocol.state.SignedPreKeyRecord; import org.thoughtcrime.securesms.crypto.PreKeyUtil; import org.thoughtcrime.securesms.crypto.storage.PreKeyMetadataStore; import org.thoughtcrime.securesms.dependencies.ApplicationDependencies; @@ -11,9 +14,6 @@ import org.thoughtcrime.securesms.jobmanager.Job; import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint; import org.thoughtcrime.securesms.keyvalue.SignalStore; import org.thoughtcrime.securesms.recipients.Recipient; -import org.whispersystems.libsignal.state.PreKeyRecord; -import org.whispersystems.libsignal.state.SignalProtocolStore; -import org.whispersystems.libsignal.state.SignedPreKeyRecord; import org.whispersystems.signalservice.api.SignalServiceAccountManager; import org.whispersystems.signalservice.api.push.PNI; import org.whispersystems.signalservice.api.push.ServiceIdType; diff --git a/app/src/main/java/org/thoughtcrime/securesms/migrations/RegistrationPinV2MigrationJob.java b/app/src/main/java/org/thoughtcrime/securesms/migrations/RegistrationPinV2MigrationJob.java index 2ceceef381..a030579f67 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/migrations/RegistrationPinV2MigrationJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/migrations/RegistrationPinV2MigrationJob.java @@ -5,13 +5,13 @@ import android.text.TextUtils; import androidx.annotation.NonNull; import org.signal.core.util.logging.Log; +import org.signal.libsignal.protocol.InvalidKeyException; import org.thoughtcrime.securesms.jobmanager.Data; import org.thoughtcrime.securesms.jobmanager.Job; import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint; import org.thoughtcrime.securesms.jobs.BaseJob; import org.thoughtcrime.securesms.pin.PinState; import org.thoughtcrime.securesms.util.TextSecurePreferences; -import org.whispersystems.libsignal.InvalidKeyException; import org.whispersystems.signalservice.internal.contacts.crypto.UnauthenticatedResponseException; import java.io.IOException; diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentStreamLocalUriFetcher.java b/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentStreamLocalUriFetcher.java index 2ea8381fa3..049760c631 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentStreamLocalUriFetcher.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentStreamLocalUriFetcher.java @@ -7,7 +7,7 @@ import com.bumptech.glide.load.DataSource; import com.bumptech.glide.load.data.DataFetcher; import org.signal.core.util.logging.Log; -import org.whispersystems.libsignal.InvalidMessageException; +import org.signal.libsignal.protocol.InvalidMessageException; import org.whispersystems.signalservice.api.crypto.AttachmentCipherInputStream; import java.io.File; diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/MessageGroupContext.java b/app/src/main/java/org/thoughtcrime/securesms/mms/MessageGroupContext.java index 786888073a..cb21798aa3 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mms/MessageGroupContext.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mms/MessageGroupContext.java @@ -5,11 +5,11 @@ import androidx.annotation.Nullable; import com.annimon.stream.Stream; +import org.signal.libsignal.zkgroup.InvalidInputException; +import org.signal.libsignal.zkgroup.groups.GroupMasterKey; import org.signal.storageservice.protos.groups.local.DecryptedGroup; import org.signal.storageservice.protos.groups.local.DecryptedGroupChange; import org.signal.storageservice.protos.groups.local.DecryptedMember; -import org.signal.zkgroup.InvalidInputException; -import org.signal.zkgroup.groups.GroupMasterKey; import org.thoughtcrime.securesms.database.model.databaseprotos.DecryptedGroupV2Context; import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.recipients.RecipientId; diff --git a/app/src/main/java/org/thoughtcrime/securesms/net/ChunkedDataFetcher.java b/app/src/main/java/org/thoughtcrime/securesms/net/ChunkedDataFetcher.java index 8ff89c7f83..da25312ad1 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/net/ChunkedDataFetcher.java +++ b/app/src/main/java/org/thoughtcrime/securesms/net/ChunkedDataFetcher.java @@ -9,8 +9,8 @@ import com.bumptech.glide.util.ContentLengthInputStream; import org.signal.core.util.concurrent.SignalExecutors; import org.signal.core.util.logging.Log; +import org.signal.libsignal.protocol.util.Pair; import org.thoughtcrime.securesms.util.Util; -import org.whispersystems.libsignal.util.Pair; import java.io.FilterInputStream; import java.io.IOException; diff --git a/app/src/main/java/org/thoughtcrime/securesms/payments/MobileCoinPublicAddressProfileUtil.java b/app/src/main/java/org/thoughtcrime/securesms/payments/MobileCoinPublicAddressProfileUtil.java index 22f04accd1..26813318a7 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/payments/MobileCoinPublicAddressProfileUtil.java +++ b/app/src/main/java/org/thoughtcrime/securesms/payments/MobileCoinPublicAddressProfileUtil.java @@ -4,8 +4,8 @@ import androidx.annotation.NonNull; import com.google.protobuf.ByteString; -import org.whispersystems.libsignal.IdentityKey; -import org.whispersystems.libsignal.IdentityKeyPair; +import org.signal.libsignal.protocol.IdentityKey; +import org.signal.libsignal.protocol.IdentityKeyPair; import org.whispersystems.signalservice.internal.push.SignalServiceProtos; public final class MobileCoinPublicAddressProfileUtil { diff --git a/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/SetCurrencyViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/SetCurrencyViewModel.java index 82a3acbabd..4eb194d7c4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/SetCurrencyViewModel.java +++ b/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/SetCurrencyViewModel.java @@ -10,6 +10,7 @@ import androidx.lifecycle.ViewModelProvider; import com.annimon.stream.Stream; import org.signal.core.util.logging.Log; +import org.signal.libsignal.protocol.util.Pair; import org.thoughtcrime.securesms.BuildConfig; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.components.settings.SettingHeader; @@ -24,7 +25,6 @@ import org.thoughtcrime.securesms.util.AsynchronousCallback; import org.thoughtcrime.securesms.util.SetUtil; import org.thoughtcrime.securesms.util.adapter.mapping.MappingModelList; import org.thoughtcrime.securesms.util.livedata.Store; -import org.whispersystems.libsignal.util.Pair; import java.util.Collection; import java.util.Currency; diff --git a/app/src/main/java/org/thoughtcrime/securesms/phonenumbers/PhoneNumberFormatter.java b/app/src/main/java/org/thoughtcrime/securesms/phonenumbers/PhoneNumberFormatter.java index 0c58979180..183268413c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/phonenumbers/PhoneNumberFormatter.java +++ b/app/src/main/java/org/thoughtcrime/securesms/phonenumbers/PhoneNumberFormatter.java @@ -11,13 +11,13 @@ import com.google.i18n.phonenumbers.Phonenumber; import com.google.i18n.phonenumbers.ShortNumberInfo; import org.signal.core.util.logging.Log; +import org.signal.libsignal.protocol.util.Pair; import org.thoughtcrime.securesms.dependencies.ApplicationDependencies; import org.thoughtcrime.securesms.groups.GroupId; import org.thoughtcrime.securesms.keyvalue.SignalStore; import org.thoughtcrime.securesms.util.SetUtil; import org.thoughtcrime.securesms.util.StringUtil; import org.thoughtcrime.securesms.util.Util; -import org.whispersystems.libsignal.util.Pair; import java.util.Optional; import java.util.Set; diff --git a/app/src/main/java/org/thoughtcrime/securesms/pin/KbsRepository.java b/app/src/main/java/org/thoughtcrime/securesms/pin/KbsRepository.java index 8887ce2b69..1fa6e836d4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/pin/KbsRepository.java +++ b/app/src/main/java/org/thoughtcrime/securesms/pin/KbsRepository.java @@ -5,10 +5,10 @@ import androidx.annotation.Nullable; import org.signal.core.util.concurrent.SignalExecutors; import org.signal.core.util.logging.Log; +import org.signal.libsignal.protocol.InvalidKeyException; import org.thoughtcrime.securesms.KbsEnclave; import org.thoughtcrime.securesms.dependencies.ApplicationDependencies; import org.thoughtcrime.securesms.lock.PinHashing; -import org.whispersystems.libsignal.InvalidKeyException; import org.whispersystems.signalservice.api.KbsPinData; import org.whispersystems.signalservice.api.KeyBackupService; import org.whispersystems.signalservice.api.KeyBackupServicePinException; diff --git a/app/src/main/java/org/thoughtcrime/securesms/pin/PinState.java b/app/src/main/java/org/thoughtcrime/securesms/pin/PinState.java index b0f15e447d..506c75331f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/pin/PinState.java +++ b/app/src/main/java/org/thoughtcrime/securesms/pin/PinState.java @@ -7,6 +7,7 @@ import androidx.annotation.Nullable; import androidx.annotation.WorkerThread; import org.signal.core.util.logging.Log; +import org.signal.libsignal.protocol.InvalidKeyException; import org.thoughtcrime.securesms.KbsEnclave; import org.thoughtcrime.securesms.dependencies.ApplicationDependencies; import org.thoughtcrime.securesms.jobmanager.JobTracker; @@ -20,7 +21,6 @@ import org.thoughtcrime.securesms.lock.RegistrationLockReminders; import org.thoughtcrime.securesms.lock.v2.PinKeyboardType; import org.thoughtcrime.securesms.megaphone.Megaphones; import org.thoughtcrime.securesms.util.TextSecurePreferences; -import org.whispersystems.libsignal.InvalidKeyException; import org.whispersystems.signalservice.api.KbsPinData; import org.whispersystems.signalservice.api.KeyBackupService; import org.whispersystems.signalservice.api.kbs.HashedPin; diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java b/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java index b63beb57e2..30c69fdd8e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java +++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java @@ -13,7 +13,7 @@ import androidx.annotation.WorkerThread; import com.annimon.stream.Stream; import org.signal.core.util.logging.Log; -import org.signal.zkgroup.profiles.ProfileKeyCredential; +import org.signal.libsignal.zkgroup.profiles.ProfileKeyCredential; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.badges.models.Badge; import org.thoughtcrime.securesms.contacts.avatars.ContactPhoto; diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/RecipientDetails.java b/app/src/main/java/org/thoughtcrime/securesms/recipients/RecipientDetails.java index 4da5656525..a4f4297144 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/recipients/RecipientDetails.java +++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/RecipientDetails.java @@ -6,7 +6,7 @@ import android.net.Uri; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import org.signal.zkgroup.profiles.ProfileKeyCredential; +import org.signal.libsignal.zkgroup.profiles.ProfileKeyCredential; import org.thoughtcrime.securesms.badges.models.Badge; import org.thoughtcrime.securesms.conversation.colors.AvatarColor; import org.thoughtcrime.securesms.conversation.colors.ChatColors; diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/bottomsheet/RecipientDialogViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/bottomsheet/RecipientDialogViewModel.java index 99a3d3c5db..e1537287d4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/bottomsheet/RecipientDialogViewModel.java +++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/bottomsheet/RecipientDialogViewModel.java @@ -17,6 +17,7 @@ import androidx.lifecycle.ViewModelProvider; import com.google.android.material.dialog.MaterialAlertDialogBuilder; import org.signal.core.util.ThreadUtil; +import org.signal.libsignal.protocol.util.Pair; import org.thoughtcrime.securesms.BlockUnblockDialog; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.components.settings.conversation.ConversationSettingsActivity; @@ -34,7 +35,6 @@ import org.thoughtcrime.securesms.recipients.RecipientUtil; import org.thoughtcrime.securesms.util.CommunicationActions; import org.thoughtcrime.securesms.util.livedata.LiveDataUtil; import org.thoughtcrime.securesms.verify.VerifyIdentityActivity; -import org.whispersystems.libsignal.util.Pair; import java.util.Objects; diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/RegistrationData.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/RegistrationData.kt index 313c6330e1..fc7e804053 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registration/RegistrationData.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/registration/RegistrationData.kt @@ -1,6 +1,6 @@ package org.thoughtcrime.securesms.registration -import org.signal.zkgroup.profiles.ProfileKey +import org.signal.libsignal.zkgroup.profiles.ProfileKey data class RegistrationData( val code: String, diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/RegistrationRepository.java b/app/src/main/java/org/thoughtcrime/securesms/registration/RegistrationRepository.java index a0c9e60a15..60af7d7a10 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registration/RegistrationRepository.java +++ b/app/src/main/java/org/thoughtcrime/securesms/registration/RegistrationRepository.java @@ -7,7 +7,11 @@ import androidx.annotation.Nullable; import androidx.annotation.WorkerThread; import org.signal.core.util.logging.Log; -import org.signal.zkgroup.profiles.ProfileKey; +import org.signal.libsignal.protocol.state.PreKeyRecord; +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.zkgroup.profiles.ProfileKey; import org.thoughtcrime.securesms.crypto.PreKeyUtil; import org.thoughtcrime.securesms.crypto.ProfileKeyUtil; import org.thoughtcrime.securesms.crypto.SenderKeyUtil; @@ -29,10 +33,6 @@ import org.thoughtcrime.securesms.registration.VerifyAccountRepository.VerifyAcc import org.thoughtcrime.securesms.service.DirectoryRefreshListener; import org.thoughtcrime.securesms.service.RotateSignedPreKeyListener; import org.thoughtcrime.securesms.util.TextSecurePreferences; -import org.whispersystems.libsignal.state.PreKeyRecord; -import org.whispersystems.libsignal.state.SignalProtocolStore; -import org.whispersystems.libsignal.state.SignedPreKeyRecord; -import org.whispersystems.libsignal.util.KeyHelper; import org.whispersystems.signalservice.api.KbsPinData; import org.whispersystems.signalservice.api.SignalServiceAccountManager; import org.whispersystems.signalservice.api.push.ACI; diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/secondary/DeviceNameCipher.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/secondary/DeviceNameCipher.kt index 68a897fe50..e9d5db0237 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registration/secondary/DeviceNameCipher.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/registration/secondary/DeviceNameCipher.kt @@ -1,10 +1,10 @@ package org.thoughtcrime.securesms.registration.secondary import com.google.protobuf.ByteString +import org.signal.libsignal.protocol.IdentityKeyPair +import org.signal.libsignal.protocol.ecc.Curve +import org.signal.libsignal.protocol.ecc.ECKeyPair import org.thoughtcrime.securesms.devicelist.DeviceNameProtos -import org.whispersystems.libsignal.IdentityKeyPair -import org.whispersystems.libsignal.ecc.Curve -import org.whispersystems.libsignal.ecc.ECKeyPair import java.nio.charset.Charset import javax.crypto.Cipher import javax.crypto.Mac diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/secondary/SecondaryProvisioningCipher.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/secondary/SecondaryProvisioningCipher.kt index 0947d5dd92..09fc09ba6a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registration/secondary/SecondaryProvisioningCipher.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/registration/secondary/SecondaryProvisioningCipher.kt @@ -1,12 +1,12 @@ package org.thoughtcrime.securesms.registration.secondary -import org.signal.zkgroup.profiles.ProfileKey +import org.signal.libsignal.protocol.IdentityKey +import org.signal.libsignal.protocol.IdentityKeyPair +import org.signal.libsignal.protocol.ecc.Curve +import org.signal.libsignal.protocol.ecc.ECPublicKey +import org.signal.libsignal.protocol.kdf.HKDF +import org.signal.libsignal.zkgroup.profiles.ProfileKey import org.thoughtcrime.securesms.crypto.IdentityKeyUtil -import org.whispersystems.libsignal.IdentityKey -import org.whispersystems.libsignal.IdentityKeyPair -import org.whispersystems.libsignal.ecc.Curve -import org.whispersystems.libsignal.ecc.ECPublicKey -import org.whispersystems.libsignal.kdf.HKDF import org.whispersystems.signalservice.api.util.UuidUtil import org.whispersystems.signalservice.internal.crypto.PrimaryProvisioningCipher import org.whispersystems.signalservice.internal.push.ProvisioningProtos diff --git a/app/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorFragment.java b/app/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorFragment.java index 9f1ca89314..349ca8e525 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorFragment.java @@ -41,6 +41,7 @@ import org.signal.imageeditor.core.model.EditorModel; import org.signal.imageeditor.core.renderers.BezierDrawingRenderer; import org.signal.imageeditor.core.renderers.FaceBlurRenderer; import org.signal.imageeditor.core.renderers.MultiLineTextRenderer; +import org.signal.libsignal.protocol.util.Pair; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.animation.ResizeAnimation; import org.thoughtcrime.securesms.dependencies.ApplicationDependencies; @@ -62,7 +63,6 @@ import org.thoughtcrime.securesms.util.ThrottledDebouncer; import org.thoughtcrime.securesms.util.ViewUtil; import org.thoughtcrime.securesms.util.concurrent.SimpleTask; import org.thoughtcrime.securesms.util.views.SimpleProgressDialog; -import org.whispersystems.libsignal.util.Pair; import java.io.ByteArrayOutputStream; import java.util.Collections; diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/OutgoingCallActionProcessor.java b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/OutgoingCallActionProcessor.java index 01987379ac..43d2ada09d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/OutgoingCallActionProcessor.java +++ b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/OutgoingCallActionProcessor.java @@ -6,6 +6,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import org.signal.core.util.logging.Log; +import org.signal.libsignal.protocol.InvalidKeyException; import org.signal.ringrtc.CallException; import org.signal.ringrtc.CallId; import org.signal.ringrtc.CallManager; @@ -26,7 +27,6 @@ import org.thoughtcrime.securesms.util.NetworkUtil; import org.thoughtcrime.securesms.util.Util; import org.thoughtcrime.securesms.webrtc.audio.SignalAudioManager; import org.webrtc.PeerConnection; -import org.whispersystems.libsignal.InvalidKeyException; import org.whispersystems.signalservice.api.messages.calls.OfferMessage; import java.util.List; 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 51b0405cf6..d420eb7bb5 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 @@ -14,6 +14,10 @@ import com.annimon.stream.Stream; import org.greenrobot.eventbus.EventBus; import org.signal.core.util.concurrent.SignalExecutors; import org.signal.core.util.logging.Log; +import org.signal.libsignal.protocol.util.Pair; +import org.signal.libsignal.zkgroup.InvalidInputException; +import org.signal.libsignal.zkgroup.VerificationFailedException; +import org.signal.libsignal.zkgroup.groups.GroupIdentifier; import org.signal.ringrtc.CallException; import org.signal.ringrtc.CallId; import org.signal.ringrtc.CallManager; @@ -22,9 +26,6 @@ import org.signal.ringrtc.HttpHeader; import org.signal.ringrtc.NetworkRoute; import org.signal.ringrtc.Remote; import org.signal.storageservice.protos.groups.GroupExternalCredential; -import org.signal.zkgroup.InvalidInputException; -import org.signal.zkgroup.VerificationFailedException; -import org.signal.zkgroup.groups.GroupIdentifier; import org.thoughtcrime.securesms.WebRtcCallActivity; import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil; import org.thoughtcrime.securesms.database.GroupDatabase; @@ -54,7 +55,6 @@ import org.thoughtcrime.securesms.util.Util; import org.thoughtcrime.securesms.webrtc.audio.SignalAudioManager; import org.thoughtcrime.securesms.webrtc.locks.LockManager; import org.webrtc.PeerConnection; -import org.whispersystems.libsignal.util.Pair; import org.whispersystems.signalservice.api.SignalServiceAccountManager; import org.whispersystems.signalservice.api.SignalServiceMessageSender; import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException; diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/WebRtcActionProcessor.java b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/WebRtcActionProcessor.java index 170b28b287..96ae6df95f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/WebRtcActionProcessor.java +++ b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/WebRtcActionProcessor.java @@ -9,6 +9,8 @@ import androidx.annotation.Nullable; import com.annimon.stream.Stream; import org.signal.core.util.logging.Log; +import org.signal.libsignal.protocol.IdentityKey; +import org.signal.libsignal.protocol.InvalidKeyException; import org.signal.ringrtc.CallException; import org.signal.ringrtc.CallId; import org.signal.ringrtc.CallManager; @@ -43,8 +45,6 @@ import org.thoughtcrime.securesms.util.TelephonyUtil; import org.thoughtcrime.securesms.webrtc.audio.SignalAudioManager; import org.thoughtcrime.securesms.webrtc.locks.LockManager; import org.webrtc.PeerConnection; -import org.whispersystems.libsignal.IdentityKey; -import org.whispersystems.libsignal.InvalidKeyException; import org.whispersystems.signalservice.api.messages.calls.AnswerMessage; import org.whispersystems.signalservice.api.messages.calls.BusyMessage; import org.whispersystems.signalservice.api.messages.calls.HangupMessage; diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/WebRtcUtil.java b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/WebRtcUtil.java index 8213cf1219..6f20f1eaf4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/WebRtcUtil.java +++ b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/WebRtcUtil.java @@ -5,6 +5,9 @@ import android.content.Context; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import org.signal.libsignal.protocol.InvalidKeyException; +import org.signal.libsignal.protocol.ecc.Curve; +import org.signal.libsignal.protocol.ecc.ECPublicKey; import org.signal.ringrtc.CallManager; import org.signal.ringrtc.GroupCall; import org.signal.ringrtc.PeekInfo; @@ -14,9 +17,6 @@ import org.thoughtcrime.securesms.service.webrtc.state.WebRtcServiceState; import org.thoughtcrime.securesms.webrtc.audio.AudioManagerCompat; import org.thoughtcrime.securesms.webrtc.audio.SignalAudioManager; import org.thoughtcrime.securesms.webrtc.locks.LockManager; -import org.whispersystems.libsignal.InvalidKeyException; -import org.whispersystems.libsignal.ecc.Curve; -import org.whispersystems.libsignal.ecc.ECPublicKey; import org.whispersystems.signalservice.api.messages.calls.HangupMessage; import org.whispersystems.signalservice.api.messages.calls.OfferMessage; import org.whispersystems.signalservice.api.messages.calls.OpaqueMessage; diff --git a/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackPreviewActivity.java b/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackPreviewActivity.java index ae73aa9a9d..f4d900becc 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackPreviewActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackPreviewActivity.java @@ -19,6 +19,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions; import org.signal.core.util.logging.Log; +import org.signal.libsignal.protocol.util.Pair; import org.thoughtcrime.securesms.PassphraseRequiredActivity; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.glide.cache.ApngOptions; @@ -29,7 +30,6 @@ import org.thoughtcrime.securesms.stickers.StickerManifest.Sticker; import org.thoughtcrime.securesms.util.DeviceProperties; import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme; import org.thoughtcrime.securesms.util.DynamicTheme; -import org.whispersystems.libsignal.util.Pair; import org.whispersystems.signalservice.api.util.OptionalUtil; import java.util.Optional; diff --git a/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackPreviewRepository.java b/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackPreviewRepository.java index 5fd9db7289..8f5d8c51c9 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackPreviewRepository.java +++ b/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackPreviewRepository.java @@ -10,13 +10,13 @@ import com.annimon.stream.Stream; import org.signal.core.util.concurrent.SignalExecutors; import org.signal.core.util.logging.Log; +import org.signal.libsignal.protocol.InvalidMessageException; import org.thoughtcrime.securesms.database.SignalDatabase; import org.thoughtcrime.securesms.database.StickerDatabase; import org.thoughtcrime.securesms.database.model.StickerPackRecord; import org.thoughtcrime.securesms.database.model.StickerRecord; import org.thoughtcrime.securesms.dependencies.ApplicationDependencies; import org.signal.core.util.Hex; -import org.whispersystems.libsignal.InvalidMessageException; import org.whispersystems.signalservice.api.SignalServiceMessageReceiver; import org.whispersystems.signalservice.api.messages.SignalServiceStickerManifest; diff --git a/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerRemoteUriFetcher.java b/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerRemoteUriFetcher.java index 50554e9919..173480d85a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerRemoteUriFetcher.java +++ b/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerRemoteUriFetcher.java @@ -8,7 +8,7 @@ import com.bumptech.glide.load.data.DataFetcher; import org.signal.core.util.logging.Log; import org.signal.core.util.Hex; -import org.whispersystems.libsignal.InvalidMessageException; +import org.signal.libsignal.protocol.InvalidMessageException; import org.whispersystems.signalservice.api.SignalServiceMessageReceiver; import java.io.IOException; diff --git a/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerRolloverTouchListener.java b/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerRolloverTouchListener.java index 0c302d8a15..01cb216b75 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerRolloverTouchListener.java +++ b/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerRolloverTouchListener.java @@ -9,11 +9,11 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.recyclerview.widget.RecyclerView; +import org.signal.libsignal.protocol.util.Pair; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.keyboard.sticker.KeyboardStickerListAdapter; import org.thoughtcrime.securesms.mms.GlideRequests; import org.thoughtcrime.securesms.util.ViewUtil; -import org.whispersystems.libsignal.util.Pair; import java.lang.ref.WeakReference; diff --git a/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerUrl.java b/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerUrl.java index 3137dc853b..227909e6b9 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerUrl.java +++ b/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerUrl.java @@ -7,7 +7,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import org.signal.core.util.Hex; -import org.whispersystems.libsignal.util.Pair; +import org.signal.libsignal.protocol.util.Pair; import org.whispersystems.signalservice.api.util.OptionalUtil; import java.util.Optional; diff --git a/app/src/main/java/org/thoughtcrime/securesms/storage/GroupV2RecordProcessor.java b/app/src/main/java/org/thoughtcrime/securesms/storage/GroupV2RecordProcessor.java index 9e4856616b..34131f5b4b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/storage/GroupV2RecordProcessor.java +++ b/app/src/main/java/org/thoughtcrime/securesms/storage/GroupV2RecordProcessor.java @@ -6,7 +6,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import org.signal.core.util.logging.Log; -import org.signal.zkgroup.groups.GroupMasterKey; +import org.signal.libsignal.zkgroup.groups.GroupMasterKey; import org.thoughtcrime.securesms.database.GroupDatabase; import org.thoughtcrime.securesms.database.RecipientDatabase; import org.thoughtcrime.securesms.database.SignalDatabase; diff --git a/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncModels.java b/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncModels.java index 79dc958038..ad49230af5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncModels.java +++ b/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncModels.java @@ -5,7 +5,7 @@ import androidx.annotation.Nullable; import com.annimon.stream.Stream; -import org.signal.zkgroup.groups.GroupMasterKey; +import org.signal.libsignal.zkgroup.groups.GroupMasterKey; import org.thoughtcrime.securesms.database.IdentityDatabase; import org.thoughtcrime.securesms.database.RecipientDatabase; import org.thoughtcrime.securesms.database.model.RecipientRecord; diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/BackupUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/BackupUtil.java index 9b78f6f953..5693470ff3 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/BackupUtil.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/BackupUtil.java @@ -14,13 +14,13 @@ import androidx.annotation.VisibleForTesting; import androidx.documentfile.provider.DocumentFile; import org.signal.core.util.logging.Log; +import org.signal.libsignal.protocol.util.ByteUtil; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.backup.BackupPassphrase; import org.thoughtcrime.securesms.database.NoExternalStorageException; import org.thoughtcrime.securesms.dependencies.ApplicationDependencies; import org.thoughtcrime.securesms.keyvalue.SignalStore; import org.thoughtcrime.securesms.permissions.Permissions; -import org.whispersystems.libsignal.util.ByteUtil; import java.io.File; import java.security.SecureRandom; diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/ConversationShortcutPhoto.java b/app/src/main/java/org/thoughtcrime/securesms/util/ConversationShortcutPhoto.java index 0651de6c82..93d40c8006 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/ConversationShortcutPhoto.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/ConversationShortcutPhoto.java @@ -17,6 +17,7 @@ import com.bumptech.glide.load.model.ModelLoader; import com.bumptech.glide.load.model.ModelLoaderFactory; import com.bumptech.glide.load.model.MultiModelLoaderFactory; +import org.signal.libsignal.protocol.util.ByteUtil; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.contacts.avatars.FallbackContactPhoto; import org.thoughtcrime.securesms.contacts.avatars.FallbackPhoto80dp; @@ -26,7 +27,6 @@ import org.thoughtcrime.securesms.conversation.colors.AvatarColor; import org.thoughtcrime.securesms.dependencies.ApplicationDependencies; import org.thoughtcrime.securesms.profiles.AvatarHelper; import org.thoughtcrime.securesms.recipients.Recipient; -import org.whispersystems.libsignal.util.ByteUtil; import java.security.MessageDigest; import java.util.Objects; diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/GroupUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/GroupUtil.java index 7f8c37cda0..fddde2fe41 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/GroupUtil.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/GroupUtil.java @@ -9,8 +9,9 @@ import androidx.annotation.WorkerThread; import com.google.protobuf.ByteString; import org.signal.core.util.logging.Log; -import org.signal.zkgroup.InvalidInputException; -import org.signal.zkgroup.groups.GroupMasterKey; +import org.signal.libsignal.protocol.InvalidMessageException; +import org.signal.libsignal.zkgroup.InvalidInputException; +import org.signal.libsignal.zkgroup.groups.GroupMasterKey; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.database.GroupDatabase; import org.thoughtcrime.securesms.database.SignalDatabase; @@ -20,7 +21,6 @@ import org.thoughtcrime.securesms.mms.MessageGroupContext; import org.thoughtcrime.securesms.mms.OutgoingGroupUpdateMessage; import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.recipients.RecipientId; -import org.whispersystems.libsignal.InvalidMessageException; import org.whispersystems.signalservice.api.messages.SignalServiceContent; import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage; import org.whispersystems.signalservice.api.messages.SignalServiceGroup; diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/IdentityUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/IdentityUtil.java index 6b332b7d18..e10f440fa7 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/IdentityUtil.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/IdentityUtil.java @@ -8,6 +8,10 @@ import androidx.annotation.StringRes; import org.signal.core.util.concurrent.SignalExecutors; import org.signal.core.util.logging.Log; +import org.signal.libsignal.protocol.IdentityKey; +import org.signal.libsignal.protocol.SignalProtocolAddress; +import org.signal.libsignal.protocol.state.SessionRecord; +import org.signal.libsignal.protocol.state.SessionStore; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.crypto.ReentrantSessionLock; import org.thoughtcrime.securesms.crypto.storage.SignalIdentityKeyStore; @@ -30,10 +34,6 @@ import org.thoughtcrime.securesms.sms.OutgoingTextMessage; import org.thoughtcrime.securesms.util.concurrent.ListenableFuture; import org.thoughtcrime.securesms.util.concurrent.SettableFuture; import org.thoughtcrime.securesms.util.concurrent.SimpleTask; -import org.whispersystems.libsignal.IdentityKey; -import org.whispersystems.libsignal.SignalProtocolAddress; -import org.whispersystems.libsignal.state.SessionRecord; -import org.whispersystems.libsignal.state.SessionStore; import org.whispersystems.signalservice.api.SignalSessionLock; import org.whispersystems.signalservice.api.messages.multidevice.VerifiedMessage; import org.whispersystems.signalservice.api.push.SignalServiceAddress; 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 965817aafc..71dafa54fc 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/ProfileUtil.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/ProfileUtil.java @@ -7,8 +7,12 @@ import androidx.annotation.Nullable; import androidx.annotation.WorkerThread; import org.signal.core.util.logging.Log; -import org.signal.zkgroup.InvalidInputException; -import org.signal.zkgroup.profiles.ProfileKey; +import org.signal.libsignal.protocol.IdentityKey; +import org.signal.libsignal.protocol.IdentityKeyPair; +import org.signal.libsignal.protocol.InvalidKeyException; +import org.signal.libsignal.protocol.util.Pair; +import org.signal.libsignal.zkgroup.InvalidInputException; +import org.signal.libsignal.zkgroup.profiles.ProfileKey; import org.thoughtcrime.securesms.badges.models.Badge; import org.thoughtcrime.securesms.crypto.ProfileKeyUtil; import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil; @@ -29,10 +33,6 @@ 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.libsignal.IdentityKey; -import org.whispersystems.libsignal.IdentityKeyPair; -import org.whispersystems.libsignal.InvalidKeyException; -import org.whispersystems.libsignal.util.Pair; import org.whispersystems.signalservice.api.SignalServiceAccountManager; 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/SaveAttachmentTask.java b/app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentTask.java index 861e742fdf..fea2d0b658 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentTask.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentTask.java @@ -21,10 +21,10 @@ import androidx.appcompat.app.AlertDialog; import org.signal.core.util.MapUtil; import org.signal.core.util.StreamUtil; import org.signal.core.util.logging.Log; +import org.signal.libsignal.protocol.util.Pair; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.mms.PartAuthority; import org.thoughtcrime.securesms.util.task.ProgressDialogAsyncTask; -import org.whispersystems.libsignal.util.Pair; import java.io.File; import java.io.FileOutputStream; diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/SearchUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/SearchUtil.java index 0f8d756bdc..74a754e316 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/SearchUtil.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/SearchUtil.java @@ -10,7 +10,7 @@ import androidx.annotation.Nullable; import com.annimon.stream.Stream; -import org.whispersystems.libsignal.util.Pair; +import org.signal.libsignal.protocol.util.Pair; import java.security.InvalidParameterException; import java.util.Collections; diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/TextSecurePreferences.java b/app/src/main/java/org/thoughtcrime/securesms/util/TextSecurePreferences.java index 16094d12ca..354cb88d6d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/TextSecurePreferences.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/TextSecurePreferences.java @@ -15,7 +15,7 @@ import androidx.core.app.NotificationCompat; import org.greenrobot.eventbus.EventBus; import org.signal.core.util.logging.Log; -import org.signal.zkgroup.profiles.ProfileKey; +import org.signal.libsignal.zkgroup.profiles.ProfileKey; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.backup.BackupProtos; import org.thoughtcrime.securesms.crypto.ProfileKeyUtil; diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/VerifySpan.java b/app/src/main/java/org/thoughtcrime/securesms/util/VerifySpan.java index 2b69a4c643..72bce8734c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/VerifySpan.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/VerifySpan.java @@ -6,10 +6,10 @@ import android.view.View; import androidx.annotation.NonNull; +import org.signal.libsignal.protocol.IdentityKey; import org.thoughtcrime.securesms.database.documents.IdentityKeyMismatch; import org.thoughtcrime.securesms.recipients.RecipientId; import org.thoughtcrime.securesms.verify.VerifyIdentityActivity; -import org.whispersystems.libsignal.IdentityKey; public class VerifySpan extends ClickableSpan { diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/adapter/RecyclerViewConcatenateAdapterStickyHeader.java b/app/src/main/java/org/thoughtcrime/securesms/util/adapter/RecyclerViewConcatenateAdapterStickyHeader.java index c648239ad2..1764d9f1de 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/adapter/RecyclerViewConcatenateAdapterStickyHeader.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/adapter/RecyclerViewConcatenateAdapterStickyHeader.java @@ -4,9 +4,9 @@ import android.view.ViewGroup; import androidx.recyclerview.widget.RecyclerView; +import org.signal.libsignal.protocol.util.Pair; import org.thoughtcrime.securesms.components.RecyclerViewFastScroller; import org.thoughtcrime.securesms.util.StickyHeaderDecoration; -import org.whispersystems.libsignal.util.Pair; import java.util.Optional; diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/livedata/LiveDataPair.java b/app/src/main/java/org/thoughtcrime/securesms/util/livedata/LiveDataPair.java index 2d28291da7..9e398d07fa 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/livedata/LiveDataPair.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/livedata/LiveDataPair.java @@ -5,7 +5,7 @@ import androidx.annotation.Nullable; import androidx.lifecycle.LiveData; import androidx.lifecycle.MediatorLiveData; -import org.whispersystems.libsignal.util.Pair; +import org.signal.libsignal.protocol.util.Pair; public final class LiveDataPair extends MediatorLiveData> { private A a; diff --git a/app/src/main/java/org/thoughtcrime/securesms/verify/VerifyDisplayFragment.java b/app/src/main/java/org/thoughtcrime/securesms/verify/VerifyDisplayFragment.java index 85430e85c8..f4e5fdaf9b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/verify/VerifyDisplayFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/verify/VerifyDisplayFragment.java @@ -43,6 +43,10 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder; import org.signal.core.util.ThreadUtil; import org.signal.core.util.concurrent.SignalExecutors; import org.signal.core.util.logging.Log; +import org.signal.libsignal.protocol.IdentityKey; +import org.signal.libsignal.protocol.fingerprint.Fingerprint; +import org.signal.libsignal.protocol.fingerprint.FingerprintVersionMismatchException; +import org.signal.libsignal.protocol.fingerprint.NumericFingerprintGenerator; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.crypto.IdentityKeyParcelable; import org.thoughtcrime.securesms.crypto.ReentrantSessionLock; @@ -60,10 +64,6 @@ import org.thoughtcrime.securesms.util.IdentityUtil; import org.thoughtcrime.securesms.util.Util; import org.thoughtcrime.securesms.util.ViewUtil; import org.thoughtcrime.securesms.util.concurrent.SimpleTask; -import org.whispersystems.libsignal.IdentityKey; -import org.whispersystems.libsignal.fingerprint.Fingerprint; -import org.whispersystems.libsignal.fingerprint.FingerprintVersionMismatchException; -import org.whispersystems.libsignal.fingerprint.NumericFingerprintGenerator; import org.whispersystems.signalservice.api.SignalSessionLock; import java.nio.charset.Charset; diff --git a/app/src/main/java/org/thoughtcrime/securesms/verify/VerifyIdentityActivity.java b/app/src/main/java/org/thoughtcrime/securesms/verify/VerifyIdentityActivity.java index 832b1c1756..04b9c4d179 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/verify/VerifyIdentityActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/verify/VerifyIdentityActivity.java @@ -6,6 +6,7 @@ import android.os.Bundle; import androidx.annotation.NonNull; +import org.signal.libsignal.protocol.IdentityKey; import org.thoughtcrime.securesms.PassphraseRequiredActivity; import org.thoughtcrime.securesms.crypto.IdentityKeyParcelable; import org.thoughtcrime.securesms.database.IdentityDatabase; @@ -13,7 +14,6 @@ import org.thoughtcrime.securesms.database.model.IdentityRecord; import org.thoughtcrime.securesms.recipients.RecipientId; import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme; import org.thoughtcrime.securesms.util.DynamicTheme; -import org.whispersystems.libsignal.IdentityKey; /** * Activity for verifying identity keys. diff --git a/app/src/test/java/org/thoughtcrime/securesms/TestZkGroupServer.java b/app/src/test/java/org/thoughtcrime/securesms/TestZkGroupServer.java index 2c1a3b79ed..a4ba932b23 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/TestZkGroupServer.java +++ b/app/src/test/java/org/thoughtcrime/securesms/TestZkGroupServer.java @@ -1,14 +1,14 @@ package org.thoughtcrime.securesms; -import org.signal.zkgroup.ServerPublicParams; -import org.signal.zkgroup.ServerSecretParams; -import org.signal.zkgroup.VerificationFailedException; -import org.signal.zkgroup.groups.GroupPublicParams; -import org.signal.zkgroup.profiles.ProfileKeyCommitment; -import org.signal.zkgroup.profiles.ProfileKeyCredentialPresentation; -import org.signal.zkgroup.profiles.ProfileKeyCredentialRequest; -import org.signal.zkgroup.profiles.ProfileKeyCredentialResponse; -import org.signal.zkgroup.profiles.ServerZkProfileOperations; +import org.signal.libsignal.zkgroup.ServerPublicParams; +import org.signal.libsignal.zkgroup.ServerSecretParams; +import org.signal.libsignal.zkgroup.VerificationFailedException; +import org.signal.libsignal.zkgroup.groups.GroupPublicParams; +import org.signal.libsignal.zkgroup.profiles.ProfileKeyCommitment; +import org.signal.libsignal.zkgroup.profiles.ProfileKeyCredentialPresentation; +import org.signal.libsignal.zkgroup.profiles.ProfileKeyCredentialRequest; +import org.signal.libsignal.zkgroup.profiles.ProfileKeyCredentialResponse; +import org.signal.libsignal.zkgroup.profiles.ServerZkProfileOperations; import org.whispersystems.signalservice.test.LibSignalLibraryUtil; import java.util.UUID; diff --git a/app/src/test/java/org/thoughtcrime/securesms/crypto/storage/SignalBaseIdentityKeyStoreTest.kt b/app/src/test/java/org/thoughtcrime/securesms/crypto/storage/SignalBaseIdentityKeyStoreTest.kt index 2e833a14ba..027d7f92a4 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/crypto/storage/SignalBaseIdentityKeyStoreTest.kt +++ b/app/src/test/java/org/thoughtcrime/securesms/crypto/storage/SignalBaseIdentityKeyStoreTest.kt @@ -8,11 +8,11 @@ import org.mockito.Mockito.mock import org.mockito.Mockito.times import org.mockito.Mockito.verify import org.mockito.Mockito.`when` +import org.signal.libsignal.protocol.IdentityKey +import org.signal.libsignal.protocol.SignalProtocolAddress +import org.signal.libsignal.protocol.ecc.ECPublicKey import org.thoughtcrime.securesms.database.IdentityDatabase import org.thoughtcrime.securesms.database.model.IdentityStoreRecord -import org.whispersystems.libsignal.IdentityKey -import org.whispersystems.libsignal.SignalProtocolAddress -import org.whispersystems.libsignal.ecc.ECPublicKey import org.whispersystems.signalservice.test.LibSignalLibraryUtil.assumeLibSignalSupportedOnOS class SignalBaseIdentityKeyStoreTest { diff --git a/app/src/test/java/org/thoughtcrime/securesms/database/GroupTestUtil.kt b/app/src/test/java/org/thoughtcrime/securesms/database/GroupTestUtil.kt index 175e3bc7c6..ae1485bbca 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/database/GroupTestUtil.kt +++ b/app/src/test/java/org/thoughtcrime/securesms/database/GroupTestUtil.kt @@ -1,6 +1,7 @@ package org.thoughtcrime.securesms.database import com.google.protobuf.ByteString +import org.signal.libsignal.zkgroup.groups.GroupMasterKey import org.signal.storageservice.protos.groups.AccessControl import org.signal.storageservice.protos.groups.GroupChange import org.signal.storageservice.protos.groups.Member @@ -12,7 +13,6 @@ import org.signal.storageservice.protos.groups.local.DecryptedRequestingMember import org.signal.storageservice.protos.groups.local.DecryptedString import org.signal.storageservice.protos.groups.local.DecryptedTimer import org.signal.storageservice.protos.groups.local.EnabledState -import org.signal.zkgroup.groups.GroupMasterKey import org.thoughtcrime.securesms.groups.GroupId import org.thoughtcrime.securesms.recipients.RecipientId import org.whispersystems.signalservice.api.groupsv2.DecryptedGroupHistoryEntry diff --git a/app/src/test/java/org/thoughtcrime/securesms/database/RecipientDatabaseTestUtils.kt b/app/src/test/java/org/thoughtcrime/securesms/database/RecipientDatabaseTestUtils.kt index fcc3225647..8358d6e7d3 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/database/RecipientDatabaseTestUtils.kt +++ b/app/src/test/java/org/thoughtcrime/securesms/database/RecipientDatabaseTestUtils.kt @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.database import android.net.Uri import org.signal.core.util.Bitmask -import org.signal.zkgroup.profiles.ProfileKeyCredential +import org.signal.libsignal.zkgroup.profiles.ProfileKeyCredential import org.thoughtcrime.securesms.badges.models.Badge import org.thoughtcrime.securesms.conversation.colors.AvatarColor import org.thoughtcrime.securesms.conversation.colors.ChatColors diff --git a/app/src/test/java/org/thoughtcrime/securesms/dependencies/MockApplicationDependencyProvider.java b/app/src/test/java/org/thoughtcrime/securesms/dependencies/MockApplicationDependencyProvider.java index 723ccc6c27..374a642efb 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/dependencies/MockApplicationDependencyProvider.java +++ b/app/src/test/java/org/thoughtcrime/securesms/dependencies/MockApplicationDependencyProvider.java @@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.dependencies; import androidx.annotation.NonNull; import org.signal.core.util.concurrent.DeadlockDetector; -import org.signal.zkgroup.receipts.ClientZkReceiptOperations; +import org.signal.libsignal.zkgroup.receipts.ClientZkReceiptOperations; import org.thoughtcrime.securesms.components.TypingStatusRepository; import org.thoughtcrime.securesms.components.TypingStatusSender; import org.thoughtcrime.securesms.crypto.storage.SignalServiceDataStoreImpl; diff --git a/app/src/test/java/org/thoughtcrime/securesms/groups/GroupIdTest.java b/app/src/test/java/org/thoughtcrime/securesms/groups/GroupIdTest.java index 4f4cabdc6a..b8022dfd16 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/groups/GroupIdTest.java +++ b/app/src/test/java/org/thoughtcrime/securesms/groups/GroupIdTest.java @@ -1,10 +1,10 @@ package org.thoughtcrime.securesms.groups; import org.junit.Test; -import org.signal.zkgroup.InvalidInputException; -import org.signal.zkgroup.groups.GroupIdentifier; -import org.signal.zkgroup.groups.GroupMasterKey; import org.signal.core.util.Hex; +import org.signal.libsignal.zkgroup.InvalidInputException; +import org.signal.libsignal.zkgroup.groups.GroupIdentifier; +import org.signal.libsignal.zkgroup.groups.GroupMasterKey; import java.io.IOException; diff --git a/app/src/test/java/org/thoughtcrime/securesms/groups/GroupId_v1_v2_migration_derivation_Test.java b/app/src/test/java/org/thoughtcrime/securesms/groups/GroupId_v1_v2_migration_derivation_Test.java index fe2f02ee39..578bef55b4 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/groups/GroupId_v1_v2_migration_derivation_Test.java +++ b/app/src/test/java/org/thoughtcrime/securesms/groups/GroupId_v1_v2_migration_derivation_Test.java @@ -4,8 +4,8 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.signal.zkgroup.groups.GroupMasterKey; import org.signal.core.util.Hex; +import org.signal.libsignal.zkgroup.groups.GroupMasterKey; import java.util.Arrays; import java.util.Collection; diff --git a/app/src/test/java/org/thoughtcrime/securesms/groups/GroupManagerV2Test_edit.kt b/app/src/test/java/org/thoughtcrime/securesms/groups/GroupManagerV2Test_edit.kt index 41aa55cb8b..373742aace 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/groups/GroupManagerV2Test_edit.kt +++ b/app/src/test/java/org/thoughtcrime/securesms/groups/GroupManagerV2Test_edit.kt @@ -19,11 +19,12 @@ import org.robolectric.annotation.Config import org.signal.core.util.Hex import org.signal.core.util.ThreadUtil import org.signal.core.util.logging.Log +import org.signal.libsignal.protocol.logging.SignalProtocolLoggerProvider +import org.signal.libsignal.zkgroup.groups.GroupMasterKey +import org.signal.libsignal.zkgroup.groups.GroupSecretParams import org.signal.storageservice.protos.groups.Member import org.signal.storageservice.protos.groups.local.DecryptedGroup import org.signal.storageservice.protos.groups.local.DecryptedMember -import org.signal.zkgroup.groups.GroupMasterKey -import org.signal.zkgroup.groups.GroupSecretParams import org.thoughtcrime.securesms.SignalStoreRule import org.thoughtcrime.securesms.TestZkGroupServer import org.thoughtcrime.securesms.database.GroupDatabase @@ -34,7 +35,6 @@ import org.thoughtcrime.securesms.groups.v2.processing.GroupsV2StateProcessor import org.thoughtcrime.securesms.logging.CustomSignalProtocolLogger import org.thoughtcrime.securesms.recipients.Recipient import org.thoughtcrime.securesms.testutil.SystemOutLogger -import org.whispersystems.libsignal.logging.SignalProtocolLoggerProvider import org.whispersystems.signalservice.api.groupsv2.ClientZkOperations import org.whispersystems.signalservice.api.groupsv2.GroupsV2Api import org.whispersystems.signalservice.api.groupsv2.GroupsV2Operations diff --git a/app/src/test/java/org/thoughtcrime/securesms/groups/v2/ChangeBuilder.java b/app/src/test/java/org/thoughtcrime/securesms/groups/v2/ChangeBuilder.java index 135f1c4883..a0cf08119f 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/groups/v2/ChangeBuilder.java +++ b/app/src/test/java/org/thoughtcrime/securesms/groups/v2/ChangeBuilder.java @@ -5,6 +5,8 @@ import androidx.annotation.Nullable; import com.google.protobuf.ByteString; +import org.signal.libsignal.zkgroup.InvalidInputException; +import org.signal.libsignal.zkgroup.profiles.ProfileKey; import org.signal.storageservice.protos.groups.AccessControl; import org.signal.storageservice.protos.groups.Member; import org.signal.storageservice.protos.groups.local.DecryptedApproveMember; @@ -16,8 +18,6 @@ import org.signal.storageservice.protos.groups.local.DecryptedPendingMemberRemov import org.signal.storageservice.protos.groups.local.DecryptedRequestingMember; import org.signal.storageservice.protos.groups.local.DecryptedString; import org.signal.storageservice.protos.groups.local.DecryptedTimer; -import org.signal.zkgroup.InvalidInputException; -import org.signal.zkgroup.profiles.ProfileKey; import org.thoughtcrime.securesms.util.Util; import org.whispersystems.signalservice.api.util.UuidUtil; diff --git a/app/src/test/java/org/thoughtcrime/securesms/groups/v2/GroupInviteLinkUrlTest.java b/app/src/test/java/org/thoughtcrime/securesms/groups/v2/GroupInviteLinkUrlTest.java index 67705fb882..bf5b12c8c8 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/groups/v2/GroupInviteLinkUrlTest.java +++ b/app/src/test/java/org/thoughtcrime/securesms/groups/v2/GroupInviteLinkUrlTest.java @@ -3,9 +3,9 @@ package org.thoughtcrime.securesms.groups.v2; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.signal.zkgroup.InvalidInputException; -import org.signal.zkgroup.groups.GroupMasterKey; import org.signal.core.util.Hex; +import org.signal.libsignal.zkgroup.InvalidInputException; +import org.signal.libsignal.zkgroup.groups.GroupMasterKey; import java.util.Arrays; import java.util.Collection; diff --git a/app/src/test/java/org/thoughtcrime/securesms/groups/v2/GroupInviteLinkUrl_InvalidGroupLinkException_Test.java b/app/src/test/java/org/thoughtcrime/securesms/groups/v2/GroupInviteLinkUrl_InvalidGroupLinkException_Test.java index bce69cde47..bd83bd192e 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/groups/v2/GroupInviteLinkUrl_InvalidGroupLinkException_Test.java +++ b/app/src/test/java/org/thoughtcrime/securesms/groups/v2/GroupInviteLinkUrl_InvalidGroupLinkException_Test.java @@ -6,8 +6,8 @@ import com.google.protobuf.ByteString; import com.google.protobuf.InvalidProtocolBufferException; import org.junit.Test; +import org.signal.libsignal.zkgroup.InvalidInputException; import org.signal.storageservice.protos.groups.GroupInviteLink; -import org.signal.zkgroup.InvalidInputException; import org.thoughtcrime.securesms.util.Util; import org.whispersystems.util.Base64UrlSafe; diff --git a/app/src/test/java/org/thoughtcrime/securesms/groups/v2/ProfileKeySetTest.java b/app/src/test/java/org/thoughtcrime/securesms/groups/v2/ProfileKeySetTest.java index c593f3bc84..1c69223d74 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/groups/v2/ProfileKeySetTest.java +++ b/app/src/test/java/org/thoughtcrime/securesms/groups/v2/ProfileKeySetTest.java @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.groups.v2; import org.junit.Test; import org.signal.core.util.logging.Log; -import org.signal.zkgroup.profiles.ProfileKey; +import org.signal.libsignal.zkgroup.profiles.ProfileKey; import org.thoughtcrime.securesms.crypto.ProfileKeyUtil; import org.thoughtcrime.securesms.testutil.LogRecorder; import org.whispersystems.signalservice.api.push.ServiceId; 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 eb43d04d55..6360ece239 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 @@ -20,11 +20,12 @@ import org.robolectric.RobolectricTestRunner import org.robolectric.annotation.Config import org.signal.core.util.Hex.fromStringCondensed import org.signal.core.util.logging.Log +import org.signal.libsignal.protocol.logging.SignalProtocolLoggerProvider +import org.signal.libsignal.zkgroup.groups.GroupMasterKey import org.signal.storageservice.protos.groups.local.DecryptedGroup import org.signal.storageservice.protos.groups.local.DecryptedGroupChange import org.signal.storageservice.protos.groups.local.DecryptedMember import org.signal.storageservice.protos.groups.local.DecryptedTimer -import org.signal.zkgroup.groups.GroupMasterKey import org.thoughtcrime.securesms.SignalStoreRule import org.thoughtcrime.securesms.database.GroupDatabase import org.thoughtcrime.securesms.database.GroupStateTestData @@ -39,7 +40,6 @@ import org.thoughtcrime.securesms.groups.GroupsV2Authorization import org.thoughtcrime.securesms.jobs.RequestGroupV2InfoJob import org.thoughtcrime.securesms.logging.CustomSignalProtocolLogger import org.thoughtcrime.securesms.testutil.SystemOutLogger -import org.whispersystems.libsignal.logging.SignalProtocolLoggerProvider import org.whispersystems.signalservice.api.groupsv2.GroupsV2Api import org.whispersystems.signalservice.api.groupsv2.PartialDecryptedGroup import org.whispersystems.signalservice.api.push.ACI diff --git a/app/src/test/java/org/thoughtcrime/securesms/notifications/MarkReadReceiverTest.java b/app/src/test/java/org/thoughtcrime/securesms/notifications/MarkReadReceiverTest.java index ca3e37578a..8077b68719 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/notifications/MarkReadReceiverTest.java +++ b/app/src/test/java/org/thoughtcrime/securesms/notifications/MarkReadReceiverTest.java @@ -14,6 +14,7 @@ import org.mockito.MockedStatic; import org.mockito.junit.MockitoJUnit; import org.mockito.junit.MockitoRule; import org.mockito.stubbing.Answer; +import org.signal.libsignal.protocol.util.Pair; import org.thoughtcrime.securesms.database.MessageDatabase; import org.thoughtcrime.securesms.database.model.MessageId; import org.thoughtcrime.securesms.dependencies.ApplicationDependencies; @@ -24,7 +25,6 @@ import org.thoughtcrime.securesms.jobs.MultiDeviceReadUpdateJob; import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.recipients.RecipientId; import org.thoughtcrime.securesms.util.Util; -import org.whispersystems.libsignal.util.Pair; import java.util.HashSet; import java.util.LinkedList; diff --git a/app/src/test/java/org/thoughtcrime/securesms/payments/MobileCoinPublicAddressProfileUtilTest.java b/app/src/test/java/org/thoughtcrime/securesms/payments/MobileCoinPublicAddressProfileUtilTest.java index 9f8a3f5bfe..c0759a2408 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/payments/MobileCoinPublicAddressProfileUtilTest.java +++ b/app/src/test/java/org/thoughtcrime/securesms/payments/MobileCoinPublicAddressProfileUtilTest.java @@ -4,10 +4,10 @@ import com.google.protobuf.ByteString; import org.junit.Before; import org.junit.Test; +import org.signal.libsignal.protocol.IdentityKey; +import org.signal.libsignal.protocol.IdentityKeyPair; import org.thoughtcrime.securesms.crypto.IdentityKeyUtil; import org.thoughtcrime.securesms.util.Util; -import org.whispersystems.libsignal.IdentityKey; -import org.whispersystems.libsignal.IdentityKeyPair; import org.whispersystems.signalservice.internal.push.SignalServiceProtos; import static org.assertj.core.api.Assertions.assertThatThrownBy; diff --git a/app/src/test/java/org/thoughtcrime/securesms/payments/reconciliation/LedgerReconcileTest.java b/app/src/test/java/org/thoughtcrime/securesms/payments/reconciliation/LedgerReconcileTest.java index 79200e4200..65ed0b80f9 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/payments/reconciliation/LedgerReconcileTest.java +++ b/app/src/test/java/org/thoughtcrime/securesms/payments/reconciliation/LedgerReconcileTest.java @@ -9,6 +9,7 @@ import com.google.protobuf.ByteString; import org.junit.BeforeClass; import org.junit.Test; import org.signal.core.util.logging.Log; +import org.signal.libsignal.protocol.util.ByteUtil; import org.thoughtcrime.securesms.payments.Direction; import org.thoughtcrime.securesms.payments.FailureReason; import org.thoughtcrime.securesms.payments.MobileCoinLedgerWrapper; @@ -19,7 +20,6 @@ import org.thoughtcrime.securesms.payments.proto.MobileCoinLedger; import org.thoughtcrime.securesms.payments.proto.PaymentMetaData; import org.thoughtcrime.securesms.recipients.RecipientId; import org.thoughtcrime.securesms.testutil.LogRecorder; -import org.whispersystems.libsignal.util.ByteUtil; import org.whispersystems.signalservice.api.payments.Money; import org.whispersystems.signalservice.api.util.Uint64RangeException; import org.whispersystems.signalservice.api.util.Uint64Util; diff --git a/app/src/test/java/org/thoughtcrime/securesms/testutil/TestHelpers.java b/app/src/test/java/org/thoughtcrime/securesms/testutil/TestHelpers.java index cadcf94c7c..e12e9b27ae 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/testutil/TestHelpers.java +++ b/app/src/test/java/org/thoughtcrime/securesms/testutil/TestHelpers.java @@ -4,7 +4,7 @@ import com.annimon.stream.Stream; import com.google.common.collect.Sets; import org.signal.core.util.Conversions; -import org.whispersystems.libsignal.util.ByteUtil; +import org.signal.libsignal.protocol.util.ByteUtil; import java.nio.ByteBuffer; import java.util.ArrayList; diff --git a/app/src/test/java/org/thoughtcrime/securesms/util/SearchUtilTest.java b/app/src/test/java/org/thoughtcrime/securesms/util/SearchUtilTest.java index 3dfdcb6555..99f58c5752 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/util/SearchUtilTest.java +++ b/app/src/test/java/org/thoughtcrime/securesms/util/SearchUtilTest.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.util; import org.junit.Test; -import org.whispersystems.libsignal.util.Pair; +import org.signal.libsignal.protocol.util.Pair; import java.util.Arrays; import java.util.List; diff --git a/app/src/testShared/org/thoughtcrime/securesms/database/model/databaseprotos/DecryptedGroupHelper.kt b/app/src/testShared/org/thoughtcrime/securesms/database/model/databaseprotos/DecryptedGroupHelper.kt index 6bda586b49..c65e61c8c2 100644 --- a/app/src/testShared/org/thoughtcrime/securesms/database/model/databaseprotos/DecryptedGroupHelper.kt +++ b/app/src/testShared/org/thoughtcrime/securesms/database/model/databaseprotos/DecryptedGroupHelper.kt @@ -1,11 +1,11 @@ package org.thoughtcrime.securesms.database.model.databaseprotos import com.google.protobuf.ByteString +import org.signal.libsignal.zkgroup.groups.GroupMasterKey import org.signal.storageservice.protos.groups.Member import org.signal.storageservice.protos.groups.local.DecryptedGroupChange import org.signal.storageservice.protos.groups.local.DecryptedMember import org.signal.storageservice.protos.groups.local.DecryptedRequestingMember -import org.signal.zkgroup.groups.GroupMasterKey import org.whispersystems.signalservice.api.push.ServiceId import org.whispersystems.signalservice.api.util.UuidUtil import org.whispersystems.signalservice.internal.push.SignalServiceProtos diff --git a/dependencies.gradle b/dependencies.gradle index 8d0b5c4246..c15d768b15 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -4,7 +4,7 @@ dependencyResolutionManagement { versionCatalogs { libs { - version('signal-client', '0.14.0') + version('libsignal-client', '0.15.0') version('exoplayer', '2.15.0') version('androidx-camera', '1.0.0-beta11') version('androidx-lifecycle', '2.3.1') @@ -72,8 +72,8 @@ dependencyResolutionManagement { alias('firebase-messaging').to('com.google.firebase:firebase-messaging:22.0.0') // 1st Party - alias('signal-client-java').to('org.whispersystems', 'signal-client-java').versionRef('signal-client') - alias('signal-client-android').to('org.whispersystems', 'signal-client-android').versionRef('signal-client') + alias('libsignal-client').to('org.signal', 'libsignal-client').versionRef('libsignal-client') + alias('libsignal-android').to('org.signal', 'libsignal-android').versionRef('libsignal-client') alias('signal-aesgcmprovider').to('org.signal:aesgcmprovider:0.0.3') alias('signal-argon2').to('org.signal:argon2:13.1') alias('signal-ringrtc').to('org.signal:ringrtc-android:2.20.0') diff --git a/device-transfer/lib/build.gradle b/device-transfer/lib/build.gradle index ad56aeacdd..86c2be5ab3 100644 --- a/device-transfer/lib/build.gradle +++ b/device-transfer/lib/build.gradle @@ -22,7 +22,7 @@ android { dependencies { implementation libs.androidx.appcompat implementation project(':core-util') - implementation libs.signal.client.java + implementation libs.libsignal.client api libs.greenrobot.eventbus testImplementation testLibs.junit.junit diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index e6f5434583..6a4a49a4f4 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -3584,6 +3584,27 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + + + + + + + + + + + + + + @@ -3624,32 +3645,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/libsignal/service/build.gradle b/libsignal/service/build.gradle index 287fea6fba..e11b388bb0 100644 --- a/libsignal/service/build.gradle +++ b/libsignal/service/build.gradle @@ -34,7 +34,7 @@ dependencies { api libs.google.libphonenumber api libs.jackson.core - implementation libs.signal.client.java + implementation libs.libsignal.client api libs.square.okhttp3 api libs.square.okio implementation libs.threeten.threetenbp @@ -46,7 +46,7 @@ dependencies { testImplementation testLibs.conscrypt.openjdk.uber testImplementation testLibs.mockito.core - testFixturesImplementation libs.signal.client.java + testFixturesImplementation libs.libsignal.client testFixturesImplementation testLibs.junit.junit } diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/KeyBackupService.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/KeyBackupService.java index 178e1da804..d2145a915d 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/KeyBackupService.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/KeyBackupService.java @@ -1,7 +1,7 @@ package org.whispersystems.signalservice.api; -import org.whispersystems.libsignal.InvalidKeyException; -import org.whispersystems.libsignal.logging.Log; +import org.signal.libsignal.protocol.InvalidKeyException; +import org.signal.libsignal.protocol.logging.Log; import org.whispersystems.signalservice.api.crypto.InvalidCiphertextException; import org.whispersystems.signalservice.api.kbs.HashedPin; import org.whispersystems.signalservice.api.kbs.KbsData; diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceAccountDataStore.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceAccountDataStore.java index 9fccc51636..b244e0d309 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceAccountDataStore.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceAccountDataStore.java @@ -1,6 +1,6 @@ package org.whispersystems.signalservice.api; -import org.whispersystems.libsignal.state.SignalProtocolStore; +import org.signal.libsignal.protocol.state.SignalProtocolStore; /** * And extension of the normal protocol store interface that has additional methods that are needed diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceAccountManager.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceAccountManager.java index 5c696973ed..9e216729af 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceAccountManager.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceAccountManager.java @@ -9,15 +9,15 @@ package org.whispersystems.signalservice.api; import com.google.protobuf.ByteString; -import org.signal.zkgroup.profiles.ProfileKey; -import org.signal.zkgroup.profiles.ProfileKeyCredential; -import org.whispersystems.libsignal.IdentityKey; -import org.whispersystems.libsignal.IdentityKeyPair; -import org.whispersystems.libsignal.InvalidKeyException; -import org.whispersystems.libsignal.ecc.ECPublicKey; -import org.whispersystems.libsignal.logging.Log; -import org.whispersystems.libsignal.state.PreKeyRecord; -import org.whispersystems.libsignal.state.SignedPreKeyRecord; +import org.signal.libsignal.protocol.IdentityKey; +import org.signal.libsignal.protocol.IdentityKeyPair; +import org.signal.libsignal.protocol.InvalidKeyException; +import org.signal.libsignal.protocol.ecc.ECPublicKey; +import org.signal.libsignal.protocol.logging.Log; +import org.signal.libsignal.protocol.state.PreKeyRecord; +import org.signal.libsignal.protocol.state.SignedPreKeyRecord; +import org.signal.libsignal.zkgroup.profiles.ProfileKey; +import org.signal.libsignal.zkgroup.profiles.ProfileKeyCredential; import org.whispersystems.signalservice.api.account.AccountAttributes; import org.whispersystems.signalservice.api.crypto.InvalidCiphertextException; import org.whispersystems.signalservice.api.crypto.ProfileCipher; diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageReceiver.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageReceiver.java index 31c8a4802f..ef92b81e54 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageReceiver.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageReceiver.java @@ -6,9 +6,9 @@ package org.whispersystems.signalservice.api; -import org.signal.zkgroup.profiles.ClientZkProfileOperations; -import org.signal.zkgroup.profiles.ProfileKey; -import org.whispersystems.libsignal.InvalidMessageException; +import org.signal.libsignal.protocol.InvalidMessageException; +import org.signal.libsignal.zkgroup.profiles.ClientZkProfileOperations; +import org.signal.libsignal.zkgroup.profiles.ProfileKey; import org.whispersystems.signalservice.api.crypto.AttachmentCipherInputStream; import org.whispersystems.signalservice.api.crypto.ProfileCipherInputStream; import org.whispersystems.signalservice.api.crypto.UnidentifiedAccess; diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java index cb2867eb82..24348a528f 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java @@ -8,19 +8,19 @@ package org.whispersystems.signalservice.api; import com.google.protobuf.ByteString; import org.signal.libsignal.metadata.certificate.SenderCertificate; -import org.signal.zkgroup.profiles.ClientZkProfileOperations; -import org.whispersystems.libsignal.InvalidKeyException; -import org.whispersystems.libsignal.InvalidRegistrationIdException; -import org.whispersystems.libsignal.NoSessionException; -import org.whispersystems.libsignal.SessionBuilder; -import org.whispersystems.libsignal.SignalProtocolAddress; -import org.whispersystems.libsignal.groups.GroupSessionBuilder; -import org.whispersystems.libsignal.logging.Log; -import org.whispersystems.libsignal.protocol.DecryptionErrorMessage; -import org.whispersystems.libsignal.protocol.PlaintextContent; -import org.whispersystems.libsignal.protocol.SenderKeyDistributionMessage; -import org.whispersystems.libsignal.state.PreKeyBundle; -import org.whispersystems.libsignal.util.Pair; +import org.signal.libsignal.protocol.InvalidKeyException; +import org.signal.libsignal.protocol.InvalidRegistrationIdException; +import org.signal.libsignal.protocol.NoSessionException; +import org.signal.libsignal.protocol.SessionBuilder; +import org.signal.libsignal.protocol.SignalProtocolAddress; +import org.signal.libsignal.protocol.groups.GroupSessionBuilder; +import org.signal.libsignal.protocol.logging.Log; +import org.signal.libsignal.protocol.message.DecryptionErrorMessage; +import org.signal.libsignal.protocol.message.PlaintextContent; +import org.signal.libsignal.protocol.message.SenderKeyDistributionMessage; +import org.signal.libsignal.protocol.state.PreKeyBundle; +import org.signal.libsignal.protocol.util.Pair; +import org.signal.libsignal.zkgroup.profiles.ClientZkProfileOperations; import org.whispersystems.signalservice.api.crypto.AttachmentCipherOutputStream; import org.whispersystems.signalservice.api.crypto.ContentHint; import org.whispersystems.signalservice.api.crypto.EnvelopeContent; @@ -1853,7 +1853,7 @@ public class SignalServiceMessageSender { byte[] ciphertext; try { ciphertext = cipher.encryptForGroup(distributionId, targetInfo.destinations, senderCertificate, content.toByteArray(), contentHint, groupId); - } catch (org.whispersystems.libsignal.UntrustedIdentityException e) { + } catch (org.signal.libsignal.protocol.UntrustedIdentityException e) { throw new UntrustedIdentityException("Untrusted during group encrypt", e.getName(), e.getUntrustedIdentity()); } @@ -2084,7 +2084,7 @@ public class SignalServiceMessageSender { SignalProtocolAddress preKeyAddress = new SignalProtocolAddress(recipient.getIdentifier(), preKey.getDeviceId()); SignalSessionBuilder sessionBuilder = new SignalSessionBuilder(sessionLock, new SessionBuilder(store, preKeyAddress)); sessionBuilder.process(preKey); - } catch (org.whispersystems.libsignal.UntrustedIdentityException e) { + } catch (org.signal.libsignal.protocol.UntrustedIdentityException e) { throw new UntrustedIdentityException("Untrusted identity key!", recipient.getIdentifier(), preKey.getIdentityKey()); } } @@ -2099,7 +2099,7 @@ public class SignalServiceMessageSender { try { return cipher.encrypt(signalProtocolAddress, unidentifiedAccess, plaintext); - } catch (org.whispersystems.libsignal.UntrustedIdentityException e) { + } catch (org.signal.libsignal.protocol.UntrustedIdentityException e) { throw new UntrustedIdentityException("Untrusted on send", recipient.getIdentifier(), e.getUntrustedIdentity()); } } @@ -2118,7 +2118,7 @@ public class SignalServiceMessageSender { try { SignalSessionBuilder sessionBuilder = new SignalSessionBuilder(sessionLock, new SessionBuilder(store, new SignalProtocolAddress(recipient.getIdentifier(), missingDeviceId))); sessionBuilder.process(preKey); - } catch (org.whispersystems.libsignal.UntrustedIdentityException e) { + } catch (org.signal.libsignal.protocol.UntrustedIdentityException e) { throw new UntrustedIdentityException("Untrusted identity key!", recipient.getIdentifier(), preKey.getIdentityKey()); } } diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceSenderKeyStore.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceSenderKeyStore.java index db91b2d0a9..2d7c190646 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceSenderKeyStore.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceSenderKeyStore.java @@ -1,7 +1,7 @@ package org.whispersystems.signalservice.api; -import org.whispersystems.libsignal.SignalProtocolAddress; -import org.whispersystems.libsignal.groups.state.SenderKeyStore; +import org.signal.libsignal.protocol.SignalProtocolAddress; +import org.signal.libsignal.protocol.groups.state.SenderKeyStore; import org.whispersystems.signalservice.api.push.DistributionId; import java.util.Collection; diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceSessionStore.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceSessionStore.java index 46f570f54b..278180ab1f 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceSessionStore.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceSessionStore.java @@ -1,7 +1,7 @@ package org.whispersystems.signalservice.api; -import org.whispersystems.libsignal.SignalProtocolAddress; -import org.whispersystems.libsignal.state.SessionStore; +import org.signal.libsignal.protocol.SignalProtocolAddress; +import org.signal.libsignal.protocol.state.SessionStore; import java.util.List; import java.util.Set; diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalWebSocket.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalWebSocket.java index 4e74ed8741..03809b501d 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalWebSocket.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalWebSocket.java @@ -1,6 +1,6 @@ package org.whispersystems.signalservice.api; -import org.whispersystems.libsignal.logging.Log; +import org.signal.libsignal.protocol.logging.Log; import org.whispersystems.signalservice.api.crypto.UnidentifiedAccess; import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope; import org.whispersystems.signalservice.api.websocket.WebSocketConnectionState; diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/AttachmentCipherInputStream.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/AttachmentCipherInputStream.java index 3ab022f99b..b6ce5829ce 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/AttachmentCipherInputStream.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/AttachmentCipherInputStream.java @@ -6,9 +6,9 @@ package org.whispersystems.signalservice.api.crypto; -import org.whispersystems.libsignal.InvalidMacException; -import org.whispersystems.libsignal.InvalidMessageException; -import org.whispersystems.libsignal.kdf.HKDFv3; +import org.signal.libsignal.protocol.InvalidMacException; +import org.signal.libsignal.protocol.InvalidMessageException; +import org.signal.libsignal.protocol.kdf.HKDFv3; import org.whispersystems.signalservice.internal.util.ContentLengthInputStream; import org.whispersystems.signalservice.internal.util.Util; diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/EnvelopeContent.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/EnvelopeContent.java index a2b4b31920..ef95b2cc96 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/EnvelopeContent.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/EnvelopeContent.java @@ -2,12 +2,12 @@ package org.whispersystems.signalservice.api.crypto; import org.signal.libsignal.metadata.certificate.SenderCertificate; import org.signal.libsignal.metadata.protocol.UnidentifiedSenderMessageContent; -import org.whispersystems.libsignal.InvalidKeyException; -import org.whispersystems.libsignal.SignalProtocolAddress; -import org.whispersystems.libsignal.UntrustedIdentityException; -import org.whispersystems.libsignal.protocol.CiphertextMessage; -import org.whispersystems.libsignal.protocol.DecryptionErrorMessage; -import org.whispersystems.libsignal.protocol.PlaintextContent; +import org.signal.libsignal.protocol.InvalidKeyException; +import org.signal.libsignal.protocol.SignalProtocolAddress; +import org.signal.libsignal.protocol.UntrustedIdentityException; +import org.signal.libsignal.protocol.message.CiphertextMessage; +import org.signal.libsignal.protocol.message.DecryptionErrorMessage; +import org.signal.libsignal.protocol.message.PlaintextContent; import org.whispersystems.signalservice.internal.push.OutgoingPushMessage; import org.whispersystems.signalservice.internal.push.PushTransportDetails; import org.whispersystems.signalservice.internal.push.SignalServiceProtos.Content; diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/ProfileCipher.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/ProfileCipher.java index a41e58d18d..fd318416c2 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/ProfileCipher.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/ProfileCipher.java @@ -1,8 +1,8 @@ package org.whispersystems.signalservice.api.crypto; -import org.signal.zkgroup.profiles.ProfileKey; -import org.whispersystems.libsignal.util.ByteUtil; +import org.signal.libsignal.protocol.util.ByteUtil; +import org.signal.libsignal.zkgroup.profiles.ProfileKey; import org.whispersystems.signalservice.internal.util.Util; import java.io.IOException; diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/ProfileCipherInputStream.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/ProfileCipherInputStream.java index af409c6b9c..9ff6270fca 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/ProfileCipherInputStream.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/ProfileCipherInputStream.java @@ -1,8 +1,8 @@ package org.whispersystems.signalservice.api.crypto; import org.signal.libsignal.crypto.Aes256GcmDecryption; -import org.signal.zkgroup.profiles.ProfileKey; -import org.whispersystems.libsignal.InvalidKeyException; +import org.signal.libsignal.protocol.InvalidKeyException; +import org.signal.libsignal.zkgroup.profiles.ProfileKey; import org.whispersystems.signalservice.internal.util.Util; import java.io.FilterInputStream; diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/ProfileCipherOutputStream.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/ProfileCipherOutputStream.java index bd3d1c0de3..04bb0b531e 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/ProfileCipherOutputStream.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/ProfileCipherOutputStream.java @@ -1,6 +1,6 @@ package org.whispersystems.signalservice.api.crypto; -import org.signal.zkgroup.profiles.ProfileKey; +import org.signal.libsignal.zkgroup.profiles.ProfileKey; import java.io.IOException; import java.io.OutputStream; diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalGroupCipher.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalGroupCipher.java index 0ff7ebfe4b..c92f1e89fc 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalGroupCipher.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalGroupCipher.java @@ -1,11 +1,11 @@ package org.whispersystems.signalservice.api.crypto; -import org.whispersystems.libsignal.DuplicateMessageException; -import org.whispersystems.libsignal.InvalidMessageException; -import org.whispersystems.libsignal.LegacyMessageException; -import org.whispersystems.libsignal.NoSessionException; -import org.whispersystems.libsignal.groups.GroupCipher; -import org.whispersystems.libsignal.protocol.CiphertextMessage; +import org.signal.libsignal.protocol.DuplicateMessageException; +import org.signal.libsignal.protocol.InvalidMessageException; +import org.signal.libsignal.protocol.LegacyMessageException; +import org.signal.libsignal.protocol.NoSessionException; +import org.signal.libsignal.protocol.groups.GroupCipher; +import org.signal.libsignal.protocol.message.CiphertextMessage; import org.whispersystems.signalservice.api.SignalSessionLock; import java.util.UUID; diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalGroupSessionBuilder.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalGroupSessionBuilder.java index 4cfc783758..97226f7287 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalGroupSessionBuilder.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalGroupSessionBuilder.java @@ -1,9 +1,9 @@ package org.whispersystems.signalservice.api.crypto; -import org.whispersystems.libsignal.SessionBuilder; -import org.whispersystems.libsignal.SignalProtocolAddress; -import org.whispersystems.libsignal.groups.GroupSessionBuilder; -import org.whispersystems.libsignal.protocol.SenderKeyDistributionMessage; +import org.signal.libsignal.protocol.SessionBuilder; +import org.signal.libsignal.protocol.SignalProtocolAddress; +import org.signal.libsignal.protocol.groups.GroupSessionBuilder; +import org.signal.libsignal.protocol.message.SenderKeyDistributionMessage; import org.whispersystems.signalservice.api.SignalSessionLock; import java.util.UUID; diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalSealedSessionCipher.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalSealedSessionCipher.java index f7d0f5aa97..12b67c4a93 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalSealedSessionCipher.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalSealedSessionCipher.java @@ -14,11 +14,11 @@ import org.signal.libsignal.metadata.SealedSessionCipher; import org.signal.libsignal.metadata.SelfSendException; import org.signal.libsignal.metadata.certificate.CertificateValidator; import org.signal.libsignal.metadata.protocol.UnidentifiedSenderMessageContent; -import org.whispersystems.libsignal.InvalidKeyException; -import org.whispersystems.libsignal.InvalidRegistrationIdException; -import org.whispersystems.libsignal.NoSessionException; -import org.whispersystems.libsignal.SignalProtocolAddress; -import org.whispersystems.libsignal.UntrustedIdentityException; +import org.signal.libsignal.protocol.InvalidKeyException; +import org.signal.libsignal.protocol.InvalidRegistrationIdException; +import org.signal.libsignal.protocol.NoSessionException; +import org.signal.libsignal.protocol.SignalProtocolAddress; +import org.signal.libsignal.protocol.UntrustedIdentityException; import org.whispersystems.signalservice.api.SignalSessionLock; import java.util.List; diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalServiceCipher.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalServiceCipher.java index 52185e5475..eb54ef8d9d 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalServiceCipher.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalServiceCipher.java @@ -24,23 +24,23 @@ import org.signal.libsignal.metadata.SelfSendException; import org.signal.libsignal.metadata.certificate.CertificateValidator; import org.signal.libsignal.metadata.certificate.SenderCertificate; import org.signal.libsignal.metadata.protocol.UnidentifiedSenderMessageContent; -import org.whispersystems.libsignal.DuplicateMessageException; -import org.whispersystems.libsignal.InvalidKeyException; -import org.whispersystems.libsignal.InvalidKeyIdException; -import org.whispersystems.libsignal.InvalidMessageException; -import org.whispersystems.libsignal.InvalidRegistrationIdException; -import org.whispersystems.libsignal.InvalidVersionException; -import org.whispersystems.libsignal.LegacyMessageException; -import org.whispersystems.libsignal.NoSessionException; -import org.whispersystems.libsignal.SessionCipher; -import org.whispersystems.libsignal.SignalProtocolAddress; -import org.whispersystems.libsignal.UntrustedIdentityException; -import org.whispersystems.libsignal.groups.GroupCipher; -import org.whispersystems.libsignal.logging.Log; -import org.whispersystems.libsignal.protocol.CiphertextMessage; -import org.whispersystems.libsignal.protocol.PlaintextContent; -import org.whispersystems.libsignal.protocol.PreKeySignalMessage; -import org.whispersystems.libsignal.protocol.SignalMessage; +import org.signal.libsignal.protocol.DuplicateMessageException; +import org.signal.libsignal.protocol.InvalidKeyException; +import org.signal.libsignal.protocol.InvalidKeyIdException; +import org.signal.libsignal.protocol.InvalidMessageException; +import org.signal.libsignal.protocol.InvalidRegistrationIdException; +import org.signal.libsignal.protocol.InvalidVersionException; +import org.signal.libsignal.protocol.LegacyMessageException; +import org.signal.libsignal.protocol.NoSessionException; +import org.signal.libsignal.protocol.SessionCipher; +import org.signal.libsignal.protocol.SignalProtocolAddress; +import org.signal.libsignal.protocol.UntrustedIdentityException; +import org.signal.libsignal.protocol.groups.GroupCipher; +import org.signal.libsignal.protocol.logging.Log; +import org.signal.libsignal.protocol.message.CiphertextMessage; +import org.signal.libsignal.protocol.message.PlaintextContent; +import org.signal.libsignal.protocol.message.PreKeySignalMessage; +import org.signal.libsignal.protocol.message.SignalMessage; import org.whispersystems.signalservice.api.InvalidMessageStructureException; import org.whispersystems.signalservice.api.SignalServiceAccountDataStore; import org.whispersystems.signalservice.api.SignalSessionLock; diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalSessionBuilder.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalSessionBuilder.java index 76e207d196..d1499c2e23 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalSessionBuilder.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalSessionBuilder.java @@ -1,9 +1,9 @@ package org.whispersystems.signalservice.api.crypto; -import org.whispersystems.libsignal.InvalidKeyException; -import org.whispersystems.libsignal.SessionBuilder; -import org.whispersystems.libsignal.UntrustedIdentityException; -import org.whispersystems.libsignal.state.PreKeyBundle; +import org.signal.libsignal.protocol.InvalidKeyException; +import org.signal.libsignal.protocol.SessionBuilder; +import org.signal.libsignal.protocol.UntrustedIdentityException; +import org.signal.libsignal.protocol.state.PreKeyBundle; import org.whispersystems.signalservice.api.SignalSessionLock; /** diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalSessionCipher.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalSessionCipher.java index 3c339c18a7..f75844bd09 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalSessionCipher.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalSessionCipher.java @@ -1,16 +1,17 @@ package org.whispersystems.signalservice.api.crypto; -import org.whispersystems.libsignal.DuplicateMessageException; -import org.whispersystems.libsignal.InvalidKeyException; -import org.whispersystems.libsignal.InvalidKeyIdException; -import org.whispersystems.libsignal.InvalidMessageException; -import org.whispersystems.libsignal.LegacyMessageException; -import org.whispersystems.libsignal.NoSessionException; -import org.whispersystems.libsignal.SessionCipher; -import org.whispersystems.libsignal.UntrustedIdentityException; -import org.whispersystems.libsignal.protocol.CiphertextMessage; -import org.whispersystems.libsignal.protocol.PreKeySignalMessage; -import org.whispersystems.libsignal.protocol.SignalMessage; +import org.signal.libsignal.protocol.DuplicateMessageException; +import org.signal.libsignal.protocol.InvalidKeyException; +import org.signal.libsignal.protocol.InvalidKeyIdException; +import org.signal.libsignal.protocol.InvalidMessageException; +import org.signal.libsignal.protocol.InvalidVersionException; +import org.signal.libsignal.protocol.LegacyMessageException; +import org.signal.libsignal.protocol.NoSessionException; +import org.signal.libsignal.protocol.SessionCipher; +import org.signal.libsignal.protocol.UntrustedIdentityException; +import org.signal.libsignal.protocol.message.CiphertextMessage; +import org.signal.libsignal.protocol.message.PreKeySignalMessage; +import org.signal.libsignal.protocol.message.SignalMessage; import org.whispersystems.signalservice.api.SignalSessionLock; /** @@ -26,19 +27,19 @@ public class SignalSessionCipher { this.cipher = cipher; } - public CiphertextMessage encrypt(byte[] paddedMessage) throws org.whispersystems.libsignal.UntrustedIdentityException { + public CiphertextMessage encrypt(byte[] paddedMessage) throws org.signal.libsignal.protocol.UntrustedIdentityException { try (SignalSessionLock.Lock unused = lock.acquire()) { return cipher.encrypt(paddedMessage); } } - public byte[] decrypt(PreKeySignalMessage ciphertext) throws DuplicateMessageException, LegacyMessageException, InvalidMessageException, InvalidKeyIdException, InvalidKeyException, org.whispersystems.libsignal.UntrustedIdentityException { + public byte[] decrypt(PreKeySignalMessage ciphertext) throws DuplicateMessageException, LegacyMessageException, InvalidMessageException, InvalidKeyIdException, InvalidKeyException, org.signal.libsignal.protocol.UntrustedIdentityException { try (SignalSessionLock.Lock unused = lock.acquire()) { return cipher.decrypt(ciphertext); } } - public byte[] decrypt(SignalMessage ciphertext) throws InvalidMessageException, DuplicateMessageException, LegacyMessageException, NoSessionException, UntrustedIdentityException { + public byte[] decrypt(SignalMessage ciphertext) throws InvalidMessageException, InvalidVersionException, DuplicateMessageException, LegacyMessageException, NoSessionException, UntrustedIdentityException { try (SignalSessionLock.Lock unused = lock.acquire()) { return cipher.decrypt(ciphertext); } diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/UnidentifiedAccess.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/UnidentifiedAccess.java index 41381c0fd8..f94e1ed4ed 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/UnidentifiedAccess.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/UnidentifiedAccess.java @@ -3,8 +3,8 @@ package org.whispersystems.signalservice.api.crypto; import org.signal.libsignal.metadata.certificate.InvalidCertificateException; import org.signal.libsignal.metadata.certificate.SenderCertificate; -import org.signal.zkgroup.profiles.ProfileKey; -import org.whispersystems.libsignal.util.ByteUtil; +import org.signal.libsignal.protocol.util.ByteUtil; +import org.signal.libsignal.zkgroup.profiles.ProfileKey; import java.security.InvalidAlgorithmParameterException; import java.security.InvalidKeyException; diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/UntrustedIdentityException.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/UntrustedIdentityException.java index b0ec664645..99c94ac3f2 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/UntrustedIdentityException.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/UntrustedIdentityException.java @@ -6,7 +6,7 @@ package org.whispersystems.signalservice.api.crypto; -import org.whispersystems.libsignal.IdentityKey; +import org.signal.libsignal.protocol.IdentityKey; public class UntrustedIdentityException extends Exception { diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/ClientZkOperations.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/ClientZkOperations.java index 63636436cf..f131b5aec0 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/ClientZkOperations.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/ClientZkOperations.java @@ -1,9 +1,9 @@ package org.whispersystems.signalservice.api.groupsv2; -import org.signal.zkgroup.ServerPublicParams; -import org.signal.zkgroup.auth.ClientZkAuthOperations; -import org.signal.zkgroup.profiles.ClientZkProfileOperations; -import org.signal.zkgroup.receipts.ClientZkReceiptOperations; +import org.signal.libsignal.zkgroup.ServerPublicParams; +import org.signal.libsignal.zkgroup.auth.ClientZkAuthOperations; +import org.signal.libsignal.zkgroup.profiles.ClientZkProfileOperations; +import org.signal.libsignal.zkgroup.receipts.ClientZkReceiptOperations; import org.whispersystems.signalservice.internal.configuration.SignalServiceConfiguration; /** diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupUtil.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupUtil.java index 6691f9e30f..37caf944eb 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupUtil.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupUtil.java @@ -2,6 +2,7 @@ package org.whispersystems.signalservice.api.groupsv2; import com.google.protobuf.ByteString; +import org.signal.libsignal.protocol.logging.Log; import org.signal.storageservice.protos.groups.AccessControl; import org.signal.storageservice.protos.groups.Member; import org.signal.storageservice.protos.groups.local.DecryptedApproveMember; @@ -14,7 +15,6 @@ import org.signal.storageservice.protos.groups.local.DecryptedPendingMember; import org.signal.storageservice.protos.groups.local.DecryptedPendingMemberRemoval; import org.signal.storageservice.protos.groups.local.DecryptedRequestingMember; import org.signal.storageservice.protos.groups.local.EnabledState; -import org.whispersystems.libsignal.logging.Log; import org.whispersystems.signalservice.api.util.UuidUtil; import java.util.ArrayList; diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupCandidate.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupCandidate.java index e225464e16..14c33480c5 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupCandidate.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupCandidate.java @@ -1,6 +1,6 @@ package org.whispersystems.signalservice.api.groupsv2; -import org.signal.zkgroup.profiles.ProfileKeyCredential; +import org.signal.libsignal.zkgroup.profiles.ProfileKeyCredential; import java.util.ArrayList; import java.util.Collection; diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Api.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Api.java index e7dda28988..3da639fcdb 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Api.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Api.java @@ -2,6 +2,14 @@ package org.whispersystems.signalservice.api.groupsv2; import com.google.protobuf.ByteString; +import org.signal.libsignal.zkgroup.InvalidInputException; +import org.signal.libsignal.zkgroup.VerificationFailedException; +import org.signal.libsignal.zkgroup.auth.AuthCredential; +import org.signal.libsignal.zkgroup.auth.AuthCredentialPresentation; +import org.signal.libsignal.zkgroup.auth.AuthCredentialResponse; +import org.signal.libsignal.zkgroup.auth.ClientZkAuthOperations; +import org.signal.libsignal.zkgroup.groups.ClientZkGroupCipher; +import org.signal.libsignal.zkgroup.groups.GroupSecretParams; import org.signal.storageservice.protos.groups.AvatarUploadAttributes; import org.signal.storageservice.protos.groups.Group; import org.signal.storageservice.protos.groups.GroupAttributeBlob; @@ -12,14 +20,6 @@ import org.signal.storageservice.protos.groups.GroupJoinInfo; import org.signal.storageservice.protos.groups.local.DecryptedGroup; import org.signal.storageservice.protos.groups.local.DecryptedGroupChange; import org.signal.storageservice.protos.groups.local.DecryptedGroupJoinInfo; -import org.signal.zkgroup.InvalidInputException; -import org.signal.zkgroup.VerificationFailedException; -import org.signal.zkgroup.auth.AuthCredential; -import org.signal.zkgroup.auth.AuthCredentialPresentation; -import org.signal.zkgroup.auth.AuthCredentialResponse; -import org.signal.zkgroup.auth.ClientZkAuthOperations; -import org.signal.zkgroup.groups.ClientZkGroupCipher; -import org.signal.zkgroup.groups.GroupSecretParams; import org.whispersystems.signalservice.api.push.ACI; import org.whispersystems.signalservice.internal.push.PushServiceSocket; import org.whispersystems.signalservice.internal.push.exceptions.ForbiddenException; diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2AuthorizationString.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2AuthorizationString.java index 6618bac21c..bcd3e782e9 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2AuthorizationString.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2AuthorizationString.java @@ -1,7 +1,7 @@ package org.whispersystems.signalservice.api.groupsv2; -import org.signal.zkgroup.auth.AuthCredentialPresentation; -import org.signal.zkgroup.groups.GroupSecretParams; +import org.signal.libsignal.zkgroup.auth.AuthCredentialPresentation; +import org.signal.libsignal.zkgroup.groups.GroupSecretParams; import org.whispersystems.signalservice.internal.util.Hex; import okhttp3.Credentials; diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Operations.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Operations.java index b1b96e3bb5..a880c19648 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Operations.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Operations.java @@ -3,6 +3,20 @@ package org.whispersystems.signalservice.api.groupsv2; import com.google.protobuf.ByteString; import com.google.protobuf.InvalidProtocolBufferException; +import org.signal.libsignal.protocol.logging.Log; +import org.signal.libsignal.zkgroup.InvalidInputException; +import org.signal.libsignal.zkgroup.NotarySignature; +import org.signal.libsignal.zkgroup.ServerPublicParams; +import org.signal.libsignal.zkgroup.VerificationFailedException; +import org.signal.libsignal.zkgroup.auth.ClientZkAuthOperations; +import org.signal.libsignal.zkgroup.groups.ClientZkGroupCipher; +import org.signal.libsignal.zkgroup.groups.GroupSecretParams; +import org.signal.libsignal.zkgroup.groups.ProfileKeyCiphertext; +import org.signal.libsignal.zkgroup.groups.UuidCiphertext; +import org.signal.libsignal.zkgroup.profiles.ClientZkProfileOperations; +import org.signal.libsignal.zkgroup.profiles.ProfileKey; +import org.signal.libsignal.zkgroup.profiles.ProfileKeyCredential; +import org.signal.libsignal.zkgroup.profiles.ProfileKeyCredentialPresentation; import org.signal.storageservice.protos.groups.AccessControl; import org.signal.storageservice.protos.groups.BannedMember; import org.signal.storageservice.protos.groups.Group; @@ -25,20 +39,6 @@ import org.signal.storageservice.protos.groups.local.DecryptedRequestingMember; import org.signal.storageservice.protos.groups.local.DecryptedString; import org.signal.storageservice.protos.groups.local.DecryptedTimer; import org.signal.storageservice.protos.groups.local.EnabledState; -import org.signal.zkgroup.InvalidInputException; -import org.signal.zkgroup.NotarySignature; -import org.signal.zkgroup.ServerPublicParams; -import org.signal.zkgroup.VerificationFailedException; -import org.signal.zkgroup.auth.ClientZkAuthOperations; -import org.signal.zkgroup.groups.ClientZkGroupCipher; -import org.signal.zkgroup.groups.GroupSecretParams; -import org.signal.zkgroup.groups.ProfileKeyCiphertext; -import org.signal.zkgroup.groups.UuidCiphertext; -import org.signal.zkgroup.profiles.ClientZkProfileOperations; -import org.signal.zkgroup.profiles.ProfileKey; -import org.signal.zkgroup.profiles.ProfileKeyCredential; -import org.signal.zkgroup.profiles.ProfileKeyCredentialPresentation; -import org.whispersystems.libsignal.logging.Log; import org.whispersystems.signalservice.api.util.UuidUtil; import java.security.SecureRandom; diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/InvalidGroupStateException.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/InvalidGroupStateException.java index c010350c40..3b05f55652 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/InvalidGroupStateException.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/InvalidGroupStateException.java @@ -1,6 +1,6 @@ package org.whispersystems.signalservice.api.groupsv2; -import org.signal.zkgroup.InvalidInputException; +import org.signal.libsignal.zkgroup.InvalidInputException; /** * Thrown when a group has some data that cannot be decrypted, or is in some other way in an diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/PartialDecryptedGroup.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/PartialDecryptedGroup.java index 5c0a9043ca..1b8dcea2f3 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/PartialDecryptedGroup.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/PartialDecryptedGroup.java @@ -1,11 +1,11 @@ package org.whispersystems.signalservice.api.groupsv2; +import org.signal.libsignal.zkgroup.VerificationFailedException; +import org.signal.libsignal.zkgroup.groups.GroupSecretParams; import org.signal.storageservice.protos.groups.Group; import org.signal.storageservice.protos.groups.local.DecryptedGroup; import org.signal.storageservice.protos.groups.local.DecryptedMember; import org.signal.storageservice.protos.groups.local.DecryptedPendingMember; -import org.signal.zkgroup.VerificationFailedException; -import org.signal.zkgroup.groups.GroupSecretParams; import java.io.IOException; import java.util.List; diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/UuidProfileKey.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/UuidProfileKey.java index 04a403a1ab..0c49ecbac6 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/UuidProfileKey.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/UuidProfileKey.java @@ -1,6 +1,6 @@ package org.whispersystems.signalservice.api.groupsv2; -import org.signal.zkgroup.profiles.ProfileKey; +import org.signal.libsignal.zkgroup.profiles.ProfileKey; import java.util.UUID; diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/UuidProfileKeyCredential.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/UuidProfileKeyCredential.java index 61ee41aa8a..df187e7156 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/UuidProfileKeyCredential.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/UuidProfileKeyCredential.java @@ -1,6 +1,6 @@ package org.whispersystems.signalservice.api.groupsv2; -import org.signal.zkgroup.profiles.ProfileKeyCredential; +import org.signal.libsignal.zkgroup.profiles.ProfileKeyCredential; import java.util.UUID; diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SendMessageResult.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SendMessageResult.java index 1a916b954f..e7f8f5222d 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SendMessageResult.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SendMessageResult.java @@ -1,7 +1,7 @@ package org.whispersystems.signalservice.api.messages; -import org.whispersystems.libsignal.IdentityKey; +import org.signal.libsignal.protocol.IdentityKey; import org.whispersystems.signalservice.api.push.SignalServiceAddress; import org.whispersystems.signalservice.api.push.exceptions.ProofRequiredException; import org.whispersystems.signalservice.api.push.exceptions.RateLimitException; diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceContent.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceContent.java index f90297db49..2962fddb17 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceContent.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceContent.java @@ -11,15 +11,16 @@ import com.google.protobuf.InvalidProtocolBufferException; import org.signal.libsignal.metadata.ProtocolInvalidKeyException; import org.signal.libsignal.metadata.ProtocolInvalidMessageException; -import org.signal.zkgroup.InvalidInputException; -import org.signal.zkgroup.groups.GroupMasterKey; -import org.whispersystems.libsignal.IdentityKey; -import org.whispersystems.libsignal.InvalidKeyException; -import org.whispersystems.libsignal.InvalidMessageException; -import org.whispersystems.libsignal.LegacyMessageException; -import org.whispersystems.libsignal.logging.Log; -import org.whispersystems.libsignal.protocol.DecryptionErrorMessage; -import org.whispersystems.libsignal.protocol.SenderKeyDistributionMessage; +import org.signal.libsignal.protocol.IdentityKey; +import org.signal.libsignal.protocol.InvalidKeyException; +import org.signal.libsignal.protocol.InvalidMessageException; +import org.signal.libsignal.protocol.InvalidVersionException; +import org.signal.libsignal.protocol.LegacyMessageException; +import org.signal.libsignal.protocol.logging.Log; +import org.signal.libsignal.protocol.message.DecryptionErrorMessage; +import org.signal.libsignal.protocol.message.SenderKeyDistributionMessage; +import org.signal.libsignal.zkgroup.InvalidInputException; +import org.signal.libsignal.zkgroup.groups.GroupMasterKey; import org.whispersystems.signalservice.api.InvalidMessageStructureException; import org.whispersystems.signalservice.api.messages.calls.AnswerMessage; import org.whispersystems.signalservice.api.messages.calls.BusyMessage; @@ -450,7 +451,7 @@ public final class SignalServiceContent { if (message.hasSenderKeyDistributionMessage()) { try { senderKeyDistributionMessage = Optional.of(new SenderKeyDistributionMessage(message.getSenderKeyDistributionMessage().toByteArray())); - } catch (LegacyMessageException | InvalidMessageException e) { + } catch (LegacyMessageException | InvalidMessageException | InvalidVersionException | InvalidKeyException e) { Log.w(TAG, "Failed to parse SenderKeyDistributionMessage!", e); } } diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceDataMessage.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceDataMessage.java index 63626e30de..0ef162bef3 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceDataMessage.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceDataMessage.java @@ -6,8 +6,8 @@ package org.whispersystems.signalservice.api.messages; -import org.signal.zkgroup.groups.GroupSecretParams; -import org.whispersystems.libsignal.InvalidMessageException; +import org.signal.libsignal.protocol.InvalidMessageException; +import org.signal.libsignal.zkgroup.groups.GroupSecretParams; import org.whispersystems.signalservice.api.messages.shared.SharedContact; import org.whispersystems.signalservice.api.push.ServiceId; import org.whispersystems.signalservice.api.push.SignalServiceAddress; diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceEnvelope.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceEnvelope.java index 366a42b08f..63ef1c1d6b 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceEnvelope.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceEnvelope.java @@ -221,14 +221,14 @@ public class SignalServiceEnvelope { } /** - * @return true if the containing message is a {@link org.whispersystems.libsignal.protocol.SignalMessage} + * @return true if the containing message is a {@link org.signal.libsignal.protocol.message.SignalMessage} */ public boolean isSignalMessage() { return envelope.getType().getNumber() == Envelope.Type.CIPHERTEXT_VALUE; } /** - * @return true if the containing message is a {@link org.whispersystems.libsignal.protocol.PreKeySignalMessage} + * @return true if the containing message is a {@link org.signal.libsignal.protocol.message.PreKeySignalMessage} */ public boolean isPreKeySignalMessage() { return envelope.getType().getNumber() == Envelope.Type.PREKEY_BUNDLE_VALUE; diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceGroupContext.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceGroupContext.java index 204a30254a..b3f92b9c38 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceGroupContext.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceGroupContext.java @@ -1,6 +1,6 @@ package org.whispersystems.signalservice.api.messages; -import org.whispersystems.libsignal.InvalidMessageException; +import org.signal.libsignal.protocol.InvalidMessageException; import java.util.Optional; diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceGroupV2.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceGroupV2.java index a4789a8d07..7391fce2ba 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceGroupV2.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceGroupV2.java @@ -1,7 +1,7 @@ package org.whispersystems.signalservice.api.messages; -import org.signal.zkgroup.InvalidInputException; -import org.signal.zkgroup.groups.GroupMasterKey; +import org.signal.libsignal.zkgroup.InvalidInputException; +import org.signal.libsignal.zkgroup.groups.GroupMasterKey; import org.whispersystems.signalservice.internal.push.SignalServiceProtos; /** diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContact.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContact.java index 486b05830b..b80387f470 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContact.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContact.java @@ -6,7 +6,7 @@ package org.whispersystems.signalservice.api.messages.multidevice; -import org.signal.zkgroup.profiles.ProfileKey; +import org.signal.libsignal.zkgroup.profiles.ProfileKey; import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentStream; import org.whispersystems.signalservice.api.push.SignalServiceAddress; diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContactsInputStream.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContactsInputStream.java index c3886086fc..8cc7320c2b 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContactsInputStream.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContactsInputStream.java @@ -6,12 +6,12 @@ package org.whispersystems.signalservice.api.messages.multidevice; -import org.signal.zkgroup.InvalidInputException; -import org.signal.zkgroup.profiles.ProfileKey; -import org.whispersystems.libsignal.IdentityKey; -import org.whispersystems.libsignal.InvalidKeyException; -import org.whispersystems.libsignal.InvalidMessageException; -import org.whispersystems.libsignal.logging.Log; +import org.signal.libsignal.protocol.IdentityKey; +import org.signal.libsignal.protocol.InvalidKeyException; +import org.signal.libsignal.protocol.InvalidMessageException; +import org.signal.libsignal.protocol.logging.Log; +import org.signal.libsignal.zkgroup.InvalidInputException; +import org.signal.libsignal.zkgroup.profiles.ProfileKey; import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentStream; import org.whispersystems.signalservice.api.push.ServiceId; import org.whispersystems.signalservice.api.push.SignalServiceAddress; diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/VerifiedMessage.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/VerifiedMessage.java index 501be584a9..d96ef4eabd 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/VerifiedMessage.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/VerifiedMessage.java @@ -1,7 +1,7 @@ package org.whispersystems.signalservice.api.messages.multidevice; -import org.whispersystems.libsignal.IdentityKey; +import org.signal.libsignal.protocol.IdentityKey; import org.whispersystems.signalservice.api.push.SignalServiceAddress; public class VerifiedMessage { diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/profiles/ProfileAndCredential.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/profiles/ProfileAndCredential.java index 9013a575d8..87f9b71fab 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/profiles/ProfileAndCredential.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/profiles/ProfileAndCredential.java @@ -1,6 +1,6 @@ package org.whispersystems.signalservice.api.profiles; -import org.signal.zkgroup.profiles.ProfileKeyCredential; +import org.signal.libsignal.zkgroup.profiles.ProfileKeyCredential; import java.util.Optional; diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/profiles/SignalServiceProfile.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/profiles/SignalServiceProfile.java index 47d03af31c..b1e99ea5a0 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/profiles/SignalServiceProfile.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/profiles/SignalServiceProfile.java @@ -7,9 +7,9 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import org.signal.zkgroup.InvalidInputException; -import org.signal.zkgroup.profiles.ProfileKeyCredentialResponse; -import org.whispersystems.libsignal.logging.Log; +import org.signal.libsignal.protocol.logging.Log; +import org.signal.libsignal.zkgroup.InvalidInputException; +import org.signal.libsignal.zkgroup.profiles.ProfileKeyCredentialResponse; import org.whispersystems.signalservice.api.push.ServiceId; import org.whispersystems.signalservice.internal.util.JsonUtil; diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/ServiceId.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/ServiceId.java index 69fa985e54..d26636282c 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/ServiceId.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/ServiceId.java @@ -2,7 +2,7 @@ package org.whispersystems.signalservice.api.push; import com.google.protobuf.ByteString; -import org.whispersystems.libsignal.SignalProtocolAddress; +import org.signal.libsignal.protocol.SignalProtocolAddress; import org.whispersystems.signalservice.api.util.UuidUtil; import java.util.Collection; diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/SignedPreKeyEntity.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/SignedPreKeyEntity.java index 0908cb9ef9..f5b108f118 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/SignedPreKeyEntity.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/SignedPreKeyEntity.java @@ -16,7 +16,7 @@ import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import org.whispersystems.libsignal.ecc.ECPublicKey; +import org.signal.libsignal.protocol.ecc.ECPublicKey; import org.whispersystems.signalservice.internal.push.PreKeyEntity; import org.whispersystems.util.Base64; diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ProofRequiredException.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ProofRequiredException.java index 4c4f3f558a..e19e5fa415 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ProofRequiredException.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ProofRequiredException.java @@ -1,6 +1,6 @@ package org.whispersystems.signalservice.api.push.exceptions; -import org.whispersystems.libsignal.logging.Log; +import org.signal.libsignal.protocol.logging.Log; import org.whispersystems.signalservice.internal.push.ProofRequiredResponse; import java.util.HashSet; diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/services/CdshSocket.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/services/CdshSocket.java index 9fa7a414cf..12cf640c5a 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/services/CdshSocket.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/services/CdshSocket.java @@ -3,8 +3,8 @@ package org.whispersystems.signalservice.api.services; import org.signal.cds.ClientRequest; import org.signal.cds.ClientResponse; import org.signal.libsignal.hsmenclave.HsmEnclaveClient; -import org.whispersystems.libsignal.logging.Log; -import org.whispersystems.libsignal.util.Pair; +import org.signal.libsignal.protocol.logging.Log; +import org.signal.libsignal.protocol.util.Pair; import org.whispersystems.signalservice.api.push.TrustStore; import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException; import org.whispersystems.signalservice.api.util.Tls12SocketFactory; diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/services/CdshV1Service.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/services/CdshV1Service.java index 1a747eee28..2099118691 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/services/CdshV1Service.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/services/CdshV1Service.java @@ -4,7 +4,7 @@ import com.google.protobuf.ByteString; import org.signal.cds.ClientRequest; import org.signal.cds.ClientResponse; -import org.whispersystems.libsignal.util.ByteUtil; +import org.signal.libsignal.protocol.util.ByteUtil; import org.whispersystems.signalservice.api.push.ACI; import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException; import org.whispersystems.signalservice.internal.ServiceResponse; diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/services/CdshV2Service.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/services/CdshV2Service.java index a81b698877..3f4014cb4c 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/services/CdshV2Service.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/services/CdshV2Service.java @@ -4,8 +4,8 @@ import com.google.protobuf.ByteString; import org.signal.cds.ClientRequest; import org.signal.cds.ClientResponse; -import org.signal.zkgroup.profiles.ProfileKey; -import org.whispersystems.libsignal.util.ByteUtil; +import org.signal.libsignal.protocol.util.ByteUtil; +import org.signal.libsignal.zkgroup.profiles.ProfileKey; import org.whispersystems.signalservice.api.crypto.UnidentifiedAccess; import org.whispersystems.signalservice.api.push.ACI; import org.whispersystems.signalservice.api.push.PNI; diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/services/DonationsService.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/services/DonationsService.java index b8584e5957..30292d03db 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/services/DonationsService.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/services/DonationsService.java @@ -1,10 +1,10 @@ package org.whispersystems.signalservice.api.services; -import org.signal.zkgroup.receipts.ReceiptCredentialPresentation; -import org.signal.zkgroup.receipts.ReceiptCredentialRequest; -import org.signal.zkgroup.receipts.ReceiptCredentialResponse; -import org.whispersystems.libsignal.logging.Log; -import org.whispersystems.libsignal.util.Pair; +import org.signal.libsignal.protocol.logging.Log; +import org.signal.libsignal.protocol.util.Pair; +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.groupsv2.GroupsV2Operations; import org.whispersystems.signalservice.api.profiles.SignalServiceProfile; import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException; diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/services/ProfileService.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/services/ProfileService.java index 63c003b4ec..5e89837f84 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/services/ProfileService.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/services/ProfileService.java @@ -1,13 +1,13 @@ package org.whispersystems.signalservice.api.services; -import org.signal.zkgroup.VerificationFailedException; -import org.signal.zkgroup.profiles.ClientZkProfileOperations; -import org.signal.zkgroup.profiles.ProfileKey; -import org.signal.zkgroup.profiles.ProfileKeyCredential; -import org.signal.zkgroup.profiles.ProfileKeyCredentialRequest; -import org.signal.zkgroup.profiles.ProfileKeyCredentialRequestContext; -import org.signal.zkgroup.profiles.ProfileKeyVersion; -import org.whispersystems.libsignal.util.Pair; +import org.signal.libsignal.protocol.util.Pair; +import org.signal.libsignal.zkgroup.VerificationFailedException; +import org.signal.libsignal.zkgroup.profiles.ClientZkProfileOperations; +import org.signal.libsignal.zkgroup.profiles.ProfileKey; +import org.signal.libsignal.zkgroup.profiles.ProfileKeyCredential; +import org.signal.libsignal.zkgroup.profiles.ProfileKeyCredentialRequest; +import org.signal.libsignal.zkgroup.profiles.ProfileKeyCredentialRequestContext; +import org.signal.libsignal.zkgroup.profiles.ProfileKeyVersion; import org.whispersystems.signalservice.api.SignalServiceMessageReceiver; import org.whispersystems.signalservice.api.SignalWebSocket; import org.whispersystems.signalservice.api.crypto.UnidentifiedAccess; diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/storage/SignalAccountRecord.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/storage/SignalAccountRecord.java index 9cc04ee786..c8719b237a 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/storage/SignalAccountRecord.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/storage/SignalAccountRecord.java @@ -3,7 +3,7 @@ package org.whispersystems.signalservice.api.storage; import com.google.protobuf.ByteString; import com.google.protobuf.InvalidProtocolBufferException; -import org.whispersystems.libsignal.logging.Log; +import org.signal.libsignal.protocol.logging.Log; import org.whispersystems.signalservice.api.payments.PaymentsConstants; import org.whispersystems.signalservice.api.push.ServiceId; import org.whispersystems.signalservice.api.push.SignalServiceAddress; diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/storage/SignalContactRecord.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/storage/SignalContactRecord.java index b47419c510..b54f595a69 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/storage/SignalContactRecord.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/storage/SignalContactRecord.java @@ -3,7 +3,7 @@ package org.whispersystems.signalservice.api.storage; import com.google.protobuf.ByteString; import com.google.protobuf.InvalidProtocolBufferException; -import org.whispersystems.libsignal.logging.Log; +import org.signal.libsignal.protocol.logging.Log; import org.whispersystems.signalservice.api.push.ServiceId; import org.whispersystems.signalservice.api.push.SignalServiceAddress; import org.whispersystems.signalservice.api.util.OptionalUtil; diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/storage/SignalGroupV1Record.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/storage/SignalGroupV1Record.java index b4be005c2b..3a5fee9f46 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/storage/SignalGroupV1Record.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/storage/SignalGroupV1Record.java @@ -3,7 +3,7 @@ package org.whispersystems.signalservice.api.storage; import com.google.protobuf.ByteString; import com.google.protobuf.InvalidProtocolBufferException; -import org.whispersystems.libsignal.logging.Log; +import org.signal.libsignal.protocol.logging.Log; import org.whispersystems.signalservice.api.util.ProtoUtil; import org.whispersystems.signalservice.internal.storage.protos.GroupV1Record; diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/storage/SignalGroupV2Record.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/storage/SignalGroupV2Record.java index ece5d316b2..0a6f6d04c1 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/storage/SignalGroupV2Record.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/storage/SignalGroupV2Record.java @@ -3,9 +3,9 @@ package org.whispersystems.signalservice.api.storage; import com.google.protobuf.ByteString; import com.google.protobuf.InvalidProtocolBufferException; -import org.signal.zkgroup.InvalidInputException; -import org.signal.zkgroup.groups.GroupMasterKey; -import org.whispersystems.libsignal.logging.Log; +import org.signal.libsignal.protocol.logging.Log; +import org.signal.libsignal.zkgroup.InvalidInputException; +import org.signal.libsignal.zkgroup.groups.GroupMasterKey; import org.whispersystems.signalservice.api.util.ProtoUtil; import org.whispersystems.signalservice.internal.storage.protos.GroupV2Record; diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/storage/SignalStorageCipher.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/storage/SignalStorageCipher.java index c1b0055cbd..f716f44d36 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/storage/SignalStorageCipher.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/storage/SignalStorageCipher.java @@ -1,6 +1,6 @@ package org.whispersystems.signalservice.api.storage; -import org.whispersystems.libsignal.InvalidKeyException; +import org.signal.libsignal.protocol.InvalidKeyException; import org.whispersystems.signalservice.internal.util.Util; import java.security.InvalidAlgorithmParameterException; diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/storage/SignalStorageModels.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/storage/SignalStorageModels.java index a8a419f192..d2bfdbe406 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/storage/SignalStorageModels.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/storage/SignalStorageModels.java @@ -2,9 +2,9 @@ package org.whispersystems.signalservice.api.storage; import com.google.protobuf.ByteString; -import org.signal.zkgroup.groups.GroupMasterKey; -import org.whispersystems.libsignal.InvalidKeyException; -import org.whispersystems.libsignal.logging.Log; +import org.signal.libsignal.protocol.InvalidKeyException; +import org.signal.libsignal.protocol.logging.Log; +import org.signal.libsignal.zkgroup.groups.GroupMasterKey; import org.whispersystems.signalservice.internal.storage.protos.ManifestRecord; import org.whispersystems.signalservice.internal.storage.protos.StorageItem; import org.whispersystems.signalservice.internal.storage.protos.StorageManifest; diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/util/PhoneNumberFormatter.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/util/PhoneNumberFormatter.java index 255b5cf77b..32bc6a279b 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/util/PhoneNumberFormatter.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/util/PhoneNumberFormatter.java @@ -11,7 +11,7 @@ import com.google.i18n.phonenumbers.PhoneNumberUtil; import com.google.i18n.phonenumbers.PhoneNumberUtil.PhoneNumberFormat; import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber; -import org.whispersystems.libsignal.logging.Log; +import org.signal.libsignal.protocol.logging.Log; import org.whispersystems.signalservice.internal.util.Util; import java.util.Locale; diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/util/ProtoUtil.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/util/ProtoUtil.java index 87452eec61..75c72c82f9 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/util/ProtoUtil.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/util/ProtoUtil.java @@ -4,7 +4,7 @@ import com.google.protobuf.GeneratedMessageLite; import com.google.protobuf.InvalidProtocolBufferException; import com.google.protobuf.UnknownFieldSetLite; -import org.whispersystems.libsignal.logging.Log; +import org.signal.libsignal.protocol.logging.Log; import java.lang.reflect.Field; import java.util.LinkedList; diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/util/StreamDetails.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/util/StreamDetails.java index 10595ae605..1845c8f94a 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/util/StreamDetails.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/util/StreamDetails.java @@ -1,6 +1,6 @@ package org.whispersystems.signalservice.api.util; -import org.whispersystems.libsignal.logging.Log; +import org.signal.libsignal.protocol.logging.Log; import java.io.Closeable; import java.io.IOException; diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/util/Uint64Util.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/util/Uint64Util.java index 7660c4a38e..e89c6ad02b 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/util/Uint64Util.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/util/Uint64Util.java @@ -2,7 +2,7 @@ package org.whispersystems.signalservice.api.util; import java.math.BigInteger; -import static org.whispersystems.libsignal.util.ByteUtil.longToByteArray; +import static org.signal.libsignal.protocol.util.ByteUtil.longToByteArray; public final class Uint64Util { diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/AESCipher.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/AESCipher.java index 19090eb7d7..0180e6d7d9 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/AESCipher.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/AESCipher.java @@ -1,6 +1,6 @@ package org.whispersystems.signalservice.internal.contacts.crypto; -import org.whispersystems.libsignal.util.ByteUtil; +import org.signal.libsignal.protocol.util.ByteUtil; import org.whispersystems.signalservice.api.crypto.InvalidCiphertextException; import org.whispersystems.signalservice.internal.util.Util; diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/ContactDiscoveryCipher.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/ContactDiscoveryCipher.java index 5223a24476..6e53a63747 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/ContactDiscoveryCipher.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/ContactDiscoveryCipher.java @@ -1,6 +1,6 @@ package org.whispersystems.signalservice.internal.contacts.crypto; -import org.whispersystems.libsignal.util.ByteUtil; +import org.signal.libsignal.protocol.util.ByteUtil; import org.whispersystems.signalservice.api.crypto.CryptoUtil; import org.whispersystems.signalservice.api.crypto.InvalidCiphertextException; import org.whispersystems.signalservice.internal.contacts.crypto.AESCipher.AESEncryptedResult; diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/RemoteAttestationCipher.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/RemoteAttestationCipher.java index 29c3241620..05073edf4a 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/RemoteAttestationCipher.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/RemoteAttestationCipher.java @@ -1,12 +1,12 @@ package org.whispersystems.signalservice.internal.contacts.crypto; +import org.signal.libsignal.protocol.util.ByteUtil; import org.threeten.bp.Instant; import org.threeten.bp.LocalDateTime; import org.threeten.bp.Period; import org.threeten.bp.ZoneId; import org.threeten.bp.ZonedDateTime; import org.threeten.bp.format.DateTimeFormatter; -import org.whispersystems.libsignal.util.ByteUtil; import org.whispersystems.signalservice.api.crypto.InvalidCiphertextException; import org.whispersystems.signalservice.internal.contacts.entities.RemoteAttestationResponse; import org.whispersystems.signalservice.internal.util.Hex; diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/RemoteAttestationKeys.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/RemoteAttestationKeys.java index f1bb3ab6c9..9ff5f8989c 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/RemoteAttestationKeys.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/RemoteAttestationKeys.java @@ -1,12 +1,12 @@ package org.whispersystems.signalservice.internal.contacts.crypto; -import org.whispersystems.libsignal.InvalidKeyException; -import org.whispersystems.libsignal.ecc.Curve; -import org.whispersystems.libsignal.ecc.ECKeyPair; -import org.whispersystems.libsignal.ecc.ECPublicKey; -import org.whispersystems.libsignal.kdf.HKDFv3; -import org.whispersystems.libsignal.util.ByteUtil; +import org.signal.libsignal.protocol.InvalidKeyException; +import org.signal.libsignal.protocol.ecc.Curve; +import org.signal.libsignal.protocol.ecc.ECKeyPair; +import org.signal.libsignal.protocol.ecc.ECPublicKey; +import org.signal.libsignal.protocol.kdf.HKDFv3; +import org.signal.libsignal.protocol.util.ByteUtil; public class RemoteAttestationKeys { diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/crypto/PrimaryProvisioningCipher.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/crypto/PrimaryProvisioningCipher.java index f384b3fe27..0c1ef5934e 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/crypto/PrimaryProvisioningCipher.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/crypto/PrimaryProvisioningCipher.java @@ -8,11 +8,11 @@ package org.whispersystems.signalservice.internal.crypto; import com.google.protobuf.ByteString; -import org.whispersystems.libsignal.InvalidKeyException; -import org.whispersystems.libsignal.ecc.Curve; -import org.whispersystems.libsignal.ecc.ECKeyPair; -import org.whispersystems.libsignal.ecc.ECPublicKey; -import org.whispersystems.libsignal.kdf.HKDF; +import org.signal.libsignal.protocol.InvalidKeyException; +import org.signal.libsignal.protocol.ecc.Curve; +import org.signal.libsignal.protocol.ecc.ECKeyPair; +import org.signal.libsignal.protocol.ecc.ECPublicKey; +import org.signal.libsignal.protocol.kdf.HKDF; import org.whispersystems.signalservice.internal.util.Util; import java.security.NoSuchAlgorithmException; diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/BoostReceiptCredentialRequestJson.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/BoostReceiptCredentialRequestJson.java index 81328863e8..4a633f0061 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/BoostReceiptCredentialRequestJson.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/BoostReceiptCredentialRequestJson.java @@ -2,7 +2,7 @@ package org.whispersystems.signalservice.internal.push; import com.fasterxml.jackson.annotation.JsonProperty; -import org.signal.zkgroup.receipts.ReceiptCredentialRequest; +import org.signal.libsignal.zkgroup.receipts.ReceiptCredentialRequest; import org.whispersystems.util.Base64; class BoostReceiptCredentialRequestJson { diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/LoggingOkhttpEventListener.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/LoggingOkhttpEventListener.java index c80e91338b..cc9984a271 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/LoggingOkhttpEventListener.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/LoggingOkhttpEventListener.java @@ -1,6 +1,6 @@ package org.whispersystems.signalservice.internal.push; -import org.whispersystems.libsignal.logging.Log; +import org.signal.libsignal.protocol.logging.Log; import java.io.IOException; import java.net.InetAddress; diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/PreKeyEntity.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/PreKeyEntity.java index 8f60db17aa..37d771233b 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/PreKeyEntity.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/PreKeyEntity.java @@ -16,9 +16,9 @@ import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import org.whispersystems.libsignal.InvalidKeyException; -import org.whispersystems.libsignal.ecc.Curve; -import org.whispersystems.libsignal.ecc.ECPublicKey; +import org.signal.libsignal.protocol.InvalidKeyException; +import org.signal.libsignal.protocol.ecc.Curve; +import org.signal.libsignal.protocol.ecc.ECPublicKey; import org.whispersystems.util.Base64; import java.io.IOException; diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/PreKeyResponse.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/PreKeyResponse.java index f6de2947e2..4b58258f46 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/PreKeyResponse.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/PreKeyResponse.java @@ -10,7 +10,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import org.whispersystems.libsignal.IdentityKey; +import org.signal.libsignal.protocol.IdentityKey; import org.whispersystems.signalservice.internal.util.JsonUtil; import java.util.List; diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/PreKeyState.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/PreKeyState.java index 2e710b8043..f0e73abe30 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/PreKeyState.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/PreKeyState.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import org.whispersystems.libsignal.IdentityKey; +import org.signal.libsignal.protocol.IdentityKey; import org.whispersystems.signalservice.api.push.SignedPreKeyEntity; import org.whispersystems.signalservice.internal.util.JsonUtil; diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/PushServiceSocket.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/PushServiceSocket.java index 050caab5a7..56df090ffc 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/PushServiceSocket.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/PushServiceSocket.java @@ -12,30 +12,31 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.google.protobuf.InvalidProtocolBufferException; import com.google.protobuf.MessageLite; +import org.signal.libsignal.protocol.IdentityKey; +import org.signal.libsignal.protocol.InvalidKeyException; +import org.signal.libsignal.protocol.ecc.ECPublicKey; +import org.signal.libsignal.protocol.logging.Log; +import org.signal.libsignal.protocol.state.PreKeyBundle; +import org.signal.libsignal.protocol.state.PreKeyRecord; +import org.signal.libsignal.protocol.state.SignedPreKeyRecord; +import org.signal.libsignal.protocol.util.Pair; +import org.signal.libsignal.zkgroup.VerificationFailedException; +import org.signal.libsignal.zkgroup.profiles.ClientZkProfileOperations; +import org.signal.libsignal.zkgroup.profiles.ProfileKey; +import org.signal.libsignal.zkgroup.profiles.ProfileKeyCredential; +import org.signal.libsignal.zkgroup.profiles.ProfileKeyCredentialRequest; +import org.signal.libsignal.zkgroup.profiles.ProfileKeyCredentialRequestContext; +import org.signal.libsignal.zkgroup.profiles.ProfileKeyCredentialResponse; +import org.signal.libsignal.zkgroup.profiles.ProfileKeyVersion; +import org.signal.libsignal.zkgroup.receipts.ReceiptCredentialPresentation; +import org.signal.libsignal.zkgroup.receipts.ReceiptCredentialRequest; +import org.signal.libsignal.zkgroup.receipts.ReceiptCredentialResponse; import org.signal.storageservice.protos.groups.AvatarUploadAttributes; import org.signal.storageservice.protos.groups.Group; import org.signal.storageservice.protos.groups.GroupChange; import org.signal.storageservice.protos.groups.GroupChanges; import org.signal.storageservice.protos.groups.GroupExternalCredential; import org.signal.storageservice.protos.groups.GroupJoinInfo; -import org.signal.zkgroup.VerificationFailedException; -import org.signal.zkgroup.profiles.ClientZkProfileOperations; -import org.signal.zkgroup.profiles.ProfileKey; -import org.signal.zkgroup.profiles.ProfileKeyCredential; -import org.signal.zkgroup.profiles.ProfileKeyCredentialRequest; -import org.signal.zkgroup.profiles.ProfileKeyCredentialRequestContext; -import org.signal.zkgroup.profiles.ProfileKeyCredentialResponse; -import org.signal.zkgroup.profiles.ProfileKeyVersion; -import org.signal.zkgroup.receipts.ReceiptCredentialPresentation; -import org.signal.zkgroup.receipts.ReceiptCredentialRequest; -import org.signal.zkgroup.receipts.ReceiptCredentialResponse; -import org.whispersystems.libsignal.IdentityKey; -import org.whispersystems.libsignal.ecc.ECPublicKey; -import org.whispersystems.libsignal.logging.Log; -import org.whispersystems.libsignal.state.PreKeyBundle; -import org.whispersystems.libsignal.state.PreKeyRecord; -import org.whispersystems.libsignal.state.SignedPreKeyRecord; -import org.whispersystems.libsignal.util.Pair; import org.whispersystems.signalservice.api.account.AccountAttributes; import org.whispersystems.signalservice.api.account.ChangePhoneNumberRequest; import org.whispersystems.signalservice.api.crypto.UnidentifiedAccess; @@ -563,11 +564,15 @@ public class PushServiceSocket { { List entities = new LinkedList<>(); - for (PreKeyRecord record : records) { - PreKeyEntity entity = new PreKeyEntity(record.getId(), - record.getKeyPair().getPublicKey()); + try { + for (PreKeyRecord record : records) { + PreKeyEntity entity = new PreKeyEntity(record.getId(), + record.getKeyPair().getPublicKey()); - entities.add(entity); + entities.add(entity); + } + } catch (InvalidKeyException e) { + throw new AssertionError("unexpected invalid key", e); } SignedPreKeyEntity signedPreKeyEntity = new SignedPreKeyEntity(signedPreKey.getId(), diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/PushTransportDetails.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/PushTransportDetails.java index 53dd0315ab..937a6da3b8 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/PushTransportDetails.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/PushTransportDetails.java @@ -7,7 +7,7 @@ package org.whispersystems.signalservice.internal.push; -import org.whispersystems.libsignal.logging.Log; +import org.signal.libsignal.protocol.logging.Log; public class PushTransportDetails { diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/ReceiptCredentialRequestJson.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/ReceiptCredentialRequestJson.java index 2064b15415..cd5037ce94 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/ReceiptCredentialRequestJson.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/ReceiptCredentialRequestJson.java @@ -2,7 +2,7 @@ package org.whispersystems.signalservice.internal.push; import com.fasterxml.jackson.annotation.JsonProperty; -import org.signal.zkgroup.receipts.ReceiptCredentialRequest; +import org.signal.libsignal.zkgroup.receipts.ReceiptCredentialRequest; import org.whispersystems.util.Base64; class ReceiptCredentialRequestJson { diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/ReceiptCredentialResponseJson.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/ReceiptCredentialResponseJson.java index 33ef1410c5..97cc722c75 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/ReceiptCredentialResponseJson.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/ReceiptCredentialResponseJson.java @@ -2,8 +2,8 @@ package org.whispersystems.signalservice.internal.push; import com.fasterxml.jackson.annotation.JsonProperty; -import org.signal.zkgroup.InvalidInputException; -import org.signal.zkgroup.receipts.ReceiptCredentialResponse; +import org.signal.libsignal.zkgroup.InvalidInputException; +import org.signal.libsignal.zkgroup.receipts.ReceiptCredentialResponse; import org.whispersystems.util.Base64; import java.io.IOException; diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/RedeemReceiptRequest.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/RedeemReceiptRequest.java index 683bd0dc48..fc38966fbf 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/RedeemReceiptRequest.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/RedeemReceiptRequest.java @@ -3,7 +3,7 @@ package org.whispersystems.signalservice.internal.push; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import org.signal.zkgroup.receipts.ReceiptCredentialPresentation; +import org.signal.libsignal.zkgroup.receipts.ReceiptCredentialPresentation; /** * POST /v1/donation/redeem-receipt diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/RemoteAttestationUtil.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/RemoteAttestationUtil.java index 89cf8c75f8..d78044be99 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/RemoteAttestationUtil.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/RemoteAttestationUtil.java @@ -1,8 +1,8 @@ package org.whispersystems.signalservice.internal.push; -import org.whispersystems.libsignal.InvalidKeyException; -import org.whispersystems.libsignal.ecc.Curve; -import org.whispersystems.libsignal.ecc.ECKeyPair; +import org.signal.libsignal.protocol.InvalidKeyException; +import org.signal.libsignal.protocol.ecc.Curve; +import org.signal.libsignal.protocol.ecc.ECKeyPair; import org.whispersystems.signalservice.api.crypto.InvalidCiphertextException; import org.whispersystems.signalservice.api.push.exceptions.MalformedResponseException; import org.whispersystems.signalservice.internal.contacts.crypto.Quote; diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/SendGroupMessageResponse.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/SendGroupMessageResponse.java index 7a6d613db8..0d7856880a 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/SendGroupMessageResponse.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/SendGroupMessageResponse.java @@ -2,7 +2,7 @@ package org.whispersystems.signalservice.internal.push; import com.fasterxml.jackson.annotation.JsonProperty; -import org.whispersystems.libsignal.logging.Log; +import org.signal.libsignal.protocol.logging.Log; import org.whispersystems.signalservice.api.push.ServiceId; import java.util.HashSet; diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/http/ProfileCipherOutputStreamFactory.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/http/ProfileCipherOutputStreamFactory.java index ae0234339f..08963d0895 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/http/ProfileCipherOutputStreamFactory.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/http/ProfileCipherOutputStreamFactory.java @@ -1,7 +1,7 @@ package org.whispersystems.signalservice.internal.push.http; -import org.signal.zkgroup.profiles.ProfileKey; +import org.signal.libsignal.zkgroup.profiles.ProfileKey; import org.whispersystems.signalservice.api.crypto.DigestingOutputStream; import org.whispersystems.signalservice.api.crypto.ProfileCipherOutputStream; diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/util/BlacklistingTrustManager.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/util/BlacklistingTrustManager.java index d8941d56fb..e98ab475ce 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/util/BlacklistingTrustManager.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/util/BlacklistingTrustManager.java @@ -6,7 +6,7 @@ package org.whispersystems.signalservice.internal.util; -import org.whispersystems.libsignal.util.Pair; +import org.signal.libsignal.protocol.util.Pair; import org.whispersystems.signalservice.api.push.TrustStore; import java.io.IOException; diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/util/JsonUtil.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/util/JsonUtil.java index 26d3bbcdbd..d8558b9dfa 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/util/JsonUtil.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/util/JsonUtil.java @@ -18,9 +18,9 @@ import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializerProvider; -import org.whispersystems.libsignal.IdentityKey; -import org.whispersystems.libsignal.InvalidKeyException; -import org.whispersystems.libsignal.logging.Log; +import org.signal.libsignal.protocol.IdentityKey; +import org.signal.libsignal.protocol.InvalidKeyException; +import org.signal.libsignal.protocol.logging.Log; import org.whispersystems.signalservice.api.push.ACI; import org.whispersystems.signalservice.api.push.ServiceId; import org.whispersystems.signalservice.api.push.exceptions.MalformedResponseException; diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/util/concurrent/CascadingFuture.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/util/concurrent/CascadingFuture.java index e3dac7e9d5..dceafe8121 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/util/concurrent/CascadingFuture.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/util/concurrent/CascadingFuture.java @@ -1,6 +1,6 @@ package org.whispersystems.signalservice.internal.util.concurrent; -import org.whispersystems.libsignal.logging.Log; +import org.signal.libsignal.protocol.logging.Log; import java.util.ArrayList; import java.util.List; diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/websocket/WebSocketConnection.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/websocket/WebSocketConnection.java index 17fca44acb..7cc2f15768 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/websocket/WebSocketConnection.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/websocket/WebSocketConnection.java @@ -2,8 +2,8 @@ package org.whispersystems.signalservice.internal.websocket; import com.google.protobuf.InvalidProtocolBufferException; -import org.whispersystems.libsignal.logging.Log; -import org.whispersystems.libsignal.util.Pair; +import org.signal.libsignal.protocol.logging.Log; +import org.signal.libsignal.protocol.util.Pair; import org.whispersystems.signalservice.api.push.SignalServiceAddress; import org.whispersystems.signalservice.api.push.TrustStore; import org.whispersystems.signalservice.api.util.CredentialsProvider; diff --git a/libsignal/service/src/test/java/org/whispersystems/signalservice/api/crypto/AttachmentCipherTest.java b/libsignal/service/src/test/java/org/whispersystems/signalservice/api/crypto/AttachmentCipherTest.java index 82e3e25ff5..e9b4883eb7 100644 --- a/libsignal/service/src/test/java/org/whispersystems/signalservice/api/crypto/AttachmentCipherTest.java +++ b/libsignal/service/src/test/java/org/whispersystems/signalservice/api/crypto/AttachmentCipherTest.java @@ -2,8 +2,8 @@ package org.whispersystems.signalservice.api.crypto; import org.conscrypt.Conscrypt; import org.junit.Test; -import org.whispersystems.libsignal.InvalidMessageException; -import org.whispersystems.libsignal.kdf.HKDFv3; +import org.signal.libsignal.protocol.InvalidMessageException; +import org.signal.libsignal.protocol.kdf.HKDFv3; import org.whispersystems.signalservice.internal.crypto.PaddingInputStream; import org.whispersystems.signalservice.internal.push.http.AttachmentCipherOutputStreamFactory; import org.whispersystems.signalservice.internal.util.Util; diff --git a/libsignal/service/src/test/java/org/whispersystems/signalservice/api/crypto/ProfileCipherTest.java b/libsignal/service/src/test/java/org/whispersystems/signalservice/api/crypto/ProfileCipherTest.java index 05d8b17d84..638b4b87b7 100644 --- a/libsignal/service/src/test/java/org/whispersystems/signalservice/api/crypto/ProfileCipherTest.java +++ b/libsignal/service/src/test/java/org/whispersystems/signalservice/api/crypto/ProfileCipherTest.java @@ -3,8 +3,8 @@ package org.whispersystems.signalservice.api.crypto; import org.conscrypt.Conscrypt; import org.junit.Test; -import org.signal.zkgroup.InvalidInputException; -import org.signal.zkgroup.profiles.ProfileKey; +import org.signal.libsignal.zkgroup.InvalidInputException; +import org.signal.libsignal.zkgroup.profiles.ProfileKey; import org.whispersystems.signalservice.internal.util.Util; import org.whispersystems.util.Base64; diff --git a/libsignal/service/src/test/java/org/whispersystems/signalservice/api/crypto/UnidentifiedAccessTest.java b/libsignal/service/src/test/java/org/whispersystems/signalservice/api/crypto/UnidentifiedAccessTest.java index 23e2f27d42..12fb4837ef 100644 --- a/libsignal/service/src/test/java/org/whispersystems/signalservice/api/crypto/UnidentifiedAccessTest.java +++ b/libsignal/service/src/test/java/org/whispersystems/signalservice/api/crypto/UnidentifiedAccessTest.java @@ -3,8 +3,8 @@ package org.whispersystems.signalservice.api.crypto; import junit.framework.TestCase; import org.conscrypt.OpenSSLProvider; -import org.signal.zkgroup.InvalidInputException; -import org.signal.zkgroup.profiles.ProfileKey; +import org.signal.libsignal.zkgroup.InvalidInputException; +import org.signal.libsignal.zkgroup.profiles.ProfileKey; import java.security.Security; import java.util.Arrays; diff --git a/libsignal/service/src/test/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupUtil_apply_Test.java b/libsignal/service/src/test/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupUtil_apply_Test.java index 0a1f5bce44..7979835a8d 100644 --- a/libsignal/service/src/test/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupUtil_apply_Test.java +++ b/libsignal/service/src/test/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupUtil_apply_Test.java @@ -3,6 +3,7 @@ package org.whispersystems.signalservice.api.groupsv2; import com.google.protobuf.ByteString; import org.junit.Test; +import org.signal.libsignal.zkgroup.profiles.ProfileKey; import org.signal.storageservice.protos.groups.AccessControl; import org.signal.storageservice.protos.groups.Member; import org.signal.storageservice.protos.groups.local.DecryptedApproveMember; @@ -17,7 +18,6 @@ import org.signal.storageservice.protos.groups.local.DecryptedRequestingMember; import org.signal.storageservice.protos.groups.local.DecryptedString; import org.signal.storageservice.protos.groups.local.DecryptedTimer; import org.signal.storageservice.protos.groups.local.EnabledState; -import org.signal.zkgroup.profiles.ProfileKey; import org.whispersystems.signalservice.api.util.UuidUtil; import org.whispersystems.signalservice.internal.util.Util; diff --git a/libsignal/service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupChangeReconstructTest.java b/libsignal/service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupChangeReconstructTest.java index 2f9efe645a..7cf4923721 100644 --- a/libsignal/service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupChangeReconstructTest.java +++ b/libsignal/service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupChangeReconstructTest.java @@ -3,13 +3,13 @@ package org.whispersystems.signalservice.api.groupsv2; import com.google.protobuf.ByteString; import org.junit.Test; +import org.signal.libsignal.zkgroup.profiles.ProfileKey; import org.signal.storageservice.protos.groups.AccessControl; import org.signal.storageservice.protos.groups.local.DecryptedGroup; import org.signal.storageservice.protos.groups.local.DecryptedGroupChange; import org.signal.storageservice.protos.groups.local.DecryptedString; import org.signal.storageservice.protos.groups.local.DecryptedTimer; import org.signal.storageservice.protos.groups.local.EnabledState; -import org.signal.zkgroup.profiles.ProfileKey; import org.whispersystems.signalservice.api.util.UuidUtil; import org.whispersystems.signalservice.internal.util.Util; diff --git a/libsignal/service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupChangeUtil_resolveConflict_Test.java b/libsignal/service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupChangeUtil_resolveConflict_Test.java index fc33b6dc74..cf63c27834 100644 --- a/libsignal/service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupChangeUtil_resolveConflict_Test.java +++ b/libsignal/service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupChangeUtil_resolveConflict_Test.java @@ -3,6 +3,7 @@ package org.whispersystems.signalservice.api.groupsv2; import com.google.protobuf.ByteString; import org.junit.Test; +import org.signal.libsignal.zkgroup.profiles.ProfileKey; import org.signal.storageservice.protos.groups.AccessControl; import org.signal.storageservice.protos.groups.BannedMember; import org.signal.storageservice.protos.groups.GroupChange; @@ -13,7 +14,6 @@ import org.signal.storageservice.protos.groups.local.DecryptedGroupChange; import org.signal.storageservice.protos.groups.local.DecryptedString; import org.signal.storageservice.protos.groups.local.DecryptedTimer; import org.signal.storageservice.protos.groups.local.EnabledState; -import org.signal.zkgroup.profiles.ProfileKey; import org.whispersystems.signalservice.api.util.UuidUtil; import org.whispersystems.signalservice.internal.util.Util; diff --git a/libsignal/service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupChangeUtil_resolveConflict_decryptedOnly_Test.java b/libsignal/service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupChangeUtil_resolveConflict_decryptedOnly_Test.java index 445872ed64..89c988aee3 100644 --- a/libsignal/service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupChangeUtil_resolveConflict_decryptedOnly_Test.java +++ b/libsignal/service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupChangeUtil_resolveConflict_decryptedOnly_Test.java @@ -3,13 +3,13 @@ package org.whispersystems.signalservice.api.groupsv2; import com.google.protobuf.ByteString; import org.junit.Test; +import org.signal.libsignal.zkgroup.profiles.ProfileKey; import org.signal.storageservice.protos.groups.AccessControl; import org.signal.storageservice.protos.groups.local.DecryptedGroup; import org.signal.storageservice.protos.groups.local.DecryptedGroupChange; import org.signal.storageservice.protos.groups.local.DecryptedString; import org.signal.storageservice.protos.groups.local.DecryptedTimer; import org.signal.storageservice.protos.groups.local.EnabledState; -import org.signal.zkgroup.profiles.ProfileKey; import org.whispersystems.signalservice.api.util.UuidUtil; import org.whispersystems.signalservice.internal.util.Util; diff --git a/libsignal/service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Operations_ban_Test.java b/libsignal/service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Operations_ban_Test.java index 317add1a21..5deeba25f5 100644 --- a/libsignal/service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Operations_ban_Test.java +++ b/libsignal/service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Operations_ban_Test.java @@ -4,14 +4,14 @@ import com.google.protobuf.ByteString; import org.junit.Before; import org.junit.Test; +import org.signal.libsignal.zkgroup.InvalidInputException; +import org.signal.libsignal.zkgroup.groups.GroupMasterKey; +import org.signal.libsignal.zkgroup.groups.GroupSecretParams; import org.signal.storageservice.protos.groups.BannedMember; import org.signal.storageservice.protos.groups.GroupChange; import org.signal.storageservice.protos.groups.GroupChange.Actions.AddBannedMemberAction; import org.signal.storageservice.protos.groups.GroupChange.Actions.DeleteBannedMemberAction; import org.signal.storageservice.protos.groups.local.DecryptedBannedMember; -import org.signal.zkgroup.InvalidInputException; -import org.signal.zkgroup.groups.GroupMasterKey; -import org.signal.zkgroup.groups.GroupSecretParams; import org.whispersystems.signalservice.api.util.UuidUtil; import org.whispersystems.signalservice.internal.util.Util; import org.whispersystems.signalservice.testutil.LibSignalLibraryUtil; @@ -20,10 +20,8 @@ import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; import java.util.List; -import java.util.Set; import java.util.UUID; import java.util.stream.Collectors; -import java.util.stream.IntStream; import static org.hamcrest.CoreMatchers.hasItems; import static org.hamcrest.CoreMatchers.is; diff --git a/libsignal/service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Operations_decrypt_change_Test.java b/libsignal/service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Operations_decrypt_change_Test.java index 78916668e8..c47544ffb8 100644 --- a/libsignal/service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Operations_decrypt_change_Test.java +++ b/libsignal/service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Operations_decrypt_change_Test.java @@ -5,6 +5,19 @@ import com.google.protobuf.InvalidProtocolBufferException; import org.junit.Before; import org.junit.Test; +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.libsignal.zkgroup.groups.UuidCiphertext; +import org.signal.libsignal.zkgroup.profiles.ClientZkProfileOperations; +import org.signal.libsignal.zkgroup.profiles.ProfileKey; +import org.signal.libsignal.zkgroup.profiles.ProfileKeyCommitment; +import org.signal.libsignal.zkgroup.profiles.ProfileKeyCredential; +import org.signal.libsignal.zkgroup.profiles.ProfileKeyCredentialPresentation; +import org.signal.libsignal.zkgroup.profiles.ProfileKeyCredentialRequest; +import org.signal.libsignal.zkgroup.profiles.ProfileKeyCredentialRequestContext; +import org.signal.libsignal.zkgroup.profiles.ProfileKeyCredentialResponse; import org.signal.storageservice.protos.groups.AccessControl; import org.signal.storageservice.protos.groups.GroupChange; import org.signal.storageservice.protos.groups.Member; @@ -19,19 +32,6 @@ import org.signal.storageservice.protos.groups.local.DecryptedRequestingMember; import org.signal.storageservice.protos.groups.local.DecryptedString; import org.signal.storageservice.protos.groups.local.DecryptedTimer; import org.signal.storageservice.protos.groups.local.EnabledState; -import org.signal.zkgroup.InvalidInputException; -import org.signal.zkgroup.VerificationFailedException; -import org.signal.zkgroup.groups.GroupMasterKey; -import org.signal.zkgroup.groups.GroupSecretParams; -import org.signal.zkgroup.groups.UuidCiphertext; -import org.signal.zkgroup.profiles.ClientZkProfileOperations; -import org.signal.zkgroup.profiles.ProfileKey; -import org.signal.zkgroup.profiles.ProfileKeyCommitment; -import org.signal.zkgroup.profiles.ProfileKeyCredential; -import org.signal.zkgroup.profiles.ProfileKeyCredentialPresentation; -import org.signal.zkgroup.profiles.ProfileKeyCredentialRequest; -import org.signal.zkgroup.profiles.ProfileKeyCredentialRequestContext; -import org.signal.zkgroup.profiles.ProfileKeyCredentialResponse; import org.whispersystems.signalservice.api.util.UuidUtil; import org.whispersystems.signalservice.internal.util.Util; import org.whispersystems.signalservice.testutil.LibSignalLibraryUtil; diff --git a/libsignal/service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Operations_decrypt_groupJoinInfo_Test.java b/libsignal/service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Operations_decrypt_groupJoinInfo_Test.java index 447009b108..e4b46ebbed 100644 --- a/libsignal/service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Operations_decrypt_groupJoinInfo_Test.java +++ b/libsignal/service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Operations_decrypt_groupJoinInfo_Test.java @@ -2,12 +2,12 @@ package org.whispersystems.signalservice.api.groupsv2; import org.junit.Before; import org.junit.Test; +import org.signal.libsignal.zkgroup.InvalidInputException; +import org.signal.libsignal.zkgroup.groups.GroupMasterKey; +import org.signal.libsignal.zkgroup.groups.GroupSecretParams; import org.signal.storageservice.protos.groups.AccessControl; import org.signal.storageservice.protos.groups.GroupJoinInfo; import org.signal.storageservice.protos.groups.local.DecryptedGroupJoinInfo; -import org.signal.zkgroup.InvalidInputException; -import org.signal.zkgroup.groups.GroupMasterKey; -import org.signal.zkgroup.groups.GroupSecretParams; import org.whispersystems.signalservice.internal.util.Util; import org.whispersystems.signalservice.testutil.LibSignalLibraryUtil; diff --git a/libsignal/service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Operations_decrypt_group_Test.java b/libsignal/service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Operations_decrypt_group_Test.java index a66612d374..769ee3fcee 100644 --- a/libsignal/service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Operations_decrypt_group_Test.java +++ b/libsignal/service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Operations_decrypt_group_Test.java @@ -4,6 +4,12 @@ import com.google.protobuf.ByteString; import org.junit.Before; import org.junit.Test; +import org.signal.libsignal.zkgroup.InvalidInputException; +import org.signal.libsignal.zkgroup.VerificationFailedException; +import org.signal.libsignal.zkgroup.groups.ClientZkGroupCipher; +import org.signal.libsignal.zkgroup.groups.GroupMasterKey; +import org.signal.libsignal.zkgroup.groups.GroupSecretParams; +import org.signal.libsignal.zkgroup.profiles.ProfileKey; import org.signal.storageservice.protos.groups.AccessControl; import org.signal.storageservice.protos.groups.BannedMember; import org.signal.storageservice.protos.groups.Group; @@ -16,12 +22,6 @@ import org.signal.storageservice.protos.groups.local.DecryptedMember; import org.signal.storageservice.protos.groups.local.DecryptedPendingMember; import org.signal.storageservice.protos.groups.local.DecryptedRequestingMember; import org.signal.storageservice.protos.groups.local.EnabledState; -import org.signal.zkgroup.InvalidInputException; -import org.signal.zkgroup.VerificationFailedException; -import org.signal.zkgroup.groups.ClientZkGroupCipher; -import org.signal.zkgroup.groups.GroupMasterKey; -import org.signal.zkgroup.groups.GroupSecretParams; -import org.signal.zkgroup.profiles.ProfileKey; import org.whispersystems.signalservice.api.util.UuidUtil; import org.whispersystems.signalservice.internal.util.Util; import org.whispersystems.signalservice.testutil.LibSignalLibraryUtil; diff --git a/libsignal/service/src/test/java/org/whispersystems/signalservice/api/groupsv2/ProtoTestUtils.java b/libsignal/service/src/test/java/org/whispersystems/signalservice/api/groupsv2/ProtoTestUtils.java index aed382fa30..d2dd3f8107 100644 --- a/libsignal/service/src/test/java/org/whispersystems/signalservice/api/groupsv2/ProtoTestUtils.java +++ b/libsignal/service/src/test/java/org/whispersystems/signalservice/api/groupsv2/ProtoTestUtils.java @@ -2,6 +2,8 @@ package org.whispersystems.signalservice.api.groupsv2; import com.google.protobuf.ByteString; +import org.signal.libsignal.zkgroup.InvalidInputException; +import org.signal.libsignal.zkgroup.profiles.ProfileKey; import org.signal.storageservice.protos.groups.Member; import org.signal.storageservice.protos.groups.RequestingMember; import org.signal.storageservice.protos.groups.local.DecryptedApproveMember; @@ -11,8 +13,6 @@ import org.signal.storageservice.protos.groups.local.DecryptedModifyMemberRole; import org.signal.storageservice.protos.groups.local.DecryptedPendingMember; import org.signal.storageservice.protos.groups.local.DecryptedPendingMemberRemoval; import org.signal.storageservice.protos.groups.local.DecryptedRequestingMember; -import org.signal.zkgroup.InvalidInputException; -import org.signal.zkgroup.profiles.ProfileKey; import org.whispersystems.signalservice.api.util.UuidUtil; import org.whispersystems.signalservice.internal.util.Util; diff --git a/libsignal/service/src/test/java/org/whispersystems/signalservice/api/groupsv2/TestZkGroupServer.java b/libsignal/service/src/test/java/org/whispersystems/signalservice/api/groupsv2/TestZkGroupServer.java index cfe9f62c7d..72288c767d 100644 --- a/libsignal/service/src/test/java/org/whispersystems/signalservice/api/groupsv2/TestZkGroupServer.java +++ b/libsignal/service/src/test/java/org/whispersystems/signalservice/api/groupsv2/TestZkGroupServer.java @@ -1,14 +1,14 @@ package org.whispersystems.signalservice.api.groupsv2; -import org.signal.zkgroup.ServerPublicParams; -import org.signal.zkgroup.ServerSecretParams; -import org.signal.zkgroup.VerificationFailedException; -import org.signal.zkgroup.groups.GroupPublicParams; -import org.signal.zkgroup.profiles.ProfileKeyCommitment; -import org.signal.zkgroup.profiles.ProfileKeyCredentialPresentation; -import org.signal.zkgroup.profiles.ProfileKeyCredentialRequest; -import org.signal.zkgroup.profiles.ProfileKeyCredentialResponse; -import org.signal.zkgroup.profiles.ServerZkProfileOperations; +import org.signal.libsignal.zkgroup.ServerPublicParams; +import org.signal.libsignal.zkgroup.ServerSecretParams; +import org.signal.libsignal.zkgroup.VerificationFailedException; +import org.signal.libsignal.zkgroup.groups.GroupPublicParams; +import org.signal.libsignal.zkgroup.profiles.ProfileKeyCommitment; +import org.signal.libsignal.zkgroup.profiles.ProfileKeyCredentialPresentation; +import org.signal.libsignal.zkgroup.profiles.ProfileKeyCredentialRequest; +import org.signal.libsignal.zkgroup.profiles.ProfileKeyCredentialResponse; +import org.signal.libsignal.zkgroup.profiles.ServerZkProfileOperations; import org.whispersystems.signalservice.testutil.LibSignalLibraryUtil; import java.util.UUID; diff --git a/libsignal/service/src/test/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContactsInputStreamTest.java b/libsignal/service/src/test/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContactsInputStreamTest.java index 94d8254304..a16a92c0d2 100644 --- a/libsignal/service/src/test/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContactsInputStreamTest.java +++ b/libsignal/service/src/test/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContactsInputStreamTest.java @@ -1,11 +1,11 @@ package org.whispersystems.signalservice.api.messages.multidevice; import org.junit.Test; -import org.signal.zkgroup.InvalidInputException; -import org.signal.zkgroup.profiles.ProfileKey; -import org.whispersystems.libsignal.IdentityKey; -import org.whispersystems.libsignal.ecc.Curve; -import org.whispersystems.libsignal.ecc.ECKeyPair; +import org.signal.libsignal.protocol.IdentityKey; +import org.signal.libsignal.protocol.ecc.Curve; +import org.signal.libsignal.protocol.ecc.ECKeyPair; +import org.signal.libsignal.zkgroup.InvalidInputException; +import org.signal.libsignal.zkgroup.profiles.ProfileKey; import org.whispersystems.signalservice.api.push.ServiceId; import org.whispersystems.signalservice.api.push.SignalServiceAddress; import org.whispersystems.signalservice.internal.util.Util; diff --git a/libsignal/service/src/test/java/org/whispersystems/signalservice/api/storage/SignalStorageCipherTest.java b/libsignal/service/src/test/java/org/whispersystems/signalservice/api/storage/SignalStorageCipherTest.java index caaff88f00..bcbc0b2ef9 100644 --- a/libsignal/service/src/test/java/org/whispersystems/signalservice/api/storage/SignalStorageCipherTest.java +++ b/libsignal/service/src/test/java/org/whispersystems/signalservice/api/storage/SignalStorageCipherTest.java @@ -1,7 +1,7 @@ package org.whispersystems.signalservice.api.storage; import org.junit.Test; -import org.whispersystems.libsignal.InvalidKeyException; +import org.signal.libsignal.protocol.InvalidKeyException; import org.whispersystems.signalservice.internal.util.Util; import static org.junit.Assert.assertArrayEquals; diff --git a/libsignal/service/src/test/java/org/whispersystems/signalservice/api/util/UuidUtilTest.java b/libsignal/service/src/test/java/org/whispersystems/signalservice/api/util/UuidUtilTest.java index b7c7045f8b..b033fbac3f 100644 --- a/libsignal/service/src/test/java/org/whispersystems/signalservice/api/util/UuidUtilTest.java +++ b/libsignal/service/src/test/java/org/whispersystems/signalservice/api/util/UuidUtilTest.java @@ -3,7 +3,7 @@ package org.whispersystems.signalservice.api.util; import com.google.protobuf.ByteString; import org.junit.Test; -import org.whispersystems.libsignal.util.Hex; +import org.signal.libsignal.protocol.util.Hex; import java.io.IOException; import java.util.UUID; diff --git a/libsignal/service/src/test/java/org/whispersystems/signalservice/testutil/LibSignalLibraryUtil.java b/libsignal/service/src/test/java/org/whispersystems/signalservice/testutil/LibSignalLibraryUtil.java index c33b70be56..3e3d86cfea 100644 --- a/libsignal/service/src/test/java/org/whispersystems/signalservice/testutil/LibSignalLibraryUtil.java +++ b/libsignal/service/src/test/java/org/whispersystems/signalservice/testutil/LibSignalLibraryUtil.java @@ -1,6 +1,6 @@ package org.whispersystems.signalservice.testutil; -import org.signal.client.internal.Native; +import org.signal.libsignal.internal.Native; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.fail; diff --git a/libsignal/service/src/testFixtures/java/org/whispersystems/signalservice/test/LibSignalLibraryUtil.java b/libsignal/service/src/testFixtures/java/org/whispersystems/signalservice/test/LibSignalLibraryUtil.java index 5bcba3a903..8339c0ab89 100644 --- a/libsignal/service/src/testFixtures/java/org/whispersystems/signalservice/test/LibSignalLibraryUtil.java +++ b/libsignal/service/src/testFixtures/java/org/whispersystems/signalservice/test/LibSignalLibraryUtil.java @@ -1,6 +1,6 @@ package org.whispersystems.signalservice.test; -import org.signal.client.internal.Native; +import org.signal.libsignal.internal.Native; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.fail; diff --git a/lintchecks/src/main/java/org/signal/lint/SignalLogDetector.java b/lintchecks/src/main/java/org/signal/lint/SignalLogDetector.java index b45796ddda..1d0bbd433b 100644 --- a/lintchecks/src/main/java/org/signal/lint/SignalLogDetector.java +++ b/lintchecks/src/main/java/org/signal/lint/SignalLogDetector.java @@ -67,7 +67,7 @@ public final class SignalLogDetector extends Detector implements Detector.UastSc context.report(LOG_NOT_SIGNAL, call, context.getLocation(call), "Using 'org.signal.glide.Log' instead of a Signal Logger", fix); } - if (evaluator.isMemberInClass(method, "org.whispersystems.libsignal.logging.Log")) { + if (evaluator.isMemberInClass(method, "org.signal.libsignal.protocol.logging.Log")) { LintFix fix = quickFixIssueLog(call); context.report(LOG_NOT_APP, call, context.getLocation(call), "Using Signal server logger instead of app level Logger", fix); } diff --git a/lintchecks/src/test/java/org/signal/lint/LogDetectorTest.java b/lintchecks/src/test/java/org/signal/lint/LogDetectorTest.java index d91a19bc2b..63a977a88e 100644 --- a/lintchecks/src/test/java/org/signal/lint/LogDetectorTest.java +++ b/lintchecks/src/test/java/org/signal/lint/LogDetectorTest.java @@ -73,7 +73,7 @@ public final class LogDetectorTest { lint() .files(serviceLogStub, java("package foo;\n" + - "import org.whispersystems.libsignal.logging.Log;\n" + + "import org.signal.libsignal.protocol.logging.Log;\n" + "public class Example {\n" + " public void log() {\n" + " Log.d(\"TAG\", \"msg\");\n" + @@ -97,7 +97,7 @@ public final class LogDetectorTest { lint() .files(serviceLogStub, java("package foo;\n" + - "import org.whispersystems.libsignal.logging.Log;\n" + + "import org.signal.libsignal.protocol.logging.Log;\n" + "public class Example {\n" + " public void log() {\n" + " Log.w(\"TAG\", \"msg\", new Exception());\n" + diff --git a/lintchecks/src/test/resources/ServiceLogStub.java b/lintchecks/src/test/resources/ServiceLogStub.java index d68b230d79..8573695643 100644 --- a/lintchecks/src/test/resources/ServiceLogStub.java +++ b/lintchecks/src/test/resources/ServiceLogStub.java @@ -1,4 +1,4 @@ -package org.whispersystems.libsignal.logging; +package org.signal.libsignal.protocol.logging; public class Log {