Skip to content

armgit / haven

Public Imported from GitHub
0

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

major update to support CameraViewPlus for #295 #297 #111 and others

n8fr8e0ecdc69a3a2
diff --git a/build.gradle b/build.gradle
index 1a53806..02f4754 100644
--- a/build.gradle
+++ b/build.gradle
@@ -80,8 +80,15 @@ android {
}
multiDexEnabled true
vectorDrawables.useSupportLibrary = true
+ renderscriptTargetApi 16
+ renderscriptSupportModeEnabled true
+
+ ndk {
+ abiFilters "armeabi", "armeabi-v7a", "x86"
+ }
}
+
buildTypes {
release {
minifyEnabled false
@@ -100,10 +107,12 @@ android {
}
dependencies {
+ //noinspection GradleCompatible
+ implementation 'com.android.support:support-v4:27.1.1'
implementation 'com.android.support:appcompat-v7:27.1.1'
implementation 'com.android.support:design:27.1.1'
implementation 'com.android.support:cardview-v7:27.1.1'
- implementation 'com.android.support.constraint:constraint-layout:1.1.0'
+ implementation 'com.android.support.constraint:constraint-layout:1.1.2'
implementation 'com.github.guardianproject:signal-cli-android:-SNAPSHOT'
implementation 'com.github.satyan:sugar:1.5'
implementation 'com.squareup.picasso:picasso:2.71828'
@@ -113,7 +122,7 @@ dependencies {
implementation 'com.nanohttpd:nanohttpd-webserver:2.2.0'
implementation 'me.angrybyte.picker:picker:1.3.1'
implementation 'com.github.stfalcon:frescoimageviewer:0.5.0'
- implementation 'com.facebook.fresco:fresco:1.8.1'
+ implementation 'com.facebook.fresco:fresco:1.9.0'
implementation 'com.github.derlio.waveform:library:1.0.1'
implementation 'org.firezenk:audiowaves:1.1@aar'
implementation 'com.maxproj.simplewaveform:app:1.0.0'
@@ -123,5 +132,7 @@ dependencies {
implementation('com.mikepenz:aboutlibraries:6.0.2@aar') {
transitive = true
}
+ implementation 'com.asksira.android:cameraviewplus:0.9.4'
implementation 'com.github.halilozercan:BetterVideoPlayer:1.1.0'
+ implementation 'io.github.silvaren:easyrs:0.5.3'
}
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 58f6ee3..8b11ebe 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -66,6 +66,7 @@
android:name=".MonitorActivity"
android:configChanges="orientation|screenSize"
android:label="@string/app_name"
+ android:screenOrientation="portrait"
android:launchMode="singleTop" />
<activity
android:name=".ui.VideoPlayerActivity"
@@ -111,6 +112,17 @@
<action android:name="android.intent.action.ACTION_POWER_DISCONNECTED" />
</intent-filter>
</receiver>
+
+ <provider
+ android:name="android.support.v4.content.FileProvider"
+ android:authorities="org.havenapp.main.fileprovider"
+ android:grantUriPermissions="true"
+ android:exported="false">
+ <meta-data
+ android:name="android.support.FILE_PROVIDER_PATHS"
+ android:resource="@xml/file_provider_paths" />
+ </provider>
+
</application>
</manifest>
\ No newline at end of file
diff --git a/src/main/java/org/havenapp/main/HavenApp.java b/src/main/java/org/havenapp/main/HavenApp.java
index 75dea58..69ae819 100644
--- a/src/main/java/org/havenapp/main/HavenApp.java
+++ b/src/main/java/org/havenapp/main/HavenApp.java
@@ -23,6 +23,8 @@ import android.text.TextUtils;
import android.util.Log;
import com.facebook.drawee.backends.pipeline.Fresco;
+import com.facebook.imagepipeline.core.ImagePipelineConfig;
+import com.facebook.imagepipeline.decoder.SimpleProgressiveJpegConfig;
import com.orm.SugarContext;
import java.io.IOException;
@@ -44,15 +46,22 @@ public class HavenApp extends MultiDexApplication {
public void onCreate() {
super.onCreate();
+ SugarContext.init(this);
+
mPrefs = new PreferenceManager(this);
- Fresco.initialize(this);
- SugarContext.init(this);
+ ImagePipelineConfig config = ImagePipelineConfig.newBuilder(this)
+ .setProgressiveJpegConfig(new SimpleProgressiveJpegConfig())
+ .setResizeAndRotateEnabledForNetwork(true)
+ .setDownsampleEnabled(true)
+ .build();
+
+ Fresco.initialize(this,config);
+
AppCompatDelegate.setCompatVectorFromResourcesEnabled(true);
if (mPrefs.getRemoteAccessActive())
startServer();
-
}
@@ -60,10 +69,12 @@ public class HavenApp extends MultiDexApplication {
{
if (mOnionServer == null || (!mOnionServer.isAlive()))
{
- try {
- mOnionServer = new WebServer(this, mPrefs.getRemoteAccessCredential());
- } catch (IOException ioe) {
- Log.e("OnioNServer", "unable to start onion server", ioe);
+ if ( mPrefs.getRemoteAccessCredential() != null) {
+ try {
+ mOnionServer = new WebServer(this, mPrefs.getRemoteAccessCredential());
+ } catch (IOException ioe) {
+ Log.e("OnioNServer", "unable to start onion server", ioe);
+ }
}
}
}
diff --git a/src/main/java/org/havenapp/main/sensors/media/MotionAsyncTask.java b/src/main/java/org/havenapp/main/sensors/media/MotionDetector.java
similarity index 56%
rename from src/main/java/org/havenapp/main/sensors/media/MotionAsyncTask.java
rename to src/main/java/org/havenapp/main/sensors/media/MotionDetector.java
index c877324..9c99f30 100644
--- a/src/main/java/org/havenapp/main/sensors/media/MotionAsyncTask.java
+++ b/src/main/java/org/havenapp/main/sensors/media/MotionDetector.java
@@ -15,6 +15,7 @@ import android.graphics.Matrix;
import android.graphics.Rect;
import android.graphics.YuvImage;
import android.os.Handler;
+import android.support.v8.renderscript.RenderScript;
import android.util.Log;
import org.havenapp.main.sensors.motion.IMotionDetector;
@@ -24,6 +25,8 @@ import java.io.ByteArrayOutputStream;
import java.util.ArrayList;
import java.util.List;
+import io.github.silvaren.easyrs.tools.Nv21Image;
+
/**
* Task doing all image processing in backgrounds,
* has a collection of listeners to notify in after having processed
@@ -31,7 +34,7 @@ import java.util.List;
* @author marco
*
*/
-public class MotionAsyncTask extends Thread {
+public class MotionDetector {
// Input data
@@ -44,14 +47,14 @@ public class MotionAsyncTask extends Thread {
private int motionSensitivity;
// Output data
-
- private Bitmap lastBitmap;
- private Bitmap newBitmap;
- private Bitmap rawBitmap;
+
private boolean hasChanged;
private IMotionDetector detector;
-
+
+ private RenderScript renderScript;
+
+
public interface MotionListener {
public void onProcess(Bitmap oldBitmap,
Bitmap newBitmap,
@@ -63,21 +66,24 @@ public class MotionAsyncTask extends Thread {
listeners.add(listener);
}
- public MotionAsyncTask(
+ public MotionDetector(
+ RenderScript renderScript,
byte[] rawOldPic,
byte[] rawNewPic,
int width,
int height,
Handler updateHandler,
int motionSensitivity) {
+ this.renderScript = renderScript;
this.rawOldPic = rawOldPic;
this.rawNewPic = rawNewPic;
this.width = width;
this.height = height;
this.handler = updateHandler;
this.motionSensitivity = motionSensitivity;
-
- }
+ detector = new LuminanceMotionDetector();
+
+ }
public void setMotionSensitivity (int motionSensitivity)
{
@@ -85,67 +91,63 @@ public class MotionAsyncTask extends Thread {
detector.setThreshold(motionSensitivity);
}
- @Override
- public void run() {
+ public void detect() {
int[] newPicLuma = ImageCodec.N21toLuma(rawNewPic, width, height);
- if (rawOldPic == null) {
- newBitmap = ImageCodec.lumaToBitmapGreyscale(newPicLuma, width, height);
- lastBitmap = newBitmap;
- } else {
+ if (rawOldPic != null) {
+
int[] oldPicLuma = ImageCodec.N21toLuma(rawOldPic, width, height);
- detector = new LuminanceMotionDetector();
detector.setThreshold(motionSensitivity);
- List<Integer> changedPixels =
+ List<Integer> changedPixels =
detector.detectMotion(oldPicLuma, newPicLuma, width, height);
hasChanged = false;
-
+
int[] newPic = ImageCodec.lumaToGreyscale(newPicLuma, width, height);
+
if (changedPixels != null) {
hasChanged = true;
- for (int changedPixel : changedPixels) {
- newPic[changedPixel] = Color.YELLOW;
- }
- }
- lastBitmap = ImageCodec.lumaToBitmapGreyscale(oldPicLuma, width, height);
- newBitmap = Bitmap.createBitmap(newPic, width, height, Bitmap.Config.RGB_565);
+ }
+
if (hasChanged) {
- YuvImage image = new YuvImage(rawNewPic, ImageFormat.NV21, width, height, null);
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- image.compressToJpeg(
- new Rect(0, 0, image.getWidth(), image.getHeight()), 90,
- baos);
-
- byte[] imageBytes = baos.toByteArray();
- rawBitmap = BitmapFactory.decodeByteArray(imageBytes, 0, imageBytes.length);
- // Setting post rotate to 90
- Matrix mtx = new Matrix();
- mtx.postRotate(-90);
- // Rotating Bitmap
- rawBitmap = Bitmap.createBitmap(rawBitmap, 0, 0, width, height, mtx, true);
- }
- else
- {
- rawBitmap = null;
+
+
+ Bitmap lastBitmap = ImageCodec.lumaToBitmapGreyscale(oldPicLuma, width, height);
+
+ for (int i = 0; i < newPic.length; i++)
+ newPic[i] = Color.TRANSPARENT;
+
+ for (int changedPixel : changedPixels) {
+ newPic[changedPixel] = Color.YELLOW;
+ }
+
+
+ Matrix mtx = new Matrix();
+ mtx.postRotate(-90);
+ mtx.postScale(-1, 1, width/2,height/2);
+
+ Bitmap newBitmap
+ = Bitmap.createBitmap(Bitmap.createBitmap(newPic, width, height, Bitmap.Config.ARGB_4444), 0, 0, width, height, mtx, true);
+
+ Bitmap rawBitmap = Bitmap.createBitmap(Nv21Image.nv21ToBitmap(renderScript, rawNewPic, width, height),0,0,width,height,mtx,true);
+
+ Log.i("MotionDetector", "Finished processing, sending results");
+ handler.post(() -> {
+ for (MotionListener listener : listeners) {
+ Log.i("MotionDetector", "Updating back view");
+ listener.onProcess(
+ lastBitmap,
+ newBitmap,
+ rawBitmap,
+ hasChanged);
+ }
+
+ });
}
+
}
-
- Log.i("MotionAsyncTask", "Finished processing, sending results");
- handler.post(new Runnable() {
-
- public void run() {
- for (MotionListener listener : listeners) {
- Log.i("MotionAsyncTask", "Updating back view");
- listener.onProcess(
- lastBitmap,
- newBitmap,
- rawBitmap,
- hasChanged);
- }
-
- }
- });
+
+
}
diff --git a/src/main/java/org/havenapp/main/sensors/motion/Preview.java b/src/main/java/org/havenapp/main/sensors/motion/Preview.java
index 4cae11e..e5899e8 100644
--- a/src/main/java/org/havenapp/main/sensors/motion/Preview.java
+++ b/src/main/java/org/havenapp/main/sensors/motion/Preview.java
@@ -15,10 +15,6 @@ import android.content.Intent;
import android.content.ServiceConnection;
import android.graphics.Bitmap;
import android.hardware.Camera;
-import android.hardware.Camera.Parameters;
-import android.hardware.Camera.PreviewCallback;
-import android.hardware.Camera.Size;
-import android.media.AudioManager;
import android.media.MediaRecorder;
import android.os.Environment;
import android.os.Handler;
@@ -26,27 +22,28 @@ import android.os.IBinder;
import android.os.Message;
import android.os.Messenger;
import android.os.RemoteException;
+import android.support.v8.renderscript.RenderScript;
import android.util.Log;
-import android.view.Surface;
import android.view.SurfaceHolder;
-import android.view.SurfaceView;
-import android.view.WindowManager;
+
+import com.google.android.cameraview.CameraView;
import org.havenapp.main.PreferenceManager;
import org.havenapp.main.model.EventTrigger;
-import org.havenapp.main.sensors.media.ImageCodec;
-import org.havenapp.main.sensors.media.MediaRecorderTask;
-import org.havenapp.main.sensors.media.MotionAsyncTask;
+import org.havenapp.main.sensors.media.MotionDetector;
import org.havenapp.main.service.MonitorService;
import java.io.File;
import java.io.FileOutputStream;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
-public class Preview extends SurfaceView implements SurfaceHolder.Callback {
+public class Preview {
/**
* Object to retrieve and set shared preferences
@@ -56,7 +53,7 @@ public class Preview extends SurfaceView implements SurfaceHolder.Callback {
private final static int PREVIEW_INTERVAL = 500;
- private List<MotionAsyncTask.MotionListener> listeners = new ArrayList<>();
+ private List<MotionDetector.MotionListener> listeners = new ArrayList<>();
/**
* Timestamp of the last picture processed
@@ -89,13 +86,16 @@ public class Preview extends SurfaceView implements SurfaceHolder.Callback {
/**
* Messenger used to signal motion to the alert service
*/
+ private CameraView cameraView = null;
private Messenger serviceMessenger = null;
- private MediaRecorder mediaRecorder = null;
- private SurfaceHolder mHolder;
- private Camera camera;
+ //private Camera camera;
private Context context;
- private MotionAsyncTask task;
+ private MotionDetector task;
private String videoFile;
+
+ //for managing bitmap processing
+ private RenderScript renderScript;
+
private ServiceConnection mConnection = new ServiceConnection() {
public void onServiceConnected(ComponentName className,
@@ -111,16 +111,17 @@ public class Preview extends SurfaceView implements SurfaceHolder.Callback {
}
};
- public Preview (Context context) {
- super(context);
+ public Preview (Context context, CameraView cameraView) {
+ //super(context);
this.context = context;
- // Install a SurfaceHolder.Callback so we get notified when the
- // underlying surface is created and destroyed.
- mHolder = getHolder();
- mHolder.addCallback(this);
+ this.cameraView = cameraView;
+ this.renderScript = RenderScript.create(context); // where context can be your activity, application, etc.
+
prefs = new PreferenceManager(context);
motionSensitivity = prefs.getCameraSensitivity();
+
+ initCamera();
/*
* We bind to the alert service
*/
@@ -128,14 +129,14 @@ public class Preview extends SurfaceView implements SurfaceHolder.Callback {
MonitorService.class), mConnection, Context.BIND_ABOVE_CLIENT);
}
- public void setMotionSensitivity (int
+ public void setMotionSensitivity (int
motionSensitivity )
{
this.
motionSensitivity = motionSensitivity;
}
- public void addListener(MotionAsyncTask.MotionListener listener) {
+ public void addListener(MotionDetector.MotionListener listener) {
listeners.add(listener);
}
@@ -146,11 +147,14 @@ public class Preview extends SurfaceView implements SurfaceHolder.Callback {
* (preferred is 640x480)
* in order to minimize CPU usage
*/
- public void surfaceCreated(SurfaceHolder holder) {
+ public void initCamera() {
+
+
+ //if (cameraView != null)
+ // stopCamera();
+ cameraView.start();
- if (camera != null)
- stopCamera();
/*
* The Surface has been created, acquire the camera and tell it where
* to draw.
@@ -164,9 +168,11 @@ public class Preview extends SurfaceView implements SurfaceHolder.Callback {
Camera.getCameraInfo(camIdx, cameraInfo);
if (cameraInfo.facing == Camera.CameraInfo.CAMERA_FACING_FRONT) {
try {
- camera = Camera.open(camIdx);
+ //camera = Camera.open(camIdx);
cameraFacing = Camera.CameraInfo.CAMERA_FACING_FRONT;
- } catch (RuntimeException e) {
+ cameraView.setFacing(CameraView.FACING_FRONT);
+
+ } catch (RuntimeException e) {
Log.e("Preview", "Camera failed to open: " + e.getLocalizedMessage());
}
}
@@ -174,178 +180,117 @@ public class Preview extends SurfaceView implements SurfaceHolder.Callback {
break;
case PreferenceManager.BACK:
- camera = Camera.open();
+ //camera = Camera.open();
+ cameraView.setFacing(CameraView.FACING_BACK);
cameraFacing = Camera.CameraInfo.CAMERA_FACING_BACK;
break;
default:
- camera = null;
+ // camera = null;
break;
}
- if (camera != null) {
- final Camera.Parameters parameters = camera.getParameters();
+ cameraView.setOnFrameListener((data, width, height, rotationDegrees) -> {
+ // processNewFrame(data, width, height);
+ long now = System.currentTimeMillis();
+ if (now < Preview.this.lastTimestamp + PREVIEW_INTERVAL)
+ return;
- try {
- List<Size> sizesPreviews = parameters.getSupportedPreviewSizes();
+ Log.i("Preview", "Processing new image");
+ Preview.this.lastTimestamp = now;
- Size bestSize = sizesPreviews.get(0);
+ mDecodeThreadPool.execute(() -> processNewFrame(data, width, height));
+ });
- for (int i = 1; i < sizesPreviews.size(); i++) {
- if ((sizesPreviews.get(i).width * sizesPreviews.get(i).height) >
- (bestSize.width * bestSize.height)) {
- bestSize = sizesPreviews.get(i);
- }
- }
+ }
- parameters.setPreviewSize(bestSize.width, bestSize.height);
+ // A queue of Runnables
+ private final BlockingQueue<Runnable> mDecodeWorkQueue = new LinkedBlockingQueue<Runnable>();
- } catch (Exception e) {
- Log.w("Camera", "Error setting camera preview size", e);
- }
+ // Creates a thread pool manager
+ ThreadPoolExecutor mDecodeThreadPool = new ThreadPoolExecutor(
+ 1, // Initial pool size
+ 1, // Max pool size
+ 10,
+ TimeUnit.SECONDS,
+ mDecodeWorkQueue);
- try {
- List<int[]> ranges = parameters.getSupportedPreviewFpsRange();
- int[] bestRange = ranges.get(0);
- for (int i = 1; i < ranges.size(); i++) {
- if (ranges.get(i)[1] >
- bestRange[1]) {
- bestRange[0] = ranges.get(i)[0];
- bestRange[1] = ranges.get(i)[1];
- }
- }
- parameters.setPreviewFpsRange(bestRange[0], bestRange[1]);
- } catch (Exception e) {
- Log.w("Camera", "Error setting frames per second", e);
- }
+ private void processNewFrame (byte[] data, int width, int height)
+ {
- try {
- parameters.setAutoExposureLock(false);
- parameters.setExposureCompensation(parameters.getMaxExposureCompensation());
- } catch (Exception e) {
- }
- /*
- * If the flash is needed
- */
- if (prefs.getFlashActivation()) {
- Log.i("Preview", "Flash activated");
- parameters.setFlashMode(Parameters.FLASH_MODE_TORCH);
- }
- camera.setParameters(parameters);
+ task = new MotionDetector(
+ renderScript,
+ lastPic,
+ data,
+ width,
+ height,
+ updateHandler,
+ motionSensitivity);
- try {
+ task.addListener((sourceImage, detectedImage, rawBitmap, motionDetected) -> {
- camera.setPreviewDisplay(mHolder);
+ if (motionDetected) {
+ Log.i("MotionListener", "Motion detected");
- camera.setPreviewCallback(new PreviewCallback() {
+ for (MotionDetector.MotionListener listener : listeners)
+ listener.onProcess(sourceImage,detectedImage,rawBitmap,motionDetected);
- public void onPreviewFrame(byte[] data, final Camera cam) {
+ if (serviceMessenger != null) {
+ Message message = new Message();
+ message.what = EventTrigger.CAMERA;
- Camera.Size size;
- try {
- size = cam.getParameters().getPreviewSize();
- } catch(RuntimeException e) {
- return;
- }
- if (size == null) return;
- long now = System.currentTimeMillis();
- if (now < Preview.this.lastTimestamp + PREVIEW_INTERVAL)
- return;
- if (!doingProcessing) {
-
-
- Log.i("Preview", "Processing new image");
- Preview.this.lastTimestamp = now;
- task = new MotionAsyncTask(
- lastPic,
- data,
- size.width,
- size.height,
- updateHandler,
- motionSensitivity);
- for (MotionAsyncTask.MotionListener listener : listeners) {
- Log.i("Preview", "Added listener");
- task.addListener(listener);
- }
- doingProcessing = true;
- task.addListener(new MotionAsyncTask.MotionListener() {
-
- public void onProcess(Bitmap oldBitmap, Bitmap newBitmap,
- Bitmap rawBitmap,
- boolean motionDetected) {
-
- if (motionDetected) {
- Log.i("MotionListener", "Motion detected");
- if (serviceMessenger != null) {
- Message message = new Message();
- message.what = EventTrigger.CAMERA;
-
-
- try {
-
- File fileImageDir = new File(Environment.getExternalStorageDirectory(), prefs.getImagePath());
- fileImageDir.mkdirs();
-
- String ts = new Date().getTime() + ".jpg";
-
- File fileImage = new File(fileImageDir, "detected.original." + ts);
- FileOutputStream stream = new FileOutputStream(fileImage);
- if (prefs.getCamera().equalsIgnoreCase(PreferenceManager.BACK)) {
- Bitmap bmps = ImageCodec.rotate(rawBitmap, 180, false);
- bmps.compress(Bitmap.CompressFormat.JPEG, 100, stream);} else {
- rawBitmap.compress(Bitmap.CompressFormat.JPEG, 100, stream);
- }
- stream.flush();
- stream.close();
- message.getData().putString("path", fileImage.getAbsolutePath());
-
- //store the still match frame, even if doing video
- serviceMessenger.send(message);
-
- if (prefs.getVideoMonitoringActive() && (!doingVideoProcessing)) {
- new Thread ()
- {
- public void run ()
- {
- camera.stopPreview();
- record(camera, serviceMessenger);
-
- }
- }.start();
- }
-
- } catch (Exception e) {
- // Cannot happen
- Log.e("Preview", "error creating image", e);
- }
- }
- }
- Log.i("MotionListener", "Allowing further processing");
- doingProcessing = false;
- }
- });
- task.start();
- lastPic = data;
- try {
+ try {
+
+ File fileImageDir = new File(Environment.getExternalStorageDirectory(), prefs.getImagePath());
+ fileImageDir.mkdirs();
+
+ String ts = new Date().getTime() + ".jpg";
+
+ File fileImage = new File(fileImageDir, "detected.original." + ts);
+ FileOutputStream stream = new FileOutputStream(fileImage);
+ rawBitmap.compress(Bitmap.CompressFormat.JPEG, 100, stream);
+
+ stream.flush();
+ stream.close();
+ message.getData().putString("path", fileImage.getAbsolutePath());
+
+ // sourceImage.recycle();
+ // detectedImage.recycle();
- Camera.Parameters parameters = cam.getParameters();
- parameters.setExposureCompensation(parameters.getMaxExposureCompensation());
- cam.setParameters(parameters);
+ //store the still match frame, even if doing video
+ serviceMessenger.send(message);
- } catch (Exception e) {
- }
+ if (prefs.getVideoMonitoringActive() && (!doingVideoProcessing)) {
+ new Thread ()
+ {
+ public void run ()
+ {
+ // camera.stopPreview();
+ // record(camera, serviceMessenger);
+
+ }
+ }.start();
}
- }
- });
- } catch (IOException e) {
- e.printStackTrace();
+ } catch (Exception e) {
+ // Cannot happen
+ Log.e("Preview", "error creating image", e);
+ }
+ }
}
- }
+
+ Log.i("MotionListener", "Allowing further processing");
+
+ });
+
+ task.detect();
+ lastPic = data;
+
}
+ /**
private synchronized boolean record(Camera cam, Messenger messenger) {
if (mediaRecorder != null && doingVideoProcessing)
@@ -357,12 +302,6 @@ public class Preview extends SurfaceView implements SurfaceHolder.Callback {
MediaRecorderTask mediaRecorderTask = new MediaRecorderTask(cam, videoFile, seconds, mHolder);
mediaRecorder = mediaRecorderTask.getPreparedMediaRecorder();
- /**
- AudioManager audioManager = (AudioManager) context.getApplicationContext().getSystemService(Context.AUDIO_SERVICE);
- if (audioManager != null) {
- audioManager.setStreamMute(AudioManager.STREAM_SYSTEM, true);
- audioManager.setStreamMute(AudioManager.STREAM_MUSIC,true);
- }**/
doingVideoProcessing = true;
mediaRecorder.start();
@@ -376,11 +315,6 @@ public class Preview extends SurfaceView implements SurfaceHolder.Callback {
} catch (RemoteException e) {
e.printStackTrace();
}
- /**
- if (audioManager != null) {
- audioManager.setStreamMute(AudioManager.STREAM_SYSTEM, false);
- audioManager.setStreamMute(AudioManager.STREAM_MUSIC, false);
- }**/
mediaRecorder.stop();
mediaRecorder.reset();
@@ -390,84 +324,22 @@ public class Preview extends SurfaceView implements SurfaceHolder.Callback {
}, seconds);
return true;
- }
+ }**/
- public void surfaceDestroyed(SurfaceHolder holder) {
-
- if (doingVideoProcessing && serviceMessenger != null && prefs.getVideoMonitoringActive()) {
- Message message = new Message();
- message.what = EventTrigger.CAMERA_VIDEO;
- message.getData().putString("path", videoFile);
- try {
- serviceMessenger.send(message);
- } catch (RemoteException e) {
- e.printStackTrace();
- }
- }
- }
public void stopCamera ()
{
- if (camera != null) {
+ 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);
- camera.setPreviewCallback(null);
- camera.stopPreview();
- camera.release();
- }
- }
-
- public void surfaceChanged(SurfaceHolder holder, int format, int w, int h) {
- if (camera != null) {
-
- int degree = ((WindowManager) context.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay().getRotation();
- int displayOrientation = 0;
-
- if (prefs.getCamera().equals(PreferenceManager.FRONT)) {
-
- switch (degree) {
- case Surface.ROTATION_0:
- displayOrientation = 90;
- break;
- case Surface.ROTATION_90:
- displayOrientation = 0;
- break;
- case Surface.ROTATION_180:
- displayOrientation = 0;
- break;
- case Surface.ROTATION_270:
- displayOrientation = 180;
- break;
- }
- } else {
- boolean isLandscape = false;// degree == Configuration.ORIENTATION_LANDSCAPE;
-
- switch (degree) {
- case Surface.ROTATION_0:
- displayOrientation = isLandscape ? 0 : 90;
- break;
- case Surface.ROTATION_90:
- displayOrientation = isLandscape ? 0 : 270;
- break;
- case Surface.ROTATION_180:
- displayOrientation = isLandscape ? 180 : 270;
- break;
- case Surface.ROTATION_270:
- displayOrientation = isLandscape ? 180 : 90;
- break;
- }
- }
-
- camera.setDisplayOrientation(displayOrientation);
-
- camera.startPreview();
+ cameraView.stop();
}
}
public int getCameraFacing() {
- return this.cameraFacing;
+ return cameraView.getFacing();
}
}
diff --git a/src/main/java/org/havenapp/main/service/MonitorService.java b/src/main/java/org/havenapp/main/service/MonitorService.java
index 43a6285..be71e5e 100644
--- a/src/main/java/org/havenapp/main/service/MonitorService.java
+++ b/src/main/java/org/havenapp/main/service/MonitorService.java
@@ -92,7 +92,8 @@ public class MonitorService extends Service {
private class MessageHandler extends Handler {
@Override
public void handleMessage(Message msg) {
- alert(msg.what,msg.getData().getString("path"));
+
+ alert(msg.what,msg.getData().getString("path"));
}
}
diff --git a/src/main/java/org/havenapp/main/ui/CameraFragment.java b/src/main/java/org/havenapp/main/ui/CameraFragment.java
index e379a02..e037c2a 100644
--- a/src/main/java/org/havenapp/main/ui/CameraFragment.java
+++ b/src/main/java/org/havenapp/main/ui/CameraFragment.java
@@ -9,7 +9,6 @@
package org.havenapp.main.ui;
import android.os.Bundle;
-import android.graphics.Bitmap;
import android.support.v4.app.Fragment;
import android.hardware.Camera;
import android.hardware.SensorEvent;
@@ -17,17 +16,17 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
-import android.widget.FrameLayout;
+
+import com.google.android.cameraview.CameraView;
import org.havenapp.main.PreferenceManager;
import org.havenapp.main.R;
-import org.havenapp.main.sensors.media.MotionAsyncTask;
import org.havenapp.main.sensors.media.ImageCodec;
import org.havenapp.main.sensors.motion.Preview;
public final class CameraFragment extends Fragment {
- private Preview preview;
+ private Preview cameraViewHolder;
private ImageView newImage;
@Override
@@ -40,7 +39,7 @@ public final class CameraFragment extends Fragment {
public void setMotionSensitivity (int threshold)
{
- preview.setMotionSensitivity(threshold);
+ cameraViewHolder.setMotionSensitivity(threshold);
}
@Override
@@ -56,7 +55,7 @@ public final class CameraFragment extends Fragment {
@Override
public void onResume() {
super.onResume();
- if (preview == null)
+ if (cameraViewHolder == null)
initCamera();
else
resetCamera();
@@ -64,57 +63,58 @@ public final class CameraFragment extends Fragment {
public void stopCamera ()
{
- if (preview != null) {
- preview.stopCamera();
- preview = null;
+ if (cameraViewHolder != null) {
+ cameraViewHolder.stopCamera();
+ cameraViewHolder = null;
}
}
public void resetCamera ()
{
stopCamera();
- ((FrameLayout) getActivity().findViewById(R.id.preview)).removeAllViews();
initCamera();
}
private void initCamera ()
{
- if (preview == null) {
- PreferenceManager prefs = new PreferenceManager(getActivity());
+ PreferenceManager prefs = new PreferenceManager(getActivity());
+
+ if (prefs.getCameraActivation()) {
+ //Uncomment to see the camera
- if (prefs.getCameraActivation()) {
- //Uncomment to see the camera
- preview = new Preview(getActivity());
+ CameraView cameraView = getActivity().findViewById(R.id.camera_view);
+ cameraViewHolder = new Preview(getActivity(),cameraView);
- ((FrameLayout) getActivity().findViewById(R.id.preview)).addView(preview);
+ // ((FrameLayout) getActivity().findViewById(R.id.cameraViewHolder)).addView(cameraViewHolder);
- // oldImage = (ImageView) getActivity().findViewById(R.id.old_image);
- newImage = getActivity().findViewById(R.id.new_image);
+ // oldImage = (ImageView) getActivity().findViewById(R.id.old_image);
+ newImage = getActivity().findViewById(R.id.new_image);
- preview.addListener(new MotionAsyncTask.MotionListener() {
+ cameraViewHolder.addListener((oldBitmap, newBitmap, rawBitmap, motionDetected) -> {
- public void onProcess(Bitmap oldBitmap, Bitmap newBitmap, Bitmap rawBitmap,
- boolean motionDetected) {
- int rotation = 0;
- boolean reflex = false;
+ /**
+ int rotation = 0;
+ boolean reflex = false;
- if (preview == null)
- return;
+ if (cameraViewHolder == null)
+ return;
- if (preview.getCameraFacing() == Camera.CameraInfo.CAMERA_FACING_BACK) {
- rotation = 90;
- } else {
- rotation = 270;
- reflex = true;
- }
+ if (cameraViewHolder.getCameraFacing() == Camera.CameraInfo.CAMERA_FACING_BACK) {
+ rotation = 90;
+ } else {
+ rotation = 270;
+ reflex = true;
+ }
- // oldImage.setImageBitmap(ImageCodec.rotate(oldBitmap, rotation, reflex));
- newImage.setImageBitmap(ImageCodec.rotate(newBitmap, rotation, reflex));
- }
- });
- }
+ // oldImage.setImageBitmap(ImageCodec.rotate(oldBitmap, rotation, reflex));
+ newImage.setImageBitmap(ImageCodec.rotate(newBitmap, rotation, reflex));
+ **/
+ if (motionDetected)
+ newImage.setImageBitmap(newBitmap);
+ });
}
+
}
@Override
diff --git a/src/main/java/org/havenapp/main/ui/EventTriggerAdapter.java b/src/main/java/org/havenapp/main/ui/EventTriggerAdapter.java
index 9118fed..c9771e6 100644
--- a/src/main/java/org/havenapp/main/ui/EventTriggerAdapter.java
+++ b/src/main/java/org/havenapp/main/ui/EventTriggerAdapter.java
@@ -6,7 +6,9 @@ import android.graphics.drawable.BitmapDrawable;
import android.media.ThumbnailUtils;
import android.net.Uri;
import android.provider.MediaStore;
+import android.support.v4.content.FileProvider;
import android.support.v7.widget.RecyclerView;
+import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -21,6 +23,7 @@ import com.stfalcon.frescoimageviewer.ImageViewer;
import org.havenapp.main.R;
import org.havenapp.main.model.EventTrigger;
+import org.w3c.dom.Text;
import java.io.File;
import java.util.ArrayList;
@@ -36,10 +39,12 @@ public class EventTriggerAdapter extends RecyclerView.Adapter<EventTriggerAdapte
private Context context;
private List<EventTrigger> eventTriggers;
- private ArrayList<String> eventTriggerImagePaths;
+ private ArrayList<Uri> eventTriggerImagePaths;
private OnItemClickListener clickListener;
+ private final static String AUTHORITY = "org.havenapp.main.fileprovider";
+
public EventTriggerAdapter(Context context, List<EventTrigger> eventTriggers) {
this.context = context;
this.eventTriggers = eventTriggers;
@@ -47,9 +52,15 @@ public class EventTriggerAdapter extends RecyclerView.Adapter<EventTriggerAdapte
this.eventTriggerImagePaths = new ArrayList<>();
for (EventTrigger trigger : eventTriggers)
{
- if (trigger.getType() == EventTrigger.CAMERA)
+ if (trigger.getType() == EventTrigger.CAMERA
+ && (!TextUtils.isEmpty(trigger.getPath())))
{
- eventTriggerImagePaths.add("file:///" + trigger.getPath());
+ Uri fileUri = FileProvider.getUriForFile(
+ context,
+ AUTHORITY,
+ new File(trigger.getPath()));
+
+ eventTriggerImagePaths.add(fileUri);
}
}
}
@@ -75,7 +86,6 @@ public class EventTriggerAdapter extends RecyclerView.Adapter<EventTriggerAdapte
holder.extra.setVisibility(View.GONE);
holder.sound.setVisibility(View.GONE);
-
if (eventTrigger.getPath() != null)
{
switch (eventTrigger.getType()) {
@@ -103,37 +113,32 @@ public class EventTriggerAdapter extends RecyclerView.Adapter<EventTriggerAdapte
break;
case EventTrigger.CAMERA:
holder.image.setVisibility(View.VISIBLE);
- Picasso.get().load(new File(eventTrigger.getPath())).into(holder.image);
- holder.image.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View view) {
+ Picasso.get().load(eventTriggerImagePaths.get(position)).into(holder.image);
+ holder.image.setOnClickListener(view -> {
- int startPosition = 0;
- for (int i = 0; i < eventTriggerImagePaths.size(); i++) {
- if (eventTriggerImagePaths.get(i).contains(eventTrigger.getPath())) {
- startPosition = i;
- break;
- }
- }
+ int startPosition = 0;
+ /**
+ for (int i = 0; i < eventTriggerImagePaths.size(); i++) {
+ if (eventTriggerImagePaths.get(i).contains(eventTrigger.getPath())) {
+ startPosition = i;
+ break;
+ }
+ }**/
- ShareOverlayView overlayView = new ShareOverlayView(context);
- ImageViewer viewer = new ImageViewer.Builder(context, eventTriggerImagePaths)
- .setStartPosition(startPosition)
- .setOverlayView(overlayView)
- .show();
- overlayView.setImageViewer(viewer);
+ ShareOverlayView overlayView = new ShareOverlayView(context);
+ ImageViewer viewer = new ImageViewer.Builder(context, eventTriggerImagePaths)
+ .setStartPosition(startPosition)
+ .setOverlayView(overlayView)
+ .show();
+ overlayView.setImageViewer(viewer);
- }
});
- holder.image.setOnLongClickListener(new View.OnLongClickListener() {
- @Override
- public boolean onLongClick(View view) {
- shareMedia(eventTrigger);
- return false;
- }
+ holder.image.setOnLongClickListener(view -> {
+ shareMedia(eventTrigger);
+ return false;
});
break;
case EventTrigger.MICROPHONE:
diff --git a/src/main/res/layout/camera_fragment.xml b/src/main/res/layout/camera_fragment.xml
index 07c17b9..fedd4cf 100644
--- a/src/main/res/layout/camera_fragment.xml
+++ b/src/main/res/layout/camera_fragment.xml
@@ -2,16 +2,30 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
android:foreground="@color/translucentOverlay25">
- <FrameLayout
- android:id="@+id/preview"
- android:layout_width="1dp"
- android:layout_height="1dp"
- android:layout_gravity="center_horizontal" />
+ <com.google.android.cameraview.CameraView
+ android:id="@+id/camera_view"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_gravity="center_horizontal"
+ android:keepScreenOn="true"
+ android:adjustViewBounds="true"
+ app:autoFocus="true"
+ app:cameraAspectRatio="4:3"
+ app:facing="front"
+ app:flash="off"
+ app:maximumWidth="1280"
+ app:maximumPreviewWidth="1280"
+ app:useHighResPicture="false"/>
<ImageView
android:id="@+id/new_image"
android:layout_width="match_parent"
- android:layout_height="match_parent" />
+ android:layout_height="match_parent"
+ android:layout_gravity="center_horizontal"
+ android:background="@color/transparent"
+ android:scaleType="fitXY"
+ />
</FrameLayout>
diff --git a/src/main/res/xml/file_provider_paths.xml b/src/main/res/xml/file_provider_paths.xml
new file mode 100644
index 0000000..c4d9bfa
--- /dev/null
+++ b/src/main/res/xml/file_provider_paths.xml
@@ -0,0 +1,4 @@
+<paths xmlns:android="http://schemas.android.com/apk/res/android">
+ <files-path name="shared" path="shared/"/>
+ <external-path path="phoneypot/" name="phoneypot" />
+</paths>