Fix a RuntimeException bug.

Fabric ref.: #3165

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

@@ -2,13 +2,13 @@ package chat.rocket.android.settings.password.presentation
 
 import chat.rocket.android.analytics.AnalyticsManager
 import chat.rocket.android.core.lifecycle.CancelStrategy
+import chat.rocket.android.helper.UserHelper
 import chat.rocket.android.server.domain.GetCurrentServerInteractor
 import chat.rocket.android.server.infraestructure.RocketChatClientFactory
 import chat.rocket.android.util.extension.launchUI
 import chat.rocket.android.util.retryIO
 import chat.rocket.common.RocketChatException
 import chat.rocket.core.RocketChatClient
-import chat.rocket.core.internal.rest.me
 import chat.rocket.core.internal.rest.updateProfile
 import javax.inject.Inject
 
@@ -16,6 +16,7 @@ class PasswordPresenter @Inject constructor(
     private val view: PasswordView,
     private val strategy: CancelStrategy,
     private val analyticsManager: AnalyticsManager,
+    private val userHelp: UserHelper,
     serverInteractor: GetCurrentServerInteractor,
     factory: RocketChatClientFactory
 ) {
@@ -26,14 +27,13 @@ class PasswordPresenter @Inject constructor(
         launchUI(strategy) {
             try {
                 view.showLoading()
-
-                val me = retryIO("me") { client.me() }
-                retryIO("updateProfile(${me.id})") {
-                    client.updateProfile(me.id, null, null, password, null)
+                userHelp.user()?.id?.let { userId ->
+                    retryIO("updateProfile()") {
+                        client.updateProfile(userId, null, null, password, null)
                     }
-
                     analyticsManager.logResetPassword(true)
                     view.showPasswordSuccessfullyUpdatedMessage()
+                }
             } catch (exception: RocketChatException) {
                 analyticsManager.logResetPassword(false)
                 view.showPasswordFailsUpdateMessage(exception.message)

app/src/main/java/chat/rocket/android/settings/password/ui/PasswordFragment.kt

@@ -6,7 +6,6 @@ import android.view.Menu
 import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
-import android.widget.Toast
 import androidx.appcompat.view.ActionMode
 import androidx.fragment.app.Fragment
 import chat.rocket.android.R
@@ -16,6 +15,7 @@ import chat.rocket.android.settings.password.presentation.PasswordPresenter
 import chat.rocket.android.settings.password.presentation.PasswordView
 import chat.rocket.android.util.extension.asObservable
 import chat.rocket.android.util.extensions.inflate
+import chat.rocket.android.util.extensions.showToast
 import chat.rocket.android.util.extensions.textContent
 import chat.rocket.android.util.extensions.ui
 import dagger.android.support.AndroidSupportInjection
@@ -33,7 +33,7 @@ class PasswordFragment : Fragment(), PasswordView, ActionMode.Callback {
     @Inject
     lateinit var analyticsManager: AnalyticsManager
     private var actionMode: ActionMode? = null
-    private val disposables = CompositeDisposable()
+    private val compositeDisposable = CompositeDisposable()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         AndroidSupportInjection.inject(this)
@@ -48,14 +48,12 @@ class PasswordFragment : Fragment(), PasswordView, ActionMode.Callback {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-
-        disposables.add(listenToChanges())
-
+        compositeDisposable.add(listenToChanges())
         analyticsManager.logScreenView(ScreenViewEvent.Password)
     }
 
     override fun onDestroyView() {
-        disposables.clear()
+        compositeDisposable.clear()
         super.onDestroyView()
     }
 
@@ -74,21 +72,19 @@ class PasswordFragment : Fragment(), PasswordView, ActionMode.Callback {
                 mode.finish()
                 return true
             }
-            else -> {
-                false
-            }
+            else -> false
         }
     }
 
-    override fun onCreateActionMode(mode: ActionMode, menu: Menu?): Boolean {
+    override fun onCreateActionMode(mode: ActionMode, menu: Menu): Boolean {
         mode.menuInflater.inflate(R.menu.password, menu)
         mode.title = resources.getString(R.string.action_confirm_password)
         return true
     }
 
-    override fun onPrepareActionMode(mode: ActionMode?, menu: Menu?): Boolean = false
+    override fun onPrepareActionMode(mode: ActionMode, menu: Menu?): Boolean = false
 
-    override fun onDestroyActionMode(mode: ActionMode?) {
+    override fun onDestroyActionMode(mode: ActionMode) {
         actionMode = null
     }
 
@@ -101,11 +97,11 @@ class PasswordFragment : Fragment(), PasswordView, ActionMode.Callback {
     }
 
     override fun showPasswordFailsUpdateMessage(error: String?) {
-        showToast("Password fails to update: " + error)
+        showToast(getString(R.string.msg_unable_to_update_password, error))
     }
 
     override fun showPasswordSuccessfullyUpdatedMessage() {
-        showToast("Password was successfully updated!")
+        showToast(R.string.msg_password_updated_successfully)
     }
 
     private fun finishActionMode() = actionMode?.finish()
@@ -115,23 +111,14 @@ class PasswordFragment : Fragment(), PasswordView, ActionMode.Callback {
             text_new_password.asObservable(),
             text_confirm_password.asObservable()
         ).subscribe {
-            val textPassword = text_new_password.textContent
-            val textConfirmPassword = text_confirm_password.textContent
-
-            if (textPassword.length > 5 && textConfirmPassword.length > 5 && textPassword.equals(
-                    textConfirmPassword
-                )
-            )
+            val newPassword = it.first.toString()
+            val newPasswordConfirmation = it.second.toString()
+            if (newPassword.length > 5 && newPassword == newPasswordConfirmation) {
                 startActionMode()
-            else
+            } else {
                 finishActionMode()
             }
         }
-
-    private fun showToast(msg: String?) {
-        ui {
-            Toast.makeText(it, msg, Toast.LENGTH_LONG).show()
-        }
     }
 
     private fun startActionMode() {

app/src/main/res/layout/fragment_password.xml

 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     tools:context=".settings.password.ui.PasswordFragment">
 
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/layout_new_password"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_margin="16dp"
         android:theme="@style/EditText.Password"
-        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        android:layout_margin="16dp"
-        >
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
         <EditText
             android:id="@+id/text_new_password"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:hint="@string/msg_new_password"
-            android:inputType="textPassword"
-            />
+            android:inputType="textPassword" />
     </com.google.android.material.textfield.TextInputLayout>
 
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/layout_confirm_password"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_margin="16dp"
         android:theme="@style/EditText.Password"
-        app:layout_constraintTop_toBottomOf="@+id/layout_new_password"
-        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        android:layout_margin="16dp"
-        >
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/layout_new_password">
+
         <EditText
             android:id="@+id/text_confirm_password"
             android:layout_width="match_parent"
@@ -47,12 +46,13 @@
         android:id="@+id/view_loading"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        tools:visibility="visible"
         android:visibility="gone"
         app:indicatorColor="@color/colorBlack"
         app:indicatorName="BallPulseIndicator"
-        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"/>
+        tools:visibility="visible" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

app/src/main/res/values-de/strings.xml

@@ -157,15 +157,15 @@
     <string name="msg_continue_with_wordpress">Continue with <b>WordPress</b></string> <!-- TODO Add translation -->
     <string name="msg_two_factor_authentication">Two-factor Authentication</string> <!-- TODO Add translation -->
     <string name="msg__your_2fa_code">What’s your 2FA code?</string> <!-- TODO Add translation -->
-    <!-- TODO - Add proper translation -->
-    <string name="msg_muted_on_this_channel">You are muted on this channel</string>
+    <string name="msg_muted_on_this_channel">You are muted on this channel</string>     <!-- TODO - Add proper translation -->
     <string name="msg_no_topic">No topic added</string> <!-- TODO Add translation -->
     <string name="msg_no_announcement">No announcement added</string> <!-- TODO Add translation -->
     <string name="msg_no_description">No description added</string> <!-- TODO Add translation -->
-    <!-- TODO - Add proper translation -->
+    <string name="msg_unable_to_update_password">Unable to update password. Error message: %1$s</string> <!-- TODO - Add proper translation -->
+    <string name="msg_password_updated_successfully">Password updated successfully</string> <!-- TODO - Add proper translation -->
     <plurals name="msg_reacted_with_">
-        <item quantity="one">%1$s reacted with %2$s</item>
-        <item quantity="other">%1$s reacted with %2$s</item>
+        <item quantity="one">%1$s reacted with %2$s</item>     <!-- TODO - Add proper translation -->
+        <item quantity="other">%1$s reacted with %2$s</item>     <!-- TODO - Add proper translation -->
     </plurals>
 
     <!-- Create channel messages -->

app/src/main/res/values-es/strings.xml

@@ -178,7 +178,8 @@
     <string name="msg_no_topic">No topic added</string> <!-- TODO Add translation -->
     <string name="msg_no_announcement">No announcement added</string> <!-- TODO Add translation -->
     <string name="msg_no_description">No description added</string> <!-- TODO Add translation -->
-
+    <string name="msg_unable_to_update_password">Unable to update password. Error message: %1$s</string> <!-- TODO - Add proper translation -->
+    <string name="msg_password_updated_successfully">Password updated successfully</string> <!-- TODO - Add proper translation -->
     <plurals name="msg_reacted_with_">
         <item quantity="one">%1$s reacted with %2$s</item> <!-- TODO - Add proper translation -->
         <item quantity="other">%1$s reacted with %2$s</item> <!-- TODO - Add proper translation -->

app/src/main/res/values-fr/strings.xml

@@ -170,7 +170,8 @@
     <string name="msg_no_topic">No topic added</string> <!-- TODO Add translation -->
     <string name="msg_no_announcement">No announcement added</string> <!-- TODO Add translation -->
     <string name="msg_no_description">No description added</string> <!-- TODO Add translation -->
-
+    <string name="msg_unable_to_update_password">Unable to update password. Error message: %1$s</string> <!-- TODO - Add proper translation -->
+    <string name="msg_password_updated_successfully">Password updated successfully</string> <!-- TODO - Add proper translation -->
     <plurals name="msg_reacted_with_">
         <item quantity="one">%1$s reacted with %2$s</item> <!-- TODO - Add proper translation -->
         <item quantity="other">%1$s reacted with %2$s</item> <!-- TODO - Add proper translation -->

app/src/main/res/values-hi-rIN/strings.xml

@@ -184,7 +184,8 @@
     <string name="msg_no_topic">कोई विषय नहीं जोड़ा गया</string>
     <string name="msg_no_announcement">कोई घोषणा नहीं जोड़ा गया</string>
     <string name="msg_no_description">कोई विवरण नहीं जोड़ा गया</string>
-
+    <string name="msg_unable_to_update_password">Unable to update password. Error message: %1$s</string> <!-- TODO - Add proper translation -->
+    <string name="msg_password_updated_successfully">Password updated successfully</string> <!-- TODO - Add proper translation -->
     <plurals name="msg_reacted_with_">
         <item quantity="one">% 1 $ s ने% 2 $ %d s के साथ प्रतिक्रिया व्यक्त की</item>
         <item quantity="few">% 1 $ s ने% 2 $ s के साथ प्रतिक्रिया व्यक्त की</item>

app/src/main/res/values-it/strings.xml

@@ -163,7 +163,8 @@
     <string name="msg_no_description">Nessuna descrizione aggiunta</string>
     <string name="msg_send_email">Invia una email</string>
     <string name="msg_android_app_support">Supporto per le app Android</string>
-
+    <string name="msg_unable_to_update_password">Unable to update password. Error message: %1$s</string> <!-- TODO - Add proper translation -->
+    <string name="msg_password_updated_successfully">Password updated successfully</string> <!-- TODO - Add proper translation -->
     <plurals name="msg_reacted_with_">
         <item quantity="one">%1$s ha reagito con %2$s</item>
         <item quantity="other">%1$s ha reagito con %2$s</item>

app/src/main/res/values-ja/strings.xml

@@ -168,10 +168,11 @@
     <string name="msg_no_topic">No topic added</string> <!-- TODO Add translation -->
     <string name="msg_no_announcement">No announcement added</string> <!-- TODO Add translation -->
     <string name="msg_no_description">No description added</string> <!-- TODO Add translation -->
-    <!-- TODO - Add proper translation -->
+    <string name="msg_unable_to_update_password">Unable to update password. Error message: %1$s</string> <!-- TODO - Add proper translation -->
+    <string name="msg_password_updated_successfully">Password updated successfully</string> <!-- TODO - Add proper translation -->
     <plurals name="msg_reacted_with_">
-        <item quantity="one">%1$s reacted with %2$s</item>
-        <item quantity="other">%1$s reacted with %2$s</item>
+        <item quantity="one">%1$s reacted with %2$s</item>     <!-- TODO - Add proper translation -->
+        <item quantity="other">%1$s reacted with %2$s</item>     <!-- TODO - Add proper translation -->
     </plurals>
 
     <!-- Create channel messages -->

app/src/main/res/values-pt-rBR/strings.xml

@@ -171,6 +171,8 @@
     <string name="msg_no_topic">No topic added</string> <!-- TODO Add translation -->
     <string name="msg_no_announcement">No announcement added</string> <!-- TODO Add translation -->
     <string name="msg_no_description">No description added</string> <!-- TODO Add translation -->
+    <string name="msg_unable_to_update_password">Não foi possível atualizar a senha. Mensagem de erro: %1$s</string>
+    <string name="msg_password_updated_successfully">Senha alterada com sucesso</string>
     <plurals name="msg_reacted_with_">
         <item quantity="one">%1$s reagiu com %2$s</item>
         <item quantity="other">%1$s reagiram com %2$s</item>

app/src/main/res/values-ru-rRU/strings.xml

@@ -169,7 +169,8 @@
     <string name="msg_send_email">Отправить e-mail</string>
     <string name="msg_android_app_support">Поддержка Android-приложения</string>
     <string name="msg_muted_on_this_channel">Вы лишены дара речи на этом канале</string>
-
+    <string name="msg_unable_to_update_password">Unable to update password. Error message: %1$s</string> <!-- TODO - Add proper translation -->
+    <string name="msg_password_updated_successfully">Password updated successfully</string> <!-- TODO - Add proper translation -->
     <plurals name="msg_reacted_with_">
         <item quantity="one">%1$s реагирует с %2$s</item>
         <item quantity="few">%1$s реагируют с %2$s</item>

app/src/main/res/values-tr/strings.xml

@@ -185,7 +185,8 @@
     <string name="msg_no_topic">No topic added</string> <!-- TODO Add translation -->
     <string name="msg_no_announcement">No announcement added</string> <!-- TODO Add translation -->
     <string name="msg_no_description">No description added</string> <!-- TODO Add translation -->
-
+    <string name="msg_unable_to_update_password">Unable to update password. Error message: %1$s</string> <!-- TODO - Add proper translation -->
+    <string name="msg_password_updated_successfully">Password updated successfully</string> <!-- TODO - Add proper translation -->
     <plurals name="msg_reacted_with_">
         <item quantity="one">%1$s reacted with %2$s</item> <!-- TODO - Add proper translation -->
         <item quantity="other">%1$s reacted with %2$s</item> <!-- TODO - Add proper translation -->

app/src/main/res/values-uk/strings.xml

@@ -168,7 +168,8 @@
     <string name="msg_no_topic">No topic added</string> <!-- TODO Add translation -->
     <string name="msg_no_announcement">No announcement added</string> <!-- TODO Add translation -->
     <string name="msg_no_description">No description added</string> <!-- TODO Add translation -->
-
+    <string name="msg_unable_to_update_password">Unable to update password. Error message: %1$s</string> <!-- TODO - Add proper translation -->
+    <string name="msg_password_updated_successfully">Password updated successfully</string> <!-- TODO - Add proper translation -->
     <plurals name="msg_reacted_with_">
         <item quantity="one">%1$s reacted with %2$s</item> <!-- TODO - Add proper translation -->
         <item quantity="few">%1$s reacted with %2$s</item> <!-- TODO - Add proper translation -->

app/src/main/res/values/strings.xml

@@ -180,7 +180,8 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
     <string name="msg_no_description">No description added</string>
     <string name="msg_send_email">Send email</string>
     <string name="msg_android_app_support">Android app support</string>
-
+    <string name="msg_unable_to_update_password">Unable to update password. Error message: %1$s</string>
+    <string name="msg_password_updated_successfully">Password updated successfully</string>
     <plurals name="msg_reacted_with_">
         <item quantity="one">%1$s reacted with %2$s</item>
         <item quantity="other">%1$s reacted with %2$s</item>