Merge branch 'master' of git.linphone.org:linphone-android into conferencing

Conflicts:
	src/org/linphone/LinphoneManager.java
	src/org/linphone/core/LinphoneCallParamsImpl.java
	src/org/linphone/core/LinphoneCoreImpl.java
	submodules/linphone

diff --cc LinphoneCallParamsImpl.java
index d9c490ae105ee7a390ff8e6cbc8e768d1d1d80ac,c346dcd1fa246931e9fdc8b5a01c794bee91123a..8a7fba15caab5240350751e1d415fbd4feee4162
--- 1/LinphoneCallParamsImpl.java
--- 2/LinphoneCallParamsImpl.java
+++ b/LinphoneCallParamsImpl.java
@@@ -48,9 -50,12 +50,17 @@@ public class LinphoneCallParamsImpl imp
        public void setAudioBandwidth(int value) {
                audioBandwidth(nativePtr, value);
        }
+       
+       public String getMediaEncryption() {
+               return getMediaEncryption(nativePtr);
+       }
+       
+       public void setMediaEnctyption(String menc) {
+               setMediaEncryption(nativePtr, menc);
+       }
 +
 +      private native boolean localConferenceMode(long nativePtr);
 +      public boolean localConferenceMode() {
 +              return localConferenceMode(nativePtr);
 +      }
  }

diff --cc LinphoneCoreImpl.java
index bf5e5de9c17b420696ad8539153d8181c21a677e,355523d59159b53c48192bd39969bd6691bb1dab..139e1a30f34848eddf2a92a3192f62ef7308022a
--- 1/LinphoneCoreImpl.java
--- 2/LinphoneCoreImpl.java
+++ b/LinphoneCoreImpl.java
@@@ -489,80 -493,74 +494,93 @@@ class LinphoneCoreImpl implements Linph
        public int getVideoDevice() {
                return getVideoDevice(nativePtr);
        }
 -      public void addAllToConference() {
 -              // TODO Auto-generated method stub
 -              
 -      }
 -      public void addToConference(LinphoneCall call) {
 -              // TODO Auto-generated method stub
 -              
 -      }
 -      public void enterConference() {
 -              // TODO Auto-generated method stub
 -              
 +
 +
 +      private native void leaveConference(long nativePtr);    
 +      public synchronized void leaveConference() {
 +              leaveConference(nativePtr);
        }
 -      public List getCalls() {
 -              // TODO Auto-generated method stub
 -              return null;
 +
 +      private native void enterConference(long nativePtr);    
 +      public synchronized void enterConference() {
 +              enterConference(nativePtr);
        }
 -      public int getCallsNb() {
 -              // TODO Auto-generated method stub
 -              return 0;
 +
 +      private native boolean isInConference(long nativePtr);
 +      public synchronized boolean isInConference() {
 +              return isInConference(nativePtr);
        }
 -      public int getConferenceSize() {
 -              // TODO Auto-generated method stub
 -              return 0;
 +
 +      private native void terminateConference(long nativePtr);
 +      public synchronized void terminateConference() {
 +              terminateConference(nativePtr);
 +      }
 +      private native int getConferenceSize(long nativePtr);
 +      public synchronized int getConferenceSize() {
 +              return getConferenceSize(nativePtr);
 +      }
 +      private native int getCallsNb(long nativePtr);
 +      public synchronized int getCallsNb() {
 +              return getCallsNb(nativePtr);
 +      }
 +      private native void terminateAllCalls(long nativePtr);
 +      public synchronized void terminateAllCalls() {
 +              terminateAllCalls(nativePtr);
 +      }
 +      private native Object getCall(long nativePtr, int position);
 +      @SuppressWarnings("unchecked") public synchronized List getCalls() {
 +              int size = getCallsNb(nativePtr);
 +              List<LinphoneCall> calls = new ArrayList<LinphoneCall>(size);
 +              for (int i=0; i < size; i++) {
 +                      calls.add((LinphoneCall)getCall(nativePtr, i));
 +              }
 +              return calls;
        }
 -      public boolean isInConference() {
 -              // TODO Auto-generated method stub
 -              return false;
 -      } 
 -      public void leaveConference() {
 -              // TODO Auto-generated method stub
 +      private native void addAllToConference(long nativePtr);
 +      public synchronized void addAllToConference() {
 +              addAllToConference(nativePtr);
                
        }
 -      public void removeFromConference(LinphoneCall call) {
 -              // TODO Auto-generated method stub
 +      private native void addToConference(long nativePtr, long nativePtrLcall);
 +      public synchronized void addToConference(LinphoneCall call) {
 +              addToConference(nativePtr, getCallPtr(call));
                
        }
 -      public void terminateAllCalls() {
 -              // TODO Auto-generated method stub
 -              
 +      private native void removeFromConference(long nativePtr);
 +      public synchronized void removeFromConference(LinphoneCall call) {
 +              removeFromConference(getCallPtr(call));
        }
 -      public void terminateConference() {
 -              // TODO Auto-generated method stub
 -              
 +
 +      private long getCallPtr(LinphoneCall call) {
 +              return ((LinphoneCallImpl)call).nativePtr;
        }
 -      public void transferCall(LinphoneCall call, String referTo) {
 -              // TODO Auto-generated method stub
 -              
 +
 +      private native int transferCall(long nativePtr, long callPtr, String referTo);
 +      public synchronized void transferCall(LinphoneCall call, String referTo) {
 +              transferCall(nativePtr, getCallPtr(call), referTo);
        }
 -      public void transferCallToAnother(LinphoneCall callToTransfer,
 -                      LinphoneCall destination) {
 -              // TODO Auto-generated method stub
 -              
 +
 +      private native int transferCallToAnother(long nativePtr, long callPtr, long destPtr);
 +      public synchronized void transferCallToAnother(LinphoneCall call, LinphoneCall dest) {
 +              transferCallToAnother(nativePtr, getCallPtr(call), getCallPtr(dest));
        }
 -      public LinphoneCall findCallFromUri(String uri) {
 -              // TODO Auto-generated method stub
 -              return null;
 +
 +      private native Object findCallFromUri(long nativePtr, String uri);
 +      @Override
 +      public synchronized LinphoneCall findCallFromUri(String uri) {
 +              return (LinphoneCall) findCallFromUri(nativePtr, uri);
        }
 -      
++
+       public String getMediaEncryption() {
+               return getMediaEncryption(nativePtr);
+       }
+       public boolean isMediaEncryptionMandatory() {
+               return isMediaEncryptionMandatory(nativePtr);
+       }
+       public void setMediaEncryption(String menc) {
+               setMediaEncryption(nativePtr, menc);            
+       }
+       public void setMediaEncryptionMandatory(boolean yesno) {
+               setMediaEncryptionMandatory(nativePtr, yesno);
+       }
  }