diff --git a/app/src/main/assets/assistant_linphone_default_values b/app/src/main/assets/assistant_linphone_default_values index f7561ee9b..9f2badee0 100644 --- a/app/src/main/assets/assistant_linphone_default_values +++ b/app/src/main/assets/assistant_linphone_default_values @@ -16,6 +16,7 @@ sip.linphone.org sip:conference-factory@sip.linphone.org 1 + 1
stun.linphone.org diff --git a/app/src/main/java/org/linphone/activities/assistant/fragments/QrCodeFragment.kt b/app/src/main/java/org/linphone/activities/assistant/fragments/QrCodeFragment.kt index 7b5a599e4..115ec375e 100644 --- a/app/src/main/java/org/linphone/activities/assistant/fragments/QrCodeFragment.kt +++ b/app/src/main/java/org/linphone/activities/assistant/fragments/QrCodeFragment.kt @@ -76,14 +76,14 @@ class QrCodeFragment : GenericFragment() { super.onResume() coreContext.core.nativePreviewWindowId = binding.qrCodeCaptureTexture - coreContext.core.enableQrcodeVideoPreview(true) - coreContext.core.enableVideoPreview(true) + coreContext.core.isQrcodeVideoPreviewEnabled = true + coreContext.core.isVideoPreviewEnabled = true } override fun onPause() { coreContext.core.nativePreviewWindowId = null - coreContext.core.enableQrcodeVideoPreview(false) - coreContext.core.enableVideoPreview(false) + coreContext.core.isQrcodeVideoPreviewEnabled = false + coreContext.core.isVideoPreviewEnabled = false super.onPause() } diff --git a/app/src/main/java/org/linphone/activities/call/IncomingCallActivity.kt b/app/src/main/java/org/linphone/activities/call/IncomingCallActivity.kt index 76fb75e3d..5ddc9b93d 100644 --- a/app/src/main/java/org/linphone/activities/call/IncomingCallActivity.kt +++ b/app/src/main/java/org/linphone/activities/call/IncomingCallActivity.kt @@ -139,7 +139,7 @@ class IncomingCallActivity : GenericActivity() { permissionsRequiredList.add(Manifest.permission.RECORD_AUDIO) } - if (viewModel.call.currentParams.videoEnabled() && !PermissionHelper.get().hasCameraPermission()) { + if (viewModel.call.currentParams.isVideoEnabled && !PermissionHelper.get().hasCameraPermission()) { Log.i("[Incoming Call Activity] Asking for CAMERA permission") permissionsRequiredList.add(Manifest.permission.CAMERA) } diff --git a/app/src/main/java/org/linphone/activities/call/OutgoingCallActivity.kt b/app/src/main/java/org/linphone/activities/call/OutgoingCallActivity.kt index b4223f928..c5ba36007 100644 --- a/app/src/main/java/org/linphone/activities/call/OutgoingCallActivity.kt +++ b/app/src/main/java/org/linphone/activities/call/OutgoingCallActivity.kt @@ -179,7 +179,7 @@ class OutgoingCallActivity : ProximitySensorActivity() { Log.i("[Outgoing Call Activity] Asking for RECORD_AUDIO permission") permissionsRequiredList.add(Manifest.permission.RECORD_AUDIO) } - if (viewModel.call.currentParams.videoEnabled() && !PermissionHelper.get().hasCameraPermission()) { + if (viewModel.call.currentParams.isVideoEnabled && !PermissionHelper.get().hasCameraPermission()) { Log.i("[Outgoing Call Activity] Asking for CAMERA permission") permissionsRequiredList.add(Manifest.permission.CAMERA) } diff --git a/app/src/main/java/org/linphone/activities/call/data/CallStatisticsData.kt b/app/src/main/java/org/linphone/activities/call/data/CallStatisticsData.kt index b99754158..bbfe7a887 100644 --- a/app/src/main/java/org/linphone/activities/call/data/CallStatisticsData.kt +++ b/app/src/main/java/org/linphone/activities/call/data/CallStatisticsData.kt @@ -36,7 +36,7 @@ class CallStatisticsData(val call: Call) : GenericContactData(call.remoteAddress private val listener = object : CoreListenerStub() { override fun onCallStatsUpdated(core: Core, call: Call, stats: CallStats) { if (call == this@CallStatisticsData.call) { - isVideoEnabled.value = call.currentParams.videoEnabled() + isVideoEnabled.value = call.currentParams.isVideoEnabled updateCallStats(stats) } } @@ -50,7 +50,7 @@ class CallStatisticsData(val call: Call) : GenericContactData(call.remoteAddress initCallStats() - val videoEnabled = call.currentParams.videoEnabled() + val videoEnabled = call.currentParams.isVideoEnabled isVideoEnabled.value = videoEnabled isExpanded.value = coreContext.core.currentCall == call diff --git a/app/src/main/java/org/linphone/activities/call/fragments/ControlsFragment.kt b/app/src/main/java/org/linphone/activities/call/fragments/ControlsFragment.kt index 674b31ee8..8c8f89640 100644 --- a/app/src/main/java/org/linphone/activities/call/fragments/ControlsFragment.kt +++ b/app/src/main/java/org/linphone/activities/call/fragments/ControlsFragment.kt @@ -126,8 +126,8 @@ class ControlsFragment : GenericFragment() { if (call.state == Call.State.StreamsRunning) { dialog?.dismiss() } else if (call.state == Call.State.UpdatedByRemote) { - if (coreContext.core.videoCaptureEnabled() || coreContext.core.videoDisplayEnabled()) { - if (call.currentParams.videoEnabled() != call.remoteParams?.videoEnabled()) { + if (coreContext.core.isVideoCaptureEnabled || coreContext.core.isVideoDisplayEnabled) { + if (call.currentParams.isVideoEnabled != call.remoteParams?.isVideoEnabled) { showCallVideoUpdateDialog(call) } } else { diff --git a/app/src/main/java/org/linphone/activities/call/viewmodels/CallViewModel.kt b/app/src/main/java/org/linphone/activities/call/viewmodels/CallViewModel.kt index 9275ade4a..59216ead9 100644 --- a/app/src/main/java/org/linphone/activities/call/viewmodels/CallViewModel.kt +++ b/app/src/main/java/org/linphone/activities/call/viewmodels/CallViewModel.kt @@ -139,7 +139,7 @@ open class CallViewModel(val call: Call) : GenericContactViewModel(call.remoteAd } fun takeScreenshot() { - if (call.currentParams.videoEnabled()) { + if (call.currentParams.isVideoEnabled) { val fileName = System.currentTimeMillis().toString() + ".jpeg" call.takeVideoSnapshot(FileUtils.getFileStoragePath(fileName).absolutePath) } diff --git a/app/src/main/java/org/linphone/activities/call/viewmodels/CallsViewModel.kt b/app/src/main/java/org/linphone/activities/call/viewmodels/CallsViewModel.kt index 2372b756d..e6165e651 100644 --- a/app/src/main/java/org/linphone/activities/call/viewmodels/CallsViewModel.kt +++ b/app/src/main/java/org/linphone/activities/call/viewmodels/CallsViewModel.kt @@ -75,11 +75,11 @@ class CallsViewModel : ViewModel() { } else if (call.state == Call.State.UpdatedByRemote) { // If the correspondent asks to turn on video while audio call, // defer update until user has chosen whether to accept it or not - val remoteVideo = call.remoteParams?.videoEnabled() ?: false - val localVideo = call.currentParams.videoEnabled() + val remoteVideo = call.remoteParams?.isVideoEnabled ?: false + val localVideo = call.currentParams.isVideoEnabled val autoAccept = call.core.videoActivationPolicy.automaticallyAccept if (remoteVideo && !localVideo && !autoAccept) { - if (coreContext.core.videoCaptureEnabled() || coreContext.core.videoDisplayEnabled()) { + if (coreContext.core.isVideoCaptureEnabled || coreContext.core.isVideoDisplayEnabled) { call.deferUpdate() callUpdateEvent.value = Event(call) } else { diff --git a/app/src/main/java/org/linphone/activities/call/viewmodels/ControlsViewModel.kt b/app/src/main/java/org/linphone/activities/call/viewmodels/ControlsViewModel.kt index 96d597b64..094cd64c2 100644 --- a/app/src/main/java/org/linphone/activities/call/viewmodels/ControlsViewModel.kt +++ b/app/src/main/java/org/linphone/activities/call/viewmodels/ControlsViewModel.kt @@ -253,8 +253,8 @@ class ControlsViewModel : ViewModel() { } somethingClickedEvent.value = Event(true) - val micEnabled = coreContext.core.micEnabled() - coreContext.core.enableMic(!micEnabled) + val micEnabled = coreContext.core.isMicEnabled + coreContext.core.isMicEnabled = !micEnabled updateMuteMicState() } @@ -304,7 +304,7 @@ class ControlsViewModel : ViewModel() { isVideoUpdateInProgress.value = true val params = core.createCallParams(currentCall) - params?.enableVideo(!currentCall.currentParams.videoEnabled()) + params?.isVideoEnabled = !currentCall.currentParams.isVideoEnabled currentCall.update(params) } } @@ -386,7 +386,7 @@ class ControlsViewModel : ViewModel() { somethingClickedEvent.value = Event(true) val core = coreContext.core - val currentCallVideoEnabled = core.currentCall?.currentParams?.videoEnabled() ?: false + val currentCallVideoEnabled = core.currentCall?.currentParams?.isVideoEnabled ?: false val params = core.createConferenceParams() params.isVideoEnabled = currentCallVideoEnabled @@ -419,7 +419,7 @@ class ControlsViewModel : ViewModel() { } fun updateMuteMicState() { - isMicrophoneMuted.value = !PermissionHelper.get().hasRecordAudioPermission() || !coreContext.core.micEnabled() + isMicrophoneMuted.value = !PermissionHelper.get().hasRecordAudioPermission() || !coreContext.core.isMicEnabled isMuteMicrophoneEnabled.value = coreContext.core.currentCall != null || coreContext.core.conference?.isIn == true } @@ -465,7 +465,7 @@ class ControlsViewModel : ViewModel() { private fun updateVideoAvailable() { val core = coreContext.core val currentCall = core.currentCall - isVideoAvailable.value = (core.videoCaptureEnabled() || core.videoPreviewEnabled()) && + isVideoAvailable.value = (core.isVideoCaptureEnabled || core.isVideoPreviewEnabled) && ( (currentCall != null && !currentCall.mediaInProgress()) || core.conference?.isIn == true diff --git a/app/src/main/java/org/linphone/activities/call/viewmodels/IncomingCallViewModel.kt b/app/src/main/java/org/linphone/activities/call/viewmodels/IncomingCallViewModel.kt index 639a43a22..f1dc0bfb6 100644 --- a/app/src/main/java/org/linphone/activities/call/viewmodels/IncomingCallViewModel.kt +++ b/app/src/main/java/org/linphone/activities/call/viewmodels/IncomingCallViewModel.kt @@ -60,10 +60,10 @@ class IncomingCallViewModel(call: Call) : CallViewModel(call) { coreContext.core.addListener(listener) screenLocked.value = false - inviteWithVideo.value = call.remoteParams?.videoEnabled() == true && coreContext.core.videoActivationPolicy.automaticallyAccept + inviteWithVideo.value = call.remoteParams?.isVideoEnabled == true && coreContext.core.videoActivationPolicy.automaticallyAccept earlyMediaVideoEnabled.value = corePreferences.acceptEarlyMedia && call.state == Call.State.IncomingEarlyMedia && - call.currentParams.videoEnabled() + call.currentParams.isVideoEnabled } override fun onCleared() { 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 472b05ec4..7c613d3d8 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 @@ -173,7 +173,7 @@ class DetailChatRoomFragment : MasterFragment navigateToImageFileViewer( preventScreenshots diff --git a/app/src/main/java/org/linphone/activities/main/chat/fragments/DevicesFragment.kt b/app/src/main/java/org/linphone/activities/main/chat/fragments/DevicesFragment.kt index 243c37fe1..8c83940c2 100644 --- a/app/src/main/java/org/linphone/activities/main/chat/fragments/DevicesFragment.kt +++ b/app/src/main/java/org/linphone/activities/main/chat/fragments/DevicesFragment.kt @@ -54,7 +54,7 @@ class DevicesFragment : SecureFragment() { return } - isSecure = chatRoom.currentParams.encryptionEnabled() + isSecure = chatRoom.currentParams.isEncryptionEnabled listViewModel = ViewModelProvider( this, diff --git a/app/src/main/java/org/linphone/activities/main/chat/fragments/GroupInfoFragment.kt b/app/src/main/java/org/linphone/activities/main/chat/fragments/GroupInfoFragment.kt index 7777b379a..dede4bd89 100644 --- a/app/src/main/java/org/linphone/activities/main/chat/fragments/GroupInfoFragment.kt +++ b/app/src/main/java/org/linphone/activities/main/chat/fragments/GroupInfoFragment.kt @@ -61,7 +61,7 @@ class GroupInfoFragment : SecureFragment() { } val chatRoom: ChatRoom? = sharedViewModel.selectedGroupChatRoom.value - isSecure = chatRoom?.currentParams?.encryptionEnabled() ?: false + isSecure = chatRoom?.currentParams?.isEncryptionEnabled ?: false viewModel = ViewModelProvider( this, diff --git a/app/src/main/java/org/linphone/activities/main/chat/fragments/ImdnFragment.kt b/app/src/main/java/org/linphone/activities/main/chat/fragments/ImdnFragment.kt index d59a75438..d07e8ca3b 100644 --- a/app/src/main/java/org/linphone/activities/main/chat/fragments/ImdnFragment.kt +++ b/app/src/main/java/org/linphone/activities/main/chat/fragments/ImdnFragment.kt @@ -61,7 +61,7 @@ class ImdnFragment : SecureFragment() { return } - isSecure = chatRoom.currentParams.encryptionEnabled() + isSecure = chatRoom.currentParams.isEncryptionEnabled if (arguments != null) { val messageId = arguments?.getString("MessageId") 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 17cefca50..bb1cc356e 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 @@ -160,9 +160,9 @@ class ChatRoomCreationViewModel : ErrorReportingViewModel() { val encrypted = isEncrypted.value == true val params: ChatRoomParams = coreContext.core.createDefaultChatRoomParams() params.backend = ChatRoomBackend.Basic - params.enableGroup(false) + params.isGroupEnabled = false if (encrypted) { - params.enableEncryption(true) + params.isEncryptionEnabled = true params.backend = ChatRoomBackend.FlexisipChat params.ephemeralMode = if (corePreferences.useEphemeralPerDeviceMode) ChatRoomEphemeralMode.DeviceManaged 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 72e950a23..396adee3e 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 @@ -203,7 +203,7 @@ class ChatRoomViewModel(val chatRoom: ChatRoom) : ViewModel(), ContactDataInterf } override fun onEphemeralEvent(chatRoom: ChatRoom, eventLog: EventLog) { - ephemeralEnabled.value = chatRoom.ephemeralEnabled() + ephemeralEnabled.value = chatRoom.isEphemeralEnabled } override fun onParticipantAdminStatusChanged(chatRoom: ChatRoom, eventLog: EventLog) { @@ -222,7 +222,7 @@ class ChatRoomViewModel(val chatRoom: ChatRoom) : ViewModel(), ContactDataInterf subject.value = chatRoom.subject updateSecurityIcon() meAdmin.value = chatRoom.me?.isAdmin ?: false - ephemeralEnabled.value = chatRoom.ephemeralEnabled() + ephemeralEnabled.value = chatRoom.isEphemeralEnabled contactLookup() updateParticipants() diff --git a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/EphemeralViewModel.kt b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/EphemeralViewModel.kt index 3704ef1ae..ce56f8034 100644 --- a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/EphemeralViewModel.kt +++ b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/EphemeralViewModel.kt @@ -50,8 +50,8 @@ class EphemeralViewModel(private val chatRoom: ChatRoom) : ViewModel() { } init { - Log.i("[Ephemeral Messages] Current lifetime is ${chatRoom.ephemeralLifetime}, ephemeral enabled? ${chatRoom.ephemeralEnabled()}") - currentSelectedDuration = if (chatRoom.ephemeralEnabled()) chatRoom.ephemeralLifetime else 0 + Log.i("[Ephemeral Messages] Current lifetime is ${chatRoom.ephemeralLifetime}, ephemeral enabled? ${chatRoom.isEphemeralEnabled}") + currentSelectedDuration = if (chatRoom.isEphemeralEnabled) chatRoom.ephemeralLifetime else 0 computeEphemeralDurationValues() } @@ -65,13 +65,13 @@ class EphemeralViewModel(private val chatRoom: ChatRoom) : ViewModel() { Log.i("[Ephemeral Messages] Configured lifetime for ephemeral messages was already $currentSelectedDuration") } - if (!chatRoom.ephemeralEnabled()) { + if (!chatRoom.isEphemeralEnabled) { Log.i("[Ephemeral Messages] Ephemeral messages were disabled, enable them") - chatRoom.enableEphemeral(true) + chatRoom.isEphemeralEnabled = true } - } else if (chatRoom.ephemeralEnabled()) { + } else if (chatRoom.isEphemeralEnabled) { Log.i("[Ephemeral Messages] Ephemeral messages were enabled, disable them") - chatRoom.enableEphemeral(false) + chatRoom.isEphemeralEnabled = false } } 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 aa5795d7a..7bfd94e48 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 @@ -117,8 +117,8 @@ class GroupInfoViewModel(val chatRoom: ChatRoom?) : ErrorReportingViewModel() { fun createChatRoom() { waitForChatRoomCreation.value = true val params: ChatRoomParams = coreContext.core.createDefaultChatRoomParams() - params.enableEncryption(isEncrypted.value == true) - params.enableGroup(true) + params.isEncryptionEnabled = isEncrypted.value == true + params.isGroupEnabled = true if (isEncrypted.value == true) { params.ephemeralMode = if (corePreferences.useEphemeralPerDeviceMode) ChatRoomEphemeralMode.DeviceManaged diff --git a/app/src/main/java/org/linphone/activities/main/dialer/viewmodels/DialerViewModel.kt b/app/src/main/java/org/linphone/activities/main/dialer/viewmodels/DialerViewModel.kt index bccebe240..964399d6b 100644 --- a/app/src/main/java/org/linphone/activities/main/dialer/viewmodels/DialerViewModel.kt +++ b/app/src/main/java/org/linphone/activities/main/dialer/viewmodels/DialerViewModel.kt @@ -160,7 +160,7 @@ class DialerViewModel : LogsUploadViewModel() { fun updateShowVideoPreview() { val videoPreview = corePreferences.videoPreview showPreview.value = videoPreview - coreContext.core.enableVideoPreview(videoPreview) + coreContext.core.isVideoPreviewEnabled = videoPreview } fun eraseLastChar() { diff --git a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/AccountSettingsViewModel.kt b/app/src/main/java/org/linphone/activities/main/settings/viewmodels/AccountSettingsViewModel.kt index 28dc867a7..81760768b 100644 --- a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/AccountSettingsViewModel.kt +++ b/app/src/main/java/org/linphone/activities/main/settings/viewmodels/AccountSettingsViewModel.kt @@ -315,7 +315,7 @@ class AccountSettingsViewModel(val account: Account) : GenericSettingsViewModel( val iceListener = object : SettingListenerStub() { override fun onBoolValueChanged(newValue: Boolean) { val params = account.params.clone() - params.natPolicy?.enableIce(newValue) + params.natPolicy?.isIceEnabled = newValue account.params = params } } @@ -437,7 +437,7 @@ class AccountSettingsViewModel(val account: Account) : GenericSettingsViewModel( proxy.value = params.serverAddress?.asStringUriOnly() outboundProxy.value = params.isOutboundProxyEnabled stunServer.value = params.natPolicy?.stunServer - ice.value = params.natPolicy?.iceEnabled() + ice.value = params.natPolicy?.isIceEnabled avpf.value = params.avpfMode == AVPFMode.Enabled avpfRrInterval.value = params.avpfRrInterval expires.value = params.expires diff --git a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/AudioSettingsViewModel.kt b/app/src/main/java/org/linphone/activities/main/settings/viewmodels/AudioSettingsViewModel.kt index 5e356b891..8c684ef7d 100644 --- a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/AudioSettingsViewModel.kt +++ b/app/src/main/java/org/linphone/activities/main/settings/viewmodels/AudioSettingsViewModel.kt @@ -41,7 +41,7 @@ class AudioSettingsViewModel : GenericSettingsViewModel() { val echoCancellationListener = object : SettingListenerStub() { override fun onBoolValueChanged(newValue: Boolean) { - core.enableEchoCancellation(newValue) + core.isEchoCancellationEnabled = newValue } } val echoCancellation = MutableLiveData() @@ -81,7 +81,7 @@ class AudioSettingsViewModel : GenericSettingsViewModel() { val adaptiveRateControlListener = object : SettingListenerStub() { override fun onBoolValueChanged(newValue: Boolean) { - core.enableAdaptiveRateControl(newValue) + core.isAdaptiveRateControlEnabled = newValue } } val adaptiveRateControl = MutableLiveData() @@ -153,9 +153,9 @@ class AudioSettingsViewModel : GenericSettingsViewModel() { val audioCodecs = MutableLiveData>() init { - echoCancellation.value = core.echoCancellationEnabled() - adaptiveRateControl.value = core.adaptiveRateControlEnabled() - echoCalibration.value = if (core.echoCancellationEnabled()) { + echoCancellation.value = core.isEchoCancellationEnabled + adaptiveRateControl.value = core.isAdaptiveRateControlEnabled + echoCalibration.value = if (core.isEchoCancellationEnabled) { prefs.getString(R.string.audio_settings_echo_cancellation_calibration_value).format(prefs.echoCancellerCalibration) } else { prefs.getString(R.string.audio_settings_echo_canceller_calibration_summary) diff --git a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/ContactsSettingsViewModel.kt b/app/src/main/java/org/linphone/activities/main/settings/viewmodels/ContactsSettingsViewModel.kt index 805279621..41aac8d87 100644 --- a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/ContactsSettingsViewModel.kt +++ b/app/src/main/java/org/linphone/activities/main/settings/viewmodels/ContactsSettingsViewModel.kt @@ -33,7 +33,7 @@ class ContactsSettingsViewModel : GenericSettingsViewModel() { val friendListSubscribeListener = object : SettingListenerStub() { override fun onBoolValueChanged(newValue: Boolean) { - core.enableFriendListSubscription(newValue) + core.isFriendListSubscriptionEnabled = newValue } } val friendListSubscribe = MutableLiveData() diff --git a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/NetworkSettingsViewModel.kt b/app/src/main/java/org/linphone/activities/main/settings/viewmodels/NetworkSettingsViewModel.kt index 1a07e8736..c282b006e 100644 --- a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/NetworkSettingsViewModel.kt +++ b/app/src/main/java/org/linphone/activities/main/settings/viewmodels/NetworkSettingsViewModel.kt @@ -26,14 +26,14 @@ import org.linphone.activities.main.settings.SettingListenerStub class NetworkSettingsViewModel : GenericSettingsViewModel() { val wifiOnlyListener = object : SettingListenerStub() { override fun onBoolValueChanged(newValue: Boolean) { - core.enableWifiOnly(newValue) + core.isWifiOnlyEnabled = newValue } } val wifiOnly = MutableLiveData() val allowIpv6Listener = object : SettingListenerStub() { override fun onBoolValueChanged(newValue: Boolean) { - core.enableIpv6(newValue) + core.isIpv6Enabled = newValue } } val allowIpv6 = MutableLiveData() @@ -59,8 +59,8 @@ class NetworkSettingsViewModel : GenericSettingsViewModel() { val sipPort = MutableLiveData() init { - wifiOnly.value = core.wifiOnlyEnabled() - allowIpv6.value = core.ipv6Enabled() + wifiOnly.value = core.isWifiOnlyEnabled + allowIpv6.value = core.isIpv6Enabled randomPorts.value = getTransportPort() == -1 sipPort.value = getTransportPort() } diff --git a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/TunnelSettingsViewModel.kt b/app/src/main/java/org/linphone/activities/main/settings/viewmodels/TunnelSettingsViewModel.kt index f07177204..3822fe5fa 100644 --- a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/TunnelSettingsViewModel.kt +++ b/app/src/main/java/org/linphone/activities/main/settings/viewmodels/TunnelSettingsViewModel.kt @@ -52,7 +52,7 @@ class TunnelSettingsViewModel : GenericSettingsViewModel() { val useDualModeListener = object : SettingListenerStub() { override fun onBoolValueChanged(newValue: Boolean) { val tunnel = core.tunnel - tunnel?.enableDualMode(newValue) + tunnel?.isDualModeEnabled = newValue } } val useDualMode = MutableLiveData() @@ -96,7 +96,7 @@ class TunnelSettingsViewModel : GenericSettingsViewModel() { hostnameUrl.value = config.host port.value = config.port - useDualMode.value = tunnel?.dualModeEnabled() + useDualMode.value = tunnel?.isDualModeEnabled hostnameUrl2.value = config.host2 port2.value = config.port2 diff --git a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/VideoSettingsViewModel.kt b/app/src/main/java/org/linphone/activities/main/settings/viewmodels/VideoSettingsViewModel.kt index f8ed1bfc1..d871e341a 100644 --- a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/VideoSettingsViewModel.kt +++ b/app/src/main/java/org/linphone/activities/main/settings/viewmodels/VideoSettingsViewModel.kt @@ -31,8 +31,8 @@ import org.linphone.core.tools.Log class VideoSettingsViewModel : GenericSettingsViewModel() { val enableVideoListener = object : SettingListenerStub() { override fun onBoolValueChanged(newValue: Boolean) { - core.enableVideoCapture(newValue) - core.enableVideoDisplay(newValue) + core.isVideoCaptureEnabled = newValue + core.isVideoDisplayEnabled = newValue if (!newValue) { tabletPreview.value = false initiateCall.value = false @@ -115,7 +115,7 @@ class VideoSettingsViewModel : GenericSettingsViewModel() { val videoCodecs = MutableLiveData>() init { - enableVideo.value = core.videoEnabled() && core.videoSupported() + enableVideo.value = core.isVideoEnabled && core.videoSupported() tabletPreview.value = prefs.videoPreview isTablet.value = coreContext.context.resources.getBoolean(R.bool.isTablet) initiateCall.value = core.videoActivationPolicy.automaticallyInitiate diff --git a/app/src/main/java/org/linphone/compatibility/Api26Compatibility.kt b/app/src/main/java/org/linphone/compatibility/Api26Compatibility.kt index 9a541f59e..4716219fd 100644 --- a/app/src/main/java/org/linphone/compatibility/Api26Compatibility.kt +++ b/app/src/main/java/org/linphone/compatibility/Api26Compatibility.kt @@ -206,7 +206,7 @@ class Api26Compatibility { } Call.State.OutgoingRinging, Call.State.OutgoingProgress, Call.State.OutgoingInit, Call.State.OutgoingEarlyMedia -> { stringResourceId = R.string.call_notification_outgoing - iconResourceId = if (call.params.videoEnabled()) { + iconResourceId = if (call.params.isVideoEnabled) { R.drawable.topbar_videocall_notification } else { R.drawable.topbar_call_notification @@ -214,7 +214,7 @@ class Api26Compatibility { } else -> { stringResourceId = R.string.call_notification_active - iconResourceId = if (call.currentParams.videoEnabled()) { + iconResourceId = if (call.currentParams.isVideoEnabled) { R.drawable.topbar_videocall_notification } else { R.drawable.topbar_call_notification diff --git a/app/src/main/java/org/linphone/compatibility/Api31Compatibility.kt b/app/src/main/java/org/linphone/compatibility/Api31Compatibility.kt index 7ca6dde46..82262693e 100644 --- a/app/src/main/java/org/linphone/compatibility/Api31Compatibility.kt +++ b/app/src/main/java/org/linphone/compatibility/Api31Compatibility.kt @@ -96,7 +96,7 @@ class Api31Compatibility { val roundPicture = ImageUtils.getRoundBitmapFromUri(context, pictureUri) val displayName = contact?.fullName ?: LinphoneUtils.getDisplayName(call.remoteAddress) - val isVideo = call.currentParams.videoEnabled() + val isVideo = call.currentParams.isVideoEnabled val iconResourceId: Int = when (call.state) { Call.State.Paused, Call.State.Pausing, Call.State.PausedByRemote -> { R.drawable.topbar_call_paused_notification diff --git a/app/src/main/java/org/linphone/contact/NativeContact.kt b/app/src/main/java/org/linphone/contact/NativeContact.kt index cb487bedd..c28f6fd6b 100644 --- a/app/src/main/java/org/linphone/contact/NativeContact.kt +++ b/app/src/main/java/org/linphone/contact/NativeContact.kt @@ -192,7 +192,7 @@ class NativeContact(val nativeId: String, private val lookupKey: String? = null) var created = false if (friend == null) { val friend = coreContext.core.createFriend() - friend.enableSubscribes(false) + friend.isSubscribesEnabled = false friend.incSubscribePolicy = SubscribePolicy.SPDeny friend.refKey = nativeId friend.userData = this diff --git a/app/src/main/java/org/linphone/core/CoreContext.kt b/app/src/main/java/org/linphone/core/CoreContext.kt index f356e47bb..7462ad19b 100644 --- a/app/src/main/java/org/linphone/core/CoreContext.kt +++ b/app/src/main/java/org/linphone/core/CoreContext.kt @@ -189,7 +189,7 @@ class CoreContext(val context: Context, coreConfig: Config) { } } - if (corePreferences.routeAudioToSpeakerWhenVideoIsEnabled && call.currentParams.videoEnabled()) { + if (corePreferences.routeAudioToSpeakerWhenVideoIsEnabled && call.currentParams.isVideoEnabled) { // Do not turn speaker on when video is enabled if headset or bluetooth is used if (!AudioRouteUtils.isHeadsetAudioRouteAvailable() && !AudioRouteUtils.isBluetoothAudioRouteCurrentlyUsed( call @@ -380,6 +380,12 @@ class CoreContext(val context: Context, coreConfig: Config) { core.limeX3DhServerUrl = url } } + + // Ensure we allow CPIM messages in basic chat rooms + val newParams = account.params.clone() + newParams.isCpimInBasicChatRoomEnabled = true + account.params = newParams + Log.i("[Context] CPIM allowed in basic chat rooms for account ${newParams.identityAddress?.asStringUriOnly()}") } } @@ -455,11 +461,11 @@ class CoreContext(val context: Context, coreConfig: Config) { val params = core.createCallParams(call) if (accept) { - params?.enableVideo(true) - core.enableVideoCapture(true) - core.enableVideoDisplay(true) + params?.isVideoEnabled = true + core.isVideoCaptureEnabled = true + core.isVideoDisplayEnabled = true } else { - params?.enableVideo(false) + params?.isVideoEnabled = false } call.acceptUpdate(params) @@ -471,7 +477,7 @@ class CoreContext(val context: Context, coreConfig: Config) { params?.recordFile = LinphoneUtils.getRecordingFilePathForAddress(call.remoteAddress) if (LinphoneUtils.checkIfNetworkHasLowBandwidth(context)) { Log.w("[Context] Enabling low bandwidth mode!") - params?.enableLowBandwidth(true) + params?.isLowBandwidthEnabled = true } call.acceptWithParams(params) } @@ -548,7 +554,7 @@ class CoreContext(val context: Context, coreConfig: Config) { } if (LinphoneUtils.checkIfNetworkHasLowBandwidth(context)) { Log.w("[Context] Enabling low bandwidth mode!") - params.enableLowBandwidth(true) + params.isLowBandwidthEnabled = true } params.recordFile = LinphoneUtils.getRecordingFilePathForAddress(address) @@ -562,7 +568,7 @@ class CoreContext(val context: Context, coreConfig: Config) { } if (corePreferences.sendEarlyMedia) { - params.enableEarlyMediaSending(true) + params.isEarlyMediaSendingEnabled = true } val call = core.inviteAddressWithParams(address, params) @@ -601,7 +607,7 @@ class CoreContext(val context: Context, coreConfig: Config) { return if (conference != null && conference.isIn) { conference.currentParams.isVideoEnabled } else { - core.currentCall?.currentParams?.videoEnabled() ?: false + core.currentCall?.currentParams?.isVideoEnabled ?: false } } diff --git a/app/src/main/java/org/linphone/utils/LinphoneUtils.kt b/app/src/main/java/org/linphone/utils/LinphoneUtils.kt index e939a085d..162811c99 100644 --- a/app/src/main/java/org/linphone/utils/LinphoneUtils.kt +++ b/app/src/main/java/org/linphone/utils/LinphoneUtils.kt @@ -66,7 +66,7 @@ class LinphoneUtils { fun isLimeAvailable(): Boolean { val core = coreContext.core - return core.limeX3DhAvailable() && core.limeX3DhEnabled() && + return core.limeX3DhAvailable() && core.isLimeX3DhEnabled && core.limeX3DhServerUrl != null && core.defaultAccount?.params?.conferenceFactoryUri != null } @@ -81,11 +81,11 @@ class LinphoneUtils { val defaultAccount = core.defaultAccount val params = core.createDefaultChatRoomParams() - params.enableGroup(false) + params.isGroupEnabled = false params.backend = ChatRoomBackend.Basic if (isSecured) { params.subject = AppUtils.getString(R.string.chat_room_dummy_subject) - params.enableEncryption(true) + params.isEncryptionEnabled = true params.backend = ChatRoomBackend.FlexisipChat } diff --git a/app/src/main/res/layout/chat_bubble_activity.xml b/app/src/main/res/layout/chat_bubble_activity.xml index a3972ae18..8ed3a2130 100644 --- a/app/src/main/res/layout/chat_bubble_activity.xml +++ b/app/src/main/res/layout/chat_bubble_activity.xml @@ -128,7 +128,7 @@ android:src="@drawable/chat_send_message" />