From 0e0658d2b494cb7a6e8dc4d9eebd6d793ec11202 Mon Sep 17 00:00:00 2001 From: Erwan Croze Date: Thu, 15 Dec 2016 16:42:31 +0100 Subject: [PATCH] Change call button if we initiate video with video --- src/org/linphone/DialerFragment.java | 12 ++++++++++-- src/org/linphone/LinphoneActivity.java | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/org/linphone/DialerFragment.java b/src/org/linphone/DialerFragment.java index 8ff3e77b4..e153c04ea 100644 --- a/src/org/linphone/DialerFragment.java +++ b/src/org/linphone/DialerFragment.java @@ -70,7 +70,11 @@ public class DialerFragment extends Fragment { mCall.setImageResource(R.drawable.call_add); } } else { - mCall.setImageResource(R.drawable.call_audio_start); + if (LinphoneManager.getLc().getVideoAutoInitiatePolicy()) { + mCall.setImageResource(R.drawable.call_video_start); + } else { + mCall.setImageResource(R.drawable.call_audio_start); + } } numpad = (AddressAware) view.findViewById(R.id.numpad); @@ -189,7 +193,11 @@ public class DialerFragment extends Fragment { mAddContact.setImageResource(R.drawable.call_alt_back); mAddContact.setOnClickListener(cancelListener); } else { - mCall.setImageResource(R.drawable.call_audio_start); + if (LinphoneManager.getLc().getVideoAutoInitiatePolicy()) { + mCall.setImageResource(R.drawable.call_video_start); + } else { + mCall.setImageResource(R.drawable.call_audio_start); + } mAddContact.setEnabled(false); mAddContact.setImageResource(R.drawable.contact_add_button); mAddContact.setOnClickListener(addContactListener); diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java index e819facf8..bb83c2e9f 100644 --- a/src/org/linphone/LinphoneActivity.java +++ b/src/org/linphone/LinphoneActivity.java @@ -1609,7 +1609,7 @@ public class LinphoneActivity extends LinphoneGenericActivity implements OnClick accountsList.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override public void onItemClick(AdapterView adapterView, View view, int i, long l) { - if(view != null && view.getTag().toString() != null) { + if(view != null && view.getTag() != null) { int position = Integer.parseInt(view.getTag().toString()); LinphoneActivity.instance().displayAccountSettings(position); }