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

Prevent crash due to calling chatRoom.getLocalAddress() when it's in Instanciated state (because returned value is null)

Browse source
This commit is contained in:
Sylvain Berfini 2024-09-02 16:26:39 +02:00
parent c2e1333be1
commit 95c4106bd0
6 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/org/linphone/ui/call/viewmodel/CurrentCallViewModel.kt
View file

@ -368,6 +368,8 @@ class CurrentCallViewModel @UiThread constructor() : GenericViewModel() {
@WorkerThread
override fun onStateChanged(chatRoom: ChatRoom, newState: ChatRoom.State?) {
val state = chatRoom.state
if (state == ChatRoom.State.Instantiated) return
val id = LinphoneUtils.getChatRoomId(chatRoom)
Log.i("$TAG Conversation [$id] (${chatRoom.subject}) state changed: [$state]")

2
app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationForwardMessageViewModel.kt
View file

@ -79,6 +79,8 @@ class ConversationForwardMessageViewModel @UiThread constructor() : AddressSelec
@WorkerThread
override fun onStateChanged(chatRoom: ChatRoom, newState: ChatRoom.State?) {
val state = chatRoom.state
if (state == ChatRoom.State.Instantiated) return
val id = LinphoneUtils.getChatRoomId(chatRoom)
Log.i("$TAG Conversation [$id] (${chatRoom.subject}) state changed: [$state]")

2
app/src/main/java/org/linphone/ui/main/chat/viewmodel/StartConversationViewModel.kt
View file

@ -61,6 +61,8 @@ class StartConversationViewModel @UiThread constructor() : AddressSelectionViewM
@WorkerThread
override fun onStateChanged(chatRoom: ChatRoom, newState: ChatRoom.State?) {
val state = chatRoom.state
if (state == ChatRoom.State.Instantiated) return
val id = LinphoneUtils.getChatRoomId(chatRoom)
Log.i("$TAG Conversation [$id] (${chatRoom.subject}) state changed: [$state]")

2
app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactViewModel.kt
View file

@ -192,6 +192,8 @@ class ContactViewModel @UiThread constructor() : GenericViewModel() {
@WorkerThread
override fun onStateChanged(chatRoom: ChatRoom, newState: ChatRoom.State?) {
val state = chatRoom.state
if (state == ChatRoom.State.Instantiated) return
val id = LinphoneUtils.getChatRoomId(chatRoom)
Log.i("$TAG Conversation [$id] (${chatRoom.subject}) state changed: [$state]")

2
app/src/main/java/org/linphone/ui/main/history/viewmodel/HistoryViewModel.kt
View file

@ -80,6 +80,8 @@ class HistoryViewModel @UiThread constructor() : GenericViewModel() {
@WorkerThread
override fun onStateChanged(chatRoom: ChatRoom, newState: ChatRoom.State?) {
val state = chatRoom.state
if (state == ChatRoom.State.Instantiated) return
val id = LinphoneUtils.getChatRoomId(chatRoom)
Log.i("$TAG Conversation [$id] (${chatRoom.subject}) state changed: [$state]")

2
app/src/main/java/org/linphone/ui/main/settings/viewmodel/AccountSettingsViewModel.kt
View file

@ -77,8 +77,6 @@ class AccountSettingsViewModel @UiThread constructor() : GenericViewModel() {
val accountFoundEvent = MutableLiveData<Event<Boolean>>()
val showUpdatePasswordDialog = MutableLiveData<Event<String>>()
private lateinit var account: Account
private lateinit var natPolicy: NatPolicy