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

Fix compil error for those who don't have SDK 24 installed yet

Browse source
This commit is contained in:
Sylvain Berfini 2016-08-03 10:05:46 +02:00
parent 7e21deaf3e
commit 1f6bce8830
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README
View file

@ -7,7 +7,7 @@ COMPILATION INSTRUCTIONS
To build liblinphone for Android, you must: To build liblinphone for Android, you must:
------------------------------------------- -------------------------------------------
0) download the Android sdk (API 24) with platform-tools and tools updated to latest revision, then add both 'tools' and 'platform-tools' folders in your path. 0) download the Android sdk (API 23 at least) 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 (version r11c or 12b) from google and add it to your path (no symlink !!!). 1) download the Android ndk (version r11c or 12b) from google and add it to your path (no symlink !!!).
2) install yasm, nasm, ant, python, cmake and vim-common 2) install yasm, nasm, ant, python, cmake and vim-common
On 64 bits linux systems you'll need the ia32-libs package On 64 bits linux systems you'll need the ia32-libs package

2
src/org/linphone/compatibility/Compatibility.java
View file

@ -116,7 +116,7 @@ public class Compatibility {
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
public static Spanned fromHtml(String text) { public static Spanned fromHtml(String text) {
if (Version.sdkAboveOrEqual(Version.API24_NOUGAT_70)) { if (Version.sdkAboveOrEqual(Version.API24_NOUGAT_70)) {
return Html.fromHtml(text, Html.FROM_HTML_MODE_LEGACY); return Html.fromHtml(text, 0); //Html.FROM_HTML_MODE_LEGACY
} else { } else {
return Html.fromHtml(text); return Html.fromHtml(text);
} }