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

Add additional safeguards around disappearing messages.

Browse Source
This commit is contained in:
Greyson Parrelli
2020-06-19 07:17:23 -07:00
committed by GitHub
parent 1c99939dfa
commit 71f54701d2
3 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java
View File

@@ -599,11 +599,13 @@ public class MmsDatabase extends MessagingDatabase {
db.beginTransaction();
try {
String query = ID + " = ? AND (" + EXPIRE_STARTED + " = 0 OR " + EXPIRE_STARTED + " > ?)";
for (long id : ids) {
ContentValues contentValues = new ContentValues();
contentValues.put(EXPIRE_STARTED, startedAtTimestamp);
db.update(TABLE_NAME, contentValues, ID_WHERE, new String[]{String.valueOf(id)});
db.update(TABLE_NAME, contentValues, query, new String[]{String.valueOf(id), String.valueOf(startedAtTimestamp)});
if (threadId < 0) {
threadId = getThreadIdForMessage(id);

4
app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java
View File

@@ -366,11 +366,13 @@ public class SmsDatabase extends MessagingDatabase {
db.beginTransaction();
try {
String query = ID + " = ? AND (" + EXPIRE_STARTED + " = 0 OR " + EXPIRE_STARTED + " > ?)";
for (long id : ids) {
ContentValues contentValues = new ContentValues();
contentValues.put(EXPIRE_STARTED, startedAtTimestamp);
db.update(TABLE_NAME, contentValues, ID_WHERE, new String[]{String.valueOf(id)});
db.update(TABLE_NAME, contentValues, query, new String[]{String.valueOf(id), String.valueOf(startedAtTimestamp)});
if (threadId < 0) {
threadId = getThreadIdForMessage(id);