From 6933cbe329f8cff022612ec9bfe679158d425829 Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Tue, 13 Dec 2011 12:16:40 +0100
Subject: [PATCH] Fix calls on phone rotation due to immutable intent.

Appears when application launched with intent data.
---
 src/org/linphone/DialerActivity.java | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/org/linphone/DialerActivity.java b/src/org/linphone/DialerActivity.java
index 1ae76d3da..97df4a686 100644
--- a/src/org/linphone/DialerActivity.java
+++ b/src/org/linphone/DialerActivity.java
@@ -31,7 +31,6 @@ import android.app.Activity;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.os.Handler;
 import android.view.KeyEvent;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -51,15 +50,16 @@ import android.widget.Toast;
 public class DialerActivity extends Activity implements LinphoneGuiListener {
 	
 	private TextView mStatus;
-	private Handler mHandler;
 
 	private AddressText mAddress;
 	private CallButton mCall;
 
 	private static DialerActivity instance;
+	private boolean mPreventDoubleCallOnRotation;
 	
 	private static final String CURRENT_ADDRESS = "org.linphone.current-address"; 
 	private static final String CURRENT_DISPLAYNAME = "org.linphone.current-displayname";
+	private static final String PREVENT_DOUBLE_CALL = "prevent_call_on_phone_rotation";
 
 	/**
 	 * @return null if not ready yet
@@ -71,8 +71,6 @@ public class DialerActivity extends Activity implements LinphoneGuiListener {
 	public void onCreate(Bundle savedInstanceState) {
 		setContentView(R.layout.dialer);
 
-		mHandler = new Handler();
-
 		mAddress = (AddressText) findViewById(R.id.SipUri); 
 		((EraseButton) findViewById(R.id.Erase)).setAddressWidget(mAddress);
 
@@ -89,8 +87,14 @@ public class DialerActivity extends Activity implements LinphoneGuiListener {
 		// call to super must be done after all fields are initialized
 		// because it may call this.enterIncallMode
 		super.onCreate(savedInstanceState);
-		
-		checkIfOutgoingCallIntentReceived();
+
+		mPreventDoubleCallOnRotation=savedInstanceState != null
+				&& savedInstanceState.getBoolean(PREVENT_DOUBLE_CALL, false);
+		if (mPreventDoubleCallOnRotation) {
+			Log.i("Prevent launching a new call on rotation");
+		} else {
+			checkIfOutgoingCallIntentReceived();
+		}
 
 		instance = this;
 		super.onCreate(savedInstanceState);
@@ -129,6 +133,7 @@ public class DialerActivity extends Activity implements LinphoneGuiListener {
 		savedInstanceState.putCharSequence(CURRENT_ADDRESS, mAddress.getText());
 		if (mAddress.getDisplayedName() != null)
 			savedInstanceState.putString(CURRENT_DISPLAYNAME,mAddress.getDisplayedName());
+		savedInstanceState.putBoolean(PREVENT_DOUBLE_CALL, mPreventDoubleCallOnRotation);
 	}
 	
 	@Override
@@ -165,6 +170,11 @@ public class DialerActivity extends Activity implements LinphoneGuiListener {
 
 		mAddress.clearDisplayedName();
 		intent.setData(null);
+		// Setting data to null is no use when the activity is recreated
+		// as the intent is immutable.
+		// https://groups.google.com/forum/#!topic/android-developers/vrLdM5mKeoY
+		mPreventDoubleCallOnRotation=true;
+		setIntent(intent);
 
 		LinphoneManager.getInstance().newOutgoingCall(mAddress);
 	}