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

Attempt to reduce impact of thread updates.

Browse Source
This commit is contained in:
Greyson Parrelli
2024-05-01 16:23:59 -04:00
committed by Alex Hart
parent 41935120e5
commit 3c380d35fd
3 changed files with 21 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
app/src/main/java/org/thoughtcrime/securesms/database/MessageTable.kt
View File

@@ -29,7 +29,6 @@ import org.json.JSONObject
import org.signal.core.util.Base64
import org.signal.core.util.CursorUtil
import org.signal.core.util.SqlUtil
import org.signal.core.util.SqlUtil.appendArg
import org.signal.core.util.SqlUtil.buildArgs
import org.signal.core.util.SqlUtil.buildCustomCollectionQuery
import org.signal.core.util.SqlUtil.buildSingleCollectionQuery
@@ -395,7 +394,7 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
$TYPE,
$DATE_RECEIVED
FROM
$TABLE_NAME
$TABLE_NAME INDEXED BY $INDEX_THREAD_STORY_SCHEDULED_DATE_LATEST_REVISION_ID
WHERE
$THREAD_ID = ? AND
$TYPE & ${MessageTypes.GROUP_V2_LEAVE_BITS} != ${MessageTypes.GROUP_V2_LEAVE_BITS} AND
@@ -1849,14 +1848,10 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
}
private fun rawQueryWithAttachments(where: String, arguments: Array<String>?, reverse: Boolean = false, limit: Long = 0): Cursor {
return rawQueryWithAttachments(MMS_PROJECTION_WITH_ATTACHMENTS, where, arguments, reverse, limit)
}
private fun rawQueryWithAttachments(projection: Array<String>, where: String, arguments: Array<String>?, reverse: Boolean, limit: Long): Cursor {
val database = databaseHelper.signalReadableDatabase
var rawQueryString = """
SELECT
${Util.join(projection, ",")}
${Util.join(MMS_PROJECTION_WITH_ATTACHMENTS, ",")}
FROM
$TABLE_NAME LEFT OUTER JOIN ${AttachmentTable.TABLE_NAME} ON ($TABLE_NAME.$ID = ${AttachmentTable.TABLE_NAME}.${AttachmentTable.MESSAGE_ID})
WHERE
@@ -1947,17 +1942,6 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
}
}
fun markAsOutbox(messageId: Long) {
val threadId = getThreadIdForMessage(messageId)
updateMailboxBitmask(messageId, MessageTypes.BASE_TYPE_MASK, MessageTypes.BASE_OUTBOX_TYPE, Optional.of(threadId))
}
fun markAsForcedSms(messageId: Long) {
val threadId = getThreadIdForMessage(messageId)
updateMailboxBitmask(messageId, MessageTypes.PUSH_MESSAGE_BIT, MessageTypes.MESSAGE_FORCE_SMS_BIT, Optional.of(threadId))
ApplicationDependencies.getDatabaseObserver().notifyMessageUpdateObservers(MessageId(messageId))
}
fun markAsRateLimited(messageId: Long) {
val threadId = getThreadIdForMessage(messageId)
updateMailboxBitmask(messageId, 0, MessageTypes.MESSAGE_RATE_LIMITED_BIT, Optional.of(threadId))
@@ -3384,59 +3368,6 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
return ids
}
fun getUnexportedInsecureMessages(limit: Int): Cursor {
return rawQueryWithAttachments(
projection = appendArg(MMS_PROJECTION_WITH_ATTACHMENTS, EXPORT_STATE),
where = "${getInsecureMessageClause()} AND NOT $EXPORTED",
arguments = null,
reverse = false,
limit = limit.toLong()
)
}
fun getUnexportedInsecureMessagesEstimatedSize(): Long {
val bodyTextSize: Long = readableDatabase
.select("SUM(LENGTH($BODY))")
.from(TABLE_NAME)
.where("${getInsecureMessageClause()} AND $EXPORTED < ?", MessageExportStatus.EXPORTED)
.run()
.readToSingleLong()
val fileSize: Long = readableDatabase.rawQuery(
"""
SELECT
SUM(${AttachmentTable.TABLE_NAME}.${AttachmentTable.DATA_SIZE}) AS s
FROM
$TABLE_NAME INNER JOIN ${AttachmentTable.TABLE_NAME} ON $TABLE_NAME.$ID = ${AttachmentTable.TABLE_NAME}.${AttachmentTable.MESSAGE_ID}
WHERE
${getInsecureMessageClause()} AND $EXPORTED < ${MessageExportStatus.EXPORTED.serialize()}
""",
null
).readToSingleLong()
return bodyTextSize + fileSize
}
fun deleteExportedMessages() {
writableDatabase.withinTransaction { db ->
val threadsToUpdate: List<Long> = db
.query(TABLE_NAME, arrayOf(THREAD_ID), "$EXPORTED = ?", buildArgs(MessageExportStatus.EXPORTED), THREAD_ID, null, null, null)
.readToList { it.requireLong(THREAD_ID) }
db.delete(TABLE_NAME)
.where("$EXPORTED = ?", MessageExportStatus.EXPORTED)
.run()
for (threadId in threadsToUpdate) {
threads.update(threadId, false)
}
attachments.deleteAbandonedAttachmentFiles()
}
OptimizeMessageSearchIndexJob.enqueue()
}
private fun deleteThreads(threadIds: Set<Long>) {
Log.d(TAG, "deleteThreads(count: ${threadIds.size})")