Skip to content

A
AloqaIM-Android
Unverified Commit d4d5cc75 authored by divyanshu bhargava's avatar divyanshu bhargava Committed by GitHub
Browse files
Options

Merge pull request #24 from RocketChat/develop 

merge
parents dd64a723 84fee449
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
app/src/main/java/chat/rocket/android/push/PushManager.kt
View file @ d4d5cc75
...@@ -467,7 +467,7 @@ data class PushInfo @KotshiConstructor constructor( ...@@ -467,7 +467,7 @@ data class PushInfo @KotshiConstructor constructor(
} }
companion object CREATOR : Parcelable.Creator<PushInfo> { 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) sender = null)
override fun createFromParcel(parcel: Parcel): PushInfo { override fun createFromParcel(parcel: Parcel): PushInfo {
......
app/src/main/res/layout/message_composer.xml
View file @ d4d5cc75
...@@ -74,7 +74,8 @@ ...@@ -74,7 +74,8 @@
android:lineSpacingExtra="4dp" android:lineSpacingExtra="4dp"
android:maxLines="4" android:maxLines="4"
android:minHeight="24dp" android:minHeight="24dp"
android:scrollbars="vertical" /> android:scrollbars="vertical"
android:imeOptions="flagNoExtractUi" />
<ImageButton <ImageButton
android:id="@+id/button_show_attachment_options" android:id="@+id/button_show_attachment_options"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023