From e01e23eccd60add976cf07fa08be4ad603587c5f Mon Sep 17 00:00:00 2001 From: Bastian Kohler Date: Tue, 20 Jun 2023 14:29:10 +0200 Subject: [PATCH] Refactor --- .../ueberwachungssystem/Detection/DetectorService.java | 8 +++++++- .../ueberwachungssystem/Detection/VideoDetector.java | 1 - .../example/ueberwachungssystem/PermissionHandler.java | 8 ++++++++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/example/ueberwachungssystem/Detection/DetectorService.java b/app/src/main/java/com/example/ueberwachungssystem/Detection/DetectorService.java index 3205133..af2d440 100644 --- a/app/src/main/java/com/example/ueberwachungssystem/Detection/DetectorService.java +++ b/app/src/main/java/com/example/ueberwachungssystem/Detection/DetectorService.java @@ -14,7 +14,6 @@ import java.io.File; @ExperimentalGetImage public class DetectorService extends LifecycleService { - public ServiceBinder serviceBinder = new ServiceBinder(); private DetectorService.OnDetectionListener listener; private boolean isServiceRunning = false; @@ -27,6 +26,9 @@ public class DetectorService extends LifecycleService { public int onStartCommand(Intent intent, int flags, int startId) { if (isServiceRunning) return START_NOT_STICKY; + + + // Setup Service classes: videoDetector = new VideoDetector(this); videoDetector.setOnDetectionListener(new Detector.OnDetectionListener() { @Override @@ -34,7 +36,11 @@ public class DetectorService extends LifecycleService { passToServiceListener(detectionReport); } }); + audioRecorder = new AudioRecorder(this); + + + isServiceRunning = true; return super.onStartCommand(intent, flags, startId); } diff --git a/app/src/main/java/com/example/ueberwachungssystem/Detection/VideoDetector.java b/app/src/main/java/com/example/ueberwachungssystem/Detection/VideoDetector.java index 7ef72a1..9018ddf 100644 --- a/app/src/main/java/com/example/ueberwachungssystem/Detection/VideoDetector.java +++ b/app/src/main/java/com/example/ueberwachungssystem/Detection/VideoDetector.java @@ -2,7 +2,6 @@ package com.example.ueberwachungssystem.Detection; import android.Manifest; import android.annotation.SuppressLint; -import android.app.Activity; import android.content.Context; import android.content.pm.PackageManager; import android.graphics.ImageFormat; diff --git a/app/src/main/java/com/example/ueberwachungssystem/PermissionHandler.java b/app/src/main/java/com/example/ueberwachungssystem/PermissionHandler.java index 2b23123..2ffcc72 100644 --- a/app/src/main/java/com/example/ueberwachungssystem/PermissionHandler.java +++ b/app/src/main/java/com/example/ueberwachungssystem/PermissionHandler.java @@ -4,6 +4,7 @@ package com.example.ueberwachungssystem; import android.app.Activity; import android.content.Context; import android.content.pm.PackageManager; +import android.widget.Toast; import androidx.core.app.ActivityCompat; import androidx.core.content.ContextCompat; @@ -32,4 +33,11 @@ public class PermissionHandler { if (!hasPermissions()) ActivityCompat.requestPermissions((Activity) context, permissions, PERMISSION_REQUEST_CODE); } + + public void showPermissionToast() { + if (hasPermissions()) + Toast.makeText(context, "permissions available", Toast.LENGTH_SHORT).show(); + else + Toast.makeText(context, "permissions missing", Toast.LENGTH_SHORT).show(); + } }