diff --git a/android/src/main/java/com/facebook/flipper/core/FlipperArray.java b/android/src/main/java/com/facebook/flipper/core/FlipperArray.java index fc0ccf416..b4e5e3fbf 100644 --- a/android/src/main/java/com/facebook/flipper/core/FlipperArray.java +++ b/android/src/main/java/com/facebook/flipper/core/FlipperArray.java @@ -9,6 +9,7 @@ package com.facebook.flipper.core; import java.util.ArrayList; import java.util.List; +import javax.annotation.Nullable; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; @@ -89,8 +90,12 @@ public class FlipperArray { } @Override - public boolean equals(Object o) { - return mJson.toString().equals(o.toString()); + public boolean equals(@Nullable Object o) { + if (o == null) { + return false; + } else { + return mJson.toString().equals(o.toString()); + } } @Override diff --git a/android/src/main/java/com/facebook/flipper/core/FlipperObject.java b/android/src/main/java/com/facebook/flipper/core/FlipperObject.java index 057d28b7f..aa2cf23c3 100644 --- a/android/src/main/java/com/facebook/flipper/core/FlipperObject.java +++ b/android/src/main/java/com/facebook/flipper/core/FlipperObject.java @@ -8,6 +8,7 @@ package com.facebook.flipper.core; import java.util.Arrays; +import javax.annotation.Nullable; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; @@ -82,8 +83,12 @@ public class FlipperObject { } @Override - public boolean equals(Object o) { - return mJson.toString().equals(o.toString()); + public boolean equals(@Nullable Object o) { + if (o == null) { + return false; + } else { + return mJson.toString().equals(o.toString()); + } } @Override