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

show camera video in events list. make default recording length to 30 secs.

percy-g2069a9217d565
diff --git a/src/main/java/org/havenapp/main/PreferenceManager.java b/src/main/java/org/havenapp/main/PreferenceManager.java
index 01453b8..aaee49d 100644
--- a/src/main/java/org/havenapp/main/PreferenceManager.java
+++ b/src/main/java/org/havenapp/main/PreferenceManager.java
@@ -295,7 +295,7 @@ public class PreferenceManager {
public int getMonitoringTime ()
{
- return appSharedPrefs.getInt(VIDEO_LENGTH,5);
+ return appSharedPrefs.getInt(VIDEO_LENGTH,30);
}
public void setMonitoringTime (int delay)
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 458251e..4008677 100644
--- a/src/main/java/org/havenapp/main/sensors/motion/Preview.java
+++ b/src/main/java/org/havenapp/main/sensors/motion/Preview.java
@@ -109,6 +109,7 @@ public class Preview extends SurfaceView implements SurfaceHolder.Callback {
private SurfaceHolder mHolder;
private Camera camera;
private Context context;
+ private String videoFile;
public Preview(Context context) {
super(context);
@@ -343,9 +344,9 @@ public class Preview extends SurfaceView implements SurfaceHolder.Callback {
Handler handler = new Handler();
void record(Camera cam, Messenger messenger) {
String ts1 = String.valueOf(new Date().getTime());
- String file = Environment.getExternalStorageDirectory() + File.separator + prefs.getImagePath() + File.separator + ts1 + ".mp4";
+ videoFile = Environment.getExternalStorageDirectory() + File.separator + prefs.getImagePath() + File.separator + ts1 + ".mp4";
int seconds = prefs.getMonitoringTime() * 1000;
- MediaRecorderTask mediaRecorderTask = new MediaRecorderTask(cam, file, seconds);
+ MediaRecorderTask mediaRecorderTask = new MediaRecorderTask(cam, videoFile, seconds);
mediaRecorder = mediaRecorderTask.getPreparedMediaRecorder();
AudioManager audioManager = (AudioManager) context.getApplicationContext().getSystemService(Context.AUDIO_SERVICE);
if (audioManager != null) {
@@ -358,7 +359,7 @@ public class Preview extends SurfaceView implements SurfaceHolder.Callback {
if (messenger != null) {
Message message = new Message();
message.what = EventTrigger.CAMERA_VIDEO;
- message.getData().putString("path", file);
+ message.getData().putString("path", videoFile);
try {
messenger.send(message);
} catch (RemoteException e) {
@@ -378,6 +379,16 @@ public class Preview extends SurfaceView implements SurfaceHolder.Callback {
public void surfaceDestroyed(SurfaceHolder holder) {
+ if (doingVideoProcessing && serviceMessenger != null) {
+ Message message = new Message();
+ message.what = EventTrigger.CAMERA_VIDEO;
+ message.getData().putString("path", videoFile);
+ try {
+ serviceMessenger.send(message);
+ } catch (RemoteException e) {
+ e.printStackTrace();
+ }
+ }
if (camera != null) {
// Surface will be destroyed when we return, so stop the preview.
// Because the CameraDevice object is not a shared resource, it's very
diff --git a/src/main/java/org/havenapp/main/ui/EventTriggerAdapter.java b/src/main/java/org/havenapp/main/ui/EventTriggerAdapter.java
index d2c7860..eed1151 100644
--- a/src/main/java/org/havenapp/main/ui/EventTriggerAdapter.java
+++ b/src/main/java/org/havenapp/main/ui/EventTriggerAdapter.java
@@ -74,6 +74,41 @@ public class EventTriggerAdapter extends RecyclerView.Adapter<EventTriggerAdapte
if (eventTrigger.getPath() != null)
{
switch (eventTrigger.getType()) {
+ case EventTrigger.CAMERA_VIDEO:
+ holder.image.setVisibility(View.VISIBLE);
+ Picasso.with(context).load(new File(eventTrigger.getPath())).into(holder.image);
+ holder.image.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+
+ 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);
+
+
+ }
+ });
+
+ holder.image.setOnLongClickListener(new View.OnLongClickListener() {
+ @Override
+ public boolean onLongClick(View view) {
+ shareMedia(eventTrigger);
+ return false;
+ }
+ });
+ break;
case EventTrigger.CAMERA:
holder.image.setVisibility(View.VISIBLE);
Picasso.with(context).load(new File(eventTrigger.getPath())).into(holder.image);