Fixed #311 - encode exported databases in utf-8

src/main/java/de/deadlocker8/budgetmaster/controller/SettingsController.java

@@ -26,6 +26,7 @@ import tools.RandomCreations;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
 
 
 @Controller
@@ -95,24 +96,31 @@ public class SettingsController extends BaseController
 	{
 		LOGGER.debug("Exporting database...");
 		String data = databaseService.getDatabaseAsJSON();
-
+		try
+		{
+			byte[] dataBytes = data.getBytes("UTF8");
 			String fileName = "BudgetMasterDatabase_" + DateTime.now().toString("yyyy_MM_dd") + ".json";
 			response.setHeader("Content-Disposition", "attachment; filename=\"" + fileName + "\"");
 
-		response.setContentType("application/json");
-		response.setContentLength(data.length());
+			response.setContentType("application/json; charset=UTF-8");
+			response.setContentLength(dataBytes.length);
+			response.setCharacterEncoding("UTF-8");
 
 			try(ServletOutputStream out = response.getOutputStream())
 			{
-			out.println(data);
+				out.write(dataBytes);
 				out.flush();
+				LOGGER.debug("Exporting database DONE");
 			}
 			catch(IOException e)
 			{
 				e.printStackTrace();
 			}
-
-		LOGGER.debug("Exporting database DONE");
+		}
+		catch(UnsupportedEncodingException e)
+		{
+			e.printStackTrace();
+		}
 	}
 
 	@RequestMapping("/settings/database/requestDelete")

src/main/resources/templates/settings.ftl

@@ -206,7 +206,7 @@
                 <div class="modal-content">
                     <h4>${locale.getString("info.title.database.import.dialog")}</h4>
 
-                    <form id="form-database-import" method="POST" action="/settings/database/upload" enctype="multipart/form-data">
+                    <form id="form-database-import" method="POST" action="/settings/database/upload" enctype="multipart/form-data" accept-charset="UTF-8">
                         <input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}"/>
                         <div class="file-field input-field">
                             <div class="btn waves-effect waves-light budgetmaster-blue">