From d271ffe2b59c7d131f2f98a0909768977639a78f Mon Sep 17 00:00:00 2001 From: Guillaume Beraudo Date: Fri, 11 Mar 2011 11:59:32 +0100 Subject: [PATCH] Fix too late to initialize payloads on first launch --- src/org/linphone/FirstLoginActivity.java | 2 ++ src/org/linphone/LinphoneActivity.java | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/org/linphone/FirstLoginActivity.java b/src/org/linphone/FirstLoginActivity.java index 4a6b9dbce..d1a70d33b 100644 --- a/src/org/linphone/FirstLoginActivity.java +++ b/src/org/linphone/FirstLoginActivity.java @@ -82,6 +82,8 @@ public class FirstLoginActivity extends Activity implements OnClickListener { writePreference(R.string.pref_username_key, login.getText().toString()); writePreference(R.string.pref_passwd_key, password.getText().toString()); + LinphoneManager.getInstance().initializePayloads(); + try { LinphoneManager.getInstance().initFromConf(getApplicationContext()); } catch (Throwable e) { diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java index 75dd15244..d3f208ba0 100644 --- a/src/org/linphone/LinphoneActivity.java +++ b/src/org/linphone/LinphoneActivity.java @@ -151,7 +151,6 @@ public class LinphoneActivity extends TabActivity { if (requestCode == FIRST_LOGIN_ACTIVITY) { if (resultCode == RESULT_OK) { Toast.makeText(this, getString(R.string.ec_calibration_launch_message), Toast.LENGTH_LONG).show(); - LinphoneManager.getInstance().initializePayloads(); try { LinphoneManager.getInstance().startEcCalibration(new EcCalibrationListener() { public void onEcCalibrationStatus(EcCalibratorStatus status, int delayMs) {