Merge branch 'feature/python-scripts-update-ios-android-dependencies' of https://github.com/firebase/firebase-cpp-sdk into feature/python-scripts-update-ios-android-dependencies

Author: vimanyu

.github/workflows/integration_tests.yml

@@ -99,9 +99,6 @@ TEST_F(FirebaseAnalyticsTest, TestSetProperties) {
       firebase::analytics::kUserPropertySignUpMethod, "Google");
   // Set the user ID.
   firebase::analytics::SetUserId("my_integration_test_user");
-
-  firebase::analytics::SetCurrentScreen(
-      "Firebase Analytics C++ integration test", "integration_test");
 }
 
 TEST_F(FirebaseAnalyticsTest, TestLogEvents) {

analytics/integration_test/src/integration_test.cc

@@ -50,8 +50,6 @@ static const ::firebase::App* g_app = nullptr;
   X(LogEvent, "logEvent", "(Ljava/lang/String;Landroid/os/Bundle;)V"),        \
   X(SetUserProperty, "setUserProperty",                                       \
     "(Ljava/lang/String;Ljava/lang/String;)V"),                               \
-  X(SetCurrentScreen, "setCurrentScreen",                                     \
-    "(Landroid/app/Activity;Ljava/lang/String;Ljava/lang/String;)V"),         \
   X(SetUserId, "setUserId", "(Ljava/lang/String;)V"),                         \
   X(SetSessionTimeoutDuration, "setSessionTimeoutDuration", "(J)V"),          \
   X(ResetAnalyticsData, "resetAnalyticsData", "()V"),                         \
@@ -309,64 +307,6 @@ void SetSessionTimeoutDuration(int64_t milliseconds) {
   util::CheckAndClearJniExceptions(env);
 }
 
-namespace {
-// Data passed into SetCurrentScreen, stored here because it is needed on a
-// different thread.
-struct SetCurrentScreenData {
-  SetCurrentScreenData() : screen_name(nullptr), screen_class(nullptr) {}
-  SetCurrentScreenData(const char* screen_name_, const char* screen_class_)
-      : screen_name(screen_name_ ? new std::string(screen_name_) : nullptr),
-        screen_class(screen_class_ ? new std::string(screen_class_) : nullptr) {
-  }
-  ~SetCurrentScreenData() {
-    if (screen_name) delete screen_name;
-    screen_name = nullptr;
-    if (screen_class) delete screen_class;
-    screen_class = nullptr;
-  }
-  // These are pointers to std::string because these can be null.
-  std::string* screen_name;
-  std::string* screen_class;
-};
-}  // namespace
-
-static void SetCurrentScreenReal(void* raw_data) {
-  SetCurrentScreenData* data =
-      reinterpret_cast<SetCurrentScreenData*>(raw_data);
-  raw_data = nullptr;
-  const char* screen_name =
-      data->screen_name ? data->screen_name->c_str() : nullptr;
-  const char* screen_class =
-      data->screen_class ? data->screen_class->c_str() : nullptr;
-
-  JNIEnv* env = g_app->GetJNIEnv();
-  jstring jni_screen_name =
-      screen_name ? env->NewStringUTF(screen_name) : nullptr;
-  jstring jni_screen_class =
-      screen_class ? env->NewStringUTF(screen_class) : nullptr;
-  env->CallVoidMethod(g_analytics_class_instance,
-                      analytics::GetMethodId(analytics::kSetCurrentScreen),
-                      g_app->activity(), jni_screen_name, jni_screen_class);
-  if (util::CheckAndClearJniExceptions(env)) {
-    LogError("Unable to set current screen name='%s', class='%s'", screen_name,
-             screen_class);
-  }
-  if (jni_screen_name) env->DeleteLocalRef(jni_screen_name);
-  if (jni_screen_class) env->DeleteLocalRef(jni_screen_class);
-
-  delete data;
-}
-
-void SetCurrentScreen(const char* screen_name, const char* screen_class) {
-  FIREBASE_ASSERT_RETURN_VOID(internal::IsInitialized());
-  // Run SetCurrentScreen on the main thread.
-  SetCurrentScreenData* data =
-      new SetCurrentScreenData(screen_name, screen_class);
-  // The callback will delete `data`.
-  util::RunOnMainThread(g_app->GetJNIEnv(), g_app->activity(),
-                        SetCurrentScreenReal, data);
-}
-
 void ResetAnalyticsData() {
   FIREBASE_ASSERT_RETURN_VOID(internal::IsInitialized());
   JNIEnv* env = g_app->GetJNIEnv();

analytics/src/analytics_android.cc

@@ -243,12 +243,6 @@ void SetSessionTimeoutDuration(int64_t milliseconds) {
       setSessionTimeoutInterval:static_cast<NSTimeInterval>(milliseconds) / kMillisecondsPerSecond];
 }
 
-void SetCurrentScreen(const char* screen_name, const char* screen_class) {
-  FIREBASE_ASSERT_RETURN_VOID(internal::IsInitialized());
-  [FIRAnalytics setScreenName:screen_name ? @(screen_name) : nil
-                  screenClass:screen_class ? @(screen_class) : nil];
-}
-
 void ResetAnalyticsData() {
   MutexLock lock(g_mutex);
   FIREBASE_ASSERT_RETURN_VOID(internal::IsInitialized());

analytics/src/analytics_ios.mm

@@ -109,11 +109,6 @@ void SetSessionTimeoutDuration(int64_t /*milliseconds*/) {
   FIREBASE_ASSERT_RETURN_VOID(internal::IsInitialized());
 }
 
-void SetCurrentScreen(const char* /*screen_name*/,
-                      const char* /*screen_class*/) {
-  FIREBASE_ASSERT_RETURN_VOID(internal::IsInitialized());
-}
-
 void ResetAnalyticsData() {
   FIREBASE_ASSERT_RETURN_VOID(internal::IsInitialized());
   g_fake_instance_id++;

analytics/src/analytics_stub.cc

@@ -497,18 +497,6 @@ void SetUserId(const char* user_id);
 /// session.
 void SetSessionTimeoutDuration(int64_t milliseconds);
 
-/// @brief Sets the current screen name and screen class, which specifies the
-/// current visual context in your app. This helps identify the areas in your
-/// app where users spend their time and how they interact with your app.
-///
-/// @param screen_name The name of the current screen. Set to nullptr to clear
-/// the current screen name. Limited to 100 characters.
-/// @param screen_class The name of the screen class. If you specify nullptr for
-/// this, it will use the default. On Android, the default is the class name of
-/// the current Activity. On iOS, the default is the class name of the current
-/// UIViewController. Limited to 100 characters.
-void SetCurrentScreen(const char* screen_name, const char* screen_class);
-
 /// Clears all analytics data for this app from the device and resets the app
 /// instance id.
 void ResetAnalyticsData();

analytics/src/include/firebase/analytics.h

@@ -25,9 +25,6 @@
 
 + (void)setUserID:(nullable NSString *)userID;
 
-+ (void)setScreenName:(nullable NSString *)screenName
-          screenClass:(nullable NSString *)screenClassOverride;
-
 + (void)setAnalyticsCollectionEnabled:(BOOL)analyticsCollectionEnabled;
 
 + (void)setSessionTimeoutInterval:(NSTimeInterval)sessionTimeoutInterval;

analytics/src_ios/fake/FIRAnalytics.h

@@ -64,13 +64,6 @@ + (void)setUserID:(nullable NSString *)userID {
   FakeReporter->AddReport("+[FIRAnalytics setUserID:]", { userID ? [userID UTF8String] : "nil" });
 }
 
-+ (void)setScreenName:(nullable NSString *)screenName
-          screenClass:(nullable NSString *)screenClassOverride {
-  FakeReporter->AddReport("+[FIRAnalytics setScreenName:screenClass:]",
-      { screenName ? [screenName UTF8String] : "nil",
-        screenClassOverride ? [screenClassOverride UTF8String] : "nil" });
-}
-
 + (void)setSessionTimeoutInterval:(NSTimeInterval)sessionTimeoutInterval {
   FakeReporter->AddReport(
       "+[FIRAnalytics setSessionTimeoutInterval:]",

analytics/src_ios/fake/FIRAnalytics.mm

@@ -68,12 +68,6 @@ public void setUserProperty(String name, String value) {
     FakeReporter.addReport("FirebaseAnalytics.setUserProperty", name, String.valueOf(value));
   }
 
-  public void setCurrentScreen(Activity activity, String screenName,
-      String screenClassOverride) {
-    FakeReporter.addReport("FirebaseAnalytics.setCurrentScreen", activity.getClass().getName(),
-        String.valueOf(screenName), String.valueOf(screenClassOverride));
-  }
-
   public void setUserId(String userId) {
     FakeReporter.addReport("FirebaseAnalytics.setUserId", String.valueOf(userId));
   }

analytics/src_java/fake/com/google/firebase/analytics/FirebaseAnalytics.java

@@ -259,36 +259,6 @@ TEST_F(AnalyticsTest, TestSetSessionTimeoutDuration) {
   SetSessionTimeoutDuration(1000);
 }
 
-TEST_F(AnalyticsTest, TestSetCurrentScreen) {
-  AddExpectationAndroid("FirebaseAnalytics.setCurrentScreen",
-                        {"android.app.Activity", "my_screen", "my_class"});
-  AddExpectationApple("+[FIRAnalytics setScreenName:screenClass:]",
-                      {"my_screen", "my_class"});
-
-  SetCurrentScreen("my_screen", "my_class");
-  WaitForMainThreadTask();
-}
-
-TEST_F(AnalyticsTest, TestSetCurrentScreenNullScreen) {
-  AddExpectationAndroid("FirebaseAnalytics.setCurrentScreen",
-                        {"android.app.Activity", "null", "my_class"});
-  AddExpectationApple("+[FIRAnalytics setScreenName:screenClass:]",
-                      {"nil", "my_class"});
-
-  SetCurrentScreen(nullptr, "my_class");
-  WaitForMainThreadTask();
-}
-
-TEST_F(AnalyticsTest, TestSetCurrentScreenNullClass) {
-  AddExpectationAndroid("FirebaseAnalytics.setCurrentScreen",
-                        {"android.app.Activity", "my_screen", "null"});
-  AddExpectationApple("+[FIRAnalytics setScreenName:screenClass:]",
-                      {"my_screen", "nil"});
-
-  SetCurrentScreen("my_screen", nullptr);
-  WaitForMainThreadTask();
-}
-
 TEST_F(AnalyticsTest, TestResetAnalyticsData) {
   AddExpectationAndroid("FirebaseAnalytics.resetAnalyticsData", {});
   AddExpectationApple("+[FIRAnalytics resetAnalyticsData]", {});