Fix Firestore move events ignoring changes (#1045)

Author: SUPERCILEX

app/src/main/java/com/firebase/uidemo/database/AbstractChat.java

@@ -11,4 +11,10 @@ public abstract class AbstractChat {
 
     public abstract String getUid();
 
+    @Override
+    public abstract int hashCode();
+
+    @Override
+    public abstract boolean equals(Object obj);
+
 }

app/src/main/java/com/firebase/uidemo/database/firestore/Chat.java

@@ -8,7 +8,6 @@
 
 @IgnoreExtraProperties
 public class Chat extends AbstractChat {
-
     private String mName;
     private String mMessage;
     private String mUid;
@@ -56,4 +55,36 @@ public Date getTimestamp() {
     public void setTimestamp(Date timestamp) {
         mTimestamp = timestamp;
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        Chat chat = (Chat) o;
+
+        return mTimestamp.equals(chat.mTimestamp)
+                && mUid.equals(chat.mUid)
+                && (mName == null ? chat.mName == null : mName.equals(chat.mName))
+                && (mMessage == null ? chat.mMessage == null : mMessage.equals(chat.mMessage));
+    }
+
+    @Override
+    public int hashCode() {
+        int result = mName == null ? 0 : mName.hashCode();
+        result = 31 * result + (mMessage == null ? 0 : mMessage.hashCode());
+        result = 31 * result + mUid.hashCode();
+        result = 31 * result + mTimestamp.hashCode();
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "Chat{" +
+                "mName='" + mName + '\'' +
+                ", mMessage='" + mMessage + '\'' +
+                ", mUid='" + mUid + '\'' +
+                ", mTimestamp=" + mTimestamp +
+                '}';
+    }
 }

app/src/main/java/com/firebase/uidemo/database/realtime/Chat.java

@@ -5,7 +5,6 @@
 
 @IgnoreExtraProperties
 public class Chat extends AbstractChat {
-
     private String mName;
     private String mMessage;
     private String mUid;
@@ -43,4 +42,33 @@ public String getUid() {
     public void setUid(String uid) {
         mUid = uid;
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        Chat chat = (Chat) o;
+
+        return mUid.equals(chat.mUid)
+                && (mName == null ? chat.mName == null : mName.equals(chat.mName))
+                && (mMessage == null ? chat.mMessage == null : mMessage.equals(chat.mMessage));
+    }
+
+    @Override
+    public int hashCode() {
+        int result = mName == null ? 0 : mName.hashCode();
+        result = 31 * result + (mMessage == null ? 0 : mMessage.hashCode());
+        result = 31 * result + mUid.hashCode();
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "Chat{" +
+                "mName='" + mName + '\'' +
+                ", mMessage='" + mMessage + '\'' +
+                ", mUid='" + mUid + '\'' +
+                '}';
+    }
 }

firestore/src/main/java/com/firebase/ui/firestore/FirestoreArray.java

@@ -110,13 +110,16 @@ private void onDocumentModified(DocumentChange change) {
             // Document modified only
             mSnapshots.set(change.getNewIndex(), change.getDocument());
             notifyOnChildChanged(ChangeEventType.CHANGED, change.getDocument(),
-                    change.getNewIndex(), change.getOldIndex());
+                    change.getNewIndex(), change.getNewIndex());
         } else {
             // Document moved and possibly also modified
             mSnapshots.remove(change.getOldIndex());
             mSnapshots.add(change.getNewIndex(), change.getDocument());
+
             notifyOnChildChanged(ChangeEventType.MOVED, change.getDocument(),
                     change.getNewIndex(), change.getOldIndex());
+            notifyOnChildChanged(ChangeEventType.CHANGED, change.getDocument(),
+                    change.getNewIndex(), change.getNewIndex());
         }
     }
 }