diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/message/conversation/ConversationExtras.java b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/message/conversation/ConversationExtras.java index e297aef7b..c11b4d78b 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/message/conversation/ConversationExtras.java +++ b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/message/conversation/ConversationExtras.java @@ -43,6 +43,6 @@ public abstract class ConversationExtras implements Parcelable { return LoganSquare.parse(json, TwitterOfficialConversationExtras.class); } } - return null; + return LoganSquare.parse(json, DefaultConversationExtras.class); } } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/message/MessagesConversationFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/message/MessagesConversationFragment.kt index 853c8264a..555d19f9f 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/message/MessagesConversationFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/message/MessagesConversationFragment.kt @@ -23,11 +23,14 @@ import android.accounts.AccountManager import android.app.Activity import android.content.Context import android.content.Intent +import android.graphics.PorterDuff import android.net.Uri import android.os.Bundle import android.support.v4.app.FragmentActivity import android.support.v4.app.LoaderManager +import android.support.v4.content.ContextCompat import android.support.v4.content.Loader +import android.support.v4.widget.TextViewCompat import android.support.v7.app.AppCompatActivity import android.support.v7.widget.FixedLinearLayoutManager import android.support.v7.widget.LinearLayoutManager @@ -461,6 +464,19 @@ class MessagesConversationFragment : AbsContentListRecyclerViewFragment @@ -57,6 +55,8 @@ android:maxLines="1" android:textAppearance="?android:textAppearanceMedium" android:textColor="?android:textColorPrimary" + tools:drawableEnd="@drawable/ic_message_type_speaker_muted" + tools:drawableTint="?android:textColorSecondary" tools:text="Conversation name"/>