summaryrefslogtreecommitdiff
path: root/android-integration/src/com/google/zxing/integration/android/IntentIntegrator.java
diff options
context:
space:
mode:
authorsrowen <srowen@59b500cc-1b3d-0410-9834-0bbf25fbcc57>2011-11-28 19:06:44 +0400
committersrowen <srowen@59b500cc-1b3d-0410-9834-0bbf25fbcc57>2011-11-28 19:06:44 +0400
commit6de693fa067d5e81d717ad5cdda035a80e080ccc (patch)
tree1e11500b22e8e994afa2543f2e31555164c68095 /android-integration/src/com/google/zxing/integration/android/IntentIntegrator.java
parent8f005274c09440f391d5a3ea05a734268ad2d065 (diff)
downloadzxing-6de693fa067d5e81d717ad5cdda035a80e080ccc.tar.xz
Issue 1079 return metadata like byte segments and more in Intent extras; add raw bytes to intent integrator code
git-svn-id: https://zxing.googlecode.com/svn/trunk@2053 59b500cc-1b3d-0410-9834-0bbf25fbcc57
Diffstat (limited to 'android-integration/src/com/google/zxing/integration/android/IntentIntegrator.java')
-rw-r--r--android-integration/src/com/google/zxing/integration/android/IntentIntegrator.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/android-integration/src/com/google/zxing/integration/android/IntentIntegrator.java b/android-integration/src/com/google/zxing/integration/android/IntentIntegrator.java
index 603b0244e..19d618a13 100644
--- a/android-integration/src/com/google/zxing/integration/android/IntentIntegrator.java
+++ b/android-integration/src/com/google/zxing/integration/android/IntentIntegrator.java
@@ -291,9 +291,10 @@ public final class IntentIntegrator {
if (resultCode == Activity.RESULT_OK) {
String contents = intent.getStringExtra("SCAN_RESULT");
String formatName = intent.getStringExtra("SCAN_RESULT_FORMAT");
- return new IntentResult(contents, formatName);
+ byte[] rawBytes = intent.getByteArrayExtra("SCAN_RESULT_BYTES");
+ return new IntentResult(contents, formatName, rawBytes);
}
- return new IntentResult(null, null);
+ return new IntentResult();
}
return null;
}