mirror of
https://github.com/zxing/zxing.git
synced 2025-03-05 20:48:51 -08:00
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
This commit is contained in:
parent
c19eb95cfc
commit
fa10404128
|
@ -127,7 +127,7 @@ public final class Intents {
|
||||||
* it defaults to QR Code. Use Intent.putExtra(FORMAT, format), where
|
* it defaults to QR Code. Use Intent.putExtra(FORMAT, format), where
|
||||||
* format is one of Contents.Format.
|
* 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() {
|
||||||
}
|
}
|
||||||
|
|
|
@ -112,7 +112,6 @@ final class QRCodeEncoder {
|
||||||
} catch (IllegalArgumentException iae) {
|
} catch (IllegalArgumentException iae) {
|
||||||
// Ignore it then
|
// Ignore it then
|
||||||
format = null;
|
format = null;
|
||||||
formatString = null;
|
|
||||||
}
|
}
|
||||||
if (format == null || BarcodeFormat.QR_CODE.equals(format)) {
|
if (format == null || BarcodeFormat.QR_CODE.equals(format)) {
|
||||||
String type = intent.getStringExtra(Intents.Encode.TYPE);
|
String type = intent.getStringExtra(Intents.Encode.TYPE);
|
||||||
|
|
Loading…
Reference in a new issue