Merge branch 'master' of github.com:fullstackreact/react-native-firestack

auser · auser · commit 226bce3cd562 · 2016-10-21T17:39:17.000+01:00
* 'master' of github.com:fullstackreact/react-native-firestack:
  Fixed provider google on Android (was missing)
  Implement android ServerValue.TIMESTAMP
  Cast firebase long's to doubles
  Update README.md
  Update Android status
  Allow removal of specific callbacks from query listeners
diff --git a/README.md b/README.md
@@ -592,23 +592,33 @@ storageRef.downloadUrl()
 
 ### Realtime Database
 
-#### database attribute
-
 The native Firebase JavaScript library provides a featureful realtime database that works out of the box. Firestack provides an attribute to interact with the database without needing to configure the JS library.
 
+#### DatabaseRef
+
+Firestack attempts to provide the same API as the JS Firebase library for both Android and iOS platforms. [Check out the firebase guide](https://firebase.google.com/docs/database/web/read-and-write) for more information on how to use the JS library.
+
+#### Example
+
 ```javascript
-firestack.database
-      .ref(LIST_KEY)
-      .on('value', snapshot => {
-        if (snapshot.val()) {
-          console.log('The list was updated');
-        }
-      });
-```
 
-#### DatabaseRef
+function handleValueChange(snapshot) {
+  if (snapshot.val()) {
+    console.log('The list was updated');
+  }
+}
+
+const LIST_KEY = 'path/to/data';
+firestack.database.ref(LIST_KEY).on('value', handleValueChange);
 
-Firestack attempts to provide the same API as the JS Firebase library for both Android and iOS platforms.
+// Calling `.off` with a reference to the callback function will only remove that specific listener.
+// This is useful if multiple components are listening and unlistening to the same ref path.
+firestack.database.ref(LIST_KEY).off('value', handleValueChange);
+
+// Calling `.off` without passing the callback function will remove *all* 'value' listeners for that ref
+firestack.database.ref(LIST_KEY).off('value');
+
+```
 
 // TODO: Finish documenting
 
@@ -774,8 +784,8 @@ The following is left to be done:
 
 - [x] Complete FirebaseModule functionality
 - [ ] Document FirebaseModule
-- [ ] Add Android support
-  - in progress
+- [X] Add Android support
+  - auth/analytics/database/storage/presence are feature-complete. remoteconfig/messaging are mostly-there.
 - [x] Add Cloud Messaging
   - [ ] Add JS api
 - [ ] Move to use swift (cleaner syntax)
diff --git a/android/src/main/java/io/fullstack/firestack/FirestackAuth.java b/android/src/main/java/io/fullstack/firestack/FirestackAuth.java
@@ -138,6 +138,8 @@ public void onComplete(@NonNull Task<AuthResult> task) {
     public void signInWithProvider(final String provider, final String authToken, final String authSecret, final Callback callback) {
       if (provider.equals("facebook")) {
            this.facebookLogin(authToken,callback);
+      } else if (provider.equals("google")) {
+           this.googleLogin(authToken,callback);
       } else
       // TODO
       FirestackUtils.todoNote(TAG, "signInWithProvider", callback);
diff --git a/android/src/main/java/io/fullstack/firestack/FirestackDatabase.java b/android/src/main/java/io/fullstack/firestack/FirestackDatabase.java
@@ -682,8 +682,8 @@ private <Any> Any castSnapshotValue(DataSnapshot snapshot) {
           case "java.lang.Boolean":
             data.putBoolean(child.getKey(), (Boolean) castedChild);
             break;
-          case "java.lang.Integer":
-            data.putInt(child.getKey(), (Integer) castedChild);
+          case "java.lang.Long":
+            data.putDouble(child.getKey(), (Long) castedChild);
             break;
           case "java.lang.Double":
             data.putDouble(child.getKey(), (Double) castedChild);
@@ -704,7 +704,7 @@ private <Any> Any castSnapshotValue(DataSnapshot snapshot) {
           case "java.lang.Boolean":
             return (Any)((Boolean) snapshot.getValue());
           case "java.lang.Long":
-            return (Any)((Integer)(((Long) snapshot.getValue()).intValue()));
+            return (Any) ((Long) snapshot.getValue());
           case "java.lang.Double":
             return (Any)((Double) snapshot.getValue());
           case "java.lang.String":
diff --git a/android/src/main/java/io/fullstack/firestack/FirestackModule.java b/android/src/main/java/io/fullstack/firestack/FirestackModule.java
@@ -178,9 +178,13 @@ public String setKeyOrDefault(
 
   @ReactMethod
   public void serverValue(@Nullable final Callback onComplete) {
+    WritableMap timestampMap = Arguments.createMap();
+    for (Map.Entry<String, String> entry : ServerValue.TIMESTAMP.entrySet()) {
+      timestampMap.putString(entry.getKey(), entry.getValue());
+    }
+
     WritableMap map = Arguments.createMap();
-    // TODO
-    map.putString("TIMESTAMP", "ServerValue.TIMESTAMP");
+    map.putMap("TIMESTAMP", timestampMap);
     onComplete.invoke(null, map);
   }
 
diff --git a/android/src/main/java/io/fullstack/firestack/FirestackUtils.java b/android/src/main/java/io/fullstack/firestack/FirestackUtils.java
@@ -58,25 +58,27 @@ public static WritableMap dataSnapshotToMap(String name,
       data.putBoolean("hasChildren", dataSnapshot.hasChildren());
 
       data.putDouble("childrenCount", dataSnapshot.getChildrenCount());
-      if (!dataSnapshot.hasChildren() && dataSnapshot.getValue() != null) {
-        String type = dataSnapshot.getValue().getClass().getName();
+      if (!dataSnapshot.hasChildren()) {
+        Object value = dataSnapshot.getValue();
+        String type = value!=null ? value.getClass().getName() : "";
         switch (type) {
           case "java.lang.Boolean":
-            data.putBoolean("value", (Boolean) dataSnapshot.getValue());
+            data.putBoolean("value", (Boolean)value);
             break;
           case "java.lang.Long":
-            data.putInt("value",(Integer)(((Long) dataSnapshot.getValue()).intValue()));
+            Long longVal = (Long) value;
+            data.putDouble("value", (double)longVal);
             break;
           case "java.lang.Double":
-            data.putDouble("value",(Double) dataSnapshot.getValue());
+            data.putDouble("value", (Double) value);
             break;
           case "java.lang.String":
-            data.putString("value",(String) dataSnapshot.getValue());
+            data.putString("value",(String) value);
             break;
           default:
             data.putString("value", null);
         }
-      }else{
+      } else{
         WritableMap valueMap = FirestackUtils.castSnapshotValue(dataSnapshot);
         data.putMap("value", valueMap);
       }
@@ -104,8 +106,9 @@ public static <Any> Any castSnapshotValue(DataSnapshot snapshot) {
           case "java.lang.Boolean":
             data.putBoolean(child.getKey(), (Boolean) castedChild);
             break;
-          case "java.lang.Integer":
-            data.putInt(child.getKey(), (Integer) castedChild);
+          case "java.lang.Long":
+            Long longVal = (Long) castedChild;
+            data.putDouble(child.getKey(), (double)longVal);
             break;
           case "java.lang.Double":
             data.putDouble(child.getKey(), (Double) castedChild);
@@ -116,6 +119,9 @@ public static <Any> Any castSnapshotValue(DataSnapshot snapshot) {
           case "com.facebook.react.bridge.WritableNativeMap":
             data.putMap(child.getKey(), (WritableMap) castedChild);
             break;
+          default:
+            Log.w(TAG, "Invalid type: "+type);
+            break;
         }
       }
       return (Any) data;
@@ -124,19 +130,19 @@ public static <Any> Any castSnapshotValue(DataSnapshot snapshot) {
         String type = snapshot.getValue().getClass().getName();
         switch (type) {
           case "java.lang.Boolean":
-            return (Any)((Boolean) snapshot.getValue());
+            return (Any)(snapshot.getValue());
           case "java.lang.Long":
-            return (Any)((Integer)(((Long) snapshot.getValue()).intValue()));
+            return (Any)(snapshot.getValue());
           case "java.lang.Double":
-            return (Any)((Double) snapshot.getValue());
+            return (Any)(snapshot.getValue());
           case "java.lang.String":
-            return (Any)((String) snapshot.getValue());
+            return (Any)(snapshot.getValue());
           default:
+            Log.w(TAG, "Invalid type: "+type);
             return (Any) null;
         }
-      } else {
-        return (Any) null;
       }
+      return (Any) null;
     }
   }
 
diff --git a/lib/modules/database.js b/lib/modules/database.js
@@ -211,10 +211,14 @@ class DatabaseRef extends ReferenceBase {
       })
   }
 
-  off(evt='') {
+  off(evt='', origCB) {
     const path = this.dbPath();
-    return this.db.off(path, evt)
+    return this.db.off(path, evt, origCB)
       .then(({callback, subscriptions}) => {
+        if (dbSubscriptions[path][evt].length > 0) {
+          return subscriptions;
+        }
+
         return promisify('off', FirestackDatabase)(path, evt)
           .then(() => {
             // subscriptions.forEach(sub => sub.remove());
@@ -432,15 +436,20 @@ export class Database extends Base {
     return Promise.resolve({callback, subscriptions});
   }
 
-  off(path, evt) {
+  off(path, evt, origCB) {
     const key = this._pathKey(path);
     // Remove subscription
     if (dbSubscriptions[key]) {
       if (!evt || evt === "") {
         dbSubscriptions[key] = {};
       } else if (dbSubscriptions[key][evt]) {
-        delete dbSubscriptions[key][evt];
+        if (origCB) {
+          dbSubscriptions[key][evt].splice(dbSubscriptions[key][evt].indexOf(origCB), 1);
+        } else {
+          delete dbSubscriptions[key][evt];
+        }
       }
+
       if (Object.keys(dbSubscriptions[key]).length <= 0) {
         // there are no more subscriptions
         // so we can unwatch
