From 91fc847fd3168be7aa6bc37fe37212cd3e30ba65 Mon Sep 17 00:00:00 2001 From: Erwan Croze Date: Thu, 5 Apr 2018 16:20:10 +0200 Subject: [PATCH] Implementing qrcode to linphone android --- .gitmodules | 3 +++ build.gradle | 2 +- src/android/org/linphone/LinphoneManager.java | 7 ++++++- submodules/bctoolbox | 2 +- submodules/cmake-builder | 2 +- submodules/externals/zxing-cpp | 1 + submodules/linphone | 2 +- submodules/mediastreamer2 | 2 +- submodules/oRTP | 2 +- 9 files changed, 16 insertions(+), 7 deletions(-) create mode 160000 submodules/externals/zxing-cpp diff --git a/.gitmodules b/.gitmodules index 2328eab8c..944c1c75a 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 = git://git.linphone.org/zxing-cpp.git diff --git a/build.gradle b/build.gradle index 8df9233cc..4f8b9f066 100644 --- a/build.gradle +++ b/build.gradle @@ -48,7 +48,7 @@ dependencies { compile 'com.google.firebase:firebase-messaging:11.+' } else { compile fileTree(include: 'gcm.jar', dir: 'libs') - compile 'com.android.support:support-v4:+' + compile 'com.android.support:support-v4:26.0.1' } } diff --git a/src/android/org/linphone/LinphoneManager.java b/src/android/org/linphone/LinphoneManager.java index 5e8a901e0..e72e36b87 100644 --- a/src/android/org/linphone/LinphoneManager.java +++ b/src/android/org/linphone/LinphoneManager.java @@ -376,7 +376,7 @@ public class LinphoneManager implements CoreListener, SensorEventListener, Accou public void changeStatusToOnThePhone() { Core lc = getLcIfManagerNotDestroyedOrNull(); if (lc == null) return; - + if (isInstanciated() && isPresenceModelActivitySet() && lc.getPresenceModel().getActivity().getType() != PresenceActivity.Type.OnThePhone) { lc.getPresenceModel().getActivity().setType(PresenceActivity.Type.OnThePhone); } else if (isInstanciated() && !isPresenceModelActivitySet()) { @@ -1301,6 +1301,11 @@ public class LinphoneManager implements CoreListener, SensorEventListener, Accou } + @Override + public void onQrcodeFounded(Core lc, String result) { + + } + public void onCallEncryptionChanged(Core lc, Call call, boolean encrypted, String authenticationToken) { } diff --git a/submodules/bctoolbox b/submodules/bctoolbox index 312f1e41b..e9473d2e5 160000 --- a/submodules/bctoolbox +++ b/submodules/bctoolbox @@ -1 +1 @@ -Subproject commit 312f1e41b217b1cb69bcad193046b01774be5341 +Subproject commit e9473d2e5772c9ad1aea83c504b9c6aa9a92bc67 diff --git a/submodules/cmake-builder b/submodules/cmake-builder index 4232e757c..d389b30b6 160000 --- a/submodules/cmake-builder +++ b/submodules/cmake-builder @@ -1 +1 @@ -Subproject commit 4232e757cc9ede121b6f35bc4da149d8aaa14e0f +Subproject commit d389b30b6c417d8bc7a79f561075a5c58871e3bc diff --git a/submodules/externals/zxing-cpp b/submodules/externals/zxing-cpp new file mode 160000 index 000000000..9d5bfe077 --- /dev/null +++ b/submodules/externals/zxing-cpp @@ -0,0 +1 @@ +Subproject commit 9d5bfe077dc53968ea1a4b386be7a2af14121aa0 diff --git a/submodules/linphone b/submodules/linphone index cd08c6e2f..f985c8a7c 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit cd08c6e2fee6c99ead64dde6783337714c5aedc8 +Subproject commit f985c8a7c3b84df3de6bb557c8fe0eabcb56ab05 diff --git a/submodules/mediastreamer2 b/submodules/mediastreamer2 index f49b3d5ea..9c69731ad 160000 --- a/submodules/mediastreamer2 +++ b/submodules/mediastreamer2 @@ -1 +1 @@ -Subproject commit f49b3d5ea3ab56b4b021a760a58f44015b3c5765 +Subproject commit 9c69731add9f4d9fa9642ac6b163d610d48bcae8 diff --git a/submodules/oRTP b/submodules/oRTP index 996a3d651..1fcd6fd15 160000 --- a/submodules/oRTP +++ b/submodules/oRTP @@ -1 +1 @@ -Subproject commit 996a3d651288e7976581c1b77e2a439c3cfb255d +Subproject commit 1fcd6fd1558f26255ae9dac687191ddf988bfd5b