commit 4fb226212fdd1a78854b5f85a0f2c17649bdcb81
author Alexandre Lision <alexandre.lision@savoirfairelinux.com> Mon Oct 21 16:26:33 2013 -0400
committer Alexandre Lision <alexandre.lision@savoirfairelinux.com> Mon Oct 21 16:26:33 2013 -0400
tree 7861f863e091d713da295481be376978c2f22f57
parent 08d782ac0ef0fd337b3c2fe0f4727b1bf96e8d69

codec: quick display of incall used codec

src/org/sflphone/client/CallActivity.java

diff --git a/src/org/sflphone/client/CallActivity.java b/src/org/sflphone/client/CallActivity.java
index 6163181..b018bbf 100644
--- a/src/org/sflphone/client/CallActivity.java
+++ b/src/org/sflphone/client/CallActivity.java
@@ -266,8 +266,10 @@
 
         // mCallsFragment.update();
 
-        if (mCurrentCallFragment != null)
+        if (mCurrentCallFragment != null) {
             mCurrentCallFragment.changeCallState(callID, newState);
+            
+        }
 
         try {
             HashMap<String, SipCall> callMap = (HashMap<String, SipCall>) service.getCallList();

src/org/sflphone/fragments/CallFragment.java

diff --git a/src/org/sflphone/fragments/CallFragment.java b/src/org/sflphone/fragments/CallFragment.java
index 2ee3b54..858be93 100644
--- a/src/org/sflphone/fragments/CallFragment.java
+++ b/src/org/sflphone/fragments/CallFragment.java
@@ -101,6 +101,8 @@
     
     TransferDFragment editName;
 
+    private TextView codecNameTxt;
+
     @Override
     public void onCreate(Bundle savedBundle) {
         super.onCreate(savedBundle);
@@ -257,6 +259,7 @@
         view.setModel(model);
         view.getHolder().addCallback(this);
 
+        codecNameTxt = (TextView) rootView.findViewById(R.id.codec_name_txt);
         callStatusTxt = (TextView) rootView.findViewById(R.id.call_status_txt);
         call_icon = BitmapFactory.decodeResource(getResources(), R.drawable.ic_action_call);
 
@@ -412,8 +415,14 @@
             }
         }
 
-        if (conf.isOnGoing())
+        if (conf.isOnGoing()) {
             initNormalStateDisplay();
+            try {
+                updateCodecName(mCallbacks.getService().getCurrentAudioCodecName(callID));
+            } catch (RemoteException e) {
+                e.printStackTrace();
+            }
+        }
 
         if (conf.getParticipants().size() == 0) {
             mCallbacks.replaceCurrentCallDisplayed();
@@ -536,4 +545,8 @@
             e.printStackTrace();
         }
     }
+
+    public void updateCodecName(String currentAudioCodecName) {
+        codecNameTxt.setText(currentAudioCodecName);
+    }
 }

src/org/sflphone/service/ISipService.aidl

diff --git a/src/org/sflphone/service/ISipService.aidl b/src/org/sflphone/service/ISipService.aidl
index e8424d1..1ebfc8d 100644
--- a/src/org/sflphone/service/ISipService.aidl
+++ b/src/org/sflphone/service/ISipService.aidl
@@ -22,6 +22,7 @@
     void setAudioPlugin(in String callID);
     String getCurrentAudioOutputPlugin();
     List getAudioCodecList(in String accountID);
+    String getCurrentAudioCodecName(in String callID);
     void setActiveCodecList(in List codecs, in String accountID);
     Map getRingtoneList();
     

src/org/sflphone/service/SipService.java

diff --git a/src/org/sflphone/service/SipService.java b/src/org/sflphone/service/SipService.java
index db55abc..b37bf7c 100644
--- a/src/org/sflphone/service/SipService.java
+++ b/src/org/sflphone/service/SipService.java
@@ -1050,8 +1050,6 @@
 
                         results.add(new Codec(active_payloads.get(i), configurationManagerJNI.getAudioCodecDetails(active_payloads.get(i)), true));
                         
-                        if (results.get(i).getName().length() == 0)
-                            results.remove(i);
                     }
 
                     // if (results.get(active_payloads.get(i)) != null) {
@@ -1268,5 +1266,10 @@
             return toReturn;
         }
 
+        @Override
+        public String getCurrentAudioCodecName(String callID) throws RemoteException {
+            return callManagerJNI.getCurrentAudioCodecName(callID);
+        }
+
     };
 }