From ca572887b2b2ad8db516ee35133d01a203b98386 Mon Sep 17 00:00:00 2001
From: Erwan Croze <erwan.croze@belledonne-communications.com>
Date: Thu, 18 May 2017 15:55:17 +0200
Subject: [PATCH] Fix race condition bug with account preference

---
 src/android/org/linphone/LinphonePreferences.java | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/android/org/linphone/LinphonePreferences.java b/src/android/org/linphone/LinphonePreferences.java
index 88f1d4004..4f4bc311c 100644
--- a/src/android/org/linphone/LinphonePreferences.java
+++ b/src/android/org/linphone/LinphonePreferences.java
@@ -512,11 +512,8 @@ public class LinphonePreferences {
 	}
 
 	public String getAccountDisplayName(int n) {
-		LinphoneAddress addr = getProxyConfig(n).getAddress();
-		if(addr != null) {
-			return addr.getDisplayName();
-		}
-		return null;
+		if (getProxyConfig(n) == null || getProxyConfig(n).getAddress() == null) return null;
+		return getProxyConfig(n).getAddress().getDisplayName();
 	}
 
 	public void setAccountUserId(int n, String userId) {