Replace Count(xxx) > 0 with Any()

KeeTrayTOTP · Apr 11, 2020 · d54495d · d54495d
1 parent cfe912f
commit d54495d
Showing 1 changed file with 8 additions and 13 deletions.
diff --git a/KeeTrayTOTP/Libraries/QRCoder/QRCodeGenerator.cs b/KeeTrayTOTP/Libraries/QRCoder/QRCodeGenerator.cs
@@ -788,18 +788,13 @@ private Polynom ConvertToDecNotation(Polynom poly)
 
         private int GetVersion(int length, EncodingMode encMode, ECCLevel eccLevel)
         {
-            return this.capacityTable.Where(
-                x => x.Details.Count(
-                    y => (y.ErrorCorrectionLevel == eccLevel
-                          && y.CapacityDict[encMode] >= Convert.ToInt32(length)
-                          )
-                    ) > 0
-              ).Select(x => new
-              {
-                  version = x.Version,
-                  capacity = x.Details.Single(y => y.ErrorCorrectionLevel == eccLevel)
-                                            .CapacityDict[encMode]
-              }).Min(x => x.version);
+            return this.capacityTable
+                .Where(x => x.Details.Any(y => y.ErrorCorrectionLevel == eccLevel && y.CapacityDict[encMode] >= Convert.ToInt32(length)))
+                .Select(x => new
+                {
+                    version = x.Version,
+                    capacity = x.Details.Single(y => y.ErrorCorrectionLevel == eccLevel).CapacityDict[encMode]
+                }).Min(x => x.version);
         }
 
         private EncodingMode GetEncodingFromPlaintext(string plainText, bool forceUtf8)
@@ -914,7 +909,7 @@ private int GetCountIndicatorLength(int version, EncodingMode encMode)
                         return 11;
                     case EncodingMode.Byte:
                         return 16;
-                    default: 
+                    default:
                         return 10;
                 }
             }