Bug fixes to Android implementation

Author: collinjackson

packages/firebase_database/android/src/main/java/io/flutter/plugins/firebase/database/FirebaseDatabasePlugin.java

@@ -56,6 +56,8 @@ private Query getQuery(Map<String, Object> arguments) {
     Query query = getReference(arguments);
     @SuppressWarnings("unchecked")
     Map<String, Object> parameters = (Map<String, Object>) arguments.get("parameters");
+    if (parameters == null)
+      return query;
     Object orderBy = parameters.get("orderBy");
     if ("child".equals(orderBy)) {
       query = query.orderByChild((String) parameters.get("orderByChildKey"));
@@ -73,8 +75,10 @@ private Query getQuery(Map<String, Object> arguments) {
         query = query.startAt((Boolean) startAt, startAtKey);
       } else if (startAt instanceof String) {
         query = query.startAt((String) startAt, startAtKey);
-      } else {
-        query = query.startAt((Double) startAt, startAtKey);
+      } else if (startAt instanceof Double) {
+        query = query.endAt((Double) startAt);
+      } else if (startAt instanceof Integer) {
+        query = query.startAt((int) startAt);
       }
     }
     if (parameters.containsKey("endAt")) {
@@ -84,25 +88,29 @@ private Query getQuery(Map<String, Object> arguments) {
         query = query.endAt((Boolean) endAt, endAtKey);
       } else if (endAt instanceof String) {
         query = query.endAt((String) endAt, endAtKey);
-      } else {
-        query = query.endAt((Double) endAt, endAtKey);
+      } else if (endAt instanceof Double) {
+        query = query.endAt((Double) endAt);
+      } else if (endAt instanceof Integer) {
+        query = query.endAt((int) endAt);
       }
     }
-    if (arguments.containsKey("equalTo")) {
-      Object equalTo = arguments.get("equalTo");
+    if (parameters.containsKey("equalTo")) {
+      Object equalTo = parameters.get("equalTo");
       if (equalTo instanceof Boolean) {
         query = query.equalTo((Boolean) equalTo);
       } else if (equalTo instanceof String) {
         query = query.equalTo((String) equalTo);
-      } else {
+      } else if (equalTo instanceof Double) {
         query = query.equalTo((Double) equalTo);
+      } else if (equalTo instanceof Integer) {
+        query = query.equalTo((int) equalTo);
       }
     }
-    if (arguments.containsKey("limitToFirst")) {
-      query = query.limitToFirst((int) arguments.get("limitToFirst"));
+    if (parameters.containsKey("limitToFirst")) {
+      query = query.limitToFirst((int) parameters.get("limitToFirst"));
     }
-    if (arguments.containsKey("limitToLast")) {
-      query = query.limitToLast((int) arguments.get("limitToLast"));
+    if (parameters.containsKey("limitToLast")) {
+      query = query.limitToLast((int) parameters.get("limitToLast"));
     }
     return query;
   }

packages/firebase_database/lib/src/query.dart

@@ -93,6 +93,7 @@ class Query {
   /// than or equal to the given key.
   Query startAt(dynamic value, { String key }) {
     assert(!_parameters.containsKey('startAt'));
+    assert(value is String || value is bool || value is double || value is int);
     return _copyWithParameters(
       <String, dynamic>{ 'startAt': value, 'startAtKey': key },
     );
@@ -104,6 +105,7 @@ class Query {
   /// than or equal to the given key.
   Query endAt(dynamic value, { String key }) {
     assert(!_parameters.containsKey('endAt'));
+    assert(value is String || value is bool || value is double || value is int);
     return _copyWithParameters(
       <String, dynamic>{ 'endAt': value, 'endAtKey': key },
     );
@@ -115,6 +117,7 @@ class Query {
   /// If a key is provided, there is at most one such child as names are unique.
   Query equalTo(dynamic value, { String key }) {
     assert(!_parameters.containsKey('equalTo'));
+    assert(value is String || value is bool || value is double || value is int);
     return _copyWithParameters(
       <String, dynamic>{ 'equalTo': value, 'equalToKey': key },
     );