TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-07-11 21:38:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve logging around deletions.

Browse Source
This commit is contained in:
Greyson Parrelli 2020-11-09 08:17:23 -05:00
parent 0c5648bfb1
commit 12ea88f409
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1483,6 +1483,8 @@ public class MmsDatabase extends MessageDatabase {
@Override @Override
public boolean deleteMessage(long messageId) { public boolean deleteMessage(long messageId) {
Log.d(TAG, "deleteMessage(" + messageId + ")");
long threadId = getThreadIdForMessage(messageId); long threadId = getThreadIdForMessage(messageId);
AttachmentDatabase attachmentDatabase = DatabaseFactory.getAttachmentDatabase(context); AttachmentDatabase attachmentDatabase = DatabaseFactory.getAttachmentDatabase(context);
attachmentDatabase.deleteAttachmentsForMessage(messageId); attachmentDatabase.deleteAttachmentsForMessage(messageId);
@ -1504,6 +1506,7 @@ public class MmsDatabase extends MessageDatabase {
@Override @Override
public void deleteThread(long threadId) { public void deleteThread(long threadId) {
Log.d(TAG, "deleteThread(" + threadId + ")");
Set<Long> singleThreadSet = new HashSet<>(); Set<Long> singleThreadSet = new HashSet<>();
singleThreadSet.add(threadId); singleThreadSet.add(threadId);
deleteThreads(singleThreadSet); deleteThreads(singleThreadSet);
@ -1589,6 +1592,8 @@ public class MmsDatabase extends MessageDatabase {
@Override @Override
void deleteThreads(@NonNull Set<Long> threadIds) { void deleteThreads(@NonNull Set<Long> threadIds) {
Log.d(TAG, "deleteThreads(count: " + threadIds.size() + ")");
SQLiteDatabase db = databaseHelper.getWritableDatabase(); SQLiteDatabase db = databaseHelper.getWritableDatabase();
String where = ""; String where = "";
Cursor cursor = null; Cursor cursor = null;
@ -1647,6 +1652,7 @@ public class MmsDatabase extends MessageDatabase {
@Override @Override
public void deleteAllThreads() { public void deleteAllThreads() {
Log.d(TAG, "deleteAllThreads()");
DatabaseFactory.getAttachmentDatabase(context).deleteAllAttachments(); DatabaseFactory.getAttachmentDatabase(context).deleteAllAttachments();
DatabaseFactory.getGroupReceiptDatabase(context).deleteAllRows(); DatabaseFactory.getGroupReceiptDatabase(context).deleteAllRows();
DatabaseFactory.getMentionDatabase(context).deleteAllMentions(); DatabaseFactory.getMentionDatabase(context).deleteAllMentions();

3
app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsDatabase.java
View File

@ -30,6 +30,7 @@ import net.sqlcipher.database.SQLiteQueryBuilder;
import org.thoughtcrime.securesms.database.MessageDatabase.SyncMessageId; import org.thoughtcrime.securesms.database.MessageDatabase.SyncMessageId;
import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper; import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
import org.thoughtcrime.securesms.database.model.MessageRecord; import org.thoughtcrime.securesms.database.model.MessageRecord;
import org.thoughtcrime.securesms.logging.Log;
import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.recipients.RecipientId; import org.thoughtcrime.securesms.recipients.RecipientId;
import org.whispersystems.libsignal.util.Pair; import org.whispersystems.libsignal.util.Pair;
@ -406,11 +407,13 @@ public class MmsSmsDatabase extends Database {
} }
public void deleteMessagesInThreadBeforeDate(long threadId, long trimBeforeDate) { public void deleteMessagesInThreadBeforeDate(long threadId, long trimBeforeDate) {
Log.d(TAG, "deleteMessagesInThreadBeforeData(" + threadId + ", " + trimBeforeDate + ")");
DatabaseFactory.getSmsDatabase(context).deleteMessagesInThreadBeforeDate(threadId, trimBeforeDate); DatabaseFactory.getSmsDatabase(context).deleteMessagesInThreadBeforeDate(threadId, trimBeforeDate);
DatabaseFactory.getMmsDatabase(context).deleteMessagesInThreadBeforeDate(threadId, trimBeforeDate); DatabaseFactory.getMmsDatabase(context).deleteMessagesInThreadBeforeDate(threadId, trimBeforeDate);
} }
public void deleteAbandonedMessages() { public void deleteAbandonedMessages() {
Log.d(TAG, "deleteAbandonedMessages()");
DatabaseFactory.getSmsDatabase(context).deleteAbandonedMessages(); DatabaseFactory.getSmsDatabase(context).deleteAbandonedMessages();
DatabaseFactory.getMmsDatabase(context).deleteAbandonedMessages(); DatabaseFactory.getMmsDatabase(context).deleteAbandonedMessages();
} }

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

@ -979,6 +979,8 @@ public class SmsDatabase extends MessageDatabase {
@Override @Override
public boolean deleteMessage(long messageId) { public boolean deleteMessage(long messageId) {
Log.d(TAG, "deleteMessage(" + messageId + ")");
SQLiteDatabase db = databaseHelper.getWritableDatabase(); SQLiteDatabase db = databaseHelper.getWritableDatabase();
long threadId = getThreadIdForMessage(messageId); long threadId = getThreadIdForMessage(messageId);
@ -1015,6 +1017,7 @@ public class SmsDatabase extends MessageDatabase {
@Override @Override
void deleteThread(long threadId) { void deleteThread(long threadId) {
Log.d(TAG, "deleteThread(" + threadId + ")");
SQLiteDatabase db = databaseHelper.getWritableDatabase(); SQLiteDatabase db = databaseHelper.getWritableDatabase();
db.delete(TABLE_NAME, THREAD_ID + " = ?", new String[] {threadId+""}); db.delete(TABLE_NAME, THREAD_ID + " = ?", new String[] {threadId+""});
} }
@ -1067,6 +1070,8 @@ public class SmsDatabase extends MessageDatabase {
@Override @Override
void deleteThreads(@NonNull Set<Long> threadIds) { void deleteThreads(@NonNull Set<Long> threadIds) {
Log.d(TAG, "deleteThreads(count: " + threadIds.size() + ")");
SQLiteDatabase db = databaseHelper.getWritableDatabase(); SQLiteDatabase db = databaseHelper.getWritableDatabase();
String where = ""; String where = "";
@ -1081,6 +1086,7 @@ public class SmsDatabase extends MessageDatabase {
@Override @Override
void deleteAllThreads() { void deleteAllThreads() {
Log.d(TAG, "deleteAllThreads()");
SQLiteDatabase db = databaseHelper.getWritableDatabase(); SQLiteDatabase db = databaseHelper.getWritableDatabase();
db.delete(TABLE_NAME, null, null); db.delete(TABLE_NAME, null, null);
} }