Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-09-28 07:51:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move DatabaseId to core-util-jvm.

Browse Source
This commit is contained in:
Alex Hart
2026-09-23 16:00:21 -04:00
committed by Michelle Tang
parent 163a7560da
commit 1e38286260
12 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/org/thoughtcrime/securesms/database/InAppPaymentTable.kt
+1 -1
View File
@@ -14,9 +14,9 @@ import androidx.core.content.contentValuesOf
import kotlinx.parcelize.IgnoredOnParcel
import kotlinx.parcelize.Parcelize
import kotlinx.parcelize.TypeParceler
import org.signal.core.models.database.DatabaseId
import org.signal.core.util.DatabaseSerializer
import org.signal.core.util.Serializer
import org.signal.core.util.database.DatabaseId
import org.signal.core.util.delete
import org.signal.core.util.exists
import org.signal.core.util.insertInto
app/src/main/java/org/thoughtcrime/securesms/database/model/DistributionListId.java
+1 -1
View File
@@ -6,7 +6,7 @@ import android.os.Parcelable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import org.signal.core.models.database.DatabaseId;
import org.signal.core.util.database.DatabaseId;
import java.util.Objects;
app/src/main/java/org/thoughtcrime/securesms/database/model/MessageExportStatus.kt
+1 -1
View File
@@ -1,7 +1,7 @@
package org.thoughtcrime.securesms.database.model
import org.signal.core.models.database.DatabaseId
import org.signal.core.util.IntSerializer
import org.signal.core.util.database.DatabaseId
/**
* Export status for a message.
app/src/main/java/org/thoughtcrime/securesms/groups/GroupId.kt
+1 -1
View File
@@ -11,10 +11,10 @@ import kotlinx.parcelize.Parcelize
import kotlinx.serialization.Serializable
import kotlinx.serialization.Transient
import okio.ByteString
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
import org.signal.core.util.database.DatabaseId
import org.signal.libsignal.protocol.kdf.HKDF
import org.signal.libsignal.zkgroup.InvalidInputException
import org.signal.libsignal.zkgroup.groups.GroupIdentifier
app/src/main/java/org/thoughtcrime/securesms/notifications/profiles/NotificationProfileId.kt
+1 -1
View File
@@ -5,8 +5,8 @@
package org.thoughtcrime.securesms.notifications.profiles
import org.signal.core.models.database.DatabaseId
import org.signal.core.util.UuidUtil
import org.signal.core.util.database.DatabaseId
import java.util.UUID
/**
app/src/main/java/org/thoughtcrime/securesms/recipients/RecipientId.kt
+1 -1
View File
@@ -13,8 +13,8 @@ import kotlinx.parcelize.Parcelize
import kotlinx.serialization.Serializable
import kotlinx.serialization.Transient
import org.signal.core.models.ServiceId
import org.signal.core.models.database.DatabaseId
import org.signal.core.util.LongSerializer
import org.signal.core.util.database.DatabaseId
import org.signal.core.util.logging.Log
import org.signal.core.util.orNull
import org.thoughtcrime.securesms.database.SignalDatabase
core/util-jvm/src/main/java/org/signal/core/util/database/DatabaseId.kt
+10
View File
@@ -0,0 +1,10 @@
/*
* Copyright 2026 Signal Messenger, LLC
* SPDX-License-Identifier: AGPL-3.0-only
*/
package org.signal.core.util.database
interface DatabaseId {
fun serialize(): String
}
core/util/src/main/java/org/signal/core/models/database/AttachmentId.kt
+1
View File
@@ -8,6 +8,7 @@ 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.database.DatabaseId
@Parcelize
data class AttachmentId(
core/util/src/main/java/org/signal/core/models/database/DatabaseId.java
-12
View File
@@ -1,12 +0,0 @@
/*
* 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();
}
core/util/src/main/java/org/signal/core/util/SQLiteDatabaseExtensions.kt
+1 -1
View File
@@ -7,8 +7,8 @@ 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.database.DatabaseId
import org.signal.core.util.logging.Log
import kotlin.time.Duration
import kotlin.time.Duration.Companion.seconds
core/util/src/main/java/org/signal/core/util/SqlUtil.kt
+1 -1
View File
@@ -4,7 +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.database.DatabaseId
import org.signal.core.util.logging.Log
import java.lang.Exception
import java.util.LinkedList
core/util/src/test/java/org/signal/core/util/SqlUtilTest.java
+1 -1
View File
@@ -9,7 +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 org.signal.core.util.database.DatabaseId;
import java.io.IOException;
import java.util.ArrayList;