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: add blocked check for read receipt and updating expiring messages

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

2
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt
View File

@ -64,7 +64,7 @@ object ConversationMenuHelper {
// Base menu (options that should always be present) // Base menu (options that should always be present)
inflater.inflate(R.menu.menu_conversation, menu) inflater.inflate(R.menu.menu_conversation, menu)
// Expiring messages // Expiring messages
if (!isOpenGroup && (thread.hasApprovedMe() || thread.isClosedGroupRecipient)) { if (!isOpenGroup && (thread.hasApprovedMe() || thread.isClosedGroupRecipient) && !thread.isBlocked) {
if (thread.expireMessages > 0) { if (thread.expireMessages > 0) {
inflater.inflate(R.menu.menu_conversation_expiration_on, menu) inflater.inflate(R.menu.menu_conversation_expiration_on, menu)
val item = menu.findItem(R.id.menu_expiring_messages) val item = menu.findItem(R.id.menu_expiring_messages)

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

@ -49,7 +49,7 @@ object SessionMetaProtocol {
@JvmStatic @JvmStatic
fun shouldSendReadReceipt(recipient: Recipient): Boolean { fun shouldSendReadReceipt(recipient: Recipient): Boolean {
return !recipient.isGroupRecipient && recipient.isApproved return !recipient.isGroupRecipient && recipient.isApproved && !recipient.isBlocked
} }
@JvmStatic @JvmStatic