mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-17 11:28:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed searchChatRoom ambiguity

Browse source
This commit is contained in:
Sylvain Berfini 2024-11-07 09:20:42 +01:00
parent 34af900a8a
commit ab4e5068af
6 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -38,6 +38,7 @@ import org.linphone.activities.main.chat.viewmodels.*
import org.linphone.activities.main.viewmodels.ListTopBarViewModel
import org.linphone.core.ChatRoom
import org.linphone.core.ChatRoomListenerStub
import org.linphone.core.ChatRoomParams
import org.linphone.core.EventLog
import org.linphone.core.Factory
import org.linphone.core.tools.Log
@ -82,8 +83,10 @@ class ChatBubbleActivity : GenericActivity() {
)
val localAddress = Factory.instance().createAddress(localSipUri)
val remoteSipAddress = Factory.instance().createAddress(remoteSipUri)
val params: ChatRoomParams? = null
chatRoom = coreContext.core.searchChatRoom(
null,
params,
localAddress,
remoteSipAddress,
arrayOfNulls(

3
app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt
View file

@ -191,8 +191,9 @@ class DetailChatRoomFragment : MasterFragment<ChatRoomDetailFragmentBinding, Cha
val localAddress = Factory.instance().createAddress(localSipUri)
val remoteSipAddress = Factory.instance().createAddress(remoteSipUri)
val params: ChatRoomParams? = null
sharedViewModel.selectedChatRoom.value = coreContext.core.searchChatRoom(
null,
params,
localAddress,
remoteSipAddress,
arrayOfNulls(

4
app/src/main/java/org/linphone/activities/main/chat/fragments/MasterChatRoomsFragment.kt
View file

@ -44,6 +44,7 @@ import org.linphone.activities.main.viewmodels.DialogViewModel
import org.linphone.activities.navigateToChatRoom
import org.linphone.activities.navigateToChatRoomCreation
import org.linphone.core.ChatRoom
import org.linphone.core.ChatRoomParams
import org.linphone.core.Factory
import org.linphone.core.tools.Log
import org.linphone.databinding.ChatRoomMasterFragmentBinding
@ -324,8 +325,9 @@ class MasterChatRoomsFragment : MasterFragment<ChatRoomMasterFragmentBinding, Ch
arguments?.clear()
val localAddress = Factory.instance().createAddress(localSipUri)
val remoteSipAddress = Factory.instance().createAddress(remoteSipUri)
val params: ChatRoomParams? = null
val chatRoom = coreContext.core.searchChatRoom(
null,
params,
localAddress,
remoteSipAddress,
arrayOfNulls(0)

4
app/src/main/java/org/linphone/activities/voip/fragments/ChatFragment.kt
View file

@ -42,6 +42,7 @@ import org.linphone.activities.main.chat.viewmodels.*
import org.linphone.activities.main.viewmodels.ListTopBarViewModel
import org.linphone.compatibility.Compatibility
import org.linphone.core.ChatRoom
import org.linphone.core.ChatRoomParams
import org.linphone.core.Factory
import org.linphone.core.tools.Log
import org.linphone.databinding.VoipChatFragmentBinding
@ -101,8 +102,9 @@ class ChatFragment : GenericFragment<VoipChatFragmentBinding>() {
val localAddress = Factory.instance().createAddress(localSipUri)
val remoteSipAddress = Factory.instance().createAddress(remoteSipUri)
val params: ChatRoomParams? = null
chatRoom = coreContext.core.searchChatRoom(
null,
params,
localAddress,
remoteSipAddress,
arrayOfNulls(0)

4
app/src/main/java/org/linphone/notifications/NotificationBroadcastReceiver.kt
View file

@ -27,6 +27,7 @@ import android.content.Intent
import org.linphone.LinphoneApplication.Companion.coreContext
import org.linphone.LinphoneApplication.Companion.ensureCoreExists
import org.linphone.core.Call
import org.linphone.core.ChatRoomParams
import org.linphone.core.Core
import org.linphone.core.tools.Log
@ -80,7 +81,8 @@ class NotificationBroadcastReceiver : BroadcastReceiver() {
return
}
val room = core.searchChatRoom(null, localAddress, remoteAddress, arrayOfNulls(0))
val params: ChatRoomParams? = null
val room = core.searchChatRoom(params, localAddress, remoteAddress, arrayOfNulls(0))
if (room == null) {
Log.e(
"[Notification Broadcast Receiver] Couldn't find chat room for remote address $remoteSipAddress and local address $localIdentity"

2
app/src/main/java/org/linphone/utils/ActivityMonitor.kt
View file

@ -23,8 +23,8 @@ import android.app.Activity
import android.app.Application.ActivityLifecycleCallbacks
import android.os.Bundle
import org.linphone.LinphoneApplication.Companion.coreContext
import org.linphone.core.tools.service.AndroidDispatcher
import org.linphone.core.tools.AndroidPlatformHelper
import org.linphone.core.tools.service.AndroidDispatcher
class ActivityMonitor : ActivityLifecycleCallbacks {
private val activities = ArrayList<Activity>()