From 9f1ee3f8681efb1335dbd3899966e586258cc49b Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Fri, 7 Oct 2011 09:52:59 +0200
Subject: [PATCH] Enhance conference activity style + permute calls.

---
 AndroidManifest.xml                         |   2 +-
 res/drawable/conf_permute.png               | Bin 0 -> 1029 bytes
 res/drawable/numpad_big.png                 | Bin 0 -> 1657 bytes
 res/drawable/plus.png                       | Bin 0 -> 1937 bytes
 res/layout/conferencing.xml                 |  54 ++++++------
 res/values/callee_style.xml                 |   2 +
 res/values/conf_style.xml                   |  12 +++
 res/values/strings.xml                      |   7 +-
 src/org/linphone/ConferenceActivity.java    |  86 ++++++++++++++------
 src/org/linphone/LinphoneUtils.java         |   7 ++
 src/org/linphone/core/LinphoneCoreImpl.java |   4 +-
 submodules/linphone                         |   2 +-
 12 files changed, 120 insertions(+), 56 deletions(-)
 create mode 100644 res/drawable/conf_permute.png
 create mode 100644 res/drawable/numpad_big.png
 create mode 100644 res/drawable/plus.png
 create mode 100644 res/values/conf_style.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 5f3d7662b..4e73fb38a 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -61,7 +61,7 @@
             </intent-filter>
          </activity>
 		<activity android:name="org.linphone.ConferenceActivity"
-        			android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
+        			android:theme="@android:style/Theme.NoTitleBar"
         			android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/res/drawable/conf_permute.png b/res/drawable/conf_permute.png
new file mode 100644
index 0000000000000000000000000000000000000000..225b8bf7d6c7b6952324d9fa961e417f656c43f9
GIT binary patch
literal 1029
zcmV+g1p51lP)<h;3K|Lk000e1NJLTq000>P000*V1^@s6{^R5m00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00007bV*G`2ipn;
z4Hpp08U~O600V_dL_t(Y$F<c>Y?M_L2H@wLnGOUSL8G+L@ds>yb`*?;xFN7|;R1~s
z6EX{faRD09m=Hz5I@F+sXrd<S!k{L?h>05G#*HLWj3#Q02m`H_2($=AwEP7vZRc~*
zJMENCsT<Gg-uvBq-tWBc`Qd-EuKe85b?U!7=+5OP{nl70jIMj0%s5vYi=)U;Y3xpP
zIp>|*?v~nBJLOLdF4(OUBOY^?9vss2(uwMk#3;6Aq-NGjr>``>uzkvCN~LImlQO`B
zNIEy&U^p=hYOcA-g2#7PrLB^p^4UORyGnwxZ9Nk;DL$7m9E|`-)`-$Gpcc2HH#pCP
zbsc)}dt;$6A<ELwc!E-J@R<gc5l7Q%HLd+(HCAFN4wZEd&ac7`_ynI_N?#&%(SeO~
zv}`#(vWHSl1wvw`mJRzp#(TIIvyiNycM$z(!E0F8SSTzL$K&XVlL^KAwIjO&`37+a
zBiq)S#;bU&EE8VDp0F>|H4je*D(mnUHWl*?Z;z*h?B-rk@%aq#D8LH5jGM6yTXA@j
zq`EPHK8)2kji-vO*S#~6qk)(>At9dd_&5r9_A&s_jI($MJCVl5Y+KJAQH9S^q9iqf
z8o@<$U_DNRKby?%!Va9mgZKukFdeBl85^Z7CQ(r;wYVR1uqiyc9m@hWmDUjM&&LMb
zgI}==zh(2sCZ=$(g?J%6z9O8R!3F$;M=R+25?w*N<tX99kRZds$N5oRDnOE`!Hm#d
z`U8*E`rBb_3F|+D)0KD~A7D+kt+#e8l2J*tU}o5z38L=BoA{+l66_32JQ0fY`fxrQ
zx8N&uh)B&yrd%iu30fpW&hNk@sK<{%*lM;tXt4xY{DC7lSZvL7jMPd(YF_@Z{jHgD
z*zkF%kvoIn>#zv#hQe#d)gj`ppjT(0`FM9OH?CP`^GC<{?s{dZh3mgxgTl$5KRq{l
z@qJAJU|qO!HaI#MYH2_E@LlL*seSp(=|ririIL6sju-XFM{Cv8H%r$olCE!7y3lXd
z+$F1U8y*N+EeVtk;w^lOz1_Lo$;t?Z6A6p+N2^c9V_$DGy<wqrU9-WyP8a(+oquDO
z#zJ9P=*BC`tsni}xm>aG{XkQ@<lp~TwDr`~<M;gOUITpx^lyHD(y||DY&WfY`DN$+
zlr#R)VKmURhd3sR5Q}0;aV*<;%%PfGRRH)GMsp;xyL|jY00000NkvXXu0mjfR-5Q%

literal 0
HcmV?d00001

diff --git a/res/drawable/numpad_big.png b/res/drawable/numpad_big.png
new file mode 100644
index 0000000000000000000000000000000000000000..2f17068694377fdba303fe2d5185da49b6bce007
GIT binary patch
literal 1657
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
D;xQ{+

literal 0
HcmV?d00001

diff --git a/res/drawable/plus.png b/res/drawable/plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..20327957a8f4107947a86a16050586d8bb625426
GIT binary patch
literal 1937
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
Xhq81V$vPHw00000NkvXXu0mjfg$tbI

literal 0
HcmV?d00001

diff --git a/res/layout/conferencing.xml b/res/layout/conferencing.xml
index a0d20e514..175a8c470 100644
--- a/res/layout/conferencing.xml
+++ b/res/layout/conferencing.xml
@@ -7,35 +7,36 @@
          android:paddingRight="8dp">
 
 
-	<LinearLayout android:id="@+id/conf_header" android:layout_alignParentTop="true"
+	<LinearLayout android:id="@+id/conf_control_buttons" 
+		android:layout_width="fill_parent" android:layout_height="wrap_content"
+		android:layout_alignParentTop="true">
+		<Button android:id="@+id/conf_simple_permute" style="@style/conf_icon_text_button"
+			android:drawableTop="@drawable/conf_permute" android:text="@string/conf_simple_permute_bt_txt"/>
+		<Button android:id="@+id/conf_simple_merge" style="@style/conf_icon_text_button"
+			android:drawableTop="@drawable/conf_merge" 
+		 	android:text="@string/conf_simple_merge_bt_txt"/>
+		<Button android:id="@+id/conf_simple_transfer" style="@style/conf_icon_text_button"
+			android:drawableTop="@drawable/conf_transfer"
+			android:text="@string/conf_simple_transfer_bt_txt" />
+	</LinearLayout>
+
+	<LinearLayout android:id="@+id/conf_header" android:layout_below="@id/conf_control_buttons"
 			android:orientation="vertical" android:layout_marginBottom="10dip"
-			android:layout_width="fill_parent" android:layout_height="wrap_content" >
+			android:layout_width="fill_parent" android:layout_height="wrap_content" 
+			android:layout_alignWithParentIfMissing="true">
       	<TextView android:text="@string/conf_text_you_host_a_conference"
         	android:layout_width="fill_parent" android:layout_height="wrap_content" 
         	android:gravity="center"/>
-<!--      	<TextView android:id="@+id/conf_self_attending"-->
-<!--        	android:layout_width="fill_parent" android:layout_height="wrap_content"/>-->
 	</LinearLayout>
 
 
 
 
 
-	<LinearLayout android:id="@+id/conf_bottom_row" android:layout_alignParentBottom="true"
-		android:layout_width="fill_parent" android:layout_height="wrap_content">
-		<Button android:text="@string/AddCallButtonText" android:id="@+id/addCall"
-	     android:layout_width="wrap_content" android:layout_height="wrap_content" />
-
-		<org.linphone.ui.HangCallButton android:id="@+id/incallHang" android:layout_width="0dip" android:layout_height="wrap_content"
-		 android:src="@drawable/mini_stopcall_red"  android:layout_weight="1" />
-		 
-		<Button android:id="@+id/incallNumpadShow" android:text="@string/show_send_dtmfs_button"  
-		 android:layout_width="wrap_content" android:layout_height="wrap_content"/>
-	</LinearLayout>
 
 
-	<LinearLayout android:id="@+id/conf_menu_row" 
-			android:layout_above="@id/conf_bottom_row"
+	<LinearLayout android:id="@+id/conf_speaker_mic_row" 
+			android:layout_alignParentBottom="true" 
 			android:layout_width="fill_parent" android:layout_height="wrap_content"> 
 	<ToggleButton android:id="@+id/toggleMuteMic" style="@style/conf_toggle_button" 
 		android:textOn="@string/mutemic_button_txt" android:textOff="@string/mutemic_button_txt" />
@@ -46,15 +47,20 @@
 		android:visibility="gone"/>
 	</LinearLayout>
 
-	<LinearLayout android:id="@+id/conf_simple_actions" android:visibility="visible" 
-		android:layout_width="fill_parent" android:layout_height="wrap_content"
-		android:layout_above="@id/conf_menu_row"
-		android:layout_centerInParent="true">
-		<Button android:id="@+id/conf_simple_merge" android:text="@string/conf_simple_merge" android:visibility="gone"
-			android:layout_width="wrap_content" android:layout_height="wrap_content" />
+	<LinearLayout android:id="@+id/conf_terminate_row"
+		android:layout_above="@id/conf_speaker_mic_row"
+		android:layout_width="fill_parent" android:layout_height="wrap_content">
+		<Button android:text="@string/AddCallButtonText" android:id="@+id/addCall"
+			style="@style/conf_icon_text_button" android:drawableTop="@drawable/plus" />
+
+		<Button	android:id="@+id/incallHang" style="@style/conf_icon_text_button"
+			android:drawableTop="@drawable/stopcall_red" android:text="@string/hangup"/>
+
+		<Button android:id="@+id/incallNumpadShow" style="@style/conf_icon_text_button"
+			android:text="@string/show_send_dtmfs_button" android:drawableTop="@drawable/numpad_big" />
 	</LinearLayout>
 
-	<FrameLayout android:id="@+id/incall_picture_box" android:layout_above="@id/conf_simple_actions"
+	<FrameLayout android:id="@+id/incall_picture_box" android:layout_above="@id/conf_terminate_row"
 			android:layout_height="wrap_content" android:layout_width="wrap_content"
 			android:layout_centerInParent="true">
 		<ImageView android:id="@+id/incall_picture" android:visibility="gone"
diff --git a/res/values/callee_style.xml b/res/values/callee_style.xml
index 37a3edcc6..a6fe15731 100644
--- a/res/values/callee_style.xml
+++ b/res/values/callee_style.xml
@@ -5,6 +5,8 @@
         <item name="android:layout_height">fill_parent</item>
         <item name="android:layout_weight">1</item>
         <item name="android:gravity">fill_vertical</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:ellipsize">marquee</item>
     </style>
 
     <style name="callee_address" parent="@android:style/TextAppearance.Medium">
diff --git a/res/values/conf_style.xml b/res/values/conf_style.xml
new file mode 100644
index 000000000..3aa046546
--- /dev/null
+++ b/res/values/conf_style.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="conf_icon_text_button" parent="@android:style/Widget.Button">
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_width">0dip</item>
+        <item name="android:layout_weight">1</item>
+        <item name="android:gravity">bottom|center_horizontal</item>
+        <item name="android:paddingLeft">15sp</item>
+        <item name="android:paddingRight">15sp</item>
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 020dafc25..a53ef3e49 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -41,8 +41,11 @@
 	<string name="conf_choice_remove_from_conference">Remove from the conference</string>
 	<string name="conf_choice_terminate">Terminate</string>
 
-	<string name="conf_simple_merge">Merge calls</string>
-	
+	<string name="hangup">Hang up</string>
+	<string name="conf_simple_merge_bt_txt">Merge</string>
+	<string name="conf_simple_transfer_bt_txt">Transfer</string>
+	<string name="conf_simple_permute_bt_txt">Permute</string>
+	<string name="conf_simple_no_current_call">No active call</string>
 	<string name="show_send_dtmfs_button">DTMFs</string>
 
 	<string name="conf_text_you_host_a_conference">You host a conference</string>
diff --git a/src/org/linphone/ConferenceActivity.java b/src/org/linphone/ConferenceActivity.java
index 146d4a789..477878e71 100644
--- a/src/org/linphone/ConferenceActivity.java
+++ b/src/org/linphone/ConferenceActivity.java
@@ -76,9 +76,8 @@ public class ConferenceActivity extends ListActivity implements
 		return LinphoneManager.getLc();
 	}
 
-	@SuppressWarnings("unchecked")
 	protected List<LinphoneCall> getInitialCalls() {
-		return lc().getCalls();
+		return LinphoneUtils.getLinphoneCalls(lc());
 	}
 
 	// End override to test block
@@ -92,7 +91,10 @@ public class ConferenceActivity extends ListActivity implements
 
 
 
+	@SuppressWarnings("unused")
 	private void workaroundStatusBarBug() {
+		// call from onCreate to get a clean display on full screen no icons
+		// otherwise the upper side of the activity may be corrupted
 		getWindow().setFlags(
 				WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS,
 				WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS);
@@ -114,30 +116,33 @@ public class ConferenceActivity extends ListActivity implements
 		confHeaderView.setOnClickListener(this);
 
 		findViewById(R.id.addCall).setOnClickListener(this);
-		findViewById(R.id.incallHang).setOnClickListener(this);
 
 		findViewById(R.id.incallNumpadShow).setOnClickListener(this);
 		findViewById(R.id.conf_simple_merge).setOnClickListener(this);
+		findViewById(R.id.conf_simple_transfer).setOnClickListener(this);
+		findViewById(R.id.conf_simple_permute).setOnClickListener(this);
 
 		findViewById(R.id.toggleMuteMic).setOnClickListener(this);
 		findViewById(R.id.toggleSpeaker).setOnClickListener(this);
 
 		waitHelper = new LinphoneManagerWaitHelper(this, this);
 		waitHelper.doManagerDependentOnCreate();
-		workaroundStatusBarBug();
+//		workaroundStatusBarBug();
 	}
 
 	@Override
 	public void onCreateWhenManagerReady() {
 		List<LinphoneCall> calls = getInitialCalls();
 		setListAdapter(new CalleeListAdapter(calls));
+		
+		findViewById(R.id.incallHang).setOnClickListener(this);
 	}
 	@Override
 	public void onResumeWhenManagerReady() {
 		registerLinphoneListener(true);
 		updateCalleeImage();
 		updateConfState();
-		updateMergeButtonState();
+		updateSimpleControlButtons();
 	}
 
 	@Override
@@ -251,6 +256,7 @@ public class ConferenceActivity extends ListActivity implements
 			intent.putExtra(UriPickerActivity.EXTRA_PICKER_TYPE, UriPickerActivity.EXTRA_PICKER_TYPE_ADD);
 			startActivityForResult(intent, ID_ADD_CALL);
 			pauseCurrentCallOrLeaveConference();
+			updateConfState();
 			break;
 		case R.id.conf_header:
 			View content = getLayoutInflater().inflate(R.layout.conf_choices_admin, null);
@@ -261,12 +267,15 @@ public class ConferenceActivity extends ListActivity implements
 					switch (v.getId()) {
 					case R.id.conf_add_all_to_conference_button:
 						lc().addAllToConference();
+						updateConfState();
 						break;
 					case R.id.conf_enter_button:
 						lc().enterConference();
+						updateConfState();
 						break;
 					case R.id.conf_leave_button:
 						lc().leaveConference();
+						updateConfState();
 						break;
 					case R.id.conf_terminate_button:
 						lc().terminateConference();
@@ -294,8 +303,27 @@ public class ConferenceActivity extends ListActivity implements
 			showDialog(numpad_dialog_id);
 			break;
 		case R.id.conf_simple_merge:
+			findViewById(R.id.conf_control_buttons).setVisibility(GONE);
 			lc().addAllToConference();
 			break;
+		case R.id.conf_simple_transfer:
+			findViewById(R.id.conf_control_buttons).setVisibility(GONE);
+			LinphoneCall tCall = lc().getCurrentCall();
+			if (tCall != null) {
+				prepareForTransferingExistingCall(tCall);
+			} else {
+				Toast.makeText(this, R.string.conf_simple_no_current_call, Toast.LENGTH_SHORT).show();
+			}
+			break;
+		case R.id.conf_simple_permute:
+			findViewById(R.id.conf_control_buttons).setVisibility(GONE);
+			for (LinphoneCall call : LinphoneUtils.getLinphoneCalls(lc())) {
+				if (State.Paused == call.getState()) {
+					lc().resumeCall(call);
+					break;
+				}
+			}
+			break;
 		case R.id.toggleMuteMic:
 			lc().muteMic(((ToggleButton) v).isChecked());
 			break;
@@ -312,6 +340,23 @@ public class ConferenceActivity extends ListActivity implements
 
 	}
 
+	private void prepareForTransferingExistingCall(final LinphoneCall call) {
+		final List<LinphoneCall> existingCalls = LinphoneUtils.getLinphoneCalls(lc());
+		existingCalls.remove(call);
+		final List<String> numbers = new ArrayList<String>(existingCalls.size());
+		Resources r = getResources();
+		for(LinphoneCall c : existingCalls) {
+			numbers.add(LinphoneManager.extractADisplayName(r, c.getRemoteAddress()));
+		}
+		ListAdapter adapter = new ArrayAdapter<String>(ConferenceActivity.this, android.R.layout.select_dialog_item, numbers);
+		DialogInterface.OnClickListener l = new DialogInterface.OnClickListener() {
+			public void onClick(DialogInterface dialog, int which) {
+				lc().transferCallToAnother(call, existingCalls.get(which));
+			}
+		};
+		new AlertDialog.Builder(ConferenceActivity.this).setAdapter(adapter, l).create().show();
+	}
+
 	private class CallActionListener implements OnClickListener {
 		private LinphoneCall call;
 		private Dialog dialog;
@@ -344,20 +389,7 @@ public class ConferenceActivity extends ListActivity implements
 				}
 				break;
 			case R.id.transfer_existing:
-				@SuppressWarnings("unchecked") final List<LinphoneCall> existingCalls = lc().getCalls();
-				existingCalls.remove(call);
-				final List<String> numbers = new ArrayList<String>(existingCalls.size());
-				Resources r = getResources();
-				for(LinphoneCall c : existingCalls) {
-					numbers.add(LinphoneManager.extractADisplayName(r, c.getRemoteAddress()));
-				}
-				ListAdapter adapter = new ArrayAdapter<String>(ConferenceActivity.this, android.R.layout.select_dialog_item, numbers);
-				DialogInterface.OnClickListener l = new DialogInterface.OnClickListener() {
-					public void onClick(DialogInterface dialog, int which) {
-						lc().transferCallToAnother(call, existingCalls.get(which));
-					}
-				};
-				new AlertDialog.Builder(ConferenceActivity.this).setAdapter(adapter, l).create().show();
+				prepareForTransferingExistingCall(call);
 				break;
 			case R.id.transfer_new:
 				Intent intent = new Intent().setClass(ConferenceActivity.this, UriPickerActivity.class);
@@ -429,6 +461,7 @@ public class ConferenceActivity extends ListActivity implements
 		}
 
 		public View getView(int position, View v, ViewGroup parent) {
+			Log.i("ConferenceActivity.getView(",position,") out of ", linphoneCalls.size());
 			if (v == null) {
 				if (Version.sdkAboveOrEqual(Version.API06_ECLAIR_20)) {
 					v = getLayoutInflater().inflate(R.layout.conf_callee, null);
@@ -542,7 +575,7 @@ public class ConferenceActivity extends ListActivity implements
 			ImageView pictureView = (ImageView) v.findViewById(R.id.picture);
 			if (numberOfCalls != 1) {
 				// May be greatly sped up using a drawable cache
-				Uri uri = LinphoneUtils.findUriPictureOfContactAndSetDisplayName(call.getRemoteAddress(), getContentResolver());
+				Uri uri = LinphoneUtils.findUriPictureOfContactAndSetDisplayName(address, getContentResolver());
 				LinphoneUtils.setImagePictureFromUri(ConferenceActivity.this, pictureView, uri, R.drawable.unknown_person);
 				pictureView.setVisibility(VISIBLE);
 			} else {
@@ -571,13 +604,14 @@ public class ConferenceActivity extends ListActivity implements
 
 	private Handler mHandler = new Handler();
 
-	private void updateMergeButtonState() {
+	private void updateSimpleControlButtons() {
+		LinphoneCall activeCall = lc().getCurrentCall();
+		View controlLayout = findViewById(R.id.conf_control_buttons);
 		int callNb = lc().getCallsNb();
-		int confSize = lc().getConferenceSize();
-		if (lc().isInConference()) confSize--;
-		boolean showSimpleActions = callNb >= 2 && confSize != callNb;
-		findViewById(R.id.conf_simple_merge).setVisibility(showSimpleActions ? VISIBLE : GONE);
+		boolean hide = activeCall == null || callNb !=2 || lc().getConferenceSize() > 0;
+		controlLayout.setVisibility(hide ? GONE : VISIBLE);
 	}
+
 	public void onCallStateChanged(final LinphoneCall call, final State state,
 			final String message) {
 		final String stateStr = call + " " + state.toString();
@@ -586,7 +620,7 @@ public class ConferenceActivity extends ListActivity implements
 			public void run() {
 				CalleeListAdapter adapter = (CalleeListAdapter) getListAdapter();
 				Log.d("ConferenceActivity applying state ",stateStr);
-				updateMergeButtonState();
+				updateSimpleControlButtons();
 				updateCalleeImage();
 				if (state == State.IncomingReceived || state == State.OutgoingRinging) {
 					if (!adapter.linphoneCalls.contains(call)) {
diff --git a/src/org/linphone/LinphoneUtils.java b/src/org/linphone/LinphoneUtils.java
index e3d6c628e..8ff6c91dd 100644
--- a/src/org/linphone/LinphoneUtils.java
+++ b/src/org/linphone/LinphoneUtils.java
@@ -22,8 +22,11 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.List;
 
 import org.linphone.core.LinphoneAddress;
+import org.linphone.core.LinphoneCall;
+import org.linphone.core.LinphoneCore;
 import org.linphone.core.Log;
 import org.linphone.mediastream.Version;
 import org.linphone.mediastream.video.capture.hwconf.Hacks;
@@ -124,5 +127,9 @@ public final class LinphoneUtils {
 		}
 	}
 
+	@SuppressWarnings("unchecked")
+	public static final List<LinphoneCall> getLinphoneCalls(LinphoneCore lc) {
+		return (List<LinphoneCall>) lc.getCalls();
+	}
 }
 
diff --git a/src/org/linphone/core/LinphoneCoreImpl.java b/src/org/linphone/core/LinphoneCoreImpl.java
index 8a40cdb9f..0f91922d7 100644
--- a/src/org/linphone/core/LinphoneCoreImpl.java
+++ b/src/org/linphone/core/LinphoneCoreImpl.java
@@ -522,12 +522,12 @@ class LinphoneCoreImpl implements LinphoneCore {
 	public synchronized void terminateAllCalls() {
 		terminateAllCalls(nativePtr);
 	}
-	private native long getCall(long nativePtr, int position);
+	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(new LinphoneCallImpl(getCall(nativePtr, i)));
+			calls.add((LinphoneCall)getCall(nativePtr, i));
 		}
 		return calls;
 	}
diff --git a/submodules/linphone b/submodules/linphone
index b7dacbd01..490945660 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit b7dacbd01a6a9f84560033413f000597f469a718
+Subproject commit 490945660d975abd2520f92a95ef781b1eaff7e3