From 4d90ee0f155dab1ccd313fdb1747324a50532965 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Wed, 22 Feb 2023 16:24:38 +0100 Subject: [PATCH] Fixed build with 5.3-alpha SDK due to enum relocations changes --- app/build.gradle | 2 +- .../viewmodels/RemoteProvisioningViewModel.kt | 12 ++++++---- .../main/chat/GroupChatRoomMember.kt | 4 ++-- .../chat/adapters/ChatMessagesListAdapter.kt | 2 +- .../activities/main/chat/data/ChatRoomData.kt | 16 ++++++------- .../main/chat/data/DevicesListChildData.kt | 10 ++++---- .../main/chat/data/DevicesListGroupData.kt | 10 ++++---- .../chat/data/GroupInfoParticipantData.kt | 10 ++++---- .../chat/fragments/DetailChatRoomFragment.kt | 2 +- .../main/chat/fragments/GroupInfoFragment.kt | 3 +-- .../viewmodels/ChatMessageSendingViewModel.kt | 24 +++++++++---------- .../viewmodels/ChatMessagesListViewModel.kt | 4 ++-- .../viewmodels/ChatRoomCreationViewModel.kt | 8 +++---- .../main/chat/viewmodels/ChatRoomViewModel.kt | 20 ++++++++-------- .../chat/viewmodels/GroupInfoViewModel.kt | 6 ++--- .../ConferenceWaitingRoomViewModel.kt | 6 ++--- .../main/contact/data/ContactEditorData.kt | 4 ++-- .../contact/viewmodels/ContactViewModel.kt | 6 ++--- .../viewmodels/ContactsListViewModel.kt | 4 ++-- .../history/viewmodels/CallLogViewModel.kt | 2 +- .../ConferencesSettingsViewModel.kt | 8 +++---- .../viewmodels/LdapSettingsViewModel.kt | 21 +++++++--------- .../data/ConferenceParticipantDeviceData.kt | 10 ++++---- .../activities/voip/data/StatItemData.kt | 2 +- .../voip/viewmodels/ConferenceViewModel.kt | 12 +++++----- .../linphone/contact/ContactDataInterface.kt | 12 +++++----- .../linphone/contact/ContactSelectionData.kt | 4 ++-- .../contact/ContactsSelectionAdapter.kt | 6 ++--- .../contact/ContactsSelectionViewModel.kt | 4 ++-- .../notifications/NotificationsManager.kt | 2 +- .../java/org/linphone/utils/LinphoneUtils.kt | 8 +++---- .../org/linphone/utils/ShortcutsHelper.kt | 8 +++---- .../chat_room_group_info_participant_cell.xml | 6 ++--- 33 files changed, 129 insertions(+), 129 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index e754a8f6b..a2498facf 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -244,7 +244,7 @@ dependencies { implementation 'com.google.firebase:firebase-messaging' } - implementation 'org.linphone:linphone-sdk-android:5.2+' + implementation 'org.linphone:linphone-sdk-android:5.3+' // Only enable leak canary prior to release //debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.4' diff --git a/app/src/main/java/org/linphone/activities/assistant/viewmodels/RemoteProvisioningViewModel.kt b/app/src/main/java/org/linphone/activities/assistant/viewmodels/RemoteProvisioningViewModel.kt index b4ec77e13..580e04a38 100644 --- a/app/src/main/java/org/linphone/activities/assistant/viewmodels/RemoteProvisioningViewModel.kt +++ b/app/src/main/java/org/linphone/activities/assistant/viewmodels/RemoteProvisioningViewModel.kt @@ -23,7 +23,7 @@ import androidx.lifecycle.MediatorLiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import org.linphone.LinphoneApplication.Companion.coreContext -import org.linphone.core.ConfiguringState +import org.linphone.core.Config import org.linphone.core.Core import org.linphone.core.CoreListenerStub import org.linphone.core.tools.Log @@ -38,13 +38,17 @@ class RemoteProvisioningViewModel : ViewModel() { val fetchSuccessfulEvent = MutableLiveData>() private val listener = object : CoreListenerStub() { - override fun onConfiguringStatus(core: Core, status: ConfiguringState, message: String?) { + override fun onConfiguringStatus( + core: Core, + status: Config.ConfiguringState, + message: String? + ) { fetchInProgress.value = false when (status) { - ConfiguringState.Successful -> { + Config.ConfiguringState.Successful -> { fetchSuccessfulEvent.value = Event(true) } - ConfiguringState.Failed -> { + Config.ConfiguringState.Failed -> { fetchSuccessfulEvent.value = Event(false) } else -> {} diff --git a/app/src/main/java/org/linphone/activities/main/chat/GroupChatRoomMember.kt b/app/src/main/java/org/linphone/activities/main/chat/GroupChatRoomMember.kt index d3ff25f5d..537b8017c 100644 --- a/app/src/main/java/org/linphone/activities/main/chat/GroupChatRoomMember.kt +++ b/app/src/main/java/org/linphone/activities/main/chat/GroupChatRoomMember.kt @@ -20,12 +20,12 @@ package org.linphone.activities.main.chat import org.linphone.core.Address -import org.linphone.core.ChatRoomSecurityLevel +import org.linphone.core.ChatRoom data class GroupChatRoomMember( val address: Address, var isAdmin: Boolean = false, - val securityLevel: ChatRoomSecurityLevel = ChatRoomSecurityLevel.ClearText, + val securityLevel: ChatRoom.SecurityLevel = ChatRoom.SecurityLevel.ClearText, val hasLimeX3DHCapability: Boolean = false, // A participant not yet added to a group can't be set admin at the same time it's added val canBeSetAdmin: Boolean = false 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 961d6af9e..9a8bbea1c 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 @@ -365,7 +365,7 @@ class ChatMessagesListAdapter( val itemSize = AppUtils.getDimension(R.dimen.chat_message_popup_item_height).toInt() var totalSize = itemSize * 7 if (chatMessage.chatRoom.hasCapability( - ChatRoomCapabilities.OneToOne.toInt() + ChatRoom.Capabilities.OneToOne.toInt() ) ) { // No message id diff --git a/app/src/main/java/org/linphone/activities/main/chat/data/ChatRoomData.kt b/app/src/main/java/org/linphone/activities/main/chat/data/ChatRoomData.kt index 80cad7923..96d63b7f9 100644 --- a/app/src/main/java/org/linphone/activities/main/chat/data/ChatRoomData.kt +++ b/app/src/main/java/org/linphone/activities/main/chat/data/ChatRoomData.kt @@ -42,7 +42,7 @@ import org.linphone.utils.TimestampUtils class ChatRoomData(val chatRoom: ChatRoom) : ContactDataInterface { override val contact: MutableLiveData = MutableLiveData() override val displayName: MutableLiveData = MutableLiveData() - override val securityLevel: MutableLiveData = MutableLiveData() + override val securityLevel: MutableLiveData = MutableLiveData() override val showGroupChatAvatar: Boolean get() = !oneToOneChatRoom override val presenceStatus: MutableLiveData = MutableLiveData() @@ -71,15 +71,15 @@ class ChatRoomData(val chatRoom: ChatRoom) : ContactDataInterface { val notificationsMuted = MutableLiveData() private val basicChatRoom: Boolean by lazy { - chatRoom.hasCapability(ChatRoomCapabilities.Basic.toInt()) + chatRoom.hasCapability(ChatRoom.Capabilities.Basic.toInt()) } val oneToOneChatRoom: Boolean by lazy { - chatRoom.hasCapability(ChatRoomCapabilities.OneToOne.toInt()) + chatRoom.hasCapability(ChatRoom.Capabilities.OneToOne.toInt()) } val encryptedChatRoom: Boolean by lazy { - chatRoom.hasCapability(ChatRoomCapabilities.Encrypted.toInt()) + chatRoom.hasCapability(ChatRoom.Capabilities.Encrypted.toInt()) } val contactNewlyFoundEvent: MutableLiveData> by lazy { @@ -131,13 +131,13 @@ class ChatRoomData(val chatRoom: ChatRoom) : ContactDataInterface { securityLevel.value = level securityLevelIcon.value = when (level) { - ChatRoomSecurityLevel.Safe -> R.drawable.security_2_indicator - ChatRoomSecurityLevel.Encrypted -> R.drawable.security_1_indicator + ChatRoom.SecurityLevel.Safe -> R.drawable.security_2_indicator + ChatRoom.SecurityLevel.Encrypted -> R.drawable.security_1_indicator else -> R.drawable.security_alert_indicator } securityLevelContentDescription.value = when (level) { - ChatRoomSecurityLevel.Safe -> R.string.content_description_security_level_safe - ChatRoomSecurityLevel.Encrypted -> R.string.content_description_security_level_encrypted + ChatRoom.SecurityLevel.Safe -> R.string.content_description_security_level_safe + ChatRoom.SecurityLevel.Encrypted -> R.string.content_description_security_level_encrypted else -> R.string.content_description_security_level_unsafe } } diff --git a/app/src/main/java/org/linphone/activities/main/chat/data/DevicesListChildData.kt b/app/src/main/java/org/linphone/activities/main/chat/data/DevicesListChildData.kt index 3052871d9..e7216c946 100644 --- a/app/src/main/java/org/linphone/activities/main/chat/data/DevicesListChildData.kt +++ b/app/src/main/java/org/linphone/activities/main/chat/data/DevicesListChildData.kt @@ -21,7 +21,7 @@ package org.linphone.activities.main.chat.data import org.linphone.LinphoneApplication.Companion.coreContext import org.linphone.R -import org.linphone.core.ChatRoomSecurityLevel +import org.linphone.core.ChatRoom import org.linphone.core.ParticipantDevice class DevicesListChildData(private val device: ParticipantDevice) { @@ -29,16 +29,16 @@ class DevicesListChildData(private val device: ParticipantDevice) { val securityLevelIcon: Int by lazy { when (device.securityLevel) { - ChatRoomSecurityLevel.Safe -> R.drawable.security_2_indicator - ChatRoomSecurityLevel.Encrypted -> R.drawable.security_1_indicator + ChatRoom.SecurityLevel.Safe -> R.drawable.security_2_indicator + ChatRoom.SecurityLevel.Encrypted -> R.drawable.security_1_indicator else -> R.drawable.security_alert_indicator } } val securityContentDescription: Int by lazy { when (device.securityLevel) { - ChatRoomSecurityLevel.Safe -> R.string.content_description_security_level_safe - ChatRoomSecurityLevel.Encrypted -> R.string.content_description_security_level_encrypted + ChatRoom.SecurityLevel.Safe -> R.string.content_description_security_level_safe + ChatRoom.SecurityLevel.Encrypted -> R.string.content_description_security_level_encrypted else -> R.string.content_description_security_level_unsafe } } diff --git a/app/src/main/java/org/linphone/activities/main/chat/data/DevicesListGroupData.kt b/app/src/main/java/org/linphone/activities/main/chat/data/DevicesListGroupData.kt index e3febca66..c8620c03b 100644 --- a/app/src/main/java/org/linphone/activities/main/chat/data/DevicesListGroupData.kt +++ b/app/src/main/java/org/linphone/activities/main/chat/data/DevicesListGroupData.kt @@ -23,7 +23,7 @@ import androidx.lifecycle.MutableLiveData import org.linphone.LinphoneApplication.Companion.coreContext import org.linphone.R import org.linphone.contact.GenericContactData -import org.linphone.core.ChatRoomSecurityLevel +import org.linphone.core.ChatRoom import org.linphone.core.Participant import org.linphone.utils.LinphoneUtils @@ -32,16 +32,16 @@ class DevicesListGroupData(private val participant: Participant) : GenericContac ) { val securityLevelIcon: Int by lazy { when (participant.securityLevel) { - ChatRoomSecurityLevel.Safe -> R.drawable.security_2_indicator - ChatRoomSecurityLevel.Encrypted -> R.drawable.security_1_indicator + ChatRoom.SecurityLevel.Safe -> R.drawable.security_2_indicator + ChatRoom.SecurityLevel.Encrypted -> R.drawable.security_1_indicator else -> R.drawable.security_alert_indicator } } val securityLevelContentDescription: Int by lazy { when (participant.securityLevel) { - ChatRoomSecurityLevel.Safe -> R.string.content_description_security_level_safe - ChatRoomSecurityLevel.Encrypted -> R.string.content_description_security_level_encrypted + ChatRoom.SecurityLevel.Safe -> R.string.content_description_security_level_safe + ChatRoom.SecurityLevel.Encrypted -> R.string.content_description_security_level_encrypted else -> R.string.content_description_security_level_unsafe } } diff --git a/app/src/main/java/org/linphone/activities/main/chat/data/GroupInfoParticipantData.kt b/app/src/main/java/org/linphone/activities/main/chat/data/GroupInfoParticipantData.kt index adfb37949..977fca139 100644 --- a/app/src/main/java/org/linphone/activities/main/chat/data/GroupInfoParticipantData.kt +++ b/app/src/main/java/org/linphone/activities/main/chat/data/GroupInfoParticipantData.kt @@ -23,7 +23,7 @@ import androidx.lifecycle.MutableLiveData import org.linphone.R import org.linphone.activities.main.chat.GroupChatRoomMember import org.linphone.contact.GenericContactData -import org.linphone.core.ChatRoomSecurityLevel +import org.linphone.core.ChatRoom import org.linphone.utils.LinphoneUtils class GroupInfoParticipantData(val participant: GroupChatRoomMember) : GenericContactData( @@ -40,16 +40,16 @@ class GroupInfoParticipantData(val participant: GroupChatRoomMember) : GenericCo val securityLevelIcon: Int by lazy { when (participant.securityLevel) { - ChatRoomSecurityLevel.Safe -> R.drawable.security_2_indicator - ChatRoomSecurityLevel.Encrypted -> R.drawable.security_1_indicator + ChatRoom.SecurityLevel.Safe -> R.drawable.security_2_indicator + ChatRoom.SecurityLevel.Encrypted -> R.drawable.security_1_indicator else -> R.drawable.security_alert_indicator } } val securityLevelContentDescription: Int by lazy { when (participant.securityLevel) { - ChatRoomSecurityLevel.Safe -> R.string.content_description_security_level_safe - ChatRoomSecurityLevel.Encrypted -> R.string.content_description_security_level_encrypted + ChatRoom.SecurityLevel.Safe -> R.string.content_description_security_level_safe + ChatRoom.SecurityLevel.Encrypted -> R.string.content_description_security_level_encrypted else -> R.string.content_description_security_level_unsafe } } diff --git a/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt b/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt index 45e0d1b02..2283d648e 100644 --- a/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt +++ b/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt @@ -1058,7 +1058,7 @@ class DetailChatRoomFragment : MasterFragment() { adapter = GroupInfoParticipantsAdapter( viewLifecycleOwner, - chatRoom?.hasCapability(ChatRoomCapabilities.Encrypted.toInt()) ?: (viewModel.isEncrypted.value == true) + chatRoom?.hasCapability(ChatRoom.Capabilities.Encrypted.toInt()) ?: (viewModel.isEncrypted.value == true) ) binding.participants.adapter = adapter diff --git a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatMessageSendingViewModel.kt b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatMessageSendingViewModel.kt index 2323d78f1..1ebe33d4c 100644 --- a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatMessageSendingViewModel.kt +++ b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatMessageSendingViewModel.kt @@ -96,7 +96,7 @@ class ChatMessageSendingViewModel(private val chatRoom: ChatRoom) : ViewModel() val voiceRecordPlayingPosition = MutableLiveData() - val imeFlags: Int = if (chatRoom.hasCapability(ChatRoomCapabilities.Encrypted.toInt())) { + val imeFlags: Int = if (chatRoom.hasCapability(ChatRoom.Capabilities.Encrypted.toInt())) { // IME_FLAG_NO_PERSONALIZED_LEARNING is only available on Android 8 and newer Compatibility.getImeFlagsForSecureChatRoom() } else { @@ -157,7 +157,7 @@ class ChatMessageSendingViewModel(private val chatRoom: ChatRoom) : ViewModel() } if (this::recorder.isInitialized) { - if (recorder.state != RecorderState.Closed) { + if (recorder.state != Recorder.State.Closed) { recorder.close() } } @@ -246,7 +246,7 @@ class ChatMessageSendingViewModel(private val chatRoom: ChatRoom) : ViewModel() } val message = createChatMessage() - val isBasicChatRoom: Boolean = chatRoom.hasCapability(ChatRoomCapabilities.Basic.toInt()) + val isBasicChatRoom: Boolean = chatRoom.hasCapability(ChatRoom.Capabilities.Basic.toInt()) var voiceRecord = false if (isPendingVoiceRecord.value == true && recorder.file != null) { @@ -366,14 +366,14 @@ class ChatMessageSendingViewModel(private val chatRoom: ChatRoom) : ViewModel() } when (recorder.state) { - RecorderState.Running -> Log.w("[Chat Message Sending] Recorder is already recording") - RecorderState.Paused -> { + Recorder.State.Running -> Log.w("[Chat Message Sending] Recorder is already recording") + Recorder.State.Paused -> { Log.w("[Chat Message Sending] Recorder isn't closed, resuming recording") recorder.start() } - RecorderState.Closed -> { + Recorder.State.Closed -> { val extension = when (recorder.params.fileFormat) { - RecorderFileFormat.Mkv -> "mkv" + Recorder.FileFormat.Mkv -> "mkv" else -> "wav" } val tempFileName = "voice-recording-${System.currentTimeMillis()}.$extension" @@ -415,7 +415,7 @@ class ChatMessageSendingViewModel(private val chatRoom: ChatRoom) : ViewModel() } fun cancelVoiceRecording() { - if (recorder.state != RecorderState.Closed) { + if (recorder.state != Recorder.State.Closed) { Log.i("[Chat Message Sending] Closing voice recorder") recorder.close() @@ -442,7 +442,7 @@ class ChatMessageSendingViewModel(private val chatRoom: ChatRoom) : ViewModel() } private fun stopVoiceRecorder() { - if (recorder.state == RecorderState.Running) { + if (recorder.state == Recorder.State.Running) { Log.i("[Chat Message Sending] Pausing / closing voice recorder") recorder.pause() recorder.close() @@ -516,9 +516,9 @@ class ChatMessageSendingViewModel(private val chatRoom: ChatRoom) : ViewModel() Log.i("[Chat Message Sending] Creating recorder for voice message") val recorderParams = coreContext.core.createRecorderParams() if (corePreferences.voiceMessagesFormatMkv) { - recorderParams.fileFormat = RecorderFileFormat.Mkv + recorderParams.fileFormat = Recorder.FileFormat.Mkv } else { - recorderParams.fileFormat = RecorderFileFormat.Wav + recorderParams.fileFormat = Recorder.FileFormat.Wav } val recordingAudioDevice = AudioRouteUtils.getAudioRecordingDeviceForVoiceMessage() @@ -580,7 +580,7 @@ class ChatMessageSendingViewModel(private val chatRoom: ChatRoom) : ViewModel() private fun updateChatRoomReadOnlyState() { isReadOnly.value = chatRoom.isReadOnly || ( chatRoom.hasCapability( - ChatRoomCapabilities.Conference.toInt() + ChatRoom.Capabilities.Conference.toInt() ) && chatRoom.participants.isEmpty() ) } diff --git a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatMessagesListViewModel.kt b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatMessagesListViewModel.kt index 976ba5880..cc3cdad16 100644 --- a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatMessagesListViewModel.kt +++ b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatMessagesListViewModel.kt @@ -95,13 +95,13 @@ class ChatMessagesListViewModel(private val chatRoom: ChatRoom) : ViewModel() { } override fun onConferenceJoined(chatRoom: ChatRoom, eventLog: EventLog) { - if (!chatRoom.hasCapability(ChatRoomCapabilities.OneToOne.toInt())) { + if (!chatRoom.hasCapability(ChatRoom.Capabilities.OneToOne.toInt())) { addEvent(eventLog) } } override fun onConferenceLeft(chatRoom: ChatRoom, eventLog: EventLog) { - if (!chatRoom.hasCapability(ChatRoomCapabilities.OneToOne.toInt())) { + if (!chatRoom.hasCapability(ChatRoom.Capabilities.OneToOne.toInt())) { addEvent(eventLog) } } diff --git a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatRoomCreationViewModel.kt b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatRoomCreationViewModel.kt index d6ea68369..56d6ab24e 100644 --- a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatRoomCreationViewModel.kt +++ b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatRoomCreationViewModel.kt @@ -94,15 +94,15 @@ class ChatRoomCreationViewModel : ContactsSelectionViewModel() { val encrypted = secureChatMandatory || isEncrypted.value == true val params: ChatRoomParams = coreContext.core.createDefaultChatRoomParams() - params.backend = ChatRoomBackend.Basic + params.backend = ChatRoom.Backend.Basic params.isGroupEnabled = false if (encrypted) { params.isEncryptionEnabled = true - params.backend = ChatRoomBackend.FlexisipChat + params.backend = ChatRoom.Backend.FlexisipChat params.ephemeralMode = if (corePreferences.useEphemeralPerDeviceMode) { - ChatRoomEphemeralMode.DeviceManaged + ChatRoom.EphemeralMode.DeviceManaged } else { - ChatRoomEphemeralMode.AdminManaged + ChatRoom.EphemeralMode.AdminManaged } params.ephemeralLifetime = 0 // Make sure ephemeral is disabled by default Log.i( diff --git a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatRoomViewModel.kt b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatRoomViewModel.kt index 42d447c0d..47887665c 100644 --- a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatRoomViewModel.kt +++ b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatRoomViewModel.kt @@ -49,7 +49,7 @@ class ChatRoomViewModelFactory(private val chatRoom: ChatRoom) : class ChatRoomViewModel(val chatRoom: ChatRoom) : ViewModel(), ContactDataInterface { override val contact: MutableLiveData = MutableLiveData() override val displayName: MutableLiveData = MutableLiveData() - override val securityLevel: MutableLiveData = MutableLiveData() + override val securityLevel: MutableLiveData = MutableLiveData() override val showGroupChatAvatar: Boolean get() = conferenceChatRoom && !oneToOneChatRoom override val presenceStatus: MutableLiveData = MutableLiveData() @@ -74,23 +74,23 @@ class ChatRoomViewModel(val chatRoom: ChatRoom) : ViewModel(), ContactDataInterf val ephemeralEnabled = MutableLiveData() val basicChatRoom: Boolean by lazy { - chatRoom.hasCapability(ChatRoomCapabilities.Basic.toInt()) + chatRoom.hasCapability(ChatRoom.Capabilities.Basic.toInt()) } val oneToOneChatRoom: Boolean by lazy { - chatRoom.hasCapability(ChatRoomCapabilities.OneToOne.toInt()) + chatRoom.hasCapability(ChatRoom.Capabilities.OneToOne.toInt()) } private val conferenceChatRoom: Boolean by lazy { - chatRoom.hasCapability(ChatRoomCapabilities.Conference.toInt()) + chatRoom.hasCapability(ChatRoom.Capabilities.Conference.toInt()) } val encryptedChatRoom: Boolean by lazy { - chatRoom.hasCapability(ChatRoomCapabilities.Encrypted.toInt()) + chatRoom.hasCapability(ChatRoom.Capabilities.Encrypted.toInt()) } val ephemeralChatRoom: Boolean by lazy { - chatRoom.hasCapability(ChatRoomCapabilities.Ephemeral.toInt()) + chatRoom.hasCapability(ChatRoom.Capabilities.Ephemeral.toInt()) } val meAdmin: MutableLiveData by lazy { @@ -387,13 +387,13 @@ class ChatRoomViewModel(val chatRoom: ChatRoom) : ViewModel(), ContactDataInterf securityLevel.value = level securityLevelIcon.value = when (level) { - ChatRoomSecurityLevel.Safe -> R.drawable.security_2_indicator - ChatRoomSecurityLevel.Encrypted -> R.drawable.security_1_indicator + ChatRoom.SecurityLevel.Safe -> R.drawable.security_2_indicator + ChatRoom.SecurityLevel.Encrypted -> R.drawable.security_1_indicator else -> R.drawable.security_alert_indicator } securityLevelContentDescription.value = when (level) { - ChatRoomSecurityLevel.Safe -> R.string.content_description_security_level_safe - ChatRoomSecurityLevel.Encrypted -> R.string.content_description_security_level_encrypted + ChatRoom.SecurityLevel.Safe -> R.string.content_description_security_level_safe + ChatRoom.SecurityLevel.Encrypted -> R.string.content_description_security_level_encrypted else -> R.string.content_description_security_level_unsafe } } diff --git a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/GroupInfoViewModel.kt b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/GroupInfoViewModel.kt index 9084e6899..ffeef03c8 100644 --- a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/GroupInfoViewModel.kt +++ b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/GroupInfoViewModel.kt @@ -100,7 +100,7 @@ class GroupInfoViewModel(val chatRoom: ChatRoom?) : MessageNotifierViewModel() { isMeAdmin.value = chatRoom == null || (chatRoom.me?.isAdmin == true && !chatRoom.isReadOnly) canLeaveGroup.value = chatRoom != null && !chatRoom.isReadOnly isEncrypted.value = corePreferences.forceEndToEndEncryptedChat || chatRoom?.hasCapability( - ChatRoomCapabilities.Encrypted.toInt() + ChatRoom.Capabilities.Encrypted.toInt() ) == true if (chatRoom != null) updateParticipants() @@ -123,9 +123,9 @@ class GroupInfoViewModel(val chatRoom: ChatRoom?) : MessageNotifierViewModel() { params.isGroupEnabled = true if (params.isEncryptionEnabled) { params.ephemeralMode = if (corePreferences.useEphemeralPerDeviceMode) { - ChatRoomEphemeralMode.DeviceManaged + ChatRoom.EphemeralMode.DeviceManaged } else { - ChatRoomEphemeralMode.AdminManaged + ChatRoom.EphemeralMode.AdminManaged } } params.ephemeralLifetime = 0 // Make sure ephemeral is disabled by default diff --git a/app/src/main/java/org/linphone/activities/main/conference/viewmodels/ConferenceWaitingRoomViewModel.kt b/app/src/main/java/org/linphone/activities/main/conference/viewmodels/ConferenceWaitingRoomViewModel.kt index d1bf3de75..72562512f 100644 --- a/app/src/main/java/org/linphone/activities/main/conference/viewmodels/ConferenceWaitingRoomViewModel.kt +++ b/app/src/main/java/org/linphone/activities/main/conference/viewmodels/ConferenceWaitingRoomViewModel.kt @@ -337,7 +337,7 @@ class ConferenceWaitingRoomViewModel : MessageNotifierViewModel() { fun setMosaicLayout() { Log.i("[Conference Waiting Room] Set default layout to Mosaic") - callParams.conferenceVideoLayout = ConferenceLayout.Grid + callParams.conferenceVideoLayout = Conference.Layout.Grid callParams.isVideoEnabled = isVideoAvailableInCore() updateLayout() @@ -350,7 +350,7 @@ class ConferenceWaitingRoomViewModel : MessageNotifierViewModel() { fun setActiveSpeakerLayout() { Log.i("[Conference Waiting Room] Set default layout to ActiveSpeaker") - callParams.conferenceVideoLayout = ConferenceLayout.ActiveSpeaker + callParams.conferenceVideoLayout = Conference.Layout.ActiveSpeaker callParams.isVideoEnabled = isVideoAvailableInCore() updateLayout() @@ -437,7 +437,7 @@ class ConferenceWaitingRoomViewModel : MessageNotifierViewModel() { selectedLayout.value = ConferenceDisplayMode.AUDIO_ONLY } else { selectedLayout.value = when (callParams.conferenceVideoLayout) { - ConferenceLayout.Grid -> ConferenceDisplayMode.GRID + Conference.Layout.Grid -> ConferenceDisplayMode.GRID else -> ConferenceDisplayMode.ACTIVE_SPEAKER } } diff --git a/app/src/main/java/org/linphone/activities/main/contact/data/ContactEditorData.kt b/app/src/main/java/org/linphone/activities/main/contact/data/ContactEditorData.kt index d1ef3ce6c..2b545fd57 100644 --- a/app/src/main/java/org/linphone/activities/main/contact/data/ContactEditorData.kt +++ b/app/src/main/java/org/linphone/activities/main/contact/data/ContactEditorData.kt @@ -31,7 +31,7 @@ import org.linphone.LinphoneApplication.Companion.coreContext import org.linphone.LinphoneApplication.Companion.corePreferences import org.linphone.R import org.linphone.contact.* -import org.linphone.core.ChatRoomSecurityLevel +import org.linphone.core.ChatRoom.SecurityLevel import org.linphone.core.ConsolidatedPresence import org.linphone.core.Friend import org.linphone.core.tools.Log @@ -42,7 +42,7 @@ import org.linphone.utils.PermissionHelper class ContactEditorData(val friend: Friend?) : ContactDataInterface { override val contact: MutableLiveData = MutableLiveData() override val displayName: MutableLiveData = MutableLiveData() - override val securityLevel: MutableLiveData = MutableLiveData() + override val securityLevel: MutableLiveData = MutableLiveData() override val presenceStatus: MutableLiveData = MutableLiveData() override val coroutineScope: CoroutineScope = coreContext.coroutineScope diff --git a/app/src/main/java/org/linphone/activities/main/contact/viewmodels/ContactViewModel.kt b/app/src/main/java/org/linphone/activities/main/contact/viewmodels/ContactViewModel.kt index 4489714ec..8d9fb8ec3 100644 --- a/app/src/main/java/org/linphone/activities/main/contact/viewmodels/ContactViewModel.kt +++ b/app/src/main/java/org/linphone/activities/main/contact/viewmodels/ContactViewModel.kt @@ -53,7 +53,7 @@ class ContactViewModelFactory(private val friend: Friend) : class ContactViewModel(friend: Friend, async: Boolean = false) : MessageNotifierViewModel(), ContactDataInterface { override val contact: MutableLiveData = MutableLiveData() override val displayName: MutableLiveData = MutableLiveData() - override val securityLevel: MutableLiveData = MutableLiveData() + override val securityLevel: MutableLiveData = MutableLiveData() override val presenceStatus: MutableLiveData = MutableLiveData() override val coroutineScope: CoroutineScope = viewModelScope @@ -218,7 +218,7 @@ class ContactViewModel(friend: Friend, async: Boolean = false) : MessageNotifier val hasLimeCapability = corePreferences.allowEndToEndEncryptedChatWithoutPresence || ( friend.getPresenceModelForUriOrTel( value - )?.hasCapability(FriendCapability.LimeX3Dh) ?: false + )?.hasCapability(Friend.Capability.LimeX3Dh) ?: false ) val secureChatAllowed = LinphoneUtils.isEndToEndEncryptedChatAvailable() && !isMe && hasLimeCapability val displayValue = if (coreContext.core.defaultAccount?.params?.domain == address.domain) (address.username ?: value) else value @@ -249,7 +249,7 @@ class ContactViewModel(friend: Friend, async: Boolean = false) : MessageNotifier val hasLimeCapability = corePreferences.allowEndToEndEncryptedChatWithoutPresence || ( friend.getPresenceModelForUriOrTel( number - )?.hasCapability(FriendCapability.LimeX3Dh) ?: false + )?.hasCapability(Friend.Capability.LimeX3Dh) ?: false ) val secureChatAllowed = LinphoneUtils.isEndToEndEncryptedChatAvailable() && !isMe && hasLimeCapability val label = PhoneNumberUtils.vcardParamStringToAddressBookLabel( diff --git a/app/src/main/java/org/linphone/activities/main/contact/viewmodels/ContactsListViewModel.kt b/app/src/main/java/org/linphone/activities/main/contact/viewmodels/ContactsListViewModel.kt index 24f6b6e0d..e71ee6bde 100644 --- a/app/src/main/java/org/linphone/activities/main/contact/viewmodels/ContactsListViewModel.kt +++ b/app/src/main/java/org/linphone/activities/main/contact/viewmodels/ContactsListViewModel.kt @@ -119,8 +119,8 @@ class ContactsListViewModel : ViewModel() { previousFilter = filterValue val domain = if (sipContactsSelected.value == true) coreContext.core.defaultAccount?.params?.domain ?: "" else "" - val filter = MagicSearchSource.Friends.toInt() or MagicSearchSource.LdapServers.toInt() - val aggregation = MagicSearchAggregation.Friend + val filter = MagicSearch.Source.Friends.toInt() or MagicSearch.Source.LdapServers.toInt() + val aggregation = MagicSearch.Aggregation.Friend searchResultsPending = true fastFetchJob?.cancel() Log.i( diff --git a/app/src/main/java/org/linphone/activities/main/history/viewmodels/CallLogViewModel.kt b/app/src/main/java/org/linphone/activities/main/history/viewmodels/CallLogViewModel.kt index a2053cb96..75da8a63f 100644 --- a/app/src/main/java/org/linphone/activities/main/history/viewmodels/CallLogViewModel.kt +++ b/app/src/main/java/org/linphone/activities/main/history/viewmodels/CallLogViewModel.kt @@ -110,7 +110,7 @@ class CallLogViewModel(val callLog: CallLog, private val isRelated: Boolean = fa corePreferences.allowEndToEndEncryptedChatWithoutPresence || ( contact.value?.getPresenceModelForUriOrTel( peerSipUri - )?.hasCapability(FriendCapability.LimeX3Dh) ?: false + )?.hasCapability(Friend.Capability.LimeX3Dh) ?: false ) ) diff --git a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/ConferencesSettingsViewModel.kt b/app/src/main/java/org/linphone/activities/main/settings/viewmodels/ConferencesSettingsViewModel.kt index 52d1c005c..51db98b06 100644 --- a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/ConferencesSettingsViewModel.kt +++ b/app/src/main/java/org/linphone/activities/main/settings/viewmodels/ConferencesSettingsViewModel.kt @@ -22,12 +22,12 @@ package org.linphone.activities.main.settings.viewmodels import androidx.lifecycle.MutableLiveData import org.linphone.R import org.linphone.activities.main.settings.SettingListenerStub -import org.linphone.core.ConferenceLayout +import org.linphone.core.Conference.Layout class ConferencesSettingsViewModel : GenericSettingsViewModel() { val layoutListener = object : SettingListenerStub() { override fun onListValueChanged(position: Int) { - core.defaultConferenceLayout = ConferenceLayout.fromInt(layoutValues[position]) + core.defaultConferenceLayout = Layout.fromInt(layoutValues[position]) layoutIndex.value = position } } @@ -43,10 +43,10 @@ class ConferencesSettingsViewModel : GenericSettingsViewModel() { val labels = arrayListOf() labels.add(prefs.getString(R.string.conference_display_mode_active_speaker)) - layoutValues.add(ConferenceLayout.ActiveSpeaker.toInt()) + layoutValues.add(Layout.ActiveSpeaker.toInt()) labels.add(prefs.getString(R.string.conference_display_mode_mosaic)) - layoutValues.add(ConferenceLayout.Grid.toInt()) + layoutValues.add(Layout.Grid.toInt()) layoutLabels.value = labels layoutIndex.value = layoutValues.indexOf(core.defaultConferenceLayout.toInt()) diff --git a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/LdapSettingsViewModel.kt b/app/src/main/java/org/linphone/activities/main/settings/viewmodels/LdapSettingsViewModel.kt index 0abd83f0c..b2fa74fbf 100644 --- a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/LdapSettingsViewModel.kt +++ b/app/src/main/java/org/linphone/activities/main/settings/viewmodels/LdapSettingsViewModel.kt @@ -27,9 +27,6 @@ import org.linphone.LinphoneApplication.Companion.coreContext import org.linphone.R import org.linphone.activities.main.settings.SettingListenerStub import org.linphone.core.Ldap -import org.linphone.core.LdapAuthMethod -import org.linphone.core.LdapCertVerificationMode -import org.linphone.core.LdapDebugLevel import org.linphone.core.tools.Log import org.linphone.utils.Event @@ -102,7 +99,7 @@ class LdapSettingsViewModel(private val ldap: Ldap, val index: String) : Generic val ldapAuthMethodListener = object : SettingListenerStub() { override fun onListValueChanged(position: Int) { val params = ldap.params.clone() - params.authMethod = LdapAuthMethod.fromInt(ldapAuthMethodValues[position]) + params.authMethod = Ldap.AuthMethod.fromInt(ldapAuthMethodValues[position]) ldap.params = params ldapAuthMethodIndex.value = position } @@ -123,7 +120,7 @@ class LdapSettingsViewModel(private val ldap: Ldap, val index: String) : Generic val ldapCertCheckListener = object : SettingListenerStub() { override fun onListValueChanged(position: Int) { val params = ldap.params.clone() - params.serverCertificatesVerificationMode = LdapCertVerificationMode.fromInt( + params.serverCertificatesVerificationMode = Ldap.CertVerificationMode.fromInt( ldapCertCheckValues[position] ) ldap.params = params @@ -238,7 +235,7 @@ class LdapSettingsViewModel(private val ldap: Ldap, val index: String) : Generic val ldapDebugListener = object : SettingListenerStub() { override fun onBoolValueChanged(newValue: Boolean) { val params = ldap.params.clone() - params.debugLevel = if (newValue) LdapDebugLevel.Verbose else LdapDebugLevel.Off + params.debugLevel = if (newValue) Ldap.DebugLevel.Verbose else Ldap.DebugLevel.Off ldap.params = params } } @@ -261,7 +258,7 @@ class LdapSettingsViewModel(private val ldap: Ldap, val index: String) : Generic ldapNameAttribute.value = params.nameAttribute ldapSipAttribute.value = params.sipAttribute ldapSipDomain.value = params.sipDomain - ldapDebug.value = params.debugLevel == LdapDebugLevel.Verbose + ldapDebug.value = params.debugLevel == Ldap.DebugLevel.Verbose initAuthMethodList() initTlsCertCheckList() @@ -271,10 +268,10 @@ class LdapSettingsViewModel(private val ldap: Ldap, val index: String) : Generic val labels = arrayListOf() labels.add(prefs.getString(R.string.contacts_settings_ldap_auth_method_anonymous)) - ldapAuthMethodValues.add(LdapAuthMethod.Anonymous.toInt()) + ldapAuthMethodValues.add(Ldap.AuthMethod.Anonymous.toInt()) labels.add(prefs.getString(R.string.contacts_settings_ldap_auth_method_simple)) - ldapAuthMethodValues.add(LdapAuthMethod.Simple.toInt()) + ldapAuthMethodValues.add(Ldap.AuthMethod.Simple.toInt()) ldapAuthMethodLabels.value = labels ldapAuthMethodIndex.value = ldapAuthMethodValues.indexOf(ldap.params.authMethod.toInt()) @@ -284,13 +281,13 @@ class LdapSettingsViewModel(private val ldap: Ldap, val index: String) : Generic val labels = arrayListOf() labels.add(prefs.getString(R.string.contacts_settings_ldap_cert_check_auto)) - ldapCertCheckValues.add(LdapCertVerificationMode.Default.toInt()) + ldapCertCheckValues.add(Ldap.CertVerificationMode.Default.toInt()) labels.add(prefs.getString(R.string.contacts_settings_ldap_cert_check_disabled)) - ldapCertCheckValues.add(LdapCertVerificationMode.Disabled.toInt()) + ldapCertCheckValues.add(Ldap.CertVerificationMode.Disabled.toInt()) labels.add(prefs.getString(R.string.contacts_settings_ldap_cert_check_enabled)) - ldapCertCheckValues.add(LdapCertVerificationMode.Enabled.toInt()) + ldapCertCheckValues.add(Ldap.CertVerificationMode.Enabled.toInt()) ldapCertCheckLabels.value = labels ldapCertCheckIndex.value = ldapCertCheckValues.indexOf( diff --git a/app/src/main/java/org/linphone/activities/voip/data/ConferenceParticipantDeviceData.kt b/app/src/main/java/org/linphone/activities/voip/data/ConferenceParticipantDeviceData.kt index 887a9b832..78cf5e860 100644 --- a/app/src/main/java/org/linphone/activities/voip/data/ConferenceParticipantDeviceData.kt +++ b/app/src/main/java/org/linphone/activities/voip/data/ConferenceParticipantDeviceData.kt @@ -70,17 +70,17 @@ class ConferenceParticipantDeviceData( override fun onStateChanged( participantDevice: ParticipantDevice, - state: ParticipantDeviceState + state: ParticipantDevice.State ) { Log.i( "[Conference Participant Device] Participant [${participantDevice.address.asStringUriOnly()}] state has changed: $state" ) when (state) { - ParticipantDeviceState.Joining, ParticipantDeviceState.Alerting -> isJoining.value = true - ParticipantDeviceState.OnHold -> { + ParticipantDevice.State.Joining, ParticipantDevice.State.Alerting -> isJoining.value = true + ParticipantDevice.State.OnHold -> { isInConference.value = false } - ParticipantDeviceState.Present -> { + ParticipantDevice.State.Present -> { isJoining.value = false isInConference.value = true updateWindowId(textureView) @@ -135,7 +135,7 @@ class ConferenceParticipantDeviceData( isInConference.value = participantDevice.isInConference val state = participantDevice.state - isJoining.value = state == ParticipantDeviceState.Joining || state == ParticipantDeviceState.Alerting + isJoining.value = state == ParticipantDevice.State.Joining || state == ParticipantDevice.State.Alerting Log.i( "[Conference Participant Device] State for participant [${participantDevice.address.asStringUriOnly()}] is $state" ) diff --git a/app/src/main/java/org/linphone/activities/voip/data/StatItemData.kt b/app/src/main/java/org/linphone/activities/voip/data/StatItemData.kt index 26374ee94..b69fd4edc 100644 --- a/app/src/main/java/org/linphone/activities/voip/data/StatItemData.kt +++ b/app/src/main/java/org/linphone/activities/voip/data/StatItemData.kt @@ -85,7 +85,7 @@ class StatItemData(val type: StatType) { StatType.DOWNLOAD_BW -> "${stats.downloadBandwidth} kbits/s" StatType.UPLOAD_BW -> "${stats.uploadBandwidth} kbits/s" StatType.ICE -> stats.iceState.toString() - StatType.IP_FAM -> if (stats.ipFamilyOfRemote == AddressFamily.Inet6) "IPv6" else "IPv4" + StatType.IP_FAM -> if (stats.ipFamilyOfRemote == Address.Family.Inet6) "IPv6" else "IPv4" StatType.SENDER_LOSS -> DecimalFormat("##.##%").format(stats.senderLossRate) StatType.RECEIVER_LOSS -> DecimalFormat("##.##%").format(stats.receiverLossRate) StatType.JITTER -> DecimalFormat("##.## ms").format(stats.jitterBufferSizeMs) diff --git a/app/src/main/java/org/linphone/activities/voip/viewmodels/ConferenceViewModel.kt b/app/src/main/java/org/linphone/activities/voip/viewmodels/ConferenceViewModel.kt index d7685e7a9..087632476 100644 --- a/app/src/main/java/org/linphone/activities/voip/viewmodels/ConferenceViewModel.kt +++ b/app/src/main/java/org/linphone/activities/voip/viewmodels/ConferenceViewModel.kt @@ -174,15 +174,15 @@ class ConferenceViewModel : ViewModel() { override fun onParticipantDeviceStateChanged( conference: Conference, device: ParticipantDevice, - state: ParticipantDeviceState + state: ParticipantDevice.State ) { if (conference.isMe(device.address)) { when (state) { - ParticipantDeviceState.Present -> { + ParticipantDevice.State.Present -> { Log.i("[Conference] Entered conference") isConferenceLocallyPaused.value = false } - ParticipantDeviceState.OnHold -> { + ParticipantDevice.State.OnHold -> { Log.i("[Conference] Left conference") isConferenceLocallyPaused.value = true } @@ -436,8 +436,8 @@ class ConferenceViewModel : ViewModel() { } params.conferenceVideoLayout = when (layout) { - ConferenceDisplayMode.GRID -> ConferenceLayout.Grid - else -> ConferenceLayout.ActiveSpeaker + ConferenceDisplayMode.GRID -> Conference.Layout.Grid + else -> Conference.Layout.ActiveSpeaker } call.update(params) @@ -464,7 +464,7 @@ class ConferenceViewModel : ViewModel() { ConferenceDisplayMode.AUDIO_ONLY } else { when (params.conferenceVideoLayout) { - ConferenceLayout.Grid -> ConferenceDisplayMode.GRID + Conference.Layout.Grid -> ConferenceDisplayMode.GRID else -> ConferenceDisplayMode.ACTIVE_SPEAKER } } diff --git a/app/src/main/java/org/linphone/contact/ContactDataInterface.kt b/app/src/main/java/org/linphone/contact/ContactDataInterface.kt index fe4e1ac1b..79ea8205a 100644 --- a/app/src/main/java/org/linphone/contact/ContactDataInterface.kt +++ b/app/src/main/java/org/linphone/contact/ContactDataInterface.kt @@ -25,7 +25,7 @@ import kotlinx.coroutines.CoroutineScope import org.linphone.LinphoneApplication.Companion.coreContext import org.linphone.activities.main.viewmodels.MessageNotifierViewModel import org.linphone.core.Address -import org.linphone.core.ChatRoomSecurityLevel +import org.linphone.core.ChatRoom.SecurityLevel import org.linphone.core.ConsolidatedPresence import org.linphone.core.Friend import org.linphone.utils.LinphoneUtils @@ -35,7 +35,7 @@ interface ContactDataInterface { val displayName: MutableLiveData - val securityLevel: MutableLiveData + val securityLevel: MutableLiveData val showGroupChatAvatar: Boolean get() = false @@ -48,12 +48,12 @@ interface ContactDataInterface { open class GenericContactData(private val sipAddress: Address) : ContactDataInterface { final override val contact: MutableLiveData = MutableLiveData() final override val displayName: MutableLiveData = MutableLiveData() - final override val securityLevel: MutableLiveData = MutableLiveData() + final override val securityLevel: MutableLiveData = MutableLiveData() final override val presenceStatus: MutableLiveData = MutableLiveData() final override val coroutineScope: CoroutineScope = coreContext.coroutineScope init { - securityLevel.value = ChatRoomSecurityLevel.ClearText + securityLevel.value = SecurityLevel.ClearText presenceStatus.value = ConsolidatedPresence.Offline contactLookup() } @@ -78,12 +78,12 @@ open class GenericContactData(private val sipAddress: Address) : ContactDataInte abstract class GenericContactViewModel(private val sipAddress: Address) : MessageNotifierViewModel(), ContactDataInterface { final override val contact: MutableLiveData = MutableLiveData() final override val displayName: MutableLiveData = MutableLiveData() - final override val securityLevel: MutableLiveData = MutableLiveData() + final override val securityLevel: MutableLiveData = MutableLiveData() final override val presenceStatus: MutableLiveData = MutableLiveData() final override val coroutineScope: CoroutineScope = viewModelScope init { - securityLevel.value = ChatRoomSecurityLevel.ClearText + securityLevel.value = SecurityLevel.ClearText presenceStatus.value = ConsolidatedPresence.Offline contactLookup() } diff --git a/app/src/main/java/org/linphone/contact/ContactSelectionData.kt b/app/src/main/java/org/linphone/contact/ContactSelectionData.kt index acade9afd..94be145f5 100644 --- a/app/src/main/java/org/linphone/contact/ContactSelectionData.kt +++ b/app/src/main/java/org/linphone/contact/ContactSelectionData.kt @@ -28,7 +28,7 @@ import org.linphone.utils.LinphoneUtils class ContactSelectionData(private val searchResult: SearchResult) : ContactDataInterface { override val contact: MutableLiveData = MutableLiveData() override val displayName: MutableLiveData = MutableLiveData() - override val securityLevel: MutableLiveData = MutableLiveData() + override val securityLevel: MutableLiveData = MutableLiveData() override val presenceStatus: MutableLiveData = MutableLiveData() override val coroutineScope: CoroutineScope = coreContext.coroutineScope @@ -56,7 +56,7 @@ class ContactSelectionData(private val searchResult: SearchResult) : ContactData val hasLimeX3DHCapability: Boolean get() = LinphoneUtils.isEndToEndEncryptedChatAvailable() && searchResult.hasCapability( - FriendCapability.LimeX3Dh + Friend.Capability.LimeX3Dh ) init { diff --git a/app/src/main/java/org/linphone/contact/ContactsSelectionAdapter.kt b/app/src/main/java/org/linphone/contact/ContactsSelectionAdapter.kt index 988adf296..76cffca9d 100644 --- a/app/src/main/java/org/linphone/contact/ContactsSelectionAdapter.kt +++ b/app/src/main/java/org/linphone/contact/ContactsSelectionAdapter.kt @@ -30,7 +30,7 @@ import androidx.recyclerview.widget.RecyclerView import org.linphone.LinphoneApplication.Companion.coreContext import org.linphone.R import org.linphone.core.Address -import org.linphone.core.FriendCapability +import org.linphone.core.Friend.Capability import org.linphone.core.SearchResult import org.linphone.databinding.ContactSelectionCellBinding import org.linphone.utils.Event @@ -121,12 +121,12 @@ class ContactsSelectionAdapter( ) ?: false val limeCheck = !securityEnabled || ( securityEnabled && searchResult.hasCapability( - FriendCapability.LimeX3Dh + Capability.LimeX3Dh ) ) val groupCheck = !groupCapabilityRequired || ( groupCapabilityRequired && searchResult.hasCapability( - FriendCapability.GroupChat + Capability.GroupChat ) ) val disabled = if (searchResult.friend != null) !limeCheck || !groupCheck || isMyself else false // Generated entry from search filter diff --git a/app/src/main/java/org/linphone/contact/ContactsSelectionViewModel.kt b/app/src/main/java/org/linphone/contact/ContactsSelectionViewModel.kt index 5e754ed19..815bbffa5 100644 --- a/app/src/main/java/org/linphone/contact/ContactsSelectionViewModel.kt +++ b/app/src/main/java/org/linphone/contact/ContactsSelectionViewModel.kt @@ -100,8 +100,8 @@ open class ContactsSelectionViewModel : MessageNotifierViewModel() { coreContext.contactsManager.magicSearch.getContactsListAsync( filterValue, domain, - MagicSearchSource.All.toInt(), - MagicSearchAggregation.None + MagicSearch.Source.All.toInt(), + MagicSearch.Aggregation.None ) val spinnerDelay = corePreferences.delayBeforeShowingContactsSearchSpinner.toLong() diff --git a/app/src/main/java/org/linphone/notifications/NotificationsManager.kt b/app/src/main/java/org/linphone/notifications/NotificationsManager.kt index df4a30389..b301d63ec 100644 --- a/app/src/main/java/org/linphone/notifications/NotificationsManager.kt +++ b/app/src/main/java/org/linphone/notifications/NotificationsManager.kt @@ -792,7 +792,7 @@ class NotificationsManager(private val context: Context) { notifiable.messages.add(notifiableMessage) } - if (room.hasCapability(ChatRoomCapabilities.OneToOne.toInt())) { + if (room.hasCapability(ChatRoom.Capabilities.OneToOne.toInt())) { notifiable.isGroup = false } else { notifiable.isGroup = true diff --git a/app/src/main/java/org/linphone/utils/LinphoneUtils.kt b/app/src/main/java/org/linphone/utils/LinphoneUtils.kt index 1d4f47857..a2d848c27 100644 --- a/app/src/main/java/org/linphone/utils/LinphoneUtils.kt +++ b/app/src/main/java/org/linphone/utils/LinphoneUtils.kt @@ -133,11 +133,11 @@ class LinphoneUtils { val params = core.createDefaultChatRoomParams() params.isGroupEnabled = false - params.backend = ChatRoomBackend.Basic + params.backend = ChatRoom.Backend.Basic if (isSecured) { params.subject = AppUtils.getString(R.string.chat_room_dummy_subject) params.isEncryptionEnabled = true - params.backend = ChatRoomBackend.FlexisipChat + params.backend = ChatRoom.Backend.FlexisipChat } val participants = arrayOf(participant) @@ -159,10 +159,10 @@ class LinphoneUtils { val chatRoomParams = coreContext.core.createDefaultChatRoomParams() chatRoomParams.isGroupEnabled = false if (isEndToEndEncryptedChatAvailable()) { - chatRoomParams.backend = ChatRoomBackend.FlexisipChat + chatRoomParams.backend = ChatRoom.Backend.FlexisipChat chatRoomParams.isEncryptionEnabled = true } else { - chatRoomParams.backend = ChatRoomBackend.Basic + chatRoomParams.backend = ChatRoom.Backend.Basic chatRoomParams.isEncryptionEnabled = false } chatRoomParams.subject = "Meeting invitation" // Won't be used diff --git a/app/src/main/java/org/linphone/utils/ShortcutsHelper.kt b/app/src/main/java/org/linphone/utils/ShortcutsHelper.kt index 2926c78d8..65ed4dd19 100644 --- a/app/src/main/java/org/linphone/utils/ShortcutsHelper.kt +++ b/app/src/main/java/org/linphone/utils/ShortcutsHelper.kt @@ -36,7 +36,7 @@ import org.linphone.activities.main.MainActivity import org.linphone.contact.getPerson import org.linphone.core.Address import org.linphone.core.ChatRoom -import org.linphone.core.ChatRoomCapabilities +import org.linphone.core.ChatRoom.Capabilities import org.linphone.core.Friend import org.linphone.core.tools.Log import org.linphone.mediastream.Version @@ -62,7 +62,7 @@ class ShortcutsHelper(val context: Context) { } val addresses: ArrayList
= arrayListOf(room.peerAddress) - if (!room.hasCapability(ChatRoomCapabilities.Basic.toInt())) { + if (!room.hasCapability(Capabilities.Basic.toInt())) { addresses.clear() for (participant in room.participants) { addresses.add(participant.address) @@ -169,7 +169,7 @@ class ShortcutsHelper(val context: Context) { val personsList = arrayListOf() val subject: String val icon: IconCompat - if (chatRoom.hasCapability(ChatRoomCapabilities.Basic.toInt())) { + if (chatRoom.hasCapability(Capabilities.Basic.toInt())) { val contact = coreContext.contactsManager.findContactByAddress(chatRoom.peerAddress) val person = contact?.getPerson() @@ -179,7 +179,7 @@ class ShortcutsHelper(val context: Context) { icon = person?.icon ?: coreContext.contactsManager.contactAvatar subject = contact?.name ?: LinphoneUtils.getDisplayName(chatRoom.peerAddress) - } else if (chatRoom.hasCapability(ChatRoomCapabilities.OneToOne.toInt()) && chatRoom.participants.isNotEmpty()) { + } else if (chatRoom.hasCapability(Capabilities.OneToOne.toInt()) && chatRoom.participants.isNotEmpty()) { val address = chatRoom.participants.first().address val contact = coreContext.contactsManager.findContactByAddress(address) diff --git a/app/src/main/res/layout/chat_room_group_info_participant_cell.xml b/app/src/main/res/layout/chat_room_group_info_participant_cell.xml index e41cadccb..820eee9b4 100644 --- a/app/src/main/res/layout/chat_room_group_info_participant_cell.xml +++ b/app/src/main/res/layout/chat_room_group_info_participant_cell.xml @@ -4,7 +4,7 @@ - + + android:visibility="@{isEncrypted && data.securityLevel == SecurityLevel.ClearText ? View.VISIBLE : View.GONE, default=gone}" /> + android:visibility="@{isEncrypted && data.securityLevel != SecurityLevel.ClearText ? View.VISIBLE : View.GONE, default=gone}" />