@@ -15,6 +15,7 @@ import org.session.libsession.messaging.groups.LegacyGroupDeprecationManager
15
15
import org.session.libsession.utilities.Address
16
16
import org.session.libsession.utilities.GroupRecord
17
17
import org.session.libsession.utilities.TextSecurePreferences
18
+ import org.session.libsession.utilities.recipients.Recipient
18
19
import org.session.libsignal.utilities.AccountId
19
20
import org.thoughtcrime.securesms.database.GroupDatabase
20
21
import org.thoughtcrime.securesms.database.model.NotifyType
@@ -73,6 +74,8 @@ class ConversationOptionsBottomSheet(private val parentContext: Context) : Botto
73
74
}
74
75
}
75
76
77
+ private val Recipient .canBlock: Boolean get() = address is Address .Standard
78
+
76
79
override fun onViewCreated (view : View , savedInstanceState : Bundle ? ) {
77
80
super .onViewCreated(view, savedInstanceState)
78
81
if (! this ::thread.isInitialized) { return dismiss() }
@@ -82,8 +85,8 @@ class ConversationOptionsBottomSheet(private val parentContext: Context) : Botto
82
85
83
86
if (! recipient.isGroupOrCommunityRecipient && ! recipient.isLocalNumber) {
84
87
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
87
90
binding.detailsTextView.setOnClickListener(this )
88
91
binding.blockTextView.setOnClickListener(this )
89
92
binding.unblockTextView.setOnClickListener(this )
0 commit comments