Removed SetCurrentScreen method.

Syncing with the removal from underlying native mobile SDKs.

Author: vimanyu

analytics/integration_test/src/integration_test.cc

@@ -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/src/analytics_android.cc

@@ -357,16 +357,6 @@ static void SetCurrentScreenReal(void* raw_data) {
   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_ios.mm

@@ -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_stub.cc

@@ -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/include/firebase/analytics.h

@@ -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_java/fake/com/google/firebase/analytics/FirebaseAnalytics.java

@@ -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/tests/analytics_test.cc

@@ -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]", {});

release_build_files/readme.md

@@ -365,6 +365,8 @@ code.
 ### 8.0.0
 
 -   Changes
+    -   Analytics: Removed `SetCurrentScreen()` following the removal from underlying
+        native SDKs.
     -   Instance Id: Removed support for the previously-deprecated Instance ID SDK.
     -   Remote Config: The previously-deprecated static methods have been removed.
         Please use the new instance-based `firebase::remote_config::RemoteConfig`