From 67dd84ca8374c98763b499b6f1b012682416e3a7 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Fri, 25 Jul 2014 11:13:07 +0200 Subject: [PATCH] Fix crashes with provisioning activity --- .../linphone/setup/RemoteProvisioningActivity.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/org/linphone/setup/RemoteProvisioningActivity.java b/src/org/linphone/setup/RemoteProvisioningActivity.java index c99ae48d7..3e3d57c1e 100644 --- a/src/org/linphone/setup/RemoteProvisioningActivity.java +++ b/src/org/linphone/setup/RemoteProvisioningActivity.java @@ -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(); + } } }