Apply PR suggestions

Author: RenanLukas

WordPress/src/main/java/org/wordpress/android/sharedlogin/SharedLoginAnalyticsTracker.kt

@@ -1,6 +1,7 @@
 package org.wordpress.android.sharedlogin
 
 import org.wordpress.android.analytics.AnalyticsTracker.Stat
+import org.wordpress.android.sharedlogin.SharedLoginAnalyticsTracker.ErrorType.Companion.ERROR_TYPE
 import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
 import javax.inject.Inject
 
@@ -11,5 +12,16 @@ class SharedLoginAnalyticsTracker @Inject constructor(
 
     fun trackLoginSuccess() = analyticsTracker.track(Stat.SHARED_LOGIN_SUCCESS, emptyMap())
 
-    fun trackLoginFailed() = analyticsTracker.track(Stat.SHARED_LOGIN_FAILED, emptyMap())
+    fun trackLoginFailed(errorType: ErrorType) =
+            analyticsTracker.track(Stat.SHARED_LOGIN_FAILED, mapOf(ERROR_TYPE to errorType))
+
+    sealed class ErrorType(val value: String) {
+        object WPNotLoggedInError : ErrorType("wp_not_logged_in_error")
+
+        object QueryTokenError : ErrorType("query_token_error")
+
+        companion object {
+            const val ERROR_TYPE = "error_type"
+        }
+    }
 }

WordPress/src/main/java/org/wordpress/android/sharedlogin/resolver/SharedLoginResolver.kt

@@ -8,6 +8,7 @@ import org.wordpress.android.provider.query.QueryResult
 import org.wordpress.android.resolver.ContentResolverWrapper
 import org.wordpress.android.sharedlogin.JetpackSharedLoginFlag
 import org.wordpress.android.sharedlogin.SharedLoginAnalyticsTracker
+import org.wordpress.android.sharedlogin.SharedLoginAnalyticsTracker.ErrorType
 import org.wordpress.android.sharedlogin.data.WordPressPublicData
 import org.wordpress.android.sharedlogin.provider.SharedLoginProvider
 import org.wordpress.android.ui.main.WPMainActivity
@@ -45,10 +46,10 @@ class SharedLoginResolver @Inject constructor(
                 dispatchUpdateAccessToken(accessToken)
                 reloadMainScreen()
             } else {
-                trackLoginFailed()
+                sharedLoginAnalyticsTracker.trackLoginFailed(ErrorType.WPNotLoggedInError)
             }
         } else {
-            trackLoginFailed()
+            sharedLoginAnalyticsTracker.trackLoginFailed(ErrorType.QueryTokenError)
         }
     }
 
@@ -74,8 +75,4 @@ class SharedLoginResolver @Inject constructor(
             startActivity(mainActivityIntent)
         }
     }
-
-    private fun trackLoginFailed() {
-        sharedLoginAnalyticsTracker.trackLoginFailed()
-    }
 }

WordPress/src/test/java/org/wordpress/android/sharedlogin/resolver/SharedLoginResolverTest.kt

@@ -3,6 +3,7 @@ package org.wordpress.android.sharedlogin.resolver
 import android.content.ContentResolver
 import android.content.Context
 import android.database.MatrixCursor
+import com.nhaarman.mockitokotlin2.any
 import com.nhaarman.mockitokotlin2.mock
 import com.nhaarman.mockitokotlin2.never
 import com.nhaarman.mockitokotlin2.times
@@ -18,6 +19,7 @@ import org.wordpress.android.provider.query.QueryResult
 import org.wordpress.android.resolver.ContentResolverWrapper
 import org.wordpress.android.sharedlogin.JetpackSharedLoginFlag
 import org.wordpress.android.sharedlogin.SharedLoginAnalyticsTracker
+import org.wordpress.android.sharedlogin.SharedLoginAnalyticsTracker.ErrorType
 import org.wordpress.android.sharedlogin.data.WordPressPublicData
 import org.wordpress.android.sharedlogin.provider.SharedLoginProvider
 import org.wordpress.android.ui.prefs.AppPrefsWrapper
@@ -156,7 +158,7 @@ class SharedLoginResolverTest {
         featureEnabled()
         classToTest.tryJetpackLogin()
         verify(sharedLoginAnalyticsTracker, never()).trackLoginSuccess()
-        verify(sharedLoginAnalyticsTracker, times(1)).trackLoginFailed()
+        verify(sharedLoginAnalyticsTracker, times(1)).trackLoginFailed(ErrorType.QueryTokenError)
     }
 
     @Test
@@ -165,15 +167,15 @@ class SharedLoginResolverTest {
         whenever(queryResult.getValue<String>(mockCursor)).thenReturn(notLoggedInToken)
         classToTest.tryJetpackLogin()
         verify(sharedLoginAnalyticsTracker, never()).trackLoginSuccess()
-        verify(sharedLoginAnalyticsTracker, times(1)).trackLoginFailed()
+        verify(sharedLoginAnalyticsTracker, times(1)).trackLoginFailed(ErrorType.WPNotLoggedInError)
     }
 
     @Test
     fun `Should track login success if access token result cursor IS NOT null AND access token IS NOT empty`() {
         featureEnabled()
         whenever(queryResult.getValue<String>(mockCursor)).thenReturn(loggedInToken)
         classToTest.tryJetpackLogin()
-        verify(sharedLoginAnalyticsTracker, never()).trackLoginFailed()
+        verify(sharedLoginAnalyticsTracker, never()).trackLoginFailed(any())
         verify(sharedLoginAnalyticsTracker, times(1)).trackLoginSuccess()
     }