From 327f2c72aa5ab1228ebb02c9dcb755aa6ac51eda Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <Sylvain.Berfini@Belledonne-Communications.com>
Date: Thu, 19 Jul 2012 17:30:35 +0200
Subject: [PATCH] Only display username if unknown caller accourding to custom
 boolean value

---
 res/values/non_localizable_custom.xml      | 1 -
 src/org/linphone/IncomingCallActivity.java | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/res/values/non_localizable_custom.xml b/res/values/non_localizable_custom.xml
index d18553c8f..93383471f 100644
--- a/res/values/non_localizable_custom.xml
+++ b/res/values/non_localizable_custom.xml
@@ -13,7 +13,6 @@
 	<bool name="disable_animations">false</bool>
 	<bool name="lock_statusbar">false</bool>
 	<bool name="only_display_username_if_unknown">true</bool>
-	<bool name="show_full_remote_address_on_incoming_call">true</bool>
 	<bool name="display_messages_time">true</bool> <!-- Used to show the time of each message arrival -->
 
 	<bool name="allow_ringing_while_early_media">true</bool>
diff --git a/src/org/linphone/IncomingCallActivity.java b/src/org/linphone/IncomingCallActivity.java
index 932057d91..f75bd5a06 100644
--- a/src/org/linphone/IncomingCallActivity.java
+++ b/src/org/linphone/IncomingCallActivity.java
@@ -97,10 +97,10 @@ public class IncomingCallActivity extends Activity implements LinphoneOnCallStat
 
 		// To be done after findUriPictureOfContactAndSetDisplayName called
 		mNameView.setText(address.getDisplayName());
-		if (getResources().getBoolean(R.bool.show_full_remote_address_on_incoming_call)) {
-			mNumberView.setText(address.asStringUriOnly());
-		} else {
+		if (getResources().getBoolean(R.bool.only_display_username_if_unknown)) {
 			mNumberView.setText(address.getUserName());
+		} else {
+			mNumberView.setText(address.asStringUriOnly());
 		}
 	}