Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix calls on phone rotation due to immutable intent.

Browse source 
Appears when application launched with intent data.
This commit is contained in:
Guillaume Beraudo 2011-12-13 12:16:40 +01:00
parent d198bef5a1
commit 6933cbe329
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/org/linphone/DialerActivity.java
View file

@ -31,7 +31,6 @@ import android.app.Activity;
import android.content.Intent; import android.content.Intent;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler;
import android.view.KeyEvent; import android.view.KeyEvent;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
@ -51,15 +50,16 @@ import android.widget.Toast;
public class DialerActivity extends Activity implements LinphoneGuiListener { public class DialerActivity extends Activity implements LinphoneGuiListener {
private TextView mStatus; private TextView mStatus;
private Handler mHandler;
private AddressText mAddress; private AddressText mAddress;
private CallButton mCall; private CallButton mCall;
private static DialerActivity instance; private static DialerActivity instance;
private boolean mPreventDoubleCallOnRotation;
private static final String CURRENT_ADDRESS = "org.linphone.current-address"; private static final String CURRENT_ADDRESS = "org.linphone.current-address";
private static final String CURRENT_DISPLAYNAME = "org.linphone.current-displayname"; 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 * @return null if not ready yet
@ -71,8 +71,6 @@ public class DialerActivity extends Activity implements LinphoneGuiListener {
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
setContentView(R.layout.dialer); setContentView(R.layout.dialer);
mHandler = new Handler();
mAddress = (AddressText) findViewById(R.id.SipUri); mAddress = (AddressText) findViewById(R.id.SipUri);
((EraseButton) findViewById(R.id.Erase)).setAddressWidget(mAddress); ((EraseButton) findViewById(R.id.Erase)).setAddressWidget(mAddress);
@ -90,7 +88,13 @@ public class DialerActivity extends Activity implements LinphoneGuiListener {
// because it may call this.enterIncallMode // because it may call this.enterIncallMode
super.onCreate(savedInstanceState); 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; instance = this;
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
@ -129,6 +133,7 @@ public class DialerActivity extends Activity implements LinphoneGuiListener {
savedInstanceState.putCharSequence(CURRENT_ADDRESS, mAddress.getText()); savedInstanceState.putCharSequence(CURRENT_ADDRESS, mAddress.getText());
if (mAddress.getDisplayedName() != null) if (mAddress.getDisplayedName() != null)
savedInstanceState.putString(CURRENT_DISPLAYNAME,mAddress.getDisplayedName()); savedInstanceState.putString(CURRENT_DISPLAYNAME,mAddress.getDisplayedName());
savedInstanceState.putBoolean(PREVENT_DOUBLE_CALL, mPreventDoubleCallOnRotation);
} }
@Override @Override
@ -165,6 +170,11 @@ public class DialerActivity extends Activity implements LinphoneGuiListener {
mAddress.clearDisplayedName(); mAddress.clearDisplayedName();
intent.setData(null); 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); LinphoneManager.getInstance().newOutgoingCall(mAddress);
} }