Added more metadata to the integrator

git-svn-id: https://zxing.googlecode.com/svn/trunk@2068 59b500cc-1b3d-0410-9834-0bbf25fbcc57

android-integration/src/com/google/zxing/integration/android/IntentIntegrator.java

@@ -292,7 +292,14 @@ public final class IntentIntegrator {
         String contents = intent.getStringExtra("SCAN_RESULT");
         String formatName = intent.getStringExtra("SCAN_RESULT_FORMAT");
         byte[] rawBytes = intent.getByteArrayExtra("SCAN_RESULT_BYTES");
-        return new IntentResult(contents, formatName, rawBytes);
+        int intentOrientation = intent.getIntExtra("SCAN_RESULT_ORIENTATION", Integer.MIN_VALUE);
+        Integer orientation = intentOrientation == Integer.MIN_VALUE ? null : intentOrientation;
+        String errorCorrectionLevel = intent.getStringExtra("SCAN_RESULT_ERROR_CORRECTION_LEVEL");
+        return new IntentResult(contents,
+                                formatName,
+                                rawBytes,
+                                orientation,
+                                errorCorrectionLevel);
       }
       return new IntentResult();
     }

android-integration/src/com/google/zxing/integration/android/IntentResult.java

@@ -26,15 +26,23 @@ public final class IntentResult {
   private final String contents;
   private final String formatName;
   private final byte[] rawBytes;
+  private final Integer orientation;
+  private final String errorCorrectionLevel;
 
   IntentResult() {
-    this(null, null, null);
+    this(null, null, null, null, null);
   }
 
-  IntentResult(String contents, String formatName, byte[] rawBytes) {
+  IntentResult(String contents,
+               String formatName,
+               byte[] rawBytes,
+               Integer orientation,
+               String errorCorrectionLevel) {
     this.contents = contents;
     this.formatName = formatName;
     this.rawBytes = rawBytes;
+    this.orientation = orientation;
+    this.errorCorrectionLevel = errorCorrectionLevel;
   }
 
   /**
@@ -58,4 +66,30 @@ public final class IntentResult {
     return rawBytes;
   }
 
+  /**
+   * @return rotation of the image, in degrees, which resulted in a successful scan. May be null.
+   */
+  public Integer getOrientation() {
+    return orientation;
+  }
+
+  /**
+   * @return name of the error correction level used in the barcode, if applicable
+   */
+  public String getErrorCorrectionLevel() {
+    return errorCorrectionLevel;
+  }
+  
+  @Override
+  public String toString() {
+    StringBuilder dialogText = new StringBuilder(100);
+    dialogText.append("Format: ").append(formatName).append('\n');
+    dialogText.append("Contents: ").append(contents).append('\n');
+    int rawBytesLength = rawBytes == null ? 0 : rawBytes.length;
+    dialogText.append("Raw bytes: (").append(rawBytesLength).append(" bytes)\n");
+    dialogText.append("Orientation: ").append(orientation).append('\n');
+    dialogText.append("EC level: ").append(errorCorrectionLevel).append('\n');
+    return dialogText.toString();
+  }
+
 }

androidtest/src/com/google/zxing/client/androidtest/ZXingTestActivity.java

@@ -105,7 +105,7 @@ public final class ZXingTestActivity extends Activity {
     if (result != null) {
       String contents = result.getContents();
       if (contents != null) {
-        showDialog(R.string.result_succeeded, "Format: " + result.getFormatName() + "\nContents: " + contents);
+        showDialog(R.string.result_succeeded, result.toString());
       } else {
         showDialog(R.string.result_failed, getString(R.string.result_failed_why));
       }