From f1b8e277701bbf1ef2155b06e34c9a6f183e33e4 Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Mon, 28 Nov 2011 20:03:16 +0100
Subject: [PATCH] Cleaning.

---
 AndroidManifest.xml                    |  5 +++--
 src/org/linphone/LinphoneActivity.java | 11 ++++-------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d79e0e751..8c9384124 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -72,9 +72,10 @@
                 <action android:name="android.intent.action.MAIN" />
             </intent-filter>
          </activity>
-        <activity android:name="org.linphone.IncallActivity"
+<!--                    android:launchMode="singleTask"-->
+            <activity android:name="org.linphone.IncallActivity"
                     android:theme="@android:style/Theme.NoTitleBar"
-        			android:screenOrientation="portrait">
+                    android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
             </intent-filter>
diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java
index bb5d3c0fc..be41c7e5d 100644
--- a/src/org/linphone/LinphoneActivity.java
+++ b/src/org/linphone/LinphoneActivity.java
@@ -22,7 +22,6 @@ package org.linphone;
 import static android.content.Intent.ACTION_MAIN;
 
 import org.linphone.LinphoneSimpleListener.LinphoneOnCallStateChangedListener;
-import org.linphone.core.CallDirection;
 import org.linphone.core.LinphoneCall;
 import org.linphone.core.LinphoneCore;
 import org.linphone.core.Log;
@@ -458,10 +457,8 @@ public class LinphoneActivity extends TabActivity implements
 		startActivityForResult(intent, incall_activity);
 	}
 
-	public void startIncomingCallActivity(LinphoneCall pendingCall) {
-		Intent intent = new Intent()
-			.setClass(this, IncomingCallActivity.class)
-			.putExtra("stringUri", pendingCall.getRemoteAddress().asStringUriOnly());
+	public void startIncomingCallActivity() {
+		Intent intent = new Intent().setClass(this, IncomingCallActivity.class);
 		startActivityForResult(intent, INCOMING_CALL_ACTIVITY);
 	}
 
@@ -476,7 +473,7 @@ public class LinphoneActivity extends TabActivity implements
 		}
 
 		if (state==State.IncomingReceived) {
-			startIncomingCallActivity(call);
+			startIncomingCallActivity();
 		}
 		if (state == State.OutgoingInit) {
 			startIncallActivity();
@@ -542,7 +539,7 @@ public class LinphoneActivity extends TabActivity implements
 		super.onResume();
 		LinphoneCall pendingCall = LinphoneManager.getInstance().getPendingIncomingCall();
 		if (pendingCall != null) {
-			startIncomingCallActivity(pendingCall);
+			startIncomingCallActivity();
 		} 
 	}