From 85b6669625c9b94972fb03ec0de2da689c24d299 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Wed, 14 Jan 2015 19:14:30 +0100 Subject: Integrate QR Code library instead of requiring the app to be installed, also due to security reasons --- OpenKeychain/build.gradle | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'OpenKeychain/build.gradle') diff --git a/OpenKeychain/build.gradle b/OpenKeychain/build.gradle index 6c78c3aea..21482340a 100644 --- a/OpenKeychain/build.gradle +++ b/OpenKeychain/build.gradle @@ -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 { -- cgit v1.2.3