Fix small mistakes in FirebaseIndexArray (#412)

* Fix small mistakes

* Add @LayoutRes

Author: SUPERCILEX

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

@@ -67,15 +67,15 @@ private int getIndexForKey(String key) {
             String superKey = super.getItem(keyIndex).getKey();
             if (key.equals(superKey)) {
                 break;
-            } else if (getItem(index).getKey().equals(superKey)) {
+            } else if (mDataSnapshots.get(index).getKey().equals(superKey)) {
                 index++;
             }
         }
         return index;
     }
 
     private boolean isMatch(int index, String key) {
-        return index >= 0 && index < getCount() && getItem(index).getKey().equals(key);
+        return index >= 0 && index < getCount() && mDataSnapshots.get(index).getKey().equals(key);
     }
 
     @Override
@@ -155,10 +155,11 @@ public void onDataChange(DataSnapshot snapshot) {
                     notifyChangedListeners(OnChangedListener.EventType.CHANGED, index);
                 }
             } else {
-                Log.w(TAG, "Key not found at ref: " + snapshot.getRef());
                 if (isMatch(index, key)) {
                     mDataSnapshots.remove(index);
                     notifyChangedListeners(OnChangedListener.EventType.REMOVED, index);
+                } else {
+                    Log.w(TAG, "Key not found at ref: " + snapshot.getRef());
                 }
             }
         }

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

@@ -1,6 +1,7 @@
 package com.firebase.ui.database;
 
 import android.app.Activity;
+import android.support.annotation.LayoutRes;
 
 import com.google.firebase.database.Query;
 
@@ -41,7 +42,7 @@ public abstract class FirebaseIndexListAdapter<T> extends FirebaseListAdapter<T>
      */
     public FirebaseIndexListAdapter(Activity activity,
                                     Class<T> modelClass,
-                                    int modelLayout,
+                                    @LayoutRes int modelLayout,
                                     Query keyRef,
                                     Query dataRef) {
         super(activity, modelClass, modelLayout, new FirebaseIndexArray(keyRef, dataRef));

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

@@ -14,6 +14,7 @@
 
 package com.firebase.ui.database;
 
+import android.support.annotation.LayoutRes;
 import android.support.v7.widget.RecyclerView;
 
 import com.google.firebase.database.Query;
@@ -70,7 +71,7 @@ public abstract class FirebaseIndexRecyclerAdapter<T, VH extends RecyclerView.Vi
      *                        Each key key found at {@code keyRef}'s location represents a list item in the {@code RecyclerView}.
      */
     public FirebaseIndexRecyclerAdapter(Class<T> modelClass,
-                                        int modelLayout,
+                                        @LayoutRes int modelLayout,
                                         Class<VH> viewHolderClass,
                                         Query keyRef,
                                         Query dataRef) {

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

@@ -15,6 +15,7 @@
 package com.firebase.ui.database;
 
 import android.app.Activity;
+import android.support.annotation.LayoutRes;
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
@@ -57,7 +58,7 @@ public abstract class FirebaseListAdapter<T> extends BaseAdapter {
 
     FirebaseListAdapter(Activity activity,
                         Class<T> modelClass,
-                        int modelLayout,
+                        @LayoutRes int modelLayout,
                         FirebaseArray snapshots) {
         mModelClass = modelClass;
         mLayout = modelLayout;

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

@@ -14,6 +14,7 @@
 
 package com.firebase.ui.database;
 
+import android.support.annotation.LayoutRes;
 import android.support.v7.widget.RecyclerView;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -76,7 +77,7 @@ public abstract class FirebaseRecyclerAdapter<T, VH extends RecyclerView.ViewHol
     FirebaseArray mSnapshots;
 
     FirebaseRecyclerAdapter(Class<T> modelClass,
-                            int modelLayout,
+                            @LayoutRes int modelLayout,
                             Class<VH> viewHolderClass,
                             FirebaseArray snapshots) {
         mModelClass = modelClass;