Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Implementing qrcode to linphone android

Browse source
This commit is contained in:
Erwan Croze 2018-04-05 16:20:10 +02:00
parent b4f851aa9e
commit 91fc847fd3
9 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored
View file

@ -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

2
build.gradle
View file

@ -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'
}
}

7
src/android/org/linphone/LinphoneManager.java
View file

@ -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) {
}

2
submodules/bctoolbox

@ -1 +1 @@
Subproject commit 312f1e41b217b1cb69bcad193046b01774be5341
Subproject commit e9473d2e5772c9ad1aea83c504b9c6aa9a92bc67

2
submodules/cmake-builder

@ -1 +1 @@
Subproject commit 4232e757cc9ede121b6f35bc4da149d8aaa14e0f
Subproject commit d389b30b6c417d8bc7a79f561075a5c58871e3bc

1
submodules/externals/zxing-cpp vendored Submodule

@ -0,0 +1 @@
Subproject commit 9d5bfe077dc53968ea1a4b386be7a2af14121aa0

2
submodules/linphone

@ -1 +1 @@
Subproject commit cd08c6e2fee6c99ead64dde6783337714c5aedc8
Subproject commit f985c8a7c3b84df3de6bb557c8fe0eabcb56ab05

2
submodules/mediastreamer2

@ -1 +1 @@
Subproject commit f49b3d5ea3ab56b4b021a760a58f44015b3c5765
Subproject commit 9c69731add9f4d9fa9642ac6b163d610d48bcae8

2
submodules/oRTP

@ -1 +1 @@
Subproject commit 996a3d651288e7976581c1b77e2a439c3cfb255d
Subproject commit 1fcd6fd1558f26255ae9dac687191ddf988bfd5b