|
@@ -127,6 +127,8 @@ class ConversationInfoActivity :
|
|
private var adapter: FlexibleAdapter<ParticipantItem>? = null
|
|
private var adapter: FlexibleAdapter<ParticipantItem>? = null
|
|
private var userItems: MutableList<ParticipantItem> = ArrayList()
|
|
private var userItems: MutableList<ParticipantItem> = ArrayList()
|
|
|
|
|
|
|
|
+ private lateinit var optionsMenu: Menu
|
|
|
|
+
|
|
private val workerData: Data?
|
|
private val workerData: Data?
|
|
get() {
|
|
get() {
|
|
if (!TextUtils.isEmpty(conversationToken) && conversationUser != null) {
|
|
if (!TextUtils.isEmpty(conversationToken) && conversationUser != null) {
|
|
@@ -204,11 +206,15 @@ class ConversationInfoActivity :
|
|
|
|
|
|
override fun onCreateOptionsMenu(menu: Menu): Boolean {
|
|
override fun onCreateOptionsMenu(menu: Menu): Boolean {
|
|
super.onCreateOptionsMenu(menu)
|
|
super.onCreateOptionsMenu(menu)
|
|
|
|
+ optionsMenu = menu
|
|
|
|
+ return true
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ fun showOptionsMenu() {
|
|
|
|
+ optionsMenu.clear()
|
|
if (CapabilitiesUtilNew.isConversationAvatarEndpointAvailable(conversationUser)) {
|
|
if (CapabilitiesUtilNew.isConversationAvatarEndpointAvailable(conversationUser)) {
|
|
- menuInflater.inflate(R.menu.menu_conversation_info, menu)
|
|
|
|
- return true
|
|
|
|
|
|
+ menuInflater.inflate(R.menu.menu_conversation_info, optionsMenu)
|
|
}
|
|
}
|
|
- return false
|
|
|
|
}
|
|
}
|
|
|
|
|
|
override fun onPrepareOptionsMenu(menu: Menu): Boolean {
|
|
override fun onPrepareOptionsMenu(menu: Menu): Boolean {
|
|
@@ -663,6 +669,7 @@ class ConversationInfoActivity :
|
|
} else {
|
|
} else {
|
|
binding?.clearConversationHistory?.visibility = GONE
|
|
binding?.clearConversationHistory?.visibility = GONE
|
|
}
|
|
}
|
|
|
|
+ showOptionsMenu()
|
|
} else {
|
|
} else {
|
|
binding?.addParticipantsAction?.visibility = GONE
|
|
binding?.addParticipantsAction?.visibility = GONE
|
|
binding?.clearConversationHistory?.visibility = GONE
|
|
binding?.clearConversationHistory?.visibility = GONE
|