diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java index 57b1ada8c..1d4248019 100644 --- a/src/org/linphone/LinphoneActivity.java +++ b/src/org/linphone/LinphoneActivity.java @@ -1223,7 +1223,8 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene LinphoneService.instance().removeMessageNotification(); String sipUri = extras.getString("ChatContactSipUri"); displayChat(sipUri); - } else if (extras != null && extras.getBoolean("Notification", false)) { + } + else if (extras != null && extras.getBoolean("Notification", false)) { if (LinphoneManager.getLc().getCallsNb() > 0) { LinphoneCall call = LinphoneManager.getLc().getCalls()[0]; if (call.getCurrentParamsCopy().getVideoEnabled()) { @@ -1237,6 +1238,14 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene if (dialerFragment != null) { ((DialerFragment) dialerFragment).newOutgoingCall(intent); } + if (LinphoneManager.getLc().getCalls().length > 0) { + LinphoneCall call = LinphoneManager.getLc().getCalls()[0]; + if (call.getCurrentParamsCopy().getVideoEnabled()) { + startVideoActivity(call); + } else { + startIncallActivity(call); + } + } } } @@ -1273,7 +1282,6 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene public AcceptNewFriendDialog(Contact c, String a) { contact = c; sipUri = a; - // Empty constructor required for DialogFragment } @Override diff --git a/src/org/linphone/StatusFragment.java b/src/org/linphone/StatusFragment.java index 7ff0c31d7..e3a79b44c 100644 --- a/src/org/linphone/StatusFragment.java +++ b/src/org/linphone/StatusFragment.java @@ -492,14 +492,16 @@ public class StatusFragment extends Fragment { final LinphoneCallParams params = call.getCurrentParamsCopy(); if (params.getVideoEnabled()) { final LinphoneCallStats videoStats = call.getVideoStats(); - if (videoStats != null) { + final LinphoneCallStats audioStats = call.getAudioStats(); + if (videoStats != null && audioStats != null) { title.setText("Video"); - PayloadType payload = params.getUsedVideoCodec(); - if (payload != null) { - codec.setText(payload.getMime()); + PayloadType payloadAudio = params.getUsedAudioCodec(); + PayloadType payloadVideo = params.getUsedVideoCodec(); + if (payloadVideo != null && payloadAudio != null) { + codec.setText(payloadVideo.getMime() + " / " + payloadAudio.getMime()); } - dl.setText(String.valueOf((int) videoStats.getDownloadBandwidth()) + " kbits/s"); - ul.setText(String.valueOf((int) videoStats.getUploadBandwidth()) + " kbits/s"); + dl.setText(String.valueOf((int) videoStats.getDownloadBandwidth()) + " / " + (int) audioStats.getDownloadBandwidth() + " kbits/s"); + ul.setText(String.valueOf((int) videoStats.getUploadBandwidth()) + " / " + (int) audioStats.getUploadBandwidth() + " kbits/s"); ice.setText(videoStats.getIceState().toString()); } } else {