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

initial work on camera sensitivity config #146 #85 #212

n8fr847395d911431
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index f184d95..7a0a20f 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -80,6 +80,8 @@
android:configChanges="orientation|screenSize|keyboardHidden"/>
<activity android:name="org.havenapp.main.ui.AccelConfigureActivity"
android:configChanges="orientation|screenSize|keyboardHidden"/>
+ <activity android:name="org.havenapp.main.ui.CameraConfigureActivity"
+ android:configChanges="orientation|screenSize|keyboardHidden"/>
<receiver android:name="org.havenapp.main.sensors.PowerConnectionReceiver">
<intent-filter>
diff --git a/src/main/java/org/havenapp/main/PreferenceManager.java b/src/main/java/org/havenapp/main/PreferenceManager.java
index f468852..5f4ab7a 100644
--- a/src/main/java/org/havenapp/main/PreferenceManager.java
+++ b/src/main/java/org/havenapp/main/PreferenceManager.java
@@ -24,6 +24,8 @@ import android.content.Context;
import android.content.SharedPreferences;
import android.content.SharedPreferences.Editor;
+import org.havenapp.main.sensors.motion.LuminanceMotionDetector;
+
public class PreferenceManager {
@@ -45,7 +47,7 @@ public class PreferenceManager {
private static final String ACCELEROMETER_SENSITIVITY="accelerometer_sensibility";
private static final String CAMERA_ACTIVE="camera_active";
public static final String CAMERA="camera";
- private static final String CAMERA_SENSITIVITY="camera_sensitivity";
+ public static final String CAMERA_SENSITIVITY="camera_sensitivity";
public static final String CONFIG_MOVEMENT ="config_movement";
private static final String FLASH_ACTIVE="flash_active";
private static final String MICROPHONE_ACTIVE="microphone_active";
@@ -167,13 +169,13 @@ public class PreferenceManager {
return appSharedPrefs.getString(CAMERA, FRONT);
}
- public void setCameraSensitivity(String sensitivity) {
- prefsEditor.putString(CAMERA_SENSITIVITY, sensitivity);
+ public void setCameraSensitivity(int sensitivity) {
+ prefsEditor.putInt(CAMERA_SENSITIVITY, sensitivity);
prefsEditor.commit();
}
- public String getCameraSensitivity() {
- return appSharedPrefs.getString(CAMERA_SENSITIVITY, HIGH);
+ public int getCameraSensitivity() {
+ return appSharedPrefs.getInt(CAMERA_SENSITIVITY, LuminanceMotionDetector.MOTION_MEDIUM);
}
public void activateFlash(boolean active) {
diff --git a/src/main/java/org/havenapp/main/SettingsFragment.java b/src/main/java/org/havenapp/main/SettingsFragment.java
index ace220e..aad98d6 100644
--- a/src/main/java/org/havenapp/main/SettingsFragment.java
+++ b/src/main/java/org/havenapp/main/SettingsFragment.java
@@ -28,6 +28,7 @@ import com.wdullaer.materialdatetimepicker.time.TimePickerDialog;
import org.havenapp.main.service.SignalSender;
import org.havenapp.main.service.WebServer;
import org.havenapp.main.ui.AccelConfigureActivity;
+import org.havenapp.main.ui.CameraConfigureActivity;
import org.havenapp.main.ui.MicrophoneConfigureActivity;
import java.io.File;
@@ -108,6 +109,12 @@ public class SettingsFragment extends PreferenceFragmentCompat implements Shared
findPreference(PreferenceManager.REGISTER_SIGNAL).setSummary(R.string.register_signal_desc);
}
+ Preference prefCameraSensitivity = findPreference(PreferenceManager.CAMERA_SENSITIVITY);
+ prefCameraSensitivity.setOnPreferenceClickListener(preference -> {
+ startActivity(new Intent(mActivity, CameraConfigureActivity.class));
+ return true;
+ });
+
Preference prefConfigMovement = findPreference(PreferenceManager.CONFIG_MOVEMENT);
prefConfigMovement.setOnPreferenceClickListener(preference -> {
startActivity(new Intent(mActivity, AccelConfigureActivity.class));
diff --git a/src/main/java/org/havenapp/main/sensors/media/MotionAsyncTask.java b/src/main/java/org/havenapp/main/sensors/media/MotionAsyncTask.java
index 5469292..c877324 100644
--- a/src/main/java/org/havenapp/main/sensors/media/MotionAsyncTask.java
+++ b/src/main/java/org/havenapp/main/sensors/media/MotionAsyncTask.java
@@ -49,6 +49,8 @@ public class MotionAsyncTask extends Thread {
private Bitmap newBitmap;
private Bitmap rawBitmap;
private boolean hasChanged;
+
+ private IMotionDetector detector;
public interface MotionListener {
public void onProcess(Bitmap oldBitmap,
@@ -77,6 +79,12 @@ public class MotionAsyncTask extends Thread {
}
+ public void setMotionSensitivity (int motionSensitivity)
+ {
+ this.motionSensitivity = motionSensitivity;
+ detector.setThreshold(motionSensitivity);
+ }
+
@Override
public void run() {
int[] newPicLuma = ImageCodec.N21toLuma(rawNewPic, width, height);
@@ -85,7 +93,7 @@ public class MotionAsyncTask extends Thread {
lastBitmap = newBitmap;
} else {
int[] oldPicLuma = ImageCodec.N21toLuma(rawOldPic, width, height);
- IMotionDetector detector = new LuminanceMotionDetector();
+ detector = new LuminanceMotionDetector();
detector.setThreshold(motionSensitivity);
List<Integer> changedPixels =
detector.detectMotion(oldPicLuma, newPicLuma, width, height);
diff --git a/src/main/java/org/havenapp/main/sensors/motion/LuminanceMotionDetector.java b/src/main/java/org/havenapp/main/sensors/motion/LuminanceMotionDetector.java
index de53473..5b2cd60 100644
--- a/src/main/java/org/havenapp/main/sensors/motion/LuminanceMotionDetector.java
+++ b/src/main/java/org/havenapp/main/sensors/motion/LuminanceMotionDetector.java
@@ -33,21 +33,8 @@ public class LuminanceMotionDetector implements IMotionDetector {
* @param thresh sensitivity identifier
*/
public void setThreshold(int thresh) {
- switch(thresh) {
- case MOTION_LOW:
- VALUE_THRESHOLD = 60;
- NUMBER_THRESHOLD = 20000;
- break;
- case MOTION_MEDIUM:
- VALUE_THRESHOLD = 50;
- NUMBER_THRESHOLD = 10000;
- break;
- case MOTION_HIGH:
- VALUE_THRESHOLD = 20;
- NUMBER_THRESHOLD = 2000;
- break;
- }
-
+ NUMBER_THRESHOLD = thresh;
+ VALUE_THRESHOLD = thresh/1000;
}
/*
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 d03bc56..524ccb6 100644
--- a/src/main/java/org/havenapp/main/sensors/motion/Preview.java
+++ b/src/main/java/org/havenapp/main/sensors/motion/Preview.java
@@ -106,6 +106,7 @@ public class Preview extends SurfaceView implements SurfaceHolder.Callback {
private SurfaceHolder mHolder;
private Camera camera;
private Context context;
+ private MotionAsyncTask task;
public Preview (Context context) {
super(context);
@@ -116,23 +117,12 @@ public class Preview extends SurfaceView implements SurfaceHolder.Callback {
mHolder.addCallback(this);
prefs = new PreferenceManager(context);
- /*
- * Set sensitivity value
- */
- switch (prefs.getCameraSensitivity()) {
- case "Medium":
- motionSensitivity = LuminanceMotionDetector.MOTION_MEDIUM;
- Log.i("CameraFragment", "Sensitivity set to Medium");
- break;
- case "Low":
- motionSensitivity = LuminanceMotionDetector.MOTION_LOW;
- Log.i("CameraFragment", "Sensitivity set to Low");
- break;
- default:
- motionSensitivity = LuminanceMotionDetector.MOTION_HIGH;
- Log.i("CameraFragment", "Sensitivity set to High");
- break;
- }
+ motionSensitivity = prefs.getCameraSensitivity();
+ }
+
+ public void setMotionSensitivity (int motionSensitivity)
+ {
+ this.motionSensitivity = motionSensitivity;
}
public void addListener(MotionAsyncTask.MotionListener listener) {
@@ -257,7 +247,7 @@ public class Preview extends SurfaceView implements SurfaceHolder.Callback {
Log.i("Preview", "Processing new image");
Preview.this.lastTimestamp = now;
- MotionAsyncTask task = new MotionAsyncTask(
+ task = new MotionAsyncTask(
lastPic,
data,
size.width,
diff --git a/src/main/java/org/havenapp/main/service/MonitorService.java b/src/main/java/org/havenapp/main/service/MonitorService.java
index f83def5..c6aab0e 100644
--- a/src/main/java/org/havenapp/main/service/MonitorService.java
+++ b/src/main/java/org/havenapp/main/service/MonitorService.java
@@ -283,9 +283,6 @@ public class MonitorService extends Service {
StringBuilder alertMessage = new StringBuilder();
alertMessage.append(getString(R.string.intrusion_detected,eventTrigger.getStringType(this)));
- // removing toast, but we should have some visual feedback for testing on the monitor screen
-// Toast.makeText(this,alertMessage.toString(),Toast.LENGTH_SHORT).show();
-
if (mPrefs.getSignalUsername() != null)
{
//since this is a secure channel, we can add the Onion address
diff --git a/src/main/java/org/havenapp/main/ui/CameraConfigureActivity.java b/src/main/java/org/havenapp/main/ui/CameraConfigureActivity.java
new file mode 100644
index 0000000..c513bce
--- /dev/null
+++ b/src/main/java/org/havenapp/main/ui/CameraConfigureActivity.java
@@ -0,0 +1,216 @@
+/*
+ * Copyright (c) 2017 Nathanial Freitas
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.havenapp.main.ui;
+
+import android.Manifest;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.graphics.Camera;
+import android.os.Bundle;
+import android.os.CountDownTimer;
+import android.os.Environment;
+import android.support.v4.app.ActivityCompat;
+import android.support.v4.content.ContextCompat;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
+import android.util.Log;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.Button;
+import android.widget.SeekBar;
+import android.widget.TextView;
+
+import com.wdullaer.materialdatetimepicker.time.TimePickerDialog;
+
+import org.havenapp.main.PreferenceManager;
+import org.havenapp.main.R;
+import org.havenapp.main.SettingsActivity;
+import org.havenapp.main.service.MonitorService;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+
+
+public class CameraConfigureActivity extends AppCompatActivity {
+
+ private PreferenceManager preferences = null;
+
+ private boolean mIsMonitoring = false;
+ private boolean mIsInitializedLayout = false;
+
+ private CameraFragment mFragment;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+
+ boolean permsNeeded = askForPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE, 1);
+
+ if (!permsNeeded)
+ initLayout();
+ }
+
+ private void initLayout() {
+ preferences = new PreferenceManager(getApplicationContext());
+ setContentView(R.layout.activity_camera_configure);
+
+ Toolbar toolbar = findViewById(R.id.toolbar);
+ setSupportActionBar(toolbar);
+
+ setTitle("");
+ getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+
+ mFragment = (CameraFragment) getSupportFragmentManager().findFragmentById(R.id.fragment_camera);
+
+ findViewById(R.id.btnCameraSwitch).setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ switchCamera();
+ }
+ });
+
+ SeekBar sBar = ((SeekBar)findViewById(R.id.seekCameraSensitivity));
+ sBar.setProgress(preferences.getCameraSensitivity());
+ sBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
+ @Override
+ public void onProgressChanged(SeekBar seekBar, int i, boolean b) {
+ mFragment.setMotionSensitivity(i);
+ preferences.setCameraSensitivity(i);
+ }
+
+ @Override
+ public void onStartTrackingTouch(SeekBar seekBar) {
+
+ }
+
+ @Override
+ public void onStopTrackingTouch(SeekBar seekBar) {
+
+ }
+ });
+
+ mIsInitializedLayout = true;
+ }
+
+ private void switchCamera() {
+
+ String camera = preferences.getCamera();
+ if (camera.equals(PreferenceManager.FRONT))
+ preferences.setCamera(PreferenceManager.BACK);
+ else if (camera.equals(PreferenceManager.BACK))
+ preferences.setCamera(PreferenceManager.FRONT);
+
+ ((CameraFragment) getSupportFragmentManager().findFragmentById(R.id.fragment_camera)).resetCamera();
+
+ }
+
+
+
+ private void initMonitor() {
+
+ mIsMonitoring = true;
+ //ensure folder exists and will not be scanned by the gallery app
+
+ try {
+ File fileImageDir = new File(Environment.getExternalStorageDirectory(), preferences.getImagePath());
+ fileImageDir.mkdirs();
+ new FileOutputStream(new File(fileImageDir, ".nomedia")).write(0);
+ } catch (IOException e) {
+ Log.e("Monitor", "unable to init media storage directory", e);
+ }
+
+ //Do something after 100ms
+ startService(new Intent(CameraConfigureActivity.this, MonitorService.class));
+
+ }
+
+ /**
+ * Closes the monitor activity and unset session properties
+ */
+ private void close() {
+
+ stopService(new Intent(this, MonitorService.class));
+ if (preferences != null) {
+ preferences.unsetAccessToken();
+ preferences.unsetDelegatedAccessToken();
+ preferences.unsetPhoneId();
+ }
+ finish();
+
+ }
+
+ @Override
+ public boolean onOptionsItemSelected (MenuItem item) {
+ switch (item.getItemId()){
+ case android.R.id.home:
+ close();
+ break;
+ }
+ return true;
+ }
+
+ /**
+ * When user closes the activity
+ */
+ @Override
+ public void onBackPressed() {
+ close();
+ }
+
+ @Override
+ public void onResume() {
+ super.onResume();
+ }
+
+ @Override
+ public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
+ super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+
+ switch (requestCode) {
+ case 1:
+ askForPermission(Manifest.permission.CAMERA, 2);
+ break;
+ case 2:
+ initLayout();
+ break;
+ }
+
+ }
+
+
+ private boolean askForPermission(String permission, Integer requestCode) {
+ if (ContextCompat.checkSelfPermission(this, permission) != PackageManager.PERMISSION_GRANTED) {
+
+ // Should we show an explanation?
+ if (ActivityCompat.shouldShowRequestPermissionRationale(this, permission)) {
+
+ //This is called if user has denied the permission before
+ //In this case I am just asking the permission again
+ ActivityCompat.requestPermissions(this, new String[]{permission}, requestCode);
+
+ } else {
+
+ ActivityCompat.requestPermissions(this, new String[]{permission}, requestCode);
+ }
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+}
diff --git a/src/main/java/org/havenapp/main/ui/CameraFragment.java b/src/main/java/org/havenapp/main/ui/CameraFragment.java
index 753a5c4..26e79e7 100644
--- a/src/main/java/org/havenapp/main/ui/CameraFragment.java
+++ b/src/main/java/org/havenapp/main/ui/CameraFragment.java
@@ -28,8 +28,6 @@ import org.havenapp.main.sensors.motion.Preview;
public final class CameraFragment extends Fragment {
private Preview preview;
-
-// private ImageView oldImage;
private ImageView newImage;
@Override
@@ -40,6 +38,11 @@ public final class CameraFragment extends Fragment {
}
+ public void setMotionSensitivity (int threshold)
+ {
+ preview.setMotionSensitivity(threshold);
+ }
+
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -70,7 +73,7 @@ public final class CameraFragment extends Fragment {
PreferenceManager prefs = new PreferenceManager(getActivity());
- if (!prefs.getCameraSensitivity().equals(PreferenceManager.OFF)) {
+ if (prefs.getCameraActivation()) {
//Uncomment to see the camera
preview = new Preview(getActivity());
diff --git a/src/main/res/layout/activity_camera_configure.xml b/src/main/res/layout/activity_camera_configure.xml
new file mode 100644
index 0000000..0108cda
--- /dev/null
+++ b/src/main/res/layout/activity_camera_configure.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:id="@+id/main_content"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@color/colorPrimary">
+
+ <android.support.v7.widget.Toolbar
+ android:id="@+id/toolbar"
+ android:layout_width="match_parent"
+ android:layout_height="?attr/actionBarSize"
+ android:background="?attr/colorPrimary"
+ android:theme="@style/AppTheme.AppBarOverlay"
+ app:popupTheme="@style/AppTheme.PopupOverlay" />
+
+ <FrameLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+
+ <fragment
+ android:id="@+id/fragment_camera"
+ class="org.havenapp.main.ui.CameraFragment"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_marginTop="60dp"
+ android:visibility="gone" />
+
+
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:gravity="center_horizontal|bottom"
+ android:text="@string/tune_the_sound_detection"
+ android:textColor="@color/colorAccent"
+ android:textSize="20sp"
+ android:textStyle="bold" />
+
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:gravity="center_horizontal|bottom"
+ android:orientation="horizontal"
+ android:padding="10dp">
+
+ <ImageView
+ android:id="@+id/btnCameraSwitch"
+ android:layout_width="36dp"
+ android:layout_height="36dp"
+ android:layout_margin="20dp"
+ android:foreground="?attr/selectableItemBackground"
+ app:srcCompat="@drawable/ic_camera_front_white" />
+
+ <SeekBar
+ android:layout_width="wrap_content"
+ android:layout_weight="1"
+ android:layout_height="36dp"
+ android:layout_marginBottom="24dp"
+ android:id="@+id/seekCameraSensitivity"
+ android:max="100000"
+ android:min="2000"
+ />
+
+ </LinearLayout>
+ </FrameLayout>
+</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index ea87c96..123d7dc 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -122,10 +122,11 @@
<string name="send_message_dialog">Enter a phone number to send a test alert notification message to</string>
<string name="send_text_message">Test notifications...</string>
<string name="service_address">Service Address</string>
- <string name="password">Password</string>
+ <string name="password">Password (Required)</string>
<string name="signal_number">Signal Number (Local)</string>
<string name="phone_number">Notification Number (Remote)</string>
<string name="sensors">Sensors</string>
<string name="label_notifications">Notifications</string>
+ <string name="camera_sensitivity">Camera Sensitivity</string>
</resources>
diff --git a/src/main/res/xml/settings.xml b/src/main/res/xml/settings.xml
index f042d9d..f671a88 100644
--- a/src/main/res/xml/settings.xml
+++ b/src/main/res/xml/settings.xml
@@ -14,6 +14,10 @@
android:summary="%s"
android:title="@string/camera_prompt" />
+ <Preference
+ android:key="camera_sensitivity"
+ android:title="@string/camera_sensitivity" />
+
<Preference
android:key="config_sound"
android:title="@string/microphone_sensitivity" />