Removed remaining references to deprecated util::GetExceptionMessage()

Also, deleted util::GetExceptionMessage().

PiperOrigin-RevId: 265696279

Author: smiles

app/src/util_android.h

@@ -1161,13 +1161,6 @@ bool CheckAndClearJniExceptions(JNIEnv* env);
 // Otherwise, it will return an empty string.
 std::string GetAndClearExceptionMessage(JNIEnv* env);
 
-// Deprecated method.
-static inline bool GetExceptionMessage(JNIEnv* env,
-                                       std::string* exception_message_out) {
-  *exception_message_out = GetAndClearExceptionMessage(env);
-  return !exception_message_out->empty();
-}
-
 // Returns the message from an exception.
 // This does not clear the JNI exception state.
 std::string GetMessageFromException(JNIEnv* env, jobject exception);

dynamic_links/src/dynamic_links_android.cc

@@ -694,7 +694,8 @@ static jobject PopulateLinkBuilder(JNIEnv* jni_env,
   link_builder =
       SetBuilderUri(jni_env, link_builder, components.link,
                     dlink_builder::GetMethodId(dlink_builder::kSetLink));
-  if (util::GetExceptionMessage(jni_env, error_out)) {
+  *error_out = util::GetAndClearExceptionMessage(jni_env);
+  if (error_out->size()) {
     // setLink() threw an exception.
     jni_env->DeleteLocalRef(link_builder);
     return nullptr;
@@ -708,7 +709,8 @@ static jobject PopulateLinkBuilder(JNIEnv* jni_env,
   link_builder = SetBuilderString(
       jni_env, link_builder, domain.c_str(),
       dlink_builder::GetMethodId(dlink_builder::kSetDomainUriPrefix));
-  if (util::GetExceptionMessage(jni_env, error_out)) {
+  *error_out = util::GetAndClearExceptionMessage(jni_env);
+  if (error_out->size()) {
     // setDomainUriPrefix() threw an exception.
     jni_env->DeleteLocalRef(link_builder);
     return nullptr;
@@ -787,7 +789,8 @@ static jobject PopulateLinkBuilder(JNIEnv* jni_env, const char* long_link,
   jobject link_builder = jni_env->CallObjectMethod(
       g_dynamic_links_class_instance,
       dynamic_links::GetMethodId(dynamic_links::kCreateDynamicLink));
-  if (util::GetExceptionMessage(jni_env, error_out)) {
+  *error_out = util::GetAndClearExceptionMessage(jni_env);
+  if (error_out->size()) {
     jni_env->DeleteLocalRef(link_builder);
     return nullptr;
   }
@@ -844,15 +847,17 @@ GeneratedDynamicLink GetLongLink(const DynamicLinkComponents& components) {
   jobject dlink_local = jni_env->CallObjectMethod(
       link_builder,
       dlink_builder::GetMethodId(dlink_builder::kBuildDynamicLink));
-  if (util::GetExceptionMessage(jni_env, &gen_link.error)) {
+  gen_link.error = util::GetAndClearExceptionMessage(jni_env);
+  if (gen_link.error.size()) {
     jni_env->DeleteLocalRef(dlink_local);
     jni_env->DeleteLocalRef(link_builder);
     return gen_link;
   }
 
   jobject uri_local = jni_env->CallObjectMethod(
       dlink_local, dlink::GetMethodId(dlink::kGetUri));
-  if (util::GetExceptionMessage(jni_env, &gen_link.error)) {
+  gen_link.error = util::GetAndClearExceptionMessage(jni_env);
+  if (gen_link.error.size()) {
     jni_env->DeleteLocalRef(uri_local);
     jni_env->DeleteLocalRef(dlink_local);
     jni_env->DeleteLocalRef(link_builder);
@@ -948,8 +953,8 @@ static Future<GeneratedDynamicLink> HandleShortLinkTask(
         dlink_builder::GetMethodId(dlink_builder::kBuildShortDynamicLink));
   }
 
-  std::string exception_message;
-  if (util::GetExceptionMessage(jni_env, &exception_message)) {
+  std::string exception_message = util::GetAndClearExceptionMessage(jni_env);
+  if (exception_message.size()) {
     GeneratedDynamicLink gen_link;
     gen_link.error = exception_message;
     LogError("Couldn't build short link: %s", exception_message.c_str());