Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-21 00:59:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Preclude cancelation of pre-uploaded video attachments.

Browse Source 
Addresses ##10225.
This commit is contained in:
Nicholas Tinsley
2024-08-30 12:23:26 -04:00
parent 2b1bbdda15
commit d683b8a321
13 changed files with 137 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/java/org/thoughtcrime/securesms/database/AttachmentTable.kt
View File

@@ -36,6 +36,7 @@ import org.signal.core.util.Base64
import org.signal.core.util.SqlUtil
import org.signal.core.util.StreamUtil
import org.signal.core.util.ThreadUtil
import org.signal.core.util.count
import org.signal.core.util.delete
import org.signal.core.util.deleteAll
import org.signal.core.util.drain
@@ -45,6 +46,7 @@ import org.signal.core.util.groupBy
import org.signal.core.util.isNull
import org.signal.core.util.logging.Log
import org.signal.core.util.readToList
import org.signal.core.util.readToSingleInt
import org.signal.core.util.readToSingleLong
import org.signal.core.util.readToSingleObject
import org.signal.core.util.requireBlob
@@ -433,6 +435,20 @@ class AttachmentTable(
.run()
}
/**
* Takes a list of attachment IDs and confirms they exist in the database.
*/
fun hasAttachments(ids: List<AttachmentId>): Boolean {
return ids.size == SqlUtil.buildCollectionQuery(ID, ids.map { it.id }).sumOf { query ->
readableDatabase
.count()
.from(TABLE_NAME)
.where(query.where, query.whereArgs)
.run()
.readToSingleInt(defaultValue = 0)
}
}
fun getPendingAttachments(): List<DatabaseAttachment> {
return readableDatabase
.select(*PROJECTION)
@@ -1103,7 +1119,7 @@ class AttachmentTable(
@Throws(MmsException::class)
fun insertAttachmentForPreUpload(attachment: Attachment): DatabaseAttachment {
Log.d(TAG, "Inserting attachment $attachment for pre-upload.")
Log.d(TAG, "Inserting attachment ${attachment.uri} for pre-upload.")
val result = insertAttachmentsForMessage(PREUPLOAD_MESSAGE_ID, listOf(attachment), emptyList())
if (result.values.isEmpty()) {