Merge pull request #893 from corona-warn-app/hotfix-exposureDetector

Remove check that prevented from feeding too many files
corona-warn-app · Jul 11, 2020 · 9fb0719 · 9fb0719
2 parents d6675e8 + 73b4f64
commit 9fb0719
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 18 deletions.
diff --git a/cfg/VERSION b/cfg/VERSION
@@ -1 +1 @@
-1.0.6.0
+1.0.7.0
diff --git a/src/xcode/ENA/ENA.xcodeproj/project.pbxproj b/src/xcode/ENA/ENA.xcodeproj/project.pbxproj
@@ -2709,7 +2709,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.6;
+				MARKETING_VERSION = 1.0.7;
 				OTHER_CFLAGS = (
 					"-DSQLITE_HAS_CODEC",
 					"-DSQLITE_TEMP_STORE=3",
@@ -2863,7 +2863,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.6;
+				MARKETING_VERSION = 1.0.7;
 				OTHER_CFLAGS = (
 					"-DSQLITE_HAS_CODEC",
 					"-DSQLITE_TEMP_STORE=3",
@@ -3020,7 +3020,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.6;
+				MARKETING_VERSION = 1.0.7;
 				OTHER_CFLAGS = (
 					"-DSQLITE_HAS_CODEC",
 					"-DSQLITE_TEMP_STORE=3",
@@ -3239,7 +3239,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.6;
+				MARKETING_VERSION = 1.0.7;
 				OTHER_CFLAGS = (
 					"-DSQLITE_HAS_CODEC",
 					"-DSQLITE_TEMP_STORE=3",
@@ -3278,7 +3278,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.6;
+				MARKETING_VERSION = 1.0.7;
 				OTHER_CFLAGS = (
 					"-DSQLITE_HAS_CODEC",
 					"-DSQLITE_TEMP_STORE=3",

diff --git a/src/xcode/ENA/ENA/Source/Services/Exposure Transaction/ExposureDetectionExecutor.swift b/src/xcode/ENA/ENA/Source/Services/Exposure Transaction/ExposureDetectionExecutor.swift
@@ -104,20 +104,9 @@ final class ExposureDetectionExecutor: ExposureDetectionDelegate {
 			}
 			fatalError("invalid state")
 		}
-
-		var fileURLs: [URL]  // Will contain all cached keypackages for the interaction with ENF
-		// Limit packages to upper thresshold
-		// This should never happen. Code is just here to be sure
-		if writtenPackages.urls.count > 14 {
-			logError(message: "Trying to feed too many files into the framework")
-			fileURLs = Array(writtenPackages.urls.prefix(14))
-		} else {
-			fileURLs = writtenPackages.urls
-		}
-
 		_ = exposureDetector.detectExposures(
 				configuration: configuration,
-				diagnosisKeyURLs: fileURLs
+				diagnosisKeyURLs: writtenPackages.urls
 		) { summary, error in
 			completion(withResultFrom(summary: summary, error: error))
 		}