From b416397b1ffa13a1ed16d1ba9eb6d11ad46053eb Mon Sep 17 00:00:00 2001 From: Erwan Croze Date: Wed, 31 Jan 2018 13:36:12 +0100 Subject: [PATCH 1/6] Changing AudioFocus mode to exclusive We had problem with others music applications during call --- src/android/org/linphone/LinphoneManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/android/org/linphone/LinphoneManager.java b/src/android/org/linphone/LinphoneManager.java index 6e42929c6..5384178ae 100644 --- a/src/android/org/linphone/LinphoneManager.java +++ b/src/android/org/linphone/LinphoneManager.java @@ -1533,7 +1533,7 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag private void requestAudioFocus(int stream){ if (!mAudioFocused){ - int res = mAudioManager.requestAudioFocus(null, stream, AudioManager.AUDIOFOCUS_GAIN_TRANSIENT ); + int res = mAudioManager.requestAudioFocus(null, stream, AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_EXCLUSIVE ); Log.d("Audio focus requested: " + (res == AudioManager.AUDIOFOCUS_REQUEST_GRANTED ? "Granted" : "Denied")); if (res == AudioManager.AUDIOFOCUS_REQUEST_GRANTED) mAudioFocused=true; } From 490a8bcb5035a05afed5b5cec90c8a29f99d0de4 Mon Sep 17 00:00:00 2001 From: Ben Sartor Date: Tue, 30 Jan 2018 16:57:40 +0100 Subject: [PATCH 2/6] set encoding for javaDoc to UTF-8 --- libLinphoneAndroidSdk.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/libLinphoneAndroidSdk.gradle b/libLinphoneAndroidSdk.gradle index 28b28f2f7..21393b4e8 100644 --- a/libLinphoneAndroidSdk.gradle +++ b/libLinphoneAndroidSdk.gradle @@ -91,6 +91,7 @@ task(releaseJavadoc, type: Javadoc, dependsOn: "assembleRelease") { classpath += project.files(android.getBootClasspath().join(File.pathSeparator)) classpath += files(android.libraryVariants.release.javaCompile.classpath.files) classpath += configurations.javadocDeps + options.encoding = 'UTF-8' } task sourcesJar(type: Jar) { From c72164a5ee3bd48cf31199848a495484163a7ac5 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Mon, 5 Feb 2018 17:19:08 +0100 Subject: [PATCH 3/6] update bctoolbox --- submodules/bctoolbox | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/bctoolbox b/submodules/bctoolbox index e0e7e5974..25e640640 160000 --- a/submodules/bctoolbox +++ b/submodules/bctoolbox @@ -1 +1 @@ -Subproject commit e0e7e59741de06ba6c9ca9d2ec69037230c15256 +Subproject commit 25e640640000e2ea691c4eb6137e8edebf6b3a52 From ce4ec9a7fbe91fa38fbf7796ce856fe2458df3fb Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Tue, 6 Feb 2018 10:47:06 +0100 Subject: [PATCH 4/6] update ms2 to fix a potential invalid write in java-based sound capture module. --- submodules/mediastreamer2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/mediastreamer2 b/submodules/mediastreamer2 index c72fb8e79..e20c2ed9a 160000 --- a/submodules/mediastreamer2 +++ b/submodules/mediastreamer2 @@ -1 +1 @@ -Subproject commit c72fb8e7994f1ccb61f89d77fdc9425df53a4033 +Subproject commit e20c2ed9a7397e5d6cc9ed4cbf3539761ae35111 From a40d65c7768f047cfa61703d6f097b2539e66347 Mon Sep 17 00:00:00 2001 From: Erwan Croze Date: Wed, 7 Feb 2018 11:08:58 +0100 Subject: [PATCH 5/6] Update submodule belle-sip --- submodules/belle-sip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index 68f164801..dd5de8022 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 68f1648017dde65edc8cd8054016fa3486a2955b +Subproject commit dd5de8022ff5a1ef4ea2d4b2a5761658f1c6010c From ec295f0bc1860fe9c2eb6f2a3e7d68e094f26220 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Tue, 13 Feb 2018 14:45:14 +0100 Subject: [PATCH 6/6] Fixed contacts with presence list --- src/android/org/linphone/ContactsManager.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/android/org/linphone/ContactsManager.java b/src/android/org/linphone/ContactsManager.java index cefe9547c..d2ec56868 100644 --- a/src/android/org/linphone/ContactsManager.java +++ b/src/android/org/linphone/ContactsManager.java @@ -245,7 +245,15 @@ public class ContactsManager extends ContentObserver { } public synchronized void setSipContacts(List c) { - sipContacts = c; + if (sipContacts.isEmpty()) { + sipContacts = c; + } else { + for (LinphoneContact contact : c) { + if (!sipContacts.contains(contact)) { + sipContacts.add(contact); + } + } + } } public synchronized void refreshSipContact(LinphoneFriend lf) {