Introduce core-models module.

Needed to share some key components with feature modules without having
to depend on libsignal-service.

app/src/test/java/org/thoughtcrime/securesms/backup/v2/ArchivedMediaObjectIteratorTest.kt

@@ -7,12 +7,12 @@ import io.mockk.mockk
 import io.mockk.mockkObject
 import org.junit.Before
 import org.junit.Test
+import org.signal.core.models.backup.MediaRootBackupKey
 import org.signal.core.util.Base64
 import org.thoughtcrime.securesms.MockCursor
 import org.thoughtcrime.securesms.keyvalue.BackupValues
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.util.Util
-import org.whispersystems.signalservice.api.backup.MediaRootBackupKey
 
 class ArchivedMediaObjectIteratorTest {
   private val cursor = mockk<MockCursor>(relaxed = true) {

app/src/test/java/org/thoughtcrime/securesms/backup/v2/stream/EncryptedBackupReaderWriterTest.kt

@@ -7,6 +7,8 @@ package org.thoughtcrime.securesms.backup.v2.stream
 
 import org.junit.Assert.assertEquals
 import org.junit.Test
+import org.signal.core.models.ServiceId.ACI
+import org.signal.core.models.backup.MessageBackupKey
 import org.signal.core.util.Base64
 import org.signal.core.util.Hex
 import org.signal.libsignal.messagebackup.BackupForwardSecrecyToken
@@ -14,8 +16,6 @@ import org.thoughtcrime.securesms.backup.v2.proto.AccountData
 import org.thoughtcrime.securesms.backup.v2.proto.BackupInfo
 import org.thoughtcrime.securesms.backup.v2.proto.Frame
 import org.thoughtcrime.securesms.util.Util
-import org.whispersystems.signalservice.api.backup.MessageBackupKey
-import org.whispersystems.signalservice.api.push.ServiceId.ACI
 import java.io.ByteArrayOutputStream
 import java.util.UUID
 

app/src/test/java/org/thoughtcrime/securesms/contacts/sync/FuzzyPhoneNumberHelperTest.java

@@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.contacts.sync;
 import org.junit.Test;
 import org.thoughtcrime.securesms.contacts.sync.FuzzyPhoneNumberHelper.InputResult;
 import org.thoughtcrime.securesms.contacts.sync.FuzzyPhoneNumberHelper.OutputResult;
-import org.whispersystems.signalservice.api.push.ServiceId.ACI;
+import org.signal.core.models.ServiceId.ACI;
 
 import java.util.Arrays;
 import java.util.Collections;

app/src/test/java/org/thoughtcrime/securesms/conversation/colors/AvatarColorHashTest.kt

@@ -7,10 +7,10 @@ package org.thoughtcrime.securesms.conversation.colors
 
 import org.junit.Assert.assertEquals
 import org.junit.Test
+import org.signal.core.models.ServiceId.ACI
+import org.signal.core.models.ServiceId.PNI
 import org.signal.core.util.Base64
 import org.thoughtcrime.securesms.groups.GroupId
-import org.whispersystems.signalservice.api.push.ServiceId.ACI
-import org.whispersystems.signalservice.api.push.ServiceId.PNI
 
 class AvatarColorHashTest {
 

app/src/test/java/org/thoughtcrime/securesms/crash/CrashConfigTest.kt

@@ -14,10 +14,10 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
 import org.robolectric.annotation.Config
+import org.signal.core.models.ServiceId
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.testutil.MockAppDependenciesRule
 import org.thoughtcrime.securesms.util.RemoteConfig
-import org.whispersystems.signalservice.api.push.ServiceId
 import java.util.UUID
 
 @RunWith(RobolectricTestRunner::class)

app/src/test/java/org/thoughtcrime/securesms/database/GroupTestUtil.kt

@@ -1,6 +1,7 @@
 package org.thoughtcrime.securesms.database
 
 import okio.ByteString.Companion.toByteString
+import org.signal.core.models.ServiceId
 import org.signal.libsignal.zkgroup.groups.GroupMasterKey
 import org.signal.storageservice.protos.groups.AccessControl
 import org.signal.storageservice.protos.groups.GroupChange
@@ -20,7 +21,6 @@ import org.whispersystems.signalservice.api.groupsv2.DecryptedGroupChangeLog
 import org.whispersystems.signalservice.api.groupsv2.GroupHistoryPage
 import org.whispersystems.signalservice.api.groupsv2.GroupsV2Operations
 import org.whispersystems.signalservice.api.push.DistributionId
-import org.whispersystems.signalservice.api.push.ServiceId
 import java.util.Optional
 
 fun DecryptedGroupChange.Builder.setNewDescription(description: String) {

app/src/test/java/org/thoughtcrime/securesms/database/RecipientDatabaseTestUtils.kt

@@ -1,6 +1,7 @@
 package org.thoughtcrime.securesms.database
 
 import android.net.Uri
+import org.signal.core.models.ServiceId.ACI
 import org.signal.core.util.toOptional
 import org.signal.libsignal.zkgroup.profiles.ExpiringProfileKeyCredential
 import org.thoughtcrime.securesms.badges.models.Badge
@@ -15,7 +16,6 @@ import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientCreator
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.wallpaper.ChatWallpaper
-import org.whispersystems.signalservice.api.push.ServiceId.ACI
 import java.util.UUID
 import kotlin.random.Random
 

app/src/test/java/org/thoughtcrime/securesms/database/model/GroupsV2UpdateMessageProducerTest.kt

@@ -13,6 +13,9 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
 import org.robolectric.annotation.Config
+import org.signal.core.models.ServiceId
+import org.signal.core.models.ServiceId.ACI
+import org.signal.core.models.ServiceId.PNI
 import org.signal.core.util.BidiUtil
 import org.signal.storageservice.protos.groups.AccessControl
 import org.signal.storageservice.protos.groups.AccessControl.AccessRequired
@@ -32,9 +35,6 @@ import org.thoughtcrime.securesms.groups.v2.ChangeBuilder
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.Recipient.Companion.resolved
 import org.thoughtcrime.securesms.recipients.RecipientId
-import org.whispersystems.signalservice.api.push.ServiceId
-import org.whispersystems.signalservice.api.push.ServiceId.ACI
-import org.whispersystems.signalservice.api.push.ServiceId.PNI
 import org.whispersystems.signalservice.api.push.ServiceIds
 import java.util.UUID
 

app/src/test/java/org/thoughtcrime/securesms/database/model/MessageRecordTest_createNewContextWithAppendedDeleteJoinRequest.kt

@@ -6,9 +6,9 @@ import okio.ByteString
 import okio.ByteString.Companion.toByteString
 import org.junit.Assert.assertEquals
 import org.junit.Test
+import org.signal.core.models.ServiceId.ACI
 import org.thoughtcrime.securesms.database.model.databaseprotos.DecryptedGroupV2Context
 import org.thoughtcrime.securesms.groups.v2.ChangeBuilder
-import org.whispersystems.signalservice.api.push.ServiceId.ACI
 import org.whispersystems.signalservice.internal.push.GroupContextV2
 import java.util.UUID
 import kotlin.random.Random

app/src/test/java/org/thoughtcrime/securesms/database/model/UpdateDescriptionTest.java

@@ -7,8 +7,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
-import org.whispersystems.signalservice.api.push.ServiceId.ACI;
-import org.whispersystems.signalservice.api.push.ServiceId;
+import org.signal.core.models.ServiceId.ACI;
 
 import java.util.Arrays;
 import java.util.Collections;

app/src/test/java/org/thoughtcrime/securesms/groups/GroupManagerV2Test_edit.kt

@@ -18,6 +18,8 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
 import org.robolectric.annotation.Config
+import org.signal.core.models.ServiceId.ACI
+import org.signal.core.models.ServiceId.PNI
 import org.signal.core.util.Hex
 import org.signal.core.util.ThreadUtil
 import org.signal.core.util.logging.Log
@@ -42,8 +44,6 @@ import org.thoughtcrime.securesms.util.RemoteConfig
 import org.whispersystems.signalservice.api.groupsv2.ClientZkOperations
 import org.whispersystems.signalservice.api.groupsv2.GroupsV2Api
 import org.whispersystems.signalservice.api.groupsv2.GroupsV2Operations
-import org.whispersystems.signalservice.api.push.ServiceId.ACI
-import org.whispersystems.signalservice.api.push.ServiceId.PNI
 import org.whispersystems.signalservice.api.push.ServiceIds
 import java.util.UUID
 

app/src/test/java/org/thoughtcrime/securesms/groups/v2/ChangeBuilder.java

@@ -17,7 +17,7 @@ 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.thoughtcrime.securesms.util.Util;
-import org.whispersystems.signalservice.api.push.ServiceId.ACI;
+import org.signal.core.models.ServiceId.ACI;
 
 import kotlin.collections.CollectionsKt;
 import okio.ByteString;

app/src/test/java/org/thoughtcrime/securesms/groups/v2/ProfileKeySetTest.kt

@@ -4,10 +4,10 @@ import assertk.assertThat
 import assertk.assertions.containsOnly
 import assertk.assertions.isEmpty
 import org.junit.Test
+import org.signal.core.models.ServiceId
 import org.signal.core.util.logging.Log.initialize
 import org.thoughtcrime.securesms.crypto.ProfileKeyUtil
 import org.thoughtcrime.securesms.testutil.LogRecorder
-import org.whispersystems.signalservice.api.push.ServiceId
 import java.util.UUID
 
 class ProfileKeySetTest {

app/src/test/java/org/thoughtcrime/securesms/groups/v2/processing/GroupStatePatcherTest.kt

@@ -9,6 +9,8 @@ import assertk.assertions.isNull
 import assertk.assertions.isSameInstanceAs
 import org.junit.Before
 import org.junit.Test
+import org.signal.core.models.ServiceId
+import org.signal.core.util.UuidUtil
 import org.signal.core.util.logging.Log
 import org.signal.storageservice.protos.groups.local.DecryptedGroup
 import org.signal.storageservice.protos.groups.local.DecryptedGroupChange
@@ -16,8 +18,6 @@ import org.signal.storageservice.protos.groups.local.DecryptedMember
 import org.signal.storageservice.protos.groups.local.DecryptedString
 import org.thoughtcrime.securesms.testutil.LogRecorder
 import org.whispersystems.signalservice.api.groupsv2.DecryptedGroupChangeLog
-import org.whispersystems.signalservice.api.push.ServiceId
-import org.whispersystems.signalservice.api.util.UuidUtil
 import java.util.UUID
 
 class GroupStatePatcherTest {

app/src/test/java/org/thoughtcrime/securesms/groups/v2/processing/GroupsV2StateProcessorTest.kt

@@ -24,6 +24,8 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
 import org.robolectric.annotation.Config
+import org.signal.core.models.ServiceId.ACI
+import org.signal.core.models.ServiceId.PNI
 import org.signal.core.util.Hex.fromStringCondensed
 import org.signal.core.util.logging.Log
 import org.signal.libsignal.protocol.logging.SignalProtocolLoggerProvider
@@ -68,8 +70,6 @@ import org.whispersystems.signalservice.api.groupsv2.GroupsV2Api
 import org.whispersystems.signalservice.api.groupsv2.GroupsV2Operations
 import org.whispersystems.signalservice.api.groupsv2.NotAbleToApplyGroupV2ChangeException
 import org.whispersystems.signalservice.api.groupsv2.ReceivedGroupSendEndorsements
-import org.whispersystems.signalservice.api.push.ServiceId.ACI
-import org.whispersystems.signalservice.api.push.ServiceId.PNI
 import org.whispersystems.signalservice.api.push.ServiceIds
 import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException
 import org.whispersystems.signalservice.internal.push.exceptions.NotInGroupException

app/src/test/java/org/thoughtcrime/securesms/jobs/FastJobStorageTest.kt

@@ -65,6 +65,51 @@ class FastJobStorageTest {
     verify(exactly = 0) { database.insertJobs(DataSet1.FULL_SPECS) }
   }
 
+  @Test
+  fun `insertJobs - depends on memory-only job`() {
+    val database = mockDatabase()
+    val subject = FastJobStorage(database)
+
+    val dependsOnFullSpec = fullSpec("j1", "f1", isMemoryOnly = true)
+
+    val job = jobSpec("j2", "f2", isMemoryOnly = false)
+    val dependencySpec = DependencySpec(jobId = "j2", dependsOnJobId = dependsOnFullSpec.jobSpec.id, isMemoryOnly = true)
+    val fullSpec = FullSpec(jobSpec = job, constraintSpecs = emptyList(), dependencySpecs = listOf(dependencySpec))
+
+    subject.insertJobs(listOf(dependsOnFullSpec))
+    verify(exactly = 0) { database.insertJobs(any()) }
+
+    val fullSpecList = listOf(fullSpec)
+    subject.insertJobs(fullSpecList)
+    verify(exactly = 1) { database.insertJobs(fullSpecList) }
+
+    assertThat(subject.getNextEligibleJob(10, NO_PREDICATE)).isEqualTo(dependsOnFullSpec.jobSpec)
+    subject.deleteJob(dependsOnFullSpec.jobSpec.id)
+
+    assertThat(subject.getNextEligibleJob(10, NO_PREDICATE)).isEqualTo(fullSpec.jobSpec)
+  }
+
+  @Test
+  fun `insertJobs - depends on memory-only job that does not exist`() {
+    val database = mockDatabase()
+    val subject = FastJobStorage(database)
+
+    val dependsOnFullSpec = fullSpec("j1", "f1", isMemoryOnly = true)
+
+    val job = jobSpec("j2", "f2", isMemoryOnly = false)
+    val dependencySpec = DependencySpec(jobId = "j2", dependsOnJobId = dependsOnFullSpec.jobSpec.id, isMemoryOnly = true)
+    val fullSpec = FullSpec(jobSpec = job, constraintSpecs = emptyList(), dependencySpecs = listOf(dependencySpec))
+
+    val fullSpecList = listOf(fullSpec)
+    subject.insertJobs(fullSpecList)
+    verify(exactly = 1) { database.insertJobs(fullSpecList) }
+
+    assertThat(subject.getNextEligibleJob(10, NO_PREDICATE)).isEqualTo(dependsOnFullSpec.jobSpec)
+    subject.deleteJob(dependsOnFullSpec.jobSpec.id)
+
+    assertThat(subject.getNextEligibleJob(10, NO_PREDICATE)).isEqualTo(fullSpec.jobSpec)
+  }
+
   @Test
   fun `insertJobs - data can be found`() {
     val subject = FastJobStorage(mockDatabase())

app/src/test/java/org/thoughtcrime/securesms/payments/reconciliation/LedgerReconcileTest.java

@@ -20,9 +20,7 @@ import org.thoughtcrime.securesms.payments.proto.PaymentMetaData;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.testutil.LogRecorder;
 import org.whispersystems.signalservice.api.payments.Money;
-import org.whispersystems.signalservice.api.util.Uint64RangeException;
-import org.whispersystems.signalservice.api.util.Uint64Util;
-import org.whispersystems.signalservice.api.util.UuidUtil;
+import org.signal.core.util.UuidUtil;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;

app/src/test/java/org/thoughtcrime/securesms/recipients/RecipientIdCacheTest.kt

@@ -5,9 +5,9 @@ import io.mockk.mockk
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNull
 import org.junit.Test
+import org.signal.core.models.ServiceId
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.testutil.LogRecorder
-import org.whispersystems.signalservice.api.push.ServiceId
 import java.util.Optional
 import java.util.UUID
 

app/src/test/java/org/thoughtcrime/securesms/recipients/ui/findby/FindByViewModelTest.kt

@@ -18,6 +18,7 @@ import org.junit.Assert.assertEquals
 import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Test
+import org.signal.core.models.ServiceId
 import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.profiles.manage.UsernameRepository
 import org.thoughtcrime.securesms.recipients.LiveRecipientCache
@@ -27,7 +28,6 @@ import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.recipients.RecipientRepository
 import org.thoughtcrime.securesms.registration.ui.countrycode.Country
 import org.thoughtcrime.securesms.registration.ui.countrycode.CountryUtils
-import org.whispersystems.signalservice.api.push.ServiceId
 import java.util.Optional
 
 class FindByViewModelTest {

app/src/test/java/org/thoughtcrime/securesms/registration/v2/PinHashKbsDataTest.kt

@@ -6,11 +6,11 @@ import org.junit.Assert.assertArrayEquals
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertTrue
 import org.junit.Test
+import org.signal.core.models.MasterKey
 import org.signal.core.util.StreamUtil
 import org.signal.libsignal.svr2.PinHash
 import org.thoughtcrime.securesms.registration.v2.testdata.KbsTestVector
 import org.thoughtcrime.securesms.testutil.SecureRandomTestUtil
-import org.whispersystems.signalservice.api.kbs.MasterKey
 import org.whispersystems.signalservice.api.kbs.PinHashUtil.createNewKbsData
 import org.whispersystems.signalservice.api.kbs.PinHashUtil.decryptSvrDataIVCipherText
 import org.whispersystems.signalservice.internal.util.JsonUtil

app/src/test/java/org/thoughtcrime/securesms/registration/v2/PinHashUtil_normalize_Test.java

@@ -1,10 +1,10 @@
 package org.thoughtcrime.securesms.registration.v2;
 
 import org.junit.Test;
+import org.signal.core.util.Hex;
 import org.signal.core.util.StreamUtil;
 import org.thoughtcrime.securesms.registration.testdata.PinSanitationVector;
 import org.whispersystems.signalservice.api.kbs.PinHashUtil;
-import org.whispersystems.signalservice.internal.util.Hex;
 import org.whispersystems.signalservice.internal.util.JsonUtil;
 
 import java.io.IOException;

app/src/test/java/org/thoughtcrime/securesms/sms/GroupV2UpdateMessageUtilTest.java

@@ -7,7 +7,7 @@ import org.signal.storageservice.protos.groups.local.DecryptedGroupChange;
 import org.thoughtcrime.securesms.database.model.databaseprotos.DecryptedGroupV2Context;
 import org.thoughtcrime.securesms.groups.v2.ChangeBuilder;
 import org.thoughtcrime.securesms.mms.MessageGroupContext;
-import org.whispersystems.signalservice.api.push.ServiceId.ACI;
+import org.signal.core.models.ServiceId.ACI;
 import org.whispersystems.signalservice.internal.push.GroupContextV2;
 
 import java.util.Random;

app/src/test/java/org/thoughtcrime/securesms/storage/ChatFolderRecordProcessorTest.kt

@@ -5,11 +5,11 @@ import org.junit.Assert.assertFalse
 import org.junit.Assert.assertTrue
 import org.junit.BeforeClass
 import org.junit.Test
+import org.signal.core.util.UuidUtil
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.testutil.EmptyLogger
 import org.whispersystems.signalservice.api.storage.SignalChatFolderRecord
 import org.whispersystems.signalservice.api.storage.StorageId
-import org.whispersystems.signalservice.api.util.UuidUtil
 import org.whispersystems.signalservice.internal.storage.protos.ChatFolderRecord
 import org.whispersystems.signalservice.internal.storage.protos.Recipient
 import java.util.UUID

app/src/test/java/org/thoughtcrime/securesms/storage/ContactRecordProcessorTest.kt

@@ -16,14 +16,14 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
 import org.robolectric.annotation.Config
+import org.signal.core.models.ServiceId
+import org.signal.core.models.ServiceId.ACI
+import org.signal.core.models.ServiceId.PNI
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.database.RecipientTable
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.testutil.EmptyLogger
 import org.thoughtcrime.securesms.testutil.MockAppDependenciesRule
-import org.whispersystems.signalservice.api.push.ServiceId
-import org.whispersystems.signalservice.api.push.ServiceId.ACI
-import org.whispersystems.signalservice.api.push.ServiceId.PNI
 import org.whispersystems.signalservice.api.storage.SignalContactRecord
 import org.whispersystems.signalservice.api.storage.StorageId
 import org.whispersystems.signalservice.internal.storage.protos.ContactRecord

app/src/test/java/org/thoughtcrime/securesms/storage/NotificationProfileRecordProcessorTest.kt

@@ -5,11 +5,11 @@ import org.junit.Assert.assertFalse
 import org.junit.Assert.assertTrue
 import org.junit.BeforeClass
 import org.junit.Test
+import org.signal.core.util.UuidUtil
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.testutil.EmptyLogger
 import org.whispersystems.signalservice.api.storage.SignalNotificationProfileRecord
 import org.whispersystems.signalservice.api.storage.StorageId
-import org.whispersystems.signalservice.api.util.UuidUtil
 import org.whispersystems.signalservice.internal.storage.protos.NotificationProfile
 import org.whispersystems.signalservice.internal.storage.protos.Recipient
 import java.util.UUID

app/src/test/java/org/thoughtcrime/securesms/storage/StorageSyncHelperTest.kt

@@ -11,12 +11,12 @@ import org.junit.Assert.assertNotEquals
 import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Test
+import org.signal.core.models.ServiceId.ACI
+import org.signal.core.models.ServiceId.ACI.Companion.parseOrThrow
 import org.thoughtcrime.securesms.storage.StorageSyncHelper.findIdDifference
 import org.thoughtcrime.securesms.storage.StorageSyncHelper.profileKeyChanged
 import org.thoughtcrime.securesms.testutil.TestHelpers
 import org.thoughtcrime.securesms.util.RemoteConfig
-import org.whispersystems.signalservice.api.push.ServiceId.ACI
-import org.whispersystems.signalservice.api.push.ServiceId.ACI.Companion.parseOrThrow
 import org.whispersystems.signalservice.api.storage.SignalContactRecord
 import org.whispersystems.signalservice.api.storage.SignalRecord
 import org.whispersystems.signalservice.api.storage.StorageId

app/src/test/java/org/thoughtcrime/securesms/storage/StoryDistributionListRecordProcessorTest.kt

@@ -5,12 +5,12 @@ import org.junit.Assert.assertFalse
 import org.junit.Assert.assertTrue
 import org.junit.BeforeClass
 import org.junit.Test
+import org.signal.core.util.UuidUtil
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.testutil.EmptyLogger
 import org.whispersystems.signalservice.api.push.DistributionId
 import org.whispersystems.signalservice.api.storage.SignalStoryDistributionListRecord
 import org.whispersystems.signalservice.api.storage.StorageId
-import org.whispersystems.signalservice.api.util.UuidUtil
 import org.whispersystems.signalservice.internal.storage.protos.StoryDistributionListRecord
 import java.util.UUID
 

app/src/test/java/org/thoughtcrime/securesms/util/BucketingUtilTest.java

@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.util;
 
 import org.junit.Test;
-import org.whispersystems.signalservice.api.util.UuidUtil;
+import org.signal.core.util.UuidUtil;
 
 import java.util.UUID;