Merge pull request #77 from DP-3T/feature/fix-ios14-detection

Fix ios14 detection -> ios14.0
SwissCovid · Sep 3, 2020 · 2c7943d · 2c7943d
2 parents a37f511 + d271131
commit 2c7943d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...in/java/org/dpppt/switzerland/backend/sdk/config/ws/controller/DPPPTConfigController.java b/...in/java/org/dpppt/switzerland/backend/sdk/config/ws/controller/DPPPTConfigController.java
@@ -40,7 +40,7 @@ public class DPPPTConfigController {
 			   "ios-200524.1316.87",
 			   "ios-200521.2320.79");
 	private static final String IOS_VERSION_13_7 = "ios13.7";
-	private static final String IOS_VERSION_14 = "ios14";
+	private static final String IOS_VERSION_14 = "ios14.0";
 	private static final Version APP_VERSION_1_0_9 = new Version("ios-1.0.9");
 
 	private static final Logger logger = LoggerFactory.getLogger(DPPPTConfigController.class);

diff --git a/...backend/src/test/java/org/dpppt/switzerland/backend/sdk/config/ws/BaseControllerTest.java b/...backend/src/test/java/org/dpppt/switzerland/backend/sdk/config/ws/BaseControllerTest.java
@@ -164,7 +164,7 @@ public void testForUpdateNote() throws Exception {
 	@Test
 	public void testForceUpdate() throws Exception {
 		MockHttpServletResponse result = mockMvc.perform(
-				get("/v1/config").param("osversion", "ios14").param("appversion", "ios-1.0.8").param("buildnr", "ios-2020.0145asdfa34"))
+				get("/v1/config").param("osversion", "ios14.0").param("appversion", "ios-1.0.8").param("buildnr", "ios-2020.0145asdfa34"))
 				.andExpect(status().is2xxSuccessful()).andReturn().getResponse();
 			assertIsForceUpdate(result);