Minor bugfixs

-Fixed audio not coming from mobile devices -Fixed redirect from exercie.jsp if not logged -Fixed redirect from exercise.jsp
pastore99 · Jan 11, 2024 · 050e03b · 050e03b
1 parent 7e8fe22
commit 050e03b
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 7 deletions.
diff --git a/src/main/java/controller/ExerciseLogger.java b/src/main/java/controller/ExerciseLogger.java
@@ -18,7 +18,9 @@
 import java.sql.SQLException;
 
 @WebServlet("/exerciseLogger")
-@MultipartConfig
+@MultipartConfig(fileSizeThreshold=1024*1024*10, // 10 MB
+        maxFileSize=1024*1024*50,      // 50 MB
+        maxRequestSize=1024*1024*100)  // 100 MB
 public class ExerciseLogger extends HttpServlet {
     protected void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
         String contentType = request.getContentType();

diff --git a/src/main/webapp/JS/exercise.js b/src/main/webapp/JS/exercise.js
@@ -42,7 +42,7 @@ function micPreparation(){
           };
 
           mediaRecorder.onstop = function() {
-            let audioBlob = new Blob(audioChunks, { type: 'audio/opus' });
+            let audioBlob = new Blob(audioChunks, { type: 'audio/wav' });
             let audioUrl = URL.createObjectURL(audioBlob);
             $("#audioPlayer").attr("src", audioUrl);
 
@@ -530,8 +530,9 @@ function saveExecution(execution){
       redirect("500.html")
     }
   });
-
-  redirect("home");
+  setTimeout(()=> {
+    redirect("home");
+  }, 3000);
 }
 
 function saveAudioExecution(execution){
@@ -547,13 +548,14 @@ function saveAudioExecution(execution){
       processData: false,
       contentType: false,
       cache: false,
+      success: function (){
+        redirect("home");
+      },
       error: function(xhr, status, error) {
         console.error("Errore durante l'invio dell'audio alla servlet:", error);
         console.log(xhr.responseText);
         redirect("500.html");
       }
     });
-
-    redirect("home");
   }
 }
diff --git a/src/main/webapp/JSP/exercise.jsp b/src/main/webapp/JSP/exercise.jsp
@@ -3,8 +3,13 @@
 <!DOCTYPE html>
 <html>
 <head>
+
     <%
-        ExerciseGlossary exercise = (ExerciseGlossary) session.getAttribute("exercise");
+        if(session.getAttribute("id") == null) {
+            response.sendRedirect("../errorPage/403.html");
+        }
+        else {
+            ExerciseGlossary exercise = (ExerciseGlossary) session.getAttribute("exercise");
     %>
 
     <title>Esercizio <%= exercise.getIdExercise()%></title>
@@ -39,4 +44,6 @@
     <script>
         startUp(<%= exercise.getInitialState()%>);
     </script>
+<%}%>
+
 </html>