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

Fix FC audio call

Browse source
This commit is contained in:
Sylvain Berfini 2012-09-27 09:55:10 +02:00
parent bd2c8845c8
commit e4fbe64162
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/org/linphone/AudioCallFragment.java
View file

@ -105,7 +105,7 @@ public class AudioCallFragment extends Fragment implements OnClickListener {
setContactName(callView, lAddress, sipUri, resources); setContactName(callView, lAddress, sipUri, resources);
boolean hide = displayCallStatusIconAndReturnCallPaused(callView, call); boolean hide = displayCallStatusIconAndReturnCallPaused(callView, call);
displayOrHideContactPictureAndStats(callView, pictureUri, call, hide); displayOrHideContactPictureAndStats(resources, callView, pictureUri, call, hide);
setRowBackgroundAndPadding(callView, resources, index, call, !hide); setRowBackgroundAndPadding(callView, resources, index, call, !hide);
registerCallDurationTimer(callView, call); registerCallDurationTimer(callView, call);
previousCallIsActive = !hide; previousCallIsActive = !hide;
@ -154,7 +154,7 @@ public class AudioCallFragment extends Fragment implements OnClickListener {
return isCallPaused || isInConference; return isCallPaused || isInConference;
} }
private void displayOrHideContactPictureAndStats(LinearLayout callView, Uri pictureUri, LinphoneCall call, boolean hide) { private void displayOrHideContactPictureAndStats(Resources resources, LinearLayout callView, Uri pictureUri, LinphoneCall call, boolean hide) {
ViewFlipper flipper = (ViewFlipper) callView.findViewById(R.id.flipper); ViewFlipper flipper = (ViewFlipper) callView.findViewById(R.id.flipper);
flipper.setDisplayedChild(FLIPPER_AVATAR_VIEW); flipper.setDisplayedChild(FLIPPER_AVATAR_VIEW);
@ -166,7 +166,7 @@ public class AudioCallFragment extends Fragment implements OnClickListener {
flipper.setVisibility(View.GONE); flipper.setVisibility(View.GONE);
} }
if (getActivity().getResources().getBoolean(R.bool.display_call_stats)) { if (resources.getBoolean(R.bool.display_call_stats)) {
View audioCallstats = callView.findViewById(R.id.audioCallStats); View audioCallstats = callView.findViewById(R.id.audioCallStats);
if (call != null) { if (call != null) {
flipper.setEnabled(true); flipper.setEnabled(true);

6
src/org/linphone/PreferencesFragment.java
View file

@ -456,9 +456,9 @@ public class PreferencesFragment extends PreferencesListFragment implements EcCa
} }
private void initializeMediaEncryptionPreferences() { private void initializeMediaEncryptionPreferences() {
LinphoneCore lc=LinphoneManager.getLc(); LinphoneCore lc = LinphoneManager.getLc();
boolean hasZrtp=lc.mediaEncryptionSupported(MediaEncryption.ZRTP); boolean hasZrtp = lc.mediaEncryptionSupported(MediaEncryption.ZRTP);
boolean hasSrtp=lc.mediaEncryptionSupported(MediaEncryption.SRTP); boolean hasSrtp = lc.mediaEncryptionSupported(MediaEncryption.SRTP);
if (!hasSrtp && !hasZrtp){ if (!hasSrtp && !hasZrtp){
mencPref.setEnabled(false); mencPref.setEnabled(false);
}else{ }else{