From 0f2d9ede278a9c0f426e6fe7b72abe5f69c89c31 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Thu, 21 May 2015 11:11:18 +0200 Subject: [PATCH 01/13] update linphone --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 2cfc9ecfd..7ae9cf700 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 2cfc9ecfd8c3d670e54fc6d4a75e6982bf42f74e +Subproject commit 7ae9cf700c72a8627e180932a006d67f5f20b1b8 From 54fe5e1ac2ecbe26bd9af5f8c0c23d45761bb952 Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Mon, 25 May 2015 10:39:22 +0200 Subject: [PATCH 02/13] submodules: update linphone to fix tester --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 7ae9cf700..9dbaa4299 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 7ae9cf700c72a8627e180932a006d67f5f20b1b8 +Subproject commit 9dbaa4299b785d01868b50e6bc4c24f14b34920b From 883bb24d4ec41e34b88496a38097974fc0859add Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Tue, 26 May 2015 10:21:42 +0200 Subject: [PATCH 03/13] submodules: update linphone to fix liblinphone tester build --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 9dbaa4299..3ca4cce83 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 9dbaa4299b785d01868b50e6bc4c24f14b34920b +Subproject commit 3ca4cce8332a348240d60e1736c799d91176a15f From cc09595c871fdbcea3c815a557d8df3c3d1dda99 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Tue, 26 May 2015 18:47:36 +0200 Subject: [PATCH 04/13] Fix lime unit test --- liblinphone_tester/src/org/linphone/tester/Tester.java | 1 + submodules/linphone | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/liblinphone_tester/src/org/linphone/tester/Tester.java b/liblinphone_tester/src/org/linphone/tester/Tester.java index aeae460a2..59c3887b3 100644 --- a/liblinphone_tester/src/org/linphone/tester/Tester.java +++ b/liblinphone_tester/src/org/linphone/tester/Tester.java @@ -25,6 +25,7 @@ public class Tester { } static { + System.loadLibrary("cunit"); List cpuabis=Version.getCpuAbis(); String ffmpegAbi; boolean libLoaded=false; diff --git a/submodules/linphone b/submodules/linphone index 3ca4cce83..40ae36e14 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 3ca4cce8332a348240d60e1736c799d91176a15f +Subproject commit 40ae36e14add40d765234aae812ee3a8009073d8 From 7a6a987da421c8b29179c6e1dea21a37d86408cb Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Wed, 27 May 2015 14:42:25 +0200 Subject: [PATCH 05/13] update submodule linphone --- liblinphone_tester/src/org/linphone/tester/LogsActivity.java | 1 + submodules/linphone | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/liblinphone_tester/src/org/linphone/tester/LogsActivity.java b/liblinphone_tester/src/org/linphone/tester/LogsActivity.java index 3cc762145..02df05446 100644 --- a/liblinphone_tester/src/org/linphone/tester/LogsActivity.java +++ b/liblinphone_tester/src/org/linphone/tester/LogsActivity.java @@ -29,6 +29,7 @@ public class LogsActivity extends Activity { list.addAll(Arrays.asList(mArgs)); String[] array = list.toArray(new String[list.size()]); tester.run(array); + Tester.clearAccounts(); mLogsActivity.runOnUiThread(new Runnable() { public void run() { mLogsActivity.done(); diff --git a/submodules/linphone b/submodules/linphone index 40ae36e14..7f2c4c22b 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 40ae36e14add40d765234aae812ee3a8009073d8 +Subproject commit 7f2c4c22b4cf92b52d98fcecc3b8e2b5ebff0e73 From c39ba1d7738be0381349bd42cf9938d77ed17fcb Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Wed, 27 May 2015 18:07:53 +0200 Subject: [PATCH 06/13] update linphone --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 7f2c4c22b..7de2c1bf3 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 7f2c4c22b4cf92b52d98fcecc3b8e2b5ebff0e73 +Subproject commit 7de2c1bf33db8787f1bb698d47654af37337f2a1 From 71535971893208a1023163852e4854efe9072a5c Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Thu, 28 May 2015 11:22:42 +0200 Subject: [PATCH 07/13] update submodule linphone --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 7de2c1bf3..e59224e2c 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 7de2c1bf33db8787f1bb698d47654af37337f2a1 +Subproject commit e59224e2c19e5b4a3f71bf3c8d661eba40a1cad6 From fa471e0edc11a4bcb3b0e4d97228b2bbc1ba5045 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Fri, 29 May 2015 16:08:51 +0200 Subject: [PATCH 08/13] update linphone and belle-sip --- submodules/belle-sip | 2 +- submodules/linphone | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index 6fd479005..1ffd89057 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 6fd479005cf9e9be15449cab34717fe17bda6dc5 +Subproject commit 1ffd890571879bba9a58251dfe7dd5249c011517 diff --git a/submodules/linphone b/submodules/linphone index e59224e2c..f0c786e6e 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit e59224e2c19e5b4a3f71bf3c8d661eba40a1cad6 +Subproject commit f0c786e6e4ebb63b557876aa753b693d541846dc From f81e65af668881b7542cf6e57c1ad0a8a1164bac Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Mon, 1 Jun 2015 13:51:19 +0200 Subject: [PATCH 09/13] update linphone submodule --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index f0c786e6e..68532f69b 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit f0c786e6e4ebb63b557876aa753b693d541846dc +Subproject commit 68532f69bc8725131f1852bfbb97410068c27ad7 From f6c894b8338e43fa5155817e0c8d50c93c61db1e Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Tue, 2 Jun 2015 11:36:21 +0200 Subject: [PATCH 10/13] set new path for libvpx repo --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 58732e88f..c925cb431 100644 --- a/.gitmodules +++ b/.gitmodules @@ -33,7 +33,7 @@ url = git://git.linphone.org/msamr [submodule "submodules/externals/libvpx"] path = submodules/externals/libvpx - url = http://git.chromium.org/webm/libvpx.git + url = https://chromium.googlesource.com/webm/libvpx ignore = dirty [submodule "submodules/bzrtp"] path = submodules/bzrtp From 70104529d4209512dd9fecaf85ec313fe0bf5bec Mon Sep 17 00:00:00 2001 From: Margaux Clerc Date: Tue, 2 Jun 2015 15:54:48 +0200 Subject: [PATCH 11/13] Fix chat notification --- src/org/linphone/LinphoneManager.java | 6 ++++-- src/org/linphone/compatibility/ApiFivePlus.java | 15 +++++++-------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java index ff27593cb..028b13fcc 100644 --- a/src/org/linphone/LinphoneManager.java +++ b/src/org/linphone/LinphoneManager.java @@ -715,9 +715,11 @@ public class LinphoneManager implements LinphoneCoreListener { } try { - Contact contact = ContactsManager.getInstance().findContactWithAddress(mServiceContext.getContentResolver(),from); + Contact contact = ContactsManager.getInstance().findContactWithAddress(mServiceContext.getContentResolver(), from); if (!mServiceContext.getResources().getBoolean(R.bool.disable_chat__message_notification)) { - if(LinphoneActivity.isInstanciated() && LinphoneActivity.instance().displayChatMessageNotification(from.asStringUriOnly())) { + if (LinphoneActivity.isInstanciated() && !LinphoneActivity.instance().displayChatMessageNotification(from.asStringUriOnly())) { + return; + } else { if (contact != null) { LinphoneService.instance().displayMessageNotification(from.asStringUriOnly(), contact.getName(), textMessage); } else { diff --git a/src/org/linphone/compatibility/ApiFivePlus.java b/src/org/linphone/compatibility/ApiFivePlus.java index ee844df79..39662f067 100644 --- a/src/org/linphone/compatibility/ApiFivePlus.java +++ b/src/org/linphone/compatibility/ApiFivePlus.java @@ -268,14 +268,15 @@ public class ApiFivePlus { String sipUri = username + "@" + domain; Cursor cursor = getSIPContactCursor(cr, sipUri); - Contact contact = getContact(cr, cursor, 0); - if (contact != null && contact.getNumbersOrAddresses().contains(sipUri)) { - address.setDisplayName(contact.getName()); + if(cursor != null) { + Contact contact = getContact(cr, cursor, 0); + if (contact != null && contact.getNumbersOrAddresses().contains(sipUri)) { + address.setDisplayName(contact.getName()); + cursor.close(); + return contact.getPhotoUri(); + } cursor.close(); - return contact.getPhotoUri(); } - - cursor.close(); return null; } @@ -286,8 +287,6 @@ public class ApiFivePlus { cursor.close(); return contactDisplayName; } - - cursor.close(); return null; } From 907bca4decb06da8c9791ce0f0e498dbfcfdbc5b Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Tue, 2 Jun 2015 18:48:00 +0200 Subject: [PATCH 12/13] update submodule linphone with a fix for conference in zrtp mode --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 68532f69b..ad1d7c12c 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 68532f69bc8725131f1852bfbb97410068c27ad7 +Subproject commit ad1d7c12c9b459660b34d63408b144bf5890f3b6 From e1b9471fe2da77b04f69305026e14753849ae3a2 Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Wed, 3 Jun 2015 10:29:13 +0200 Subject: [PATCH 13/13] custom_rules.xml: detect NullPointerException --- liblinphone_tester/custom_rules.xml | 1 + tests/custom_rules.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/liblinphone_tester/custom_rules.xml b/liblinphone_tester/custom_rules.xml index 0f2e0d9c0..9adcb8c2f 100644 --- a/liblinphone_tester/custom_rules.xml +++ b/liblinphone_tester/custom_rules.xml @@ -42,6 +42,7 @@ + diff --git a/tests/custom_rules.xml b/tests/custom_rules.xml index 5a23506fc..a8100b078 100644 --- a/tests/custom_rules.xml +++ b/tests/custom_rules.xml @@ -34,8 +34,8 @@ + -