From ff906985b4549f4835c71a55ccddd59338c47481 Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Mon, 13 Oct 2014 15:43:48 +0200
Subject: [PATCH] Do not use "Send log" feature on the Exit button, but on
 another one...

---
 res/layout/about.xml                |  8 ++++++++
 res/values/strings.xml              |  7 ++++++-
 src/org/linphone/AboutFragment.java | 19 +++++++++++++------
 3 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/res/layout/about.xml b/res/layout/about.xml
index ea9945d12..b52da3b61 100644
--- a/res/layout/about.xml
+++ b/res/layout/about.xml
@@ -42,6 +42,14 @@
 		android:textStyle="bold" 
 		android:textColor="@color/text_contrast"
 		android:id="@+id/AboutLink"/>
+
+	<Button
+	    android:id="@+id/send_log"
+	    android:layout_width="wrap_content"
+	    android:layout_height="wrap_content"
+	    android:layout_marginTop="30sp"
+	    android:text="@string/menu_send_log"
+	    android:visibility="gone" />
 	
 	<Button android:id="@+id/exit"
 		android:layout_width="wrap_content"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 98291155c..7c4130dfa 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -200,6 +200,7 @@
 	<string name="about_reading_logs">Reading logs, may takes time&#8230;</string>
 	<string name="about_mailer_chooser_text">Send bug report with&#8230;</string>
 	<string name="menu_about">About</string>
+	<string name="menu_send_log">Send log</string>
 	<string name="pref_audio">Audio</string>
 	<string name="menu_exit">Exit</string>
 	<string name="pref_prefix">Prefix</string>
@@ -258,6 +259,7 @@
 	<string name="pref_video_codec_mpeg4_unavailable">Codec disabled, build the app from source code to enable it</string>
 
 	<string name="pref_sipaccounts">SIP Accounts</string>
+	<string name="pref_dtmf">Gate code</string>
 	<string name="pref_wifi_only">Use wifi only</string>
 	<string name="pref_push_notification">Enable push notifications</string>
 
@@ -359,7 +361,7 @@
 	<string name="button_history">History</string>
 	<string name="button_contacts">Contacts</string>
 	<string name="button_settings">Settings</string>
-	<string name="button_chat">Chat</string>
+	<string name="button_chat">Gate</string>
 	<string name="button_about">About</string>
 
 	<string name="button_setup_cancel">Cancel</string>
@@ -482,4 +484,7 @@
 	<string name="remote_provisioning_failure">Failed to download or apply remote provisioning profile...</string>
 	<string name="remote_provisioning_again_title">Remote provisioning</string>
 	<string name="remote_provisioning_again_message">Do you want to change the provisioning URI ?</string>
+	<string name="pref_dtmf_sequence_title">DTMF sequence</string>
+	<string name="dtmf_sequence_not_set_failure">No DTMF set in advanced preferences</string>
+	<string name="dtmf_sequence">DTMF sequence</string>
 </resources>
diff --git a/src/org/linphone/AboutFragment.java b/src/org/linphone/AboutFragment.java
index d138347aa..4c59f3a7c 100644
--- a/src/org/linphone/AboutFragment.java
+++ b/src/org/linphone/AboutFragment.java
@@ -34,6 +34,9 @@ import android.widget.TextView;
  */
 public class AboutFragment extends Fragment implements OnClickListener {
 	private FragmentsAvailable about = FragmentsAvailable.ABOUT_INSTEAD_OF_CHAT;
+	View exitButton = null;
+	View sendLogButton = null;
+	
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container,
 			Bundle savedInstanceState) {
@@ -49,11 +52,16 @@ public class AboutFragment extends Fragment implements OnClickListener {
 		} catch (NameNotFoundException e) {
 			Log.e(e, "cannot get version name");
 		}
-
-		View issue = view.findViewById(R.id.exit);
-		issue.setOnClickListener(this);
-		issue.setVisibility(View.VISIBLE);
 		
+		sendLogButton = view.findViewById(R.id.send_log);
+		sendLogButton.setOnClickListener(this);
+		sendLogButton.setVisibility(getResources().getBoolean(R.bool.enable_log_collect) ? View.VISIBLE : View.GONE);
+
+		exitButton = view.findViewById(R.id.exit);
+		exitButton.setOnClickListener(this);
+		exitButton.setVisibility(View.VISIBLE);
+		
+
 		return view;
 	}
 	
@@ -73,8 +81,7 @@ public class AboutFragment extends Fragment implements OnClickListener {
 	@Override
 	public void onClick(View v) {
 		if (LinphoneActivity.isInstanciated()) {
-
-			if (getResources().getBoolean(R.bool.enable_log_collect)) {
+			if (v == sendLogButton) {
 				LinphoneUtils.collectLogs(LinphoneActivity.instance(), getString(R.string.about_bugreport_email));
 			} else {
 				LinphoneActivity.instance().exit();