From 47cab329351683895ce090adff79dc7e9c8026cf Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Fri, 30 Nov 2012 15:47:45 +0100
Subject: [PATCH] Translate liblinphone error messages and display if call
 declined

---
 res/values-FR/strings.xml              |  2 ++
 res/values/strings.xml                 |  3 +++
 src/org/linphone/LinphoneActivity.java | 13 +++++++------
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/res/values-FR/strings.xml b/res/values-FR/strings.xml
index d200cd85c..746d65e54 100644
--- a/res/values-FR/strings.xml
+++ b/res/values-FR/strings.xml
@@ -357,4 +357,6 @@
 	<string name="pref_rfc2833_dtmf">Envoyer les DTMFs RFC2833</string>
 	<string name="pref_sipinfo_dtmf">Envoyer les DTMFs en SIP INFO</string>
 	
+	<string name="error_call_declined">Appel rejeté</string>
+	<string name="error_user_not_found">Utilisateur non trouvé</string>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 9570c4305..38811b3ac 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -403,4 +403,7 @@
 	
 	<string name="pref_rfc2833_dtmf">Send RFC2833 DTMFs</string>
 	<string name="pref_sipinfo_dtmf">Send SIP INFO DTMFs</string>
+	
+	<string name="error_call_declined">Call declined</string>
+	<string name="error_user_not_found">User not found</string>
 </resources>
diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java
index 161fe94ce..84ac77b9c 100644
--- a/src/org/linphone/LinphoneActivity.java
+++ b/src/org/linphone/LinphoneActivity.java
@@ -823,12 +823,7 @@ public class LinphoneActivity extends FragmentActivity implements
 	}
 
 	@Override
-	public void onCallStateChanged(LinphoneCall call, State state,
-			String message) {
-		if (state == State.Error) {
-			displayCustomToast(message, Toast.LENGTH_LONG);
-		}
-
+	public void onCallStateChanged(LinphoneCall call, State state, String message) {
 		if (state == State.IncomingReceived) {
 			startActivity(new Intent(this, IncomingCallActivity.class));
 		} else if (state == State.OutgoingInit) {
@@ -838,6 +833,12 @@ public class LinphoneActivity extends FragmentActivity implements
 				startIncallActivity(call);
 			}
 		} else if (state == State.CallEnd || state == State.Error || state == State.CallReleased) {
+			// Convert LinphoneCore message for internalization
+			if (message != null && message.equals("Call declined.")) { 
+				displayCustomToast(getString(R.string.error_call_declined), Toast.LENGTH_LONG);
+			} else if (message != null && message.equals("User not found.")) {
+				displayCustomToast(getString(R.string.error_user_not_found), Toast.LENGTH_LONG);
+			}
 			resetClassicMenuLayoutAndGoBackToCallIfStillRunning();
 		}