Merge remote-tracking branch 'CONFIDENTIAL/version-3.0.0-dev' into dev

# Conflicts:
#	database/src/main/java/com/firebase/ui/database/FirebaseArray.java

Author: SUPERCILEX

database/src/main/java/com/firebase/ui/database/FirebaseArray.java

@@ -27,8 +27,8 @@
 /**
  * This class implements a collection on top of a Firebase location.
  */
-public class FirebaseArray<T> extends CachingObservableSnapshotArray<T> implements ChildEventListener, ValueEventListener {
-
+public class FirebaseArray<T> extends CachingObservableSnapshotArray<T>
+        implements ChildEventListener, ValueEventListener {
     private Query mQuery;
     private List<DataSnapshot> mSnapshots = new ArrayList<>();
 

database/src/main/java/com/firebase/ui/database/FirebaseIndexArray.java

@@ -29,7 +29,8 @@
 import java.util.List;
 import java.util.Map;
 
-public class FirebaseIndexArray<T> extends CachingObservableSnapshotArray<T> implements ChangeEventListener {
+public class FirebaseIndexArray<T> extends CachingObservableSnapshotArray<T>
+        implements ChangeEventListener {
     private static final String TAG = "FirebaseIndexArray";
 
     private DatabaseReference mDataRef;
@@ -108,7 +109,7 @@ protected void onDestroy() {
     public void onChildChanged(ChangeEventType type, DataSnapshot snapshot, int index, int oldIndex) {
         switch (type) {
             case ADDED:
-                onKeyAdded(snapshot);
+                onKeyAdded(snapshot, index);
                 break;
             case MOVED:
                 onKeyMoved(snapshot, index, oldIndex);
@@ -176,16 +177,16 @@ private boolean isKeyAtIndex(String key, int index) {
         return index >= 0 && index < size() && mDataSnapshots.get(index).getKey().equals(key);
     }
 
-    protected void onKeyAdded(DataSnapshot data) {
+    private void onKeyAdded(DataSnapshot data, int newIndex) {
         String key = data.getKey();
         DatabaseReference ref = mDataRef.child(key);
 
         mKeysWithPendingUpdate.add(key);
         // Start listening
-        mRefs.put(ref, ref.addValueEventListener(new DataRefListener()));
+        mRefs.put(ref, ref.addValueEventListener(new DataRefListener(newIndex)));
     }
 
-    protected void onKeyMoved(DataSnapshot data, int index, int oldIndex) {
+    private void onKeyMoved(DataSnapshot data, int index, int oldIndex) {
         String key = data.getKey();
 
         // We can't use `returnOrFindIndexForKey(...)` for `oldIndex` or it might find the updated
@@ -201,7 +202,7 @@ protected void onKeyMoved(DataSnapshot data, int index, int oldIndex) {
         }
     }
 
-    protected void onKeyRemoved(DataSnapshot data, int index) {
+    private void onKeyRemoved(DataSnapshot data, int index) {
         String key = data.getKey();
         ValueEventListener listener = mRefs.remove(mDataRef.getRef().child(key));
         if (listener != null) mDataRef.child(key).removeEventListener(listener);
@@ -255,10 +256,14 @@ public String toString() {
     /**
      * A ValueEventListener attached to the joined child data.
      */
-    protected class DataRefListener implements ValueEventListener {
+    private final class DataRefListener implements ValueEventListener {
         /** Cached index to skip searching for the current index on each update */
         private int currentIndex;
 
+        public DataRefListener(int index) {
+            currentIndex = index;
+        }
+
         @Override
         public void onDataChange(DataSnapshot snapshot) {
             String key = snapshot.getKey();