Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Display error popup if incompatible media parameters

Browse source
This commit is contained in:
Sylvain Berfini 2012-12-04 11:31:00 +01:00
parent 8237d96c67
commit 78468d10b3
4 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README
View file

@ -2,7 +2,7 @@
**************************** ****************************
To build liblinphone for Android, you must: 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. 1) download the Android ndk (>=r8b) from google and add it to your path.
2) install the autotools: autoconf, automake, aclocal, libtoolize pkgconfig 2) install the autotools: autoconf, automake, aclocal, libtoolize pkgconfig
2bis) on some 64 bits systems you'll need the ia32-libs package 2bis) on some 64 bits systems you'll need the ia32-libs package

1
res/values-FR/strings.xml
View file

@ -359,4 +359,5 @@
<string name="error_call_declined">Appel rejeté</string> <string name="error_call_declined">Appel rejeté</string>
<string name="error_user_not_found">Utilisateur non trouvé</string> <string name="error_user_not_found">Utilisateur non trouvé</string>
<string name="error_incompatible_media">Paramètres média incompatibles</string>
</resources> </resources>

1
res/values/strings.xml
View file

@ -406,4 +406,5 @@
<string name="error_call_declined">Call declined</string> <string name="error_call_declined">Call declined</string>
<string name="error_user_not_found">User not found</string> <string name="error_user_not_found">User not found</string>
<string name="error_incompatible_media">Incompatible media parameters</string>
</resources> </resources>

2
src/org/linphone/LinphoneActivity.java
View file

@ -838,6 +838,8 @@ public class LinphoneActivity extends FragmentActivity implements
displayCustomToast(getString(R.string.error_call_declined), Toast.LENGTH_LONG); displayCustomToast(getString(R.string.error_call_declined), Toast.LENGTH_LONG);
} else if (message != null && message.equals("User not found.")) { } else if (message != null && message.equals("User not found.")) {
displayCustomToast(getString(R.string.error_user_not_found), Toast.LENGTH_LONG); 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(); resetClassicMenuLayoutAndGoBackToCallIfStillRunning();
} }