Merge branch 'develop' into new/take-a-photo

app/src/main/java/chat/rocket/android/analytics/Analytics.kt

@@ -61,7 +61,14 @@ interface Analytics {
     fun logServerSwitch(serverUrl: String, serverCount: Int) {}
 
     /**
-     * Logs the admin opening.
+     * Logs the admin opening event.
      */
     fun logOpenAdmin() {}
+
+    /**
+     * Logs the reset password event.
+     *
+     * @param resetPasswordSucceeded True if successful reset password, false otherwise.
+     */
+    fun logResetPassword(resetPasswordSucceeded: Boolean) {}
 }

app/src/main/java/chat/rocket/android/analytics/AnalyticsManager.kt

@@ -70,4 +70,10 @@ class AnalyticsManager @Inject constructor(
             analytics.forEach { it.logOpenAdmin() }
         }
     }
+
+    fun logResetPassword(resetPasswordSucceeded: Boolean) {
+        if (analyticsTrackingInteractor.get()) {
+            analytics.forEach { it.logResetPassword(resetPasswordSucceeded) }
+        }
+    }
 }

app/src/main/java/chat/rocket/android/settings/password/presentation/PasswordPresenter.kt

 package chat.rocket.android.settings.password.presentation
 
+import chat.rocket.android.analytics.AnalyticsManager
 import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.server.domain.GetCurrentServerInteractor
 import chat.rocket.android.server.infraestructure.RocketChatClientFactory
@@ -14,6 +15,7 @@ import javax.inject.Inject
 class PasswordPresenter @Inject constructor(
     private val view: PasswordView,
     private val strategy: CancelStrategy,
+    private val analyticsManager: AnalyticsManager,
     serverInteractor: GetCurrentServerInteractor,
     factory: RocketChatClientFactory
 ) {
@@ -30,10 +32,12 @@ class PasswordPresenter @Inject constructor(
                     client.updateProfile(me.id, null, null, password, null)
                 }
 
+                analyticsManager.logResetPassword(true)
                 view.showPasswordSuccessfullyUpdatedMessage()
-                view.hideLoading()
             } catch (exception: RocketChatException) {
+                analyticsManager.logResetPassword(false)
                 view.showPasswordFailsUpdateMessage(exception.message)
+            } finally {
                 view.hideLoading()
             }
         }

app/src/play/java/chat/rocket/android/analytics/AnswersAnalytics.kt

@@ -67,4 +67,11 @@ class AnswersAnalytics : Analytics {
             )
 
     override fun logOpenAdmin() = Answers.getInstance().logCustom(CustomEvent("open_admin"))
+
+    override fun logResetPassword(resetPasswordSucceeded: Boolean) =
+        Answers.getInstance()
+            .logCustom(
+                CustomEvent("reset_password")
+                    .putCustomAttribute("resetPasswordSucceeded", resetPasswordSucceeded.toString())
+            )
 }

app/src/play/java/chat/rocket/android/analytics/GoogleAnalyticsForFirebase.kt

@@ -60,4 +60,9 @@ class GoogleAnalyticsForFirebase @Inject constructor(val context: Context) :
     }
 
     override fun logOpenAdmin() = firebaseAnalytics.logEvent("open_admin", null)
+
+    override fun logResetPassword(resetPasswordSucceeded: Boolean) =
+        firebaseAnalytics.logEvent("reset_password", Bundle(1).apply {
+            putBoolean("resetPasswordSucceeded", resetPasswordSucceeded)
+        })
 }