From 4da94806563be74755154ba2b08ae5bbaa3e28fc Mon Sep 17 00:00:00 2001
From: Margaux Clerc <margaux.clerc@belledonne-communications.com>
Date: Tue, 4 Aug 2015 15:49:56 +0200
Subject: [PATCH] Fix null pointer exception

---
 src/org/linphone/LinphonePreferences.java | 26 +++++++++++++++--------
 src/org/linphone/setup/SetupActivity.java |  3 +++
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/org/linphone/LinphonePreferences.java b/src/org/linphone/LinphonePreferences.java
index 2d45d9c73..a627312a1 100644
--- a/src/org/linphone/LinphonePreferences.java
+++ b/src/org/linphone/LinphonePreferences.java
@@ -430,8 +430,10 @@ public class LinphonePreferences {
 			prxCfg.setIdentity(identity);
 			prxCfg.done();
 
-			info.setUsername(username);
-			saveAuthInfo(info);
+			if(info != null) {
+				info.setUsername(username);
+				saveAuthInfo(info);
+			}
 		} catch (LinphoneCoreException e) {
 			e.printStackTrace();
 		}
@@ -468,8 +470,10 @@ public class LinphonePreferences {
 
 	public void setAccountUserId(int n, String userId) {
 		LinphoneAuthInfo info = getClonedAuthInfo(n);
-		info.setUserId(userId);
-		saveAuthInfo(info);
+		if(info != null) {
+			info.setUserId(userId);
+			saveAuthInfo(info);
+		}
 	}
 
 	public String getAccountUserId(int n) {
@@ -479,8 +483,10 @@ public class LinphonePreferences {
 
 	public void setAccountPassword(int n, String password) {
 		LinphoneAuthInfo info = getClonedAuthInfo(n);
-		info.setPassword(password);
-		saveAuthInfo(info);
+		if(info != null) {
+			info.setPassword(password);
+			saveAuthInfo(info);
+		}
 	}
 
 	public String getAccountPassword(int n) {
@@ -492,8 +498,10 @@ public class LinphonePreferences {
 
 		try {
 			LinphoneAuthInfo authInfo = getClonedAuthInfo(n);
-			authInfo.setDomain(domain);
-			saveAuthInfo(authInfo);
+			if(authInfo != null) {
+				authInfo.setDomain(domain);
+				saveAuthInfo(authInfo);
+			}
 
 			LinphoneProxyConfig prxCfg = getProxyConfig(n);
 			prxCfg.edit();
@@ -1026,7 +1034,7 @@ public class LinphonePreferences {
 	}
 
 	public boolean isAutoStartEnabled() {
-		return getConfig().getBool("app", "auto_start", false);
+		return getConfig().getBool("app", "auto_start", true);
 	}
 
 	public void setAutoStart(boolean autoStartEnabled) {
diff --git a/src/org/linphone/setup/SetupActivity.java b/src/org/linphone/setup/SetupActivity.java
index bba6e8292..a2f5bfedb 100644
--- a/src/org/linphone/setup/SetupActivity.java
+++ b/src/org/linphone/setup/SetupActivity.java
@@ -309,6 +309,9 @@ public class SetupActivity extends FragmentActivity implements OnClickListener {
 			username = username.substring(4);
 		}
 
+		if (username.contains("@"))
+			username = username.split("@")[0];
+
 		if(domain.startsWith("sip:")) {
 			domain = domain.substring(4);
 		}