empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Update the types of messages we backup.

Browse source
This commit is contained in:
Greyson Parrelli 2024-01-26 15:08:08 -05:00 • committed by Nicholas Tinsley
parent ea60858a07
commit 3776e86b83
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.java
View file

@ -580,18 +580,21 @@ public class FullBackupExporter extends FullBackupBase {
}
private static boolean isNonExpiringMessage(@NonNull Cursor cursor) {
long expiresIn = CursorUtil.requireLong(cursor, MessageTable.EXPIRES_IN);
boolean viewOnce = CursorUtil.requireBoolean(cursor, MessageTable.VIEW_ONCE);
long expireStarted = CursorUtil.requireLong(cursor, MessageTable.EXPIRE_STARTED);
long expiresIn = CursorUtil.requireLong(cursor, MessageTable.EXPIRES_IN);
if (expiresIn == 0 && !viewOnce) {
if (expireStarted == 0 || expiresIn == 0) {
return true;
}
return expiresIn > EXPIRATION_BACKUP_THRESHOLD;
long expiresAt = expireStarted + expiresIn;
long timeRemaining = expiresAt - System.currentTimeMillis();
return timeRemaining > EXPIRATION_BACKUP_THRESHOLD;
}
private static boolean isForNonExpiringMessage(@NonNull SQLiteDatabase db, long messageId) {
String[] columns = new String[] { MessageTable.EXPIRES_IN, MessageTable.VIEW_ONCE };
String[] columns = new String[] { MessageTable.EXPIRE_STARTED, MessageTable.EXPIRES_IN };
String where = MessageTable.ID + " = ?";
String[] args = SqlUtil.buildArgs(messageId);