mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-03-05 20:48:51 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Indentation wtf

Browse source
This commit is contained in:
slepmog 2014-05-01 05:43:12 -07:00
parent e19e20b5dc
commit 01bbe8fd53
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
android-integration/src/main/java/com/google/zxing/integration/android/IntentIntegrator.java
View file

@ -266,7 +266,7 @@ public class IntentIntegrator {
* if a prompt was needed, or null otherwise. * if a prompt was needed, or null otherwise.
*/ */
public final AlertDialog initiateScan(int cameraId) { public final AlertDialog initiateScan(int cameraId) {
return initiateScan(ALL_CODE_TYPES, cameraId); return initiateScan(ALL_CODE_TYPES, cameraId);
} }
/** /**
@ -279,7 +279,7 @@ public class IntentIntegrator {
* if a prompt was needed, or null otherwise. * if a prompt was needed, or null otherwise.
*/ */
public final AlertDialog initiateScan(Collection<String> desiredBarcodeFormats) { public final AlertDialog initiateScan(Collection<String> desiredBarcodeFormats) {
return initiateScan(desiredBarcodeFormats, -1); return initiateScan(desiredBarcodeFormats, -1);
} }
/** /**
@ -309,10 +309,10 @@ public class IntentIntegrator {
intentScan.putExtra("SCAN_FORMATS", joinedByComma.toString()); intentScan.putExtra("SCAN_FORMATS", joinedByComma.toString());
} }
// check requested camera ID // check requested camera ID
if (cameraId > -1) { if (cameraId > -1) {
intentScan.putExtra("SCAN_CAMERA_ID", cameraId); intentScan.putExtra("SCAN_CAMERA_ID", cameraId);
} }
String targetAppPackage = findTargetAppPackage(intentScan); String targetAppPackage = findTargetAppPackage(intentScan);
if (targetAppPackage == null) { if (targetAppPackage == null) {