From 69817fc61036308ab055b377d9a709213dd12c19 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Mon, 6 Aug 2018 10:46:28 +0200 Subject: [PATCH 1/8] Disabled reduced spaces between same sender chat messages --- res/values/non_localizable_custom.xml | 1 + src/android/org/linphone/chat/ChatEventsAdapter.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/res/values/non_localizable_custom.xml b/res/values/non_localizable_custom.xml index d2a5c766a..dd0645646 100644 --- a/res/values/non_localizable_custom.xml +++ b/res/values/non_localizable_custom.xml @@ -80,6 +80,7 @@ false linphone-android-photo-temp linphone-android-photo-%s + false false diff --git a/src/android/org/linphone/chat/ChatEventsAdapter.java b/src/android/org/linphone/chat/ChatEventsAdapter.java index d9f2f4ca6..b7d97aceb 100644 --- a/src/android/org/linphone/chat/ChatEventsAdapter.java +++ b/src/android/org/linphone/chat/ChatEventsAdapter.java @@ -207,7 +207,7 @@ public class ChatEventsAdapter extends ListSelectionAdapter { holder.bubbleLayout.setVisibility(View.VISIBLE); final ChatMessage message = event.getChatMessage(); - if (i > 0) { + if (i > 0 && mContext.getResources().getBoolean(R.bool.lower_space_between_chat_bubbles_if_same_person)) { EventLog previousEvent = (EventLog)getItem(i-1); if (previousEvent.getType() == EventLog.Type.ConferenceChatMessage) { ChatMessage previousMessage = previousEvent.getChatMessage(); From bf6c70545c1b9d4f4b216c760985efbb5788a880 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Tue, 14 Aug 2018 16:46:42 +0200 Subject: [PATCH 2/8] Update belle-sip and linphone for bugfixes. Update README.md to set minimum NDK and cmake version requirements. --- README.md | 4 ++-- submodules/belle-sip | 2 +- submodules/linphone | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index df4f16c35..afd28c46f 100644 --- a/README.md +++ b/README.md @@ -8,9 +8,9 @@ Linphone is a free VoIP and video softphone based on the SIP protocol. 1. Download the Android sdk (API 28.0.0 at max) with platform-tools and tools updated to latest revision, then add both 'tools' and 'platform-tools' folders in your path and the android-sdk folder to ANDROID_HOME environment variable. -2. Download the Android ndk (version 16) from google and add it to your path (no symlink !!!) and ANDROID_NDK environment variable. +2. Download the Android NDK 17 from google and add it to your path (no symlink !!!) and ANDROID_NDK environment variable. -3. Install _yasm_, _nasm_ (For OpenH224 support only), _python_, _pkg_config_ and _cmake(>=3.10)_. +3. Install _yasm_, _nasm_ (For OpenH224 support only), _python_, _pkg_config_ and _cmake(>=3.12)_. * On 64 bits linux systems you'll need the _ia32-libs_ package. * With the latest Debian (multiarch), you need this: * `dpkg --add-architecture i386` diff --git a/submodules/belle-sip b/submodules/belle-sip index 11f4c9c61..914558009 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 11f4c9c61feece2d46909ae62e91ac1bace64c2c +Subproject commit 914558009a3013e53745344c359d3621c5e9d4e6 diff --git a/submodules/linphone b/submodules/linphone index 064b3c30e..5b637d23e 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 064b3c30e15de98ac7f03b1d0a323bf565c40498 +Subproject commit 5b637d23ec2bd3b3fc52289d8d39c4c318595b78 From b0caccfb544f443a046b5d110f7f60db6d192cfb Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Thu, 16 Aug 2018 10:37:25 +0200 Subject: [PATCH 3/8] Update bcmatroska2 and cmake-builder submodules. --- submodules/bcmatroska2 | 2 +- submodules/cmake-builder | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/bcmatroska2 b/submodules/bcmatroska2 index ca4a89930..e8a69bdc3 160000 --- a/submodules/bcmatroska2 +++ b/submodules/bcmatroska2 @@ -1 +1 @@ -Subproject commit ca4a89930dd8db94a60ae4a1dbf44a3710497429 +Subproject commit e8a69bdc3f8828cfd83b0938955132918364b175 diff --git a/submodules/cmake-builder b/submodules/cmake-builder index f58510c8c..25e2442d5 160000 --- a/submodules/cmake-builder +++ b/submodules/cmake-builder @@ -1 +1 @@ -Subproject commit f58510c8ce6cd89dadff2b29574d03b05c6efcc9 +Subproject commit 25e2442d536dee89222dbeaa04ceac8f9cc41bfc From 5f63ca63b0ffb480f1bd4b3b667a89c7ecfc54fd Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Thu, 16 Aug 2018 14:53:24 +0200 Subject: [PATCH 4/8] Update cmake-builder submodule. --- submodules/cmake-builder | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/cmake-builder b/submodules/cmake-builder index 25e2442d5..81f2fa301 160000 --- a/submodules/cmake-builder +++ b/submodules/cmake-builder @@ -1 +1 @@ -Subproject commit 25e2442d536dee89222dbeaa04ceac8f9cc41bfc +Subproject commit 81f2fa301e392a33e63fb6ac6ded9b9d48832605 From d81f8e1f6f6681a0fa02b138f3651098ff3240c3 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Fri, 17 Aug 2018 13:27:43 +0200 Subject: [PATCH 5/8] Update ortp and ms2 for bugfixes --- submodules/mediastreamer2 | 2 +- submodules/oRTP | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/mediastreamer2 b/submodules/mediastreamer2 index 52d316934..4c3e15efe 160000 --- a/submodules/mediastreamer2 +++ b/submodules/mediastreamer2 @@ -1 +1 @@ -Subproject commit 52d3169349b55b27090ecb81f88d10ebb65fa469 +Subproject commit 4c3e15efe23f771f5f62b67c91868000697ab078 diff --git a/submodules/oRTP b/submodules/oRTP index a88be02b9..17be28e9d 160000 --- a/submodules/oRTP +++ b/submodules/oRTP @@ -1 +1 @@ -Subproject commit a88be02b93e2274ae3fcf80e1e0032adc43c0448 +Subproject commit 17be28e9d0b8e50b89ff9fba75990a51f03f111e From 5a3491a4bbc9f558bd0871ec7bb1c49a2c508c7e Mon Sep 17 00:00:00 2001 From: Erwan Croze Date: Tue, 21 Aug 2018 09:29:27 +0200 Subject: [PATCH 6/8] Add time to all notification --- .../org/linphone/compatibility/ApiTwentyOnePlus.java | 5 +++++ .../org/linphone/compatibility/ApiTwentySixPlus.java | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/src/android/org/linphone/compatibility/ApiTwentyOnePlus.java b/src/android/org/linphone/compatibility/ApiTwentyOnePlus.java index 8215d4e0d..7197dbbba 100644 --- a/src/android/org/linphone/compatibility/ApiTwentyOnePlus.java +++ b/src/android/org/linphone/compatibility/ApiTwentyOnePlus.java @@ -59,6 +59,7 @@ public class ApiTwentyOnePlus { .setVisibility(Notification.VISIBILITY_PRIVATE) .setPriority(Notification.PRIORITY_HIGH) .setNumber(msgCount) + .setWhen(System.currentTimeMillis()) .build(); return notif; @@ -100,6 +101,7 @@ public class ApiTwentyOnePlus { .setLights(ContextCompat.getColor(context, R.color.notification_color_led), context.getResources().getInteger(R.integer.notification_ms_on), context.getResources().getInteger(R.integer.notification_ms_off)) + .setWhen(System.currentTimeMillis()) .setPriority(priority) .build(); } else { @@ -114,6 +116,7 @@ public class ApiTwentyOnePlus { context.getResources().getInteger(R.integer.notification_ms_on), context.getResources().getInteger(R.integer.notification_ms_off)) .setPriority(priority) + .setWhen(System.currentTimeMillis()) .build(); } @@ -139,6 +142,7 @@ public class ApiTwentyOnePlus { context.getResources().getInteger(R.integer.notification_ms_on), context.getResources().getInteger(R.integer.notification_ms_off)) .setPriority(Notification.PRIORITY_HIGH) + .setWhen(System.currentTimeMillis()) .build(); return notif; @@ -158,6 +162,7 @@ public class ApiTwentyOnePlus { .setLights(ContextCompat.getColor(context, R.color.notification_color_led), context.getResources().getInteger(R.integer.notification_ms_on), context.getResources().getInteger(R.integer.notification_ms_off)) + .setWhen(System.currentTimeMillis()) .setPriority(Notification.PRIORITY_HIGH) .build(); diff --git a/src/android/org/linphone/compatibility/ApiTwentySixPlus.java b/src/android/org/linphone/compatibility/ApiTwentySixPlus.java index 0ed80b882..6c88ce9cd 100644 --- a/src/android/org/linphone/compatibility/ApiTwentySixPlus.java +++ b/src/android/org/linphone/compatibility/ApiTwentySixPlus.java @@ -87,6 +87,7 @@ public class ApiTwentySixPlus { .setVisibility(Notification.VISIBILITY_PRIVATE) .setPriority(Notification.PRIORITY_HIGH) .setNumber(msgCount) + .setWhen(System.currentTimeMillis()) .build(); return notif; @@ -106,6 +107,7 @@ public class ApiTwentySixPlus { .setCategory(Notification.CATEGORY_CALL) .setVisibility(Notification.VISIBILITY_PUBLIC) .setPriority(Notification.PRIORITY_HIGH) + .setWhen(System.currentTimeMillis()) .build(); return notif; @@ -124,6 +126,7 @@ public class ApiTwentySixPlus { .setCategory(Notification.CATEGORY_SERVICE) .setVisibility(Notification.VISIBILITY_SECRET) .setPriority(priority) + .setWhen(System.currentTimeMillis()) .build(); } else { notif = new Notification.Builder(context, context.getString(R.string.notification_service_channel_id)) @@ -134,6 +137,7 @@ public class ApiTwentySixPlus { .setCategory(Notification.CATEGORY_SERVICE) .setVisibility(Notification.VISIBILITY_SECRET) .setPriority(priority) + .setWhen(System.currentTimeMillis()) .build(); } @@ -156,6 +160,7 @@ public class ApiTwentySixPlus { .setCategory(Notification.CATEGORY_MESSAGE) .setVisibility(Notification.VISIBILITY_PRIVATE) .setPriority(Notification.PRIORITY_HIGH) + .setWhen(System.currentTimeMillis()) .build(); return notif; @@ -173,6 +178,7 @@ public class ApiTwentySixPlus { .setCategory(Notification.CATEGORY_MESSAGE) .setVisibility(Notification.VISIBILITY_PRIVATE) .setPriority(Notification.PRIORITY_HIGH) + .setWhen(System.currentTimeMillis()) .build(); return notif; From d2190fd9982b3459e0251b0266530e907771c003 Mon Sep 17 00:00:00 2001 From: Erwan Croze Date: Tue, 21 Aug 2018 10:48:26 +0200 Subject: [PATCH 7/8] Enable creation time in notification --- .../org/linphone/compatibility/ApiTwentyOnePlus.java | 6 ++++++ .../org/linphone/compatibility/ApiTwentySixPlus.java | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/src/android/org/linphone/compatibility/ApiTwentyOnePlus.java b/src/android/org/linphone/compatibility/ApiTwentyOnePlus.java index 7197dbbba..d633daa18 100644 --- a/src/android/org/linphone/compatibility/ApiTwentyOnePlus.java +++ b/src/android/org/linphone/compatibility/ApiTwentyOnePlus.java @@ -60,6 +60,7 @@ public class ApiTwentyOnePlus { .setPriority(Notification.PRIORITY_HIGH) .setNumber(msgCount) .setWhen(System.currentTimeMillis()) + .setShowWhen(true) .build(); return notif; @@ -81,6 +82,7 @@ public class ApiTwentyOnePlus { .setLights(ContextCompat.getColor(context, R.color.notification_color_led), context.getResources().getInteger(R.integer.notification_ms_on), context.getResources().getInteger(R.integer.notification_ms_off)) + .setShowWhen(true) .build(); return notif; @@ -103,6 +105,7 @@ public class ApiTwentyOnePlus { context.getResources().getInteger(R.integer.notification_ms_off)) .setWhen(System.currentTimeMillis()) .setPriority(priority) + .setShowWhen(true) .build(); } else { notif = new Notification.Builder(context) @@ -117,6 +120,7 @@ public class ApiTwentyOnePlus { context.getResources().getInteger(R.integer.notification_ms_off)) .setPriority(priority) .setWhen(System.currentTimeMillis()) + .setShowWhen(true) .build(); } @@ -143,6 +147,7 @@ public class ApiTwentyOnePlus { context.getResources().getInteger(R.integer.notification_ms_off)) .setPriority(Notification.PRIORITY_HIGH) .setWhen(System.currentTimeMillis()) + .setShowWhen(true) .build(); return notif; @@ -164,6 +169,7 @@ public class ApiTwentyOnePlus { context.getResources().getInteger(R.integer.notification_ms_off)) .setWhen(System.currentTimeMillis()) .setPriority(Notification.PRIORITY_HIGH) + .setShowWhen(true) .build(); return notif; diff --git a/src/android/org/linphone/compatibility/ApiTwentySixPlus.java b/src/android/org/linphone/compatibility/ApiTwentySixPlus.java index 6c88ce9cd..182295a75 100644 --- a/src/android/org/linphone/compatibility/ApiTwentySixPlus.java +++ b/src/android/org/linphone/compatibility/ApiTwentySixPlus.java @@ -88,6 +88,7 @@ public class ApiTwentySixPlus { .setPriority(Notification.PRIORITY_HIGH) .setNumber(msgCount) .setWhen(System.currentTimeMillis()) + .setShowWhen(true) .build(); return notif; @@ -108,6 +109,7 @@ public class ApiTwentySixPlus { .setVisibility(Notification.VISIBILITY_PUBLIC) .setPriority(Notification.PRIORITY_HIGH) .setWhen(System.currentTimeMillis()) + .setShowWhen(true) .build(); return notif; @@ -127,6 +129,7 @@ public class ApiTwentySixPlus { .setVisibility(Notification.VISIBILITY_SECRET) .setPriority(priority) .setWhen(System.currentTimeMillis()) + .setShowWhen(true) .build(); } else { notif = new Notification.Builder(context, context.getString(R.string.notification_service_channel_id)) @@ -138,6 +141,7 @@ public class ApiTwentySixPlus { .setVisibility(Notification.VISIBILITY_SECRET) .setPriority(priority) .setWhen(System.currentTimeMillis()) + .setShowWhen(true) .build(); } @@ -161,6 +165,7 @@ public class ApiTwentySixPlus { .setVisibility(Notification.VISIBILITY_PRIVATE) .setPriority(Notification.PRIORITY_HIGH) .setWhen(System.currentTimeMillis()) + .setShowWhen(true) .build(); return notif; @@ -179,6 +184,7 @@ public class ApiTwentySixPlus { .setVisibility(Notification.VISIBILITY_PRIVATE) .setPriority(Notification.PRIORITY_HIGH) .setWhen(System.currentTimeMillis()) + .setShowWhen(true) .build(); return notif; From ee541ac0363daa356df97cc9f50d8ef2513ff306 Mon Sep 17 00:00:00 2001 From: Erwan Croze Date: Tue, 21 Aug 2018 11:16:31 +0200 Subject: [PATCH 8/8] Add color to notification --- .../org/linphone/compatibility/ApiTwentySixPlus.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/android/org/linphone/compatibility/ApiTwentySixPlus.java b/src/android/org/linphone/compatibility/ApiTwentySixPlus.java index 182295a75..f40c1b892 100644 --- a/src/android/org/linphone/compatibility/ApiTwentySixPlus.java +++ b/src/android/org/linphone/compatibility/ApiTwentySixPlus.java @@ -89,6 +89,8 @@ public class ApiTwentySixPlus { .setNumber(msgCount) .setWhen(System.currentTimeMillis()) .setShowWhen(true) + .setColorized(true) + .setColor(context.getColor(R.color.notification_color_led)) .build(); return notif; @@ -110,6 +112,8 @@ public class ApiTwentySixPlus { .setPriority(Notification.PRIORITY_HIGH) .setWhen(System.currentTimeMillis()) .setShowWhen(true) + .setColorized(true) + .setColor(context.getColor(R.color.notification_color_led)) .build(); return notif; @@ -130,6 +134,8 @@ public class ApiTwentySixPlus { .setPriority(priority) .setWhen(System.currentTimeMillis()) .setShowWhen(true) + .setColorized(true) + .setColor(context.getColor(R.color.notification_color_led)) .build(); } else { notif = new Notification.Builder(context, context.getString(R.string.notification_service_channel_id)) @@ -142,6 +148,8 @@ public class ApiTwentySixPlus { .setPriority(priority) .setWhen(System.currentTimeMillis()) .setShowWhen(true) + .setColorized(true) + .setColor(context.getColor(R.color.notification_color_led)) .build(); } @@ -166,6 +174,8 @@ public class ApiTwentySixPlus { .setPriority(Notification.PRIORITY_HIGH) .setWhen(System.currentTimeMillis()) .setShowWhen(true) + .setColorized(true) + .setColor(context.getColor(R.color.notification_color_led)) .build(); return notif; @@ -185,6 +195,8 @@ public class ApiTwentySixPlus { .setPriority(Notification.PRIORITY_HIGH) .setWhen(System.currentTimeMillis()) .setShowWhen(true) + .setColorized(true) + .setColor(context.getColor(R.color.notification_color_led)) .build(); return notif;