Make equals() more robust

[pub/Android/ownCloud.git] / src / eu / alefzero / owncloud / datamodel / OCFile.java

diff --git a/src/eu/alefzero/owncloud/datamodel/OCFile.java b/src/eu/alefzero/owncloud/datamodel/OCFile.java
index 336f95c..6861933 100644 (file)
--- a/src/eu/alefzero/owncloud/datamodel/OCFile.java
+++ b/src/eu/alefzero/owncloud/datamodel/OCFile.java
@@ -334,8 +334,14 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
     }
 
     public boolean equals(Object o) {
-        OCFile that = (OCFile) o;
-        return this.mId == that.mId;
+        if(o instanceof OCFile){
+            OCFile that = (OCFile) o;
+            if(that != null){
+                return this.mId == that.mId;
+            }
+        }
+        
+        return false;
     }
 
     @Override