From 2dcd5cbba50d3d29da37b1b9016cb73fe09ae293 Mon Sep 17 00:00:00 2001 From: Vincent Lucas Date: Thu, 1 Mar 2012 15:13:11 +0000 Subject: [PATCH] Small corrections concerning the CallInfoFrame. Displays the call duration only once the call is connected. Truncates upload and download jitter to ms (integer). Corrects typo in language resources (service.gui.callingo -> service.gui.callinfo for LOSS_RATE and JITTER). --- resources/languages/resources.properties | 4 +-- .../impl/gui/main/call/CallInfoFrame.java | 33 ++++++++++--------- 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/resources/languages/resources.properties b/resources/languages/resources.properties index 7b251b0c8..18d088393 100644 --- a/resources/languages/resources.properties +++ b/resources/languages/resources.properties @@ -537,8 +537,8 @@ service.gui.callinfo.VIDEO_INFO=Video info service.gui.callinfo.LOCAL_IP=Local IP / Port service.gui.callinfo.REMOTE_IP=Remote IP / Port service.gui.callinfo.BANDWITH=Bandwith -service.gui.callingo.LOSS_RATE=Loss rate -service.gui.callingo.JITTER=Jitter +service.gui.callinfo.LOSS_RATE=Loss rate +service.gui.callinfo.JITTER=Jitter service.gui.callinfo.ICE_CANDIDATE_EXTENDED_TYPE=ICE candidate extended type service.gui.ALWAYS_TRUST=Always trust this certificate diff --git a/src/net/java/sip/communicator/impl/gui/main/call/CallInfoFrame.java b/src/net/java/sip/communicator/impl/gui/main/call/CallInfoFrame.java index 950dc5e1a..64921c7c9 100644 --- a/src/net/java/sip/communicator/impl/gui/main/call/CallInfoFrame.java +++ b/src/net/java/sip/communicator/impl/gui/main/call/CallInfoFrame.java @@ -231,18 +231,20 @@ private void constructCallPeersInfo(StringBuffer stringBuffer) */ private void constructPeerInfo(CallPeer callPeer, StringBuffer stringBuffer) { - Date startTime = new Date(callPeer.getCallDurationStartTime()); - Date currentTime = new Date(System.currentTimeMillis()); - Date callNbTimeMsSpent = GuiUtils.substractDates( - currentTime, - startTime); + stringBuffer.append(getLineString(callPeer.getAddress(), "")); - String peerAddress = callPeer.getAddress(); - - stringBuffer.append(getLineString(peerAddress, "")); - stringBuffer.append(getLineString( - resources.getI18NString("service.gui.callinfo.CALL_DURATION"), - GuiUtils.formatTime(callNbTimeMsSpent))); + if(callPeer.getCallDurationStartTime() != + CallPeer.CALL_DURATION_START_TIME_UNKNOWN) + { + Date startTime = new Date(callPeer.getCallDurationStartTime()); + Date currentTime = new Date(System.currentTimeMillis()); + Date callNbTimeMsSpent = GuiUtils.substractDates( + currentTime, + startTime); + stringBuffer.append(getLineString( + resources.getI18NString("service.gui.callinfo.CALL_DURATION"), + GuiUtils.formatTime(callNbTimeMsSpent))); + } if(callPeer instanceof MediaAwareCallPeer) { @@ -334,17 +336,18 @@ private void constructAudioVideoInfo( MediaStream mediaStream, stringBuffer.append( getLineString( - resources.getI18NString("service.gui.callingo.LOSS_RATE"), + resources.getI18NString("service.gui.callinfo.LOSS_RATE"), "↓ " + (int) mediaStreamStats.getDownloadPercentLoss() + "% ↑ " + (int) mediaStreamStats.getUploadPercentLoss() + "%")); stringBuffer.append( - getLineString(resources.getI18NString("service.gui.callingo.JITTER"), - "↓ " + mediaStreamStats.getDownloadJitterMs() + getLineString(resources.getI18NString( + "service.gui.callinfo.JITTER"), + "↓ " + (int) mediaStreamStats.getDownloadJitterMs() + " ms ↑ " - + mediaStreamStats.getUploadJitterMs() + " ms")); + + (int) mediaStreamStats.getUploadJitterMs() + " ms")); } /**