Issue 549, Make slightly more consistent by changing value of as-yet-unused key ENCOD...

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

diff --git a/android/src/com/google/zxing/client/android/Intents.java b/android/src/com/google/zxing/client/android/Intents.java
index 74dd0af..6605baf 100755 (executable)
--- a/android/src/com/google/zxing/client/android/Intents.java
+++ b/android/src/com/google/zxing/client/android/Intents.java
@@ -127,7 +127,7 @@ public final class Intents {
      * it defaults to QR Code. Use Intent.putExtra(FORMAT, format), where
      * format is one of Contents.Format. 
      */
      * it defaults to QR Code. Use Intent.putExtra(FORMAT, format), where
      * format is one of Contents.Format. 
      */

-    public static final String FORMAT = "com.google.zxing.client.android.ENCODE_FORMAT";
+    public static final String FORMAT = "ENCODE_FORMAT";

 
     private Encode() {
     }
 
     private Encode() {
     }

diff --git a/android/src/com/google/zxing/client/android/encode/QRCodeEncoder.java b/android/src/com/google/zxing/client/android/encode/QRCodeEncoder.java
index 0ba2d22..393967e 100755 (executable)
--- a/android/src/com/google/zxing/client/android/encode/QRCodeEncoder.java
+++ b/android/src/com/google/zxing/client/android/encode/QRCodeEncoder.java
@@ -112,7 +112,6 @@ final class QRCodeEncoder {
     } catch (IllegalArgumentException iae) {
       // Ignore it then
       format = null;
     } catch (IllegalArgumentException iae) {
       // Ignore it then
       format = null;

-      formatString = null;

     }
     if (format == null || BarcodeFormat.QR_CODE.equals(format)) {
       String type = intent.getStringExtra(Intents.Encode.TYPE);
     }
     if (format == null || BarcodeFormat.QR_CODE.equals(format)) {
       String type = intent.getStringExtra(Intents.Encode.TYPE);