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
tuning of accel/motion sensor; new UI for configuration
n8fr80fd6f690ef63
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xmlindex cc197f1..da69434 100644--- a/src/main/AndroidManifest.xml+++ b/src/main/AndroidManifest.xml@@ -16,7 +16,7 @@<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /><application- android:name="org.havenapp.main.PhoneyPotApp"+ android:name="org.havenapp.main.HavenApp"android:icon="@mipmap/ic_launcher"android:label="@string/app_name"android:theme="@style/AppTheme">@@ -47,7 +47,7 @@<meta-dataandroid:name="DATABASE"- android:value="phoneypot.db" />+ android:value="haven.db" /><meta-dataandroid:name="VERSION"android:value="3" />@@ -56,13 +56,15 @@android:value="true" /><meta-dataandroid:name="DOMAIN_PACKAGE_NAME"- android:value="info.guardianproject.phoneypot.model" />+ android:value="org.havenapp.main.model" /><activityandroid:name="org.havenapp.main.ui.EventActivity"android:label="@string/title_activity_event"android:theme="@style/AppTheme" />- <activity android:name="org.havenapp.main.ui.MicrophoneConfigureActivity"></activity>+ <activity android:name="org.havenapp.main.ui.MicrophoneConfigureActivity"/>+ <activity android:name="org.havenapp.main.ui.AccelConfigureActivity"/>+<receiver android:name="org.havenapp.main.sensors.PowerConnectionReceiver"><intent-filter><action android:name="android.intent.action.ACTION_POWER_CONNECTED"/>diff --git a/src/main/java/org/havenapp/main/PhoneyPotApp.java b/src/main/java/org/havenapp/main/HavenApp.javasimilarity index 95%rename from src/main/java/org/havenapp/main/PhoneyPotApp.javarename to src/main/java/org/havenapp/main/HavenApp.javaindex d17972e..f82b5a9 100644--- a/src/main/java/org/havenapp/main/PhoneyPotApp.java+++ b/src/main/java/org/havenapp/main/HavenApp.java@@ -28,7 +28,7 @@ import java.io.IOException;import org.havenapp.main.service.WebServer;-public class PhoneyPotApp extends MultiDexApplication {+public class HavenApp extends MultiDexApplication {/*@@ -58,7 +58,7 @@ public class PhoneyPotApp extends MultiDexApplication {if (mOnionServer == null || (!mOnionServer.isAlive())){try {- mOnionServer = new WebServer();+ mOnionServer = new WebServer(this);if (!TextUtils.isEmpty(mPrefs.getRemoteAccessCredential()))mOnionServer.setPassword(mPrefs.getRemoteAccessCredential());diff --git a/src/main/java/org/havenapp/main/MonitorActivity.java b/src/main/java/org/havenapp/main/MonitorActivity.javaindex c607005..0e6bc3a 100644--- a/src/main/java/org/havenapp/main/MonitorActivity.java+++ b/src/main/java/org/havenapp/main/MonitorActivity.java@@ -43,6 +43,7 @@ import java.util.concurrent.TimeUnit;import org.havenapp.main.service.MonitorService;+import org.havenapp.main.ui.AccelConfigureActivity;import org.havenapp.main.ui.CameraFragment;import org.havenapp.main.ui.MicrophoneConfigureActivity;@@ -115,13 +116,20 @@ public class MonitorActivity extends FragmentActivity {}});- findViewById(R.id.btnMicSettings).setOnClickListener(new View.OnClickListener() {+ findViewById(R.id.btnAccelSettings).setOnClickListener(new View.OnClickListener() {@Overridepublic void onClick(View v) {- startActivity(new Intent(MonitorActivity.this, MicrophoneConfigureActivity.class));+ startActivity(new Intent(MonitorActivity.this, AccelConfigureActivity.class));}});+ findViewById(R.id.btnMicSettings).setOnClickListener(new View.OnClickListener() {+ @Override+ public void onClick(View v) {+ startActivity(new Intent(MonitorActivity.this, MicrophoneConfigureActivity.class));+ }+ });+findViewById(R.id.btnCameraSwitch).setOnClickListener(new View.OnClickListener() {@Overridepublic void onClick(View v) {diff --git a/src/main/java/org/havenapp/main/PreferenceManager.java b/src/main/java/org/havenapp/main/PreferenceManager.javaindex 8c5d0eb..f59e464 100644--- a/src/main/java/org/havenapp/main/PreferenceManager.java+++ b/src/main/java/org/havenapp/main/PreferenceManager.java@@ -39,7 +39,7 @@ public class PreferenceManager {public static final String FRONT = "Front";public static final String BACK = "Back";- private static final String APP_SHARED_PREFS="me.ziccard.secureit";+ private static final String APP_SHARED_PREFS="org.havenapp.main";private static final String ACCELEROMETER_ACTIVE="accelerometer_active";private static final String ACCELEROMETER_SENSITIVITY="accelerometer_sensibility";private static final String CAMERA_ACTIVE="camera_active";diff --git a/src/main/java/org/havenapp/main/SettingsActivity.java b/src/main/java/org/havenapp/main/SettingsActivity.javaindex e3aa648..a5d5b84 100644--- a/src/main/java/org/havenapp/main/SettingsActivity.java+++ b/src/main/java/org/havenapp/main/SettingsActivity.java@@ -55,12 +55,13 @@ import info.guardianproject.netcipher.proxy.OrbotHelper;import org.havenapp.main.service.SignalSender;import org.havenapp.main.service.WebServer;+import org.havenapp.main.ui.AccelConfigureActivity;import org.havenapp.main.ui.MicrophoneConfigureActivity;public class SettingsActivity extends AppCompatActivity {private PreferenceManager preferences = null;- private PhoneyPotApp app = null;+ private HavenApp app = null;private EditText remoteAccessCredential;@Override@@ -74,7 +75,7 @@ public class SettingsActivity extends AppCompatActivity {preferences = new PreferenceManager(this.getApplicationContext());- app = (PhoneyPotApp)getApplication();+ app = (HavenApp)getApplication();/** We create an application directory to store images and audio@@ -173,6 +174,15 @@ public class SettingsActivity extends AppCompatActivity {}});+ findViewById(R.id.action_configure_accel).setOnClickListener(new View.OnClickListener() {+ @Override+ public void onClick(View view) {+ startActivity(new Intent(SettingsActivity.this, AccelConfigureActivity.class));+ }+ });+++findViewById(R.id.action_configure_time).setOnClickListener(new View.OnClickListener() {@Overridepublic void onClick(View v) {diff --git a/src/main/java/org/havenapp/main/model/Event.java b/src/main/java/org/havenapp/main/model/Event.javaindex d21032d..581bc4d 100644--- a/src/main/java/org/havenapp/main/model/Event.java+++ b/src/main/java/org/havenapp/main/model/Event.java@@ -18,7 +18,7 @@ public class Event extends SugarRecord {@IgnoreArrayList<EventTrigger> mEventTriggers;- public final static long EVENT_WINDOW_TIME = 1000 * 60; //1 minutes+ public final static long EVENT_WINDOW_TIME = 1000 * 60 * 5; //1 minutespublic Event (){diff --git a/src/main/java/org/havenapp/main/model/EventTrigger.java b/src/main/java/org/havenapp/main/model/EventTrigger.javaindex 039d3ec..1b77dba 100644--- a/src/main/java/org/havenapp/main/model/EventTrigger.java+++ b/src/main/java/org/havenapp/main/model/EventTrigger.java@@ -1,7 +1,11 @@package org.havenapp.main.model;+import android.content.Context;+import com.orm.SugarRecord;+import org.havenapp.main.R;+import java.util.Date;/**@@ -80,28 +84,29 @@ public class EventTrigger extends SugarRecord {this.mPath = mPath;}- public String getStringType ()++ public String getStringType (Context context){String sType = "";switch (getType()) {case EventTrigger.ACCELEROMETER:- sType = "ACCELEROMETER";+ sType = context.getString(R.string.sensor_accel);break;case EventTrigger.LIGHT:- sType = "LIGHT";+ sType = context.getString(R.string.sensor_light);break;case EventTrigger.CAMERA:- sType = "CAMERA MOTION";+ sType = context.getString(R.string.sensor_camera);break;case EventTrigger.MICROPHONE:- sType = "SOUND";+ sType = context.getString(R.string.sensor_sound);break;case EventTrigger.POWER:- sType = "POWER";+ sType = context.getString(R.string.sensor_power);break;default:- sType = "UNKNOWN";+ sType = context.getString(R.string.sensor_unknown);}return sType;diff --git a/src/main/java/org/havenapp/main/sensors/AccelerometerMonitor.java b/src/main/java/org/havenapp/main/sensors/AccelerometerMonitor.javaindex 80ecde0..623b0b5 100644--- a/src/main/java/org/havenapp/main/sensors/AccelerometerMonitor.java+++ b/src/main/java/org/havenapp/main/sensors/AccelerometerMonitor.java@@ -55,7 +55,7 @@ public class AccelerometerMonitor implements SensorEventListener {/*** Shake threshold*/- private static int SHAKE_THRESHOLD = 2300;+ private int shakeThreshold = -1;/*** Text showing accelerometer values@@ -71,12 +71,13 @@ public class AccelerometerMonitor implements SensorEventListener {/** Set sensitivity value*/- if (prefs.getAccelerometerSensitivity().equals("Medium")) {- SHAKE_THRESHOLD = 400;- } else if (prefs.getAccelerometerSensitivity().equals("Low")) {- SHAKE_THRESHOLD = 600;- } else {- SHAKE_THRESHOLD = 200;+ try+ {+ shakeThreshold = Integer.parseInt(prefs.getAccelerometerSensitivity());+ }+ catch (Exception e)+ {+ shakeThreshold = 50;}context.bindService(new Intent(context,@@ -119,9 +120,9 @@ public class AccelerometerMonitor implements SensorEventListener {float speed = Math.abs(accel_values[0] + accel_values[1] + accel_values[2] -last_accel_values[0] + last_accel_values[1] + last_accel_values[2])- / diffTime * 10000;+ / diffTime * 1000;- if (speed > SHAKE_THRESHOLD) {+ if (speed > shakeThreshold) {/** Send Alert*/diff --git a/src/main/java/org/havenapp/main/sensors/motion/Preview.java b/src/main/java/org/havenapp/main/sensors/motion/Preview.javaindex ddcd9a6..950ea80 100644--- a/src/main/java/org/havenapp/main/sensors/motion/Preview.java+++ b/src/main/java/org/havenapp/main/sensors/motion/Preview.java@@ -198,6 +198,11 @@ public class Preview extends SurfaceView implements SurfaceHolder.Callback {Log.w("Camera","Error setting frames per second",e);}+ try {+ parameters.setAutoExposureLock(false);+ parameters.setExposureCompensation(parameters.getMaxExposureCompensation());+ }+ catch (Exception e){}/** If the flash is needed*/@@ -289,6 +294,15 @@ public class Preview extends SurfaceView implements SurfaceHolder.Callback {});task.start();lastPic = data;++ try {++ Camera.Parameters parameters = cam.getParameters();+ parameters.setExposureCompensation(parameters.getMaxExposureCompensation());+ cam.setParameters(parameters);++ }+ catch (Exception e){}}}});diff --git a/src/main/java/org/havenapp/main/service/MonitorService.java b/src/main/java/org/havenapp/main/service/MonitorService.javaindex b093f66..7b8ace5 100644--- a/src/main/java/org/havenapp/main/service/MonitorService.java+++ b/src/main/java/org/havenapp/main/service/MonitorService.java@@ -23,13 +23,14 @@ import android.os.PowerManager;import android.support.v4.app.NotificationCompat;import android.telephony.SmsManager;import android.text.TextUtils;+import android.widget.Toast;import java.util.ArrayList;import java.util.Date;import java.util.StringTokenizer;import org.havenapp.main.MonitorActivity;-import org.havenapp.main.PhoneyPotApp;+import org.havenapp.main.HavenApp;import org.havenapp.main.PreferenceManager;import org.havenapp.main.R;import org.havenapp.main.model.Event;@@ -106,7 +107,7 @@ public class MonitorService extends Service {*** Application*/- PhoneyPotApp mApp = null;+ HavenApp mApp = null;/*** Called on service creation, sends a notification@@ -116,7 +117,7 @@ public class MonitorService extends Service {sInstance = this;- mApp = (PhoneyPotApp)getApplication();+ mApp = (HavenApp)getApplication();manager = (NotificationManager)getSystemService(NOTIFICATION_SERVICE);mPrefs = new PreferenceManager(this);@@ -262,7 +263,9 @@ public class MonitorService extends Service {* number*/StringBuffer alertMessage = new StringBuffer();- alertMessage.append(getString(R.string.intrusion_detected,eventTrigger.getStringType()));+ alertMessage.append(getString(R.string.intrusion_detected,eventTrigger.getStringType(this)));++ Toast.makeText(this,alertMessage.toString(),Toast.LENGTH_SHORT).show();if (mPrefs.getSignalUsername() != null){diff --git a/src/main/java/org/havenapp/main/service/WebServer.java b/src/main/java/org/havenapp/main/service/WebServer.javaindex e3b34cb..226486e 100644--- a/src/main/java/org/havenapp/main/service/WebServer.java+++ b/src/main/java/org/havenapp/main/service/WebServer.java@@ -1,5 +1,6 @@package org.havenapp.main.service;+import android.content.Context;import android.net.Uri;import android.text.TextUtils;import android.util.Log;@@ -28,8 +29,11 @@ public class WebServer extends NanoHTTPD {private String mPassword = null;private String mSession = null;- public WebServer() throws IOException {+ private Context mContext;++ public WebServer(Context context) throws IOException {super(LOCAL_PORT);+ mContext = context;start(NanoHTTPD.SOCKET_READ_TIMEOUT, false);}@@ -147,7 +151,7 @@ public class WebServer extends NanoHTTPD {for (EventTrigger eventTrigger: triggers){- String title = eventTrigger.getStringType();+ String title = eventTrigger.getStringType(mContext);String desc = eventTrigger.getTriggerTime().toString();page.append("<b>");diff --git a/src/main/java/org/havenapp/main/ui/AccelConfigureActivity.java b/src/main/java/org/havenapp/main/ui/AccelConfigureActivity.javanew file mode 100644index 0000000..2d2361b--- /dev/null+++ b/src/main/java/org/havenapp/main/ui/AccelConfigureActivity.java@@ -0,0 +1,304 @@+package org.havenapp.main.ui;++import android.Manifest;+import android.app.Activity;+import android.content.pm.PackageManager;+import android.graphics.Canvas;+import android.graphics.Color;+import android.graphics.Paint;+import android.graphics.PorterDuff;+import android.hardware.Sensor;+import android.hardware.SensorEvent;+import android.hardware.SensorEventListener;+import android.hardware.SensorManager;+import android.os.Bundle;+import android.os.Message;+import android.os.RemoteException;+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.Menu;+import android.view.MenuItem;+import android.widget.TextView;++import com.maxproj.simplewaveform.SimpleWaveform;++import org.havenapp.main.PreferenceManager;+import org.havenapp.main.R;+import org.havenapp.main.model.EventTrigger;+import org.havenapp.main.sensors.media.MicSamplerTask;+import org.havenapp.main.sensors.media.MicrophoneTaskFactory;++import java.util.LinkedList;++import me.angrybyte.numberpicker.listener.OnValueChangeListener;+import me.angrybyte.numberpicker.view.ActualNumberPicker;++public class AccelConfigureActivity extends AppCompatActivity implements SensorEventListener {++ private TextView mTextLevel;+ private ActualNumberPicker mNumberTrigger;+ private PreferenceManager mPrefManager;+ private SimpleWaveformExtended mWaveform;+ private LinkedList<Integer> mWaveAmpList;++ private double maxAmp = 0;++ /**+ * Last update of the accelerometer+ */+ private long lastUpdate = -1;++ /**+ * Current accelerometer values+ */+ private float accel_values[];++ /**+ * Last accelerometer values+ */+ private float last_accel_values[];+++ /**+ * Shake threshold+ */+ private int shakeThreshold = -1;++ /**+ * Text showing accelerometer values+ */+ private int maxAlertPeriod = 30;+ private int remainingAlertPeriod = 0;+ private boolean alert = false;+ private final static int CHECK_INTERVAL = 1000;+++ @Override+ protected void onCreate(Bundle savedInstanceState) {+ super.onCreate(savedInstanceState);+ setContentView(R.layout.activity_accel_configure);++ Toolbar toolbar = (Toolbar)findViewById(R.id.toolbar);+ setSupportActionBar(toolbar);++ setTitle("");+ getSupportActionBar().setDisplayHomeAsUpEnabled(true);++ mTextLevel = (TextView)findViewById(R.id.text_display_level);+ mNumberTrigger = (ActualNumberPicker)findViewById(R.id.number_trigger_level);+ mWaveform = (SimpleWaveformExtended)findViewById(R.id.simplewaveform);++ mNumberTrigger.setMinValue(0);+ mNumberTrigger.setMaxValue(100);+ mNumberTrigger.setListener(new OnValueChangeListener() {+ @Override+ public void onValueChanged(int oldValue, int newValue) {+ mWaveform.setThreshold(newValue);+ }+ });++ mPrefManager = new PreferenceManager(this.getApplicationContext());++++ initWave();+ startAccel();+ }++ private void initWave ()+ {+ mWaveform.init();++ mWaveAmpList = new LinkedList<>();++ mWaveform.setDataList(mWaveAmpList);++ //define bar gap+ mWaveform.barGap = 30;++ //define x-axis direction+ mWaveform.modeDirection = SimpleWaveform.MODE_DIRECTION_RIGHT_LEFT;++ //define if draw opposite pole when show bars+ mWaveform.modeAmp = SimpleWaveform.MODE_AMP_ABSOLUTE;+ //define if the unit is px or percent of the view's height+ mWaveform.modeHeight = SimpleWaveform.MODE_HEIGHT_PERCENT;+ //define where is the x-axis in y-axis+ mWaveform.modeZero = SimpleWaveform.MODE_ZERO_CENTER;+ //if show bars?+ mWaveform.showBar = true;++ //define how to show peaks outline+ mWaveform.modePeak = SimpleWaveform.MODE_PEAK_ORIGIN;+ //if show peaks outline?+ mWaveform.showPeak = true;++ //show x-axis+ mWaveform.showXAxis = true;+ Paint xAxisPencil = new Paint();+ xAxisPencil.setStrokeWidth(1);+ xAxisPencil.setColor(0x88ffffff);+ mWaveform.xAxisPencil = xAxisPencil;++ //define pencil to draw bar+ Paint barPencilFirst = new Paint();+ Paint barPencilSecond = new Paint();+ Paint peakPencilFirst = new Paint();+ Paint peakPencilSecond = new Paint();++ barPencilFirst.setStrokeWidth(15);+ barPencilFirst.setColor(getResources().getColor(R.color.colorAccent));+ mWaveform.barPencilFirst = barPencilFirst;++ barPencilFirst.setStrokeWidth(15);++ barPencilSecond.setStrokeWidth(15);+ barPencilSecond.setColor(getResources().getColor(R.color.colorPrimaryDark));+ mWaveform.barPencilSecond = barPencilSecond;++ //define pencil to draw peaks outline+ peakPencilFirst.setStrokeWidth(5);+ peakPencilFirst.setColor(getResources().getColor(R.color.colorAccent));+ mWaveform.peakPencilFirst = peakPencilFirst;+ peakPencilSecond.setStrokeWidth(5);+ peakPencilSecond.setColor(getResources().getColor(R.color.colorPrimaryDark));+ mWaveform.peakPencilSecond = peakPencilSecond;+ mWaveform.firstPartNum = 0;+++ //define how to clear screen+ mWaveform.clearScreenListener = new SimpleWaveform.ClearScreenListener() {+ @Override+ public void clearScreen(Canvas canvas) {+ canvas.drawColor(Color.WHITE, PorterDuff.Mode.CLEAR);+ }+ };++ //show...+ mWaveform.refresh();+ }+ private void startAccel () {++ try {++ SensorManager sensorMgr = (SensorManager) getSystemService(Activity.SENSOR_SERVICE);+ Sensor sensor = (Sensor) sensorMgr.getDefaultSensor(Sensor.TYPE_ACCELEROMETER);++ if (sensor == null) {+ Log.i("AccelerometerFrament", "Warning: no accelerometer");+ } else {+ sensorMgr.registerListener(this, sensor, SensorManager.SENSOR_DELAY_NORMAL);++ }+++ } catch (Exception e) {+ // TODO Auto-generated catch block+ e.printStackTrace();+ }++ }++ public void onSensorChanged(SensorEvent event) {+ long curTime = System.currentTimeMillis();+ // only allow one update every 100ms.+ if (event.sensor.getType() == Sensor.TYPE_ACCELEROMETER) {+ if ((curTime - lastUpdate) > CHECK_INTERVAL) {+ long diffTime = (curTime - lastUpdate);+ lastUpdate = curTime;++ accel_values = event.values.clone();++ if (alert && remainingAlertPeriod > 0) {+ remainingAlertPeriod = remainingAlertPeriod - 1;+ } else {+ alert = false;+ }++ if (last_accel_values != null) {++ int speed = (int)(Math.abs(+ accel_values[0] + accel_values[1] + accel_values[2] -+ last_accel_values[0] + last_accel_values[1] + last_accel_values[2])+ / diffTime * 1000);++ if (speed > shakeThreshold) {+ /*+ * Send Alert+ */++ alert = true;+ remainingAlertPeriod = maxAlertPeriod;++ double averageDB = 0.0;+ if (speed != 0) {+ averageDB = 20 * Math.log10(Math.abs(speed) / 1);+ }++ if (averageDB > maxAmp) {+ maxAmp = averageDB + 5d; //add 5db buffer+ mNumberTrigger.setValue(new Integer((int)maxAmp));+ mNumberTrigger.invalidate();+ }++ mWaveAmpList.addFirst(new Integer(speed));++ if (mWaveAmpList.size() > mWaveform.width / mWaveform.barGap + 2) {+ mWaveAmpList.removeLast();+ }++ mWaveform.refresh();+ mTextLevel.setText(getString(R.string.current_accel_base) + ' ' + ((int)speed));++++ }+ }+ last_accel_values = accel_values.clone();+ }+ }+ }++ @Override+ public void onAccuracyChanged(Sensor sensor, int accuracy) {++ }+++ @Override+ protected void onDestroy() {+ super.onDestroy();++ }++ private void save ()+ {+ //mPrefManager.setMicrophoneSensitivity(mNumberTrigger.getValue()+"");++ mPrefManager.setAccelerometerSensitivity(mNumberTrigger.getValue()+"");+ finish();+ }+++ @Override+ public boolean onCreateOptionsMenu(Menu menu) {+ getMenuInflater().inflate(R.menu.monitor_start, menu);+ return true;+ }++ @Override+ public boolean onOptionsItemSelected (MenuItem item) {+ switch (item.getItemId()){+ case R.id.menu_save:+ save();+ break;+ case android.R.id.home:+ finish();+ break;+ }+ return true;+ }+}diff --git a/src/main/java/org/havenapp/main/ui/EventActivity.java b/src/main/java/org/havenapp/main/ui/EventActivity.javaindex 5cfae78..ab21879 100644--- a/src/main/java/org/havenapp/main/ui/EventActivity.java+++ b/src/main/java/org/havenapp/main/ui/EventActivity.java@@ -161,7 +161,7 @@ public class EventActivity extends AppCompatActivity {mEventLog.append("Event Triggered @ " + eventTrigger.getTriggerTime().toLocaleString()).append("\n");- String sType = eventTrigger.getStringType();+ String sType = eventTrigger.getStringType(this);mEventLog.append("Event Type: " + sType);mEventLog.append("\n==========================\n");diff --git a/src/main/java/org/havenapp/main/ui/EventTriggerAdapter.java b/src/main/java/org/havenapp/main/ui/EventTriggerAdapter.javaindex fae663c..94bf3e2 100644--- a/src/main/java/org/havenapp/main/ui/EventTriggerAdapter.java+++ b/src/main/java/org/havenapp/main/ui/EventTriggerAdapter.java@@ -63,7 +63,7 @@ public class EventTriggerAdapter extends RecyclerView.Adapter<EventTriggerAdaptefinal EventTrigger eventTrigger = eventTriggers.get(position);- String title = eventTrigger.getStringType();+ String title = eventTrigger.getStringType(context);String desc = eventTrigger.getTriggerTime().toLocaleString();holder.image.setVisibility(View.GONE);diff --git a/src/main/java/org/havenapp/main/ui/PPAppIntro.java b/src/main/java/org/havenapp/main/ui/PPAppIntro.javaindex cde5f03..8f1bfae 100644--- a/src/main/java/org/havenapp/main/ui/PPAppIntro.java+++ b/src/main/java/org/havenapp/main/ui/PPAppIntro.java@@ -47,6 +47,8 @@ public class PPAppIntro extends AppIntro {@Overridepublic void onClick(View v) {startActivity(new Intent(PPAppIntro.this,MicrophoneConfigureActivity.class));+ startActivity(new Intent(PPAppIntro.this,AccelConfigureActivity.class));+}});addSlide(cs2);diff --git a/src/main/res/drawable-hdpi/ic_vibration_white_36dp.png b/src/main/res/drawable-hdpi/ic_vibration_white_36dp.pngnew file mode 100644index 0000000..944a602Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_vibration_white_36dp.png differdiff --git a/src/main/res/drawable-mdpi/ic_vibration_white_36dp.png b/src/main/res/drawable-mdpi/ic_vibration_white_36dp.pngnew file mode 100644index 0000000..f258534Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_vibration_white_36dp.png differdiff --git a/src/main/res/drawable-xhdpi/ic_vibration_white_36dp.png b/src/main/res/drawable-xhdpi/ic_vibration_white_36dp.pngnew file mode 100644index 0000000..a0fa587Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_vibration_white_36dp.png differdiff --git a/src/main/res/drawable-xxhdpi/ic_vibration_white_36dp.png b/src/main/res/drawable-xxhdpi/ic_vibration_white_36dp.pngnew file mode 100644index 0000000..a8076d1Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_vibration_white_36dp.png differdiff --git a/src/main/res/drawable-xxxhdpi/ic_vibration_white_36dp.png b/src/main/res/drawable-xxxhdpi/ic_vibration_white_36dp.pngnew file mode 100644index 0000000..05e81c9Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_vibration_white_36dp.png differdiff --git a/src/main/res/layout/activity_accel_configure.xml b/src/main/res/layout/activity_accel_configure.xmlnew file mode 100644index 0000000..05c0a63--- /dev/null+++ b/src/main/res/layout/activity_accel_configure.xml@@ -0,0 +1,101 @@+<?xml version="1.0" encoding="utf-8"?>+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"+ xmlns:tools="http://schemas.android.com/tools"+ android:layout_width="match_parent"+ android:layout_height="match_parent"+ android:orientation="vertical"+ xmlns:app="http://schemas.android.com/apk/res-auto"+ 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" />+<LinearLayout+ android:layout_width="match_parent"+ android:layout_height="match_parent"+ android:orientation="vertical"+ android:gravity="center_vertical"+ >+++ <TextView+ android:layout_width="match_parent"+ android:layout_height="wrap_content"+ android:gravity="center"+ android:text="@string/tune_the_accel_detection"+ android:textColor="@color/colorAccent"+ android:textSize="28dp"+ android:textStyle="bold"++ android:layout_marginLeft="10dp"+ android:layout_marginRight="10dp"+ />+ <TextView+ android:layout_width="match_parent"+ android:layout_height="wrap_content"+ android:gravity="center"+ android:text="@string/tune_the_accel_detection_more"+ android:textColor="@color/colorAccent"+ android:textSize="14dp"+ android:textStyle="bold"+ android:layout_marginLeft="40dp"+ android:layout_marginRight="40dp"+++ />++ <org.havenapp.main.ui.SimpleWaveformExtended+ android:id="@+id/simplewaveform"+ android:layout_width="match_parent"+ android:layout_height="240dp"+ android:layout_margin="10dp"+ android:background="#FFFFFF"++ />++ <TextView+ android:layout_width="match_parent"+ android:layout_height="wrap_content"+ android:gravity="center"+ android:text="@string/configure_trigger_level"+ android:textColor="@color/colorAccent"++ />++ <me.angrybyte.numberpicker.view.ActualNumberPicker+ android:id="@+id/number_trigger_level"+ android:layout_width="match_parent"+ android:layout_height="48dp"+ android:layout_centerHorizontal="true"+ android:layout_marginTop="3dp"+ android:background="#FFFFFF"+ app:bar_color="@android:color/darker_gray"+ app:bar_width="1dp"+ app:draw_over_controls="true"+ app:max_value="100"+ app:min_value="0"+ app:show_text="true"+ app:show_bars="true"+ app:show_controls="false"+ app:show_fast_controls="false"+ app:text_color="@android:color/darker_gray"+ app:text_size="16sp" />++ <TextView+ android:id="@+id/text_display_level"+ android:layout_width="match_parent"+ android:layout_height="wrap_content"+ android:gravity="center"+ android:textSize="24dp"+ android:text="@string/current_noise_base"+ android:textColor="@color/colorAccent"+ android:textStyle="bold"+ android:layout_margin="15dp"+ />+</LinearLayout>+ </LinearLayout>\ No newline at end of filediff --git a/src/main/res/layout/activity_microphone_configure.xml b/src/main/res/layout/activity_microphone_configure.xmlindex 92b01dc..8469c25 100644--- a/src/main/res/layout/activity_microphone_configure.xml+++ b/src/main/res/layout/activity_microphone_configure.xml@@ -43,8 +43,8 @@android:textColor="@color/colorAccent"android:textSize="14dp"android:textStyle="bold"- android:layout_marginLeft="10dp"- android:layout_marginRight="10dp"+ android:layout_marginLeft="40dp"+ android:layout_marginRight="40dp"/>diff --git a/src/main/res/layout/activity_monitor.xml b/src/main/res/layout/activity_monitor.xmlindex 5e59517..2ea623e 100644--- a/src/main/res/layout/activity_monitor.xml+++ b/src/main/res/layout/activity_monitor.xml@@ -98,6 +98,13 @@android:src="@drawable/ic_mic_white_36dp"android:layout_margin="20dp"/>+ <ImageView+ android:id="@+id/btnAccelSettings"+ android:layout_width="wrap_content"+ android:layout_height="wrap_content"+ android:src="@drawable/ic_vibration_white_36dp"+ android:layout_margin="20dp"+ /><ImageViewandroid:id="@+id/btnSettings"android:layout_width="36dp"diff --git a/src/main/res/layout/activity_settings.xml b/src/main/res/layout/activity_settings.xmlindex 3a4fc0b..7ccb38b 100644--- a/src/main/res/layout/activity_settings.xml+++ b/src/main/res/layout/activity_settings.xml@@ -66,18 +66,18 @@android:layout_margin="6dp"/></RadioGroup>- <!--<LinearLayout- android:layout_width="match_parent"+ android:layout_width="wrap_content"android:layout_height="wrap_content"android:orientation="horizontal"android:paddingTop="10dp">+<TextView- android:id="@+id/accelerometer_prompt"- android:text="@string/accelerometer_prompt"+ android:id="@+id/microphone_prompt"+ android:text="@string/microphone_sensitivity"android:layout_alignParentLeft="true"android:layout_width="200dp"android:layout_height="wrap_content"@@ -86,9 +86,10 @@android:layout_width="wrap_content"android:layout_height="wrap_content"android:text="@string/action_configure"- android:id="@+id/action_configure_movement"++ android:id="@+id/action_configure_mic"/>-</LinearLayout>-->+</LinearLayout><LinearLayoutandroid:layout_width="wrap_content"@@ -99,23 +100,21 @@>- <TextView- android:id="@+id/microphone_prompt"- android:text="@string/microphone_sensitivity"- android:layout_alignParentLeft="true"- android:layout_width="200dp"- android:layout_height="wrap_content"- />+ <TextView+ android:id="@+id/accelerometer_prompt"+ android:text="@string/accelerometer_prompt"+ android:layout_alignParentLeft="true"+ android:layout_width="200dp"+ android:layout_height="wrap_content"+ /><Buttonandroid:layout_width="wrap_content"android:layout_height="wrap_content"android:text="@string/action_configure"- android:id="@+id/action_configure_mic"+ android:id="@+id/action_configure_accel"/>-</LinearLayout>--+ </LinearLayout><LinearLayoutandroid:layout_width="match_parent"@@ -153,34 +152,6 @@android:paddingTop="10dp"/>- <TextView- android:text="**** WARNING ADVANCED FEATURES ****"- android:layout_alignParentLeft="true"- android:layout_width="wrap_content"- android:layout_height="wrap_content"- android:textStyle="bold"- android:textColor="@color/Red"- />-- <CheckBox- android:id="@+id/remote_access_check"- android:text="@string/remote_access_label"- android:layout_width="wrap_content"- android:layout_height="wrap_content"- tools:context="org.havenapp.main.SettingsActivity" />- <EditText- android:id="@+id/remote_access_onion"- android:hint="@string/remote_access_hint"- android:layout_width="wrap_content"- android:layout_height="wrap_content"- tools:context="org.havenapp.main.SettingsActivity" />- <EditText- android:id="@+id/remote_access_credential"- android:hint="@string/remote_access_credential_hint"- android:layout_width="wrap_content"- android:layout_height="wrap_content"- android:inputType="textPassword"- tools:context="org.havenapp.main.SettingsActivity" /><LinearLayoutandroid:layout_width="match_parent"android:layout_height="wrap_content"@@ -193,7 +164,7 @@android:id="@+id/label_signal"android:text="@string/activate_signal"android:layout_alignParentLeft="true"- android:layout_width="200dp"+ android:layout_width="150dp"android:layout_height="wrap_content"/><Button@@ -222,7 +193,7 @@android:id="@+id/label_signal_status"android:text=""android:layout_alignParentLeft="true"- android:layout_width="200dp"+ android:layout_width="150dp"android:layout_height="wrap_content"/><Button@@ -233,6 +204,26 @@android:visibility="gone"/></LinearLayout>+ <CheckBox+ android:id="@+id/remote_access_check"+ android:text="@string/remote_access_label"+ android:layout_width="wrap_content"+ android:layout_height="wrap_content"+ tools:context="org.havenapp.main.SettingsActivity" />+ <EditText+ android:id="@+id/remote_access_onion"+ android:hint="@string/remote_access_hint"+ android:layout_width="wrap_content"+ android:layout_height="wrap_content"+ tools:context="org.havenapp.main.SettingsActivity" />+ <EditText+ android:id="@+id/remote_access_credential"+ android:hint="@string/remote_access_credential_hint"+ android:layout_width="wrap_content"+ android:layout_height="wrap_content"+ android:inputType="textPassword"+ tools:context="org.havenapp.main.SettingsActivity" />+</LinearLayout></ScrollView>diff --git a/src/main/res/layout/custom_slide_notify.xml b/src/main/res/layout/custom_slide_notify.xmlindex 4d09f24..62bba82 100644--- a/src/main/res/layout/custom_slide_notify.xml+++ b/src/main/res/layout/custom_slide_notify.xml@@ -23,7 +23,7 @@android:layout_height="wrap_content"android:textColor="@color/White"android:backgroundTint="@color/colorPrimaryLight"- android:hint="212 555 1212"+ android:hint="+12125551212"android:gravity="center"android:inputType="phone"android:id="@+id/editNumber"diff --git a/src/main/res/values-zh/strings.xml b/src/main/res/values-zh/strings.xmlnew file mode 100644index 0000000..da56aff--- /dev/null+++ b/src/main/res/values-zh/strings.xml@@ -0,0 +1,3 @@+<resources>++ </resources>\ No newline at end of filediff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xmlindex d96522b..096b896 100644--- a/src/main/res/values/strings.xml+++ b/src/main/res/values/strings.xml@@ -39,11 +39,11 @@</string><string name="sms_label">- Send SMS or Signal message alert when detection occurs+ Send SMS or Signal message alerts</string><string name="sms_hint">- Phone number(s) to send notification to (SMS / Signal)+ +12125551212</string><string name="unlock_code_hint">@@ -75,7 +75,7 @@<string name="secure_service_stopped">Haven Deactivated</string>- <string name="intrusion_detected">An intrusion was detected (Type: %s). Capturing audio and photo evidence now.</string>+ <string name="intrusion_detected">A Haven sensor was triggered (Type: %s)</string><string name="title_activity_event">EventActivity</string><string name="action_settings">Settings</string>@@ -107,12 +107,17 @@<string name="main_screen_title">Your Haven Log</string><string name="current_noise_base">Current noise level is</string>+ <string name="current_accel_base">Current motion level is</string>+<string name="configure_trigger_level">Slide wheel to change detection threshold</string><string name="tune_the_sound_detection">Make some noise!</string><string name="set_your_phone_on_the_table_and_make_noises_in_the_room_to_find_the_right_level_to_detect">Set your phone on the table, and make noises in the room to find the right level to detect</string>++ <string name="tune_the_accel_detection">Shake it up!</string>+ <string name="tune_the_accel_detection_more">Move your phone around to tune the motion detection threshold</string><string name="set_a_countdown_time">Tap to change countdown</string><string name="start_now">Start Now</string>- <string name="start_later">Start Later</string>+ <string name="start_later">View Logs</string><string name="save_number">Save Number</string><string name="action_cancel">Deactivate</string>@@ -140,4 +145,10 @@<string name="phone_hint">+12125551212</string><string name="menu_licenses">Licenses...</string>+ <string name="sensor_light">Ambient Light</string>+ <string name="sensor_accel">Motion (Accelerometer)</string>+ <string name="sensor_camera">Motion (Camera)</string>+ <string name="sensor_sound">Microphone</string>+ <string name="sensor_power">USB Power</string>+ <string name="sensor_unknown">Unknown</string></resources>\ No newline at end of file