From caeb3d0422befb9dfc6fb5009e2efa0276770f94 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <Sylvain.Berfini@Belledonne-Communications.com>
Date: Wed, 16 May 2012 14:38:37 +0200
Subject: [PATCH] Final fix for two incall activities issue

---
 AndroidManifest.xml                    | 1 +
 src/org/linphone/IncallActivity.java   | 7 +++++--
 src/org/linphone/LinphoneActivity.java | 1 -
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6e88ac139..845442572 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -76,6 +76,7 @@
 <!--                    android:launchMode="singleTask"-->
             <activity android:name="org.linphone.IncallActivity"
                     android:theme="@android:style/Theme.NoTitleBar"
+                    android:launchMode="singleInstance"
                     android:configChanges="keyboardHidden|orientation">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/src/org/linphone/IncallActivity.java b/src/org/linphone/IncallActivity.java
index 04c40e0fd..32a2544fa 100644
--- a/src/org/linphone/IncallActivity.java
+++ b/src/org/linphone/IncallActivity.java
@@ -112,11 +112,13 @@ public class IncallActivity extends AbstractCalleesActivity implements
 	private boolean mAllowTransfers;
 	
 	@Override
-	protected void onCreate(Bundle savedInstanceState) {		
+	protected void onCreate(Bundle savedInstanceState) {	
+		setActive(true);	
+		
 		if (finishIfAutoRestartAfterACrash(savedInstanceState)) {
+			setActive(false);
 			return;
 		}
-		setActive(true);
 		
 		if (!Version.isXLargeScreen(this))
 		    setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
@@ -153,6 +155,7 @@ public class IncallActivity extends AbstractCalleesActivity implements
 	@Override
 	protected void onPause() {
 		setActive(false);
+		instance = null;
 		super.onPause();
 	}
 
diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java
index 391b24e0f..476a498ce 100644
--- a/src/org/linphone/LinphoneActivity.java
+++ b/src/org/linphone/LinphoneActivity.java
@@ -425,7 +425,6 @@ public class LinphoneActivity extends TabActivity implements ContactPicked
 				if (IncallActivity.active) return;
 				Intent intent = new Intent().setClass(LinphoneActivity.this, IncallActivity.class);
 				startActivityForResult(intent, incall_activity);
-				IncallActivity.active = true;
 			}
 		});
 	}