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

* 'master' of github.com:fullstackreact/react-native-firestack:
  Fix startAt, endAt, equalTo optional 2nd params on Android
  Update README.md
  Update README.md
  Some quick build fixes for ios10

# Conflicts:
#	ios/Firestack.xcodeproj/project.pbxproj
#	ios/Firestack/FirestackCloudMessaging.m

Author: auser

README.md

@@ -306,40 +306,7 @@ We can use an external authentication provider, such as twitter/facebook for aut
 
 ### OAuth setup with library
 
-We'll use the [react-native-oauth](https://github.com/fullstackreact/react-native-oauth) library, which was built along-side [Firestack](https://github.com/fullstackreact/react-native-firestack) specifically to handle authentication through third-party providers.
-
-> If you prefer to use another library, make sure you pass through the `oauthToken` and `oauthTokenSecret` provided by your other library to call the `signInWithProvider()` method.
-
-Following the instructions on the [react-native-oauth README](https://github.com/fullstackreact/react-native-oauth), we'll need to install it using `npm`:
-
-```javascript
-npm install --save react-native-oauth
-```
-
-It's important to set up the authentication library fully with our app configuration. Make sure to configure your app [along with this step](https://github.com/fullstackreact/react-native-oauth#handle-deep-linking-loading) otherwise authentication _cannot_ work.
-
-Once the app is configured with the instructions, we can call the `oauthManager`'s (or other library's) login method. We'll need to hold on to the `oauthToken` and an `oauthTokenSecret` provided by the provider. Using these values, we can call the `signInWithProvider()` method. The `signInWithProvider()` method accepts three parameters:
-
-1. The provider (such as `twitter`, `facebook`, etc) name
-2. The `authToken` value granted by the provider
-3. The `authTokenSecret` value granted by the provider
-
-```javascript
-// For instance, using the react-native-oauth library, this process
-// looks like:
-
-const appUrl = 'app-uri://oauth-callback/twitter'
-authManager.authorizeWithCallbackURL('twitter', appUrl)
-.then(creds => {
-  return firestack.signInWithProvider('twitter', creds.oauth_token, creds.oauth_token_secret)
-    .then(() => {
-      // We're now signed in through Firebase
-    })
-    .catch(err => {
-      // There was an error
-    })
-})
-```
+[Currently undergoing updates]
 
 ### socialLogin with custom Library
 If you don't want to use [react-native-oauth](https://github.com/fullstackreact/react-native-oauth), you can use other library such as [react-native-facebook-login](https://github.com/magus/react-native-facebook-login). 
@@ -465,7 +432,7 @@ Wouldn't it be nice to send analytics about your app usage from your users? Well
 #### logEventWithName()
 
 ```javascript
-firestack.logEventWithName("launch", {
+firestack.analytics.logEventWithName("launch", {
   'screen': 'Main screen'
 })
 .then(res => console.log('Sent event named launch'))

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

@@ -641,23 +641,23 @@ private Query getDatabaseQueryAtPathAndModifiers(
         query = query.limitToFirst(limit);
       } else if (methStr.contains("equalTo")) {
         String value = strArr[1];
-        String key = strArr[2];
+        String key = strArr.length >= 3 ? strArr[2] : null;
         if (key == null) {
           query = query.equalTo(value);
         } else {
           query = query.equalTo(value, key);
         }
       } else if (methStr.contains("endAt")) {
         String value = strArr[1];
-        String key = strArr[2];
+        String key = strArr.length >= 3 ? strArr[2] : null;
         if (key == null) {
           query = query.endAt(value);
         } else {
           query = query.endAt(value, key);
         }
       } else if (methStr.contains("startAt")) {
         String value = strArr[1];
-        String key = strArr[2];
+        String key = strArr.length >= 3 ? strArr[2] : null;
         if (key == null) {
           query = query.startAt(value);
         } else {

ios/Firestack/FirestackCloudMessaging.m

@@ -8,6 +8,10 @@
 
 #import <Foundation/Foundation.h>
 #import <NotificationCenter/NotificationCenter.h>
+#if defined(__IPHONE_10_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_10_0
+#import <UserNotifications/UserNotifications.h>
+#endif
+#import "FirestackCloudMessaging.h"
 #import "FirestackEvents.h"
 #import "RCTConvert.h"
 #import "FirestackCloudMessaging.h"