From f51d67d3f9408c5829a7c575194df497165c7ea2 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Wed, 26 Aug 2020 14:17:51 +0200 Subject: [PATCH] Added setting to allow user to see the delivery status of an incoming message in a group chat room --- .../activities/main/chat/adapters/ChatMessagesListAdapter.kt | 3 ++- app/src/main/java/org/linphone/core/CorePreferences.kt | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/linphone/activities/main/chat/adapters/ChatMessagesListAdapter.kt b/app/src/main/java/org/linphone/activities/main/chat/adapters/ChatMessagesListAdapter.kt index 389b13387..e92fd0966 100644 --- a/app/src/main/java/org/linphone/activities/main/chat/adapters/ChatMessagesListAdapter.kt +++ b/app/src/main/java/org/linphone/activities/main/chat/adapters/ChatMessagesListAdapter.kt @@ -30,6 +30,7 @@ import androidx.databinding.DataBindingUtil import androidx.lifecycle.MutableLiveData import androidx.recyclerview.widget.DiffUtil import org.linphone.LinphoneApplication.Companion.coreContext +import org.linphone.LinphoneApplication.Companion.corePreferences import org.linphone.R import org.linphone.activities.main.chat.viewmodels.ChatMessageViewModel import org.linphone.activities.main.chat.viewmodels.EventViewModel @@ -179,7 +180,7 @@ class ChatMessagesListAdapter(val selectionViewModel: ListTopBarViewModel) : Lif popup.setOnMenuItemClickListener(this@ChatMessageViewHolder) popup.inflate(R.menu.chat_message_menu) - if (!chatMessage.isOutgoing || + if ((!chatMessage.isOutgoing && !corePreferences.showIncomingChatMessagesDeliveryStatus) || chatMessage.chatRoom.hasCapability(ChatRoomCapabilities.Basic.toInt()) || chatMessage.state == ChatMessage.State.NotDelivered) { // No message id popup.menu.removeItem(R.id.chat_message_menu_imdn_infos) diff --git a/app/src/main/java/org/linphone/core/CorePreferences.kt b/app/src/main/java/org/linphone/core/CorePreferences.kt index 9cce212a1..d5ca50e22 100644 --- a/app/src/main/java/org/linphone/core/CorePreferences.kt +++ b/app/src/main/java/org/linphone/core/CorePreferences.kt @@ -270,6 +270,9 @@ class CorePreferences constructor(private val context: Context) { val checkUpdateAvailableInterval: Int get() = config.getInt("app", "version_check_interval", 86400000) + val showIncomingChatMessagesDeliveryStatus: Boolean + get() = config.getBool("app", "show_incoming_messages_delivery_status", false) + /* Tabs */ val showHistory: Boolean