Skip to content

Commit 409b213

Browse files
committed
Fix potential crashes (catch exceptions/check for nulls)
1 parent 10da388 commit 409b213

File tree

3 files changed

+16
-11
lines changed

3 files changed

+16
-11
lines changed

src/main/java/org/havenapp/main/ListActivity.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -122,12 +122,12 @@ public void onSwiped(RecyclerView.ViewHolder viewHolder, int direction) {
122122
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
123123

124124
Drawable drawable = ContextCompat.getDrawable(this, R.drawable.ic_play_arrow);
125-
drawable = DrawableCompat.wrap(drawable);
126-
DrawableCompat.setTint(drawable, Color.WHITE);
127-
DrawableCompat.setTintMode(drawable, PorterDuff.Mode.SRC_IN);
128-
129-
fab.setImageDrawable(drawable);
130-
125+
if (drawable != null) {
126+
drawable = DrawableCompat.wrap(drawable);
127+
DrawableCompat.setTint(drawable, Color.WHITE);
128+
DrawableCompat.setTintMode(drawable, PorterDuff.Mode.SRC_IN);
129+
fab.setImageDrawable(drawable);
130+
}
131131
}
132132

133133

src/main/java/org/havenapp/main/model/Event.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,13 @@ public Date getStartTime ()
3333
@Override
3434
public boolean delete() {
3535
for (EventTrigger trigger : this.getEventTriggers()) {
36-
File file = new File(trigger.getPath());
36+
try {
37+
File file = new File(trigger.getPath());
3738

38-
if (!file.delete() || !trigger.delete()) {
39+
if (!file.delete() || !trigger.delete()) {
40+
return false;
41+
}
42+
} catch (NullPointerException e) {
3943
return false;
4044
}
4145
}

src/main/java/org/havenapp/main/ui/EventActivity.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,10 @@ private void deleteEventTrigger (final EventTrigger eventTrigger, final int posi
114114
{
115115
public void run ()
116116
{
117-
118-
new File(eventTrigger.getPath()).delete();
119-
eventTrigger.delete();
117+
if (eventTrigger != null) {
118+
new File(eventTrigger.getPath()).delete();
119+
eventTrigger.delete();
120+
}
120121

121122
}
122123
};

0 commit comments

Comments
 (0)