From 4196b5c28b22ae36e0014448661616a8d8f0d7ca Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Tue, 13 Nov 2012 12:07:24 +0100
Subject: [PATCH] New bools to customize in-app contact editor

---
 res/values/non_localizable_custom.xml     |  3 +++
 src/org/linphone/EditContactFragment.java | 29 +++++++++++++++++++----
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/res/values/non_localizable_custom.xml b/res/values/non_localizable_custom.xml
index 93ee7436a..d8eea5203 100644
--- a/res/values/non_localizable_custom.xml
+++ b/res/values/non_localizable_custom.xml
@@ -23,6 +23,9 @@
 	<bool name="use_first_login_activity">true</bool>
 	
 	<bool name="use_android_native_contact_edit_interface">false</bool>
+	<bool name="hide_phone_numbers_in_editor">false</bool>
+	<bool name="hide_sip_addresses_in_editor">false</bool>
+	<bool name="forbid_empty_new_contact_in_editor">false</bool>
 	
 	<bool name="disable_animations">false</bool>
     <bool name="show_statusbar_only_on_dialer">true</bool>
diff --git a/src/org/linphone/EditContactFragment.java b/src/org/linphone/EditContactFragment.java
index acdf1b7b3..724fc4c6c 100644
--- a/src/org/linphone/EditContactFragment.java
+++ b/src/org/linphone/EditContactFragment.java
@@ -63,6 +63,19 @@ public class EditContactFragment extends Fragment {
 			@Override
 			public void onClick(View v) {
 				if (isNewContact) {
+					if (getResources().getBoolean(R.bool.forbid_empty_new_contact_in_editor)) {
+						boolean areAllFielsEmpty = true;
+						for (NewOrUpdatedNumberOrAddress nounoa : numbersAndAddresses) {
+							if (nounoa.newNumberOrAddress != null && !nounoa.newNumberOrAddress.equals("")) {
+								areAllFielsEmpty = false;
+								break;
+							}
+						}
+						if (areAllFielsEmpty) {
+							getFragmentManager().popBackStackImmediate();
+							return;
+						}
+					}
 					createNewContact();
 				} else {
 					updateExistingContact();
@@ -166,6 +179,9 @@ public class EditContactFragment extends Fragment {
 					
 					numberOrAddress = numberOrAddress.replace("sip:", "");
 				}
+				if ((getResources().getBoolean(R.bool.hide_phone_numbers_in_editor) && !isSip) || (getResources().getBoolean(R.bool.hide_sip_addresses_in_editor) && isSip)) {
+					continue;
+				}
 				
 				final NewOrUpdatedNumberOrAddress nounoa = new NewOrUpdatedNumberOrAddress(numberOrAddress, isSip);
 				numbersAndAddresses.add(nounoa);
@@ -219,10 +235,15 @@ public class EditContactFragment extends Fragment {
 		}
 
 		// Add one for phone numbers, one for SIP address
-		addEmptyRowToAllowNewNumberOrAddress(controls, false);
-		if (firstSipAddressIndex == -1) { // Only add new SIP address field if there is no SIP address yet
-			firstSipAddressIndex = controls.getChildCount() - 2; // Update the value to alwas display phone numbers before SIP accounts
-			addEmptyRowToAllowNewNumberOrAddress(controls, true);
+		if (!getResources().getBoolean(R.bool.hide_phone_numbers_in_editor)) {
+			addEmptyRowToAllowNewNumberOrAddress(controls, false);
+		}
+		
+		if (!getResources().getBoolean(R.bool.hide_sip_addresses_in_editor)) {
+			if (firstSipAddressIndex == -1) { // Only add new SIP address field if there is no SIP address yet
+				firstSipAddressIndex = controls.getChildCount() - 2; // Update the value to alwas display phone numbers before SIP accounts
+				addEmptyRowToAllowNewNumberOrAddress(controls, true);
+			}
 		}
 	}