From fa10404128f004c00642e798ca24bd7e61bc5092 Mon Sep 17 00:00:00 2001
From: srowen <srowen@59b500cc-1b3d-0410-9834-0bbf25fbcc57>
Date: Fri, 10 Sep 2010 08:24:51 +0000
Subject: [PATCH] Issue 549, Make slightly more consistent by changing value of
 as-yet-unused key ENCODE_FORMAT

git-svn-id: https://zxing.googlecode.com/svn/trunk@1581 59b500cc-1b3d-0410-9834-0bbf25fbcc57
---
 android/src/com/google/zxing/client/android/Intents.java        | 2 +-
 .../com/google/zxing/client/android/encode/QRCodeEncoder.java   | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/android/src/com/google/zxing/client/android/Intents.java b/android/src/com/google/zxing/client/android/Intents.java
index 74dd0af24..6605baf79 100755
--- 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. 
      */
-    public static final String FORMAT = "com.google.zxing.client.android.ENCODE_FORMAT";
+    public static final String FORMAT = "ENCODE_FORMAT";
 
     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 0ba2d22e4..393967e84 100755
--- 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;
-      formatString = null;
     }
     if (format == null || BarcodeFormat.QR_CODE.equals(format)) {
       String type = intent.getStringExtra(Intents.Encode.TYPE);