Skip to content

Commit 5858a97

Browse files
Shouldn't be able to block blinded MR (#1549)
1 parent 86e4bb7 commit 5858a97

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

app/src/main/java/org/thoughtcrime/securesms/home/ConversationOptionsBottomSheet.kt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import org.session.libsession.messaging.groups.LegacyGroupDeprecationManager
1515
import org.session.libsession.utilities.Address
1616
import org.session.libsession.utilities.GroupRecord
1717
import org.session.libsession.utilities.TextSecurePreferences
18+
import org.session.libsession.utilities.recipients.Recipient
1819
import org.session.libsignal.utilities.AccountId
1920
import org.thoughtcrime.securesms.database.GroupDatabase
2021
import org.thoughtcrime.securesms.database.model.NotifyType
@@ -73,6 +74,8 @@ class ConversationOptionsBottomSheet(private val parentContext: Context) : Botto
7374
}
7475
}
7576

77+
private val Recipient.canBlock: Boolean get() = address is Address.Standard
78+
7679
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
7780
super.onViewCreated(view, savedInstanceState)
7881
if (!this::thread.isInitialized) { return dismiss() }
@@ -82,8 +85,8 @@ class ConversationOptionsBottomSheet(private val parentContext: Context) : Botto
8285

8386
if (!recipient.isGroupOrCommunityRecipient && !recipient.isLocalNumber) {
8487
binding.detailsTextView.visibility = View.VISIBLE
85-
binding.unblockTextView.visibility = if (recipient.blocked) View.VISIBLE else View.GONE
86-
binding.blockTextView.visibility = if (recipient.blocked) View.GONE else View.VISIBLE
88+
binding.unblockTextView.visibility = if (recipient.canBlock && recipient.blocked) View.VISIBLE else View.GONE
89+
binding.blockTextView.visibility = if (recipient.canBlock && !recipient.blocked) View.VISIBLE else View.GONE
8790
binding.detailsTextView.setOnClickListener(this)
8891
binding.blockTextView.setOnClickListener(this)
8992
binding.unblockTextView.setOnClickListener(this)

0 commit comments

Comments
 (0)