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

Improve free tier UX around media.

Browse Source
This commit is contained in:
Cody Henthorne
2025-09-22 10:19:42 -04:00
committed by Jeffrey Starke
parent c5753b96ff
commit cbfdc4b57a
8 changed files with 202 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3009,28 +3009,40 @@ class AttachmentTable(
.readToList { AttachmentId(it.requireLong(ID)) }
}
fun getEstimatedArchiveMediaSize(): Long {
val estimatedThumbnailCount = readableDatabase
.select("COUNT(*)")
.from(
"""
(
SELECT DISTINCT $DATA_HASH_END, $REMOTE_KEY
FROM $TABLE_NAME INNER JOIN ${MessageTable.TABLE_NAME} AS m ON $TABLE_NAME.$MESSAGE_ID = m.${MessageTable.ID}
WHERE
$DATA_FILE NOT NULL AND
$DATA_HASH_END NOT NULL AND
$REMOTE_KEY NOT NULL AND
$TRANSFER_STATE = $TRANSFER_PROGRESS_DONE AND
$ARCHIVE_TRANSFER_STATE != ${ArchiveTransferState.PERMANENT_FAILURE.value} AND
($CONTENT_TYPE LIKE 'image/%' OR $CONTENT_TYPE LIKE 'video/%') AND
$CONTENT_TYPE != 'image/svg+xml' AND
${getMessageDoesNotExpireWithinTimeoutClause(tablePrefix = "m")}
fun getPaidEstimatedArchiveMediaSize(): Long {
return getEstimatedArchiveMediaSize()
}
fun getFreeEstimatedArchiveMediaSize(afterTimestamp: Long): Long {
return getEstimatedArchiveMediaSize(afterTimestamp)
}
private fun getEstimatedArchiveMediaSize(afterTimestamp: Long = 0L): Long {
val estimatedThumbnailCount = if (afterTimestamp == 0L) {
readableDatabase
.select("COUNT(*)")
.from(
"""
(
SELECT DISTINCT $DATA_HASH_END, $REMOTE_KEY
FROM $TABLE_NAME INNER JOIN ${MessageTable.TABLE_NAME} AS m ON $TABLE_NAME.$MESSAGE_ID = m.${MessageTable.ID}
WHERE
$DATA_FILE NOT NULL AND
$DATA_HASH_END NOT NULL AND
$REMOTE_KEY NOT NULL AND
$TRANSFER_STATE = $TRANSFER_PROGRESS_DONE AND
$ARCHIVE_TRANSFER_STATE != ${ArchiveTransferState.PERMANENT_FAILURE.value} AND
($CONTENT_TYPE LIKE 'image/%' OR $CONTENT_TYPE LIKE 'video/%') AND
$CONTENT_TYPE != 'image/svg+xml' AND
${getMessageDoesNotExpireWithinTimeoutClause(tablePrefix = "m")}
)
"""
)
"""
)
.run()
.readToSingleLong(0L)
.run()
.readToSingleLong(0L)
} else {
0
}
val uploadedAttachmentBytes = readableDatabase
.rawQuery(
@@ -3045,6 +3057,7 @@ class AttachmentTable(
$REMOTE_KEY NOT NULL AND
$TRANSFER_STATE = $TRANSFER_PROGRESS_DONE AND
$ARCHIVE_TRANSFER_STATE != ${ArchiveTransferState.PERMANENT_FAILURE.value} AND
${if (afterTimestamp > 0) "m.${MessageTable.DATE_RECEIVED} >= $afterTimestamp AND" else ""}
${getMessageDoesNotExpireWithinTimeoutClause(tablePrefix = "m")}
)
"""