From 10523948b8ae0446755619ccf7faf06f21da575a Mon Sep 17 00:00:00 2001 From: Cody Henthorne Date: Fri, 17 Sep 2021 11:49:37 -0400 Subject: [PATCH] Revert thread updates to running inline again. --- .../securesms/database/MmsDatabase.java | 6 +++--- .../securesms/database/SmsDatabase.java | 14 +++++++------- .../messages/MessageContentProcessor.java | 4 ++-- .../thoughtcrime/securesms/sms/MessageSender.java | 2 +- .../thoughtcrime/securesms/util/IdentityUtil.java | 4 ++-- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java index e57b859d0d..4112fa628c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java @@ -1360,7 +1360,7 @@ public class MmsDatabase extends MessageDatabase { if (!Types.isExpirationTimerUpdate(mailbox)) { DatabaseFactory.getThreadDatabase(context).incrementUnread(threadId, 1); - ThreadUpdateJob.enqueue(threadId); + DatabaseFactory.getThreadDatabase(context).update(threadId, true); } notifyConversationListeners(threadId); @@ -1458,7 +1458,7 @@ public class MmsDatabase extends MessageDatabase { DatabaseFactory.getThreadDatabase(context).incrementUnread(threadId, 1); } - ThreadUpdateJob.enqueue(threadId); + DatabaseFactory.getThreadDatabase(context).update(threadId, true); TrimThreadJob.enqueueAsync(threadId); } @@ -1665,7 +1665,7 @@ public class MmsDatabase extends MessageDatabase { if (updateThread) { DatabaseFactory.getThreadDatabase(context).setLastScrolled(contentValuesThreadId, 0); - ThreadUpdateJob.enqueue(contentValuesThreadId); + DatabaseFactory.getThreadDatabase(context).update(threadId, true); } } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java index c22eba8060..32292f92d6 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java @@ -663,7 +663,7 @@ public class SmsDatabase extends MessageDatabase { long threadId = getThreadIdForMessage(messageId); - ThreadUpdateJob.enqueue(threadId); + DatabaseFactory.getThreadDatabase(context).update(threadId, true); notifyConversationListeners(threadId); return new InsertResult(messageId, threadId); @@ -747,7 +747,7 @@ public class SmsDatabase extends MessageDatabase { DatabaseFactory.getThreadDatabase(context).incrementUnread(threadId, 1); } - ThreadUpdateJob.enqueue(threadId); + DatabaseFactory.getThreadDatabase(context).update(threadId, true); db.setTransactionSuccessful(); } finally { @@ -824,7 +824,7 @@ public class SmsDatabase extends MessageDatabase { DatabaseFactory.getThreadDatabase(context).incrementUnread(threadId, 1); } - ThreadUpdateJob.enqueue(threadId); + DatabaseFactory.getThreadDatabase(context).update(threadId, true); db.setTransactionSuccessful(); } finally { @@ -896,7 +896,7 @@ public class SmsDatabase extends MessageDatabase { DatabaseFactory.getThreadDatabase(context).incrementUnread(threadId, 1); } - ThreadUpdateJob.enqueue(threadId); + DatabaseFactory.getThreadDatabase(context).update(threadId, true); notifyConversationListeners(threadId); TrimThreadJob.enqueueAsync(threadId); @@ -1163,7 +1163,7 @@ public class SmsDatabase extends MessageDatabase { } if (!silent) { - ThreadUpdateJob.enqueue(threadId); + DatabaseFactory.getThreadDatabase(context).update(threadId, true); } if (message.getSubscriptionId() != -1) { @@ -1206,7 +1206,7 @@ public class SmsDatabase extends MessageDatabase { long messageId = db.insert(TABLE_NAME, null, values); DatabaseFactory.getThreadDatabase(context).incrementUnread(threadId, 1); - ThreadUpdateJob.enqueue(threadId); + DatabaseFactory.getThreadDatabase(context).update(threadId, true); notifyConversationListeners(threadId); @@ -1230,7 +1230,7 @@ public class SmsDatabase extends MessageDatabase { databaseHelper.getSignalWritableDatabase().insert(TABLE_NAME, null, values); DatabaseFactory.getThreadDatabase(context).incrementUnread(threadId, 1); - ThreadUpdateJob.enqueue(threadId); + DatabaseFactory.getThreadDatabase(context).update(threadId, true); notifyConversationListeners(threadId); diff --git a/app/src/main/java/org/thoughtcrime/securesms/messages/MessageContentProcessor.java b/app/src/main/java/org/thoughtcrime/securesms/messages/MessageContentProcessor.java index f71c8e48a7..4e8e0a997c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/messages/MessageContentProcessor.java +++ b/app/src/main/java/org/thoughtcrime/securesms/messages/MessageContentProcessor.java @@ -726,7 +726,7 @@ public final class MessageContentProcessor { message.getTimestamp(), null); database.markAsSent(messageId, true); - ThreadUpdateJob.enqueue(threadId); + DatabaseFactory.getThreadDatabase(context).update(threadId, true); } return threadId; @@ -1557,7 +1557,7 @@ public final class MessageContentProcessor { messageId = DatabaseFactory.getSmsDatabase(context).insertMessageOutbox(threadId, outgoingTextMessage, false, message.getTimestamp(), null); database = DatabaseFactory.getSmsDatabase(context); database.markUnidentified(messageId, isUnidentified(message, recipient)); - ThreadUpdateJob.enqueue(threadId); + DatabaseFactory.getThreadDatabase(context).update(threadId, true); } database.markAsSent(messageId, true); diff --git a/app/src/main/java/org/thoughtcrime/securesms/sms/MessageSender.java b/app/src/main/java/org/thoughtcrime/securesms/sms/MessageSender.java index a8166bbe9b..080bcd1cb0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/sms/MessageSender.java +++ b/app/src/main/java/org/thoughtcrime/securesms/sms/MessageSender.java @@ -122,7 +122,7 @@ public class MessageSender { sendTextMessage(context, recipient, forceSms, keyExchange, messageId); onMessageSent(); - ThreadUpdateJob.enqueue(threadId); + DatabaseFactory.getThreadDatabase(context).update(threadId, true); return allocatedThreadId; } diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/IdentityUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/IdentityUtil.java index 260a670e28..fb35caf9ad 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/IdentityUtil.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/IdentityUtil.java @@ -89,7 +89,7 @@ public final class IdentityUtil { else outgoing = new OutgoingIdentityDefaultMessage(recipient); DatabaseFactory.getSmsDatabase(context).insertMessageOutbox(threadId, outgoing, false, time, null); - ThreadUpdateJob.enqueue(threadId); + DatabaseFactory.getThreadDatabase(context).update(threadId, true); } } } @@ -112,7 +112,7 @@ public final class IdentityUtil { Log.i(TAG, "Inserting verified outbox..."); DatabaseFactory.getSmsDatabase(context).insertMessageOutbox(threadId, outgoing, false, time, null); - ThreadUpdateJob.enqueue(threadId); + DatabaseFactory.getThreadDatabase(context).update(threadId, true); } }