diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/database/AttachmentTableTest.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/database/AttachmentTableTest.kt index 29a44c8788..70754b89eb 100644 --- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/AttachmentTableTest.kt +++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/AttachmentTableTest.kt @@ -20,6 +20,7 @@ import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith import org.signal.core.models.backup.MediaName +import org.signal.core.models.database.AttachmentId import org.signal.core.models.media.TransformProperties import org.signal.core.util.Base64 import org.signal.core.util.Base64.decodeBase64OrThrow @@ -27,7 +28,6 @@ import org.signal.core.util.copyTo import org.signal.core.util.stream.NullOutputStream import org.thoughtcrime.securesms.attachments.ArchivedAttachment import org.thoughtcrime.securesms.attachments.Attachment -import org.thoughtcrime.securesms.attachments.AttachmentId import org.thoughtcrime.securesms.attachments.PointerAttachment import org.thoughtcrime.securesms.attachments.UriAttachment import org.thoughtcrime.securesms.backup.v2.ArchivedMediaObject diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/database/AttachmentTableTestUtil.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/database/AttachmentTableTestUtil.kt index aa05d60dd7..aee06f75f4 100644 --- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/AttachmentTableTestUtil.kt +++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/AttachmentTableTestUtil.kt @@ -5,10 +5,10 @@ package org.thoughtcrime.securesms.database +import org.signal.core.models.database.AttachmentId import org.signal.core.util.Base64 import org.signal.core.util.Util import org.signal.network.api.AttachmentUploadResult -import org.thoughtcrime.securesms.attachments.AttachmentId import org.thoughtcrime.securesms.attachments.Cdn import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentRemoteId import kotlin.random.Random diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/database/AttachmentTableTest_deduping.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/database/AttachmentTableTest_deduping.kt index 47ef8d2871..f4167f4a18 100644 --- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/AttachmentTableTest_deduping.kt +++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/AttachmentTableTest_deduping.kt @@ -12,13 +12,13 @@ import org.junit.Before import org.junit.Test import org.junit.runner.RunWith import org.signal.core.models.ServiceId +import org.signal.core.models.database.AttachmentId import org.signal.core.models.media.TransformProperties import org.signal.core.util.Base64 import org.signal.core.util.Util import org.signal.core.util.readFully import org.signal.core.util.stream.LimitedInputStream import org.signal.core.util.update -import org.thoughtcrime.securesms.attachments.AttachmentId import org.thoughtcrime.securesms.attachments.Cdn import org.thoughtcrime.securesms.attachments.PointerAttachment import org.thoughtcrime.securesms.keyvalue.SignalStore diff --git a/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachment.kt b/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachment.kt index 1ec6300ccd..4234631367 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachment.kt @@ -4,6 +4,7 @@ import android.net.Uri import android.os.Parcel import androidx.core.os.ParcelCompat import org.signal.blurhash.BlurHash +import org.signal.core.models.database.AttachmentId import org.signal.core.models.media.TransformProperties import org.signal.core.util.ParcelUtil import org.thoughtcrime.securesms.audio.AudioHash diff --git a/app/src/main/java/org/thoughtcrime/securesms/audio/AudioWaveForms.kt b/app/src/main/java/org/thoughtcrime/securesms/audio/AudioWaveForms.kt index 9cf9a43d2d..d8a9739835 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/audio/AudioWaveForms.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/audio/AudioWaveForms.kt @@ -7,9 +7,9 @@ import androidx.annotation.AnyThread import io.reactivex.rxjava3.core.Single import io.reactivex.rxjava3.schedulers.Schedulers import io.reactivex.rxjava3.subjects.SingleSubject +import org.signal.core.models.database.AttachmentId import org.signal.core.util.logging.Log import org.thoughtcrime.securesms.attachments.Attachment -import org.thoughtcrime.securesms.attachments.AttachmentId import org.thoughtcrime.securesms.attachments.DatabaseAttachment import org.thoughtcrime.securesms.database.SignalDatabase import org.thoughtcrime.securesms.database.model.databaseprotos.AudioWaveFormData diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/ArchiveUploadProgress.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/ArchiveUploadProgress.kt index a5427496de..e828b3e1fe 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/ArchiveUploadProgress.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/ArchiveUploadProgress.kt @@ -19,11 +19,11 @@ import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.flow.onStart import kotlinx.coroutines.flow.shareIn import kotlinx.coroutines.withContext +import org.signal.core.models.database.AttachmentId import org.signal.core.util.bytes import org.signal.core.util.logging.Log import org.signal.core.util.throttleLatest import org.thoughtcrime.securesms.BuildConfig -import org.thoughtcrime.securesms.attachments.AttachmentId import org.thoughtcrime.securesms.backup.v2.BackupRepository import org.thoughtcrime.securesms.database.SignalDatabase import org.thoughtcrime.securesms.dependencies.AppDependencies diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/BackupFrameOutputStream.java b/app/src/main/java/org/thoughtcrime/securesms/backup/BackupFrameOutputStream.java index fcce1f50e1..39ae9248f9 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/BackupFrameOutputStream.java +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/BackupFrameOutputStream.java @@ -11,7 +11,7 @@ import org.signal.core.util.Conversions; import org.signal.core.util.logging.Log; import org.signal.libsignal.protocol.kdf.HKDF; import org.signal.libsignal.protocol.util.ByteUtil; -import org.thoughtcrime.securesms.attachments.AttachmentId; +import org.signal.core.models.database.AttachmentId; import org.thoughtcrime.securesms.backup.proto.Attachment; import org.thoughtcrime.securesms.backup.proto.Avatar; import org.thoughtcrime.securesms.backup.proto.BackupFrame; 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 21343257c0..45e5f01781 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.java +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.java @@ -19,7 +19,7 @@ import org.signal.core.util.SetUtil; import org.signal.core.util.SqlUtil; import org.signal.core.util.Stopwatch; import org.signal.core.util.logging.Log; -import org.thoughtcrime.securesms.attachments.AttachmentId; +import org.signal.core.models.database.AttachmentId; import org.thoughtcrime.securesms.backup.proto.KeyValue; import org.thoughtcrime.securesms.backup.proto.SharedPreference; import org.thoughtcrime.securesms.backup.proto.SqlStatement; diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ArchiveRestoreProgress.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ArchiveRestoreProgress.kt index faf8b30c0e..3c74f47304 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ArchiveRestoreProgress.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ArchiveRestoreProgress.kt @@ -16,13 +16,13 @@ import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.flow.flowOn import kotlinx.coroutines.flow.update +import org.signal.core.models.database.AttachmentId import org.signal.core.util.bytes import org.signal.core.util.concurrent.SignalExecutors import org.signal.core.util.logging.Log import org.signal.core.util.safeUnregisterReceiver import org.signal.core.util.throttleLatest import org.thoughtcrime.securesms.BuildConfig -import org.thoughtcrime.securesms.attachments.AttachmentId import org.thoughtcrime.securesms.backup.RestoreState import org.thoughtcrime.securesms.database.DatabaseObserver import org.thoughtcrime.securesms.database.SignalDatabase diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/BackupRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/BackupRepository.kt index 22f724bf73..67f4174512 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/BackupRepository.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/BackupRepository.kt @@ -34,6 +34,7 @@ import org.signal.core.models.backup.BackupId import org.signal.core.models.backup.MediaName import org.signal.core.models.backup.MediaRootBackupKey import org.signal.core.models.backup.MessageBackupKey +import org.signal.core.models.database.AttachmentId import org.signal.core.util.Base64 import org.signal.core.util.Base64.decodeBase64OrThrow import org.signal.core.util.CursorUtil @@ -72,9 +73,7 @@ import org.signal.network.NetworkResult import org.signal.network.StatusCodeErrorAction import org.signal.network.api.SvrBApi import org.signal.network.exceptions.NonSuccessfulResponseCodeException -import org.signal.network.rest.toNetworkResult import org.thoughtcrime.securesms.R -import org.thoughtcrime.securesms.attachments.AttachmentId import org.thoughtcrime.securesms.attachments.Cdn import org.thoughtcrime.securesms.attachments.DatabaseAttachment import org.thoughtcrime.securesms.backup.ArchiveUploadProgress diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/BackupRestoreManager.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/BackupRestoreManager.kt index ae117f9df1..5b9b9f5c5c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/BackupRestoreManager.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/BackupRestoreManager.kt @@ -5,8 +5,8 @@ package org.thoughtcrime.securesms.backup.v2 +import org.signal.core.models.database.AttachmentId import org.signal.core.util.concurrent.SignalExecutors -import org.thoughtcrime.securesms.attachments.AttachmentId import org.thoughtcrime.securesms.attachments.DatabaseAttachment import org.thoughtcrime.securesms.database.AttachmentTable import org.thoughtcrime.securesms.database.model.MessageRecord diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/BatchArchiveMediaResult.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/BatchArchiveMediaResult.kt index a8a14b02c9..c2effd4c9b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/BatchArchiveMediaResult.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/BatchArchiveMediaResult.kt @@ -5,7 +5,7 @@ package org.thoughtcrime.securesms.backup.v2 -import org.thoughtcrime.securesms.attachments.AttachmentId +import org.signal.core.models.database.AttachmentId import org.whispersystems.signalservice.api.archive.BatchArchiveMediaResponse /** diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/database/AttachmentTableArchiveExtensions.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/database/AttachmentTableArchiveExtensions.kt index b100df773c..0b43108779 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/database/AttachmentTableArchiveExtensions.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/database/AttachmentTableArchiveExtensions.kt @@ -5,8 +5,8 @@ package org.thoughtcrime.securesms.backup.v2.database +import org.signal.core.models.database.AttachmentId import org.thoughtcrime.securesms.attachments.Attachment -import org.thoughtcrime.securesms.attachments.AttachmentId import org.thoughtcrime.securesms.database.AttachmentTable fun AttachmentTable.restoreWallpaperAttachment(attachment: Attachment): AttachmentId? { diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/exporters/ChatItemArchiveExporter.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/exporters/ChatItemArchiveExporter.kt index 328de6fc9a..b36b66f65f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/exporters/ChatItemArchiveExporter.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/exporters/ChatItemArchiveExporter.kt @@ -42,6 +42,7 @@ import org.signal.archive.proto.Text import org.signal.archive.proto.ThreadMergeChatUpdate import org.signal.archive.proto.ViewOnceMessage import org.signal.core.models.ServiceId +import org.signal.core.models.database.AttachmentId import org.signal.core.util.Base64 import org.signal.core.util.EventTimer import org.signal.core.util.Hex @@ -68,7 +69,6 @@ import org.signal.core.util.requireLong import org.signal.core.util.requireLongOrNull import org.signal.core.util.requireString import org.signal.core.util.toByteArray -import org.thoughtcrime.securesms.attachments.AttachmentId import org.thoughtcrime.securesms.attachments.DatabaseAttachment import org.thoughtcrime.securesms.backup.v2.BackupMode import org.thoughtcrime.securesms.backup.v2.ExportOddities diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/importer/ChatArchiveImporter.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/importer/ChatArchiveImporter.kt index 0a6ca9262b..f4899c1cde 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/importer/ChatArchiveImporter.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/importer/ChatArchiveImporter.kt @@ -7,10 +7,10 @@ package org.thoughtcrime.securesms.backup.v2.importer import androidx.core.content.contentValuesOf import org.signal.archive.proto.Chat +import org.signal.core.models.database.AttachmentId import org.signal.core.util.SqlUtil import org.signal.core.util.insertInto import org.signal.core.util.toInt -import org.thoughtcrime.securesms.attachments.AttachmentId import org.thoughtcrime.securesms.backup.v2.ImportState import org.thoughtcrime.securesms.backup.v2.database.restoreWallpaperAttachment import org.thoughtcrime.securesms.backup.v2.util.parseChatWallpaper diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/local/LocalArchiver.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/local/LocalArchiver.kt index 8b09f7d072..9a0358010d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/local/LocalArchiver.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/local/LocalArchiver.kt @@ -16,6 +16,7 @@ import org.signal.archive.stream.EncryptedBackupReader import org.signal.core.models.backup.BackupId import org.signal.core.models.backup.MediaName import org.signal.core.models.backup.MessageBackupKey +import org.signal.core.models.database.AttachmentId import org.signal.core.util.Stopwatch import org.signal.core.util.StreamUtil import org.signal.core.util.Util @@ -23,7 +24,6 @@ import org.signal.core.util.logging.Log import org.signal.core.util.readFully import org.signal.core.util.toJson import org.signal.libsignal.crypto.Aes256Ctr32 -import org.thoughtcrime.securesms.attachments.AttachmentId import org.thoughtcrime.securesms.backup.LocalExportProgress import org.thoughtcrime.securesms.backup.v2.BackupRepository import org.thoughtcrime.securesms.database.AttachmentTable diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/processor/AccountDataArchiveProcessor.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/processor/AccountDataArchiveProcessor.kt index aeec925e87..315f494945 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/processor/AccountDataArchiveProcessor.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/processor/AccountDataArchiveProcessor.kt @@ -12,11 +12,11 @@ import org.signal.archive.proto.AccountData import org.signal.archive.proto.ChatStyle import org.signal.archive.proto.Frame import org.signal.archive.stream.BackupFrameEmitter +import org.signal.core.models.database.AttachmentId import org.signal.core.util.UuidUtil import org.signal.core.util.logging.Log import org.signal.core.util.toByteArray import org.signal.libsignal.zkgroup.backups.BackupLevel -import org.thoughtcrime.securesms.attachments.AttachmentId import org.thoughtcrime.securesms.backup.v2.ExportState import org.thoughtcrime.securesms.backup.v2.ImportState import org.thoughtcrime.securesms.backup.v2.MessageBackupTier diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/util/ChatStyleConverter.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/util/ChatStyleConverter.kt index 63a26741b8..38f3bba220 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/util/ChatStyleConverter.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/util/ChatStyleConverter.kt @@ -7,8 +7,8 @@ package org.thoughtcrime.securesms.backup.v2.util import org.signal.archive.proto.ChatStyle import org.signal.archive.proto.FilePointer +import org.signal.core.models.database.AttachmentId import org.signal.core.util.logging.Log -import org.thoughtcrime.securesms.attachments.AttachmentId import org.thoughtcrime.securesms.backup.v2.BackupMode import org.thoughtcrime.securesms.backup.v2.ImportState import org.thoughtcrime.securesms.conversation.colors.ChatColors diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/backup/InternalBackupPlaygroundViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/backup/InternalBackupPlaygroundViewModel.kt index 2bab3392af..94e2ed99e3 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/backup/InternalBackupPlaygroundViewModel.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/backup/InternalBackupPlaygroundViewModel.kt @@ -27,6 +27,7 @@ import org.signal.archive.stream.EncryptedBackupReader import org.signal.archive.stream.EncryptedBackupReader.Companion.MAC_SIZE import org.signal.core.models.ServiceId import org.signal.core.models.backup.MessageBackupKey +import org.signal.core.models.database.AttachmentId import org.signal.core.util.Hex import org.signal.core.util.ThreadUtil import org.signal.core.util.bytes @@ -39,7 +40,6 @@ import org.signal.core.util.stream.LimitedInputStream import org.signal.libsignal.zkgroup.profiles.ProfileKey import org.signal.network.NetworkResult import org.signal.network.api.SvrBApi -import org.thoughtcrime.securesms.attachments.AttachmentId import org.thoughtcrime.securesms.attachments.DatabaseAttachment import org.thoughtcrime.securesms.backup.ArchiveUploadProgress import org.thoughtcrime.securesms.backup.LocalExportProgress diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNotePlaybackService.java b/app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNotePlaybackService.java index 01dd2f8e00..b47ff67f4d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNotePlaybackService.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNotePlaybackService.java @@ -8,7 +8,6 @@ import android.content.pm.ResolveInfo; import android.media.AudioManager; import android.net.Uri; import android.os.Bundle; -import android.os.Process; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -26,7 +25,7 @@ import androidx.media3.session.MediaSessionService; import org.signal.core.util.concurrent.SignalExecutors; import org.signal.core.util.logging.Log; -import org.thoughtcrime.securesms.attachments.AttachmentId; +import org.signal.core.models.database.AttachmentId; import org.thoughtcrime.securesms.attachments.DatabaseAttachment; import org.thoughtcrime.securesms.database.DatabaseObserver; import org.thoughtcrime.securesms.database.MessageTable; diff --git a/app/src/main/java/org/thoughtcrime/securesms/contactshare/Contact.java b/app/src/main/java/org/thoughtcrime/securesms/contactshare/Contact.java index 1425df4dd1..549f9a96de 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/contactshare/Contact.java +++ b/app/src/main/java/org/thoughtcrime/securesms/contactshare/Contact.java @@ -13,7 +13,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import org.thoughtcrime.securesms.attachments.Attachment; -import org.thoughtcrime.securesms.attachments.AttachmentId; +import org.signal.core.models.database.AttachmentId; import org.thoughtcrime.securesms.attachments.UriAttachment; import org.thoughtcrime.securesms.database.AttachmentTable; import org.signal.core.util.JsonUtils; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentTable.kt b/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentTable.kt index 213699bc98..be78011c3b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentTable.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentTable.kt @@ -29,6 +29,7 @@ import org.signal.archive.proto.BackupDebugInfo import org.signal.blurhash.BlurHash import org.signal.core.models.backup.MediaId import org.signal.core.models.backup.MediaName +import org.signal.core.models.database.AttachmentId import org.signal.core.models.media.TransformProperties import org.signal.core.ui.util.StorageUtil import org.signal.core.util.Base64 @@ -69,7 +70,6 @@ import org.signal.glide.decryptableuri.DecryptableUri import org.signal.network.api.AttachmentUploadResult import org.thoughtcrime.securesms.attachments.ArchivedAttachment import org.thoughtcrime.securesms.attachments.Attachment -import org.thoughtcrime.securesms.attachments.AttachmentId import org.thoughtcrime.securesms.attachments.Cdn import org.thoughtcrime.securesms.attachments.DatabaseAttachment import org.thoughtcrime.securesms.attachments.LocalBackupKey diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/InAppPaymentTable.kt b/app/src/main/java/org/thoughtcrime/securesms/database/InAppPaymentTable.kt index 2d3f76febe..5d65d48e5c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/InAppPaymentTable.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/InAppPaymentTable.kt @@ -14,7 +14,7 @@ import androidx.core.content.contentValuesOf import kotlinx.parcelize.IgnoredOnParcel import kotlinx.parcelize.Parcelize import kotlinx.parcelize.TypeParceler -import org.signal.core.util.DatabaseId +import org.signal.core.models.database.DatabaseId import org.signal.core.util.DatabaseSerializer import org.signal.core.util.Serializer import org.signal.core.util.delete diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/MessageTable.kt b/app/src/main/java/org/thoughtcrime/securesms/database/MessageTable.kt index cc4b007c47..eb731890f0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/MessageTable.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/MessageTable.kt @@ -28,6 +28,7 @@ import org.json.JSONArray import org.json.JSONException import org.json.JSONObject import org.signal.core.models.ServiceId +import org.signal.core.models.database.AttachmentId import org.signal.core.util.Base64 import org.signal.core.util.CursorUtil import org.signal.core.util.JsonUtils @@ -67,7 +68,6 @@ import org.signal.core.util.update import org.signal.core.util.withinTransaction import org.signal.libsignal.protocol.IdentityKey import org.thoughtcrime.securesms.attachments.Attachment -import org.thoughtcrime.securesms.attachments.AttachmentId import org.thoughtcrime.securesms.attachments.DatabaseAttachment import org.thoughtcrime.securesms.attachments.DatabaseAttachment.DisplayOrderComparator import org.thoughtcrime.securesms.backup.v2.exporters.ChatItemArchiveExporter diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/model/DistributionListId.java b/app/src/main/java/org/thoughtcrime/securesms/database/model/DistributionListId.java index 5d96a8ad93..b9bea1af13 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/model/DistributionListId.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/model/DistributionListId.java @@ -6,7 +6,7 @@ import android.os.Parcelable; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import org.signal.core.util.DatabaseId; +import org.signal.core.models.database.DatabaseId; import java.util.Objects; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/model/MessageExportStatus.kt b/app/src/main/java/org/thoughtcrime/securesms/database/model/MessageExportStatus.kt index 014277e69b..12dfb33306 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/model/MessageExportStatus.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/model/MessageExportStatus.kt @@ -1,6 +1,6 @@ package org.thoughtcrime.securesms.database.model -import org.signal.core.util.DatabaseId +import org.signal.core.models.database.DatabaseId import org.signal.core.util.IntSerializer /** diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/model/MmsMessageRecord.java b/app/src/main/java/org/thoughtcrime/securesms/database/model/MmsMessageRecord.java index 821113eea6..5a6dbfb302 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/model/MmsMessageRecord.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/model/MmsMessageRecord.java @@ -15,7 +15,7 @@ import androidx.core.content.ContextCompat; import org.signal.core.util.logging.Log; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.attachments.Attachment; -import org.thoughtcrime.securesms.attachments.AttachmentId; +import org.signal.core.models.database.AttachmentId; import org.thoughtcrime.securesms.attachments.DatabaseAttachment; import org.thoughtcrime.securesms.contactshare.Contact; import org.thoughtcrime.securesms.database.CallTable; diff --git a/app/src/main/java/org/thoughtcrime/securesms/glide/DecryptableStreamLocalUriFetcher.java b/app/src/main/java/org/thoughtcrime/securesms/glide/DecryptableStreamLocalUriFetcher.java index 9aad17ff52..02afad6830 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/glide/DecryptableStreamLocalUriFetcher.java +++ b/app/src/main/java/org/thoughtcrime/securesms/glide/DecryptableStreamLocalUriFetcher.java @@ -15,7 +15,7 @@ import com.bumptech.glide.load.data.StreamLocalUriFetcher; import org.signal.core.util.logging.Log; import org.signal.glide.common.io.GlideStreamConfig; -import org.thoughtcrime.securesms.attachments.AttachmentId; +import org.signal.core.models.database.AttachmentId; import org.thoughtcrime.securesms.mms.PartAuthority; import org.thoughtcrime.securesms.providers.BlobProvider; import org.thoughtcrime.securesms.util.BitmapDecodingException; diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/GroupId.kt b/app/src/main/java/org/thoughtcrime/securesms/groups/GroupId.kt index 0bd9993561..b74cb5ad39 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/GroupId.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/GroupId.kt @@ -11,7 +11,7 @@ import kotlinx.parcelize.Parcelize import kotlinx.serialization.Serializable import kotlinx.serialization.Transient import okio.ByteString -import org.signal.core.util.DatabaseId +import org.signal.core.models.database.DatabaseId import org.signal.core.util.Hex import org.signal.core.util.LRUCache import org.signal.core.util.Util diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/ArchiveThumbnailUploadJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/ArchiveThumbnailUploadJob.kt index 090bd93019..616eb6d014 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/ArchiveThumbnailUploadJob.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/ArchiveThumbnailUploadJob.kt @@ -5,12 +5,12 @@ package org.thoughtcrime.securesms.jobs +import org.signal.core.models.database.AttachmentId import org.signal.core.util.Util import org.signal.core.util.logging.Log import org.signal.glide.decryptableuri.DecryptableUri import org.signal.network.NetworkResult import org.signal.network.api.AttachmentUploadResult -import org.thoughtcrime.securesms.attachments.AttachmentId import org.thoughtcrime.securesms.attachments.AttachmentUploadUtil import org.thoughtcrime.securesms.attachments.DatabaseAttachment import org.thoughtcrime.securesms.backup.v2.ArchiveDatabaseExecutor diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentCompressionJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentCompressionJob.java index ad0ddbb91d..dd97b106ef 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentCompressionJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentCompressionJob.java @@ -13,7 +13,7 @@ import org.greenrobot.eventbus.EventBus; import org.signal.core.util.logging.Log; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.attachments.Attachment; -import org.thoughtcrime.securesms.attachments.AttachmentId; +import org.signal.core.models.database.AttachmentId; import org.thoughtcrime.securesms.attachments.DatabaseAttachment; import org.thoughtcrime.securesms.crypto.AttachmentSecret; import org.thoughtcrime.securesms.crypto.AttachmentSecretProvider; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentCopyJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentCopyJob.java index c38d4628bb..afbb8bf278 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentCopyJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentCopyJob.java @@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.jobs; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import org.thoughtcrime.securesms.attachments.AttachmentId; +import org.signal.core.models.database.AttachmentId; import org.thoughtcrime.securesms.database.AttachmentTable; import org.thoughtcrime.securesms.database.SignalDatabase; import org.thoughtcrime.securesms.jobmanager.JsonJobData; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentDownloadJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentDownloadJob.kt index abe179ae68..479356a1fa 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentDownloadJob.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentDownloadJob.kt @@ -8,6 +8,7 @@ import androidx.annotation.MainThread import okio.Source import okio.buffer import org.greenrobot.eventbus.EventBus +import org.signal.core.models.database.AttachmentId import org.signal.core.util.Base64 import org.signal.core.util.Hex import org.signal.core.util.Util @@ -17,7 +18,6 @@ import org.signal.libsignal.protocol.InvalidMessageException import org.signal.network.exceptions.NonSuccessfulResponseCodeException import org.signal.network.exceptions.PushNetworkException import org.thoughtcrime.securesms.attachments.Attachment -import org.thoughtcrime.securesms.attachments.AttachmentId import org.thoughtcrime.securesms.attachments.Cdn import org.thoughtcrime.securesms.attachments.DatabaseAttachment import org.thoughtcrime.securesms.attachments.InvalidAttachmentException diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentHashBackfillJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentHashBackfillJob.kt index 295eb0e976..bc40731b21 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentHashBackfillJob.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentHashBackfillJob.kt @@ -5,10 +5,10 @@ package org.thoughtcrime.securesms.jobs +import org.signal.core.models.database.AttachmentId import org.signal.core.util.ThreadUtil import org.signal.core.util.drain import org.signal.core.util.logging.Log -import org.thoughtcrime.securesms.attachments.AttachmentId import org.thoughtcrime.securesms.database.SignalDatabase import org.thoughtcrime.securesms.dependencies.AppDependencies import org.thoughtcrime.securesms.jobmanager.Job diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentUploadJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentUploadJob.kt index a941ccaa81..4304466197 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentUploadJob.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentUploadJob.kt @@ -7,6 +7,7 @@ package org.thoughtcrime.securesms.jobs import android.text.TextUtils import okhttp3.internal.http2.StreamResetException import org.greenrobot.eventbus.EventBus +import org.signal.core.models.database.AttachmentId import org.signal.core.util.Base64 import org.signal.core.util.Util import org.signal.core.util.concurrent.SignalExecutors @@ -20,7 +21,6 @@ import org.signal.network.api.AttachmentUploadResult import org.signal.protos.resumableuploads.ResumableUpload import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.attachments.Attachment -import org.thoughtcrime.securesms.attachments.AttachmentId import org.thoughtcrime.securesms.attachments.AttachmentUploadUtil import org.thoughtcrime.securesms.attachments.DatabaseAttachment import org.thoughtcrime.securesms.backup.v2.BackupRepository diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/BackupRestoreMediaJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/BackupRestoreMediaJob.kt index 0d51044c81..4fa8ec3b19 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/BackupRestoreMediaJob.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/BackupRestoreMediaJob.kt @@ -5,10 +5,10 @@ package org.thoughtcrime.securesms.jobs +import org.signal.core.models.database.AttachmentId import org.signal.core.util.logging.Log import org.signal.core.util.withinTransaction import org.thoughtcrime.securesms.R -import org.thoughtcrime.securesms.attachments.AttachmentId import org.thoughtcrime.securesms.backup.v2.ArchiveRestoreProgress import org.thoughtcrime.securesms.database.AttachmentTable import org.thoughtcrime.securesms.database.SignalDatabase diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/CopyAttachmentToArchiveJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/CopyAttachmentToArchiveJob.kt index dcd0528e3d..1724b759da 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/CopyAttachmentToArchiveJob.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/CopyAttachmentToArchiveJob.kt @@ -2,6 +2,7 @@ package org.thoughtcrime.securesms.jobs import kotlinx.coroutines.runBlocking import org.signal.core.models.backup.MediaName +import org.signal.core.models.database.AttachmentId import org.signal.core.util.Base64.decodeBase64 import org.signal.core.util.ByteSize import org.signal.core.util.bytes @@ -9,7 +10,6 @@ import org.signal.core.util.logging.Log import org.signal.core.util.logging.logW import org.signal.libsignal.zkgroup.VerificationFailedException import org.signal.network.NetworkResult -import org.thoughtcrime.securesms.attachments.AttachmentId import org.thoughtcrime.securesms.attachments.Cdn import org.thoughtcrime.securesms.attachments.DatabaseAttachment import org.thoughtcrime.securesms.backup.ArchiveUploadProgress diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/GenerateAudioWaveFormJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/GenerateAudioWaveFormJob.kt index b8b6fc7dc4..b935772147 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/GenerateAudioWaveFormJob.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/GenerateAudioWaveFormJob.kt @@ -1,8 +1,8 @@ package org.thoughtcrime.securesms.jobs +import org.signal.core.models.database.AttachmentId import org.signal.core.util.concurrent.safeBlockingGet import org.signal.core.util.logging.Log -import org.thoughtcrime.securesms.attachments.AttachmentId import org.thoughtcrime.securesms.attachments.DatabaseAttachment import org.thoughtcrime.securesms.audio.AudioWaveForms import org.thoughtcrime.securesms.database.SignalDatabase diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/QuoteThumbnailBackfillJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/QuoteThumbnailBackfillJob.kt index a0174c1ac2..18b6d8babd 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/QuoteThumbnailBackfillJob.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/QuoteThumbnailBackfillJob.kt @@ -6,6 +6,7 @@ package org.thoughtcrime.securesms.jobs import android.net.Uri +import org.signal.core.models.database.AttachmentId import org.signal.core.util.logging.Log import org.signal.core.util.readToSingleObject import org.signal.core.util.requireLong @@ -14,7 +15,6 @@ import org.signal.core.util.requireString import org.signal.core.util.select import org.signal.core.util.update import org.signal.glide.decryptableuri.DecryptableUri -import org.thoughtcrime.securesms.attachments.AttachmentId import org.thoughtcrime.securesms.database.AttachmentTable import org.thoughtcrime.securesms.database.AttachmentTable.Companion.CONTENT_TYPE import org.thoughtcrime.securesms.database.AttachmentTable.Companion.DATA_FILE diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/RestoreAttachmentJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/RestoreAttachmentJob.kt index 844185282c..f923974d5d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/RestoreAttachmentJob.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/RestoreAttachmentJob.kt @@ -13,6 +13,7 @@ import androidx.core.app.NotificationCompat import androidx.core.app.NotificationManagerCompat import androidx.core.content.ContextCompat import org.greenrobot.eventbus.EventBus +import org.signal.core.models.database.AttachmentId import org.signal.core.util.Base64.decodeBase64OrThrow import org.signal.core.util.PendingIntentFlags import org.signal.core.util.isNotNullOrBlank @@ -22,7 +23,6 @@ import org.signal.libsignal.protocol.InvalidMessageException import org.signal.network.exceptions.NonSuccessfulResponseCodeException import org.signal.network.exceptions.PushNetworkException import org.thoughtcrime.securesms.R -import org.thoughtcrime.securesms.attachments.AttachmentId import org.thoughtcrime.securesms.attachments.DatabaseAttachment import org.thoughtcrime.securesms.attachments.InvalidAttachmentException import org.thoughtcrime.securesms.backup.v2.ArchiveDatabaseExecutor diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/RestoreAttachmentThumbnailJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/RestoreAttachmentThumbnailJob.kt index 82691383a6..46636961f4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/RestoreAttachmentThumbnailJob.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/RestoreAttachmentThumbnailJob.kt @@ -4,10 +4,10 @@ */ package org.thoughtcrime.securesms.jobs +import org.signal.core.models.database.AttachmentId import org.signal.core.util.logging.Log import org.signal.libsignal.protocol.InvalidMessageException import org.signal.network.exceptions.NonSuccessfulResponseCodeException -import org.thoughtcrime.securesms.attachments.AttachmentId import org.thoughtcrime.securesms.attachments.InvalidAttachmentException import org.thoughtcrime.securesms.backup.v2.ArchiveDatabaseExecutor import org.thoughtcrime.securesms.backup.v2.BackupRepository diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/RestoreLocalAttachmentJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/RestoreLocalAttachmentJob.kt index 727d4a28cf..c9b348f0a7 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/RestoreLocalAttachmentJob.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/RestoreLocalAttachmentJob.kt @@ -6,13 +6,13 @@ package org.thoughtcrime.securesms.jobs import android.net.Uri import org.signal.core.models.backup.MediaName +import org.signal.core.models.database.AttachmentId import org.signal.core.util.Base64 import org.signal.core.util.StreamUtil import org.signal.core.util.androidx.DocumentFileInfo import org.signal.core.util.logging.Log import org.signal.libsignal.protocol.InvalidMacException import org.signal.libsignal.protocol.InvalidMessageException -import org.thoughtcrime.securesms.attachments.AttachmentId import org.thoughtcrime.securesms.backup.v2.ArchiveRestoreProgress import org.thoughtcrime.securesms.backup.v2.local.ArchiveFileSystem import org.thoughtcrime.securesms.database.AttachmentTable diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/UploadAttachmentToArchiveJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/UploadAttachmentToArchiveJob.kt index 2e912b8e09..2d853a7bbb 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/UploadAttachmentToArchiveJob.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/UploadAttachmentToArchiveJob.kt @@ -6,6 +6,7 @@ package org.thoughtcrime.securesms.jobs import org.signal.core.models.backup.MediaName +import org.signal.core.models.database.AttachmentId import org.signal.core.util.Base64 import org.signal.core.util.Base64.decodeBase64 import org.signal.core.util.Util @@ -17,7 +18,6 @@ import org.signal.network.NetworkResult import org.signal.network.api.AttachmentUploadResult import org.signal.protos.resumableuploads.ResumableUpload import org.thoughtcrime.securesms.R -import org.thoughtcrime.securesms.attachments.AttachmentId import org.thoughtcrime.securesms.attachments.AttachmentUploadUtil import org.thoughtcrime.securesms.attachments.DatabaseAttachment import org.thoughtcrime.securesms.backup.ArchiveUploadProgress diff --git a/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreview.java b/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreview.java index e6e555b0f9..045c99ebd7 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreview.java +++ b/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreview.java @@ -12,7 +12,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import org.thoughtcrime.securesms.attachments.Attachment; -import org.thoughtcrime.securesms.attachments.AttachmentId; +import org.signal.core.models.database.AttachmentId; import org.thoughtcrime.securesms.attachments.DatabaseAttachment; import org.signal.core.util.JsonUtils; diff --git a/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewViewModel.java index b63b01b9da..ac78001c73 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewViewModel.java +++ b/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewViewModel.java @@ -1,6 +1,5 @@ package org.thoughtcrime.securesms.linkpreview; -import android.content.Context; import android.text.TextUtils; import androidx.annotation.NonNull; @@ -12,7 +11,7 @@ import androidx.lifecycle.ViewModel; import androidx.lifecycle.ViewModelProvider; import org.signal.core.util.ThreadUtil; -import org.thoughtcrime.securesms.attachments.AttachmentId; +import org.signal.core.models.database.AttachmentId; import org.thoughtcrime.securesms.dependencies.AppDependencies; import org.thoughtcrime.securesms.keyvalue.SignalStore; import org.thoughtcrime.securesms.net.RequestController; diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaSelectionKey.kt b/app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaSelectionKey.kt index e790e2715c..d3e3117964 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaSelectionKey.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaSelectionKey.kt @@ -1,6 +1,6 @@ package org.thoughtcrime.securesms.mediaoverview -import org.thoughtcrime.securesms.attachments.AttachmentId +import org.signal.core.models.database.AttachmentId import org.thoughtcrime.securesms.database.MediaTable.MediaRecord sealed class MediaSelectionKey { diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewFragment.java b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewFragment.java index 8e6263fd60..473e72e871 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewFragment.java @@ -1,18 +1,14 @@ package org.thoughtcrime.securesms.mediapreview; import android.content.Context; -import android.net.Uri; -import android.os.Bundle; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; -import org.thoughtcrime.securesms.attachments.Attachment; -import org.thoughtcrime.securesms.attachments.AttachmentId; +import org.signal.core.models.database.AttachmentId; import org.thoughtcrime.securesms.database.SignalDatabase; import org.thoughtcrime.securesms.mms.PartUriParser; -import org.thoughtcrime.securesms.util.MediaUtil; import org.signal.core.util.concurrent.SimpleTask; import java.util.Objects; diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewRepository.kt index f3def7f4c5..4565f9f095 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewRepository.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewRepository.kt @@ -8,10 +8,10 @@ import io.reactivex.rxjava3.core.Completable import io.reactivex.rxjava3.core.Flowable import io.reactivex.rxjava3.core.Single import io.reactivex.rxjava3.schedulers.Schedulers +import org.signal.core.models.database.AttachmentId import org.signal.core.util.Stopwatch import org.signal.core.util.logging.Log import org.signal.core.util.requireLong -import org.thoughtcrime.securesms.attachments.AttachmentId import org.thoughtcrime.securesms.attachments.DatabaseAttachment import org.thoughtcrime.securesms.conversation.ConversationIntents import org.thoughtcrime.securesms.database.AttachmentTable diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2ViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2ViewModel.kt index bf7b157625..31e680310a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2ViewModel.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2ViewModel.kt @@ -18,12 +18,12 @@ import io.reactivex.rxjava3.core.Single import io.reactivex.rxjava3.disposables.CompositeDisposable import io.reactivex.rxjava3.kotlin.plusAssign import io.reactivex.rxjava3.schedulers.Schedulers +import org.signal.core.models.database.AttachmentId import org.signal.core.models.media.Media import org.signal.core.util.PendingIntentFlags import org.signal.core.util.concurrent.SignalExecutors import org.signal.core.util.logging.Log import org.thoughtcrime.securesms.R -import org.thoughtcrime.securesms.attachments.AttachmentId import org.thoughtcrime.securesms.attachments.DatabaseAttachment import org.thoughtcrime.securesms.database.MediaTable import org.thoughtcrime.securesms.database.SignalDatabase diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaUploadRepository.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaUploadRepository.java index f737a4e434..8fe9636bbf 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaUploadRepository.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaUploadRepository.java @@ -12,7 +12,7 @@ import org.signal.core.util.ThreadUtil; import org.signal.core.util.concurrent.SignalExecutors; import org.signal.core.util.logging.Log; import org.thoughtcrime.securesms.attachments.Attachment; -import org.thoughtcrime.securesms.attachments.AttachmentId; +import org.signal.core.models.database.AttachmentId; import org.thoughtcrime.securesms.database.AttachmentTable; import org.thoughtcrime.securesms.database.SignalDatabase; import org.thoughtcrime.securesms.dependencies.AppDependencies; diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v3/MediaSendV3PreUploadRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v3/MediaSendV3PreUploadRepository.kt index b129288b02..17449ee123 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v3/MediaSendV3PreUploadRepository.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v3/MediaSendV3PreUploadRepository.kt @@ -7,11 +7,11 @@ package org.thoughtcrime.securesms.mediasend.v3 import android.content.Context import androidx.annotation.WorkerThread +import org.signal.core.models.database.AttachmentId import org.signal.core.models.media.Media import org.signal.mediasend.MediaRecipientId import org.signal.mediasend.preupload.PreUploadRepository import org.signal.mediasend.preupload.PreUploadResult -import org.thoughtcrime.securesms.attachments.AttachmentId import org.thoughtcrime.securesms.database.SignalDatabase import org.thoughtcrime.securesms.dependencies.AppDependencies import org.thoughtcrime.securesms.mediasend.MediaUploadRepository diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/PartAuthority.java b/app/src/main/java/org/thoughtcrime/securesms/mms/PartAuthority.java index e12032a325..9e9276a2b6 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mms/PartAuthority.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mms/PartAuthority.java @@ -14,7 +14,7 @@ import androidx.core.provider.DocumentsContractCompat; import org.thoughtcrime.securesms.BuildConfig; import org.thoughtcrime.securesms.attachments.Attachment; -import org.thoughtcrime.securesms.attachments.AttachmentId; +import org.signal.core.models.database.AttachmentId; import org.thoughtcrime.securesms.avatar.AvatarPickerStorage; import org.signal.core.models.media.TransformProperties; import org.thoughtcrime.securesms.database.SignalDatabase; diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/PartUriParser.kt b/app/src/main/java/org/thoughtcrime/securesms/mms/PartUriParser.kt index dfa0456036..7a73344546 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mms/PartUriParser.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/mms/PartUriParser.kt @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.mms import android.content.ContentUris import android.net.Uri -import org.thoughtcrime.securesms.attachments.AttachmentId +import org.signal.core.models.database.AttachmentId /** * Parses the given [Uri] into either an [AttachmentId] or a [Long] diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/profiles/NotificationProfileId.kt b/app/src/main/java/org/thoughtcrime/securesms/notifications/profiles/NotificationProfileId.kt index 4894106bb7..25cba61272 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/notifications/profiles/NotificationProfileId.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/profiles/NotificationProfileId.kt @@ -5,7 +5,7 @@ package org.thoughtcrime.securesms.notifications.profiles -import org.signal.core.util.DatabaseId +import org.signal.core.models.database.DatabaseId import org.signal.core.util.UuidUtil import java.util.UUID diff --git a/app/src/main/java/org/thoughtcrime/securesms/providers/PartProvider.java b/app/src/main/java/org/thoughtcrime/securesms/providers/PartProvider.java index e4a5a7ef20..d66dada300 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/providers/PartProvider.java +++ b/app/src/main/java/org/thoughtcrime/securesms/providers/PartProvider.java @@ -40,7 +40,7 @@ import org.signal.core.util.ThreadUtil; import org.signal.core.util.concurrent.SignalExecutors; import org.signal.core.util.logging.Log; import org.thoughtcrime.securesms.BuildConfig; -import org.thoughtcrime.securesms.attachments.AttachmentId; +import org.signal.core.models.database.AttachmentId; import org.thoughtcrime.securesms.attachments.DatabaseAttachment; import org.thoughtcrime.securesms.database.AttachmentTable; import org.thoughtcrime.securesms.database.SignalDatabase; diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/RecipientId.kt b/app/src/main/java/org/thoughtcrime/securesms/recipients/RecipientId.kt index 1b64c2106c..64ff9fb0f4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/recipients/RecipientId.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/RecipientId.kt @@ -13,7 +13,7 @@ import kotlinx.parcelize.Parcelize import kotlinx.serialization.Serializable import kotlinx.serialization.Transient import org.signal.core.models.ServiceId -import org.signal.core.util.DatabaseId +import org.signal.core.models.database.DatabaseId import org.signal.core.util.LongSerializer import org.signal.core.util.logging.Log import org.signal.core.util.orNull diff --git a/app/src/main/java/org/thoughtcrime/securesms/sms/MessageSender.java b/app/src/main/java/org/thoughtcrime/securesms/sms/MessageSender.java index 1cb841a332..747b0d137d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/sms/MessageSender.java +++ b/app/src/main/java/org/thoughtcrime/securesms/sms/MessageSender.java @@ -28,7 +28,7 @@ import androidx.annotation.WorkerThread; import org.greenrobot.eventbus.EventBus; import org.signal.core.util.logging.Log; import org.thoughtcrime.securesms.attachments.Attachment; -import org.thoughtcrime.securesms.attachments.AttachmentId; +import org.signal.core.models.database.AttachmentId; import org.thoughtcrime.securesms.attachments.DatabaseAttachment; import org.thoughtcrime.securesms.backup.v2.BackupRepository; import org.thoughtcrime.securesms.contacts.sync.ContactDiscovery; diff --git a/app/src/main/java/org/thoughtcrime/securesms/sms/UploadDependencyGraph.kt b/app/src/main/java/org/thoughtcrime/securesms/sms/UploadDependencyGraph.kt index 4e31f99f7c..d0ab0f89fb 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/sms/UploadDependencyGraph.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/sms/UploadDependencyGraph.kt @@ -1,9 +1,9 @@ package org.thoughtcrime.securesms.sms import androidx.annotation.WorkerThread +import org.signal.core.models.database.AttachmentId import org.signal.core.models.media.TransformProperties import org.thoughtcrime.securesms.attachments.Attachment -import org.thoughtcrime.securesms.attachments.AttachmentId import org.thoughtcrime.securesms.attachments.DatabaseAttachment import org.thoughtcrime.securesms.attachments.UriAttachment import org.thoughtcrime.securesms.jobmanager.Job diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/MediaUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/MediaUtil.java index 6da9b73516..488d42d17f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/MediaUtil.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/MediaUtil.java @@ -29,7 +29,7 @@ import com.bumptech.glide.load.resource.gif.GifDrawable; import org.signal.core.util.ContentTypeUtil; import org.signal.core.util.logging.Log; import org.thoughtcrime.securesms.attachments.Attachment; -import org.thoughtcrime.securesms.attachments.AttachmentId; +import org.signal.core.models.database.AttachmentId; import org.thoughtcrime.securesms.database.SignalDatabase; import org.signal.core.models.media.Media; import org.thoughtcrime.securesms.mms.AudioSlide; diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/SignalLocalMetrics.java b/app/src/main/java/org/thoughtcrime/securesms/util/SignalLocalMetrics.java index 62afaab757..16cb361b81 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/SignalLocalMetrics.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/SignalLocalMetrics.java @@ -6,7 +6,7 @@ import androidx.annotation.MainThread; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import org.thoughtcrime.securesms.attachments.AttachmentId; +import org.signal.core.models.database.AttachmentId; import java.util.HashMap; import java.util.Map; diff --git a/app/src/main/java/org/thoughtcrime/securesms/wallpaper/WallpaperStorage.java b/app/src/main/java/org/thoughtcrime/securesms/wallpaper/WallpaperStorage.java index fcba73401b..73ee6b97aa 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/wallpaper/WallpaperStorage.java +++ b/app/src/main/java/org/thoughtcrime/securesms/wallpaper/WallpaperStorage.java @@ -6,7 +6,7 @@ import androidx.annotation.NonNull; import androidx.annotation.WorkerThread; import org.signal.core.util.logging.Log; -import org.thoughtcrime.securesms.attachments.AttachmentId; +import org.signal.core.models.database.AttachmentId; import org.thoughtcrime.securesms.database.SignalDatabase; import org.thoughtcrime.securesms.dependencies.AppDependencies; import org.thoughtcrime.securesms.jobs.UploadAttachmentToArchiveJob; diff --git a/app/src/spinner/java/org/thoughtcrime/securesms/AttachmentPlugin.kt b/app/src/spinner/java/org/thoughtcrime/securesms/AttachmentPlugin.kt index d7955ddac3..cdf9848d30 100644 --- a/app/src/spinner/java/org/thoughtcrime/securesms/AttachmentPlugin.kt +++ b/app/src/spinner/java/org/thoughtcrime/securesms/AttachmentPlugin.kt @@ -6,9 +6,9 @@ package org.thoughtcrime.securesms import okio.IOException +import org.signal.core.models.database.AttachmentId import org.signal.spinner.Plugin import org.signal.spinner.PluginResult -import org.thoughtcrime.securesms.attachments.AttachmentId import org.thoughtcrime.securesms.database.AttachmentTable import org.thoughtcrime.securesms.database.SignalDatabase diff --git a/app/src/test/java/org/thoughtcrime/securesms/backup/ArchiveUploadProgressTest.kt b/app/src/test/java/org/thoughtcrime/securesms/backup/ArchiveUploadProgressTest.kt index 8b23898926..479ad615ef 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/backup/ArchiveUploadProgressTest.kt +++ b/app/src/test/java/org/thoughtcrime/securesms/backup/ArchiveUploadProgressTest.kt @@ -29,7 +29,7 @@ import org.junit.Test import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner import org.robolectric.annotation.Config -import org.thoughtcrime.securesms.attachments.AttachmentId +import org.signal.core.models.database.AttachmentId import org.thoughtcrime.securesms.backup.ArchiveUploadProgress.ArchiveBackupProgressListener import org.thoughtcrime.securesms.database.AttachmentTable import org.thoughtcrime.securesms.database.SignalDatabase diff --git a/app/src/test/java/org/thoughtcrime/securesms/conversation/plaintext/PlaintextExportRepositoryTest.kt b/app/src/test/java/org/thoughtcrime/securesms/conversation/plaintext/PlaintextExportRepositoryTest.kt index 380053d284..f06a703b7a 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/conversation/plaintext/PlaintextExportRepositoryTest.kt +++ b/app/src/test/java/org/thoughtcrime/securesms/conversation/plaintext/PlaintextExportRepositoryTest.kt @@ -19,7 +19,7 @@ import org.junit.Test import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner import org.robolectric.annotation.Config -import org.thoughtcrime.securesms.attachments.AttachmentId +import org.signal.core.models.database.AttachmentId import org.thoughtcrime.securesms.conversation.plaintext.PlaintextExportRepository.PendingAttachment import org.thoughtcrime.securesms.database.FakeMessageRecords import org.thoughtcrime.securesms.database.MessageTypes diff --git a/app/src/test/java/org/thoughtcrime/securesms/database/AttachmentTableTest_createRemoteKeyForAttachmentsThatNeedArchiveUpload.kt b/app/src/test/java/org/thoughtcrime/securesms/database/AttachmentTableTest_createRemoteKeyForAttachmentsThatNeedArchiveUpload.kt index 8f37bead48..6913792784 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/database/AttachmentTableTest_createRemoteKeyForAttachmentsThatNeedArchiveUpload.kt +++ b/app/src/test/java/org/thoughtcrime/securesms/database/AttachmentTableTest_createRemoteKeyForAttachmentsThatNeedArchiveUpload.kt @@ -18,10 +18,10 @@ import org.junit.Test import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner import org.robolectric.annotation.Config +import org.signal.core.models.database.AttachmentId import org.signal.core.util.Base64 import org.signal.core.util.logging.Log import org.signal.core.util.update -import org.thoughtcrime.securesms.attachments.AttachmentId import org.thoughtcrime.securesms.testutil.MockAppDependenciesRule import org.thoughtcrime.securesms.testutil.SignalDatabaseRule import org.thoughtcrime.securesms.testutil.SystemOutLogger diff --git a/app/src/test/java/org/thoughtcrime/securesms/sms/UploadDependencyGraphTest.kt b/app/src/test/java/org/thoughtcrime/securesms/sms/UploadDependencyGraphTest.kt index 80afb12e6c..b93820b24e 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/sms/UploadDependencyGraphTest.kt +++ b/app/src/test/java/org/thoughtcrime/securesms/sms/UploadDependencyGraphTest.kt @@ -9,10 +9,10 @@ import org.junit.Test import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner import org.robolectric.annotation.Config +import org.signal.core.models.database.AttachmentId import org.signal.core.models.media.TransformProperties import org.signal.core.util.JsonUtils import org.thoughtcrime.securesms.attachments.Attachment -import org.thoughtcrime.securesms.attachments.AttachmentId import org.thoughtcrime.securesms.attachments.DatabaseAttachment import org.thoughtcrime.securesms.database.AttachmentTable import org.thoughtcrime.securesms.jobmanager.Job diff --git a/app/src/test/java/org/thoughtcrime/securesms/stories/StoriesTest.kt b/app/src/test/java/org/thoughtcrime/securesms/stories/StoriesTest.kt index f5faa97786..0539fb9835 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/stories/StoriesTest.kt +++ b/app/src/test/java/org/thoughtcrime/securesms/stories/StoriesTest.kt @@ -13,7 +13,7 @@ import io.reactivex.rxjava3.schedulers.TestScheduler import org.junit.After import org.junit.Before import org.junit.Test -import org.thoughtcrime.securesms.attachments.AttachmentId +import org.signal.core.models.database.AttachmentId import org.thoughtcrime.securesms.database.AttachmentTable import org.thoughtcrime.securesms.database.FakeMessageRecords import org.thoughtcrime.securesms.database.SignalDatabase diff --git a/app/src/test/java/org/thoughtcrime/securesms/stories/dialogs/StoryContextMenuTest.kt b/app/src/test/java/org/thoughtcrime/securesms/stories/dialogs/StoryContextMenuTest.kt index be7d1768da..978fc907d9 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/stories/dialogs/StoryContextMenuTest.kt +++ b/app/src/test/java/org/thoughtcrime/securesms/stories/dialogs/StoryContextMenuTest.kt @@ -16,9 +16,9 @@ import org.junit.Test import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner import org.robolectric.annotation.Config +import org.signal.core.models.database.AttachmentId import org.signal.core.util.Base64 import org.signal.core.util.getParcelableExtraCompat -import org.thoughtcrime.securesms.attachments.AttachmentId import org.thoughtcrime.securesms.database.FakeMessageRecords import org.thoughtcrime.securesms.database.model.StoryType import org.thoughtcrime.securesms.database.model.databaseprotos.StoryTextPost diff --git a/app/src/test/java/org/thoughtcrime/securesms/util/AttachmentUtilTest.kt b/app/src/test/java/org/thoughtcrime/securesms/util/AttachmentUtilTest.kt index af5e212d15..77b9e04751 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/util/AttachmentUtilTest.kt +++ b/app/src/test/java/org/thoughtcrime/securesms/util/AttachmentUtilTest.kt @@ -14,7 +14,7 @@ import org.junit.Assert.assertFalse import org.junit.Assert.assertTrue import org.junit.Before import org.junit.Test -import org.thoughtcrime.securesms.attachments.AttachmentId +import org.signal.core.models.database.AttachmentId import org.thoughtcrime.securesms.attachments.Cdn import org.thoughtcrime.securesms.attachments.DatabaseAttachment import org.thoughtcrime.securesms.database.AttachmentTable diff --git a/app/src/testShared/org/thoughtcrime/securesms/database/FakeMessageRecords.kt b/app/src/testShared/org/thoughtcrime/securesms/database/FakeMessageRecords.kt index 69c88a7947..486c37654c 100644 --- a/app/src/testShared/org/thoughtcrime/securesms/database/FakeMessageRecords.kt +++ b/app/src/testShared/org/thoughtcrime/securesms/database/FakeMessageRecords.kt @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.database import org.signal.blurhash.BlurHash import org.signal.core.models.media.TransformProperties -import org.thoughtcrime.securesms.attachments.AttachmentId +import org.signal.core.models.database.AttachmentId import org.thoughtcrime.securesms.attachments.Cdn import org.thoughtcrime.securesms.attachments.DatabaseAttachment import org.thoughtcrime.securesms.audio.AudioHash diff --git a/app/src/main/java/org/thoughtcrime/securesms/attachments/AttachmentId.kt b/core/util/src/main/java/org/signal/core/models/database/AttachmentId.kt similarity index 76% rename from app/src/main/java/org/thoughtcrime/securesms/attachments/AttachmentId.kt rename to core/util/src/main/java/org/signal/core/models/database/AttachmentId.kt index 2af8d50af8..4a43c3fe3f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/attachments/AttachmentId.kt +++ b/core/util/src/main/java/org/signal/core/models/database/AttachmentId.kt @@ -1,9 +1,13 @@ -package org.thoughtcrime.securesms.attachments +/* + * Copyright 2026 Signal Messenger, LLC + * SPDX-License-Identifier: AGPL-3.0-only + */ + +package org.signal.core.models.database import android.os.Parcelable import com.fasterxml.jackson.annotation.JsonProperty import kotlinx.parcelize.Parcelize -import org.signal.core.util.DatabaseId @Parcelize data class AttachmentId( diff --git a/core/util/src/main/java/org/signal/core/models/database/DatabaseId.java b/core/util/src/main/java/org/signal/core/models/database/DatabaseId.java new file mode 100644 index 0000000000..bd43570dd6 --- /dev/null +++ b/core/util/src/main/java/org/signal/core/models/database/DatabaseId.java @@ -0,0 +1,12 @@ +/* + * Copyright 2026 Signal Messenger, LLC + * SPDX-License-Identifier: AGPL-3.0-only + */ + +package org.signal.core.models.database; + +import androidx.annotation.NonNull; + +public interface DatabaseId { + @NonNull String serialize(); +} diff --git a/core/util/src/main/java/org/signal/core/util/DatabaseId.java b/core/util/src/main/java/org/signal/core/util/DatabaseId.java deleted file mode 100644 index afe455fc7b..0000000000 --- a/core/util/src/main/java/org/signal/core/util/DatabaseId.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.signal.core.util; - -import androidx.annotation.NonNull; - -public interface DatabaseId { - @NonNull String serialize(); -} diff --git a/core/util/src/main/java/org/signal/core/util/SQLiteDatabaseExtensions.kt b/core/util/src/main/java/org/signal/core/util/SQLiteDatabaseExtensions.kt index 9383ac25d6..cbdca9ee0d 100644 --- a/core/util/src/main/java/org/signal/core/util/SQLiteDatabaseExtensions.kt +++ b/core/util/src/main/java/org/signal/core/util/SQLiteDatabaseExtensions.kt @@ -7,6 +7,7 @@ import androidx.core.content.contentValuesOf import androidx.sqlite.db.SupportSQLiteDatabase import androidx.sqlite.db.SupportSQLiteQueryBuilder import androidx.sqlite.db.SupportSQLiteStatement +import org.signal.core.models.database.DatabaseId import org.signal.core.util.SqlUtil.ForeignKeyViolation import org.signal.core.util.logging.Log import kotlin.time.Duration diff --git a/core/util/src/main/java/org/signal/core/util/SqlUtil.kt b/core/util/src/main/java/org/signal/core/util/SqlUtil.kt index 1162309bfe..4b26090c29 100644 --- a/core/util/src/main/java/org/signal/core/util/SqlUtil.kt +++ b/core/util/src/main/java/org/signal/core/util/SqlUtil.kt @@ -4,6 +4,7 @@ import android.content.ContentValues import android.text.TextUtils import androidx.annotation.VisibleForTesting import androidx.sqlite.db.SupportSQLiteDatabase +import org.signal.core.models.database.DatabaseId import org.signal.core.util.logging.Log import java.lang.Exception import java.util.LinkedList diff --git a/core/util/src/test/java/org/signal/core/util/SqlUtilTest.java b/core/util/src/test/java/org/signal/core/util/SqlUtilTest.java index 0e99056efa..7ed7355c73 100644 --- a/core/util/src/test/java/org/signal/core/util/SqlUtilTest.java +++ b/core/util/src/test/java/org/signal/core/util/SqlUtilTest.java @@ -9,6 +9,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; +import org.signal.core.models.database.DatabaseId; import java.io.IOException; import java.util.ArrayList;