Updated some stuff

code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/components/ExerciseStatusElement.java

@@ -18,12 +18,7 @@ import com.example.fitbot.util.NavigationManager;
 import com.example.fitbot.util.processing.IInputHandler;
 import com.example.fitbot.util.processing.InputProcessor;
 
-import org.joml.Matrix4f;
-import org.joml.Vector2f;
 import org.joml.Vector3f;
-import org.joml.Vector4f;
-
-import java.util.concurrent.ConcurrentLinkedQueue;
 
 public class ExerciseStatusElement extends View implements IInputHandler {
 
@@ -87,8 +82,6 @@ public class ExerciseStatusElement extends View implements IInputHandler {
 
         // Handler that is called every time the motion processor receives new data.
 
-
-
     }
 
     /**
@@ -127,40 +120,40 @@ public class ExerciseStatusElement extends View implements IInputHandler {
 
     @Override
     public void accept(Vector3f rotationVector, int sensorId) {
-            Log.i("MotionProcessor", "Rotation vector received: " + rotationVector);
+        Log.i("MotionProcessor", "Rotation vector received: " + rotationVector);
-            Log.i("MotionProcessor", "Last error offset:" + this.motionProcessor.getError(sensorId, this.motionProcessor.secondsPassed()));
+        Log.i("MotionProcessor", "Last error offset:" + this.motionProcessor.getError(sensorId, this.motionProcessor.secondsPassed()));
 
-            // Check whether the current exercise has been completed.
+        // Check whether the current exercise has been completed.
-            // This is determined by the duration of the exercise, and the amount of time that has passed.
+        // This is determined by the duration of the exercise, and the amount of time that has passed.
-            // The duration of the exercise originates from the database, and is stored in seconds.
+        // The duration of the exercise originates from the database, and is stored in seconds.
-            // Whenever 'useExercise' is called, the timer resets and this method will be called again.
+        // Whenever 'useExercise' is called, the timer resets and this method will be called again.
-            if (this.motionProcessor.hasFinished() && !this.motionProcessor.isRecording()) {
+        if (this.motionProcessor.hasFinished() && !this.motionProcessor.isRecording()) {
-                // If for some reason the parent activity is not defined,
+            // If for some reason the parent activity is not defined,
-                // move back to the main screen.
+            // move back to the main screen.
-                if (this.parentActivity == null) {
+            if (this.parentActivity == null) {
-                    // Move to main screen
+                // Move to main screen
-                    Log.i("MotionProcessor", "Parent activity was null.");
+                Log.i("MotionProcessor", "Parent activity was null.");
-                    NavigationManager.navigateToActivity(getContext(), MainActivity.class);
+                NavigationManager.navigateToActivity(getContext(), MainActivity.class);
-                    return;
+                return;
-                }
-                // Move on to the next exercise, or finish.
-                if (this.exerciseCount > 0) {
-                    this.exerciseCount--;
-                    this.parentActivity.fetchExerciseAsync((newExercise) -> {
-                        this.motionProcessor.useExercise(newExercise);
-
-                        // Whenever the database retrieval failed, we return to the main screen.
-                    }, (failed) -> {
-                        // Move to main screen
-                        Log.i("MotionProcessor", "Failed to fetch exercise from database");
-                        NavigationManager.navigateToActivity(parentActivity, MainActivity.class);
-                    });
-                } else {
-                    // Finish the exercise.
-                    Log.i("MotionProcessor", "Exercise has finished");
-                    NavigationManager.navigateToActivity(parentActivity, EndScreenActivity.class);
-                }
             }
+            // Move on to the next exercise, or finish.
+            if (this.exerciseCount > 0) {
+                this.exerciseCount--;
+                this.parentActivity.fetchExerciseAsync((newExercise) -> {
+                    this.motionProcessor.useExercise(newExercise);
+
+                    // Whenever the database retrieval failed, we return to the main screen.
+                }, (failed) -> {
+                    // Move to main screen
+                    Log.i("MotionProcessor", "Failed to fetch exercise from database");
+                    NavigationManager.navigateToActivity(parentActivity, MainActivity.class);
+                });
+            } else {
+                // Finish the exercise.
+                Log.i("MotionProcessor", "Exercise has finished");
+                NavigationManager.navigateToActivity(parentActivity, EndScreenActivity.class);
+            }
+        }
 
     }
 }

code/src/Fitbot/app/src/main/java/com/example/fitbot/util/path/GesturePath.java

@@ -92,6 +92,8 @@ public class GesturePath {
      */
 
     public static GesturePath fromString(String input) {
+        if (input == null)
+            throw new IllegalArgumentException("Input string cannot be null");
         byte[] bytes = input.getBytes();
 
         // Check if the input string contains a valid amount of bytes (12 bytes per vector)

code/src/Fitbot/app/src/main/java/com/example/fitbot/util/processing/InputProcessor.java

@@ -101,6 +101,7 @@ public class InputProcessor {
         if (recording) {
             this.secondsPassed = 0.0D;
             this.lastTime = System.currentTimeMillis();
+            this.selfRotationVectorPaths = new Vector3f[2][(int) (duration * this.sampleRate)];
         }
     }
 
@@ -179,6 +180,7 @@ public class InputProcessor {
             int deviceId = object.get("deviceId").getAsInt();
             String type = object.get("type").getAsString();
 
+            // Parse the retrieved data
             parseRotationVector(rotation, deviceId);
         } catch (Exception e) {
             Log.i("MotionProcessor", "Failed to parse packet data.");