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

Made outgoing call activity use proximity sensor if speaker is disabled

Browse source
This commit is contained in:
Sylvain Berfini 2020-09-06 10:15:35 +02:00
parent c3a6f9298b
commit 00d5a780db
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/java/org/linphone/activities/call/OutgoingCallActivity.kt
View file

@ -26,7 +26,6 @@ import androidx.databinding.DataBindingUtil
import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProvider
import org.linphone.LinphoneApplication.Companion.coreContext import org.linphone.LinphoneApplication.Companion.coreContext
import org.linphone.R import org.linphone.R
import org.linphone.activities.GenericActivity
import org.linphone.activities.call.viewmodels.CallViewModel import org.linphone.activities.call.viewmodels.CallViewModel
import org.linphone.activities.call.viewmodels.CallViewModelFactory import org.linphone.activities.call.viewmodels.CallViewModelFactory
import org.linphone.activities.call.viewmodels.ControlsViewModel import org.linphone.activities.call.viewmodels.ControlsViewModel
@ -36,7 +35,7 @@ import org.linphone.databinding.CallOutgoingActivityBinding
import org.linphone.mediastream.Version import org.linphone.mediastream.Version
import org.linphone.utils.PermissionHelper import org.linphone.utils.PermissionHelper
class OutgoingCallActivity : GenericActivity() { class OutgoingCallActivity : ProximitySensorActivity() {
private lateinit var binding: CallOutgoingActivityBinding private lateinit var binding: CallOutgoingActivityBinding
private lateinit var viewModel: CallViewModel private lateinit var viewModel: CallViewModel
private lateinit var controlsViewModel: ControlsViewModel private lateinit var controlsViewModel: ControlsViewModel
@ -95,6 +94,10 @@ class OutgoingCallActivity : GenericActivity() {
} }
}) })
controlsViewModel.isSpeakerSelected.observe(this, {
enableProximitySensor(!it)
})
if (Version.sdkAboveOrEqual(Version.API23_MARSHMALLOW_60)) { if (Version.sdkAboveOrEqual(Version.API23_MARSHMALLOW_60)) {
checkPermissions() checkPermissions()
} }

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

@ -122,8 +122,8 @@ class NotificationsManager(private val context: Context) {
Call.State.IncomingEarlyMedia, Call.State.IncomingReceived -> displayIncomingCallNotification(call) Call.State.IncomingEarlyMedia, Call.State.IncomingReceived -> displayIncomingCallNotification(call)
Call.State.End, Call.State.Error -> dismissCallNotification(call) Call.State.End, Call.State.Error -> dismissCallNotification(call)
Call.State.Released -> { Call.State.Released -> {
if (call.dir == Call.Dir.Incoming if (call.dir == Call.Dir.Incoming &&
&& (call.callLog.status == Call.Status.Missed || (call.callLog.status == Call.Status.Missed ||
call.callLog.status == Call.Status.Aborted || call.callLog.status == Call.Status.Aborted ||
call.callLog.status == Call.Status.EarlyAborted)) { call.callLog.status == Call.Status.EarlyAborted)) {
displayMissedCallNotification(call) displayMissedCallNotification(call)