Bring Java responses more in line with iOS

Author: chrisbianca

android/src/main/java/io/fullstack/firestack/database/FirestackDatabase.java

@@ -159,7 +159,7 @@ public void onComplete(DatabaseError error, DatabaseReference ref) {
     } else {
       Log.d(TAG, "No value passed to push: " + newPath);
       WritableMap res = Arguments.createMap();
-      res.putString("result", "success");
+      res.putString("status", "success");
       res.putString("ref", newPath);
       callback.invoke(null, res);
     }
@@ -180,7 +180,7 @@ public void on(final String path,
     }
 
     WritableMap resp = Arguments.createMap();
-    resp.putString("result", "success");
+    resp.putString("status", "success");
     resp.putString("handle", path);
     callback.invoke(null, resp);
   }
@@ -205,13 +205,31 @@ public void onOnce(final String path,
   public void off(
           final String path,
           final String modifiersString,
-          @Deprecated final String name,
+          final String name,
           final Callback callback) {
-    this.removeDBHandle(path, modifiersString);
+
+    String key = this.getDBListenerKey(path, modifiersString);
+    FirestackDatabaseReference r = mDBListeners.get(key);
+
+    if (r != null) {
+      if (name == null || "".equals(name)) {
+        r.cleanup();
+        mDBListeners.remove(key);
+      } else {
+        //TODO: Remove individual listeners as per iOS code
+        //1) Remove event handler
+        //2) If no more listeners, remove from listeners map
+        r.cleanup();
+        mDBListeners.remove(key);
+      }
+    }
+
     Log.d(TAG, "Removed listener " + path + "/" + modifiersString);
     WritableMap resp = Arguments.createMap();
     resp.putString("handle", path);
-    resp.putString("result", "success");
+    resp.putString("status", "success");
+    resp.putString("modifiersString", modifiersString);
+    //TODO: Remaining listeners
     callback.invoke(null, resp);
   }
 
@@ -304,14 +322,4 @@ private FirestackDatabaseReference getDBHandle(final String path,
   private String getDBListenerKey(String path, String modifiersString) {
     return path + " | " + modifiersString;
   }
-
-  private void removeDBHandle(final String path, String modifiersString) {
-    String key = this.getDBListenerKey(path, modifiersString);
-    FirestackDatabaseReference r = mDBListeners.get(key);
-
-    if (r != null) {
-      r.cleanup();
-      mDBListeners.remove(key);
-    }
-  }
 }

android/src/main/java/io/fullstack/firestack/database/FirestackDatabaseReference.java

@@ -92,7 +92,7 @@ public void onCancelled(DatabaseError error) {
       Log.d(TAG, "Added ValueEventListener for path: " + mPath + " with modifiers: "+ mModifiersString);
       //this.setListeningTo(mPath, modifiersString, "value");
     } else {
-      Log.w(TAG, "trying to add duplicate ValueEventListener for path: " + mPath + " with modifiers: "+ mModifiersString);
+      Log.w(TAG, "Trying to add duplicate ValueEventListener for path: " + mPath + " with modifiers: "+ mModifiersString);
     }
   }