From 78468d10b365cc4cd8066378b1b3c420475d178d Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Tue, 4 Dec 2012 11:31:00 +0100
Subject: [PATCH] Display error popup if incompatible media parameters

---
 README                                 | 2 +-
 res/values-FR/strings.xml              | 1 +
 res/values/strings.xml                 | 1 +
 src/org/linphone/LinphoneActivity.java | 2 ++
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/README b/README
index 85ffe59d2..f4e9f6fa0 100644
--- a/README
+++ b/README
@@ -2,7 +2,7 @@
 			****************************
 
 To build liblinphone for Android, you must:
-0) download the Android sdk with platform-tools >= 13, tools >= 20 (20.0.3 for linux), then add both 'tools' and 'platform-tools' folders in your path.
+0) download the Android sdk with platform-tools and tools updated to latest revision, then add both 'tools' and 'platform-tools' folders in your path.
 1) download the Android ndk (>=r8b) from google and add it to your path.
 2) install the autotools: autoconf, automake, aclocal, libtoolize pkgconfig
 2bis) on some 64 bits systems you'll need the ia32-libs package
diff --git a/res/values-FR/strings.xml b/res/values-FR/strings.xml
index 746d65e54..ab6181268 100644
--- a/res/values-FR/strings.xml
+++ b/res/values-FR/strings.xml
@@ -359,4 +359,5 @@
 	
 	<string name="error_call_declined">Appel rejeté</string>
 	<string name="error_user_not_found">Utilisateur non trouvé</string>
+	<string name="error_incompatible_media">Paramètres média incompatibles</string>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 38811b3ac..65a8714bb 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -406,4 +406,5 @@
 	
 	<string name="error_call_declined">Call declined</string>
 	<string name="error_user_not_found">User not found</string>
+	<string name="error_incompatible_media">Incompatible media parameters</string>
 </resources>
diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java
index 84ac77b9c..04a973a96 100644
--- a/src/org/linphone/LinphoneActivity.java
+++ b/src/org/linphone/LinphoneActivity.java
@@ -838,6 +838,8 @@ public class LinphoneActivity extends FragmentActivity implements
 				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);
+			} else if (message != null && message.equals("Incompatible media parameters.")) {
+				displayCustomToast(getString(R.string.error_incompatible_media), Toast.LENGTH_LONG);
 			}
 			resetClassicMenuLayoutAndGoBackToCallIfStillRunning();
 		}