Commit ae031b7b authored by ekager's avatar ekager Committed by liuche
Browse files

For #11610 - Fire sign in event for other types of auth events

parent 5211bbb6

app/src/main/java/org/mozilla/fenix/components/metrics/LeanplumMetricsService.kt

+28 −20
Original line number Diff line number Diff line
@@ -34,7 +34,9 @@ private val Event.name: String? 
        is Event.InteractWithSearchURLArea -> "E_Interact_With_Search_URL_Area"

        is Event.CollectionSaved -> "E_Collection_Created"

        is Event.CollectionTabRestored -> "E_Collection_Tab_Opened"

        is Event.SyncAuthSignIn -> "E_Sign_In_FxA"

        is Event.SyncAuthSignUp -> "E_FxA_New_Signup"

        is Event.SyncAuthSignIn, Event.SyncAuthPaired, Event.SyncAuthOtherExternal -> "E_Sign_In_FxA"

        is Event.SyncAuthFromShared -> "E_Sign_In_FxA_Fennec_to_Fenix"

        is Event.SyncAuthSignOut -> "E_Sign_Out_FxA"

        is Event.ClearedPrivateData -> "E_Cleared_Private_Data"

        is Event.DismissedOnboarding -> "E_Dismissed_Onboarding"
@@ -122,8 +124,10 @@ class LeanplumMetricsService(private val application: Application) : MetricsServ 
                }

            }



            Leanplum.start(application, hashMapOf(

                "default_browser" to MozillaProductDetector.getMozillaBrowserDefault(application).orEmpty(),

            Leanplum.start(

                application, hashMapOf(

                    "default_browser" to MozillaProductDetector.getMozillaBrowserDefault(application)

                        .orEmpty(),

                    "fennec_installed" to installedApps.contains(MozillaProducts.FIREFOX.productName),

                    "focus_installed" to installedApps.contains(MozillaProducts.FOCUS.productName),

                    "klar_installed" to installedApps.contains(MozillaProducts.KLAR.productName),
@@ -133,7 +137,8 @@ class LeanplumMetricsService(private val application: Application) : MetricsServ 
                    "tracking_protection_enabled" to application.settings().shouldUseTrackingProtection,

                    "tracking_protection_setting" to trackingProtection,

                    "fenix" to true

            ))

                )

            )



            withContext(Main) {

                LeanplumInternal.setCalledStart(true)
@@ -182,7 +187,9 @@ class LeanplumMetricsService(private val application: Application) : MetricsServ 
        get() =

            try {

                this.isO3Language

            } catch (_: MissingResourceException) { null }

            } catch (_: MissingResourceException) {

                null

            }



    companion object {

        private const val LOGTAG = "LeanplumMetricsService"
@@ -193,6 +200,7 @@ class LeanplumMetricsService(private val application: Application) : MetricsServ 
        private val LeanplumToken: String

            // Debug builds have a null (nullable) LEANPLUM_TOKEN

            get() = BuildConfig.LEANPLUM_TOKEN.orEmpty()



        // Leanplum needs to be enabled for the following locales.

        // Irrespective of the actual device location.

        private val LEANPLUM_ENABLED_LOCALES = setOf(

docs/mma.md

+6 −1
Original line number Diff line number Diff line
@@ -221,6 +221,11 @@ Here is the list of current Events sent, which can be found here in the code bas 
    <td>The user successfully signed in to FxA</td>

    <td><a href="https://github.com/mozilla-mobile/fenix/pull/4626#issuecomment-519691332">#4626</a></td>

  </tr>

  <tr>

    <td>`E_Sign_In_FxA_Fennec_to_Fenix`</td>

    <td>The user successfully signed in to FxA using previously signed in Fennec account</td>

    <td><a href="https://github.com/mozilla-mobile/fenix/pull/4626#issuecomment-519691332">#4626</a></td>

  </tr>

  <tr>

    <td>`E_Sign_Out_FxA`</td>

    <td>The user successfully signed out of FxA</td>