Haven is for people who need a way to protect their personal spaces and possessions without compromising their own privacy, through an Android app and on-device sensors
address #313 (don't unbind service more than once!) and refactor Preview to CameraViewHolder
n8fr82acb1be84fc0
diff --git a/src/main/java/org/havenapp/main/sensors/motion/Preview.java b/src/main/java/org/havenapp/main/sensors/motion/CameraViewHolder.javasimilarity index 92%rename from src/main/java/org/havenapp/main/sensors/motion/Preview.javarename to src/main/java/org/havenapp/main/sensors/motion/CameraViewHolder.javaindex 61e2b70..0b2ea18 100644--- a/src/main/java/org/havenapp/main/sensors/motion/Preview.java+++ b/src/main/java/org/havenapp/main/sensors/motion/CameraViewHolder.java@@ -14,7 +14,6 @@ import android.content.Context;import android.content.Intent;import android.content.ServiceConnection;import android.graphics.Bitmap;-import android.hardware.Camera;import android.os.Environment;import android.os.Handler;import android.os.IBinder;@@ -29,16 +28,11 @@ import com.google.android.cameraview.CameraView;import org.havenapp.main.PreferenceManager;import org.havenapp.main.model.EventTrigger;import org.havenapp.main.service.MonitorService;-import org.jcodec.api.SequenceEncoder;import org.jcodec.api.android.AndroidSequenceEncoder;-import org.jcodec.codecs.vpx.IVFMuxer;-import org.jcodec.codecs.vpx.VP8Encoder;-import org.jcodec.common.io.SeekableByteChannel;import java.io.File;import java.io.FileOutputStream;import java.io.IOException;-import java.nio.ByteBuffer;import java.util.ArrayList;import java.util.Date;import java.util.List;@@ -49,7 +43,7 @@ import java.util.concurrent.TimeUnit;import io.github.silvaren.easyrs.tools.Nv21Image;-public class Preview {+public class CameraViewHolder {/*** Object to retrieve and set shared preferences@@ -118,7 +112,7 @@ public class Preview {}};- public Preview (Context context, CameraView cameraView) {+ public CameraViewHolder(Context context, CameraView cameraView) {//super(context);this.context = context;this.cameraView = cameraView;@@ -175,14 +169,14 @@ public class Preview {cameraView.setOnFrameListener((data, width, height, rotationDegrees) -> {long now = System.currentTimeMillis();- if (now < Preview.this.lastTimestamp + PREVIEW_INTERVAL)+ if (now < CameraViewHolder.this.lastTimestamp + PREVIEW_INTERVAL)return;- Preview.this.lastTimestamp = now;+ CameraViewHolder.this.lastTimestamp = now;if (!doingVideoProcessing) {- Log.i("Preview", "Processing new image");+ Log.i("CameraViewHolder", "Processing new image");mDecodeThreadPool.execute(() -> processNewFrame(data, width, height, rotationDegrees));}@@ -304,7 +298,7 @@ public class Preview {} catch (Exception e) {// Cannot happen- Log.e("Preview", "error creating image", e);+ Log.e("CameraViewHolder", "error creating image", e);}}}@@ -343,14 +337,9 @@ public class Preview {}- public void stopCamera ()+ public synchronized void stopCamera (){if (cameraView != null) {- // Surface will be destroyed when we return, so stop the preview.- // Because the CameraDevice object is not a shared resource, it's very- // important to release it when the activity is paused.- this.context.unbindService(mConnection);-cameraView.stop();}}@@ -358,4 +347,13 @@ public class Preview {public int getCameraFacing() {return cameraView.getFacing();}++ public void destroy ()+ {+ if (mConnection != null) {+ this.context.unbindService(mConnection);+ mConnection = null;+ }+ stopCamera();+ }}diff --git a/src/main/java/org/havenapp/main/ui/CameraFragment.java b/src/main/java/org/havenapp/main/ui/CameraFragment.javaindex 43c4229..c725cac 100644--- a/src/main/java/org/havenapp/main/ui/CameraFragment.java+++ b/src/main/java/org/havenapp/main/ui/CameraFragment.java@@ -10,7 +10,6 @@ package org.havenapp.main.ui;import android.os.Bundle;import android.support.v4.app.Fragment;-import android.hardware.Camera;import android.hardware.SensorEvent;import android.view.LayoutInflater;import android.view.View;@@ -21,12 +20,11 @@ import com.google.android.cameraview.CameraView;import org.havenapp.main.PreferenceManager;import org.havenapp.main.R;-import org.havenapp.main.sensors.media.ImageCodec;-import org.havenapp.main.sensors.motion.Preview;+import org.havenapp.main.sensors.motion.CameraViewHolder;public final class CameraFragment extends Fragment {- private Preview cameraViewHolder;+ private CameraViewHolder cameraViewHolder;private ImageView newImage;@Override@@ -85,7 +83,7 @@ public final class CameraFragment extends Fragment {CameraView cameraView = getActivity().findViewById(R.id.camera_view);- cameraViewHolder = new Preview(getContext().getApplicationContext(),cameraView);+ cameraViewHolder = new CameraViewHolder(getContext().getApplicationContext(),cameraView);newImage = getActivity().findViewById(R.id.new_image);@@ -100,6 +98,7 @@ public final class CameraFragment extends Fragment {@Overridepublic void onDestroy() {super.onDestroy();+ cameraViewHolder.destroy();}