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
Added an option to remove all events from the logs. Added an action in the main menu to remove all events. Removed initialCount varaible since it was in fact bound to events.size() and moved the event delete implementation (ie. to properly delete an event from disk and database, including the linked EventTrigger) into the Event class.
Nathan Patry38a625337f10
diff --git a/src/main/java/org/havenapp/main/ListActivity.java b/src/main/java/org/havenapp/main/ListActivity.javaindex dcc1d72..680c762 100644--- a/src/main/java/org/havenapp/main/ListActivity.java+++ b/src/main/java/org/havenapp/main/ListActivity.java@@ -46,13 +46,11 @@ import com.mikepenz.aboutlibraries.Libs;import com.mikepenz.aboutlibraries.LibsBuilder;import org.havenapp.main.model.Event;-import org.havenapp.main.model.EventTrigger;import org.havenapp.main.service.SignalSender;import org.havenapp.main.ui.EventActivity;import org.havenapp.main.ui.EventAdapter;import org.havenapp.main.ui.PPAppIntro;-import java.io.File;import java.text.SimpleDateFormat;import java.util.ArrayList;import java.util.Date;@@ -68,8 +66,6 @@ public class ListActivity extends AppCompatActivity {private List<Event> events = new ArrayList<>();private PreferenceManager preferences;- private long initialCount;-private int modifyPos = -1;private int REQUEST_CODE_INTRO = 1001;@@ -145,18 +141,17 @@ public class ListActivity extends AppCompatActivity {}});- initialCount = Event.count(Event.class);-if (preferences.isFirstLaunch()) {showOnboarding();}- if (initialCount > 0) {- findViewById(R.id.empty_view).setVisibility(View.GONE);- }-try {events = Event.listAll(Event.class, "id DESC");++ if (events.size() > 0) {+ findViewById(R.id.empty_view).setVisibility(View.GONE);+ }+adapter = new EventAdapter(ListActivity.this, events);recyclerView.setVisibility(View.VISIBLE);recyclerView.setAdapter(adapter);@@ -187,12 +182,7 @@ public class ListActivity extends AppCompatActivity {{public void run (){- for (EventTrigger trigger : event.getEventTriggers())- {- new File(trigger.getPath()).delete();- trigger.delete();- }-+ event.delete();}};@@ -202,7 +192,6 @@ public class ListActivity extends AppCompatActivity {adapter.notifyItemRemoved(position);event.delete();- initialCount -= 1;Snackbar.make(recyclerView, "Event deleted", Snackbar.LENGTH_SHORT).setAction("UNDO", new View.OnClickListener() {@@ -212,8 +201,6 @@ public class ListActivity extends AppCompatActivity {event.save();events.add(position, event);adapter.notifyItemInserted(position);- initialCount += 1;-}}).show();@@ -251,8 +238,7 @@ public class ListActivity extends AppCompatActivity {final long newCount = Event.count(Event.class);- if (newCount > initialCount) {-+ if (newCount > events.size()) {events = Event.listAll(Event.class, "id DESC");adapter = new EventAdapter(ListActivity.this, events);recyclerView.setAdapter(adapter);@@ -279,9 +265,6 @@ public class ListActivity extends AppCompatActivity {initialCount = newCount;**/- initialCount = newCount;--recyclerView.setVisibility(View.VISIBLE);findViewById(R.id.empty_view).setVisibility(View.GONE);}@@ -323,6 +306,9 @@ public class ListActivity extends AppCompatActivity {case R.id.action_settings:startActivity(new Intent(this,SettingsActivity.class));break;+ case R.id.action_remove_all_events:+ removeAllEvents();+ break;case R.id.action_about:showOnboarding();break;@@ -336,6 +322,42 @@ public class ListActivity extends AppCompatActivity {return true;}+ private void removeAllEvents()+ {+ final List<Event> removedEvents = new ArrayList<Event>();+ final Runnable runnableDelete = new Runnable ()+ {+ public void run ()+ {+ for (Event event : removedEvents) {+ event.delete();+ }+ }+ };++ for (int i = 0, size = events.size(); i < size; i++) {+ removedEvents.add(events.remove(0));+ adapter.notifyItemRemoved(0);+ }++ handler.postDelayed(runnableDelete, 3000);++ Snackbar.make(recyclerView, "Events deleted", Snackbar.LENGTH_SHORT)+ .setAction("UNDO", new View.OnClickListener() {+ @Override+ public void onClick(View v) {+ handler.removeCallbacks(runnableDelete);++ for (Event event : removedEvents) {+ event.save();+ events.add(event);+ adapter.notifyItemInserted(events.size() - 1);+ }+ }+ })+ .show();+ }+private void showLicenses (){new LibsBuilder()diff --git a/src/main/java/org/havenapp/main/model/Event.java b/src/main/java/org/havenapp/main/model/Event.javaindex c7e3645..617d909 100644--- a/src/main/java/org/havenapp/main/model/Event.java+++ b/src/main/java/org/havenapp/main/model/Event.java@@ -3,6 +3,7 @@ package org.havenapp.main.model;import com.orm.SugarRecord;import com.orm.dsl.Ignore;+import java.io.File;import java.util.ArrayList;import java.util.Date;import java.util.List;@@ -29,6 +30,19 @@ public class Event extends SugarRecord {return mStartTime;}+ @Override+ public boolean delete() {+ for (EventTrigger trigger : this.getEventTriggers()) {+ File file = new File(trigger.getPath());++ if (!file.delete() || !trigger.delete()) {+ return false;+ }+ }++ return super.delete();+ }+public void addEventTrigger (EventTrigger eventTrigger){mEventTriggers.add(eventTrigger);diff --git a/src/main/res/menu/menu_main.xml b/src/main/res/menu/menu_main.xmlindex 2fd35d9..32c9caa 100644--- a/src/main/res/menu/menu_main.xml+++ b/src/main/res/menu/menu_main.xml@@ -24,5 +24,9 @@android:orderInCategory="100"android:title="@string/menu_licenses"app:showAsAction="never" />+ <item+ android:id="@+id/action_remove_all_events"+ android:title="@string/remove_all_logs"+ app:showAsAction="never" /></menu>diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xmlindex f54944f..bdd794f 100644--- a/src/main/res/values-fr/strings.xml+++ b/src/main/res/values-fr/strings.xml@@ -134,6 +134,7 @@<string name="camera_sensitivity_tip">Changez de caméra ou glissez pour ajuster la sensibilité de détection de mouvement</string><string name="disable_battery_opt_title">Désactiver les optimisations de batterie</string><string name="disable_battery_opt_summary">Autoriser l\'application à fonctionner quand l\'écran est éteint</string>+ <string name="remove_all_logs">Effacer tous les enregistrements</string></resources>diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xmlindex 118ecac..62173a0 100644--- a/src/main/res/values/strings.xml+++ b/src/main/res/values/strings.xml@@ -143,6 +143,7 @@<string name="camera_sensitivity_tip">Switch camera or use the slider to adjust motion detection sensitivity</string><string name="disable_battery_opt_title">Disable Battery Optimizations</string><string name="disable_battery_opt_summary">Allow app to run when screen is off</string>+ <string name="remove_all_logs">Remove all logs</string></resources>