TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-25 11:05:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: adding in more checks for open group inbox recipients before being saved to the shared configs. Prevent sending typing indicator for blocked users

Browse Source
This commit is contained in:
0x330a 2023-04-27 12:02:47 +10:00
parent 1f8fa4a904
commit 1cf4ef9e10
No known key found for this signature in database
GPG Key ID: 267811D6E6A2698C
4 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -212,6 +212,10 @@ open class Storage(context: Context, helper: SQLCipherOpenHelper, private val co
val threadDb = DatabaseComponent.get(context).threadDatabase()
getRecipientForThread(threadId)?.let { recipient ->
threadDb.markAllAsRead(threadId, recipient.isGroupRecipient, lastSeenTime)
// don't process configs for inbox recipients
if (recipient.isOpenGroupInboxRecipient) return
configFactory.convoVolatile?.let { config ->
val convo = when {
// recipient closed group

1
app/src/main/java/org/thoughtcrime/securesms/util/ConfigurationMessageUtilities.kt
View File

@ -204,6 +204,7 @@ object ConfigurationMessageUtilities {
recipient.isContactRecipient -> {
val sessionId = SessionId(recipient.address.serialize())
if (recipient.isLocalNumber) null // this is handled by the user profile NTS data
if (recipient.isOpenGroupInboxRecipient) null // specifically exclude
else convoConfig.getOrConstructOneToOne(recipient.address.serialize())
}
else -> null

2
app/src/main/java/org/thoughtcrime/securesms/util/SessionMetaProtocol.kt
View File

@ -54,6 +54,6 @@ object SessionMetaProtocol {
@JvmStatic
fun shouldSendTypingIndicator(recipient: Recipient): Boolean {
return !recipient.isGroupRecipient && recipient.isApproved
return !recipient.isGroupRecipient && recipient.isApproved && !recipient.isBlocked
}
}

16
libsession-util/src/main/java/network/loki/messenger/libsession_util/Config.kt
View File

@ -7,6 +7,8 @@ import network.loki.messenger.libsession_util.util.Conversation
import network.loki.messenger.libsession_util.util.GroupInfo
import network.loki.messenger.libsession_util.util.UserPic
import org.session.libsignal.protos.SignalServiceProtos.SharedConfigMessage.Kind
import org.session.libsignal.utilities.IdPrefix
import org.session.libsignal.utilities.Log
sealed class ConfigBase(protected val /* yucky */ pointer: Long) {
@ -69,6 +71,13 @@ class Contacts(pointer: Long) : ConfigBase(pointer) {
* Similar to [updateIfExists], but will create the underlying contact if it doesn't exist before passing to [updateFunction]
*/
fun upsertContact(sessionId: String, updateFunction: Contact.()->Unit = {}) {
if (sessionId.startsWith(IdPrefix.BLINDED.value)) {
Log.w("Loki", "Trying to create a contact with a blinded ID prefix")
return
} else if (sessionId.startsWith(IdPrefix.UN_BLINDED.value)) {
Log.w("Loki", "Trying to create a contact with an un-blinded ID prefix")
return
}
val contact = getOrConstruct(sessionId)
updateFunction(contact)
set(contact)
@ -79,6 +88,13 @@ class Contacts(pointer: Long) : ConfigBase(pointer) {
* the [updateFunction] doesn't run if there is no contact
*/
fun updateIfExists(sessionId: String, updateFunction: Contact.()->Unit) {
if (sessionId.startsWith(IdPrefix.BLINDED.value)) {
Log.w("Loki", "Trying to create a contact with a blinded ID prefix")
return
} else if (sessionId.startsWith(IdPrefix.UN_BLINDED.value)) {
Log.w("Loki", "Trying to create a contact with an un-blinded ID prefix")
return
}
val contact = get(sessionId) ?: return
updateFunction(contact)
set(contact)