Merge branch 'dev' into feature/strings-nice-to-haves

app/build.gradle

@@ -13,8 +13,8 @@ configurations.forEach {
     it.exclude module: "commons-logging"
 }
 
-def canonicalVersionCode = 383
-def canonicalVersionName = "1.20.1"
+def canonicalVersionCode = 384
+def canonicalVersionName = "1.20.2"
 
 def postFixSize = 10
 def abiPostFix = ['armeabi-v7a' : 1,

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/DownloadDialog.kt

@@ -37,11 +37,7 @@ class DownloadDialog(private val recipient: Recipient) : DialogFragment() {
         val explanation = Phrase.from(context, R.string.attachmentsAutoDownloadModalDescription)
             .put(CONVERSATION_NAME_KEY, recipient.toShortString())
             .format()
-        val spannable = SpannableStringBuilder(explanation)
-
-        val startIndex = explanation.indexOf(name)
-        spannable.setSpan(StyleSpan(Typeface.BOLD), startIndex, startIndex + name.count(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
-        text(spannable)
+        text(explanation)
 
         button(R.string.download, R.string.AccessibilityId_download) { trust() }
         cancelButton { dismiss() }

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

@@ -44,10 +44,14 @@ class ConfigDatabase(context: Context, helper: SQLCipherOpenHelper): Database(co
     }
 
     fun retrieveConfigLastUpdateTimestamp(variant: String, publicKey: String): Long {
-        val db = readableDatabase
-        val cursor = db.query(TABLE_NAME, arrayOf(TIMESTAMP), VARIANT_AND_PUBKEY_WHERE, arrayOf(variant, publicKey),null, null, null)
-        if (cursor == null) return 0
-        if (!cursor.moveToFirst()) return 0
-        return (cursor.getLongOrNull(cursor.getColumnIndex(TIMESTAMP)) ?: 0)
+        return readableDatabase
+            .query(TABLE_NAME, arrayOf(TIMESTAMP), VARIANT_AND_PUBKEY_WHERE, arrayOf(variant, publicKey), null, null, null)
+            ?.use { cursor ->
+                if (cursor.moveToFirst()) {
+                    cursor.getLongOrNull(cursor.getColumnIndex(TIMESTAMP))
+                } else {
+                    null
+                }
+            } ?: 0L
     }
 }

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

@@ -1589,8 +1589,11 @@ open class Storage(
         DatabaseComponent.get(context).recipientDatabase().setApproved(recipient, approved)
         if (recipient.isLocalNumber || !recipient.isContactRecipient) return
         configFactory.contacts?.upsertContact(recipient.address.serialize()) {
+            // if the contact wasn't approved before but is approved now, make sure it's visible
+            if(approved && !this.approved) this.priority = PRIORITY_VISIBLE
+
+            // update approval
             this.approved = approved
-            this.priority = PRIORITY_VISIBLE
         }
     }
 

app/src/main/java/org/thoughtcrime/securesms/dependencies/ConfigFactory.kt

@@ -196,6 +196,18 @@ class ConfigFactory(
         }
     }
 
+    override fun getConfigTimestamp(forConfigObject: ConfigBase, publicKey: String): Long {
+        val variant = when (forConfigObject) {
+            is UserProfile -> SharedConfigMessage.Kind.USER_PROFILE.name
+            is Contacts -> SharedConfigMessage.Kind.CONTACTS.name
+            is ConversationVolatileConfig -> SharedConfigMessage.Kind.CONVO_INFO_VOLATILE.name
+            is UserGroupsConfig -> SharedConfigMessage.Kind.GROUPS.name
+            else -> throw UnsupportedOperationException("Can't support type of ${forConfigObject::class.simpleName} yet")
+        }
+
+        return configDatabase.retrieveConfigLastUpdateTimestamp(variant, publicKey)
+    }
+
     override fun conversationInConfig(
         publicKey: String?,
         groupPublicKey: String?,

libsession/src/main/java/org/session/libsession/messaging/jobs/BatchMessageReceiveJob.kt

@@ -5,10 +5,12 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.runBlocking
+import network.loki.messenger.libsession_util.ConfigBase
 import nl.komponents.kovenant.Promise
 import nl.komponents.kovenant.task
 import org.session.libsession.messaging.MessagingModuleConfiguration
 import org.session.libsession.messaging.messages.Message
+import org.session.libsession.messaging.messages.Message.Companion.senderOrSync
 import org.session.libsession.messaging.messages.control.CallMessage
 import org.session.libsession.messaging.messages.control.ClosedGroupControlMessage
 import org.session.libsession.messaging.messages.control.ConfigurationMessage
@@ -96,6 +98,26 @@ class BatchMessageReceiveJob(
         executeAsync(dispatcherName).get()
     }
 
+    private fun isHidden(message: Message): Boolean{
+        // if the contact is marked as hidden for 1on1 messages
+        // and  the message's sentTimestamp is earlier than the sentTimestamp of the last config
+        val config = MessagingModuleConfiguration.shared.configFactory
+        val publicKey = MessagingModuleConfiguration.shared.storage.getUserPublicKey()
+        if(config.contacts == null || message.sentTimestamp == null || publicKey == null) return false
+        val contactConfigTimestamp = config.getConfigTimestamp(config.contacts!!, publicKey)
+        if(message.groupPublicKey == null && // not a group
+            message.openGroupServerMessageID == null && // not a community
+            // not marked as hidden
+            config.contacts?.get(message.senderOrSync)?.priority == ConfigBase.PRIORITY_HIDDEN &&
+            // the message's sentTimestamp is earlier than the sentTimestamp of the last config
+            message.sentTimestamp!! < contactConfigTimestamp
+        ) {
+            return true
+        }
+
+        return false
+    }
+
     fun executeAsync(dispatcherName: String): Promise<Unit, Exception> {
         return task {
             val threadMap = mutableMapOf<Long, MutableList<ParsedMessage>>()
@@ -112,6 +134,9 @@ class BatchMessageReceiveJob(
                     val (message, proto) = MessageReceiver.parse(data, openGroupMessageServerID, openGroupPublicKey = serverPublicKey, currentClosedGroups = currentClosedGroups)
                     message.serverHash = serverHash
                     val parsedParams = ParsedMessage(messageParameters, message, proto)
+
+                    if(isHidden(message)) return@forEach
+
                     val threadID = Message.getThreadId(message, openGroupID, storage, shouldCreateThread(parsedParams)) ?: NO_THREAD_MAPPING
                     if (!threadMap.containsKey(threadID)) {
                         threadMap[threadID] = mutableListOf(parsedParams)

libsession/src/main/java/org/session/libsession/messaging/messages/Message.kt

@@ -33,12 +33,13 @@ abstract class Message {
 
     companion object {
         fun getThreadId(message: Message, openGroupID: String?, storage: StorageProtocol, shouldCreateThread: Boolean): Long? {
-            val senderOrSync = when (message) {
-                is VisibleMessage -> message.syncTarget ?: message.sender!!
-                is ExpirationTimerUpdate -> message.syncTarget ?: message.sender!!
-                else -> message.sender!!
-            }
-            return storage.getThreadIdFor(senderOrSync, message.groupPublicKey, openGroupID, createThread = shouldCreateThread)
+            return storage.getThreadIdFor(message.senderOrSync, message.groupPublicKey, openGroupID, createThread = shouldCreateThread)
+        }
+
+        val Message.senderOrSync get() = when(this)  {
+            is VisibleMessage -> syncTarget ?: sender!!
+            is ExpirationTimerUpdate -> syncTarget ?: sender!!
+            else -> sender!!
         }
     }
 

libsession/src/main/java/org/session/libsession/utilities/ConfigFactoryProtocol.kt

@@ -16,6 +16,8 @@ interface ConfigFactoryProtocol {
 
     fun conversationInConfig(publicKey: String?, groupPublicKey: String?, openGroupId: String?, visibleOnly: Boolean): Boolean
     fun canPerformChange(variant: String, publicKey: String, changeTimestampMs: Long): Boolean
+
+    fun getConfigTimestamp(forConfigObject: ConfigBase, publicKey: String): Long
 }
 
 interface ConfigFactoryUpdateListener {