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
Single Responsibility for EventTriggerAdapter
Arka Prava Basue19cf299b5aa
diff --git a/src/main/java/org/havenapp/main/model/Event.kt b/src/main/java/org/havenapp/main/model/Event.ktindex 1c9ad12..b577f64 100644--- a/src/main/java/org/havenapp/main/model/Event.kt+++ b/src/main/java/org/havenapp/main/model/Event.kt@@ -41,4 +41,12 @@ class Event {return mEventTriggers}++ fun getEventTriggerCount(): Int {+ if (mEventTriggers.size == 0) {+ return getEventTriggers().size+ }++ return mEventTriggers.size+ }}\ No newline at end of filediff --git a/src/main/java/org/havenapp/main/model/EventTrigger.kt b/src/main/java/org/havenapp/main/model/EventTrigger.ktindex ee687a4..2342653 100644--- a/src/main/java/org/havenapp/main/model/EventTrigger.kt+++ b/src/main/java/org/havenapp/main/model/EventTrigger.kt@@ -3,8 +3,8 @@ package org.havenapp.main.modelimport android.arch.persistence.room.ColumnInfoimport android.arch.persistence.room.Entityimport android.arch.persistence.room.PrimaryKey-import android.content.Contextimport org.havenapp.main.R+import org.havenapp.main.resources.IResourceManagerimport java.util.*/**@@ -77,19 +77,19 @@ class EventTrigger {@ColumnInfo(name = "M_PATH")var mPath: String? = null- fun getStringType(context: Context): String {+ fun getStringType(resourceManager: IResourceManager): String {var sType = ""sType = when (mType) {- ACCELEROMETER -> context.getString(R.string.sensor_accel)- LIGHT -> context.getString(R.string.sensor_light)- CAMERA -> context.getString(R.string.sensor_camera)- MICROPHONE -> context.getString(R.string.sensor_sound)- POWER -> context.getString(R.string.sensor_power)- BUMP -> context.getString(R.string.sensor_bump)- CAMERA_VIDEO -> context.getString(R.string.sensor_camera_video)- HEART -> context.getString(R.string.sensor_heartbeat)- else -> context.getString(R.string.sensor_unknown)+ ACCELEROMETER -> resourceManager.getString(R.string.sensor_accel)+ LIGHT -> resourceManager.getString(R.string.sensor_light)+ CAMERA -> resourceManager.getString(R.string.sensor_camera)+ MICROPHONE -> resourceManager.getString(R.string.sensor_sound)+ POWER -> resourceManager.getString(R.string.sensor_power)+ BUMP -> resourceManager.getString(R.string.sensor_bump)+ CAMERA_VIDEO -> resourceManager.getString(R.string.sensor_camera_video)+ HEART -> resourceManager.getString(R.string.sensor_heartbeat)+ else -> resourceManager.getString(R.string.sensor_unknown)}return sTypediff --git a/src/main/java/org/havenapp/main/service/MonitorService.java b/src/main/java/org/havenapp/main/service/MonitorService.javaindex f47ce50..9dadb79 100644--- a/src/main/java/org/havenapp/main/service/MonitorService.java+++ b/src/main/java/org/havenapp/main/service/MonitorService.java@@ -34,6 +34,7 @@ import org.havenapp.main.R;import org.havenapp.main.database.HavenEventDB;import org.havenapp.main.model.Event;import org.havenapp.main.model.EventTrigger;+import org.havenapp.main.resources.ResourceManager;import org.havenapp.main.sensors.AccelerometerMonitor;import org.havenapp.main.sensors.AmbientLightMonitor;import org.havenapp.main.sensors.BarometerMonitor;@@ -335,7 +336,8 @@ public class MonitorService extends Service {* number*/StringBuilder alertMessage = new StringBuilder();- alertMessage.append(getString(R.string.intrusion_detected, eventTrigger.getStringType(this)));+ alertMessage.append(getString(R.string.intrusion_detected,+ eventTrigger.getStringType(new ResourceManager(this))));if (mPrefs.getSignalUsername() != null) {//since this is a secure channel, we can add the Onion addressdiff --git a/src/main/java/org/havenapp/main/service/WebServer.java b/src/main/java/org/havenapp/main/service/WebServer.javaindex 1aa980d..b4cc1b6 100644--- a/src/main/java/org/havenapp/main/service/WebServer.java+++ b/src/main/java/org/havenapp/main/service/WebServer.java@@ -9,6 +9,7 @@ import org.havenapp.main.R;import org.havenapp.main.database.HavenEventDB;import org.havenapp.main.model.Event;import org.havenapp.main.model.EventTrigger;+import org.havenapp.main.resources.ResourceManager;import java.io.File;import java.io.FileInputStream;@@ -174,7 +175,7 @@ public class WebServer extends NanoHTTPD {for (EventTrigger eventTrigger: triggers){- String title = eventTrigger.getStringType(mContext);+ String title = eventTrigger.getStringType(new ResourceManager(mContext));String desc = eventTrigger.getMTime().toString();page.append("<b>");diff --git a/src/main/java/org/havenapp/main/ui/EventActivity.java b/src/main/java/org/havenapp/main/ui/EventActivity.javaindex ee30ea1..fa117a5 100644--- a/src/main/java/org/havenapp/main/ui/EventActivity.java+++ b/src/main/java/org/havenapp/main/ui/EventActivity.java@@ -7,30 +7,41 @@ import android.os.Handler;import android.os.StrictMode;import android.support.design.widget.FloatingActionButton;import android.support.design.widget.Snackbar;+import android.support.v4.content.FileProvider;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.support.v7.widget.helper.ItemTouchHelper;+import android.text.TextUtils;import android.view.MenuItem;import android.view.View;+import com.stfalcon.frescoimageviewer.ImageViewer;+import org.havenapp.main.R;import org.havenapp.main.database.HavenEventDB;import org.havenapp.main.model.Event;import org.havenapp.main.model.EventTrigger;+import org.havenapp.main.resources.IResourceManager;+import org.havenapp.main.resources.ResourceManager;import java.io.File;import java.util.ArrayList;+import java.util.List;-public class EventActivity extends AppCompatActivity {-+public class EventActivity extends AppCompatActivity implements EventTriggerAdapter.EventTriggerClickListener {+ private IResourceManager resourceManager;private RecyclerView mRecyclerView;private Event mEvent;+ private List<EventTrigger> eventTriggerList = new ArrayList<>();private Handler mHandler = new Handler();private EventTriggerAdapter mAdapter;+ private ArrayList<Uri> eventTriggerImagePaths;+ private final static String AUTHORITY = "org.havenapp.main.fileprovider";+@Overrideprotected void onCreate(Bundle savedInstanceState) {@@ -42,16 +53,22 @@ public class EventActivity extends AppCompatActivity {StrictMode.setVmPolicy(StrictMode.VmPolicy.LAX);+ resourceManager = new ResourceManager(this);+long eventId = getIntent().getLongExtra("eventid",-1);if (eventId != -1) {mEvent = HavenEventDB.getDatabase(this).getEventDAO().findById(eventId);+ eventTriggerList = mEvent.getEventTriggers();mRecyclerView = findViewById(R.id.event_trigger_list);setTitle(mEvent.getMStartTime().toLocaleString());- mAdapter = new EventTriggerAdapter(this, mEvent.getEventTriggers());+ mAdapter = new EventTriggerAdapter(this, eventTriggerList,+ resourceManager, this);++ setEventTriggerImagePaths(eventTriggerList);LinearLayoutManager llm = new LinearLayoutManager(this);mRecyclerView.setLayoutManager(llm);@@ -79,7 +96,7 @@ public class EventActivity extends AppCompatActivity {//Remove swiped item from list and notify the RecyclerViewfinal int position = viewHolder.getAdapterPosition();- final EventTrigger eventTrigger = mEvent.getEventTriggers()+ final EventTrigger eventTrigger = eventTriggerList.get(viewHolder.getAdapterPosition());deleteEventTrigger (eventTrigger, position);@@ -128,7 +145,7 @@ public class EventActivity extends AppCompatActivity {mHandler.postDelayed(runnableDelete,3000);- mEvent.getEventTriggers().remove(position);+ eventTriggerList.remove(position);mAdapter.notifyItemRemoved(position);HavenEventDB.getDatabase(EventActivity.this)@@ -142,7 +159,7 @@ public class EventActivity extends AppCompatActivity {long eventTriggerId = HavenEventDB.getDatabase(EventActivity.this).getEventTriggerDAO().insert(eventTrigger);eventTrigger.setId(eventTriggerId);- mEvent.getEventTriggers().add(position, eventTrigger);+ eventTriggerList.add(position, eventTrigger);mAdapter.notifyItemInserted(position);}})@@ -162,7 +179,7 @@ public class EventActivity extends AppCompatActivity {//has to be an ArrayListArrayList<Uri> uris = new ArrayList<>();//convert from paths to Android friendly Parcelable Uri's- for (EventTrigger trigger : mEvent.getEventTriggers())+ for (EventTrigger trigger : eventTriggerList){// ignore triggers for which we do not have valid file/file-pathsif (trigger.getMimeType() == null || trigger.getMPath() == null)@@ -182,11 +199,11 @@ public class EventActivity extends AppCompatActivity {setTitle("Event @ " + mEvent.getMStartTime().toLocaleString());- for (EventTrigger eventTrigger : mEvent.getEventTriggers()) {+ for (EventTrigger eventTrigger : eventTriggerList) {mEventLog.append("Event Triggered @ ").append(eventTrigger.getMTime().toString()).append("\n");- String sType = eventTrigger.getStringType(this);+ String sType = eventTrigger.getStringType(resourceManager);mEventLog.append("Event Type: ").append(sType);mEventLog.append("\n==========================\n");@@ -195,4 +212,63 @@ public class EventActivity extends AppCompatActivity {return mEventLog.toString();}+ @Override+ public void onVideoClick(EventTrigger eventTrigger) {+ Intent intent = new Intent(this, VideoPlayerActivity.class);+ intent.setData(Uri.parse("file://" + eventTrigger.getMPath()));+ startActivity(intent);+ }++ @Override+ public void onVideoLongClick(EventTrigger eventTrigger) {+ shareMedia(eventTrigger);+ }++ @Override+ public void onImageClick(EventTrigger eventTrigger) {+ int startPosition = 0;++ /**+ for (int i = 0; i < eventTriggerImagePaths.size(); i++) {+ if (eventTriggerImagePaths.get(i).contains(eventTrigger.getPath())) {+ startPosition = i;+ break;+ }+ }**/++ ShareOverlayView overlayView = new ShareOverlayView(this);+ ImageViewer viewer = new ImageViewer.Builder<>(this, eventTriggerImagePaths)+ .setStartPosition(startPosition)+ .setOverlayView(overlayView)+ .show();+ overlayView.setImageViewer(viewer);+ }++ @Override+ public void onImageLongClick(EventTrigger eventTrigger) {+ shareMedia(eventTrigger);+ }++ private void shareMedia (EventTrigger eventTrigger) {+ Intent shareIntent = new Intent();+ shareIntent.setAction(Intent.ACTION_SEND);+ shareIntent.putExtra(Intent.EXTRA_STREAM, Uri.fromFile(new File(eventTrigger.getMPath())));+ shareIntent.setType(eventTrigger.getMimeType());+ startActivity(shareIntent);+ }++ private void setEventTriggerImagePaths(List<EventTrigger> eventTriggerList) {+ this.eventTriggerImagePaths = new ArrayList<>();+ for (EventTrigger trigger : eventTriggerList)+ {+ if (trigger.getMType() == EventTrigger.CAMERA+ && (!TextUtils.isEmpty(trigger.getMPath())))+ {+ Uri fileUri = FileProvider.getUriForFile(this, AUTHORITY,+ new File(trigger.getMPath()));++ eventTriggerImagePaths.add(fileUri);+ }+ }+ }}diff --git a/src/main/java/org/havenapp/main/ui/EventAdapter.java b/src/main/java/org/havenapp/main/ui/EventAdapter.javaindex 10ccbee..70df2c1 100644--- a/src/main/java/org/havenapp/main/ui/EventAdapter.java+++ b/src/main/java/org/havenapp/main/ui/EventAdapter.java@@ -42,7 +42,7 @@ public class EventAdapter extends RecyclerView.Adapter<EventAdapter.EventVH> {Event event = events.get(position);String title = event.getMStartTime().toLocaleString();- String desc = event.getEventTriggers().size() + " " ++ String desc = event.getEventTriggerCount() + " " +resourceManager.getString(R.string.detection_events);holder.title.setText(title);diff --git a/src/main/java/org/havenapp/main/ui/EventTriggerAdapter.java b/src/main/java/org/havenapp/main/ui/EventTriggerAdapter.javaindex 6aec1d5..60c05d5 100644--- a/src/main/java/org/havenapp/main/ui/EventTriggerAdapter.java+++ b/src/main/java/org/havenapp/main/ui/EventTriggerAdapter.java@@ -1,14 +1,13 @@package org.havenapp.main.ui;import android.content.Context;-import android.content.Intent;import android.graphics.drawable.BitmapDrawable;import android.media.ThumbnailUtils;import android.net.Uri;import android.provider.MediaStore;+import android.support.annotation.NonNull;import android.support.v4.content.FileProvider;import android.support.v7.widget.RecyclerView;-import android.text.TextUtils;import android.view.LayoutInflater;import android.view.View;import android.view.ViewGroup;@@ -18,13 +17,12 @@ import android.widget.VideoView;import com.github.derlio.waveform.SimpleWaveformView;import com.github.derlio.waveform.soundfile.SoundFile;-import com.stfalcon.frescoimageviewer.ImageViewer;import org.havenapp.main.R;import org.havenapp.main.model.EventTrigger;+import org.havenapp.main.resources.IResourceManager;import java.io.File;-import java.util.ArrayList;import java.util.List;import nl.changer.audiowife.AudioWife;@@ -36,47 +34,35 @@ import nl.changer.audiowife.AudioWife;public class EventTriggerAdapter extends RecyclerView.Adapter<EventTriggerAdapter.EventTriggerVH> {private Context context;+ private IResourceManager resourceManager;private List<EventTrigger> eventTriggers;- private ArrayList<Uri> eventTriggerImagePaths;- private OnItemClickListener clickListener;+ private EventTriggerClickListener eventTriggerClickListener;private final static String AUTHORITY = "org.havenapp.main.fileprovider";- public EventTriggerAdapter(Context context, List<EventTrigger> eventTriggers) {+ public EventTriggerAdapter(Context context, List<EventTrigger> eventTriggers,+ IResourceManager resourceManager, EventTriggerClickListener eventTriggerClickListener) {this.context = context;+ this.resourceManager = resourceManager;this.eventTriggers = eventTriggers;-- this.eventTriggerImagePaths = new ArrayList<>();- for (EventTrigger trigger : eventTriggers)- {- if (trigger.getMType() == EventTrigger.CAMERA- && (!TextUtils.isEmpty(trigger.getMPath())))- {- Uri fileUri = FileProvider.getUriForFile(- context,- AUTHORITY,- new File(trigger.getMPath()));-- eventTriggerImagePaths.add(fileUri);- }- }+ this.eventTriggerClickListener = eventTriggerClickListener;}@Override- public EventTriggerVH onCreateViewHolder(ViewGroup parent, int viewType) {+ public EventTriggerVH onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_event, parent, false);return new EventTriggerVH(view);}@Override- public void onBindViewHolder(EventTriggerVH holder, int position) {+ public void onBindViewHolder(@NonNull EventTriggerVH holder, int position) {final EventTrigger eventTrigger = eventTriggers.get(position);- String title = eventTrigger.getStringType(context);+ String title = eventTrigger.getStringType(resourceManager);String desc = eventTrigger.getMTime().toLocaleString();holder.image.setVisibility(View.GONE);@@ -94,21 +80,17 @@ public class EventTriggerAdapter extends RecyclerView.Adapter<EventTriggerAdapteThumbnailUtils.createVideoThumbnail(eventTrigger.getMPath(),MediaStore.Video.Thumbnails.FULL_SCREEN_KIND));holder.video.setBackground(bitmapD);- holder.video.setOnClickListener(new View.OnClickListener() {- @Override- public void onClick(View view) {- Intent intent = new Intent(context, VideoPlayerActivity.class);- intent.setData(Uri.parse("file://" + eventTrigger.getMPath()));- context.startActivity(intent);+ holder.video.setOnClickListener(view -> {+ if (eventTriggerClickListener != null) {+ eventTriggerClickListener.onVideoClick(eventTrigger);}});- holder.video.setOnLongClickListener(new View.OnLongClickListener() {- @Override- public boolean onLongClick(View view) {- shareMedia(eventTrigger);- return false;+ holder.video.setOnLongClickListener(view -> {+ if (eventTriggerClickListener != null) {+ eventTriggerClickListener.onVideoLongClick(eventTrigger);}+ return false;});break;case EventTrigger.CAMERA:@@ -118,33 +100,16 @@ public class EventTriggerAdapter extends RecyclerView.Adapter<EventTriggerAdaptecontext,AUTHORITY,new File(eventTrigger.getMPath()));- //Picasso.get().load(fileUri).into(holder.image);holder.image.setImageURI(fileUri);holder.image.setOnClickListener(view -> {-- int startPosition = 0;-- /**- for (int i = 0; i < eventTriggerImagePaths.size(); i++) {- if (eventTriggerImagePaths.get(i).contains(eventTrigger.getPath())) {- startPosition = i;- break;- }- }**/-- ShareOverlayView overlayView = new ShareOverlayView(context);- ImageViewer viewer = new ImageViewer.Builder(context, eventTriggerImagePaths)- .setStartPosition(startPosition)- .setOverlayView(overlayView)- .show();- overlayView.setImageViewer(viewer);--+ if (eventTriggerClickListener != null)+ eventTriggerClickListener.onImageClick(eventTrigger);});holder.image.setOnLongClickListener(view -> {- shareMedia(eventTrigger);+ if (eventTriggerClickListener != null)+ eventTriggerClickListener.onImageLongClick(eventTrigger);return false;});break;@@ -183,18 +148,18 @@ public class EventTriggerAdapter extends RecyclerView.Adapter<EventTriggerAdaptebreak;case EventTrigger.ACCELEROMETER:- desc += "\n" + context.getString(R.string.data_speed) + ": " + eventTrigger.getMPath();+ desc += "\n" + resourceManager.getString(R.string.data_speed) + ": " + eventTrigger.getMPath();break;case EventTrigger.LIGHT:- desc += "\n" + context.getString(R.string.data_light) + ": " + eventTrigger.getMPath();+ desc += "\n" + resourceManager.getString(R.string.data_light) + ": " + eventTrigger.getMPath();break;case EventTrigger.PRESSURE:- desc += "\n" + context.getString(R.string.data_pressure) + ": " + eventTrigger.getMPath();+ desc += "\n" + resourceManager.getString(R.string.data_pressure) + ": " + eventTrigger.getMPath();break;case EventTrigger.POWER:- desc += "\n" + context.getString(R.string.data_power) + ": " + eventTrigger.getMPath();+ desc += "\n" + resourceManager.getString(R.string.data_power) + ": " + eventTrigger.getMPath();break;}@@ -207,29 +172,18 @@ public class EventTriggerAdapter extends RecyclerView.Adapter<EventTriggerAdapte}@Override- public void onDetachedFromRecyclerView(RecyclerView recyclerView) {+ public void onDetachedFromRecyclerView(@NonNull RecyclerView recyclerView) {super.onDetachedFromRecyclerView(recyclerView);AudioWife.getInstance().release();}- private void shareMedia (EventTrigger eventTrigger)- {-- Intent shareIntent = new Intent();- shareIntent.setAction(Intent.ACTION_SEND);- shareIntent.putExtra(Intent.EXTRA_STREAM, Uri.fromFile(new File(eventTrigger.getMPath())));- shareIntent.setType(eventTrigger.getMimeType());-- context.startActivity(shareIntent);- }-@Overridepublic int getItemCount() {return eventTriggers.size();}- class EventTriggerVH extends RecyclerView.ViewHolder implements View.OnClickListener {+ class EventTriggerVH extends RecyclerView.ViewHolder {TextView title, note;ImageView image;VideoView video;@@ -244,25 +198,17 @@ public class EventTriggerAdapter extends RecyclerView.Adapter<EventTriggerAdaptevideo = itemView.findViewById(R.id.event_item_video);extra = itemView.findViewById(R.id.event_item_extra);sound = itemView.findViewById(R.id.event_item_sound);- 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 interface EventTriggerClickListener {+ void onVideoClick(EventTrigger eventTrigger);- public void SetOnItemClickListener(final OnItemClickListener itemClickListener) {- this.clickListener = itemClickListener;- }+ void onVideoLongClick(EventTrigger eventTrigger);+ void onImageClick(EventTrigger eventTrigger);+ void onImageLongClick(EventTrigger eventTrigger);+ }}