Android implementation

Author: tom-andersen

firestore/src/android/query_android.h

@@ -71,6 +71,8 @@ class QueryInternal : public Wrapper {
    */
   virtual AggregateQuery Count() const;
 
+  Query Where(const Filter& filter) const;
+
   /**
    * @brief Creates and returns a new Query with the additional filter.
    *

firestore/src/android/wrapper.cc

@@ -60,7 +60,7 @@ Wrapper::Wrapper(Wrapper* rhs) : Wrapper() {
 
 Wrapper::~Wrapper() = default;
 
-jni::Env Wrapper::GetEnv() const { return firestore_->GetEnv(); }
+jni::Env Wrapper::GetEnv() { return FirestoreInternal::GetEnv(); }
 
 Local<Object> Wrapper::ToJava() const {
   Env env = GetEnv();

firestore/src/android/wrapper.h

@@ -55,7 +55,7 @@ class Wrapper {
   // Similar to a copy constructor, but can handle the case where `rhs` is null.
   explicit Wrapper(Wrapper* rhs);
 
-  jni::Env GetEnv() const;
+  static jni::Env GetEnv();
 
   FirestoreInternal* firestore_ = nullptr;  // not owning
   jni::ArenaRef obj_;