Bring improvements from Firestore adapter to Firebase adapters (#15)

Author: SUPERCILEX

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

@@ -16,7 +16,9 @@ interface FirebaseAdapter<T> extends ChangeEventListener, LifecycleObserver {
     /**
      * Removes listeners and clears all items in the backing {@link FirebaseArray}.
      */
-    void cleanup();
+    void stopListening();
+
+    ObservableSnapshotArray<T> getSnapshots();
 
     T getItem(int position);
 

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

@@ -28,7 +28,7 @@
 public abstract class FirebaseListAdapter<T> extends BaseAdapter implements FirebaseAdapter<T> {
     private static final String TAG = "FirebaseListAdapter";
 
-    protected final ObservableSnapshotArray<T> mSnapshots;
+    private final ObservableSnapshotArray<T> mSnapshots;
     protected final int mLayout;
 
     public FirebaseListAdapter(FirebaseListOptions<T> options) {
@@ -49,18 +49,15 @@ public void startListening() {
     }
 
     @Override
-    public void cleanup() {
+    @OnLifecycleEvent(Lifecycle.Event.ON_STOP)
+    public void stopListening() {
         mSnapshots.removeChangeEventListener(this);
+        notifyDataSetChanged();
     }
 
-    @SuppressWarnings("unused")
-    @OnLifecycleEvent(Lifecycle.Event.ON_ANY)
-    void cleanup(LifecycleOwner source, Lifecycle.Event event) {
-        if (event == Lifecycle.Event.ON_STOP) {
-            cleanup();
-        } else if (event == Lifecycle.Event.ON_DESTROY) {
-            source.getLifecycle().removeObserver(this);
-        }
+    @OnLifecycleEvent(Lifecycle.Event.ON_DESTROY)
+    void cleanup(LifecycleOwner source) {
+        source.getLifecycle().removeObserver(this);
     }
 
     @Override
@@ -80,6 +77,11 @@ public void onError(DatabaseError error) {
         Log.w(TAG, error.toException());
     }
 
+    @Override
+    public ObservableSnapshotArray<T> getSnapshots() {
+        return mSnapshots;
+    }
+
     @Override
     public T getItem(int position) {
         return mSnapshots.getObject(position);

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

@@ -27,7 +27,7 @@ public abstract class FirebaseRecyclerAdapter<T, VH extends RecyclerView.ViewHol
         extends RecyclerView.Adapter<VH> implements FirebaseAdapter<T> {
     private static final String TAG = "FirebaseRecyclerAdapter";
 
-    protected final ObservableSnapshotArray<T> mSnapshots;
+    private final ObservableSnapshotArray<T> mSnapshots;
 
     /**
      * Initialize a {@link RecyclerView.Adapter} that listens to a Firebase query. See
@@ -50,19 +50,15 @@ public void startListening() {
     }
 
     @Override
-    public void cleanup() {
+    @OnLifecycleEvent(Lifecycle.Event.ON_STOP)
+    public void stopListening() {
         mSnapshots.removeChangeEventListener(this);
         notifyDataSetChanged();
     }
 
-    @SuppressWarnings("unused")
-    @OnLifecycleEvent(Lifecycle.Event.ON_ANY)
-    void cleanup(LifecycleOwner source, Lifecycle.Event event) {
-        if (event == Lifecycle.Event.ON_STOP) {
-            cleanup();
-        } else if (event == Lifecycle.Event.ON_DESTROY) {
-            source.getLifecycle().removeObserver(this);
-        }
+    @OnLifecycleEvent(Lifecycle.Event.ON_DESTROY)
+    void cleanup(LifecycleOwner source) {
+        source.getLifecycle().removeObserver(this);
     }
 
     @Override
@@ -97,6 +93,11 @@ public void onError(DatabaseError error) {
         Log.w(TAG, error.toException());
     }
 
+    @Override
+    public ObservableSnapshotArray<T> getSnapshots() {
+        return mSnapshots;
+    }
+
     @Override
     public T getItem(int position) {
         return mSnapshots.getObject(position);