diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-01-14 19:14:30 +0100 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-01-14 19:14:30 +0100 |
commit | 85b6669625c9b94972fb03ec0de2da689c24d299 (patch) | |
tree | 79755cc6c865a1f7b71be352e3126dbdfd9560a6 /OpenKeychain/src/main/java/org/sufficientlysecure | |
parent | 9b093c6d73214879bee3c1b2162cf1f15c224a19 (diff) | |
download | open-keychain-85b6669625c9b94972fb03ec0de2da689c24d299.tar.gz open-keychain-85b6669625c9b94972fb03ec0de2da689c24d299.tar.bz2 open-keychain-85b6669625c9b94972fb03ec0de2da689c24d299.zip |
Integrate QR Code library instead of requiring the app to be installed, also due to security reasons
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/QrCodeScanActivity.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/QrCodeScanActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/QrCodeScanActivity.java index 5966870df..28488879b 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/QrCodeScanActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/QrCodeScanActivity.java @@ -78,7 +78,11 @@ public class QrCodeScanActivity extends FragmentActivity { // scan using xzing's Barcode Scanner and return result parcel in OpenKeychain returnResult = true; - new IntentIntegrator(this).initiateScan(); + IntentIntegrator integrator = new IntentIntegrator(this); + integrator.setDesiredBarcodeFormats(IntentIntegrator.QR_CODE_TYPES) + .setPrompt(getString(R.string.import_qr_code_text)) + .setResultDisplayDuration(0) + .initiateScan(); } else if (ACTION_QR_CODE_API.equals(action)) { // scan using xzing's Barcode Scanner from outside OpenKeychain @@ -168,7 +172,7 @@ public class QrCodeScanActivity extends FragmentActivity { return; } - if ( ! result.success()) { + if (!result.success()) { // only return if no success... Intent data = new Intent(); data.putExtras(returnData); |