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

Changes related to chat messages aggregation in SDK

Browse source
This commit is contained in:
Sylvain Berfini 2022-07-06 11:52:14 +02:00
parent 7c267dad25
commit 5642d4c8c3
9 changed files with 118 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/assets/linphonerc_factory
View file

@ -16,6 +16,8 @@ auto_answer_replacing_calls=1
ping_with_options=0
use_cpim=1
zrtp_key_agreements_suites=MS_ZRTP_KEY_AGREEMENT_K255_KYB512
chat_messages_aggregation_delay=1000
chat_messages_aggregation=1
[sound]
#remove this property for any application that is not Linphone public version itself

2
app/src/main/java/org/linphone/activities/chat_bubble/ChatBubbleActivity.kt
View file

@ -61,7 +61,7 @@ class ChatBubbleActivity : GenericActivity() {
}
private val listener = object : ChatRoomListenerStub() {
override fun onChatMessageReceived(chatRoom: ChatRoom, eventLog: EventLog) {
override fun onChatMessagesReceived(chatRoom: ChatRoom, eventLogs: Array<out EventLog>) {
chatRoom.markAsRead()
}
}

54
app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatMessagesListViewModel.kt
View file

@ -56,31 +56,10 @@ class ChatMessagesListViewModel(private val chatRoom: ChatRoom) : ViewModel() {
}
private val chatRoomListener: ChatRoomListenerStub = object : ChatRoomListenerStub() {
override fun onChatMessageReceived(chatRoom: ChatRoom, eventLog: EventLog) {
if (eventLog.type == EventLog.Type.ConferenceChatMessage) {
val chatMessage = eventLog.chatMessage
chatMessage ?: return
chatMessage.userData = events.value.orEmpty().size
val existingEvent = events.value.orEmpty().find { data ->
data.eventLog == eventLog
override fun onChatMessagesReceived(chatRoom: ChatRoom, eventLogs: Array<out EventLog>) {
for (eventLog in eventLogs) {
addChatMessageEventLog(eventLog)
}
if (existingEvent != null) {
Log.w("[Chat Messages] Found already present chat message, don't add it it's probably the result of an auto download")
return
}
if (!PermissionHelper.get().hasWriteExternalStoragePermission()) {
for (content in chatMessage.contents) {
if (content.isFileTransfer) {
Log.i("[Chat Messages] Android < 10 detected and WRITE_EXTERNAL_STORAGE permission isn't granted yet")
requestWriteExternalStoragePermissionEvent.value = Event(true)
}
}
}
}
addEvent(eventLog)
}
override fun onChatMessageSending(chatRoom: ChatRoom, eventLog: EventLog) {
@ -245,4 +224,31 @@ class ChatMessagesListViewModel(private val chatRoom: ChatRoom) : ViewModel() {
events.value.orEmpty().forEach(EventLogData::destroy)
events.value = getEvents()
}
private fun addChatMessageEventLog(eventLog: EventLog) {
if (eventLog.type == EventLog.Type.ConferenceChatMessage) {
val chatMessage = eventLog.chatMessage
chatMessage ?: return
chatMessage.userData = events.value.orEmpty().size
val existingEvent = events.value.orEmpty().find { data ->
data.eventLog == eventLog
}
if (existingEvent != null) {
Log.w("[Chat Messages] Found already present chat message, don't add it it's probably the result of an auto download")
return
}
if (!PermissionHelper.get().hasWriteExternalStoragePermission()) {
for (content in chatMessage.contents) {
if (content.isFileTransfer) {
Log.i("[Chat Messages] Android < 10 detected and WRITE_EXTERNAL_STORAGE permission isn't granted yet")
requestWriteExternalStoragePermissionEvent.value = Event(true)
}
}
}
}
addEvent(eventLog)
}
}

2
app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatRoomViewModel.kt
View file

@ -150,7 +150,7 @@ class ChatRoomViewModel(val chatRoom: ChatRoom) : ViewModel(), ContactDataInterf
subject.value = chatRoom.subject
}
override fun onChatMessageReceived(chatRoom: ChatRoom, eventLog: EventLog) {
override fun onChatMessagesReceived(chatRoom: ChatRoom, eventLogs: Array<out EventLog>) {
updateUnreadMessageCount()
}

26
app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatRoomsListViewModel.kt
View file

@ -56,19 +56,15 @@ class ChatRoomsListViewModel : MessageNotifierViewModel() {
}
override fun onMessageSent(core: Core, chatRoom: ChatRoom, message: ChatMessage) {
when (findChatRoomIndex(chatRoom)) {
-1 -> updateChatRooms()
0 -> chatRoomIndexUpdatedEvent.value = Event(0)
else -> reorderChatRooms()
}
onChatRoomMessageEvent(chatRoom)
}
override fun onMessageReceived(core: Core, chatRoom: ChatRoom, message: ChatMessage) {
when (findChatRoomIndex(chatRoom)) {
-1 -> updateChatRooms()
0 -> chatRoomIndexUpdatedEvent.value = Event(0)
else -> reorderChatRooms()
}
override fun onMessagesReceived(
core: Core,
chatRoom: ChatRoom,
messages: Array<out ChatMessage>
) {
onChatRoomMessageEvent(chatRoom)
}
override fun onChatRoomRead(core: Core, chatRoom: ChatRoom) {
@ -168,4 +164,12 @@ class ChatRoomsListViewModel : MessageNotifierViewModel() {
}
return -1
}
private fun onChatRoomMessageEvent(chatRoom: ChatRoom) {
when (findChatRoomIndex(chatRoom)) {
-1 -> updateChatRooms()
0 -> chatRoomIndexUpdatedEvent.value = Event(0)
else -> reorderChatRooms()
}
}
}

6
app/src/main/java/org/linphone/activities/main/viewmodels/TabsViewModel.kt
View file

@ -70,7 +70,11 @@ class TabsViewModel : ViewModel() {
updateUnreadChatCount()
}
override fun onMessageReceived(core: Core, chatRoom: ChatRoom, message: ChatMessage) {
override fun onMessagesReceived(
core: Core,
chatRoom: ChatRoom,
messages: Array<out ChatMessage>
) {
updateUnreadChatCount()
}

6
app/src/main/java/org/linphone/activities/voip/viewmodels/CallsViewModel.kt
View file

@ -77,7 +77,11 @@ class CallsViewModel : ViewModel() {
updateUnreadChatCount()
}
override fun onMessageReceived(core: Core, chatRoom: ChatRoom, message: ChatMessage) {
override fun onMessagesReceived(
core: Core,
chatRoom: ChatRoom,
messages: Array<out ChatMessage>
) {
updateUnreadChatCount()
}

36
app/src/main/java/org/linphone/core/CoreContext.kt
View file

@ -247,18 +247,13 @@ class CoreContext(
}
}
override fun onMessageReceived(core: Core, chatRoom: ChatRoom, message: ChatMessage) {
if (core.maxSizeForAutoDownloadIncomingFiles != -1) {
var hasFile = false
for (content in message.contents) {
if (content.isFile) {
hasFile = true
break
}
}
if (hasFile) {
exportFilesInMessageToMediaStore(message)
}
override fun onMessagesReceived(
core: Core,
chatRoom: ChatRoom,
messages: Array<out ChatMessage>
) {
for (message in messages) {
exportFileInMessage(message)
}
}
}
@ -817,7 +812,22 @@ class CoreContext(
/* Coroutine related */
fun exportFilesInMessageToMediaStore(message: ChatMessage) {
private fun exportFileInMessage(message: ChatMessage) {
if (core.maxSizeForAutoDownloadIncomingFiles != -1) {
var hasFile = false
for (content in message.contents) {
if (content.isFile) {
hasFile = true
break
}
}
if (hasFile) {
exportFilesInMessageToMediaStore(message)
}
}
}
private fun exportFilesInMessageToMediaStore(message: ChatMessage) {
if (message.isEphemeral) {
Log.w("[Context] Do not make ephemeral file(s) public")
return

60
app/src/main/java/org/linphone/notifications/NotificationsManager.kt
View file

@ -139,11 +139,16 @@ class NotificationsManager(private val context: Context) {
}
}
override fun onMessageReceived(core: Core, room: ChatRoom, message: ChatMessage) {
if (message.isOutgoing || corePreferences.disableChat) return
override fun onMessagesReceived(
core: Core,
room: ChatRoom,
messages: Array<out ChatMessage>
) {
Log.i("[Notifications Manager] Received ${messages.size} aggregated messages")
if (corePreferences.disableChat) return
if (corePreferences.preventInterfaceFromShowingUp) {
Log.w("[Context] We were asked to not show the chat notifications")
Log.w("[Notifications Manager] We were asked to not show the chat notifications")
return
}
@ -160,24 +165,6 @@ class NotificationsManager(private val context: Context) {
return
}
if (message.errorInfo.reason == Reason.UnsupportedContent) {
Log.w("[Notifications Manager] Received message with unsupported content, do not notify")
return
}
if (message.contents.find { content ->
content.isFile or content.isFileTransfer or content.isText
} == null
) {
Log.w("[Notifications Manager] Received message with neither text or attachment, do not notify")
return
}
if (message.isRead) {
Log.w("[Notifications Manager] Received message is already marked as read, do not notify")
return
}
if (corePreferences.chatRoomShortcuts) {
if (ShortcutsHelper.isShortcutToChatRoomAlreadyCreated(context, room)) {
Log.i("[Notifications Manager] Chat room shortcut already exists")
@ -187,7 +174,12 @@ class NotificationsManager(private val context: Context) {
}
}
displayIncomingChatNotification(room, message)
val notifiable = createChatNotifiable(room, messages)
if (notifiable.messages.isNotEmpty()) {
displayChatNotifiable(room, notifiable)
} else {
Log.w("[Notifications Manager] No message to display in received aggregated messages")
}
}
override fun onChatRoomRead(core: Core, chatRoom: ChatRoom) {
@ -661,7 +653,7 @@ class NotificationsManager(private val context: Context) {
notify(notifiable.notificationId, notification, CHAT_TAG)
}
private fun displayIncomingChatNotification(room: ChatRoom, message: ChatMessage) {
private fun createChatNotifiable(room: ChatRoom, message: ChatMessage): Notifiable {
val notifiable = getNotifiableForRoom(room)
if (notifiable.messages.isNotEmpty() || room.unreadMessagesCount == 1) {
val friend = coreContext.contactsManager.findContactByAddress(message.fromAddress)
@ -682,7 +674,27 @@ class NotificationsManager(private val context: Context) {
notifiable.groupTitle = room.subject
}
displayChatNotifiable(room, notifiable)
return notifiable
}
private fun createChatNotifiable(room: ChatRoom, messages: Array<out ChatMessage>): Notifiable {
val notifiable = getNotifiableForRoom(room)
for (message in messages) {
if (message.isRead || message.isOutgoing) continue
val friend = coreContext.contactsManager.findContactByAddress(message.fromAddress)
val notifiableMessage = getNotifiableMessage(message, friend)
notifiable.messages.add(notifiableMessage)
}
if (room.hasCapability(ChatRoomCapabilities.OneToOne.toInt())) {
notifiable.isGroup = false
} else {
notifiable.isGroup = true
notifiable.groupTitle = room.subject
}
return notifiable
}
private fun getNotifiableForRoom(room: ChatRoom): Notifiable {