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

Fix crashes with provisioning activity

Browse source
This commit is contained in:
Sylvain Berfini 2014-07-25 11:13:07 +02:00
parent efa9921136
commit 67dd84ca83
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/org/linphone/setup/RemoteProvisioningActivity.java
View file

@ -66,6 +66,7 @@ public class RemoteProvisioningActivity extends Activity implements LinphoneOnRe
protected void onResume() {
super.onResume();
instance = this;
LinphonePreferences.instance().setContext(this);
checkIntentForConfigUri(getIntent());
}
@ -175,8 +176,12 @@ public class RemoteProvisioningActivity extends Activity implements LinphoneOnRe
}
private void goToLinphoneActivity() {
LinphoneService.instance().setActivityToLaunchOnIncomingReceived(LinphoneActivity.class);
finish(); // To prevent the user to come back to this page using back button
startActivity(new Intent().setClass(this, LinphoneActivity.class));
if (LinphoneService.isReady()) {
LinphoneService.instance().setActivityToLaunchOnIncomingReceived(LinphoneActivity.class);
//finish(); // To prevent the user to come back to this page using back button
startActivity(new Intent().setClass(this, LinphoneActivity.class));
} else {
finish();
}
}
}