Merge branch 'master' into download

* master:
  Updated README installation instructions
  Updates to Podfile to include use_frameworks
  Updated README with removing build phases (no longer necessary)
  Adding missing user info mapping to getUserMap
  fixing NPE after Database#off
  Formatting updates for README
  added instructions for running on the master branch
  Updates
  Added protection around user on android to ensure it is not null on auth actions
  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
  2.3.2
  Removed modules from FirestackAnalytics

Author: auser

.gitignore

@@ -54,3 +54,4 @@ android/gradlew
 android/gradlew.bat
 android/gradle/
 .idea
+.idea

README.md

@@ -31,6 +31,10 @@ For a detailed discussion of how Firestack works, check out our [contribution gu
 * Intended on being as drop-dead simple as possible
 * And so much more
 
+## Example app
+
+We have a working application example available in at [fullstackreact/FirestackApp](https://github.com/fullstackreact/FirestackApp). Check it out for more details about how to use Firestack.
+
 ## Why?
 
 Firebase is awesome and it's combination with the Google Cloud Platform makes it super awesome. Sadly, the latest version of Firebase requires the `window` object. That's where Firestack comes in! Firestack provides a really thin layer that sits on top of the native Firebase SDKs and attempts to use the JavaScript library as much as possible rather than reinventing the wheel.
@@ -41,8 +45,7 @@ Getting `react-native-firestack` up and running in your app should be a 2 step p
 
 1. Install the `npm` package
 2. Link the project with `react-native link react-native-firestack`
-3. Modify the _Build Phases_ for iOS like it says below.
-4. To ensure Android is setup, check your `MainApplication.java` for the `FirestackPackage()` line.
+3. To ensure Android is setup, check your `MainApplication.java` for the `FirestackPackage()` line.
 
 Those steps in more detail:
 
@@ -82,19 +85,15 @@ If you prefer not to use `rnpm`, we can manually link the package together with
 
 ![Firebase.xcodeproj in Libraries listing](http://d.pr/i/19ktP.png)
 
-3. In the project's "Build Settings" tab in your app's target, add `libFirestack.a` to the list of `Link Binary with Libraries`
-
-![Linking binaries](http://d.pr/i/1cHgs.png)
-
-4. Ensure that the `Build Settings` of the `Firestack.xcodeproj` project is ticked to _All_ and it's `Header Search Paths` include both of the following paths _and_ are set to _recursive_:
+3. Ensure that the `Build Settings` of the `Firestack.xcodeproj` project is ticked to _All_ and it's `Header Search Paths` include both of the following paths _and_ are set to _recursive_:
 
   1. `$(SRCROOT)/../../react-native/React`
   2. `$(SRCROOT)/../node_modules/react-native/React`
   3. `${PROJECT_DIR}/../../../ios/Pods`
 
 ![Recursive paths](http://d.pr/i/1hAr1.png)
 
-5. Setting up cocoapods
+4. Setting up cocoapods
 
 Since we're dependent upon cocoapods (or at least the Firebase libraries being available at the root project -- i.e. your application), we have to make them available for Firestack to find them.
 
@@ -323,7 +322,7 @@ firestack.createUserWithEmail('[email protected]', '123456')
 To sign a user in with their email and password, use the `signInWithEmail()` function. It accepts two parameters, the user's email and password:
 
 ```javascript
-firestack.signInWithEmail('[email protected]', '123456')
+firestack.auth.signInWithEmail('[email protected]', '123456')
   .then((user) => {
     console.log('User successfully logged in', user)
   })
@@ -592,23 +591,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
 
@@ -757,6 +766,37 @@ firestack.off('listenForAuth');
 
 Firestack provides a built-in way to connect your Redux app using the `FirestackModule` export from Firestack.
 
+## Running with the `master` branch
+
+Most of our work is committed to the master branch. If you want to run the bleeding-edge version of Firestack, you'll need to follow these instructions.
+
+Since `react-native` doesn't like symlinks, we need to clone the raw repository into our `node_modules/` manually. First, in order to tell `react-native` we are using the package `react-native-firestack`, make sure to install the `npm` version:
+
+```bash
+npm install --save react-native-firestack
+```
+
+After the `npm` version is installed, you can either clone the repo directly into our `node_modules/` directory:
+
+```bash
+git clone https://github.com/fullstackreact/react-native-firestack.git ./node_modules/react-native-firestack
+```
+
+Alternatively, you can clone the repo somewhere else and `rsync` the directory over to the `node_modules/` directory. 
+
+> This is the method I use as it allows me to separate the codebases:
+
+```bash
+git clone https://github.com/fullstackreact/react-native-firestack.git \
+      ~/Development/react-native/mine/react-native-firestack/
+      
+## And rsync
+rsync -avhW --delete \
+      --exclude='node_modules' \
+      --exclude='.git' \
+      ~/Development/react-native/mine/react-native-firestack/ \
+      ./node_modules/react-native-firestack/
+```
 
 ## Contributing
 
@@ -774,8 +814,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)

android/.idea/runConfigurations.xml

@@ -9,6 +9,7 @@ android {
         targetSdkVersion 23
         versionCode 1
         versionName "1.0"
+        multiDexEnabled  true
     }
     buildTypes {
         release {
@@ -19,6 +20,8 @@ android {
 
 dependencies {
     compile 'com.facebook.react:react-native:0.20.+'
+    compile 'com.google.android.gms:play-services-base:9.6.1'
+
     compile 'com.google.firebase:firebase-core:9.6.0'
     compile 'com.google.firebase:firebase-auth:9.6.0'
     compile 'com.google.firebase:firebase-analytics:9.6.0'

android/build.gradle

@@ -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);
@@ -155,7 +157,7 @@ public void onComplete(@NonNull Task<AuthResult> task) {
 
                         if (task.isSuccessful()) {
                             user = task.getResult().getUser();
-                            userCallback(user, callback);
+                            anonymousUserCallback(user, callback);
                         }else{
                             userErrorCallback(task, callback);
                         }
@@ -354,6 +356,7 @@ public void onComplete(@NonNull Task<Void> task) {
     @ReactMethod
     public void signOut(final Callback callback) {
       FirebaseAuth.getInstance().signOut();
+      user = null;
 
       WritableMap resp = Arguments.createMap();
       resp.putString("status", "complete");
@@ -426,29 +429,55 @@ public void userCallback(FirebaseUser passedUser, final Callback onComplete) {
         user.getToken(true).addOnCompleteListener(new OnCompleteListener<GetTokenResult>() {
             @Override
             public void onComplete(@NonNull Task<GetTokenResult> task) {
+              WritableMap msgMap = Arguments.createMap();
                 WritableMap userMap = Arguments.createMap();
-                final String name = user.getDisplayName();
-                final String token = task.getResult().getToken();
-                final String email = user.getEmail();
-                final String uid   = user.getUid();
-                final String provider = user.getProviderId();
-                final Uri photoUrl = user.getPhotoUrl();
-
-                userMap.putString("name", name);
-                userMap.putString("token", token);
-                userMap.putString("email", email);
-                userMap.putString("uid", uid);
-                userMap.putString("provider", provider);
-
-                if (photoUrl!=null) {
-                  userMap.putString("photoUrl",photoUrl.toString());
+
+                if (user != null) {
+                  final String token = task.getResult().getToken();
+
+                  userMap.putString("token", token);
+                  userMap.putBoolean("anonymous", false);
                 }
 
-                onComplete.invoke(null, userMap);
+                msgMap.putMap("user", userMap);
+
+                onComplete.invoke(null, msgMap);
             }
         });
     }
 
+    // TODO: Reduce to one method
+    public void anonymousUserCallback(FirebaseUser passedUser, final Callback onComplete) {
+        WritableMap userMap = getUserMap();
+
+        if (passedUser == null) {
+          mAuth = FirebaseAuth.getInstance();
+          final FirebaseUser user = mAuth.getCurrentUser();
+        } else {
+          final FirebaseUser user = passedUser;
+        }
+
+        user.getToken(true).addOnCompleteListener(new OnCompleteListener<GetTokenResult>() {
+            @Override
+            public void onComplete(@NonNull Task<GetTokenResult> task) {
+              WritableMap msgMap = Arguments.createMap();
+                WritableMap userMap = Arguments.createMap();
+
+                if (user != null) {
+                  final String token = task.getResult().getToken();
+
+                  userMap.putString("token", token);
+                  userMap.putBoolean("anonymous", true);
+                }
+
+                msgMap.putMap("user", userMap);
+
+                onComplete.invoke(null, msgMap);
+            }
+        });
+    }
+
+
     public void noUserCallback(final Callback callback) {
         WritableMap message = Arguments.createMap();
 
@@ -473,12 +502,28 @@ private WritableMap getUserMap() {
 
         FirebaseUser user = FirebaseAuth.getInstance().getCurrentUser();
 
-        userMap.putString("email", user.getEmail());
-        userMap.putString("uid", user.getUid());
-        userMap.putString("provider", user.getProviderId());
+        if (user != null) {
+          final String email = user.getEmail();
+          final String uid   = user.getUid();
+          final String provider = user.getProviderId();
+          final String name = user.getDisplayName();
+          final Uri photoUrl = user.getPhotoUrl();
+
+          userMap.putString("email", email);
+          userMap.putString("uid", uid);
+          userMap.putString("providerId", provider);
+
+          if (name != null) {
+            userMap.putString("name", name);
+          }
+
+          if (photoUrl != null) {
+            userMap.putString("photoUrl", photoUrl.toString());
+          }
+        } else {
+          userMap.putString("msg", "no user");
+        }
 
         return userMap;
     }
-
-
 }

android/src/main/java/io/fullstack/firestack/FirestackAuth.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":

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

@@ -2,6 +2,7 @@
 
 import android.content.Context;
 import android.util.Log;
+import java.util.Map;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
@@ -178,9 +179,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);
   }