Merge branch 'develop' of github.com:RocketChat/Rocket.Chat.Android into new/discussion

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

@@ -10,7 +10,7 @@ interface Analytics {
      * Logs the login event.
      *
      * @param event The [AuthenticationEvent] used to log in.
-     * @param loginSucceeded True if successful logged in, false otherwise.
+     * @param loginSucceeded True if logged in successfully, false otherwise.
      */
     fun logLogin(event: AuthenticationEvent, loginSucceeded: Boolean) {}
 
@@ -18,7 +18,7 @@ interface Analytics {
      * Logs the sign up event.
      *
      * @param event The [AuthenticationEvent] used to sign up.
-     * @param signUpSucceeded True if successful signed up, false otherwise.
+     * @param signUpSucceeded True if signed up successfully, false otherwise.
      */
     fun logSignUp(event: AuthenticationEvent, signUpSucceeded: Boolean) {}
 

app/src/main/java/chat/rocket/android/app/DrawableHelper.kt

@@ -43,7 +43,7 @@ object DrawableHelper {
     /**
      * Tints an array of Drawable.
      *
-     * REMARK: you MUST always wrap the array of Drawable before tint it.
+     * REMARK: you MUST always wrap the array of Drawable before tinting it.
      *
      * @param drawables The array of Drawable to tint.
      * @param context The context.

app/src/main/java/chat/rocket/android/app/RocketChatApplication.kt

@@ -115,7 +115,7 @@ class RocketChatApplication : Application(), HasActivityInjector, HasServiceInje
         // TODO - remove this
         checkCurrentServer()
 
-        // TODO - FIXME - we need to proper inject the EmojiRepository and initialize it properly
+        // TODO - FIXME - we need to properly inject and initialize the EmojiRepository
         loadEmojis()
     }
 

app/src/main/java/chat/rocket/android/authentication/resetpassword/presentation/ResetPasswordView.kt

@@ -21,7 +21,7 @@ interface ResetPasswordView : LoadingView, MessageView {
     fun enableButtonConnect()
 
     /**
-     * Disables the button to reset the password when the user entered an invalid email address
+     * Disables the button to reset the password when the user has entered an invalid email address
      */
     fun disableButtonConnect()
 }
\ No newline at end of file

app/src/main/java/chat/rocket/android/authentication/server/presentation/VersionCheckView.kt

@@ -26,7 +26,7 @@ interface VersionCheckView {
     fun versionOk() {}
 
     /**
-     * Alters the user this protocol is invalid. This is optional.
+     * Alters the user that this protocol is invalid. This is optional.
      */
     fun errorInvalidProtocol() {}
 

app/src/main/java/chat/rocket/android/db/DatabaseManager.kt

@@ -139,7 +139,7 @@ class DatabaseManager(val context: Application, val serverUrl: String) {
     }
 
     /*
-     * Creates a list of data base operations
+     * Creates a list of database operations
      */
     fun processChatRoomsBatch(batch: List<StreamMessage<BaseRoom>>) {
         GlobalScope.launch(dbManagerContext) {

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

@@ -213,8 +213,8 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
 
     <!-- Preferences messages -->
     <string name="msg_analytics_tracking">Analytics tracking</string>
-    <string name="msg_send_analytics_tracking">Send anonymous statics to help improving this app</string>
-    <string name="msg_do_not_send_analytics_tracking">Do not send anonymous statics to help improving this app</string>
+    <string name="msg_send_analytics_tracking">Send anonymous statistics to help improve this app</string>
+    <string name="msg_do_not_send_analytics_tracking">Do not send anonymous statistics to help improve this app</string>
     <string name="msg_not_applicable_since_it_is_a_foss_version">Not applicable since it is a FOSS version</string>
 
     <!-- System messages -->