Android: Fix .on() listeners not getting removed / called immediately on setup

BlooJeans · BlooJeans · commit f484cbdebf70 · 2016-11-01T16:14:14.000-04:00
diff --git a/android/src/main/java/io/fullstack/firestack/FirestackDatabase.java b/android/src/main/java/io/fullstack/firestack/FirestackDatabase.java
@@ -468,7 +468,8 @@ public void off(final String path, final String name, final Callback callback) {
       ref.removeChildEventListener();
     }
 
-    this.removeDBHandle(path, name);
+    String key = this.keyPath(path, name);
+    this.removeDBHandle(key);
     Log.d(TAG, "Removed listener " + name);
     WritableMap resp = Arguments.createMap();
     resp.putString("handle", path);
@@ -583,12 +584,11 @@ private void saveDBHandle(final String path,
                             final String eventName,
                             final FirestackDBReference dbRef) {
     String key = this.keyPath(path, eventName);
-    this.removeDBHandle(key, eventName);
+    this.removeDBHandle(key);
     mDBListeners.put(key, dbRef);
   }
 
-  private void removeDBHandle(final String path, final String eventName) {
-    String key = this.keyPath(path, eventName);
+  private void removeDBHandle(final String key) {
     if (mDBListeners.containsKey(key)) {
       FirestackDBReference r = mDBListeners.get(key);
       r.cleanup();
