Fix potential crashes (catch exceptions/check for nulls)

guardianproject · Sep 26, 2018 · 409b213 · 409b213
1 parent 10da388
commit 409b213
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 11 deletions.
diff --git a/src/main/java/org/havenapp/main/ListActivity.java b/src/main/java/org/havenapp/main/ListActivity.java
@@ -122,12 +122,12 @@ public void onSwiped(RecyclerView.ViewHolder viewHolder, int direction) {
         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.java
@@ -33,9 +33,13 @@ public Date getStartTime ()
     @Override
     public 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.java
@@ -114,9 +114,10 @@ private void deleteEventTrigger (final EventTrigger eventTrigger, final int posi
         {
             public void run ()
             {
-
-                new File(eventTrigger.getPath()).delete();
-                eventTrigger.delete();
+                if (eventTrigger != null) {
+                    new File(eventTrigger.getPath()).delete();
+                    eventTrigger.delete();
+                }
 
             }
         };