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

Fixed call transfer and call add if auto start call setting is enabled

Browse source
This commit is contained in:
Sylvain Berfini 2020-05-26 11:58:34 +02:00
parent f6df9711b7
commit 7b581ba586
5 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/org/linphone/activities/main/contact/fragments/DetailContactFragment.kt
View file

@ -79,10 +79,11 @@ class DetailContactFragment : Fragment() {
viewModel.startCallToEvent.observe(viewLifecycleOwner, Observer { viewModel.startCallToEvent.observe(viewLifecycleOwner, Observer {
it.consume { address -> it.consume { address ->
if (coreContext.core.callsNb > 0) { if (coreContext.core.callsNb > 0) {
Log.i("[Contact] Starting dialer with pre-filled URI ${address.asStringUriOnly()}") Log.i("[Contact] Starting dialer with pre-filled URI ${address.asStringUriOnly()}, is transfer? ${sharedViewModel.pendingCallTransfer}")
val args = Bundle() val args = Bundle()
args.putString("URI", address.asStringUriOnly()) args.putString("URI", address.asStringUriOnly())
args.putBoolean("Transfer", sharedViewModel.pendingCallTransfer) args.putBoolean("Transfer", sharedViewModel.pendingCallTransfer)
args.putBoolean("SkipAutoCallStart", true) // If auto start call setting is enabled, ignore it
findNavController().navigate( findNavController().navigate(
R.id.action_global_dialerFragment, R.id.action_global_dialerFragment,
args args

4
app/src/main/java/org/linphone/activities/main/dialer/fragments/DialerFragment.kt
View file

@ -89,11 +89,13 @@ class DialerFragment : Fragment() {
if (arguments?.containsKey("Transfer") == true) { if (arguments?.containsKey("Transfer") == true) {
sharedViewModel.pendingCallTransfer = arguments?.getBoolean("Transfer") ?: false sharedViewModel.pendingCallTransfer = arguments?.getBoolean("Transfer") ?: false
Log.i("[Dialer] Is pending call transfer: ${sharedViewModel.pendingCallTransfer}")
} }
if (arguments?.containsKey("URI") == true) { if (arguments?.containsKey("URI") == true) {
val address = arguments?.getString("URI") ?: "" val address = arguments?.getString("URI") ?: ""
val skipAutoCall = arguments?.getBoolean("SkipAutoCallStart") ?: false
if (corePreferences.callRightAway) { if (corePreferences.callRightAway && !skipAutoCall) {
Log.i("[Dialer] Call right away setting is enabled, start the call to $address") Log.i("[Dialer] Call right away setting is enabled, start the call to $address")
viewModel.directCall(address) viewModel.directCall(address)
} else { } else {

3
app/src/main/java/org/linphone/activities/main/history/fragments/DetailCallLogFragment.kt
View file

@ -100,10 +100,11 @@ class DetailCallLogFragment : Fragment() {
viewModel.startCallEvent.observe(viewLifecycleOwner, Observer { viewModel.startCallEvent.observe(viewLifecycleOwner, Observer {
it.consume { address -> it.consume { address ->
if (coreContext.core.callsNb > 0) { if (coreContext.core.callsNb > 0) {
Log.i("[History] Starting dialer with pre-filled URI ${address.asStringUriOnly()}") Log.i("[History] Starting dialer with pre-filled URI ${address.asStringUriOnly()}, is transfer? ${sharedViewModel.pendingCallTransfer}")
val args = Bundle() val args = Bundle()
args.putString("URI", address.asStringUriOnly()) args.putString("URI", address.asStringUriOnly())
args.putBoolean("Transfer", sharedViewModel.pendingCallTransfer) args.putBoolean("Transfer", sharedViewModel.pendingCallTransfer)
args.putBoolean("SkipAutoCallStart", true) // If auto start call setting is enabled, ignore it
findNavController().navigate( findNavController().navigate(
R.id.action_global_dialerFragment, R.id.action_global_dialerFragment,
args args

3
app/src/main/java/org/linphone/activities/main/history/fragments/MasterCallLogsFragment.kt
View file

@ -139,10 +139,11 @@ class MasterCallLogsFragment : MasterFragment() {
adapter.startCallToEvent.observe(viewLifecycleOwner, Observer { adapter.startCallToEvent.observe(viewLifecycleOwner, Observer {
it.consume { address -> it.consume { address ->
if (coreContext.core.callsNb > 0) { if (coreContext.core.callsNb > 0) {
Log.i("[History] Starting dialer with pre-filled URI ${address.asStringUriOnly()}") Log.i("[History] Starting dialer with pre-filled URI ${address.asStringUriOnly()}, is transfer? ${sharedViewModel.pendingCallTransfer}")
val args = Bundle() val args = Bundle()
args.putString("URI", address.asStringUriOnly()) args.putString("URI", address.asStringUriOnly())
args.putBoolean("Transfer", sharedViewModel.pendingCallTransfer) args.putBoolean("Transfer", sharedViewModel.pendingCallTransfer)
args.putBoolean("SkipAutoCallStart", true) // If auto start call setting is enabled, ignore it
findNavController().navigate( findNavController().navigate(
R.id.action_global_dialerFragment, R.id.action_global_dialerFragment,
args args

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

@ -369,6 +369,7 @@ class NotificationsManager(private val context: Context) {
.setContentIntent(pendingIntent) .setContentIntent(pendingIntent)
.setCategory(NotificationCompat.CATEGORY_CALL) .setCategory(NotificationCompat.CATEGORY_CALL)
.setVisibility(NotificationCompat.VISIBILITY_PUBLIC) .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
.setPriority(NotificationCompat.PRIORITY_HIGH)
.setWhen(System.currentTimeMillis()) .setWhen(System.currentTimeMillis())
.setAutoCancel(false) .setAutoCancel(false)
.setShowWhen(true) .setShowWhen(true)