"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "android-integration/src/main/java/com/google/zxing/integration/android/IntentIntegrator.java" between
zxing-zxing-3.4.1.tar.gz and zxing-zxing-3.5.0.tar.gz

About: ZXing ("zebra crossing") is a multi-format 1D/2D barcode image processing library implemented in Java, with ports to other languages. Info: Project is in maintenance mode (no active development).

IntentIntegrator.java  (zxing-zxing-3.4.1)	:	IntentIntegrator.java  (zxing-zxing-3.5.0)
skipping to change at line 291		skipping to change at line 291
*		*
* @param desiredBarcodeFormats names of {@code BarcodeFormat}s to scan for		* @param desiredBarcodeFormats names of {@code BarcodeFormat}s to scan for
* @return the {@link AlertDialog} that was shown to the user prompting them t o download the app		* @return the {@link AlertDialog} that was shown to the user prompting them t o download the app
* 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);
}		}
/**		/**
* Initiates a scan, using the specified camera, only for a certain set of bar		* Initiates a scan, using the specified camera, only for a certain set of bar
code types, given as strings corresponding		code types, given as strings
* to their names in ZXing's {@code BarcodeFormat} class like "UPC_A". You can		* corresponding to their names in ZXing's {@code BarcodeFormat} class like "U
supply constants		PC_A". You can supply constants
* like {@link #PRODUCT_CODE_TYPES} for example.		* like {@link #PRODUCT_CODE_TYPES} for example.
*		*
* @param desiredBarcodeFormats names of {@code BarcodeFormat}s to scan for		* @param desiredBarcodeFormats names of {@code BarcodeFormat}s to scan for
* @param cameraId camera ID of the camera to use. A negative value means "no preference".		* @param cameraId camera ID of the camera to use. A negative value means "no preference".
* @return the {@link AlertDialog} that was shown to the user prompting them t o download the app		* @return the {@link AlertDialog} that was shown to the user prompting them t o download the app
* if a prompt was needed, or null otherwise		* if a prompt was needed, or null otherwise
*/		*/
public final AlertDialog initiateScan(Collection<String> desiredBarcodeFormats , int cameraId) {		public final AlertDialog initiateScan(Collection<String> desiredBarcodeFormats , int cameraId) {
Intent intentScan = new Intent(BS_PACKAGE + ".SCAN");		Intent intentScan = new Intent(BS_PACKAGE + ".SCAN");
intentScan.addCategory(Intent.CATEGORY_DEFAULT);		intentScan.addCategory(Intent.CATEGORY_DEFAULT);
End of changes. 1 change blocks.
4 lines changed or deleted		4 lines changed or added

---