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

improve the delete / undo capability

n8fr84ba04361115c
diff --git a/src/main/java/info/guardianproject/phoneypot/ListActivity.java b/src/main/java/info/guardianproject/phoneypot/ListActivity.java
index 8fbb1b5..88b1144 100644
--- a/src/main/java/info/guardianproject/phoneypot/ListActivity.java
+++ b/src/main/java/info/guardianproject/phoneypot/ListActivity.java
@@ -1,5 +1,6 @@
package info.guardianproject.phoneypot;
+import android.os.Handler;
import android.support.design.widget.FloatingActionButton;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.RecyclerView;
@@ -31,6 +32,7 @@ import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.TimerTask;
/**
* Created by n8fr8 on 4/16/17.
@@ -50,6 +52,9 @@ public class ListActivity extends AppCompatActivity {
int REQUEST_CODE_INTRO = 1001;
+
+ private Handler handler = new Handler();
+
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -81,35 +86,14 @@ public class ListActivity extends AppCompatActivity {
final int position = viewHolder.getAdapterPosition();
final Event event = events.get(viewHolder.getAdapterPosition());
- for (EventTrigger trigger : event.getEventTriggers())
- {
- new File(trigger.getPath()).delete();
- trigger.delete();
- }
+ deleteEvent (event, position);
- events.remove(viewHolder.getAdapterPosition());
- adapter.notifyItemRemoved(position);
- event.delete();
- initialCount -= 1;
-
- Snackbar.make(recyclerView, "Event deleted", Snackbar.LENGTH_SHORT)
- .setAction("UNDO", new View.OnClickListener() {
- @Override
- public void onClick(View v) {
-
- event.save();
- events.add(position, event);
- adapter.notifyItemInserted(position);
- initialCount += 1;
-
- }
- })
- .show();
}
};
+
ItemTouchHelper itemTouchHelper = new ItemTouchHelper(simpleCallback);
itemTouchHelper.attachToRecyclerView(recyclerView);
@@ -172,6 +156,45 @@ public class ListActivity extends AppCompatActivity {
}
+ private void deleteEvent (final Event event, final int position)
+ {
+
+ final Runnable runnableDelete = new Runnable ()
+ {
+ public void run ()
+ {
+ for (EventTrigger trigger : event.getEventTriggers())
+ {
+ new File(trigger.getPath()).delete();
+ trigger.delete();
+ }
+
+ }
+ };
+
+ handler.postDelayed(runnableDelete,3000);
+
+ events.remove(position);
+ adapter.notifyItemRemoved(position);
+
+ event.delete();
+ initialCount -= 1;
+
+ Snackbar.make(recyclerView, "Event deleted", Snackbar.LENGTH_SHORT)
+ .setAction("UNDO", new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ handler.removeCallbacks(runnableDelete);
+ event.save();
+ events.add(position, event);
+ adapter.notifyItemInserted(position);
+ initialCount += 1;
+
+ }
+ })
+ .show();
+ }
+
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
diff --git a/src/main/java/info/guardianproject/phoneypot/ui/EventActivity.java b/src/main/java/info/guardianproject/phoneypot/ui/EventActivity.java
index 0fb0094..8a49bb9 100644
--- a/src/main/java/info/guardianproject/phoneypot/ui/EventActivity.java
+++ b/src/main/java/info/guardianproject/phoneypot/ui/EventActivity.java
@@ -60,20 +60,7 @@ public class EventActivity extends AppCompatActivity {
}
});
- /**
- 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();