From bb61dd6ac3c8c9658543d49af3ac9294502d822f Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@linphone.org>
Date: Mon, 1 Dec 2014 12:43:07 +0100
Subject: [PATCH] Improved listener on SetupActivity

---
 src/org/linphone/setup/SetupActivity.java | 29 ++++++++++++++++-------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/org/linphone/setup/SetupActivity.java b/src/org/linphone/setup/SetupActivity.java
index 11ce7e034..f58752e41 100644
--- a/src/org/linphone/setup/SetupActivity.java
+++ b/src/org/linphone/setup/SetupActivity.java
@@ -78,6 +78,26 @@ public class SetupActivity extends FragmentActivity implements OnClickListener,
         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
 	protected void onSaveInstanceState(Bundle outState) {
 		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) {
 		if (state == RegistrationState.RegistrationOk) {
-			lc.removeListener(this);
 			
 			if (LinphoneManager.getLc().getDefaultProxyConfig() != null) {
 				mHandler .post(new Runnable () {
@@ -213,7 +232,6 @@ public class SetupActivity extends FragmentActivity implements OnClickListener,
 				});
 			}
 		} else if (state == RegistrationState.RegistrationFailed) {
-			lc.removeListener(this);
 			mHandler.post(new Runnable () {
 				public void run() {
 					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) {
-//		LinphoneManager.removeListener(registrationListener);
-//		LinphoneManager.addListener(registrationListener);
-		LinphoneCore lc = LinphoneManager.getLcIfManagerNotDestroyedOrNull();
-		if (lc != null) {
-			lc.addListener(this);
-		}
-		
 		saveCreatedAccount(username, password, domain);
 	}