Merge branch 'beta'

RocketChat · Aug 2, 2018 · 797a06f · 797a06f
2 parents 0c11cb5 + 479a70e
commit 797a06f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -12,7 +12,7 @@ android {
         applicationId "chat.rocket.android"
         minSdkVersion versions.minSdk
         targetSdkVersion versions.targetSdk
-        versionCode 2035
+        versionCode 2036
         versionName "2.5.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true

diff --git a/app/src/main/java/chat/rocket/android/helper/MessageParser.kt b/app/src/main/java/chat/rocket/android/helper/MessageParser.kt
@@ -157,7 +157,7 @@ class MessageParser @Inject constructor(
                 if (node is ListItem) {
                     newLine()
                     builder.append("$number$delimiter ")
-                    super.visitChildren(node.firstChild)
+                    super.visitChildren(node)
                     newLine()
                 }
                 number++

diff --git a/app/src/main/java/chat/rocket/android/server/infraestructure/ConnectionManager.kt b/app/src/main/java/chat/rocket/android/server/infraestructure/ConnectionManager.kt
@@ -2,7 +2,6 @@ package chat.rocket.android.server.infraestructure
 
 import androidx.lifecycle.MutableLiveData
 import chat.rocket.android.db.DatabaseManager
-import chat.rocket.android.infrastructure.LocalRepository
 import chat.rocket.common.model.BaseRoom
 import chat.rocket.common.model.User
 import chat.rocket.common.model.UserStatus