Convert Settings to the new JNI framework

PiperOrigin-RevId: 329734038

Author: wilhuff

firestore/CMakeLists.txt

@@ -79,8 +79,6 @@ set(android_SRCS
     src/android/field_value_android.h
     src/android/firebase_firestore_exception_android.cc
     src/android/firebase_firestore_exception_android.h
-    src/android/firebase_firestore_settings_android.cc
-    src/android/firebase_firestore_settings_android.h
     src/android/firestore_android.cc
     src/android/firestore_android.h
     src/android/geo_point_android.cc
@@ -101,6 +99,8 @@ set(android_SRCS
     src/android/server_timestamp_behavior_android.h
     src/android/set_options_android.cc
     src/android/set_options_android.h
+    src/android/settings_android.cc
+    src/android/settings_android.h
     src/android/snapshot_metadata_android.cc
     src/android/snapshot_metadata_android.h
     src/android/source_android.cc

firestore/src/android/firebase_firestore_settings_android.cc

@@ -20,7 +20,6 @@
 #include "firestore/src/android/field_path_android.h"
 #include "firestore/src/android/field_value_android.h"
 #include "firestore/src/android/firebase_firestore_exception_android.h"
-#include "firestore/src/android/firebase_firestore_settings_android.h"
 #include "firestore/src/android/geo_point_android.h"
 #include "firestore/src/android/lambda_event_listener.h"
 #include "firestore/src/android/lambda_transaction_function.h"
@@ -30,6 +29,7 @@
 #include "firestore/src/android/query_snapshot_android.h"
 #include "firestore/src/android/server_timestamp_behavior_android.h"
 #include "firestore/src/android/set_options_android.h"
+#include "firestore/src/android/settings_android.h"
 #include "firestore/src/android/snapshot_metadata_android.h"
 #include "firestore/src/android/source_android.h"
 #include "firestore/src/android/timestamp_android.h"
@@ -52,6 +52,9 @@
 namespace firebase {
 namespace firestore {
 
+using jni::Env;
+using jni::Local;
+
 const char kApiIdentifier[] = "Firestore";
 
 // clang-format off
@@ -163,7 +166,6 @@ bool FirestoreInternal::Initialize(App* app) {
           // Call Initialize on each Firestore internal class.
           FieldValueInternal::Initialize(app) &&
           FirebaseFirestoreExceptionInternal::Initialize(app) &&
-          FirebaseFirestoreSettingsInternal::Initialize(app) &&
           GeoPointInternal::Initialize(app) &&
           ListenerRegistrationInternal::Initialize(app) &&
           QueryInternal::Initialize(app) &&
@@ -200,6 +202,7 @@ bool FirestoreInternal::Initialize(App* app) {
     MetadataChangesInternal::Initialize(loader);
     ServerTimestampBehaviorInternal::Initialize(loader);
     SetOptionsInternal::Initialize(loader);
+    SettingsInternal::Initialize(loader);
     SnapshotMetadataInternal::Initialize(loader);
     SourceInternal::Initialize(loader);
     if (!loader.ok()) {
@@ -251,7 +254,6 @@ void FirestoreInternal::ReleaseClasses(App* app) {
   EventListenerInternal::Terminate(app);
   FieldValueInternal::Terminate(app);
   FirebaseFirestoreExceptionInternal::Terminate(app);
-  FirebaseFirestoreSettingsInternal::Terminate(app);
   GeoPointInternal::Terminate(app);
   ListenerRegistrationInternal::Terminate(app);
   QueryInternal::Terminate(app);
@@ -363,27 +365,20 @@ Query FirestoreInternal::CollectionGroup(const char* collection_id) const {
 }
 
 Settings FirestoreInternal::settings() const {
-  JNIEnv* env = app_->GetJNIEnv();
-  jobject settings = env->CallObjectMethod(
+  Env env = GetEnv();
+  Local<SettingsInternal> settings = env.Call<SettingsInternal>(
       obj_, firebase_firestore::GetMethodId(firebase_firestore::kGetSettings));
-  FIREBASE_ASSERT(settings != nullptr);
+  FIREBASE_ASSERT(settings);
 
-  Settings result =
-      FirebaseFirestoreSettingsInternal::JavaSettingToSetting(env, settings);
-  env->DeleteLocalRef(settings);
-  CheckAndClearJniExceptions(env);
-  return result;
+  return settings.ToPublic(env);
 }
 
 void FirestoreInternal::set_settings(Settings settings) {
-  JNIEnv* env = app_->GetJNIEnv();
-  jobject settings_jobj =
-      FirebaseFirestoreSettingsInternal::SettingToJavaSetting(env, settings);
-  env->CallVoidMethod(
+  Env env = GetEnv();
+  auto java_settings = SettingsInternal::Create(env, settings);
+  env.Call<void>(
       obj_, firebase_firestore::GetMethodId(firebase_firestore::kSetSettings),
-      settings_jobj);
-  env->DeleteLocalRef(settings_jobj);
-  CheckAndClearJniExceptions(env);
+      java_settings);
 }
 
 WriteBatch FirestoreInternal::batch() const {
@@ -556,6 +551,15 @@ void FirestoreInternal::UnregisterListenerRegistration(
   }
 }
 
+jni::Env FirestoreInternal::GetEnv() const {
+  // TODO(mcg): Investigate whether or not this method can be made static.
+  // This will depend on whether or not we need to flag the current Firestore
+  // instance as somehow broken in response to an exception.
+  jni::Env env;
+  env.SetUnhandledExceptionHandler(GlobalUnhandledExceptionHandler, nullptr);
+  return env;
+}
+
 CollectionReference FirestoreInternal::NewCollectionReference(
     jni::Env& env, const jni::Object& reference) {
   if (!env.ok() || !reference) return {};

firestore/src/android/firebase_firestore_settings_android.h

@@ -120,6 +120,8 @@ class FirestoreInternal {
   void UnregisterListenerRegistration(
       ListenerRegistrationInternal* registration);
 
+  jni::Env GetEnv() const;
+
   CollectionReference NewCollectionReference(jni::Env& env,
                                              const jni::Object& reference);
   DocumentReference NewDocumentReference(jni::Env& env,

firestore/src/android/firestore_android.cc

@@ -0,0 +1,87 @@
+#include "firestore/src/android/settings_android.h"
+
+#include "firestore/src/jni/env.h"
+#include "firestore/src/jni/loader.h"
+
+namespace firebase {
+namespace firestore {
+namespace {
+
+using jni::Constructor;
+using jni::Env;
+using jni::Local;
+using jni::Method;
+using jni::Object;
+using jni::String;
+
+// class FirebaseFirestoreSettings.Builder
+constexpr char kSettingsBuilderClass[] = PROGUARD_KEEP_CLASS
+    "com/google/firebase/firestore/FirebaseFirestoreSettings$Builder";
+Constructor<Object> kNewBuilder("()V");
+Method<Object> kSetHost(
+    "setHost",
+    "(Ljava/lang/String;)"
+    "Lcom/google/firebase/firestore/FirebaseFirestoreSettings$Builder;");
+Method<Object> kSetSslEnabled(
+    "setSslEnabled",
+    "(Z)"
+    "Lcom/google/firebase/firestore/FirebaseFirestoreSettings$Builder;");
+Method<Object> kSetPersistenceEnabled(
+    "setPersistenceEnabled",
+    "(Z)"
+    "Lcom/google/firebase/firestore/FirebaseFirestoreSettings$Builder;");
+Method<SettingsInternal> kBuild(
+    "build", "()Lcom/google/firebase/firestore/FirebaseFirestoreSettings;");
+
+// class FirebaseFirestoreSettings
+constexpr char kSettingsClass[] = PROGUARD_KEEP_CLASS
+    "com/google/firebase/firestore/FirebaseFirestoreSettings";
+Method<String> kGetHost("getHost", "()Ljava/lang/String;");
+Method<bool> kIsSslEnabled("isSslEnabled", "()Z");
+Method<bool> kIsPersistenceEnabled("isPersistenceEnabled", "()Z");
+
+}  // namespace
+
+void SettingsInternal::Initialize(jni::Loader& loader) {
+  loader.LoadClass(kSettingsBuilderClass, kNewBuilder, kSetHost, kSetSslEnabled,
+                   kSetPersistenceEnabled, kBuild);
+
+  loader.LoadClass(kSettingsClass, kGetHost, kIsSslEnabled,
+                   kIsPersistenceEnabled);
+}
+
+Local<SettingsInternal> SettingsInternal::Create(Env& env,
+                                                 const Settings& settings) {
+  Local<Object> builder = env.New(kNewBuilder);
+
+  Local<String> host = env.NewStringUtf(settings.host());
+  builder = env.Call(builder, kSetHost, host);
+
+  builder = env.Call(builder, kSetSslEnabled, settings.is_ssl_enabled());
+
+  builder = env.Call(builder, kSetPersistenceEnabled,
+                     settings.is_persistence_enabled());
+
+  return env.Call(builder, kBuild);
+}
+
+Settings SettingsInternal::ToPublic(Env& env) const {
+  Settings result;
+
+  // Set host
+  Local<String> host = env.Call(*this, kGetHost);
+  result.set_host(host.ToString(env));
+
+  // Set SSL enabled
+  bool ssl_enabled = env.Call(*this, kIsSslEnabled);
+  result.set_ssl_enabled(ssl_enabled);
+
+  // Set Persistence enabled
+  bool persistence_enabled = env.Call(*this, kIsPersistenceEnabled);
+  result.set_persistence_enabled(persistence_enabled);
+
+  return result;
+}
+
+}  // namespace firestore
+}  // namespace firebase