Rename and refactor all of the source files and namespaces.

Author: jonsimantov

ump/src/android/consent_info_internal_android.cc

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "gma/src/android/ump/consent_info_internal_android.h"
+#include "ump/src/android/consent_info_internal_android.h"
 
 #include <jni.h>
 
@@ -25,17 +25,13 @@
 #include "app/src/thread.h"
 #include "app/src/util_android.h"
 #include "firebase/internal/common.h"
-#include "gma/gma_resources.h"
-#include "gma/src/android/gma_android.h"
+#include "ump/ump_resources.h"
+#include "ump/src/android/ump_android.h"
 
 namespace firebase {
-namespace gma {
 namespace ump {
 namespace internal {
 
-ConsentInfoInternalAndroid* ConsentInfoInternalAndroid::s_instance = nullptr;
-firebase::Mutex ConsentInfoInternalAndroid::s_instance_mutex;
-
 // clang-format off
 #define CONSENTINFOHELPER_METHODS(X)                                            \
   X(Constructor, "<init>", "(JLandroid/app/Activity;)V"),                       \
@@ -83,7 +79,7 @@ METHOD_LOOKUP_DECLARATION(consent_info_helper, CONSENTINFOHELPER_METHODS,
 
 METHOD_LOOKUP_DEFINITION(
     consent_info_helper,
-    "com/google/firebase/gma/internal/cpp/ConsentInfoHelper",
+    "com/google/firebase/ump/internal/cpp/ConsentInfoHelper",
     CONSENTINFOHELPER_METHODS, CONSENTINFOHELPER_FIELDS);
 
 // clang-format off
@@ -263,23 +259,23 @@ ConsentInfoInternalAndroid::ConsentInfoInternalAndroid(JNIEnv* env,
   util::Initialize(env, activity);
   env->GetJavaVM(&java_vm_);
 
-  // Between this and GMA, we only want to load these files once.
+  // Ensure we only load these files once.
   {
     MutexLock lock(
-        ::firebase::gma::internal::g_cached_gma_embedded_files_mutex);
-    if (::firebase::gma::internal::g_cached_gma_embedded_files == nullptr) {
-      ::firebase::gma::internal::g_cached_gma_embedded_files =
+        ::firebase::ump::internal::g_cached_ump_embedded_files_mutex);
+    if (::firebase::ump::internal::g_cached_ump_embedded_files == nullptr) {
+      ::firebase::ump::internal::g_cached_ump_embedded_files =
           new std::vector<firebase::internal::EmbeddedFile>();
-      *::firebase::gma::internal::g_cached_gma_embedded_files =
+      *::firebase::ump::internal::g_cached_ump_embedded_files =
           util::CacheEmbeddedFiles(env, activity,
                                    firebase::internal::EmbeddedFile::ToVector(
-                                       firebase_gma::gma_resources_filename,
-                                       firebase_gma::gma_resources_data,
-                                       firebase_gma::gma_resources_size));
+                                       firebase_ump::ump_resources_filename,
+                                       firebase_ump::ump_resources_data,
+                                       firebase_ump::ump_resources_size));
     }
   }
   const std::vector<firebase::internal::EmbeddedFile>& embedded_files =
-      *::firebase::gma::internal::g_cached_gma_embedded_files;
+      *::firebase::ump::internal::g_cached_ump_embedded_files;
 
   if (!(consent_info_helper::CacheClassFromFiles(env, activity,
                                                  &embedded_files) != nullptr &&
@@ -335,7 +331,7 @@ ConsentStatus ConsentInfoInternalAndroid::CppConsentStatusFromAndroid(
   if (status == enums().consentstatus_not_required)
     return kConsentStatusNotRequired;
   if (status == enums().consentstatus_obtained) return kConsentStatusObtained;
-  LogWarning("GMA: Unknown ConsentStatus returned by UMP Android SDK: %d",
+  LogWarning("UMP: Unknown ConsentStatus returned by UMP Android SDK: %d",
              (int)status);
   return kConsentStatusUnknown;
 }
@@ -350,7 +346,7 @@ ConsentInfoInternalAndroid::CppPrivacyOptionsRequirementStatusFromAndroid(
   if (status == enums().privacy_options_requirement_not_required)
     return kPrivacyOptionsRequirementStatusNotRequired;
   LogWarning(
-      "GMA: Unknown PrivacyOptionsRequirementStatus returned by UMP Android "
+      "UMP: Unknown PrivacyOptionsRequirementStatus returned by UMP Android "
       "SDK: %d",
       (int)status);
   return kPrivacyOptionsRequirementStatusUnknown;
@@ -387,7 +383,7 @@ ConsentInfoInternalAndroid::CppConsentRequestErrorFromAndroidFormError(
     else
       return kConsentRequestErrorInvalidOperation;
   }
-  LogWarning("GMA: Unknown RequestError returned by UMP Android SDK: %d (%s)",
+  LogWarning("UMP: Unknown RequestError returned by UMP Android SDK: %d (%s)",
              (int)error, message ? message : "");
   return kConsentRequestErrorUnknown;
 }
@@ -410,7 +406,7 @@ ConsentInfoInternalAndroid::CppConsentFormErrorFromAndroidFormError(
     else
       return kConsentFormErrorInvalidOperation;
   }
-  LogWarning("GMA: Unknown RequestError returned by UMP Android SDK: %d (%s)",
+  LogWarning("UMP: Unknown RequestError returned by UMP Android SDK: %d (%s)",
              (int)error, message ? message : "");
   return kConsentFormErrorUnknown;
 }
@@ -664,5 +660,4 @@ void ConsentInfoInternalAndroid::CompleteFutureFromJniCallback(
 
 }  // namespace internal
 }  // namespace ump
-}  // namespace gma
 }  // namespace firebase

ump/src/android/consent_info_internal_android.h

@@ -14,19 +14,43 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_GMA_SRC_ANDROID_UMP_CONSENT_INFO_INTERNAL_ANDROID_H_
-#define FIREBASE_GMA_SRC_ANDROID_UMP_CONSENT_INFO_INTERNAL_ANDROID_H_
+#ifndef FIREBASE_UMP_SRC_ANDROID_CONSENT_INFO_INTERNAL_ANDROID_H_
+#define FIREBASE_UMP_SRC_ANDROID_CONSENT_INFO_INTERNAL_ANDROID_H_
 
 #include <jni.h>
 
 #include "app/src/util_android.h"
 #include "firebase/internal/mutex.h"
-#include "gma/src/common/ump/consent_info_internal.h"
+#include "ump/src/common/consent_info_internal.h"
 
 namespace firebase {
-namespace gma {
 namespace ump {
+
+// clang-format off
+#define UMP_INITIALIZATION_HELPER_METHODS(X)                                 \
+  X(InitializeUmp, "initializeUmp", "(Landroid/content/Context;)V",          \
+    util::kMethodTypeStatic)
+// clang-format on
+
+METHOD_LOOKUP_DECLARATION(ump_initialization_helper,
+                          UMP_INITIALIZATION_HELPER_METHODS);
+
+// Needed when UMP is initialized without Firebase.
+JNIEnv* GetJNI();
+
+// Retrieves the activity used to initialize UMP.
+jobject GetActivity();
+
+// Register the native callbacks needed by the Futures.
+bool RegisterNatives();
+
+// Release classes registered by this module.
+void ReleaseClasses(JNIEnv* env);
+
 namespace internal {
+extern ::firebase::Mutex g_cached_ump_embedded_files_mutex;
+extern std::vector<::firebase::internal::EmbeddedFile>*
+    g_cached_ump_embedded_files;
 
 class ConsentInfoInternalAndroid : public ConsentInfoInternal {
  public:
@@ -126,7 +150,6 @@ class ConsentInfoInternalAndroid : public ConsentInfoInternal {
 
 }  // namespace internal
 }  // namespace ump
-}  // namespace gma
 }  // namespace firebase
 
-#endif  // FIREBASE_GMA_SRC_ANDROID_UMP_CONSENT_INFO_INTERNAL_ANDROID_H_
+#endif  // FIREBASE_UMP_SRC_ANDROID_CONSENT_INFO_INTERNAL_ANDROID_H_

ump/src/common/consent_info.cc

@@ -14,16 +14,15 @@
  * limitations under the License.
  */
 
-#include "firebase/gma/ump/consent_info.h"
+#include "firebase/ump/consent_info.h"
 
 #include "app/src/assert.h"
 #include "firebase/app.h"
-#include "firebase/gma/ump.h"
+#include "firebase/ump.h"
 #include "firebase/internal/platform.h"
-#include "gma/src/common/ump/consent_info_internal.h"
+#include "ump//src/common/consent_info_internal.h"
 
 namespace firebase {
-namespace gma {
 namespace ump {
 
 ConsentInfo* ConsentInfo::s_instance_ = nullptr;
@@ -180,5 +179,4 @@ void ConsentInfo::Reset() {
 }
 
 }  // namespace ump
-}  // namespace gma
 }  // namespace firebase

ump/src/common/consent_info_internal.cc

@@ -14,12 +14,11 @@
  * limitations under the License.
  */
 
-#include "gma/src/common/ump/consent_info_internal.h"
+#include "ump/src/common/consent_info_internal.h"
 
 #include "app/src/include/firebase/internal/platform.h"
 
 namespace firebase {
-namespace gma {
 namespace ump {
 namespace internal {
 
@@ -86,5 +85,4 @@ const char* ConsentInfoInternal::GetConsentFormErrorMessage(
 
 }  // namespace internal
 }  // namespace ump
-}  // namespace gma
 }  // namespace firebase

ump/src/common/consent_info_internal.h

@@ -14,22 +14,21 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_GMA_SRC_COMMON_UMP_CONSENT_INFO_INTERNAL_H_
-#define FIREBASE_GMA_SRC_COMMON_UMP_CONSENT_INFO_INTERNAL_H_
+#ifndef FIREBASE_UMP_SRC_COMMON_CONSENT_INFO_INTERNAL_H_
+#define FIREBASE_UMP_SRC_COMMON_CONSENT_INFO_INTERNAL_H_
 
 #include "app/src/cleanup_notifier.h"
 #include "app/src/reference_counted_future_impl.h"
 #include "firebase/future.h"
-#include "firebase/gma/ump.h"
-#include "firebase/gma/ump/types.h"
+#include "firebase/ump.h"
+#include "firebase/ump/types.h"
 #include "firebase/internal/platform.h"
 
 #if FIREBASE_PLATFORM_ANDROID
 #include <jni.h>
 #endif
 
 namespace firebase {
-namespace gma {
 namespace ump {
 namespace internal {
 
@@ -136,7 +135,6 @@ class ConsentInfoInternal {
 
 }  // namespace internal
 }  // namespace ump
-}  // namespace gma
 }  // namespace firebase
 
-#endif  // FIREBASE_GMA_SRC_COMMON_UMP_CONSENT_INFO_INTERNAL_H_
+#endif  // FIREBASE_UMP_SRC_COMMON_CONSENT_INFO_INTERNAL_H_

ump/src/include/firebase/ump.h

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_GMA_SRC_INCLUDE_FIREBASE_GMA_UMP_H_
-#define FIREBASE_GMA_SRC_INCLUDE_FIREBASE_GMA_UMP_H_
+#ifndef FIREBASE_UMP_SRC_INCLUDE_FIREBASE_UMP_H_
+#define FIREBASE_UMP_SRC_INCLUDE_FIREBASE_UMP_H_
 
-#include "firebase/gma/ump/consent_info.h"
-#include "firebase/gma/ump/types.h"
+#include "firebase/ump/consent_info.h"
+#include "firebase/ump/types.h"
 
-#endif  // FIREBASE_GMA_SRC_INCLUDE_FIREBASE_GMA_UMP_H_
+#endif  // FIREBASE_UMP_SRC_INCLUDE_FIREBASE_UMP_H_

ump/src/include/firebase/ump/consent_info.h

@@ -14,20 +14,19 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_GMA_SRC_INCLUDE_FIREBASE_GMA_UMP_CONSENT_INFO_H_
-#define FIREBASE_GMA_SRC_INCLUDE_FIREBASE_GMA_UMP_CONSENT_INFO_H_
+#ifndef FIREBASE_UMP_SRC_INCLUDE_FIREBASE_UMP_CONSENT_INFO_H_
+#define FIREBASE_UMP_SRC_INCLUDE_FIREBASE_UMP_CONSENT_INFO_H_
 
 #include "firebase/app.h"
 #include "firebase/future.h"
-#include "firebase/gma/ump/types.h"
+#include "firebase/ump/types.h"
 #include "firebase/internal/platform.h"
 
 #if FIREBASE_PLATFORM_ANDROID
 #include <jni.h>
 #endif  // FIREBASE_PLATFORM_ANDROID
 
 namespace firebase {
-namespace gma {
 /// @brief API for User Messaging Platform.
 ///
 /// The User Messaging Platform (UMP) SDK is Google’s option to handle user
@@ -75,10 +74,10 @@ class ConsentInfo {
   /// do something like this:
   /// @code
   /// #if defined(__ANDROID__)
-  /// consent_info = firebase::gma::ump::ConsentInfo::GetInstance(jni_env,
+  /// consent_info = firebase::ump::ConsentInfo::GetInstance(jni_env,
   /// activity);
   /// #else
-  /// consent_info = firebase::gma::ump::GetInstance();
+  /// consent_info = firebase::ump::GetInstance();
   /// #endif
   /// @endcode
   ///
@@ -243,7 +242,6 @@ class ConsentInfo {
 };
 
 }  // namespace ump
-}  // namespace gma
 }  // namespace firebase
 
-#endif  // FIREBASE_GMA_SRC_INCLUDE_FIREBASE_GMA_UMP_CONSENT_INFO_H_
+#endif  // FIREBASE_UMP_SRC_INCLUDE_FIREBASE_UMP_CONSENT_INFO_H_

ump/src/include/firebase/ump/types.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_GMA_SRC_INCLUDE_FIREBASE_GMA_UMP_TYPES_H_
-#define FIREBASE_GMA_SRC_INCLUDE_FIREBASE_GMA_UMP_TYPES_H_
+#ifndef FIREBASE_UMP_SRC_INCLUDE_FIREBASE_UMP_TYPES_H_
+#define FIREBASE_UMP_SRC_INCLUDE_FIREBASE_UMP_TYPES_H_
 
 #include <string>
 #include <utility>
@@ -176,4 +176,4 @@ enum PrivacyOptionsRequirementStatus {
 }  // namespace gma
 }  // namespace firebase
 
-#endif  // FIREBASE_GMA_SRC_INCLUDE_FIREBASE_GMA_UMP_TYPES_H_
+#endif  // FIREBASE_UMP_SRC_INCLUDE_FIREBASE_UMP_TYPES_H_

ump/src/ios/consent_info_internal_ios.h

@@ -14,16 +14,15 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_GMA_SRC_IOS_UMP_CONSENT_INFO_INTERNAL_IOS_H_
-#define FIREBASE_GMA_SRC_IOS_UMP_CONSENT_INFO_INTERNAL_IOS_H_
+#ifndef FIREBASE_UMP_SRC_IOS_CONSENT_INFO_INTERNAL_IOS_H_
+#define FIREBASE_UMP_SRC_IOS_CONSENT_INFO_INTERNAL_IOS_H_
 
 #include <UserMessagingPlatform/UserMessagingPlatform.h>
 
 #include "firebase/internal/mutex.h"
-#include "gma/src/common/ump/consent_info_internal.h"
+#include "ump/src/common/consent_info_internal.h"
 
 namespace firebase {
-namespace gma {
 namespace ump {
 namespace internal {
 
@@ -63,7 +62,6 @@ class ConsentInfoInternalIos : public ConsentInfoInternal {
 
 }  // namespace internal
 }  // namespace ump
-}  // namespace gma
 }  // namespace firebase
 
-#endif  // FIREBASE_GMA_SRC_IOS_UMP_CONSENT_INFO_INTERNAL_IOS_H_
+#endif  // FIREBASE_UMP_SRC_IOS_CONSENT_INFO_INTERNAL_IOS_H_