From 7432b9c698bd43139f6af598766949af9bb5c16f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Turnel?= Date: Fri, 15 Jun 2018 15:07:43 +0200 Subject: [PATCH 1/9] Fix some type of files treated as images Such as .pcapng which is a Wireshark format that couldn't be sent. --- src/android/org/linphone/LinphoneUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/android/org/linphone/LinphoneUtils.java b/src/android/org/linphone/LinphoneUtils.java index 00933b03b..badb3532e 100644 --- a/src/android/org/linphone/LinphoneUtils.java +++ b/src/android/org/linphone/LinphoneUtils.java @@ -415,7 +415,7 @@ public final class LinphoneUtils { String extension = LinphoneUtils.getExtensionFromFileName(path); if(extension != null) extension = extension.toLowerCase(); - return (extension != null && extension.matches(".*(png|jpg|jpeg|bmp|gif).*")); + return (extension != null && extension.matches("(png|jpg|jpeg|bmp|gif)")); } public static void recursiveFileRemoval(File root) { From 1c1c76a4367ae78e0599bc23eb87a14f44bbc01f Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Fri, 15 Jun 2018 16:09:23 +0200 Subject: [PATCH 2/9] Add release notes for 4.0.0 --- CHANGELOG.md | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 26e8b01c2..b6801e467 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,13 +5,27 @@ Group changes to describe their impact on the project, as follows: Added for new features. Changed for changes in existing functionality. - Deprecated for once-stable features removed in upcoming releases.é + Deprecated for once-stable features removed in upcoming releases. Removed for deprecated features removed in this release. Fixed for any bug fixes. Security to invite users to upgrade in case of vulnerabilities. ## [Incomming] +## [4.0.0] - 2018-06-15 + +### Added +- Group chat between linphone.org SIP accounts. +- new JAVA/JNI wrapper. This new wrapper is automatically generated from liblinphone C API. It breaks compatibility with previous, hand-made wrapper. + (more information about new wrapper [here.](https://wiki.linphone.org/xwiki/wiki/public/view/Lib/Linphone%20%28Android%29%20Java%20wrapper/) ) + +### Deprecated +- hand-made java API in submodules/linphone/java is deprecated. However it is still possible to use it by checking out the 3.4.x branch of linphone-android. + +### Fixed +- issue with changing push notification token not passed to library, possibly resulting in a loss of incoming calls. + + ## [3.3.0] - 2017-10-18 ### Added From fab3081b601cd349365bc36abc14efcf15c03dcb Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Fri, 15 Jun 2018 22:10:28 +0200 Subject: [PATCH 3/9] Fix loading of plugins. --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index a5dce4038..142fdca15 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit a5dce40387dfb8102aa2408122e3f0fb6fe25a50 +Subproject commit 142fdca15504216b6a52e08594c2e35872b0cdbf From 060e37054cf81df606b10b09f3bd7d092bc0158c Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Sun, 17 Jun 2018 11:46:28 +0200 Subject: [PATCH 4/9] Fix compilation errors and crashes. --- src/android/org/linphone/LinphoneManager.java | 3 +++ submodules/bctoolbox | 2 +- submodules/linphone | 2 +- submodules/mediastreamer2 | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/android/org/linphone/LinphoneManager.java b/src/android/org/linphone/LinphoneManager.java index e9638139f..677f41225 100644 --- a/src/android/org/linphone/LinphoneManager.java +++ b/src/android/org/linphone/LinphoneManager.java @@ -1770,4 +1770,7 @@ public class LinphoneManager implements CoreListener, SensorEventListener, Accou mUnreadChatsPerRoom.put(key, 1); } } + + public void onQrcodeFound(Core lc, String something){ + } } diff --git a/submodules/bctoolbox b/submodules/bctoolbox index 48ac645ca..3eef7b372 160000 --- a/submodules/bctoolbox +++ b/submodules/bctoolbox @@ -1 +1 @@ -Subproject commit 48ac645caa629a65fb164882aeddab7eb13a56a9 +Subproject commit 3eef7b37214cc8a3fc1453fe92ac483a6b388f08 diff --git a/submodules/linphone b/submodules/linphone index 142fdca15..634aaf3cb 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 142fdca15504216b6a52e08594c2e35872b0cdbf +Subproject commit 634aaf3cbfcb08e0d1a1c0c92cf5243b893011a4 diff --git a/submodules/mediastreamer2 b/submodules/mediastreamer2 index a9f96ff70..e02b12e57 160000 --- a/submodules/mediastreamer2 +++ b/submodules/mediastreamer2 @@ -1 +1 @@ -Subproject commit a9f96ff708f451d2568d1aa70ea40149d6f8d0ea +Subproject commit e02b12e579faee6c792bcf34c6cca9ac20f88251 From 59def5f64f1c3613b7b6b63668280003b6c52f71 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Mon, 18 Jun 2018 10:02:42 +0200 Subject: [PATCH 5/9] restaure target liblinphone-android-sdk for bacward compatibility --- prepare.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prepare.py b/prepare.py index 4ad88b5e0..a16d7c6b9 100755 --- a/prepare.py +++ b/prepare.py @@ -371,7 +371,7 @@ generate-javadoc: debug-sdk: java-clean build copy-libs generate-javadoc generate-apk \t./gradlew -q sdkZip -release-sdk: java-clean build copy-libs generate-javadoc release +liblinphone-android-sdk: java-clean build copy-libs generate-javadoc release \t./gradlew -q sdkZip linphone-android-sdk: java-clean build copy-libs From be1c96a2be701fbe6a7d5b39596630f7799a0aa4 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Mon, 18 Jun 2018 11:58:57 +0200 Subject: [PATCH 6/9] Directly use source path of java wrapper's non-generated classes. --- liblinphone-sdk/build.gradle | 2 +- submodules/linphone | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/liblinphone-sdk/build.gradle b/liblinphone-sdk/build.gradle index c1692f802..ab99818cc 100644 --- a/liblinphone-sdk/build.gradle +++ b/liblinphone-sdk/build.gradle @@ -54,7 +54,7 @@ else { } srcDir += [rootSdk+'/share/linphonej/java/org/linphone/core/'] - +srcDir += ['../submodules/linphone/wrappers/java/classes/'] def excludePackage = [] diff --git a/submodules/linphone b/submodules/linphone index 634aaf3cb..c5115f63e 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 634aaf3cbfcb08e0d1a1c0c92cf5243b893011a4 +Subproject commit c5115f63e14796bff6054a9697a0305a7e9b0c20 From 6e0f455ca63b8951535e36b9b04c9b26fdf1db36 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Tue, 19 Jun 2018 13:00:36 +0200 Subject: [PATCH 7/9] add zxing submodule + fix armv5/gcc build --- .gitmodules | 3 +++ submodules/externals/zxing-cpp | 1 + submodules/linphone | 2 +- submodules/oRTP | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) create mode 160000 submodules/externals/zxing-cpp diff --git a/.gitmodules b/.gitmodules index 48a6bfc5b..9bdd3f034 100644 --- a/.gitmodules +++ b/.gitmodules @@ -117,3 +117,6 @@ [submodule "submodules/externals/soci"] path = submodules/externals/soci url = git://git.linphone.org/soci +[submodule "submodules/externals/zxing-cpp"] + path = submodules/externals/zxing-cpp + url = gitosis@git.linphone.org:zxing-cpp.git diff --git a/submodules/externals/zxing-cpp b/submodules/externals/zxing-cpp new file mode 160000 index 000000000..0f267e5fb --- /dev/null +++ b/submodules/externals/zxing-cpp @@ -0,0 +1 @@ +Subproject commit 0f267e5fb66d45b32fba302bef0028dcf0dda84f diff --git a/submodules/linphone b/submodules/linphone index c5115f63e..d643672e8 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit c5115f63e14796bff6054a9697a0305a7e9b0c20 +Subproject commit d643672e81e63dbdb41edb91160f188ae5cb7ff7 diff --git a/submodules/oRTP b/submodules/oRTP index 1fcd6fd15..3afc47570 160000 --- a/submodules/oRTP +++ b/submodules/oRTP @@ -1 +1 @@ -Subproject commit 1fcd6fd1558f26255ae9dac687191ddf988bfd5b +Subproject commit 3afc47570a1c9f34bd2f1a759ae00fb7ecd26a0e From 4898b21d85d14e7a971c4487051ae2b754cf0a2c Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Tue, 19 Jun 2018 13:03:33 +0200 Subject: [PATCH 8/9] fix .gitmodules --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 9bdd3f034..cdfee6b31 100644 --- a/.gitmodules +++ b/.gitmodules @@ -119,4 +119,4 @@ url = git://git.linphone.org/soci [submodule "submodules/externals/zxing-cpp"] path = submodules/externals/zxing-cpp - url = gitosis@git.linphone.org:zxing-cpp.git + url = git://git.linphone.org/zxing-cpp.git From b7df48ba7aaba30865a00077bacd6743f3aed400 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Tue, 19 Jun 2018 13:48:30 +0200 Subject: [PATCH 9/9] update linphone's submodule --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index d643672e8..f9384facd 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit d643672e81e63dbdb41edb91160f188ae5cb7ff7 +Subproject commit f9384facd9e19c79cad20c14f7596e7c18d7b20c