Fixes for the App Check Android testapp (#1281)

* Fixes for the App Check Android testapp

* Formatting

Author: a-maurice

app_check/integration_test/build.gradle

@@ -68,6 +68,7 @@ android {
         "-DFIREBASE_INCLUDE_FUNCTIONS=ON",
         "-DFIREBASE_INCLUDE_FIRESTORE=ON"
     }
+    multiDexEnabled true
   }
   externalNativeBuild.cmake {
     path 'CMakeLists.txt'
@@ -79,6 +80,9 @@ android {
       proguardFile file('proguard.pro')
     }
   }
+  lintOptions {
+    abortOnError false
+  }
 }
 
 apply from: "$gradle.firebase_cpp_sdk_dir/Android/firebase_dependencies.gradle"

app_check/integration_test/src/integration_test.cc

@@ -754,9 +754,24 @@ TEST_F(FirebaseAppCheckTest, TestDatabaseFailure) {
   firebase::database::DatabaseReference ref = CreateWorkingPath();
   const char* test_name = test_info_->name();
   firebase::Future<void> f = ref.Child(test_name).SetValue("test");
+#if FIREBASE_PLATFORM_ANDROID
+  // On Android the future will not complete. This is present in the
+  // underlying Android SDK, so work around it here.
+  ASSERT_EQ(f.status(), firebase::kFutureStatusPending);
+  std::this_thread::sleep_for(std::chrono::milliseconds(2000));
+  ASSERT_EQ(f.status(), firebase::kFutureStatusPending);
+  // Likewise, removal won't finish, so don't wait for it.
+  if (!database_cleanup_.empty()) {
+    LogDebug("Cleaning up Database...");
+    for (int i = 0; i < database_cleanup_.size(); ++i) {
+      database_cleanup_[i].RemoveValue();
+    }
+    database_cleanup_.clear();
+  }
+#else
   WaitForCompletion(f, "SetString", firebase::database::kErrorDisconnected);
-
   CleanupDatabase(firebase::database::kErrorOperationFailed);
+#endif
 }
 
 TEST_F(FirebaseAppCheckTest, TestDatabaseCreateWorkingPath) {

app_check/src/android/app_check_android.cc

@@ -58,6 +58,19 @@ METHOD_LOOKUP_DEFINITION(app_check,
                          "com/google/firebase/appcheck/FirebaseAppCheck",
                          APP_CHECK_METHODS)
 
+// clang-format off
+#define DEFAULT_APP_CHECK_IMPL_METHODS(X)               \
+  X(ResetAppCheckState, "resetAppCheckState", "()V")
+// clang-format on
+
+METHOD_LOOKUP_DECLARATION(default_app_check_impl,
+                          DEFAULT_APP_CHECK_IMPL_METHODS)
+METHOD_LOOKUP_DEFINITION(
+    default_app_check_impl,
+    PROGUARD_KEEP_CLASS
+    "com/google/firebase/appcheck/internal/DefaultFirebaseAppCheck",
+    DEFAULT_APP_CHECK_IMPL_METHODS)
+
 // clang-format off
 #define JNI_APP_CHECK_PROVIDER_FACTORY_METHODS(X)                              \
   X(Constructor, "<init>", "(JJ)V")
@@ -159,11 +172,13 @@ bool CacheAppCheckMethodIds(
             FIREBASE_ARRAYSIZE(kNativeJniAppCheckListenerMethods)))) {
     return false;
   }
-  return app_check::CacheMethodIds(env, activity);
+  return app_check::CacheMethodIds(env, activity) &&
+         default_app_check_impl::CacheMethodIds(env, activity);
 }
 
 void ReleaseAppCheckClasses(JNIEnv* env) {
   app_check::ReleaseClass(env);
+  default_app_check_impl::ReleaseClass(env);
   jni_provider_factory::ReleaseClass(env);
   jni_provider::ReleaseClass(env);
   jni_app_check_listener::ReleaseClass(env);
@@ -359,6 +374,19 @@ AppCheckInternal::~AppCheckInternal() {
     env->DeleteGlobalRef(j_app_check_listener_);
   }
   if (app_check_impl_ != nullptr) {
+    // The Android App Check library holds onto the provider,
+    // which can be a problem if it tries to call up to C++
+    // after being deleted. So we use a hidden function meant
+    // for testing purposes to clear out the App Check state,
+    // to prevent this. Note, this assumes that the java object
+    // is a DefaultFirebaseAppCheck (instead of a FirebaseAppCheck)
+    // which is currently true, but may not be in the future.
+    // We will have to rely on tests to detect if this changes.
+    env->CallVoidMethod(app_check_impl_,
+                        default_app_check_impl::GetMethodId(
+                            default_app_check_impl::kResetAppCheckState));
+    FIREBASE_ASSERT(!util::CheckAndClearJniExceptions(env));
+
     env->DeleteGlobalRef(app_check_impl_);
   }