diff --git a/README b/README index a655c6113..19a458a83 100644 --- a/README +++ b/README @@ -5,11 +5,15 @@ To build liblinphone for Android, you must: 0) download the Android sdk with platform-tools and tools updated to latest revision (at least API 16 is needed), 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 + On 64 bits linux systems you'll need the ia32-libs package 3) run the Makefile script in the top level directory. This will download iLBC source files and convert some assembly files in VP8 project. $ make 4) To install the generated apk into a plugged device, run $ make install +5) (Optional) To generate a liblinphone SDK zip containing a full jar and native libraries, run + $ make generate-sdk + + To run the tutorials: 1) open the res/values/non_localizable_custom.xml file and change the value of the show_tutorials_instead_of_app to true. diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java index fa57ff2d1..deeb5b029 100644 --- a/src/org/linphone/LinphoneManager.java +++ b/src/org/linphone/LinphoneManager.java @@ -1712,8 +1712,8 @@ public final class LinphoneManager implements LinphoneCoreListener { } @Override - public void infoReceived(LinphoneCore lc, LinphoneInfoMessage info) { - Log.d("Info message received from "+info.getFrom()); + public void infoReceived(LinphoneCore lc, LinphoneCall call, LinphoneInfoMessage info) { + Log.d("Info message received from "+call.getRemoteAddress().asString()); LinphoneContent ct=info.getContent(); if (ct!=null){ Log.d("Info received with body with mime type "+ct.getType()+"/"+ct.getSubtype()+" and data ["+ct.getDataAsString()+"]"); diff --git a/submodules/belle-sip b/submodules/belle-sip index 81b4695a7..ab0f6d5a3 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 81b4695a7720331d13a8fe5a7175071b10f52eb7 +Subproject commit ab0f6d5a313b953ec84de9e613cbd6aa98ebff9b diff --git a/submodules/linphone b/submodules/linphone index 2b0381668..8c3fd2d43 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 2b03816684178a07b8719d4079dd5dc86b9442a7 +Subproject commit 8c3fd2d4325fe1be53e3fb26a07afa52f0361a10