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

update eventtrigger list UI and add support for storing detection images

n8fr8389afc05f002
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index a05c033..195deb0 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -53,7 +53,7 @@
android:value="phoneypot.db" />
<meta-data
android:name="VERSION"
- android:value="1" />
+ android:value="2" />
<meta-data
android:name="QUERY_LOG"
android:value="true" />
diff --git a/src/main/assets/sugar_upgrades/2.sql b/src/main/assets/sugar_upgrades/2.sql
new file mode 100644
index 0000000..e995a18
--- /dev/null
+++ b/src/main/assets/sugar_upgrades/2.sql
@@ -0,0 +1 @@
+alter table EVENT_TRIGGER add PATH TEXT;
diff --git a/src/main/java/info/guardianproject/phoneypot/PreferenceManager.java b/src/main/java/info/guardianproject/phoneypot/PreferenceManager.java
index 2c34a32..95d4192 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 5000;
+ return 30000; //30 seconds
}
}
diff --git a/src/main/java/info/guardianproject/phoneypot/model/Event.java b/src/main/java/info/guardianproject/phoneypot/model/Event.java
index 596d6bc..a34b206 100644
--- a/src/main/java/info/guardianproject/phoneypot/model/Event.java
+++ b/src/main/java/info/guardianproject/phoneypot/model/Event.java
@@ -1,6 +1,7 @@
package info.guardianproject.phoneypot.model;
import com.orm.SugarRecord;
+import com.orm.dsl.Ignore;
import java.util.ArrayList;
import java.util.Date;
@@ -13,7 +14,10 @@ import java.util.List;
public class Event extends SugarRecord {
Date mStartTime;
+
+ @Ignore
ArrayList<EventTrigger> mEventTriggers;
+
public final static long EVENT_WINDOW_TIME = 1000 * 60; //1 minutes
public Event ()
diff --git a/src/main/java/info/guardianproject/phoneypot/model/EventTrigger.java b/src/main/java/info/guardianproject/phoneypot/model/EventTrigger.java
index 861a34c..ac87c82 100644
--- a/src/main/java/info/guardianproject/phoneypot/model/EventTrigger.java
+++ b/src/main/java/info/guardianproject/phoneypot/model/EventTrigger.java
@@ -14,6 +14,7 @@ public class EventTrigger extends SugarRecord {
Date mTime;
long mEventId;
+ String mPath;
/**
* Acceleration detected message
@@ -55,4 +56,57 @@ public class EventTrigger extends SugarRecord {
{
mEventId = eventId;
}
+
+ public String getPath() {
+ return mPath;
+ }
+
+ public void setPath(String mPath) {
+ this.mPath = mPath;
+ }
+
+ public String getStringType ()
+ {
+ String sType = "";
+
+ switch (getType()) {
+ case EventTrigger.ACCELEROMETER:
+ sType = "ACCELEROMETER";
+ break;
+ case EventTrigger.CAMERA:
+ sType = "CAMERA MOTION";
+ break;
+ case EventTrigger.MICROPHONE:
+ sType = "SOUND";
+ break;
+ default:
+ sType = "UNKNOWN";
+ }
+
+ return sType;
+
+ }
+
+ public String getMimeType ()
+ {
+ String sType = "";
+
+ switch (getType()) {
+ case EventTrigger.ACCELEROMETER:
+ sType = null;
+ break;
+ case EventTrigger.CAMERA:
+ sType = "image/jpeg";
+ break;
+ case EventTrigger.MICROPHONE:
+ sType = "audio/aac";
+ break;
+ default:
+ sType = null;
+ }
+
+ return sType;
+
+ }
+
}
diff --git a/src/main/java/info/guardianproject/phoneypot/sensors/media/AudioCodec.java b/src/main/java/info/guardianproject/phoneypot/sensors/media/AudioCodec.java
index b5126c0..cc0f955 100644
--- a/src/main/java/info/guardianproject/phoneypot/sensors/media/AudioCodec.java
+++ b/src/main/java/info/guardianproject/phoneypot/sensors/media/AudioCodec.java
@@ -5,6 +5,7 @@
package info.guardianproject.phoneypot.sensors.media;
+import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.util.Arrays;
import android.media.AudioFormat;
@@ -16,7 +17,7 @@ public class AudioCodec {
private AudioRecord recorder = null;
private int minSize;
-
+
/**
* Configures the recorder and starts it
* @throws IOException
@@ -35,6 +36,7 @@ public class AudioCodec {
AudioFormat.CHANNEL_IN_DEFAULT,
AudioFormat.ENCODING_PCM_16BIT,
minSize);
+
recorder.startRecording();
}
}
@@ -50,6 +52,7 @@ public class AudioCodec {
while (readBytes < 8192) {
readBytes += recorder.read(buffer, readBytes, 8192-readBytes);
}
+
short[] copyToReturn = Arrays.copyOf(buffer, 512);
Arrays.sort(buffer);
Log.e("AudioCodec", "Recorder has read: " + readBytes + " the maximum is: " +
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 76a2008..86c2f23 100644
--- a/src/main/java/info/guardianproject/phoneypot/sensors/media/AudioRecorderTask.java
+++ b/src/main/java/info/guardianproject/phoneypot/sensors/media/AudioRecorderTask.java
@@ -36,17 +36,12 @@ public class AudioRecorderTask extends Thread {
* Name of the audio file to store
*/
private String filename;
-
- /**
- * Id of the phone
- */
- private String phoneId;
/**
- * Access token to upload the audio
+ * Path of the audio file for this instance
*/
- private String accessToken;
-
+ private String audioPath;
+
/**
* True iff the thread is recording
*/
@@ -68,8 +63,6 @@ public class AudioRecorderTask extends Thread {
this.context = context;
this.prefs = new PreferenceManager(context);
this.filename = prefs.getAudioPath();
- this.phoneId = prefs.getPhoneId();
- this.accessToken = prefs.getAccessToken();
Log.i("AudioRecorderTask", "Created recorder");
}
@@ -89,15 +82,12 @@ public class AudioRecorderTask extends Thread {
recording = true;
final MediaRecorder recorder = new MediaRecorder();
-
- ContentValues values = new ContentValues(3);
- values.put(MediaStore.MediaColumns.TITLE, filename);
-
+
recorder.setAudioSource(MediaRecorder.AudioSource.MIC);
recorder.setOutputFormat(MediaRecorder.OutputFormat.MPEG_4);
recorder.setAudioEncoder(MediaRecorder.AudioEncoder.AAC);
- String audioPath = Environment.getExternalStorageDirectory().getPath() +
+ audioPath = Environment.getExternalStorageDirectory().getPath() +
filename +
".m4a";
@@ -126,4 +116,9 @@ public class AudioRecorderTask extends Thread {
}
+ public String getAudioFilePath ()
+ {
+ return audioPath;
+ }
+
}
diff --git a/src/main/java/info/guardianproject/phoneypot/sensors/media/MotionAsyncTask.java b/src/main/java/info/guardianproject/phoneypot/sensors/media/MotionAsyncTask.java
index f5c69d8..4e1df97 100644
--- a/src/main/java/info/guardianproject/phoneypot/sensors/media/MotionAsyncTask.java
+++ b/src/main/java/info/guardianproject/phoneypot/sensors/media/MotionAsyncTask.java
@@ -7,13 +7,20 @@
package info.guardianproject.phoneypot.sensors.media;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
import java.util.ArrayList;
import java.util.List;
import android.graphics.Bitmap;
import android.graphics.Color;
+import android.graphics.Rect;
+import android.graphics.YuvImage;
+import android.os.Environment;
import android.os.Handler;
import android.util.Log;
+import android.widget.Toast;
import info.guardianproject.phoneypot.sensors.motion.IMotionDetector;
import info.guardianproject.phoneypot.sensors.motion.LuminanceMotionDetector;
@@ -110,4 +117,33 @@ public class MotionAsyncTask extends Thread {
}
});
}
+
+ private void saveImage ()
+ {
+/**
+ *
+ try {
+ YuvImage image = new YuvImage(data, parameters.getPreviewFormat(),
+ size.width, size.height, null);
+
+ imageCount = (imageCount + 1)%(prefs.getMaxImages());
+
+ File file = new File(
+ Environment.getExternalStorageDirectory().getPath() +
+ prefs.getImagePath() +
+ imageCount +
+ ".jpg");
+
+ FileOutputStream filecon = new FileOutputStream(file);
+
+ image.compressToJpeg(
+ new Rect(0, 0, image.getWidth(), image.getHeight()), 90,
+ filecon);
+
+ } catch (FileNotFoundException e) {
+ Toast toast = Toast.makeText(getContext(), e.getMessage(), Toast.LENGTH_LONG);
+ toast.show();
+ }
+ */
+ }
}
diff --git a/src/main/java/info/guardianproject/phoneypot/sensors/motion/Preview.java b/src/main/java/info/guardianproject/phoneypot/sensors/motion/Preview.java
index 9123861..4ee4737 100644
--- a/src/main/java/info/guardianproject/phoneypot/sensors/motion/Preview.java
+++ b/src/main/java/info/guardianproject/phoneypot/sensors/motion/Preview.java
@@ -15,6 +15,7 @@ import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import android.content.ComponentName;
@@ -216,34 +217,8 @@ public class Preview extends SurfaceView implements SurfaceHolder.Callback {
if (now < Preview.this.lastTimestamp + 1000)
return;
if (!doingProcessing) {
-
- /**
- * Before processing the frame we save it
- * to the SDCARD
- */
- try {
- YuvImage image = new YuvImage(data, parameters.getPreviewFormat(),
- size.width, size.height, null);
-
- imageCount = (imageCount + 1)%(prefs.getMaxImages());
-
- File file = new File(
- Environment.getExternalStorageDirectory().getPath() +
- prefs.getImagePath() +
- imageCount +
- ".jpg");
-
- FileOutputStream filecon = new FileOutputStream(file);
-
- image.compressToJpeg(
- new Rect(0, 0, image.getWidth(), image.getHeight()), 90,
- filecon);
-
- } catch (FileNotFoundException e) {
- Toast toast = Toast.makeText(getContext(), e.getMessage(), Toast.LENGTH_LONG);
- toast.show();
- }
-
+
+
Log.i("Preview", "Processing new image");
Preview.this.lastTimestamp = now;
MotionAsyncTask task = new MotionAsyncTask(
@@ -269,17 +244,26 @@ public class Preview extends SurfaceView implements SurfaceHolder.Callback {
Message message = new Message();
message.what = EventTrigger.CAMERA;
- ByteArrayOutputStream stream = new ByteArrayOutputStream();
- newBitmap.compress(Bitmap.CompressFormat.JPEG, 100, stream);
- byte[] byteArray = stream.toByteArray();
-
- message.getData().putByteArray("image",byteArray);
try {
+
+ File fileImageDir = new File(Environment.getExternalStorageDirectory(),"phoneypot");
+ fileImageDir.mkdirs();
+ File fileImage = new File(fileImageDir,"detected." + new Date().getTime() + ".jpg");
+ fileImage.getParentFile().mkdirs();
+ FileOutputStream stream = new FileOutputStream(fileImage);
+ newBitmap.compress(Bitmap.CompressFormat.JPEG, 100, stream);
+ stream.flush();
+ stream.close();
+
+ message.getData().putString("path",fileImage.getAbsolutePath());
+
serviceMessenger.send(message);
- } catch (RemoteException e) {
+
+ } catch (Exception e) {
// Cannot happen
+ Log.e("Preview","error creating imnage",e);
}
}
}
diff --git a/src/main/java/info/guardianproject/phoneypot/service/MicrophoneMonitor.java b/src/main/java/info/guardianproject/phoneypot/service/MicrophoneMonitor.java
index c684787..3f94c30 100644
--- a/src/main/java/info/guardianproject/phoneypot/service/MicrophoneMonitor.java
+++ b/src/main/java/info/guardianproject/phoneypot/service/MicrophoneMonitor.java
@@ -16,6 +16,7 @@ import android.util.Log;
import info.guardianproject.phoneypot.PreferenceManager;
import info.guardianproject.phoneypot.model.EventTrigger;
+import info.guardianproject.phoneypot.sensors.media.AudioRecorderTask;
import info.guardianproject.phoneypot.sensors.media.MicSamplerTask;
import info.guardianproject.phoneypot.sensors.media.MicrophoneTaskFactory;
@@ -40,6 +41,8 @@ public final class MicrophoneMonitor implements MicSamplerTask.MicListener {
*/
private Messenger serviceMessenger = null;
+ private Context context;
+
private ServiceConnection mConnection = new ServiceConnection() {
public void onServiceConnected(ComponentName className,
@@ -58,6 +61,8 @@ public final class MicrophoneMonitor implements MicSamplerTask.MicListener {
public MicrophoneMonitor(Context context)
{
+ this.context = context;
+
prefs = new PreferenceManager(context);
if (prefs.getMicrophoneSensitivity().equals("High")) {
@@ -78,6 +83,8 @@ public final class MicrophoneMonitor implements MicSamplerTask.MicListener {
e.printStackTrace();
}
+
+
}
public void stop (Context context)
@@ -114,13 +121,24 @@ public final class MicrophoneMonitor implements MicSamplerTask.MicListener {
if (averageDB > NOISE_THRESHOLD) {
- Message message = new Message();
- message.what = EventTrigger.MICROPHONE;
- try {
- if (serviceMessenger != null)
- serviceMessenger.send(message);
- } catch (RemoteException e) {
- // Cannot happen
+
+ if (!MicrophoneTaskFactory.isRecording()) {
+ try {
+ AudioRecorderTask audioRecorderTask = MicrophoneTaskFactory.makeRecorder(context);
+ audioRecorderTask.start();
+
+ Message message = new Message();
+ message.what = EventTrigger.MICROPHONE;
+ message.getData().putString("path",audioRecorderTask.getAudioFilePath());
+ try {
+ if (serviceMessenger != null)
+ serviceMessenger.send(message);
+ } catch (RemoteException e) {
+ // Cannot happen
+ }
+ } catch (MicrophoneTaskFactory.RecordLimitExceeded rle) {
+ Log.w("MicrophoneMonitor", "We are already recording!");
+ }
}
}
}
diff --git a/src/main/java/info/guardianproject/phoneypot/service/MonitorService.java b/src/main/java/info/guardianproject/phoneypot/service/MonitorService.java
index b670de2..c0b53f9 100644
--- a/src/main/java/info/guardianproject/phoneypot/service/MonitorService.java
+++ b/src/main/java/info/guardianproject/phoneypot/service/MonitorService.java
@@ -72,7 +72,7 @@ public class MonitorService extends Service {
class MessageHandler extends Handler {
@Override
public void handleMessage(Message msg) {
- alert(msg.what);
+ alert(msg.what,msg.getData().getString("path"));
}
}
@@ -181,7 +181,7 @@ public class MonitorService extends Service {
/**
* Sends an alert according to type of connectivity
*/
- private synchronized void alert(int alertType) {
+ private synchronized void alert(int alertType, String path) {
Date now = new Date();
boolean isNewEvent = false;
@@ -205,6 +205,7 @@ public class MonitorService extends Service {
EventTrigger eventTrigger = new EventTrigger();
eventTrigger.setType(alertType);
+ eventTrigger.setPath(path);
mLastEvent.addEventTrigger(eventTrigger);
eventTrigger.save();
diff --git a/src/main/java/info/guardianproject/phoneypot/CameraFragment.java b/src/main/java/info/guardianproject/phoneypot/ui/CameraFragment.java
similarity index 96%
rename from src/main/java/info/guardianproject/phoneypot/CameraFragment.java
rename to src/main/java/info/guardianproject/phoneypot/ui/CameraFragment.java
index 99d9270..ae6f141 100644
--- a/src/main/java/info/guardianproject/phoneypot/CameraFragment.java
+++ b/src/main/java/info/guardianproject/phoneypot/ui/CameraFragment.java
@@ -6,7 +6,7 @@
* Copyright (c) 2013-2015 Marco Ziccardi, Luca Bonato
* Licensed under the MIT license.
*/
-package info.guardianproject.phoneypot;
+package info.guardianproject.phoneypot.ui;
import android.os.Bundle;
import android.graphics.Bitmap;
@@ -19,6 +19,7 @@ import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.FrameLayout;
+import info.guardianproject.phoneypot.R;
import info.guardianproject.phoneypot.sensors.media.MotionAsyncTask;
import info.guardianproject.phoneypot.sensors.media.ImageCodec;
import info.guardianproject.phoneypot.sensors.motion.Preview;
diff --git a/src/main/java/info/guardianproject/phoneypot/ui/EventActivity.java b/src/main/java/info/guardianproject/phoneypot/ui/EventActivity.java
index a3ffdd6..f49bb57 100644
--- a/src/main/java/info/guardianproject/phoneypot/ui/EventActivity.java
+++ b/src/main/java/info/guardianproject/phoneypot/ui/EventActivity.java
@@ -1,66 +1,53 @@
package info.guardianproject.phoneypot.ui;
import android.content.Intent;
+import android.net.Uri;
import android.os.Bundle;
+import android.os.StrictMode;
import android.support.design.widget.FloatingActionButton;
import android.support.design.widget.Snackbar;
import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.Toolbar;
import android.view.View;
import android.widget.TextView;
+import java.io.File;
+
+import info.guardianproject.phoneypot.ListActivity;
import info.guardianproject.phoneypot.R;
import info.guardianproject.phoneypot.model.Event;
import info.guardianproject.phoneypot.model.EventTrigger;
public class EventActivity extends AppCompatActivity {
- StringBuffer mEventLog;
+
+ private RecyclerView mRecyclerView;
+ private Event mEvent;
@Override
protected void onCreate(Bundle savedInstanceState) {
+
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_event);
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
+ StrictMode.setVmPolicy(StrictMode.VmPolicy.LAX);
+
long eventId = getIntent().getLongExtra("eventid",-1);
if (eventId != -1) {
- Event event = Event.findById(Event.class, eventId);
-
- mEventLog = new StringBuffer();
-
- setTitle("Event @ " + event.getStartTime().toLocaleString());
-
- for (EventTrigger eventTrigger : event.getEventTriggers())
- {
-
- mEventLog.append("Event Triggered @ " + eventTrigger.getTriggerTime().toLocaleString()).append("\n");
- String sType = "";
+ mEvent = Event.findById(Event.class, eventId);
+ mRecyclerView = (RecyclerView)findViewById(R.id.event_trigger_list);
- switch (eventTrigger.getType())
- {
- case EventTrigger.ACCELEROMETER:
- sType = "ACCELEROMETER";
- break;
- case EventTrigger.CAMERA:
- sType = "CAMERA MOTION";
- break;
- case EventTrigger.MICROPHONE:
- sType = "SOUND";
- break;
- default:
- sType = "UNKNOWN";
- }
-
- mEventLog.append("Event Type: " + sType);
- mEventLog.append("\n==========================\n");
- }
+ EventTriggerAdapter adapter = new EventTriggerAdapter(this, mEvent.getEventTriggers());
- TextView tvEventLog = (TextView)findViewById(R.id.event_log);
- tvEventLog.setText(mEventLog.toString());
+ LinearLayoutManager llm = new LinearLayoutManager(this);
+ mRecyclerView.setLayoutManager(llm);
+ mRecyclerView.setAdapter(adapter);
FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
fab.setOnClickListener(new View.OnClickListener() {
@@ -70,6 +57,20 @@ public class EventActivity extends AppCompatActivity {
shareEvent();
}
});
+
+ adapter.SetOnItemClickListener(new EventTriggerAdapter.OnItemClickListener() {
+ @Override
+ public void onItemClick(View view, int position) {
+
+ EventTrigger eventTrigger = mEvent.getEventTriggers().get(position);
+
+ if (eventTrigger.getPath() != null) {
+ Intent i = new Intent(Intent.ACTION_VIEW);
+ i.setDataAndType(Uri.fromFile(new File(eventTrigger.getPath())),eventTrigger.getMimeType());
+ startActivity(i);
+ }
+ }
+ });
}
else
finish();
@@ -79,7 +80,40 @@ public class EventActivity extends AppCompatActivity {
{
Intent intent = new Intent(Intent.ACTION_SEND);
intent.setType("text/plan");
- intent.putExtra(Intent.EXTRA_TEXT,mEventLog.toString());
+ intent.putExtra(Intent.EXTRA_TEXT,generateLog());
startActivity(intent);
}
+
+ private String generateLog () {
+ StringBuffer mEventLog = new StringBuffer();
+
+ setTitle("Event @ " + mEvent.getStartTime().toLocaleString());
+
+ for (EventTrigger eventTrigger : mEvent.getEventTriggers()) {
+
+ mEventLog.append("Event Triggered @ " + eventTrigger.getTriggerTime().toLocaleString()).append("\n");
+
+ String sType = "";
+
+ switch (eventTrigger.getType()) {
+ case EventTrigger.ACCELEROMETER:
+ sType = "ACCELEROMETER";
+ break;
+ case EventTrigger.CAMERA:
+ sType = "CAMERA MOTION";
+ break;
+ case EventTrigger.MICROPHONE:
+ sType = "SOUND";
+ break;
+ default:
+ sType = "UNKNOWN";
+ }
+
+ mEventLog.append("Event Type: " + sType);
+ mEventLog.append("\n==========================\n");
+ }
+
+ return mEventLog.toString();
+ }
+
}
diff --git a/src/main/java/info/guardianproject/phoneypot/ui/EventTriggerAdapter.java b/src/main/java/info/guardianproject/phoneypot/ui/EventTriggerAdapter.java
new file mode 100644
index 0000000..4deac42
--- /dev/null
+++ b/src/main/java/info/guardianproject/phoneypot/ui/EventTriggerAdapter.java
@@ -0,0 +1,89 @@
+package info.guardianproject.phoneypot.ui;
+
+import android.content.Context;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import java.util.List;
+
+import info.guardianproject.phoneypot.R;
+import info.guardianproject.phoneypot.model.Event;
+import info.guardianproject.phoneypot.model.EventTrigger;
+
+/**
+ * Created by n8fr8 on 4/16/17.
+ */
+
+public class EventTriggerAdapter extends RecyclerView.Adapter<EventTriggerAdapter.EventTriggerVH> {
+
+ Context context;
+ List<EventTrigger> eventTriggers;
+
+ OnItemClickListener clickListener;
+
+ public EventTriggerAdapter(Context context, List<EventTrigger> eventTriggers) {
+ this.context = context;
+ this.eventTriggers = eventTriggers;
+
+ }
+
+
+ @Override
+ public EventTriggerVH onCreateViewHolder(ViewGroup parent, int viewType) {
+ View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.event_item, parent, false);
+ EventTriggerVH viewHolder = new EventTriggerVH(view);
+ return viewHolder;
+ }
+
+ @Override
+ public void onBindViewHolder(EventTriggerVH holder, int position) {
+
+ EventTrigger eventTrigger = eventTriggers.get(position);
+
+ String title = eventTrigger.getStringType();
+ String desc = eventTrigger.getTriggerTime().toString();
+
+ holder.title.setText(title);
+ holder.note.setText(desc);
+
+ }
+
+ @Override
+ public int getItemCount() {
+ return eventTriggers.size();
+ }
+
+ class EventTriggerVH extends RecyclerView.ViewHolder implements View.OnClickListener {
+ TextView title, note;
+
+ public EventTriggerVH(View itemView) {
+ super(itemView);
+
+ title = (TextView) itemView.findViewById(R.id.event_item_title);
+ note = (TextView) itemView.findViewById(R.id.event_item_desc);
+
+ itemView.setOnClickListener(this);
+ }
+
+ @Override
+ public void onClick(View v) {
+
+ if (clickListener != null)
+ clickListener.onItemClick(v, getAdapterPosition());
+ }
+ }
+
+ public interface OnItemClickListener {
+ public void onItemClick(View view, int position);
+ }
+
+ public void SetOnItemClickListener(final OnItemClickListener itemClickListener) {
+ this.clickListener = itemClickListener;
+ }
+
+
+
+}
diff --git a/src/main/res/layout/activity_event.xml b/src/main/res/layout/activity_event.xml
index 0df66e7..90eb906 100644
--- a/src/main/res/layout/activity_event.xml
+++ b/src/main/res/layout/activity_event.xml
@@ -32,7 +32,12 @@
</android.support.design.widget.CollapsingToolbarLayout>
</android.support.design.widget.AppBarLayout>
- <include layout="@layout/content_event" />
+ <android.support.v7.widget.RecyclerView
+ android:id="@+id/event_trigger_list"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ tools:listitem="@layout/event_item"
+ app:layout_behavior="@string/appbar_scrolling_view_behavior" />
<android.support.design.widget.FloatingActionButton
android:id="@+id/fab"
diff --git a/src/main/res/layout/layout_running.xml b/src/main/res/layout/layout_running.xml
index d4f7a08..cef7ff1 100644
--- a/src/main/res/layout/layout_running.xml
+++ b/src/main/res/layout/layout_running.xml
@@ -5,7 +5,7 @@
android:gravity="center_vertical"
>
- <fragment class="info.guardianproject.phoneypot.CameraFragment"
+ <fragment class="info.guardianproject.phoneypot.ui.CameraFragment"
android:id="@+id/fragment_camera"
android:layout_width="match_parent"
android:layout_height="match_parent"