Merge pull request #868 from Redth/ienumerable

Use IEnumerable for PossibleFormats
Redth · Mar 14, 2020 · 9e0dedd · 9e0dedd
2 parents c667b8f + 12caff1
commit 9e0dedd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/ZXing.Net.Mobile/MobileBarcodeScanningOptions.shared.cs b/ZXing.Net.Mobile/MobileBarcodeScanningOptions.shared.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Linq;
 using ZXing;
 
 namespace ZXing.Mobile
@@ -24,7 +25,7 @@ public MobileBarcodeScanningOptions()
 
 		public CameraResolutionSelectorDelegate CameraResolutionSelector { get; set; }
 
-		public List<BarcodeFormat> PossibleFormats { get; set; }
+		public IEnumerable<BarcodeFormat> PossibleFormats { get; set; }
 
 		public bool? TryHarder { get; set; }
 
@@ -75,7 +76,7 @@ public BarcodeReader BuildBarcodeReader()
 			if (AssumeGS1.HasValue)
 				reader.Options.AssumeGS1 = AssumeGS1.Value;
 
-			if (PossibleFormats != null && PossibleFormats.Count > 0)
+			if (PossibleFormats?.Any() ?? false)
 			{
 				reader.Options.PossibleFormats = new List<BarcodeFormat>();
 
@@ -97,7 +98,7 @@ public MultiFormatReader BuildMultiFormatReader()
 			if (PureBarcode.HasValue && PureBarcode.Value)
 				hints.Add(DecodeHintType.PURE_BARCODE, PureBarcode.Value);
 
-			if (PossibleFormats != null && PossibleFormats.Count > 0)
+			if (PossibleFormats?.Any() ?? false)
 				hints.Add(DecodeHintType.POSSIBLE_FORMATS, PossibleFormats);
 
 			reader.Hints = hints;

diff --git a/ZXing.Net.Mobile/iOS/AVCaptureScannerView.ios.cs b/ZXing.Net.Mobile/iOS/AVCaptureScannerView.ios.cs
@@ -222,7 +222,7 @@ bool SetupCaptureSession()
 			session.AddOutput(metadataOutput);
 
 			//Setup barcode formats
-			if (ScanningOptions.PossibleFormats != null && ScanningOptions.PossibleFormats.Count > 0)
+			if (ScanningOptions?.PossibleFormats?.Any() ?? false)
 			{
 				var formats = AVMetadataObjectType.None;