From 49f700eba173221ccdb998b2176ffd8352580420 Mon Sep 17 00:00:00 2001 From: AnastasiiaKomar Date: Mon, 25 Jul 2022 15:18:35 +0300 Subject: [PATCH] cleaned file download controller --- .../server/controller/OtaPackageController.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/application/src/main/java/org/thingsboard/server/controller/OtaPackageController.java b/application/src/main/java/org/thingsboard/server/controller/OtaPackageController.java index 062b98028b..c1aadc238b 100644 --- a/application/src/main/java/org/thingsboard/server/controller/OtaPackageController.java +++ b/application/src/main/java/org/thingsboard/server/controller/OtaPackageController.java @@ -98,20 +98,16 @@ public class OtaPackageController extends BaseController { return ResponseEntity.badRequest().build(); } FileSystemResource resource = new FileSystemResource(otaPackageService.getOtaDataFile(getTenantId(), otaPackageId)); - String fileName= URLEncoder.encode(otaPackage.getFileName(), StandardCharsets.UTF_8.toString()); return ResponseEntity.ok() - .header(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename*=UTF-8''" + fileName) - .header("x-filename", fileName) + .header(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=" + otaPackage.getFileName()) + .header("x-filename", otaPackage.getFileName()) .contentLength(otaPackage.getDataSize()) - .contentType(new MediaType(parseMediaType(otaPackage.getContentType()), StandardCharsets.UTF_8)) + .contentType(parseMediaType(otaPackage.getContentType())) .body(resource); } catch (Exception e) { throw handleException(e); } } - private static String encodeFileName(String fileName) { - return URLEncoder.encode(fileName, StandardCharsets.UTF_8).replace("+", "%20"); - } @ApiOperation(value = "Get OTA Package Info (getOtaPackageInfoById)", notes = "Fetch the OTA Package Info object based on the provided OTA Package Id. " +