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
Fix potential crashes (catch exceptions/check for nulls)
fattire409b213a84bf
diff --git a/src/main/java/org/havenapp/main/ListActivity.java b/src/main/java/org/havenapp/main/ListActivity.javaindex bc9bb87..61e49ce 100644--- a/src/main/java/org/havenapp/main/ListActivity.java+++ b/src/main/java/org/havenapp/main/ListActivity.java@@ -122,12 +122,12 @@ public class ListActivity extends AppCompatActivity {if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {Drawable drawable = ContextCompat.getDrawable(this, R.drawable.ic_play_arrow);- drawable = DrawableCompat.wrap(drawable);- DrawableCompat.setTint(drawable, Color.WHITE);- DrawableCompat.setTintMode(drawable, PorterDuff.Mode.SRC_IN);-- fab.setImageDrawable(drawable);-+ if (drawable != null) {+ drawable = DrawableCompat.wrap(drawable);+ DrawableCompat.setTint(drawable, Color.WHITE);+ DrawableCompat.setTintMode(drawable, PorterDuff.Mode.SRC_IN);+ fab.setImageDrawable(drawable);+ }}diff --git a/src/main/java/org/havenapp/main/model/Event.java b/src/main/java/org/havenapp/main/model/Event.javaindex 617d909..7c2029f 100644--- a/src/main/java/org/havenapp/main/model/Event.java+++ b/src/main/java/org/havenapp/main/model/Event.java@@ -33,9 +33,13 @@ public class Event extends SugarRecord {@Overridepublic boolean delete() {for (EventTrigger trigger : this.getEventTriggers()) {- File file = new File(trigger.getPath());+ try {+ File file = new File(trigger.getPath());- if (!file.delete() || !trigger.delete()) {+ if (!file.delete() || !trigger.delete()) {+ return false;+ }+ } catch (NullPointerException e) {return false;}}diff --git a/src/main/java/org/havenapp/main/ui/EventActivity.java b/src/main/java/org/havenapp/main/ui/EventActivity.javaindex b55f714..6ddb799 100644--- a/src/main/java/org/havenapp/main/ui/EventActivity.java+++ b/src/main/java/org/havenapp/main/ui/EventActivity.java@@ -114,9 +114,10 @@ public class EventActivity extends AppCompatActivity {{public void run (){-- new File(eventTrigger.getPath()).delete();- eventTrigger.delete();+ if (eventTrigger != null) {+ new File(eventTrigger.getPath()).delete();+ eventTrigger.delete();+ }}};