Get rid of AppInviteNativeWrapper, which uses the old deprecated Firebase

Invites SDK on Android, and use the Firebase Dynamic Links SDK instead.

This eliminates some one-version errors we've been getting, as the firebase-invites dependency uses a fairly old version of play-services-base which causes issues.

PiperOrigin-RevId: 264705390

Author: jonsimantov

Android/firebase_dependencies.gradle

@@ -22,7 +22,7 @@ def firebaseDependenciesMap = [
   'analytics' : ['com.google.firebase:firebase-analytics:17.1.0'],
   'auth' : ['com.google.firebase:firebase-auth:19.0.0'],
   'database' : ['com.google.firebase:firebase-database:19.0.0'],
-  'dynamic_links' : ['com.google.firebase:firebase-invites:17.0.0'],
+  'dynamic_links' : ['com.google.firebase:firebase-dynamic-links:19.0.0'],
   'functions' : ['com.google.firebase:firebase-functions:19.0.0'],
   'instance_id' : ['com.google.firebase:firebase-iid:20.0.0'],
   'invites' : ['com.google.firebase:firebase-invites:17.0.0'],

app/invites_resources/build.gradle

@@ -38,15 +38,15 @@ android {
     main {
       manifest.srcFile '../../android_build_files/AndroidManifest.xml'
       java {
-        srcDirs = ['../src_java/com/google/firebase/invites/internal/cpp']
+        srcDirs = ['../src_java/com/google/firebase/dynamiclinks/internal/cpp']
       }
     }
   }
 }
 
 dependencies {
   implementation 'com.google.firebase:firebase-analytics:17.1.0'
-  implementation 'com.google.firebase:firebase-invites:17.0.0'
+  implementation 'com.google.firebase:firebase-dynamic-links:19.0.0'
   implementation project(':app:app_resources')
 }
 

app/src/invites/android/invites_android_helper.cc

@@ -15,8 +15,10 @@
  */
 
 #include "app/src/invites/android/invites_android_helper.h"
+
 #include <assert.h>
 #include <string.h>
+
 #include "app/invites_resources.h"
 #include "app/src/invites/receiver_interface.h"
 #include "app/src/invites/sender_receiver_interface.h"
@@ -31,27 +33,16 @@ Mutex AndroidHelper::init_mutex_;  // NOLINT
 int AndroidHelper::initialize_count_ = 0;
 
 METHOD_LOOKUP_DEFINITION(
-    invite, "com/google/firebase/invites/internal/cpp/AppInviteNativeWrapper",
-    INVITE_METHODS)
+    dynamic_links_native_wrapper,
+    "com/google/firebase/dynamiclinks/internal/cpp/DynamicLinksNativeWrapper",
+    DYNAMIC_LINKS_NATIVE_WRAPPER_METHODS)
 
 extern "C" {
 
 JNIEXPORT void JNICALL
-Java_com_google_firebase_invites_internal_cpp_AppInviteNativeWrapper_receivedInviteCallback(
-    JNIEnv* env, jclass clazz, jlong data_ptr, jstring invitation_id_java,
-    jstring deep_link_url_java, jint result, jstring error_string_java);
-JNIEXPORT void JNICALL
-Java_com_google_firebase_invites_internal_cpp_AppInviteNativeWrapper_convertedInviteCallback(
-    JNIEnv* env, jclass clazz, jlong data_ptr, jstring invitation_id_java,
+Java_com_google_firebase_dynamiclinks_internal_cpp_DynamicLinksNativeWrapper_receivedDynamicLinkCallback(
+    JNIEnv* env, jclass clazz, jlong data_ptr, jstring deep_link_url_java,
     jint result, jstring error_string_java);
-JNIEXPORT void JNICALL
-Java_com_google_firebase_invites_internal_cpp_AppInviteNativeWrapper_sentInviteCallback(
-    JNIEnv* env, jclass clazz, jlong data_ptr,
-    jobjectArray invitation_ids_array, jint result, jstring error_string_java);
-JNIEXPORT void JNICALL
-Java_com_google_firebase_invites_internal_cpp_AppInviteNativeWrapper_connectionFailedCallback(
-    JNIEnv* env, jclass clazz, jlong data_ptr, jint error_code,
-    jstring error_message);
 
 }  // extern "C"
 
@@ -68,20 +59,10 @@ AndroidHelper::AndroidHelper(const ::firebase::App& app,
       }
 
       static const JNINativeMethod kNativeMethods[] = {
-          {"receivedInviteCallback",
-           "(JLjava/lang/String;Ljava/lang/String;ILjava/lang/String;)V",
-           reinterpret_cast<void*>(
-               &Java_com_google_firebase_invites_internal_cpp_AppInviteNativeWrapper_receivedInviteCallback)},  // NOLINT
-          {"convertedInviteCallback",
+          {"receivedDynamicLinkCallback",
            "(JLjava/lang/String;ILjava/lang/String;)V",
            reinterpret_cast<void*>(
-               &Java_com_google_firebase_invites_internal_cpp_AppInviteNativeWrapper_convertedInviteCallback)},  // NOLINT
-          {"sentInviteCallback", "(J[Ljava/lang/String;ILjava/lang/String;)V",
-           reinterpret_cast<void*>(
-               &Java_com_google_firebase_invites_internal_cpp_AppInviteNativeWrapper_sentInviteCallback)},  // NOLINT
-          {"connectionFailedCallback", "(JILjava/lang/String;)V",
-           reinterpret_cast<void*>(
-               &Java_com_google_firebase_invites_internal_cpp_AppInviteNativeWrapper_connectionFailedCallback)},  // NOLINT
+               &Java_com_google_firebase_dynamiclinks_internal_cpp_DynamicLinksNativeWrapper_receivedDynamicLinkCallback)}  // NOLINT
       };
       const std::vector<util::EmbeddedFile> embedded_files =
           util::CacheEmbeddedFiles(
@@ -90,16 +71,15 @@ AndroidHelper::AndroidHelper(const ::firebase::App& app,
                   firebase_invites::invites_resources_filename,
                   firebase_invites::invites_resources_data,
                   firebase_invites::invites_resources_size));
-      if (!(invite::CacheClassFromFiles(env, app_->activity(),
-                                        &embedded_files) &&
-            // Prepare to instantiate the AppInviteNativeWrapper Java class,
-            // which
-            // we will use to talk to the Firebase Invites Java library. Note
-            // that
-            // we need global references to everything because, again, we may be
-            // running from different threads.
-            invite::CacheMethodIds(env, app_->activity()) &&
-            invite::RegisterNatives(
+      if (!(dynamic_links_native_wrapper::CacheClassFromFiles(
+                env, app_->activity(), &embedded_files) &&
+            // Prepare to instantiate the DynamicLinksNativeWrapper Java class,
+            // which we will use to talk to the Firebase Dynamic Links Java
+            // library. Note that we need global references to everything
+            // because, again, we may be running from different threads.
+            dynamic_links_native_wrapper::CacheMethodIds(env,
+                                                         app_->activity()) &&
+            dynamic_links_native_wrapper::RegisterNatives(
                 env, kNativeMethods,
                 sizeof(kNativeMethods) / sizeof(kNativeMethods[0])))) {
         util::Terminate(env);
@@ -109,7 +89,7 @@ AndroidHelper::AndroidHelper(const ::firebase::App& app,
     }
     initialize_count_++;
   }
-  // Actually create the AppInviteNativeWrapper object now.
+  // Actually create the DynamicLinksNativeWrapper object now.
   CreateWrapperObject(sender_receiver);
 }
 
@@ -118,7 +98,7 @@ AndroidHelper::~AndroidHelper() {
   if (app_ == nullptr) return;
 
   // Ensure that no further JNI callbacks refer to deleted instances.
-  CallMethod(invite::kDiscardNativePointer);
+  CallMethod(dynamic_links_native_wrapper::kDiscardNativePointer);
 
   JNIEnv* env = app_->GetJNIEnv();
   env->DeleteGlobalRef(wrapper_obj_);
@@ -129,7 +109,7 @@ AndroidHelper::~AndroidHelper() {
     initialize_count_--;
     if (initialize_count_ == 0) {
       util::Terminate(env);
-      invite::ReleaseClass(env);
+      dynamic_links_native_wrapper::ReleaseClass(env);
     }
   }
   app_ = nullptr;
@@ -138,59 +118,64 @@ AndroidHelper::~AndroidHelper() {
 void AndroidHelper::CreateWrapperObject(
     SenderReceiverInterface* sender_receiver) {
   JNIEnv* env = app_->GetJNIEnv();
-  jobject obj = env->NewObject(
-      invite::g_class, invite::GetMethodId(invite::kConstructor),
-      reinterpret_cast<jlong>(sender_receiver), app_->activity(), nullptr);
+  jobject obj = env->NewObject(dynamic_links_native_wrapper::g_class,
+                               dynamic_links_native_wrapper::GetMethodId(
+                                   dynamic_links_native_wrapper::kConstructor),
+                               reinterpret_cast<jlong>(sender_receiver),
+                               app_->activity(), nullptr);
   CheckJNIException();
   wrapper_obj_ = env->NewGlobalRef(obj);
   env->DeleteLocalRef(obj);
 }
 
-bool AndroidHelper::CallBooleanMethod(invite::Method method) {
+bool AndroidHelper::CallBooleanMethod(
+    dynamic_links_native_wrapper::Method method) {
   JNIEnv* env = app_->GetJNIEnv();
-  jboolean result =
-      env->CallBooleanMethod(wrapper_obj(), invite::GetMethodId(method));
+  jboolean result = env->CallBooleanMethod(
+      wrapper_obj(), dynamic_links_native_wrapper::GetMethodId(method));
   CheckJNIException();
   return (result != JNI_FALSE);
 }
 
-bool AndroidHelper::CallBooleanMethodString(invite::Method method,
-                                            const char* strparam) {
+bool AndroidHelper::CallBooleanMethodString(
+    dynamic_links_native_wrapper::Method method, const char* strparam) {
   JNIEnv* env = app_->GetJNIEnv();
   jstring param = env->NewStringUTF(strparam);
-  jboolean result =
-      env->CallBooleanMethod(wrapper_obj(), invite::GetMethodId(method), param);
+  jboolean result = env->CallBooleanMethod(
+      wrapper_obj(), dynamic_links_native_wrapper::GetMethodId(method), param);
   CheckJNIException();
   env->DeleteLocalRef(param);
 
   return (result != JNI_FALSE);
 }
 
-int AndroidHelper::CallIntMethodString(invite::Method method,
-                                       const char* strparam) {
+int AndroidHelper::CallIntMethodString(
+    dynamic_links_native_wrapper::Method method, const char* strparam) {
   JNIEnv* env = app_->GetJNIEnv();
   jstring param = env->NewStringUTF(strparam);
-  jint result =
-      env->CallBooleanMethod(wrapper_obj(), invite::GetMethodId(method), param);
+  jint result = env->CallBooleanMethod(
+      wrapper_obj(), dynamic_links_native_wrapper::GetMethodId(method), param);
   CheckJNIException();
   env->DeleteLocalRef(param);
 
   return result;
 }
 
-void AndroidHelper::CallMethod(invite::Method method) {
+void AndroidHelper::CallMethod(dynamic_links_native_wrapper::Method method) {
   JNIEnv* env = app_->GetJNIEnv();
-  env->CallVoidMethod(wrapper_obj(), invite::GetMethodId(method));
+  env->CallVoidMethod(wrapper_obj(),
+                      dynamic_links_native_wrapper::GetMethodId(method));
   CheckJNIException();
 }
 
-void AndroidHelper::CallMethodStringString(invite::Method method,
-                                           const char* strparam1,
-                                           const char* strparam2) {
+void AndroidHelper::CallMethodStringString(
+    dynamic_links_native_wrapper::Method method, const char* strparam1,
+    const char* strparam2) {
   JNIEnv* env = app_->GetJNIEnv();
   jstring param1 = env->NewStringUTF(strparam1);
   jstring param2 = env->NewStringUTF(strparam2);
-  env->CallVoidMethod(wrapper_obj(), invite::GetMethodId(method), param1,
+  env->CallVoidMethod(wrapper_obj(),
+                      dynamic_links_native_wrapper::GetMethodId(method), param1,
                       param2);
   CheckJNIException();
 
@@ -232,90 +217,23 @@ void AndroidHelper::ConnectionFailedCallback(int error_code) {
 
 extern "C" {
 
-// A function that receives the callback from the Java side. The
-// "data_ptr" parameter is actually a pointer to our the AndroidHelper
-// instance, so we can call the proper ConnectionFailed method.
-JNIEXPORT void JNICALL
-Java_com_google_firebase_invites_internal_cpp_AppInviteNativeWrapper_connectionFailedCallback(
-    JNIEnv* env, jclass clazz, jlong data_ptr, jint error_code,
-    jstring error_message) {
-  if (data_ptr == 0) return;  // test call only
-
-  // Be careful - we are in a different thread now. No JNI calls are allowed
-  // except on the JNIEnv we were passed, and we have to take care changing the
-  // InvitesReceiverInternal data -- anything we touch needs a lock.
-  firebase::invites::internal::AndroidHelper* instance =
-      reinterpret_cast<firebase::invites::internal::AndroidHelper*>(data_ptr);
-
-  instance->ConnectionFailedCallback(error_code);
-}
-
-// A function that receives the callback from the Java side. The
-// "data_ptr" parameter is actually a pointer to our instance of
-// InviteSenderInternalAndroid, so we can call the proper
-// SentInviteCallback method.
-
-JNIEXPORT void JNICALL
-Java_com_google_firebase_invites_internal_cpp_AppInviteNativeWrapper_sentInviteCallback(
-    JNIEnv* env, jclass clazz, jlong data_ptr,
-    jobjectArray invitation_ids_array, jint result, jstring error_string_java) {
-  if (data_ptr == 0) return;  // Test call to ensure JNI is hooked up.
-
-  // Be careful - we are in a different thread now. No JNI calls are allowed
-  // except on the JNIEnv we were passed, and we have to take care changing the
-  // AppInvitesSenderInternal data -- anything we touch needs a lock.
-  std::vector<std::string> invitation_ids;
-  std::string error_string;
-  if (result == 0) {
-    if (invitation_ids_array != nullptr) {
-      size_t num_ids =
-          static_cast<size_t>(env->GetArrayLength(invitation_ids_array));
-      invitation_ids.reserve(num_ids);
-      for (int i = 0; i < num_ids; i++) {
-        jstring id = static_cast<jstring>(
-            env->GetObjectArrayElement(invitation_ids_array, i));
-        const char* chars = env->GetStringUTFChars(id, nullptr);
-        invitation_ids.push_back(std::string(chars));
-        env->ReleaseStringUTFChars(id, chars);
-        env->DeleteLocalRef(id);
-      }
-    }
-  } else {
-    // result != 0
-    if (error_string_java != nullptr) {
-      const char* chars = env->GetStringUTFChars(error_string_java, nullptr);
-      error_string = chars;
-      env->ReleaseStringUTFChars(error_string_java, chars);
-    }
-  }
-  firebase::invites::internal::SenderReceiverInterface* sender_receiver =
-      reinterpret_cast<firebase::invites::internal::SenderReceiverInterface*>(
-          data_ptr);
-  sender_receiver->SentInviteCallback(invitation_ids, result, error_string);
-}
-
 // A function that receives the callback from the Java side. The
 // "data_ptr" parameter is actually a pointer to our instance of
 // InviteReceiverInternalAndroid, so we can call the proper
 // ReceivedInviteCallback method.
 JNIEXPORT void JNICALL
-Java_com_google_firebase_invites_internal_cpp_AppInviteNativeWrapper_receivedInviteCallback(
-    JNIEnv* env, jclass clazz, jlong data_ptr, jstring invitation_id_java,
-    jstring deep_link_url_java, jint result, jstring error_string_java) {
+Java_com_google_firebase_dynamiclinks_internal_cpp_DynamicLinksNativeWrapper_receivedDynamicLinkCallback(
+    JNIEnv* env, jclass clazz, jlong data_ptr, jstring deep_link_url_java,
+    jint result, jstring error_string_java) {
   if (data_ptr == 0) return;  // test call only
 
   // Be careful - we are in a different thread now. No JNI calls are allowed
   // except on the JNIEnv we were passed, and we have to take care changing the
   // InvitesReceiverInternal data -- anything we touch needs a lock.
-  std::string invitation_id;
+  std::string invitation_id;  // Will remain empty.
   std::string deep_link_url;
   std::string error_string;
   if (result == 0) {
-    if (invitation_id_java != nullptr) {
-      const char* chars = env->GetStringUTFChars(invitation_id_java, nullptr);
-      invitation_id = chars;
-      env->ReleaseStringUTFChars(invitation_id_java, chars);
-    }
     if (deep_link_url_java != nullptr) {
       const char* chars = env->GetStringUTFChars(deep_link_url_java, nullptr);
       deep_link_url = chars;
@@ -339,43 +257,6 @@ Java_com_google_firebase_invites_internal_cpp_AppInviteNativeWrapper_receivedInv
                                           result, error_string);
 }
 
-// A function that receives the callback from the Java side. The
-// "data_ptr" parameter is actually a pointer to our instance of
-// InviteReceiverInternalAndroid, so we can call the proper
-// ConvertedInviteCallback method.
-JNIEXPORT void JNICALL
-Java_com_google_firebase_invites_internal_cpp_AppInviteNativeWrapper_convertedInviteCallback(
-    JNIEnv* env, jclass clazz, jlong data_ptr, jstring invitation_id_java,
-    jint result, jstring error_string_java) {
-  if (data_ptr == 0) return;  // test call only
-
-  // Be careful - we are in a different thread now. No JNI calls are allowed
-  // except on the JNIEnv we were passed, and we have to take care changing the
-  // InvitesReceiverInternal data -- anything we touch needs a lock.
-  std::string invitation_id;
-  std::string error_string;
-  if (result == 0) {
-    if (invitation_id_java != nullptr) {
-      const char* chars = env->GetStringUTFChars(invitation_id_java, nullptr);
-      invitation_id = chars;
-      env->ReleaseStringUTFChars(invitation_id_java, chars);
-    }
-  } else {
-    // result != 0
-    if (error_string_java != nullptr) {
-      const char* chars = env->GetStringUTFChars(error_string_java, nullptr);
-      error_string = chars;
-      env->ReleaseStringUTFChars(error_string_java, chars);
-    }
-  }
-
-  firebase::invites::internal::SenderReceiverInterface* sender_receiver =
-      reinterpret_cast<firebase::invites::internal::SenderReceiverInterface*>(
-          data_ptr);
-
-  sender_receiver->ConvertedInviteCallback(invitation_id, result, error_string);
-}
-
 }  // extern "C"
 
 }  // namespace internal