Permissions

app/src/main/AndroidManifest.xml

@@ -5,6 +5,8 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.CAMERA"/>
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 
     <uses-feature android:name="android.hardware.camera"/>
 

app/src/main/java/com/example/greenwatch/AccelerometerActivity.java

@@ -32,6 +32,7 @@ public class AccelerometerActivity extends AppCompatActivity implements SensorEv
     private TextView accelerometerWarningTV;
     private Button backToMainActivityButton;
     private AccelerometerViewModel mAccelerometerViewModel;
+    private Permission permission = new Permission();
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -84,7 +85,18 @@ public class AccelerometerActivity extends AppCompatActivity implements SensorEv
             @Override
             public void onChanged(Boolean aBoolean) {
                 if (aBoolean) {
-                    Toast.makeText(AccelerometerActivity.this, "Start Alarm Recording", Toast.LENGTH_LONG).show();
+                    if(permission.alarmRechtePruefen(AccelerometerActivity.this, AccelerometerActivity.this)){
+                        Toast.makeText(AccelerometerActivity.this, "Start Alarm Recording", Toast.LENGTH_LONG).show();
+                        //todo AlarmHandling einfügen
+                    } else {
+                        permission.alarmRechteAnfordern(AccelerometerActivity.this);
+                        if(permission.alarmRechtePruefen(AccelerometerActivity.this, AccelerometerActivity.this)){
+                            Toast.makeText(AccelerometerActivity.this, "Start Alarm Recording", Toast.LENGTH_LONG).show();
+                            //todo Alarmhandling einfügen
+                        } else {
+                            Toast.makeText(AccelerometerActivity.this, "Stop Alarm Recording", Toast.LENGTH_LONG).show();
+                        }
+                    }
                 }
                 else {
                     Toast.makeText(AccelerometerActivity.this, "Stop Alarm Recording", Toast.LENGTH_LONG).show();

app/src/main/java/com/example/greenwatch/AudiodetectionActivity.java

@@ -24,6 +24,7 @@ import java.util.List;
 public class AudiodetectionActivity extends AppCompatActivity {
     private TextView microfonStatusMessage;
     private Button backToMainActivityButton;
+    private Permission permission = new Permission();
     private MicrofonViewModel mMicrofonViewModel;
 
     @Override
@@ -75,7 +76,18 @@ public class AudiodetectionActivity extends AppCompatActivity {
             @Override
             public void onChanged(Boolean aBoolean) {
                 if (aBoolean) {
-                    Toast.makeText(AudiodetectionActivity.this, "Start Alarm Recording", Toast.LENGTH_LONG).show();
+                    if(permission.alarmRechtePruefen(AudiodetectionActivity.this, AudiodetectionActivity.this)){
+                        Toast.makeText(AudiodetectionActivity.this, "Start Alarm Recording", Toast.LENGTH_LONG).show();
+                        //todo AlarmHandling einfügen
+                    } else {
+                        permission.alarmRechteAnfordern(AudiodetectionActivity.this);
+                        if(permission.alarmRechtePruefen(AudiodetectionActivity.this, AudiodetectionActivity.this)){
+                            Toast.makeText(AudiodetectionActivity.this, "Start Alarm Recording", Toast.LENGTH_LONG).show();
+                            //todo Alarmhandling einfügen
+                        } else {
+                            Toast.makeText(AudiodetectionActivity.this, "Stop Alarm Recording", Toast.LENGTH_LONG).show();
+                        }
+                    }
                 }
                 else {
                     Toast.makeText(AudiodetectionActivity.this, "Stop Alarm Recording", Toast.LENGTH_LONG).show();
@@ -106,6 +118,9 @@ public class AudiodetectionActivity extends AppCompatActivity {
     @Override
     protected void onPause() {
         super.onPause();
+        if (isFinishing()){
+            mMicrofonViewModel.recalibrationMicrofonSensor();
+        }
         mMicrofonViewModel.stopMicrofonSensor();
     }
 }

app/src/main/java/com/example/greenwatch/AudiodetectionAndAccelerometerActivity.java

@@ -31,6 +31,8 @@ public class AudiodetectionAndAccelerometerActivity extends AppCompatActivity im
     private AudiodetectionAndAccelerometerViewModel mAudiodetectionAndAccelerometerViewModel;
     private Button backToMainActivity;
 
+    private Permission permission = new Permission();
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -80,7 +82,18 @@ public class AudiodetectionAndAccelerometerActivity extends AppCompatActivity im
             @Override
             public void onChanged(Boolean aBoolean) {
                 if (aBoolean) {
-                    Toast.makeText(AudiodetectionAndAccelerometerActivity.this, "Start Alarm Recording", Toast.LENGTH_LONG).show();
+                    if(permission.alarmRechtePruefen(AudiodetectionAndAccelerometerActivity.this, AudiodetectionAndAccelerometerActivity.this)){
+                        Toast.makeText(AudiodetectionAndAccelerometerActivity.this, "Start Alarm Recording", Toast.LENGTH_LONG).show();
+                        //todo AlarmHandling einfügen
+                    } else {
+                        permission.alarmRechteAnfordern(AudiodetectionAndAccelerometerActivity.this);
+                        if(permission.alarmRechtePruefen(AudiodetectionAndAccelerometerActivity.this, AudiodetectionAndAccelerometerActivity.this)){
+                            Toast.makeText(AudiodetectionAndAccelerometerActivity.this, "Start Alarm Recording", Toast.LENGTH_LONG).show();
+                            //todo Alarmhandling einfügen
+                        } else {
+                            Toast.makeText(AudiodetectionAndAccelerometerActivity.this, "Stop Alarm Recording", Toast.LENGTH_LONG).show();
+                        }
+                    }
                 }
                 else {
                     Toast.makeText(AudiodetectionAndAccelerometerActivity.this, "Stop Alarm Recording", Toast.LENGTH_LONG).show();
@@ -92,14 +105,19 @@ public class AudiodetectionAndAccelerometerActivity extends AppCompatActivity im
             @Override
             public void onChanged(Boolean aBoolean) {
                 if (aBoolean) {
-                    if (mAudiodetectionAndAccelerometerViewModel.getAccelerometerAlarmDetected()) {
+                    Toast.makeText(AudiodetectionAndAccelerometerActivity.this, "onChangedTrue", Toast.LENGTH_LONG).show();
+                    if (mAudiodetectionAndAccelerometerViewModel.getAccelerometerAlarmDetected() && !mAudiodetectionAndAccelerometerViewModel.getMicrofonAlarmDetected()) {
                         mAudiodetectionAndAccelerometerViewModel.updateDevice(mAudiodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mAudiodetectionAndAccelerometerViewModel.getSystemTimeStamp(), true, "Accelerometer", 10);
                     }
-                    else if (mAudiodetectionAndAccelerometerViewModel.getMicrofonAlarmDetected()) {
-                        mAudiodetectionAndAccelerometerViewModel.updateDevice(mAudiodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mAudiodetectionAndAccelerometerViewModel.getSystemTimeStamp(), true, "Microfon", (int) mAudiodetectionAndAccelerometerViewModel.getAmplitudeInDB());
+                    else if (mAudiodetectionAndAccelerometerViewModel.getMicrofonAlarmDetected() && !mAudiodetectionAndAccelerometerViewModel.getAccelerometerAlarmDetected()) {
+                        mAudiodetectionAndAccelerometerViewModel.updateDevice(mAudiodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mAudiodetectionAndAccelerometerViewModel.getSystemTimeStamp(), true, "Audio", (int) mAudiodetectionAndAccelerometerViewModel.getAmplitudeInDB());
+                    }
+                    else if (mAudiodetectionAndAccelerometerViewModel.getMicrofonAlarmDetected() && mAudiodetectionAndAccelerometerViewModel.getAccelerometerAlarmDetected()) {
+                        mAudiodetectionAndAccelerometerViewModel.updateDevice(mAudiodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mAudiodetectionAndAccelerometerViewModel.getSystemTimeStamp(), true, "2AudioAndAccelerometer", 10);
                     }
                 }
                 else {
+                    Toast.makeText(AudiodetectionAndAccelerometerActivity.this, "onChangedFalse", Toast.LENGTH_LONG).show();
                     mAudiodetectionAndAccelerometerViewModel.updateDevice(mAudiodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mAudiodetectionAndAccelerometerViewModel.getSystemTimeStamp(), false, "AudioAndAccelerometer", 0);
                 }
 
@@ -153,6 +171,9 @@ public class AudiodetectionAndAccelerometerActivity extends AppCompatActivity im
     @Override
     protected void onPause() {
         super.onPause();
+        if (isFinishing()){
+            mAudiodetectionAndAccelerometerViewModel.recalibrationMicrofonSensor();
+        }
         mAudiodetectionAndAccelerometerViewModel.stopMicrofonSensor();
         if (accelerometerSensor != null) {
             accelerometerManager.unregisterListener(this, accelerometerSensor);

app/src/main/java/com/example/greenwatch/MainActivity.java

@@ -6,6 +6,8 @@ import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
+import android.app.Activity;
+import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
@@ -17,6 +19,7 @@ import com.example.greenwatch.adapters.DeviceListAdapter;
 import com.example.greenwatch.models.Device;
 import com.example.greenwatch.viewmodels.MainActivityViewModel;
 
+
 import java.util.List;
 
 public class MainActivity extends AppCompatActivity {
@@ -28,12 +31,19 @@ public class MainActivity extends AppCompatActivity {
     private Button videodetectionAndAccelerometerButton;
     private Button connectionButton;
     private MainActivityViewModel mMainActivityViewModel;
+    private Permission permission = new Permission();
+
+    private Activity activity = new Activity();
+    private Context context;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
+        activity = MainActivity.this;
+        context = MainActivity.this;
+
         audiodetectionButton = (Button) findViewById(R.id.audiodetectionButton);
         videodetectionButton = (Button) findViewById(R.id.videodetectionButton);
         accelerometerButton = (Button) findViewById(R.id.accelerometerButton);
@@ -55,10 +65,10 @@ public class MainActivity extends AppCompatActivity {
         final AlarmHistoryListAdapter alarmHistoryListAdapter  = new AlarmHistoryListAdapter();
         alarmHistoryListRecyclerView.setAdapter(alarmHistoryListAdapter);
 
+        permission.startRechtePruefen(this, this);
+
         mMainActivityViewModel = new ViewModelProvider(this).get(MainActivityViewModel.class);
         mMainActivityViewModel.init();
-        mMainActivityViewModel.accessRequestCamera(this);
-        mMainActivityViewModel.accessRequestMicrofon(this);
         mMainActivityViewModel.getConnectedDeviceList().observe(this, new Observer<List<Device>>() {
             @Override
             public void onChanged(List<Device> devices) {
@@ -77,7 +87,18 @@ public class MainActivity extends AppCompatActivity {
             @Override
             public void onChanged(Boolean aBoolean) {
                 if (aBoolean) {
-                    Toast.makeText(MainActivity.this, "Start Alarm Recording", Toast.LENGTH_LONG).show();
+                    if(permission.alarmRechtePruefen(context, activity)){
+                        Toast.makeText(MainActivity.this, "Start Alarm Recording", Toast.LENGTH_LONG).show();
+                        //todo AlarmHandling einfügen
+                    } else {
+                        permission.alarmRechteAnfordern(activity);
+                        if(permission.alarmRechtePruefen(context, activity)){
+                            Toast.makeText(MainActivity.this, "Start Alarm Recording", Toast.LENGTH_LONG).show();
+                            //todo Alarmhandling einfügen
+                        } else {
+                            Toast.makeText(MainActivity.this, "Stop Alarm Recording", Toast.LENGTH_LONG).show();
+                        }
+                    }
                 }
                 else {
                     Toast.makeText(MainActivity.this, "Stop Alarm Recording", Toast.LENGTH_LONG).show();
@@ -88,22 +109,23 @@ public class MainActivity extends AppCompatActivity {
         audiodetectionButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                if (mMainActivityViewModel.isMicrofonAccessAllowed(MainActivity.this)) {
+
+                if (permission.microRechtePruefen(context, activity)) {
                     openAudiodetectionActivity();
                 }
                 else {
-                    mMainActivityViewModel.accessRequestMicrofon(MainActivity.this);
+                    permission.microRechteAnfordern(activity);
                 }
             }
         });
         videodetectionButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                if (mMainActivityViewModel.isCameraAccessAllowed(MainActivity.this)) {
+                if (permission.kameraRechtePruefen(context, activity)) {
                     openVideodetectionActivity();
                 }
                 else {
-                    mMainActivityViewModel.accessRequestCamera(MainActivity.this);
+                    permission.kameraRechteAnfordern(activity);
                 }
             }
         });
@@ -117,18 +139,23 @@ public class MainActivity extends AppCompatActivity {
         audiodetectionAndAccelerometerButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                if (mMainActivityViewModel.isMicrofonAccessAllowed(MainActivity.this)) {
+                if (permission.microRechtePruefen(context, activity)) {
                     openAudiodetectionAndAccelerometerActivity();
                 }
                 else {
-                    mMainActivityViewModel.accessRequestMicrofon(MainActivity.this);
+                    permission.microRechteAnfordern(activity);
                 }
             }
         });
         videodetectionAndAccelerometerButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                openVideodetectionAndAccelerometerActivity();
+                if (permission.kameraRechtePruefen(context, activity)) {
+                    openVideodetectionAndAccelerometerActivity();
+                }
+                else {
+                    permission.kameraRechteAnfordern(activity);
+                }
             }
         });
         connectionButton.setOnClickListener(new View.OnClickListener() {

app/src/main/java/com/example/greenwatch/Permission.java

@@ -0,0 +1,128 @@
+package com.example.greenwatch;
+
+import static android.Manifest.permission.CAMERA;
+import static android.Manifest.permission.RECORD_AUDIO;
+import static android.Manifest.permission.WRITE_EXTERNAL_STORAGE;
+import static android.Manifest.permission.READ_EXTERNAL_STORAGE;
+
+import static androidx.core.app.ActivityCompat.requestPermissions;
+import static androidx.core.content.ContextCompat.checkSelfPermission;
+
+import android.Manifest;
+import android.app.Activity;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.pm.PackageManager;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.View;
+
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+
+
+
+public class Permission {
+    private static final int PERMISSION_REQUEST_MICRO = 1;
+    private static final int PERMISSION_REQUEST_CAMERA = 2;
+    private static final int PERMISSION_REQUEST_ALARM = 1234;
+    private static final int PERMISSION_REQUEST_START = 1235;
+
+    public void startRechtePruefen(Context context, Activity activity){
+        boolean rechtKamera = checkSelfPermission(context, CAMERA) == PackageManager.PERMISSION_GRANTED;
+        boolean rechtAudio = checkSelfPermission(context, RECORD_AUDIO) == PackageManager.PERMISSION_GRANTED;
+        boolean rechtSchreiben = checkSelfPermission(context, WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED;
+        boolean rechtLesen = checkSelfPermission(context, READ_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED;
+
+        Log.d("Kamera Rechte", String.valueOf(rechtKamera));
+        Log.d("Audio Rechte", String.valueOf(rechtAudio));
+        Log.d("Schreib Rechte", String.valueOf(rechtSchreiben));
+        Log.d("Lese Rechte", String.valueOf(rechtLesen));
+
+        if(rechtKamera && rechtAudio && rechtSchreiben && rechtLesen){
+            Log.d("Rechte", "erteilt");
+        } else {
+            startRechteAnfordern(activity);
+        }
+    }
+
+    public boolean kameraRechtePruefen(Context context, Activity activity){
+        boolean rechtKamera = checkSelfPermission(context, CAMERA) == PackageManager.PERMISSION_GRANTED;
+        Log.d("Kamera Rechte", String.valueOf(rechtKamera));
+
+        if(rechtKamera){
+            Log.d("Kamerarechte", "erteilt");
+            return true;
+        } else {
+            kameraRechteAnfordern(activity);
+            if(checkSelfPermission(context, CAMERA) == PackageManager.PERMISSION_GRANTED){
+                return true;
+            } else {
+                return false;
+            }
+        }
+    }
+
+    public boolean microRechtePruefen(Context context, Activity activity){
+        boolean rechtAudio = checkSelfPermission(context, RECORD_AUDIO) == PackageManager.PERMISSION_GRANTED;
+        Log.d("Audio Rechte", String.valueOf(rechtAudio));
+
+        if(rechtAudio){
+            Log.d("Rechte", "erteilt");
+            return true;
+        } else {
+            microRechteAnfordern(activity);
+            if(checkSelfPermission(context, RECORD_AUDIO) == PackageManager.PERMISSION_GRANTED){
+                return true;
+            } else {
+                return false;
+            }
+        }
+    }
+
+    public boolean alarmRechtePruefen(Context context, Activity activity){
+        boolean rechtKamera = checkSelfPermission(context, CAMERA) == PackageManager.PERMISSION_GRANTED;
+        boolean rechtAudio = checkSelfPermission(context, RECORD_AUDIO) == PackageManager.PERMISSION_GRANTED;
+        boolean rechtSchreiben = checkSelfPermission(context, WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED;
+        boolean rechtLesen = checkSelfPermission(context, READ_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED;
+
+        Log.d("Kamera Rechte", String.valueOf(rechtKamera));
+        Log.d("Audio Rechte", String.valueOf(rechtAudio));
+        Log.d("Schreib Rechte", String.valueOf(rechtSchreiben));
+        Log.d("Lese Rechte", String.valueOf(rechtLesen));
+
+        if(rechtKamera && rechtAudio && rechtSchreiben && rechtLesen){
+            Log.d("Rechte", "erteilt");
+            return true;
+        } else {
+            alarmRechteAnfordern(activity);
+            if(checkSelfPermission(context, CAMERA) == PackageManager.PERMISSION_GRANTED
+                    && checkSelfPermission(context, RECORD_AUDIO) == PackageManager.PERMISSION_GRANTED
+                    && checkSelfPermission(context, WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED
+                    && checkSelfPermission(context, READ_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED){
+                return true;
+            } else {
+                return false;
+            }
+        }
+    }
+
+    public void startRechteAnfordern(Activity activity){
+        ActivityCompat.requestPermissions(activity, new String[]{CAMERA, RECORD_AUDIO, WRITE_EXTERNAL_STORAGE, READ_EXTERNAL_STORAGE}, PERMISSION_REQUEST_START);
+    }
+
+    public void kameraRechteAnfordern(Activity activity){
+        ActivityCompat.requestPermissions(activity, new String[]{CAMERA}, PERMISSION_REQUEST_CAMERA);
+    }
+
+    public void microRechteAnfordern(Activity activity){
+        ActivityCompat.requestPermissions(activity, new String[]{RECORD_AUDIO}, PERMISSION_REQUEST_MICRO);
+    }
+
+    public void alarmRechteAnfordern(Activity activity){
+        ActivityCompat.requestPermissions(activity, new String[]{CAMERA, RECORD_AUDIO, WRITE_EXTERNAL_STORAGE, READ_EXTERNAL_STORAGE}, PERMISSION_REQUEST_ALARM);
+    }
+
+}

app/src/main/java/com/example/greenwatch/VideodetectionActivity.java

@@ -27,6 +27,7 @@ public class VideodetectionActivity extends AppCompatActivity {
 
     private Button backToMainActivity;
     private VideodetectionViewModel mVideoDetectionViewModel;
+    private Permission permission = new Permission();
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -76,7 +77,18 @@ public class VideodetectionActivity extends AppCompatActivity {
             @Override
             public void onChanged(Boolean aBoolean) {
                 if (aBoolean) {
-                    Toast.makeText(VideodetectionActivity.this, "Start Alarm Recording", Toast.LENGTH_LONG).show();
+                    if(permission.alarmRechtePruefen(VideodetectionActivity.this, VideodetectionActivity.this)){
+                        Toast.makeText(VideodetectionActivity.this, "Start Alarm Recording", Toast.LENGTH_LONG).show();
+                        //todo AlarmHandling einfügen
+                    } else {
+                        permission.alarmRechteAnfordern(VideodetectionActivity.this);
+                        if(permission.alarmRechtePruefen(VideodetectionActivity.this, VideodetectionActivity.this)){
+                            Toast.makeText(VideodetectionActivity.this, "Start Alarm Recording", Toast.LENGTH_LONG).show();
+                            //todo Alarmhandling einfügen
+                        } else {
+                            Toast.makeText(VideodetectionActivity.this, "Stop Alarm Recording", Toast.LENGTH_LONG).show();
+                        }
+                    }
                 }
                 else {
                     Toast.makeText(VideodetectionActivity.this, "Stop Alarm Recording", Toast.LENGTH_LONG).show();

app/src/main/java/com/example/greenwatch/VideodetectionAndAccelerometerActivity.java

@@ -37,6 +37,7 @@ public class VideodetectionAndAccelerometerActivity extends AppCompatActivity im
     private TextView videodetectionAndAccelerometerWarningTV;
     private Button backToMainActivity;
     private VideodetectionAndAccelerometerViewModel mVideodetectionAndAccelerometerViewModel;
+    private Permission permission = new Permission();
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -89,7 +90,18 @@ public class VideodetectionAndAccelerometerActivity extends AppCompatActivity im
             @Override
             public void onChanged(Boolean aBoolean) {
                 if (aBoolean) {
-                    Toast.makeText(VideodetectionAndAccelerometerActivity.this, "Start Alarm Recording", Toast.LENGTH_LONG).show();
+                    if(permission.alarmRechtePruefen(VideodetectionAndAccelerometerActivity.this, VideodetectionAndAccelerometerActivity.this)){
+                        Toast.makeText(VideodetectionAndAccelerometerActivity.this, "Start Alarm Recording", Toast.LENGTH_LONG).show();
+                        //todo AlarmHandling einfügen
+                    } else {
+                        permission.alarmRechteAnfordern(VideodetectionAndAccelerometerActivity.this);
+                        if(permission.alarmRechtePruefen(VideodetectionAndAccelerometerActivity.this, VideodetectionAndAccelerometerActivity.this)){
+                            Toast.makeText(VideodetectionAndAccelerometerActivity.this, "Start Alarm Recording", Toast.LENGTH_LONG).show();
+                            //todo Alarmhandling einfügen
+                        } else {
+                            Toast.makeText(VideodetectionAndAccelerometerActivity.this, "Stop Alarm Recording", Toast.LENGTH_LONG).show();
+                        }
+                    }
                 }
                 else {
                     Toast.makeText(VideodetectionAndAccelerometerActivity.this, "Stop Alarm Recording", Toast.LENGTH_LONG).show();
@@ -101,12 +113,19 @@ public class VideodetectionAndAccelerometerActivity extends AppCompatActivity im
             @Override
             public void onChanged(Boolean aBoolean) {
                 if (aBoolean) {
-                    mVideodetectionAndAccelerometerViewModel.updateDevice(mVideodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mVideodetectionAndAccelerometerViewModel.getSystemTimeStamp(), true, "Accelerometer", 10);
+                    if (mVideodetectionAndAccelerometerViewModel.getAccelerometerAlarmDetected() && !mVideodetectionAndAccelerometerViewModel.getVideoAlarmDetected()) {
+                        mVideodetectionAndAccelerometerViewModel.updateDevice(mVideodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mVideodetectionAndAccelerometerViewModel.getSystemTimeStamp(), true, "Accelerometer", 10);
+                    }
+                    else if (mVideodetectionAndAccelerometerViewModel.getVideoAlarmDetected() && !mVideodetectionAndAccelerometerViewModel.getAccelerometerAlarmDetected()) {
+                        mVideodetectionAndAccelerometerViewModel.updateDevice(mVideodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mVideodetectionAndAccelerometerViewModel.getSystemTimeStamp(), true, "Video", 10);
+                    }
+                    else if (mVideodetectionAndAccelerometerViewModel.getAccelerometerAlarmDetected() && mVideodetectionAndAccelerometerViewModel.getVideoAlarmDetected()) {
+                        mVideodetectionAndAccelerometerViewModel.updateDevice(mVideodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mVideodetectionAndAccelerometerViewModel.getSystemTimeStamp(), true, "2VideoAndAccelerometer", 10);
+                    }
                 }
                 else {
-                    mVideodetectionAndAccelerometerViewModel.updateDevice(mVideodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mVideodetectionAndAccelerometerViewModel.getSystemTimeStamp(), false, "Accelerometer", 0);
+                    mVideodetectionAndAccelerometerViewModel.updateDevice(mVideodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mVideodetectionAndAccelerometerViewModel.getSystemTimeStamp(), false, "VideoAndAccelerometer", 0);
                 }
-
             }
         });
 

app/src/main/java/com/example/greenwatch/sensors/CameraSensor.java

@@ -3,6 +3,7 @@ package com.example.greenwatch.sensors;
 import android.content.Context;
 import android.graphics.ImageFormat;
 import android.media.Image;
+import android.os.Handler;
 import android.util.Size;
 
 import androidx.camera.core.CameraSelector;
@@ -18,9 +19,18 @@ public class CameraSensor {
     private final MutableLiveData<Boolean> mVideoAlarmDetected = new MutableLiveData<>();
     private static CameraSensor cameraSensorInstance;
     private boolean videoAlarmDetected;
+    private boolean isMotionDetected;
     private ByteBuffer previousBuffer;
     private int previousWidth;
     private int previousHeight;
+    private final int threshold = 50;
+    private int startX;
+    private int startY;
+    private int endX;
+    private int endY;
+    private static final long ALARM_RESET_DELAY = 5000;
+    private Runnable alarmResetRunnable;
+    private final Handler alarmResetHandler = new Handler();
 
     private CameraSensor() {
         videoAlarmDetected = false;
@@ -59,7 +69,7 @@ public class CameraSensor {
 
                         if (previousHeight != 0) {
                             assert currentImage != null;
-                            videoAlarmDetected = compareFrames(currentImage);
+                            isMotionDetected = compareFrames(currentImage);
                         }
 
                         assert currentImage != null;
@@ -72,6 +82,18 @@ public class CameraSensor {
 
                         currentImage.close();
 
+                        if (isMotionDetected) {
+
+                            videoAlarmDetected = true;
+
+                            if(alarmResetRunnable != null) {
+                                alarmResetHandler.removeCallbacks(alarmResetRunnable);
+                            }
+
+                            alarmResetRunnable = this::resetAlarmStatus;
+                            alarmResetHandler.postDelayed(alarmResetRunnable, ALARM_RESET_DELAY);
+                        }
+
                         checkAlarmCondition();
 
                     }
@@ -85,36 +107,76 @@ public class CameraSensor {
     }
 
     private boolean compareFrames(Image currentImage) {
-
-        ByteBuffer currentBuffer = currentImage.getPlanes()[0].getBuffer();
-
+        Image.Plane[] planes = currentImage.getPlanes();
+        ByteBuffer currentBuffer = planes[0].getBuffer();
         int currentWidth = currentImage.getWidth();
         int currentHeight = currentImage.getHeight();
+        int yRowStride = planes[0].getRowStride();
+        int yPixelStride = planes[0].getPixelStride();
 
         if (previousWidth != currentWidth || previousHeight != currentHeight) {
             return false;
         }
 
-        for (int row = 0; row < previousHeight; row++) {
-            for (int col = 0; col < previousWidth; col++) {
+        int blockSize = kleinstesQuadrat(previousHeight, previousWidth) / 8;
 
-                int previousIndex = row * previousWidth + col;
-                int currentIndex = row * currentWidth + col;
+        int numBlocksX = currentWidth / blockSize;
+        int numBlocksY = currentHeight / blockSize;
 
-                int previousPixel = previousBuffer.get(previousIndex) & 0xFF;
-                int currentPixel = currentBuffer.get(currentIndex) & 0xFF;
+        for (int blockY = 0; blockY < numBlocksY; blockY++) {
+            for (int blockX = 0; blockX < numBlocksX; blockX++) {
+                startX = blockX * blockSize;
+                startY = blockY * blockSize;
+                endX = startX + blockSize;
+                endY = startY + blockSize;
 
-                int pixelDifference = Math.abs(previousPixel - currentPixel);
-                int threshold = 120;
+                float currentLuminance = berechneMittlereLuminanz(currentBuffer, yRowStride, yPixelStride);
+                float previousLuminance = berechneMittlereLuminanz(previousBuffer, yRowStride, yPixelStride);
+
+                int pixelDifference = Math.abs((int) previousLuminance - (int) currentLuminance);
 
                 if (pixelDifference > threshold) {
+                    System.out.println(pixelDifference);
                     return true;
                 }
             }
         }
+
         return false;
     }
 
+    private float berechneMittlereLuminanz(ByteBuffer buffer, int rowStride, int pixelStride) {
+        int sumLuminance = 0;
+        int countPixels = 0;
+
+        for (int row = startY; row < endY; row++) {
+            for (int col = startX; col < endX; col++) {
+                int bufferIndex = row * rowStride + col * pixelStride;
+                int currentPixel = buffer.get(bufferIndex) & 0xFF;
+
+                sumLuminance += currentPixel;
+                countPixels++;
+            }
+        }
+
+        return (float) sumLuminance / countPixels;
+    }
+
+    private int kleinstesQuadrat(int height, int width) {
+        if (height == width) {
+            return height;
+        } else if (height > width) {
+            return kleinstesQuadrat(height - width, width);
+        } else {
+            return kleinstesQuadrat(height, width - height);
+        }
+    }
+
+    private void resetAlarmStatus() {
+        videoAlarmDetected = false;
+        alarmResetRunnable = null;
+    }
+
     public void checkAlarmCondition() {
         if (videoAlarmDetected && !mVideoAlarmDetected.getValue()) {
             setMutableLiveDataVideoAlarmDetected();

app/src/main/java/com/example/greenwatch/sensors/MicrofonSensor.java

@@ -19,7 +19,7 @@ import com.example.greenwatch.sensors.MicrofonHelperClasses.Verarbeitungsergebni
      private boolean microfonAlarmDetected = false;
      private boolean kalibrierung_do = true;
      private float threshold = 40;
-     private float sensitivity = 5;
+     private float sensitivity = 10;
 
      private float amplitudeInDB = 0;
 
@@ -52,9 +52,8 @@ import com.example.greenwatch.sensors.MicrofonHelperClasses.Verarbeitungsergebni
          microfonAlarmDetected = false;
          kalibrierung_do = true;
          threshold = 40;
-         sensitivity = 5;
+         sensitivity = 10;
          amplitudeInDB = 0;
-         start();
      }
 
      public float getAmplitudeInDB() {

app/src/main/java/com/example/greenwatch/viewmodels/AudiodetectionAndAccelerometerViewModel.java

@@ -120,12 +120,12 @@ public class AudiodetectionAndAccelerometerViewModel extends ViewModel implement
         public void onChanged(Boolean aBoolean) {
             setAccelerometerAlarmDetected(mAccelerometerAlarmDetected.getValue());
             setMicrofonAlarmDetected(mMicrofonAlarmDetected.getValue());
-            if (microfonAlarmDetected || accelerometerAlarmDetected && !microfondetectionAndAccelerometerAlarmDetected) {
+            if (microfonAlarmDetected || accelerometerAlarmDetected) {
                 microfondetectionAndAccelerometerAlarmDetected = true;
                 setMutableLiveDataMicrofondetectionAndAccelerometerAlarmDetected();
 
             }
-            else if (!microfonAlarmDetected && !accelerometerAlarmDetected && microfondetectionAndAccelerometerAlarmDetected) {
+            else if (!microfonAlarmDetected && !accelerometerAlarmDetected) {
                 microfondetectionAndAccelerometerAlarmDetected = false;
                 setMutableLiveDataMicrofondetectionAndAccelerometerAlarmDetected();
             }

app/src/main/java/com/example/greenwatch/viewmodels/MainActivityViewModel.java

@@ -23,8 +23,6 @@ public class MainActivityViewModel extends ViewModel implements ViewModelInterfa
     private MutableLiveData<List<Device>> mAlarmHistoryList;
     private MutableLiveData<Boolean> mStartAlarmRecording;
     private DeviceRepository mDeviceRepository;
-    private static final int RIGHTS_REQUEST_CAMERA = 10;
-    private static final int RIGHTS_REQUEST_CAMERA_MICROFON = 1;
 
     @Override
     public void init() {
@@ -43,22 +41,6 @@ public class MainActivityViewModel extends ViewModel implements ViewModelInterfa
         mStartAlarmRecording = mDeviceRepository.getStartAlarmRecording();
     }
 
-    public boolean isMicrofonAccessAllowed(Context context) {
-        return ContextCompat.checkSelfPermission(context, android.Manifest.permission.RECORD_AUDIO) == PackageManager.PERMISSION_GRANTED;
-    }
-
-    public void accessRequestMicrofon(Activity activity) {
-        ActivityCompat.requestPermissions(activity, new String[]{Manifest.permission.RECORD_AUDIO}, RIGHTS_REQUEST_CAMERA_MICROFON);
-    }
-
-    public boolean isCameraAccessAllowed(Context context) {
-        return ContextCompat.checkSelfPermission(context, android.Manifest.permission.CAMERA) == PackageManager.PERMISSION_GRANTED;
-    }
-
-    public void accessRequestCamera(Activity activity) {
-        ActivityCompat.requestPermissions(activity, new String[]{android.Manifest.permission.CAMERA}, RIGHTS_REQUEST_CAMERA);
-    }
-
     @Override
     public LiveData<List<Device>> getConnectedDeviceList() {
         return mDeviceList;

app/src/main/java/com/example/greenwatch/viewmodels/VideodetectionAndAccelerometerViewModel.java

@@ -26,7 +26,9 @@ public class VideodetectionAndAccelerometerViewModel extends ViewModel implement
     private AccelerometerSensor mAccelerometerSensor;
     private CameraSensor mCameraSensor;
     private DeviceRepository mDeviceRepository;
-    private boolean VideodetectionAndAccelerometerAlarmDetected;
+    private boolean videoAlarmDetected;
+    private boolean accelerometerAlarmDetected;
+    private boolean videodetectionAndAccelerometerAlarmDetected;
 
     @Override
     public void init() {
@@ -54,7 +56,9 @@ public class VideodetectionAndAccelerometerViewModel extends ViewModel implement
         if (mVideoAlarmDetected == null) {
             mVideoAlarmDetected = mCameraSensor.getVideoAlarmDetectedValue();
         }
-        VideodetectionAndAccelerometerAlarmDetected = false;
+        videodetectionAndAccelerometerAlarmDetected = false;
+        videoAlarmDetected = false;
+        accelerometerAlarmDetected = false;
         registerAlarmObserver();
     }
 
@@ -84,19 +88,37 @@ public class VideodetectionAndAccelerometerViewModel extends ViewModel implement
     }
 
     private void setMutableLiveDataVideodetectionAndAccelerometerAlarmDetected() {
-        mVideodetectionAndAccelerometerAlarmDetected.setValue(VideodetectionAndAccelerometerAlarmDetected);
+        mVideodetectionAndAccelerometerAlarmDetected.setValue(videodetectionAndAccelerometerAlarmDetected);
+    }
+
+    private void setAccelerometerAlarmDetected(boolean accelerometerAlarmDetected) {
+        this.accelerometerAlarmDetected = accelerometerAlarmDetected;
+    }
+
+    public boolean getAccelerometerAlarmDetected() {
+        return accelerometerAlarmDetected;
+    }
+
+    private void setVideoAlarmDetected(boolean videoAlarmDetected) {
+        this.videoAlarmDetected = videoAlarmDetected;
+    }
+
+    public boolean getVideoAlarmDetected() {
+        return videoAlarmDetected;
     }
 
     Observer<Boolean> observer = new Observer<Boolean>() {
         @Override
         public void onChanged(Boolean aBoolean) {
-            if (mVideoAlarmDetected.getValue() || mAccelerometerAlarmDetected.getValue() && !VideodetectionAndAccelerometerAlarmDetected) {
-                VideodetectionAndAccelerometerAlarmDetected = true;
+            setAccelerometerAlarmDetected(mAccelerometerAlarmDetected.getValue());
+            setVideoAlarmDetected(mVideoAlarmDetected.getValue());
+            if (videoAlarmDetected || accelerometerAlarmDetected && !videodetectionAndAccelerometerAlarmDetected) {
+                videodetectionAndAccelerometerAlarmDetected = true;
                 setMutableLiveDataVideodetectionAndAccelerometerAlarmDetected();
 
             }
-            else if (!mVideoAlarmDetected.getValue() && !mAccelerometerAlarmDetected.getValue() && VideodetectionAndAccelerometerAlarmDetected) {
-                VideodetectionAndAccelerometerAlarmDetected = false;
+            else if (!videoAlarmDetected && !accelerometerAlarmDetected && videodetectionAndAccelerometerAlarmDetected) {
+                videodetectionAndAccelerometerAlarmDetected = false;
                 setMutableLiveDataVideodetectionAndAccelerometerAlarmDetected();
             }
         }