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

Improved listener on SetupActivity

Browse source
This commit is contained in:
Sylvain Berfini 2014-12-01 12:43:07 +01:00
parent d227adbd1b
commit bb61dd6ac3
1 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/org/linphone/setup/SetupActivity.java
View file

@ -78,6 +78,26 @@ public class SetupActivity extends FragmentActivity implements OnClickListener,
instance = this; instance = this;
}; };
@Override
protected void onResume() {
super.onResume();
LinphoneCore lc = LinphoneManager.getLcIfManagerNotDestroyedOrNull();
if (lc != null) {
lc.addListener(this);
}
}
@Override
protected void onPause() {
LinphoneCore lc = LinphoneManager.getLcIfManagerNotDestroyedOrNull();
if (lc != null) {
lc.removeListener(this);
}
super.onPause();
}
@Override @Override
protected void onSaveInstanceState(Bundle outState) { protected void onSaveInstanceState(Bundle outState) {
outState.putSerializable("CurrentFragment", currentFragment); outState.putSerializable("CurrentFragment", currentFragment);
@ -203,7 +223,6 @@ public class SetupActivity extends FragmentActivity implements OnClickListener,
public void registrationState(LinphoneCore lc, LinphoneProxyConfig cfg, LinphoneCore.RegistrationState state, String smessage) { public void registrationState(LinphoneCore lc, LinphoneProxyConfig cfg, LinphoneCore.RegistrationState state, String smessage) {
if (state == RegistrationState.RegistrationOk) { if (state == RegistrationState.RegistrationOk) {
lc.removeListener(this);
if (LinphoneManager.getLc().getDefaultProxyConfig() != null) { if (LinphoneManager.getLc().getDefaultProxyConfig() != null) {
mHandler .post(new Runnable () { mHandler .post(new Runnable () {
@ -213,7 +232,6 @@ public class SetupActivity extends FragmentActivity implements OnClickListener,
}); });
} }
} else if (state == RegistrationState.RegistrationFailed) { } else if (state == RegistrationState.RegistrationFailed) {
lc.removeListener(this);
mHandler.post(new Runnable () { mHandler.post(new Runnable () {
public void run() { public void run() {
Toast.makeText(SetupActivity.this, getString(R.string.first_launch_bad_login_password), Toast.LENGTH_LONG).show(); Toast.makeText(SetupActivity.this, getString(R.string.first_launch_bad_login_password), Toast.LENGTH_LONG).show();
@ -223,13 +241,6 @@ public class SetupActivity extends FragmentActivity implements OnClickListener,
} }
public void checkAccount(String username, String password, String domain) { public void checkAccount(String username, String password, String domain) {
// LinphoneManager.removeListener(registrationListener);
// LinphoneManager.addListener(registrationListener);
LinphoneCore lc = LinphoneManager.getLcIfManagerNotDestroyedOrNull();
if (lc != null) {
lc.addListener(this);
}
saveCreatedAccount(username, password, domain); saveCreatedAccount(username, password, domain);
} }