Merge pull request #24 from RocketChat/develop

merge

app/src/main/java/chat/rocket/android/push/PushManager.kt

@@ -467,7 +467,7 @@ data class PushInfo @KotshiConstructor constructor(
     }
 
     companion object CREATOR : Parcelable.Creator<PushInfo> {
-        val EMPTY = PushInfo(hostname = "", roomId = "", type = RoomType.CHANNEL, name = "",
+        val EMPTY = PushInfo(hostname = "", roomId = "", type = roomTypeOf(RoomType.CHANNEL), name = "",
             sender = null)
 
         override fun createFromParcel(parcel: Parcel): PushInfo {

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

@@ -74,7 +74,8 @@
                 android:lineSpacingExtra="4dp"
                 android:maxLines="4"
                 android:minHeight="24dp"
-                android:scrollbars="vertical" />
+                android:scrollbars="vertical"
+                android:imeOptions="flagNoExtractUi" />
 
             <ImageButton
                 android:id="@+id/button_show_attachment_options"