From f07f35e00bef20d09e99f2b8d0d08a3ddab7b2cc Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Fri, 16 Nov 2012 14:42:43 +0100
Subject: [PATCH] Added displayname/username and expire preferences

---
 res/values-FR/strings.xml               |  5 ++++
 res/values/non_localizable_defaults.xml |  3 +++
 res/values/non_localizable_strings.xml  |  4 +++
 res/values/strings.xml                  |  5 ++++
 res/xml/preferences.xml                 | 34 ++++++++++++++++++++++---
 src/org/linphone/LinphoneManager.java   |  7 ++++-
 submodules/linphone                     |  2 +-
 7 files changed, 54 insertions(+), 6 deletions(-)

diff --git a/res/values-FR/strings.xml b/res/values-FR/strings.xml
index 400e46e35..4e519103f 100644
--- a/res/values-FR/strings.xml
+++ b/res/values-FR/strings.xml
@@ -348,4 +348,9 @@
 	<string name="contact_first_name">Prénom</string>
 	<string name="contact_last_name">Nom</string>
 	
+	<string name="pref_primary_account_title">Compte principal</string>
+	<string name="pref_display_name_title">Nom d\'affichage</string>
+	<string name="pref_user_name_title">Nom d\'utilisateur</string>
+	<string name="pref_expire_title">Expiration</string>
+	
 </resources>
diff --git a/res/values/non_localizable_defaults.xml b/res/values/non_localizable_defaults.xml
index 1a2ad3c1d..e41e74da7 100644
--- a/res/values/non_localizable_defaults.xml
+++ b/res/values/non_localizable_defaults.xml
@@ -51,6 +51,9 @@
     <string name="pref_incoming_call_timeout_default">30</string>
     <string name="pref_image_sharing_server_default">https://www.linphone.org:444/upload.php</string>
     <string name="pref_audio_use_specific_mode_default">0</string>
+    <string name="pref_expire_default">600</string>
+    <string name="pref_display_name_default">Linphone Android</string>
+    <string name="pref_user_name_default">linphone.android</string>
     
     <bool name="pref_auto_accept_friends_default">false</bool>
     
diff --git a/res/values/non_localizable_strings.xml b/res/values/non_localizable_strings.xml
index ab2694606..cc82cf109 100644
--- a/res/values/non_localizable_strings.xml
+++ b/res/values/non_localizable_strings.xml
@@ -102,4 +102,8 @@
     <string name="pref_video_port_key">pref_video_port_key</string>
     <string name="pref_audio_port_key">pref_audio_port_key</string>
     <string name="pref_incoming_call_timeout_key">pref_incoming_expire_key</string>
+    
+    <string name="pref_display_name_key">pref_display_name_key</string>
+    <string name="pref_user_name_key">pref_user_name_key</string>
+    <string name="pref_expire_key">pref_expire_key</string>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6ddb232c3..aa07f3cdb 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -394,4 +394,9 @@
 	<string name="phone_number">Phone number</string>
 	<string name="contact_first_name">First name</string>
 	<string name="contact_last_name">Last name</string>
+	
+	<string name="pref_primary_account_title">Primary account</string>
+	<string name="pref_display_name_title">Display name</string>
+	<string name="pref_user_name_title">Username</string>
+	<string name="pref_expire_title">Expire</string>
 </resources>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 93d8f4927..54e0b8cfe 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -266,10 +266,15 @@
 		<PreferenceScreen 
 		    android:title="@string/pref_advanced">
 	
-			<CheckBoxPreference 
-			    android:key="@string/pref_debug_key"
-				android:title="@string/pref_debug" 
-				android:defaultValue="@bool/pref_debug_default"/>
+		    <PreferenceCategory
+		        android:title="@string/pref_debug">
+		        
+				<CheckBoxPreference 
+				    android:key="@string/pref_debug_key"
+					android:title="@string/pref_debug" 
+					android:defaultValue="@bool/pref_debug_default"/>
+			
+			</PreferenceCategory>
 			
 			<CheckBoxPreference 
 			    android:defaultValue="@bool/pref_animation_enable_default"
@@ -286,6 +291,27 @@
 			    android:title="@string/pref_incoming_call_timeout_title"
 			    android:defaultValue="@string/pref_incoming_call_timeout_default"
 			    android:layout="@layout/hidden"/>
+			 
+			 <EditTextPreference 
+				android:key="@string/pref_expire_key"
+				android:title="@string/pref_expire_title"
+			  	android:defaultValue="@string/pref_expire_default"
+			  	android:numeric="integer" />
+			 
+			 <PreferenceCategory
+			     android:title="@string/pref_primary_account_title">
+			     
+			     <EditTextPreference 
+			         android:title="@string/pref_display_name_title"
+			  		 android:defaultValue="@string/pref_display_name_default"
+			         android:key="@string/pref_display_name_key"/>
+			     
+			     <EditTextPreference 
+			         android:title="@string/pref_user_name_title"
+			  		 android:defaultValue="@string/pref_user_name_default"
+			         android:key="@string/pref_user_name_key"/>
+			     
+			 </PreferenceCategory>
 				 
 			 <EditTextPreference 
 				android:key="@string/pref_image_sharing_server_key"
diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index f861828c6..f81238b9b 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -610,6 +610,7 @@ public final class LinphoneManager implements LinphoneCoreListener {
 				}
 				
 				LinphoneProxyConfig proxycon = LinphoneCoreFactory.instance().createProxyConfig(identity, proxy, null, true);
+				proxycon.setExpires(getPrefInt(R.string.pref_expire_key, Integer.parseInt(getString(R.string.pref_expire_default))));
 				
 				// Add parameters for push notifications
 				String regId = getPrefString(R.string.push_reg_id_key, null);
@@ -687,7 +688,7 @@ public final class LinphoneManager implements LinphoneCoreListener {
 		
 		readAndSetAudioAndVideoPorts();
 		
-		int incomingCallTimeout = Integer.parseInt(getPrefString(R.string.pref_incoming_call_timeout_key, "30"));
+		int incomingCallTimeout = Integer.parseInt(getPrefString(R.string.pref_incoming_call_timeout_key, getString(R.string.pref_incoming_call_timeout_default)));
 		mLc.setIncomingTimeout(incomingCallTimeout);
 		
 		try {
@@ -750,6 +751,10 @@ public final class LinphoneManager implements LinphoneCoreListener {
 		} catch (LinphoneCoreException e) {
 			throw new LinphoneConfigException(getString(R.string.wrong_settings),e);
 		}
+		
+		String displayName = getPrefString(R.string.pref_display_name_key, getString(R.string.pref_display_name_default));
+		String username = getPrefString(R.string.pref_user_name_key, getString(R.string.pref_user_name_default));
+		mLc.setPrimaryContact(displayName, username);
 	}
 	
 	private void setSignalingTransportsFromConfiguration(Transports t) {
diff --git a/submodules/linphone b/submodules/linphone
index 871275760..eeb4b52d1 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 8712757602d7fc6d80a1d0d61d9af70473782b00
+Subproject commit eeb4b52d1e8b12c0b1096775be41774dc6bd61b6