Merge branch 'Benutzeroberflaeche' of bauseweinfr74630/mMDT5_GreenWatch into master

app/src/main/java/com/example/greenwatch/alarmrecorder/AlarmRecorder.java

@@ -65,17 +65,17 @@ public class AlarmRecorder {
         setVideoPath(videoPath);
         setVideoRecorderPreviewHolder(previewHolder);
 
-        audioThread = new Thread(audioRecorderRunnable);
+        //audioThread = new Thread(audioRecorderRunnable);
         videoThread = new Thread(videoRecorderRunnable);
 
         //Threads starten
         videoThread.start();
-        audioThread.start();
+        //audioThread.start();
     }
 
     public void stopRecording(Context context) {
         try {
-            stopAudioRecording();
+            //stopAudioRecording();
             stopVideoRecording();
 
             Toast.makeText(context, "Video- und Audioaufzeichnung beendet", Toast.LENGTH_SHORT).show();
@@ -86,7 +86,7 @@ public class AlarmRecorder {
 
             if (videoFile.exists() && audioFile.exists()) {
                 //Wenn Video- und Audioaufzeichnung gestoppt und abgespeichert sind, beginne mit dem Mergeprozess der beiden
-                mergeVideoWithAudio();
+               // mergeVideoWithAudio();
                 Toast.makeText(context, "Video und Audio erfolgreich zusammengeführt", Toast.LENGTH_SHORT).show();
             } else {
                 Toast.makeText(context, "Dateien wurden nicht gefunden!", Toast.LENGTH_SHORT).show();

app/src/main/java/com/example/greenwatch/alarmrecorder/runnables/AudioRecorder.java

@@ -10,9 +10,10 @@ import java.io.IOException;
 
 public class AudioRecorder implements Runnable {
 
-    private MediaRecorder audioRecorder = null;
+    private MediaRecorder audioRecorder;
     private String audioPath;
     public AudioRecorder() {
+        audioRecorder = new MediaRecorder();
     }
 
     public void setAudioPath(String audioPath) {

app/src/main/java/com/example/greenwatch/communication/WiFiCommunication.java

@@ -51,11 +51,6 @@ public class WiFiCommunication {
         if (mDeviceRepository == null) {
             this.mDeviceRepository = deviceRepository;
         }
-
-    }
-    public void setRecievedSting(String rxString) {
-        this.rxString = rxString;
-        mDeviceRepository.getNewReceivedMessage(this.rxString);
     }
 
     public void setNewMessage(String newMessage, boolean isNewMessage){
@@ -124,7 +119,7 @@ public class WiFiCommunication {
                     rxString = new String(packet.getData(), 0, packet.getLength());
 
                     if(!previousRxString.equals(rxString)){
-                        setRecievedSting(rxString);
+                        mDeviceRepository.getNewReceivedMessage(rxString);
 
                     }
                     previousRxString = rxString;

app/src/main/java/com/example/greenwatch/repositories/DeviceRepository.java

@@ -1,6 +1,8 @@
 package com.example.greenwatch.repositories;
 
 
+import android.os.Looper;
+
 import androidx.lifecycle.MutableLiveData;
 
 import com.example.greenwatch.models.Device;
@@ -273,8 +275,13 @@ public class DeviceRepository {
 
     private void setMutableLiveDataDeviceList() {
         List<Device> list = new ArrayList<>(connectedDevicesList.values());
+        if (Looper.myLooper() == Looper.getMainLooper()){
             deviceList.setValue(list);
         }
+        else {
+            deviceList.postValue(list);
+        }
+    }
 
     private void setMutableLiveDataAlarmHistoryList() {
         alarmHistoryList.setValue(alarmHistoryDeviceList);