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

add countdown screen and cancel buttons - also fix a bug with persisting the audio file path

n8fr855b2bce8411c
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 76bebb9..ed18ce8 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -37,7 +37,7 @@
</intent-filter>
</activity>
<activity
- android:name=".StartActivity"
+ android:name=".SettingsActivity"
android:label="@string/title_activity_start"
android:windowSoftInputMode="stateHidden"></activity>
<activity
diff --git a/src/main/java/info/guardianproject/phoneypot/ListActivity.java b/src/main/java/info/guardianproject/phoneypot/ListActivity.java
index b085f4a..eb82dae 100644
--- a/src/main/java/info/guardianproject/phoneypot/ListActivity.java
+++ b/src/main/java/info/guardianproject/phoneypot/ListActivity.java
@@ -16,12 +16,9 @@ import android.graphics.PorterDuff;
import android.graphics.drawable.Drawable;
import android.os.Build;
import android.os.Bundle;
-import android.support.design.widget.FloatingActionButton;
import android.support.design.widget.Snackbar;
import android.support.v4.content.ContextCompat;
import android.support.v4.graphics.drawable.DrawableCompat;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.helper.ItemTouchHelper;
import android.util.Log;
@@ -32,8 +29,6 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-import info.guardianproject.phoneypot.R;
-
/**
* Created by n8fr8 on 4/16/17.
*/
@@ -104,7 +99,7 @@ public class ListActivity extends AppCompatActivity {
@Override
public void onClick(View v) {
- Intent i = new Intent(ListActivity.this, StartActivity.class);
+ Intent i = new Intent(ListActivity.this, SettingsActivity.class);
startActivity(i);
}
diff --git a/src/main/java/info/guardianproject/phoneypot/MonitorActivity.java b/src/main/java/info/guardianproject/phoneypot/MonitorActivity.java
index 4f727b4..ba5f264 100644
--- a/src/main/java/info/guardianproject/phoneypot/MonitorActivity.java
+++ b/src/main/java/info/guardianproject/phoneypot/MonitorActivity.java
@@ -13,71 +13,97 @@ import android.content.DialogInterface;
import android.content.Intent;
import android.content.res.Configuration;
import android.os.Bundle;
+import android.os.CountDownTimer;
import android.os.Handler;
+import android.support.design.widget.FloatingActionButton;
import android.support.v4.app.FragmentActivity;
import android.text.InputType;
import android.view.Menu;
import android.view.MenuItem;
+import android.view.View;
import android.widget.EditText;
+import android.widget.TextView;
import android.widget.Toast;
+import org.w3c.dom.Text;
+
import info.guardianproject.phoneypot.service.MonitorService;
public class MonitorActivity extends FragmentActivity {
private PreferenceManager preferences = null;
-
+ private TextView txtTimer;
+ private CountDownTimer cTimer;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
preferences = new PreferenceManager(getApplicationContext());
+ setContentView(R.layout.layout_running);
- setContentView(R.layout.layout_running);
+ txtTimer = (TextView)findViewById(R.id.timer_text);
+ initTimer();
- final Handler handler = new Handler();
- handler.postDelayed(new Runnable() {
+ FloatingActionButton fab = (FloatingActionButton)findViewById(R.id.fab_cancel);
+ fab.setOnClickListener(new View.OnClickListener() {
@Override
- public void run() {
- //Do something after 100ms
- startService(new Intent(MonitorActivity.this, MonitorService.class));
+ public void onClick(View v) {
+
+ if (cTimer != null) {
+ cTimer.cancel();
+ cTimer = null;
+ }
+ close();
}
- }, 10 * 1000);
+ });
+
}
+ private void initTimer ()
+ {
+ cTimer = new CountDownTimer(10000, 1000) {
+
+ public void onTick(long millisUntilFinished) {
+ // mTextField.setText("seconds remaining: " + millisUntilFinished / 1000);
+ //here you can have your logic to set text to edittext
+
+ txtTimer.setText(""+millisUntilFinished/1000);
+ }
+
+ public void onFinish() {
+
+
+ initMonitor();
+ }
+
+ };
+
+ cTimer.start();
+
-
- @Override
- public boolean onCreateOptionsMenu(Menu menu) {
- getMenuInflater().inflate(R.menu.monitor_activity, menu);
- return true;
}
-
- @Override
- public boolean onOptionsItemSelected (MenuItem item) {
- switch (item.getItemId()){
- case R.id.menu_settings:
- close();
- break;
- }
- return true;
+
+ private void initMonitor ()
+ {
+
+ //Do something after 100ms
+ startService(new Intent(MonitorActivity.this, MonitorService.class));
+
}
/**
* Closes the monitor activity and unset session properties
*/
private void close() {
- Intent intent = new Intent(
- getApplicationContext(), ListActivity.class);
- intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
- startActivity(intent);
+
stopService(new Intent(this, MonitorService.class));
preferences.unsetAccessToken();
preferences.unsetDelegatedAccessToken();
preferences.unsetPhoneId();
+ finish();
}
diff --git a/src/main/java/info/guardianproject/phoneypot/PreferenceManager.java b/src/main/java/info/guardianproject/phoneypot/PreferenceManager.java
index 95d4192..fb636a7 100644
--- a/src/main/java/info/guardianproject/phoneypot/PreferenceManager.java
+++ b/src/main/java/info/guardianproject/phoneypot/PreferenceManager.java
@@ -220,6 +220,6 @@ public class PreferenceManager {
public int getAudioLength ()
{
- return 30000; //30 seconds
+ return 15000; //30 seconds
}
}
diff --git a/src/main/java/info/guardianproject/phoneypot/StartActivity.java b/src/main/java/info/guardianproject/phoneypot/SettingsActivity.java
similarity index 90%
rename from src/main/java/info/guardianproject/phoneypot/StartActivity.java
rename to src/main/java/info/guardianproject/phoneypot/SettingsActivity.java
index 91899a3..f48f0b2 100644
--- a/src/main/java/info/guardianproject/phoneypot/StartActivity.java
+++ b/src/main/java/info/guardianproject/phoneypot/SettingsActivity.java
@@ -12,31 +12,24 @@ package info.guardianproject.phoneypot;
import java.io.File;
import android.Manifest;
-import android.app.AlertDialog;
-import android.content.DialogInterface;
-import android.content.res.Configuration;
import android.os.Bundle;
import android.os.Environment;
-import android.app.Activity;
import android.content.Intent;
import android.content.pm.PackageManager;
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.text.InputType;
import android.util.Log;
import android.view.Menu;
import android.view.MenuItem;
-import android.view.View;
-import android.widget.Button;
import android.widget.CheckBox;
import android.widget.CompoundButton;
import android.widget.EditText;
import android.widget.CompoundButton.OnCheckedChangeListener;
import android.widget.Spinner;
-public class StartActivity extends AppCompatActivity {
+public class SettingsActivity extends AppCompatActivity {
private PreferenceManager preferences = null;
@@ -163,18 +156,18 @@ public class StartActivity extends AppCompatActivity {
private void askForPermission(String permission, Integer requestCode) {
- if (ContextCompat.checkSelfPermission(StartActivity.this, permission) != PackageManager.PERMISSION_GRANTED) {
+ if (ContextCompat.checkSelfPermission(SettingsActivity.this, permission) != PackageManager.PERMISSION_GRANTED) {
// Should we show an explanation?
- if (ActivityCompat.shouldShowRequestPermissionRationale(StartActivity.this, permission)) {
+ if (ActivityCompat.shouldShowRequestPermissionRationale(SettingsActivity.this, permission)) {
//This is called if user has denied the permission before
//In this case I am just asking the permission again
- ActivityCompat.requestPermissions(StartActivity.this, new String[]{permission}, requestCode);
+ ActivityCompat.requestPermissions(SettingsActivity.this, new String[]{permission}, requestCode);
} else {
- ActivityCompat.requestPermissions(StartActivity.this, new String[]{permission}, requestCode);
+ ActivityCompat.requestPermissions(SettingsActivity.this, new String[]{permission}, requestCode);
}
} else {
}
@@ -228,10 +221,12 @@ public class StartActivity extends AppCompatActivity {
{
Intent intent = new Intent(
- StartActivity.this,
+ SettingsActivity.this,
MonitorActivity.class);
- StartActivity.this.startActivity(intent);
+ startActivity(intent);
+
+ finish();
}
diff --git a/src/main/java/info/guardianproject/phoneypot/sensors/media/AudioRecorderTask.java b/src/main/java/info/guardianproject/phoneypot/sensors/media/AudioRecorderTask.java
index 86c2f23..212f28d 100644
--- a/src/main/java/info/guardianproject/phoneypot/sensors/media/AudioRecorderTask.java
+++ b/src/main/java/info/guardianproject/phoneypot/sensors/media/AudioRecorderTask.java
@@ -68,8 +68,12 @@ public class AudioRecorderTask extends Thread {
@Override
public void run() {
-
- MicrophoneTaskFactory.pauseSampling();
+
+ audioPath = Environment.getExternalStorageDirectory().getPath() +
+ filename +
+ ".m4a";
+
+ MicrophoneTaskFactory.pauseSampling();
while (MicrophoneTaskFactory.isSampling()) {
try {
@@ -86,10 +90,6 @@ public class AudioRecorderTask extends Thread {
recorder.setAudioSource(MediaRecorder.AudioSource.MIC);
recorder.setOutputFormat(MediaRecorder.OutputFormat.MPEG_4);
recorder.setAudioEncoder(MediaRecorder.AudioEncoder.AAC);
-
- audioPath = Environment.getExternalStorageDirectory().getPath() +
- filename +
- ".m4a";
recorder.setOutputFile(audioPath);
try {
diff --git a/src/main/java/info/guardianproject/phoneypot/service/AccelerometerMonitor.java b/src/main/java/info/guardianproject/phoneypot/service/AccelerometerMonitor.java
index 17598f6..e6dcbfb 100644
--- a/src/main/java/info/guardianproject/phoneypot/service/AccelerometerMonitor.java
+++ b/src/main/java/info/guardianproject/phoneypot/service/AccelerometerMonitor.java
@@ -103,7 +103,7 @@ public class AccelerometerMonitor implements SensorEventListener {
long curTime = System.currentTimeMillis();
// only allow one update every 100ms.
if (event.sensor.getType() == Sensor.TYPE_ACCELEROMETER) {
- if ((curTime - lastUpdate) > 100) {
+ if ((curTime - lastUpdate) > 1000) {
long diffTime = (curTime - lastUpdate);
lastUpdate = curTime;
diff --git a/src/main/java/info/guardianproject/phoneypot/service/MicrophoneMonitor.java b/src/main/java/info/guardianproject/phoneypot/service/MicrophoneMonitor.java
index d685e1a..7022dc0 100644
--- a/src/main/java/info/guardianproject/phoneypot/service/MicrophoneMonitor.java
+++ b/src/main/java/info/guardianproject/phoneypot/service/MicrophoneMonitor.java
@@ -127,6 +127,12 @@ public final class MicrophoneMonitor implements MicSamplerTask.MicListener {
AudioRecorderTask audioRecorderTask = MicrophoneTaskFactory.makeRecorder(context);
audioRecorderTask.start();
+ while (audioRecorderTask.getAudioFilePath() == null)
+ {
+ try { Thread.sleep(100); }
+ catch (Exception e){}
+ }
+
Message message = new Message();
message.what = EventTrigger.MICROPHONE;
message.getData().putString("path",audioRecorderTask.getAudioFilePath());
diff --git a/src/main/res/drawable-hdpi/ic_cancel_white_24dp.png b/src/main/res/drawable-hdpi/ic_cancel_white_24dp.png
new file mode 100644
index 0000000..73f5116
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_cancel_white_24dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_cancel_white_24dp.png b/src/main/res/drawable-mdpi/ic_cancel_white_24dp.png
new file mode 100644
index 0000000..787e259
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_cancel_white_24dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_cancel_white_24dp.png b/src/main/res/drawable-xhdpi/ic_cancel_white_24dp.png
new file mode 100644
index 0000000..6ebbc83
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_cancel_white_24dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_cancel_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_cancel_white_24dp.png
new file mode 100644
index 0000000..dc32a14
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_cancel_white_24dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_cancel_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_cancel_white_24dp.png
new file mode 100644
index 0000000..dc775b2
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_cancel_white_24dp.png differ
diff --git a/src/main/res/layout/activity_start.xml b/src/main/res/layout/activity_start.xml
index a25eb4e..c5ee6d9 100644
--- a/src/main/res/layout/activity_start.xml
+++ b/src/main/res/layout/activity_start.xml
@@ -100,7 +100,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
- tools:context=".StartActivity" />
+ tools:context=".SettingsActivity" />
<EditText
android:id="@+id/phone_number"
diff --git a/src/main/res/layout/layout_running.xml b/src/main/res/layout/layout_running.xml
index cef7ff1..f66050d 100644
--- a/src/main/res/layout/layout_running.xml
+++ b/src/main/res/layout/layout_running.xml
@@ -1,13 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="vertical" android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:gravity="center_vertical"
- >
+<android.support.design.widget.CoordinatorLayout
+ android:id="@+id/main_content"
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+ <TextView
+ android:id="@+id/timer_text"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:gravity="center"
+ android:textSize="120dp"
+ android:text=""
+ />
<fragment class="info.guardianproject.phoneypot.ui.CameraFragment"
android:id="@+id/fragment_camera"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:visibility="gone"
/>
-</LinearLayout>
\ No newline at end of file
+
+
+ <android.support.design.widget.FloatingActionButton
+ android:id="@+id/fab_cancel"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="bottom|center"
+ android:layout_margin="@dimen/fab_margin"
+ android:src="@drawable/ic_cancel_white_24dp"
+ android:tint="@android:color/white" />
+
+ </android.support.design.widget.CoordinatorLayout>
\ No newline at end of file