Issue 549, Make slightly more consistent by changing value of as-yet-unused key ENCOD...
authorsrowen <srowen@59b500cc-1b3d-0410-9834-0bbf25fbcc57>
Fri, 10 Sep 2010 08:24:51 +0000 (08:24 +0000)
committersrowen <srowen@59b500cc-1b3d-0410-9834-0bbf25fbcc57>
Fri, 10 Sep 2010 08:24:51 +0000 (08:24 +0000)
git-svn-id: http://zxing.googlecode.com/svn/trunk@1581 59b500cc-1b3d-0410-9834-0bbf25fbcc57

android/src/com/google/zxing/client/android/Intents.java
android/src/com/google/zxing/client/android/encode/QRCodeEncoder.java

index 74dd0af..6605baf 100755 (executable)
@@ -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() {
     }
index 0ba2d22..393967e 100755 (executable)
@@ -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);