Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Added setting to allow user to see the delivery status of an incoming message in a group chat room

Browse source
This commit is contained in:
Sylvain Berfini 2020-08-26 14:17:51 +02:00
parent 808163cdde
commit f51d67d3f9
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/org/linphone/activities/main/chat/adapters/ChatMessagesListAdapter.kt
View file

@ -30,6 +30,7 @@ import androidx.databinding.DataBindingUtil
import androidx.lifecycle.MutableLiveData import androidx.lifecycle.MutableLiveData
import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.DiffUtil
import org.linphone.LinphoneApplication.Companion.coreContext import org.linphone.LinphoneApplication.Companion.coreContext
import org.linphone.LinphoneApplication.Companion.corePreferences
import org.linphone.R import org.linphone.R
import org.linphone.activities.main.chat.viewmodels.ChatMessageViewModel import org.linphone.activities.main.chat.viewmodels.ChatMessageViewModel
import org.linphone.activities.main.chat.viewmodels.EventViewModel import org.linphone.activities.main.chat.viewmodels.EventViewModel
@ -179,7 +180,7 @@ class ChatMessagesListAdapter(val selectionViewModel: ListTopBarViewModel) : Lif
popup.setOnMenuItemClickListener(this@ChatMessageViewHolder) popup.setOnMenuItemClickListener(this@ChatMessageViewHolder)
popup.inflate(R.menu.chat_message_menu) popup.inflate(R.menu.chat_message_menu)
if (!chatMessage.isOutgoing || if ((!chatMessage.isOutgoing && !corePreferences.showIncomingChatMessagesDeliveryStatus) ||
chatMessage.chatRoom.hasCapability(ChatRoomCapabilities.Basic.toInt()) || chatMessage.chatRoom.hasCapability(ChatRoomCapabilities.Basic.toInt()) ||
chatMessage.state == ChatMessage.State.NotDelivered) { // No message id chatMessage.state == ChatMessage.State.NotDelivered) { // No message id
popup.menu.removeItem(R.id.chat_message_menu_imdn_infos) popup.menu.removeItem(R.id.chat_message_menu_imdn_infos)

3
app/src/main/java/org/linphone/core/CorePreferences.kt
View file

@ -270,6 +270,9 @@ class CorePreferences constructor(private val context: Context) {
val checkUpdateAvailableInterval: Int val checkUpdateAvailableInterval: Int
get() = config.getInt("app", "version_check_interval", 86400000) get() = config.getInt("app", "version_check_interval", 86400000)
val showIncomingChatMessagesDeliveryStatus: Boolean
get() = config.getBool("app", "show_incoming_messages_delivery_status", false)
/* Tabs */ /* Tabs */
val showHistory: Boolean val showHistory: Boolean