diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/conversation/ConversationItemPreviewer.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/conversation/ConversationItemPreviewer.kt index 2a205b775..14164ff86 100644 --- a/app/src/androidTest/java/org/thoughtcrime/securesms/conversation/ConversationItemPreviewer.kt +++ b/app/src/androidTest/java/org/thoughtcrime/securesms/conversation/ConversationItemPreviewer.kt @@ -9,7 +9,7 @@ import org.junit.runner.RunWith import org.signal.core.util.ThreadUtil import org.thoughtcrime.securesms.attachments.PointerAttachment import org.thoughtcrime.securesms.database.SignalDatabase -import org.thoughtcrime.securesms.database.ThreadDatabase +import org.thoughtcrime.securesms.database.ThreadTable import org.thoughtcrime.securesms.database.model.StoryType import org.thoughtcrime.securesms.mms.IncomingMediaMessage import org.thoughtcrime.securesms.mms.OutgoingMediaMessage @@ -120,7 +120,7 @@ class ConversationItemPreviewer { -1, 0, false, - ThreadDatabase.DistributionTypes.DEFAULT, + ThreadTable.DistributionTypes.DEFAULT, StoryType.NONE, null, false, diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/conversation/SafetyNumberChangeDialogPreviewer.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/conversation/SafetyNumberChangeDialogPreviewer.kt index 2e495b750..5a544664a 100644 --- a/app/src/androidTest/java/org/thoughtcrime/securesms/conversation/SafetyNumberChangeDialogPreviewer.kt +++ b/app/src/androidTest/java/org/thoughtcrime/securesms/conversation/SafetyNumberChangeDialogPreviewer.kt @@ -7,7 +7,7 @@ import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith import org.thoughtcrime.securesms.contacts.paged.ContactSearchKey -import org.thoughtcrime.securesms.database.IdentityDatabase +import org.thoughtcrime.securesms.database.IdentityTable import org.thoughtcrime.securesms.database.SignalDatabase import org.thoughtcrime.securesms.database.model.DistributionListId import org.thoughtcrime.securesms.database.model.DistributionListPrivacyMode @@ -32,7 +32,7 @@ class SafetyNumberChangeDialogPreviewer { SignalDatabase.recipients.setProfileName(other.id, ProfileName.fromParts("Super really long name like omg", "But seriously it's long like really really long")) - harness.setVerified(other, IdentityDatabase.VerifiedStatus.VERIFIED) + harness.setVerified(other, IdentityTable.VerifiedStatus.VERIFIED) harness.changeIdentityKey(other) val scenario: ActivityScenario = harness.launchActivity { putExtra("recipient_id", other.id.serialize()) } @@ -52,7 +52,7 @@ class SafetyNumberChangeDialogPreviewer { othersRecipients.forEach { other -> SignalDatabase.recipients.setProfileName(other.id, ProfileName.fromParts("My", "Name")) - harness.setVerified(other, IdentityDatabase.VerifiedStatus.DEFAULT) + harness.setVerified(other, IdentityTable.VerifiedStatus.DEFAULT) harness.changeIdentityKey(other) SignalDatabase.distributionLists.addMemberToList(DistributionListId.MY_STORY, DistributionListPrivacyMode.ONLY_WITH, other.id) diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/database/AttachmentDatabaseTest.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/database/AttachmentTableTest.kt similarity index 86% rename from app/src/androidTest/java/org/thoughtcrime/securesms/database/AttachmentDatabaseTest.kt rename to app/src/androidTest/java/org/thoughtcrime/securesms/database/AttachmentTableTest.kt index 704e6b346..876641d29 100644 --- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/AttachmentDatabaseTest.kt +++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/AttachmentTableTest.kt @@ -15,7 +15,7 @@ import org.thoughtcrime.securesms.util.MediaUtil import java.util.Optional @RunWith(AndroidJUnit4::class) -class AttachmentDatabaseTest { +class AttachmentTableTest { @Before fun setUp() { @@ -39,7 +39,7 @@ class AttachmentDatabaseTest { val blob = BlobProvider.getInstance().forData(byteArrayOf(1, 2, 3, 4, 5)).createForSingleSessionInMemory() val highQualityProperties = createHighQualityTransformProperties() val highQualityImage = createAttachment(1, blob, highQualityProperties) - val lowQualityImage = createAttachment(1, blob, AttachmentDatabase.TransformProperties.empty()) + val lowQualityImage = createAttachment(1, blob, AttachmentTable.TransformProperties.empty()) val attachment = SignalDatabase.attachments.insertAttachmentForPreUpload(highQualityImage) val attachment2 = SignalDatabase.attachments.insertAttachmentForPreUpload(lowQualityImage) @@ -55,8 +55,8 @@ class AttachmentDatabaseTest { false ) - val attachment1Info = SignalDatabase.attachments.getAttachmentDataFileInfo(attachment.attachmentId, AttachmentDatabase.DATA) - val attachment2Info = SignalDatabase.attachments.getAttachmentDataFileInfo(attachment2.attachmentId, AttachmentDatabase.DATA) + val attachment1Info = SignalDatabase.attachments.getAttachmentDataFileInfo(attachment.attachmentId, AttachmentTable.DATA) + val attachment2Info = SignalDatabase.attachments.getAttachmentDataFileInfo(attachment2.attachmentId, AttachmentTable.DATA) assertNotEquals(attachment1Info, attachment2Info) } @@ -81,13 +81,13 @@ class AttachmentDatabaseTest { true ) - val attachment1Info = SignalDatabase.attachments.getAttachmentDataFileInfo(attachment.attachmentId, AttachmentDatabase.DATA) - val attachment2Info = SignalDatabase.attachments.getAttachmentDataFileInfo(attachment2.attachmentId, AttachmentDatabase.DATA) + val attachment1Info = SignalDatabase.attachments.getAttachmentDataFileInfo(attachment.attachmentId, AttachmentTable.DATA) + val attachment2Info = SignalDatabase.attachments.getAttachmentDataFileInfo(attachment2.attachmentId, AttachmentTable.DATA) assertNotEquals(attachment1Info, attachment2Info) } - private fun createAttachment(id: Long, uri: Uri, transformProperties: AttachmentDatabase.TransformProperties): UriAttachment { + private fun createAttachment(id: Long, uri: Uri, transformProperties: AttachmentTable.TransformProperties): UriAttachment { return UriAttachmentBuilder.build( id, uri = uri, @@ -96,8 +96,8 @@ class AttachmentDatabaseTest { ) } - private fun createHighQualityTransformProperties(): AttachmentDatabase.TransformProperties { - return AttachmentDatabase.TransformProperties.forSentMediaQuality(Optional.empty(), SentMediaQuality.HIGH) + private fun createHighQualityTransformProperties(): AttachmentTable.TransformProperties { + return AttachmentTable.TransformProperties.forSentMediaQuality(Optional.empty(), SentMediaQuality.HIGH) } private fun createMediaStream(byteArray: ByteArray): MediaStream { diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/database/DistributionListDatabaseTest.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/database/DistributionListTablesTest.kt similarity index 96% rename from app/src/androidTest/java/org/thoughtcrime/securesms/database/DistributionListDatabaseTest.kt rename to app/src/androidTest/java/org/thoughtcrime/securesms/database/DistributionListTablesTest.kt index e346c9275..dde6f7a7f 100644 --- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/DistributionListDatabaseTest.kt +++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/DistributionListTablesTest.kt @@ -10,9 +10,9 @@ import org.thoughtcrime.securesms.recipients.RecipientId import org.whispersystems.signalservice.api.push.ACI import java.util.UUID -class DistributionListDatabaseTest { +class DistributionListTablesTest { - private lateinit var distributionDatabase: DistributionListDatabase + private lateinit var distributionDatabase: DistributionListTables @Before fun setup() { diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/database/MmsHelper.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/database/MmsHelper.kt index bb5ddd511..ce951d36a 100644 --- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/MmsHelper.kt +++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/MmsHelper.kt @@ -21,7 +21,7 @@ object MmsHelper { subscriptionId: Int = -1, expiresIn: Long = 0, viewOnce: Boolean = false, - distributionType: Int = ThreadDatabase.DistributionTypes.DEFAULT, + distributionType: Int = ThreadTable.DistributionTypes.DEFAULT, threadId: Long = 1, storyType: StoryType = StoryType.NONE, parentStoryId: ParentStoryId? = null, @@ -62,13 +62,13 @@ object MmsHelper { message: OutgoingMediaMessage, threadId: Long ): Long { - return SignalDatabase.mms.insertMessageOutbox(message, threadId, false, GroupReceiptDatabase.STATUS_UNKNOWN, null) + return SignalDatabase.mms.insertMessageOutbox(message, threadId, false, GroupReceiptTable.STATUS_UNKNOWN, null) } fun insert( message: IncomingMediaMessage, threadId: Long - ): Optional { + ): Optional { return SignalDatabase.mms.insertSecureDecryptedMessageInbox(message, threadId) } } diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/database/MmsDatabaseTest_gifts.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/database/MmsTableTest_gifts.kt similarity index 98% rename from app/src/androidTest/java/org/thoughtcrime/securesms/database/MmsDatabaseTest_gifts.kt rename to app/src/androidTest/java/org/thoughtcrime/securesms/database/MmsTableTest_gifts.kt index b618bf7b2..83f10a75e 100644 --- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/MmsDatabaseTest_gifts.kt +++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/MmsTableTest_gifts.kt @@ -17,8 +17,8 @@ import java.util.UUID @Suppress("ClassName") @RunWith(AndroidJUnit4::class) -class MmsDatabaseTest_gifts { - private lateinit var mms: MmsDatabase +class MmsTableTest_gifts { + private lateinit var mms: MmsTable private val localAci = ACI.from(UUID.randomUUID()) private val localPni = PNI.from(UUID.randomUUID()) diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/database/MmsDatabaseTest_stories.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/database/MmsTableTest_stories.kt similarity index 99% rename from app/src/androidTest/java/org/thoughtcrime/securesms/database/MmsDatabaseTest_stories.kt rename to app/src/androidTest/java/org/thoughtcrime/securesms/database/MmsTableTest_stories.kt index 9f7b2e055..603953b24 100644 --- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/MmsDatabaseTest_stories.kt +++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/MmsTableTest_stories.kt @@ -24,9 +24,9 @@ import java.util.concurrent.TimeUnit @Suppress("ClassName") @RunWith(AndroidJUnit4::class) -class MmsDatabaseTest_stories { +class MmsTableTest_stories { - private lateinit var mms: MmsDatabase + private lateinit var mms: MmsTable private val localAci = ACI.from(UUID.randomUUID()) private val localPni = PNI.from(UUID.randomUUID()) diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientDatabaseTest.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientTableTest.kt similarity index 98% rename from app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientDatabaseTest.kt rename to app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientTableTest.kt index 5ff5df98a..b90f14210 100644 --- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientDatabaseTest.kt +++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientTableTest.kt @@ -13,7 +13,7 @@ import org.thoughtcrime.securesms.recipients.RecipientId import org.thoughtcrime.securesms.testing.SignalActivityRule @RunWith(AndroidJUnit4::class) -class RecipientDatabaseTest { +class RecipientTableTest { @get:Rule val harness = SignalActivityRule() @@ -38,7 +38,7 @@ class RecipientDatabaseTest { val results: MutableList = SignalDatabase.recipients.getSignalContacts(false)?.use { val ids = mutableListOf() while (it.moveToNext()) { - ids.add(RecipientId.from(CursorUtil.requireLong(it, RecipientDatabase.ID))) + ids.add(RecipientId.from(CursorUtil.requireLong(it, RecipientTable.ID))) } ids @@ -79,7 +79,7 @@ class RecipientDatabaseTest { val results: MutableList = SignalDatabase.recipients.getNonGroupContacts(false)?.use { val ids = mutableListOf() while (it.moveToNext()) { - ids.add(RecipientId.from(CursorUtil.requireLong(it, RecipientDatabase.ID))) + ids.add(RecipientId.from(CursorUtil.requireLong(it, RecipientTable.ID))) } ids @@ -109,7 +109,7 @@ class RecipientDatabaseTest { val results: MutableList = SignalDatabase.recipients.getSignalContacts(false)?.use { val ids = mutableListOf() while (it.moveToNext()) { - ids.add(RecipientId.from(CursorUtil.requireLong(it, RecipientDatabase.ID))) + ids.add(RecipientId.from(CursorUtil.requireLong(it, RecipientTable.ID))) } ids @@ -150,7 +150,7 @@ class RecipientDatabaseTest { val results: MutableList = SignalDatabase.recipients.getNonGroupContacts(false)?.use { val ids = mutableListOf() while (it.moveToNext()) { - ids.add(RecipientId.from(CursorUtil.requireLong(it, RecipientDatabase.ID))) + ids.add(RecipientId.from(CursorUtil.requireLong(it, RecipientTable.ID))) } ids diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientDatabaseTest_getAndPossiblyMerge.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientTableTest_getAndPossiblyMerge.kt similarity index 96% rename from app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientDatabaseTest_getAndPossiblyMerge.kt rename to app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientTableTest_getAndPossiblyMerge.kt index af3832ac1..9be6eba6f 100644 --- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientDatabaseTest_getAndPossiblyMerge.kt +++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientTableTest_getAndPossiblyMerge.kt @@ -39,7 +39,7 @@ import java.util.Optional import java.util.UUID @RunWith(AndroidJUnit4::class) -class RecipientDatabaseTest_getAndPossiblyMerge { +class RecipientTableTest_getAndPossiblyMerge { @Before fun setup() { @@ -413,8 +413,8 @@ class RecipientDatabaseTest_getAndPossiblyMerge { val identityKeyAci: IdentityKey = identityKey(1) val identityKeyE164: IdentityKey = identityKey(2) - SignalDatabase.identities.saveIdentity(ACI_A.toString(), recipientIdAci, identityKeyAci, IdentityDatabase.VerifiedStatus.VERIFIED, false, 0, false) - SignalDatabase.identities.saveIdentity(E164_A, recipientIdE164, identityKeyE164, IdentityDatabase.VerifiedStatus.VERIFIED, false, 0, false) + SignalDatabase.identities.saveIdentity(ACI_A.toString(), recipientIdAci, identityKeyAci, IdentityTable.VerifiedStatus.VERIFIED, false, 0, false) + SignalDatabase.identities.saveIdentity(E164_A, recipientIdE164, identityKeyE164, IdentityTable.VerifiedStatus.VERIFIED, false, 0, false) SignalDatabase.sessions.store(ACI_SELF, SignalProtocolAddress(ACI_A.toString(), 1), SessionRecord()) @@ -485,7 +485,7 @@ class RecipientDatabaseTest_getAndPossiblyMerge { assertEquals(retrievedThreadId, mention2.threadId) // Group receipt validation - val groupReceipts: List = SignalDatabase.groupReceipts.getGroupReceiptInfo(mmsId1) + val groupReceipts: List = SignalDatabase.groupReceipts.getGroupReceiptInfo(mmsId1) assertEquals(retrievedId, groupReceipts[0].recipientId) assertEquals(retrievedId, groupReceipts[1].recipientId) @@ -539,11 +539,11 @@ class RecipientDatabaseTest_getAndPossiblyMerge { } private fun getMention(messageId: Long): MentionModel { - SignalDatabase.rawDatabase.rawQuery("SELECT * FROM ${MentionDatabase.TABLE_NAME} WHERE ${MentionDatabase.MESSAGE_ID} = $messageId").use { cursor -> + SignalDatabase.rawDatabase.rawQuery("SELECT * FROM ${MentionTable.TABLE_NAME} WHERE ${MentionTable.MESSAGE_ID} = $messageId").use { cursor -> cursor.moveToFirst() return MentionModel( - recipientId = RecipientId.from(CursorUtil.requireLong(cursor, MentionDatabase.RECIPIENT_ID)), - threadId = CursorUtil.requireLong(cursor, MentionDatabase.THREAD_ID) + recipientId = RecipientId.from(CursorUtil.requireLong(cursor, MentionTable.RECIPIENT_ID)), + threadId = CursorUtil.requireLong(cursor, MentionTable.THREAD_ID) ) } } @@ -660,8 +660,8 @@ class RecipientDatabaseTest_getAndPossiblyMerge { fun expectDeleted(id: RecipientId) { SignalDatabase.rawDatabase .select("1") - .from(RecipientDatabase.TABLE_NAME) - .where("${RecipientDatabase.ID} = ?", id) + .from(RecipientTable.TABLE_NAME) + .where("${RecipientTable.ID} = ?", id) .run() .use { !it.moveToFirst() } } @@ -681,13 +681,13 @@ class RecipientDatabaseTest_getAndPossiblyMerge { val pniString: String? = pni?.toString() val id: Long = SignalDatabase.rawDatabase.insert( - RecipientDatabase.TABLE_NAME, + RecipientTable.TABLE_NAME, null, contentValuesOf( - RecipientDatabase.PHONE to e164, - RecipientDatabase.SERVICE_ID to serviceIdString, - RecipientDatabase.PNI_COLUMN to pniString, - RecipientDatabase.REGISTERED to RecipientDatabase.RegisteredState.REGISTERED.id + RecipientTable.PHONE to e164, + RecipientTable.SERVICE_ID to serviceIdString, + RecipientTable.PNI_COLUMN to pniString, + RecipientTable.REGISTERED to RecipientTable.RegisteredState.REGISTERED.id ) ) diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientDatabaseTest_processPnpTupleToChangeSet.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientTableTest_processPnpTupleToChangeSet.kt similarity index 96% rename from app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientDatabaseTest_processPnpTupleToChangeSet.kt rename to app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientTableTest_processPnpTupleToChangeSet.kt index cdd6cea57..865f7af56 100644 --- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientDatabaseTest_processPnpTupleToChangeSet.kt +++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientTableTest_processPnpTupleToChangeSet.kt @@ -18,13 +18,13 @@ import java.lang.IllegalStateException import java.util.UUID @RunWith(AndroidJUnit4::class) -class RecipientDatabaseTest_processPnpTupleToChangeSet { +class RecipientTableTest_processPnpTupleToChangeSet { @Rule @JvmField val databaseRule = SignalDatabaseRule(deleteAllThreadsOnEachRun = false) - private lateinit var db: RecipientDatabase + private lateinit var db: RecipientTable @Before fun setup() { @@ -711,13 +711,13 @@ class RecipientDatabaseTest_processPnpTupleToChangeSet { private fun insert(e164: String?, pni: PNI?, aci: ACI?): RecipientId { val id: Long = SignalDatabase.rawDatabase.insert( - RecipientDatabase.TABLE_NAME, + RecipientTable.TABLE_NAME, null, contentValuesOf( - RecipientDatabase.PHONE to e164, - RecipientDatabase.SERVICE_ID to (aci ?: pni)?.toString(), - RecipientDatabase.PNI_COLUMN to pni?.toString(), - RecipientDatabase.REGISTERED to RecipientDatabase.RegisteredState.REGISTERED.id + RecipientTable.PHONE to e164, + RecipientTable.SERVICE_ID to (aci ?: pni)?.toString(), + RecipientTable.PNI_COLUMN to pni?.toString(), + RecipientTable.REGISTERED to RecipientTable.RegisteredState.REGISTERED.id ) ) @@ -726,12 +726,12 @@ class RecipientDatabaseTest_processPnpTupleToChangeSet { private fun insertMockSessionFor(account: ServiceId, address: ServiceId) { SignalDatabase.rawDatabase.insert( - SessionDatabase.TABLE_NAME, null, + SessionTable.TABLE_NAME, null, contentValuesOf( - SessionDatabase.ACCOUNT_ID to account.toString(), - SessionDatabase.ADDRESS to address.toString(), - SessionDatabase.DEVICE to 1, - SessionDatabase.RECORD to Util.getSecretBytes(32) + SessionTable.ACCOUNT_ID to account.toString(), + SessionTable.ADDRESS to address.toString(), + SessionTable.DEVICE to 1, + SessionTable.RECORD to Util.getSecretBytes(32) ) ) } @@ -762,7 +762,7 @@ class RecipientDatabaseTest_processPnpTupleToChangeSet { } /** - * Helper method that will call insert your recipients, call [RecipientDatabase.processPnpTupleToChangeSet] with your params, + * Helper method that will call insert your recipients, call [RecipientTable.processPnpTupleToChangeSet] with your params, * and then verify your output matches what you expect. * * It results the inserted ID's and changeset for additional verification. 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 1b6e3feec..db14edf40 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 @@ -31,8 +31,8 @@ import java.util.UUID @RunWith(AndroidJUnit4::class) class SmsDatabaseTest_collapseJoinRequestEventsIfPossible { - private lateinit var recipients: RecipientDatabase - private lateinit var sms: SmsDatabase + private lateinit var recipients: RecipientTable + private lateinit var sms: SmsTable private val localAci = ACI.from(UUID.randomUUID()) private val localPni = PNI.from(UUID.randomUUID()) @@ -163,7 +163,7 @@ class SmsDatabaseTest_collapseJoinRequestEventsIfPossible { */ @Test fun previousJoinRequestCollapse() { - val latestMessage: MessageDatabase.InsertResult = sms.insertMessageInbox( + val latestMessage: MessageTable.InsertResult = sms.insertMessageInbox( groupUpdateMessage( sender = alice, groupContext = groupContext(masterKey = masterKey) { @@ -197,7 +197,7 @@ class SmsDatabaseTest_collapseJoinRequestEventsIfPossible { fun previousJoinThenTextCollapse() { val secondLatestMessage = sms.insertMessageInbox(smsMessage(sender = alice, body = "What up")).get() - val latestMessage: MessageDatabase.InsertResult = sms.insertMessageInbox( + val latestMessage: MessageTable.InsertResult = sms.insertMessageInbox( groupUpdateMessage( sender = alice, groupContext = groupContext(masterKey = masterKey) { @@ -231,7 +231,7 @@ class SmsDatabaseTest_collapseJoinRequestEventsIfPossible { */ @Test fun previousCollapseAndJoinRequestDoubleCollapse() { - val secondLatestMessage: MessageDatabase.InsertResult = sms.insertMessageInbox( + val secondLatestMessage: MessageTable.InsertResult = sms.insertMessageInbox( groupUpdateMessage( sender = alice, groupContext = groupContext(masterKey = masterKey) { @@ -243,7 +243,7 @@ class SmsDatabaseTest_collapseJoinRequestEventsIfPossible { ) ).get() - val latestMessage: MessageDatabase.InsertResult = sms.insertMessageInbox( + val latestMessage: MessageTable.InsertResult = sms.insertMessageInbox( groupUpdateMessage( sender = alice, groupContext = groupContext(masterKey = masterKey) { diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/database/StorySendsDatabaseTest.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/database/StorySendTableTest.kt similarity index 99% rename from app/src/androidTest/java/org/thoughtcrime/securesms/database/StorySendsDatabaseTest.kt rename to app/src/androidTest/java/org/thoughtcrime/securesms/database/StorySendTableTest.kt index 14348f161..05cf39ac0 100644 --- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/StorySendsDatabaseTest.kt +++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/StorySendTableTest.kt @@ -22,7 +22,7 @@ import org.whispersystems.signalservice.api.push.ServiceId import java.util.UUID @RunWith(AndroidJUnit4::class) -class StorySendsDatabaseTest { +class StorySendTableTest { private val distributionId1 = DistributionId.from(UUID.randomUUID()) private val distributionId2 = DistributionId.from(UUID.randomUUID()) @@ -45,7 +45,7 @@ class StorySendsDatabaseTest { private var messageId2: Long = 0 private var messageId3: Long = 0 - private lateinit var storySends: StorySendsDatabase + private lateinit var storySends: StorySendTable @Before fun setup() { @@ -287,6 +287,7 @@ class StorySendsDatabaseTest { assertNotNull(manifest) } + /* @Test fun givenTwoStoriesAndOneIsRemoteDeleted_whenIGetRecipientIdsForManifestUpdate_thenIExpectOnlyRecipientsWithStory2() { storySends.insert(messageId1, recipients1to10, 200, false, distributionId1) @@ -324,7 +325,7 @@ class StorySendsDatabaseTest { assertTrue(results.entries.all { it.allowedToReply }) } - + */ @Test fun givenEmptyManifest_whenIApplyRemoteManifest_thenNothingChanges() { storySends.insert(messageId1, recipients1to10, 200, false, distributionId1) diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/database/ThreadDatabaseTest_pinned.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/database/ThreadTableTest_pinned.kt similarity index 87% rename from app/src/androidTest/java/org/thoughtcrime/securesms/database/ThreadDatabaseTest_pinned.kt rename to app/src/androidTest/java/org/thoughtcrime/securesms/database/ThreadTableTest_pinned.kt index e3f9b8300..a688f85e2 100644 --- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/ThreadDatabaseTest_pinned.kt +++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/ThreadTableTest_pinned.kt @@ -6,13 +6,14 @@ import org.junit.Before import org.junit.Rule import org.junit.Test import org.signal.core.util.CursorUtil +import org.thoughtcrime.securesms.conversationlist.model.ConversationFilter import org.thoughtcrime.securesms.recipients.Recipient import org.thoughtcrime.securesms.testing.SignalDatabaseRule import org.whispersystems.signalservice.api.push.ServiceId import java.util.UUID @Suppress("ClassName") -class ThreadDatabaseTest_pinned { +class ThreadTableTest_pinned { @Rule @JvmField @@ -51,7 +52,7 @@ class ThreadDatabaseTest_pinned { SignalDatabase.mms.deleteMessage(messageId) // THEN - val unarchivedCount = SignalDatabase.threads.getUnarchivedConversationListCount() + val unarchivedCount = SignalDatabase.threads.getUnarchivedConversationListCount(ConversationFilter.OFF) assertEquals(1, unarchivedCount) } @@ -66,9 +67,9 @@ class ThreadDatabaseTest_pinned { SignalDatabase.mms.deleteMessage(messageId) // THEN - SignalDatabase.threads.getUnarchivedConversationList(true, 0, 1).use { + SignalDatabase.threads.getUnarchivedConversationList(ConversationFilter.OFF, true, 0, 1).use { it.moveToFirst() - assertEquals(threadId, CursorUtil.requireLong(it, ThreadDatabase.ID)) + assertEquals(threadId, CursorUtil.requireLong(it, ThreadTable.ID)) } } } diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/database/ThreadDatabaseTest_recents.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/database/ThreadTableTest_recents.kt similarity index 96% rename from app/src/androidTest/java/org/thoughtcrime/securesms/database/ThreadDatabaseTest_recents.kt rename to app/src/androidTest/java/org/thoughtcrime/securesms/database/ThreadTableTest_recents.kt index 744451749..5e0058f98 100644 --- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/ThreadDatabaseTest_recents.kt +++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/ThreadTableTest_recents.kt @@ -15,7 +15,7 @@ import java.util.UUID @Suppress("ClassName") @RunWith(AndroidJUnit4::class) -class ThreadDatabaseTest_recents { +class ThreadTableTest_recents { @Rule @JvmField @@ -40,7 +40,7 @@ class ThreadDatabaseTest_recents { val results: MutableList = SignalDatabase.threads.getRecentConversationList(10, false, false, false, false, false, false).use { cursor -> val ids = mutableListOf() while (cursor.moveToNext()) { - ids.add(RecipientId.from(CursorUtil.requireLong(cursor, ThreadDatabase.RECIPIENT_ID))) + ids.add(RecipientId.from(CursorUtil.requireLong(cursor, ThreadTable.RECIPIENT_ID))) } ids diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/database/UriAttachmentBuilder.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/database/UriAttachmentBuilder.kt index 7068d5ef2..828b75fe7 100644 --- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/UriAttachmentBuilder.kt +++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/UriAttachmentBuilder.kt @@ -11,7 +11,7 @@ object UriAttachmentBuilder { id: Long, uri: Uri = Uri.parse("content://$id"), contentType: String, - transferState: Int = AttachmentDatabase.TRANSFER_PROGRESS_PENDING, + transferState: Int = AttachmentTable.TRANSFER_PROGRESS_PENDING, size: Long = 0L, fileName: String = "file$id", voiceNote: Boolean = false, @@ -22,7 +22,7 @@ object UriAttachmentBuilder { stickerLocator: StickerLocator? = null, blurHash: BlurHash? = null, audioHash: AudioHash? = null, - transformProperties: AttachmentDatabase.TransformProperties? = null + transformProperties: AttachmentTable.TransformProperties? = null ): UriAttachment { return UriAttachment( uri, diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/database/helpers/migration/MyStoryMigrationTest.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/database/helpers/migration/MyStoryMigrationTest.kt index bcb7ef66f..fe6f4b778 100644 --- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/helpers/migration/MyStoryMigrationTest.kt +++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/helpers/migration/MyStoryMigrationTest.kt @@ -10,7 +10,7 @@ import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith import org.signal.core.util.SqlUtil -import org.thoughtcrime.securesms.database.DistributionListDatabase +import org.thoughtcrime.securesms.database.DistributionListTables import org.thoughtcrime.securesms.database.SignalDatabase import org.thoughtcrime.securesms.database.model.DistributionListId import org.thoughtcrime.securesms.testing.SignalDatabaseRule @@ -72,9 +72,9 @@ class MyStoryMigrationTest { private fun setMyStoryDistributionId(serializedId: String) { SignalDatabase.rawDatabase.update( - DistributionListDatabase.LIST_TABLE_NAME, + DistributionListTables.LIST_TABLE_NAME, contentValuesOf( - DistributionListDatabase.DISTRIBUTION_ID to serializedId + DistributionListTables.DISTRIBUTION_ID to serializedId ), "_id = ?", SqlUtil.buildArgs(DistributionListId.MY_STORY) @@ -83,7 +83,7 @@ class MyStoryMigrationTest { private fun deleteMyStory() { SignalDatabase.rawDatabase.delete( - DistributionListDatabase.LIST_TABLE_NAME, + DistributionListTables.LIST_TABLE_NAME, "_id = ?", SqlUtil.buildArgs(DistributionListId.MY_STORY) ) @@ -91,9 +91,9 @@ class MyStoryMigrationTest { private fun assertValidMyStoryExists() { SignalDatabase.rawDatabase.query( - DistributionListDatabase.LIST_TABLE_NAME, + DistributionListTables.LIST_TABLE_NAME, SqlUtil.COUNT, - "_id = ? AND ${DistributionListDatabase.DISTRIBUTION_ID} = ?", + "_id = ? AND ${DistributionListTables.DISTRIBUTION_ID} = ?", SqlUtil.buildArgs(DistributionListId.MY_STORY, DistributionId.MY_STORY.toString()), null, null, diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/messages/MessageContentProcessor__handleStoryMessageTest.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/messages/MessageContentProcessor__handleStoryMessageTest.kt index f77cbf03f..4ddc5b298 100644 --- a/app/src/androidTest/java/org/thoughtcrime/securesms/messages/MessageContentProcessor__handleStoryMessageTest.kt +++ b/app/src/androidTest/java/org/thoughtcrime/securesms/messages/MessageContentProcessor__handleStoryMessageTest.kt @@ -9,7 +9,7 @@ import org.signal.libsignal.zkgroup.groups.GroupMasterKey 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.thoughtcrime.securesms.database.MessageDatabase +import org.thoughtcrime.securesms.database.MessageTable import org.thoughtcrime.securesms.database.MmsHelper import org.thoughtcrime.securesms.database.SignalDatabase import org.thoughtcrime.securesms.database.model.DistributionListId @@ -74,7 +74,7 @@ class MessageContentProcessor__handleStoryMessageTest : MessageContentProcessorT val replyId = SignalDatabase.mmsSms.getConversation(senderThreadId, 0, 1).use { it.moveToFirst() - it.requireLong(MessageDatabase.ID) + it.requireLong(MessageTable.ID) } val replyRecord = SignalDatabase.mms.getMessageRecord(replyId) as MediaMmsMessageRecord @@ -140,7 +140,7 @@ class MessageContentProcessor__handleStoryMessageTest : MessageContentProcessorT val replyId = SignalDatabase.mms.getStoryReplies(insertResult.get().messageId).use { cursor -> assertEquals(1, cursor.count) cursor.moveToFirst() - cursor.requireLong(MessageDatabase.ID) + cursor.requireLong(MessageTable.ID) } val replyRecord = SignalDatabase.mms.getMessageRecord(replyId) as MediaMmsMessageRecord diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/testing/SignalActivityRule.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/testing/SignalActivityRule.kt index 8af9677d2..c725182c3 100644 --- a/app/src/androidTest/java/org/thoughtcrime/securesms/testing/SignalActivityRule.kt +++ b/app/src/androidTest/java/org/thoughtcrime/securesms/testing/SignalActivityRule.kt @@ -15,7 +15,7 @@ import org.signal.libsignal.protocol.SignalProtocolAddress import org.thoughtcrime.securesms.crypto.IdentityKeyUtil import org.thoughtcrime.securesms.crypto.MasterSecretUtil import org.thoughtcrime.securesms.crypto.ProfileKeyUtil -import org.thoughtcrime.securesms.database.IdentityDatabase +import org.thoughtcrime.securesms.database.IdentityTable import org.thoughtcrime.securesms.database.SignalDatabase import org.thoughtcrime.securesms.dependencies.ApplicationDependencies import org.thoughtcrime.securesms.dependencies.InstrumentationApplicationDependencyProvider @@ -130,7 +130,7 @@ class SignalActivityRule(private val othersCount: Int = 4) : ExternalResource() return ApplicationDependencies.getProtocolStore().aci().identities().getIdentity(SignalProtocolAddress(recipient.requireServiceId().toString(), 0)) } - fun setVerified(recipient: Recipient, status: IdentityDatabase.VerifiedStatus) { - ApplicationDependencies.getProtocolStore().aci().identities().setVerified(recipient.id, getIdentity(recipient), IdentityDatabase.VerifiedStatus.VERIFIED) + fun setVerified(recipient: Recipient, status: IdentityTable.VerifiedStatus) { + ApplicationDependencies.getProtocolStore().aci().identities().setVerified(recipient.id, getIdentity(recipient), IdentityTable.VerifiedStatus.VERIFIED) } } diff --git a/paging/lib/build.gradle b/paging/lib/build.gradle index e21f35bbd..c5e85d955 100644 --- a/paging/lib/build.gradle +++ b/paging/lib/build.gradle @@ -7,6 +7,7 @@ android { defaultConfig { minSdkVersion MINIMUM_SDK targetSdkVersion TARGET_SDK + multiDexEnabled true } compileOptions { @@ -17,6 +18,7 @@ android { dependencies { implementation libs.androidx.appcompat + implementation libs.androidx.multidex implementation libs.material.material implementation libs.rxjava3.rxandroid implementation libs.rxjava3.rxjava diff --git a/spinner/app/build.gradle b/spinner/app/build.gradle index c99aa4e7e..90eda201f 100644 --- a/spinner/app/build.gradle +++ b/spinner/app/build.gradle @@ -50,6 +50,7 @@ dependencies { implementation libs.androidx.activity.ktx implementation libs.androidx.appcompat implementation libs.material.material + implementation libs.androidx.multidex implementation libs.androidx.constraintlayout implementation libs.signal.android.database.sqlcipher implementation libs.androidx.sqlite diff --git a/spinner/lib/build.gradle b/spinner/lib/build.gradle index f263354e0..1c901986d 100644 --- a/spinner/lib/build.gradle +++ b/spinner/lib/build.gradle @@ -11,6 +11,7 @@ android { defaultConfig { minSdkVersion MINIMUM_SDK targetSdkVersion TARGET_SDK + multiDexEnabled true } compileOptions { @@ -33,6 +34,7 @@ dependencies { implementation libs.androidx.appcompat implementation libs.material.material + implementation libs.androidx.multidex implementation libs.androidx.sqlite implementation project(':core-util') testImplementation testLibs.junit.junit