Fix Android OR Query

firestore/src/android/filter_android.cc

@@ -40,6 +40,7 @@ using jni::Local;
 using jni::Object;
 using jni::StaticMethod;
 
+jclass filter_class = nullptr;
 constexpr char kClassName[] =
  PROGUARD_KEEP_CLASS "com/google/firebase/firestore/Filter";
 StaticMethod<Object> kEqualTo(
@@ -75,11 +76,11 @@ StaticMethod<Object> kArrayContainsAny(
  "(Lcom/google/firebase/firestore/FieldPath;Ljava/util/List;)"
  "Lcom/google/firebase/firestore/Filter;");
 StaticMethod<Object> kIn(
- "in",
+ "inArray",
  "(Lcom/google/firebase/firestore/FieldPath;Ljava/util/List;)"
  "Lcom/google/firebase/firestore/Filter;");
 StaticMethod<Object> kNotIn(
- "notIn",
+ "notInArray",
  "(Lcom/google/firebase/firestore/FieldPath;Ljava/util/List;)"
  "Lcom/google/firebase/firestore/Filter;");
 StaticMethod<Object> kAnd("and",
@@ -91,13 +92,17 @@ StaticMethod<Object> kOr("or",
 } // namespace
 
 void FilterInternal::Initialize(jni::Loader& loader) {
+ filter_class = loader.LoadClass(kClassName);
  loader.LoadClass(kClassName, kEqualTo, kNotEqualTo, kLessThan,
  kLessThanOrEqualTo, kGreaterThan, kGreaterThanOrEqualTo,
  kArrayContains, kArrayContainsAny, kIn, kNotIn, kAnd, kOr);
 }
 
-FilterInternal::FilterInternal(jni::Object&& object, bool is_empty)
- : object_(object), is_empty_(is_empty) {}
+FilterInternal::FilterInternal(const jni::Object& obj, bool is_empty)
+ : is_empty_(is_empty) {
+ Env env = GetEnv();
+ obj_.reset(env, obj);
+}
 
 Filter FilterInternal::EqualTo(const FieldPath& field,
  const FieldValue& value) {
@@ -164,9 +169,9 @@ Filter FilterInternal::Where(const FieldPath& field,
  const FieldValue& value) {
  Env env = GetEnv();
  Local<Object> java_field = FieldPathConverter::Create(env, field);
- Object filter =
+ Local<Object> filter =
  env.Call(method, java_field, FieldValueInternal::ToJava(value));
- return Filter(new FilterInternal(std::move(filter), false));
+ return Filter(new FilterInternal(filter, false));
 }
 
 Filter FilterInternal::Where(const FieldPath& field,
@@ -180,25 +185,32 @@ Filter FilterInternal::Where(const FieldPath& field,
  }
 
  Local<Object> java_field = FieldPathConverter::Create(env, field);
- Object filter = env.Call(method, java_field, java_values);
- return Filter(new FilterInternal(std::move(filter), false));
+ Local<Object> filter = env.Call(method, java_field, java_values);
+ return Filter(new FilterInternal(filter, false));
 }
 
 Filter FilterInternal::Where(const StaticMethod<Object>& method,
  const std::vector<Filter>& filters) {
  Env env = GetEnv();
- size_t size = filters.size();
- Local<Array<Object>> java_filters = env.NewArray(size, Object::GetClass());
- bool is_empty = true;
- for (int i = 0; i < size; ++i) {
- FilterInternal* internal_filter = filters[i].internal_;
- if (!internal_filter->IsEmpty()) {
- is_empty = false;
+ std::vector<int> non_empty_indexes;
+ size_t filters_size = filters.size();
+ for (int i = 0; i < filters_size; ++i) {
+ if (!filters[i].internal_->IsEmpty()) {
+ non_empty_indexes.push_back(i);
  }
- java_filters.Set(env, i, internal_filter->object_);
  }
- Object filter = env.Call(method, java_filters);
- return Filter(new FilterInternal(std::move(filter), is_empty));
+ size_t non_empty_size = non_empty_indexes.size();
+ Local<Array<Object>> java_filters = env.NewArray(non_empty_size, filter_class);
+ for (int i = 0; i < non_empty_size; ++i) {
+ java_filters.Set(env, i, filters[non_empty_indexes[i]].internal_->ToJava());
+ }
+ Local<Object> filter = env.Call(method, java_filters);
+ return Filter(new FilterInternal(filter, non_empty_size == 0));
+}
+
+Local<Object> FilterInternal::ToJava() const {
+ Env env = GetEnv();
+ return obj_.get(env);
 }
 
 bool operator==(const FilterInternal& lhs, const FilterInternal& rhs) {

firestore/src/android/filter_android.h

@@ -31,7 +31,7 @@ class FilterInternal final {
  public:
  static void Initialize(jni::Loader& loader);
 
- FilterInternal(jni::Object&& object, bool is_empty);
+ FilterInternal(const jni::Object& object, bool is_empty);
 
  static Filter ArrayContains(const FieldPath& field, const FieldValue& value);
  static Filter ArrayContainsAny(const FieldPath& field,
@@ -51,7 +51,7 @@ class FilterInternal final {
  static Filter Or(const std::vector<Filter>& filters);
  static Filter And(const std::vector<Filter>& filters);
 
- const jni::Global<jni::Object>& ToJava() const { return object_; }
+ jni::Local<jni::Object> ToJava() const;
 
  private:
  friend class Filter;
@@ -63,7 +63,7 @@ class FilterInternal final {
 
  static jni::Env GetEnv();
 
- jni::Global<jni::Object> object_;
+ jni::ArenaRef obj_;
  const bool is_empty_;
 
  // A generalized function for all WhereFoo calls.

firestore/src/android/firestore_android.cc

@@ -37,6 +37,7 @@
 #include "firestore/src/android/exception_android.h"
 #include "firestore/src/android/field_path_android.h"
 #include "firestore/src/android/field_value_android.h"
+#include "firestore/src/android/filter_android.h"
 #include "firestore/src/android/geo_point_android.h"
 #include "firestore/src/android/jni_runnable_android.h"
 #include "firestore/src/android/lambda_event_listener.h"
@@ -339,6 +340,7 @@ bool FirestoreInternal::Initialize(App* app) {
  ExceptionInternal::Initialize(loader);
  FieldPathConverter::Initialize(loader);
  FieldValueInternal::Initialize(loader);
+ FilterInternal::Initialize(loader);
  GeoPointInternal::Initialize(loader);
  JniRunnableBase::Initialize(loader);
  ListenerRegistrationInternal::Initialize(loader);