Integrate QR Code library instead of requiring the app to be installed, also due to security reasons

This commit is contained in:
Dominik Schürmann
2015-01-14 19:14:30 +01:00
parent 9b093c6d73
commit 85b6669625
5 changed files with 17 additions and 6 deletions

View File

@@ -10,8 +10,6 @@ dependencies {
compile project(':extern:openkeychain-api-lib')
compile project(':extern:html-textview')
compile project(':extern:StickyListHeaders:library')
compile project(':extern:zxing-qr-code')
compile project(':extern:zxing-android-integration')
compile project(':extern:spongycastle:core')
compile project(':extern:spongycastle:pg')
compile project(':extern:spongycastle:pkix')
@@ -22,6 +20,11 @@ dependencies {
compile project(':extern:TokenAutoComplete:library')
compile project(':extern:safeslinger-exchange')
compile project(':extern:android-lockpattern:code')
// TODO: include as submodule?:
compile 'com.journeyapps:zxing-android-embedded:2.0.1@aar'
compile 'com.journeyapps:zxing-android-integration:2.0.1@aar'
compile 'com.google.zxing:core:3.0.1'
}
android {