TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-12-31 11:46:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reduce database notifications for disappearing conversations.

Browse Source
This commit is contained in:
Greyson Parrelli
2020-06-07 14:46:03 -04:00
parent 8fe8a1e9ee
commit 3a479d7eef
4 changed files with 84 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/database/MessagingDatabase.java
View File

@@ -27,6 +27,7 @@ import org.whispersystems.libsignal.util.guava.Optional;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
@@ -46,6 +47,7 @@ public abstract class MessagingDatabase extends Database implements MmsSmsColumn
public abstract void markExpireStarted(long messageId);
public abstract void markExpireStarted(long messageId, long startTime);
public abstract void markExpireStarted(Collection<Long> messageId, long startTime);
public abstract void markAsSent(long messageId, boolean secure);
public abstract void markUnidentified(long messageId, boolean unidentified);

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

@@ -76,6 +76,7 @@ import org.whispersystems.libsignal.util.guava.Optional;
import java.io.Closeable;
import java.io.IOException;
import java.security.SecureRandom;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
@@ -570,19 +571,39 @@ public class MmsDatabase extends MessagingDatabase {
}
@Override
public void markExpireStarted(long messageId) {
markExpireStarted(messageId, System.currentTimeMillis());
public void markExpireStarted(long id) {
markExpireStarted(id, System.currentTimeMillis());
}
@Override
public void markExpireStarted(long messageId, long startedTimestamp) {
ContentValues contentValues = new ContentValues();
contentValues.put(EXPIRE_STARTED, startedTimestamp);
public void markExpireStarted(long id, long startedTimestamp) {
markExpireStarted(Collections.singleton(id), startedTimestamp);
}
SQLiteDatabase db = databaseHelper.getWritableDatabase();
db.update(TABLE_NAME, contentValues, ID_WHERE, new String[] {String.valueOf(messageId)});
@Override
public void markExpireStarted(Collection<Long> ids, long startedAtTimestamp) {
SQLiteDatabase db = databaseHelper.getWritableDatabase();
long threadId = -1;
long threadId = getThreadIdForMessage(messageId);
db.beginTransaction();
try {
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)});
if (threadId < 0) {
threadId = getThreadIdForMessage(id);
}
}
db.setTransactionSuccessful();
} finally {
db.endTransaction();
}
DatabaseFactory.getThreadDatabase(context).update(threadId, false);
notifyConversationListeners(threadId);
}

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

@@ -51,6 +51,7 @@ import org.whispersystems.libsignal.util.guava.Optional;
import java.io.IOException;
import java.security.SecureRandom;
import java.util.Collection;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
@@ -355,13 +356,31 @@ public class SmsDatabase extends MessagingDatabase {
@Override
public void markExpireStarted(long id, long startedAtTimestamp) {
ContentValues contentValues = new ContentValues();
contentValues.put(EXPIRE_STARTED, startedAtTimestamp);
markExpireStarted(Collections.singleton(id), startedAtTimestamp);
}
SQLiteDatabase db = databaseHelper.getWritableDatabase();
db.update(TABLE_NAME, contentValues, ID_WHERE, new String[] {String.valueOf(id)});
@Override
public void markExpireStarted(Collection<Long> ids, long startedAtTimestamp) {
SQLiteDatabase db = databaseHelper.getWritableDatabase();
long threadId = -1;
long threadId = getThreadIdForMessage(id);
db.beginTransaction();
try {
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)});
if (threadId < 0) {
threadId = getThreadIdForMessage(id);
}
}
db.setTransactionSuccessful();
} finally {
db.endTransaction();
}
DatabaseFactory.getThreadDatabase(context).update(threadId, false);
notifyConversationListeners(threadId);