Merge remote-tracking branch 'upstream/dev' into improve_background_jobs

app/src/main/java/org/thoughtcrime/securesms/database/ConversationNotificationDebouncer.kt

@@ -0,0 +1,37 @@
+package org.thoughtcrime.securesms.database
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.os.Handler
+import android.os.Looper
+import org.session.libsession.utilities.Debouncer
+import org.thoughtcrime.securesms.ApplicationContext
+
+class ConversationNotificationDebouncer(private val context: Context) {
+    private val threadIDs = mutableSetOf<Long>()
+    private val handler = Handler(Looper.getMainLooper())
+    private val debouncer = Debouncer(handler, 250);
+
+    companion object {
+        @SuppressLint("StaticFieldLeak")
+        lateinit var shared: ConversationNotificationDebouncer
+
+        fun get(context: Context): ConversationNotificationDebouncer {
+            if (::shared.isInitialized) { return shared }
+            shared = ConversationNotificationDebouncer(context)
+            return shared
+        }
+    }
+
+    fun notify(threadID: Long) {
+        threadIDs.add(threadID)
+        debouncer.publish { publish() }
+    }
+
+    private fun publish() {
+        for (threadID in threadIDs) {
+            context.contentResolver.notifyChange(DatabaseContentProviders.Conversation.getUriForThread(threadID), null)
+        }
+        threadIDs.clear()
+    }
+}

app/src/main/java/org/thoughtcrime/securesms/database/Database.java

@@ -35,13 +35,13 @@ public abstract class Database {
 
   protected       SQLCipherOpenHelper databaseHelper;
   protected final Context             context;
-  private final Debouncer threadNotificationDebouncer;
+  private final   Debouncer           conversationListNotificationDebouncer;
 
   @SuppressLint("WrongConstant")
   public Database(Context context, SQLCipherOpenHelper databaseHelper) {
-    this.context        = context;
+    this.context = context;
     this.databaseHelper = databaseHelper;
-    this.threadNotificationDebouncer = new Debouncer(ApplicationContext.getInstance(context).getThreadNotificationHandler(), 250);
+    this.conversationListNotificationDebouncer = new Debouncer(ApplicationContext.getInstance(context).getConversationListNotificationHandler(), 250);
   }
 
   protected void notifyConversationListeners(Set<Long> threadIds) {
@@ -50,11 +50,11 @@ public abstract class Database {
   }
 
   protected void notifyConversationListeners(long threadId) {
-    context.getContentResolver().notifyChange(DatabaseContentProviders.Conversation.getUriForThread(threadId), null);
+    ConversationNotificationDebouncer.Companion.get(context).notify(threadId);
   }
 
   protected void notifyConversationListListeners() {
-    threadNotificationDebouncer.publish(()->context.getContentResolver().notifyChange(DatabaseContentProviders.ConversationList.CONTENT_URI, null));
+    conversationListNotificationDebouncer.publish(()->context.getContentResolver().notifyChange(DatabaseContentProviders.ConversationList.CONTENT_URI, null));
   }
 
   protected void notifyStickerListeners() {

app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt

@@ -4,8 +4,8 @@ import android.app.job.JobScheduler
 import android.content.Context
 import android.net.Uri
 import org.session.libsession.database.StorageProtocol
-import org.session.libsession.messaging.jobs.*
 import org.session.libsession.messaging.contacts.Contact
+import org.session.libsession.messaging.jobs.*
 import org.session.libsession.messaging.messages.control.ConfigurationMessage
 import org.session.libsession.messaging.messages.signal.*
 import org.session.libsession.messaging.messages.signal.IncomingTextMessage
@@ -17,20 +17,15 @@ import org.session.libsession.messaging.sending_receiving.attachments.DatabaseAt
 import org.session.libsession.messaging.sending_receiving.data_extraction.DataExtractionNotificationInfoMessage
 import org.session.libsession.messaging.sending_receiving.link_preview.LinkPreview
 import org.session.libsession.messaging.sending_receiving.quotes.QuoteModel
-import org.session.libsession.utilities.Address
-import org.session.libsession.utilities.Address.Companion.fromSerialized
-import org.session.libsession.utilities.GroupRecord
-import org.session.libsession.utilities.recipients.Recipient
 import org.session.libsession.messaging.utilities.UpdateMessageData
-import org.session.libsession.utilities.GroupUtil
-import org.session.libsession.utilities.IdentityKeyUtil
-import org.session.libsession.utilities.TextSecurePreferences
-import org.session.libsession.utilities.ProfileKeyUtil
+import org.session.libsession.utilities.*
+import org.session.libsession.utilities.Address.Companion.fromSerialized
+import org.session.libsession.utilities.recipients.Recipient
 import org.session.libsignal.crypto.ecc.ECKeyPair
-import org.session.libsignal.utilities.KeyHelper
-import org.session.libsignal.utilities.guava.Optional
 import org.session.libsignal.messages.SignalServiceAttachmentPointer
 import org.session.libsignal.messages.SignalServiceGroup
+import org.session.libsignal.utilities.KeyHelper
+import org.session.libsignal.utilities.guava.Optional
 import org.thoughtcrime.securesms.ApplicationContext
 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper
 import org.thoughtcrime.securesms.jobs.RetrieveProfileAvatarJob
@@ -101,7 +96,7 @@ class Storage(context: Context, helper: SQLCipherOpenHelper) : Database(context,
     override fun persist(message: VisibleMessage, quotes: QuoteModel?, linkPreview: List<LinkPreview?>, groupPublicKey: String?, openGroupID: String?, attachments: List<Attachment>): Long? {
         var messageID: Long? = null
         val senderAddress = Address.fromSerialized(message.sender!!)
-        val isUserSender = message.sender!! == getUserPublicKey()
+        val isUserSender = (message.sender!! == getUserPublicKey())
         val group: Optional<SignalServiceGroup> = when {
             openGroupID != null -> Optional.of(SignalServiceGroup(openGroupID.toByteArray(), SignalServiceGroup.GroupType.PUBLIC_CHAT))
             groupPublicKey != null -> {
@@ -121,14 +116,12 @@ class Storage(context: Context, helper: SQLCipherOpenHelper) : Database(context,
             senderAddress
         }
         val targetRecipient = Recipient.from(context, targetAddress, false)
-
         if (message.isMediaMessage() || attachments.isNotEmpty()) {
             val quote: Optional<QuoteModel> = if (quotes != null) Optional.of(quotes) else Optional.absent()
             val linkPreviews: Optional<List<LinkPreview>> = if (linkPreview.isEmpty()) Optional.absent() else Optional.of(linkPreview.mapNotNull { it!! })
             val mmsDatabase = DatabaseFactory.getMmsDatabase(context)
             val insertResult = if (message.sender == getUserPublicKey()) {
                 val mediaMessage = OutgoingMediaMessage.from(message, targetRecipient, pointerAttachments, quote.orNull(), linkPreviews.orNull()?.firstOrNull())
-                mmsDatabase.beginTransaction()
                 mmsDatabase.insertSecureDecryptedMessageOutbox(mediaMessage, message.threadID ?: -1, message.sentTimestamp!!)
             } else {
                 // It seems like we have replaced SignalServiceAttachment with SessionServiceAttachment
@@ -136,14 +129,11 @@ class Storage(context: Context, helper: SQLCipherOpenHelper) : Database(context,
                     it.toSignalPointer()
                 }
                 val mediaMessage = IncomingMediaMessage.from(message, senderAddress, targetRecipient.expireMessages * 1000L, group, signalServiceAttachments, quote, linkPreviews)
-                mmsDatabase.beginTransaction()
                 mmsDatabase.insertSecureDecryptedMessageInbox(mediaMessage, message.threadID ?: -1, message.receivedTimestamp ?: 0)
             }
             if (insertResult.isPresent) {
-                mmsDatabase.setTransactionSuccessful()
                 messageID = insertResult.get().messageId
             }
-            mmsDatabase.endTransaction()
         } else {
             val smsDatabase = DatabaseFactory.getSmsDatabase(context)
             val isOpenGroupInvitation = (message.openGroupInvitation != null)