Skip to content

A
AloqaIM-Android
Commit 2884d2dc authored by Filipe de Lima Brito's avatar Filipe de Lima Brito
Browse files
Options

Better SyncState.FAILED handling.

parent 9b8ae5be
Hide whitespace changes
Inline Side-by-side
Showing with 156 additions and 147 deletions
app/src/main/java/chat/rocket/android/layouthelper/chatroom/AbstractMessageViewHolder.java
View file @ 2884d2dc
...@@ -43,11 +43,9 @@ public abstract class AbstractMessageViewHolder extends ModelViewHolder<PairedMe ...@@ -43,11 +43,9 @@ public abstract class AbstractMessageViewHolder extends ModelViewHolder<PairedMe
*/ */
public final void bind(PairedMessage pairedMessage, boolean autoloadImages) { public final void bind(PairedMessage pairedMessage, boolean autoloadImages) {
if (pairedMessage.target.getSyncState() == SyncState.FAILED) { if (pairedMessage.target.getSyncState() == SyncState.FAILED) {
avatar.setVisibility(View.GONE);
errorImageView.setVisibility(View.VISIBLE); errorImageView.setVisibility(View.VISIBLE);
} else { } else {
errorImageView.setVisibility(View.GONE); errorImageView.setVisibility(View.GONE);
avatar.setVisibility(View.VISIBLE);
} }
bindMessage(pairedMessage, autoloadImages); bindMessage(pairedMessage, autoloadImages);
...@@ -73,10 +71,11 @@ public abstract class AbstractMessageViewHolder extends ModelViewHolder<PairedMe ...@@ -73,10 +71,11 @@ public abstract class AbstractMessageViewHolder extends ModelViewHolder<PairedMe
private void setSequential(boolean sequential) { private void setSequential(boolean sequential) {
if (avatar != null) { if (avatar != null) {
if (sequential) if (sequential) {
avatar.setVisibility(View.GONE); avatar.setVisibility(View.GONE);
else } else {
avatar.setVisibility(View.VISIBLE); avatar.setVisibility(View.VISIBLE);
}
} }
if (userAndTimeContainer != null) { if (userAndTimeContainer != null) {
......
app/src/main/java/chat/rocket/android/renderer/MessageRenderer.java
View file @ 2884d2dc
...@@ -38,13 +38,11 @@ public class MessageRenderer extends AbstractRenderer<Message> { ...@@ -38,13 +38,11 @@ public class MessageRenderer extends AbstractRenderer<Message> {
return this; return this;
} }
if(object.getSyncState() != SyncState.FAILED) { if (TextUtils.isEmpty(object.getAvatar())) {
if (TextUtils.isEmpty(object.getAvatar())) { userRenderer.avatarInto(rocketChatAvatar, absoluteUrl);
userRenderer.avatarInto(rocketChatAvatar, absoluteUrl); // Avatar from oauth providers
// Avatar from oauth providers } else {
} else { rocketChatAvatar.loadImage(object.getAvatar());
rocketChatAvatar.loadImage(object.getAvatar());
}
} }
return this; return this;
} }
......
app/src/main/res/layout/list_item_normal_message.xml
View file @ 2884d2dc
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:theme="@style/AppTheme"> android:theme="@style/AppTheme">
<include layout="@layout/list_item_message_newday" /> <include layout="@layout/list_item_message_newday" />
<FrameLayout <FrameLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="2dp"> android:layout_marginBottom="2dp">
<chat.rocket.android.widget.RocketChatAvatar <chat.rocket.android.widget.RocketChatAvatar
android:id="@+id/user_avatar" android:id="@+id/user_avatar"
android:layout_width="32dp" android:layout_width="32dp"
android:layout_height="32dp" android:layout_height="32dp"
android:layout_margin="8dp" /> android:layout_margin="8dp" />
<ImageView <LinearLayout
android:id="@+id/errorImageView" android:layout_width="match_parent"
android:layout_width="32dp" android:layout_height="wrap_content"
android:layout_height="32dp" android:layout_marginEnd="8dp"
android:layout_margin="8dp" android:layout_marginStart="48dp"
android:tint="@color/colorAccent" android:orientation="vertical"
app:srcCompat="@drawable/ic_error_black_24dp" android:layout_marginRight="8dp"
android:visibility="gone" /> android:layout_marginLeft="48dp">
<LinearLayout
android:id="@+id/user_and_timestamp_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<LinearLayout <TextView
android:layout_width="match_parent" android:id="@+id/username"
android:layout_height="wrap_content" android:layout_width="wrap_content"
android:layout_marginEnd="8dp" android:layout_height="wrap_content"
android:layout_marginStart="48dp" android:textAppearance="@style/TextAppearance.RocketChat.Message.Username"
android:orientation="vertical" tools:text="John Doe" />
android:layout_marginRight="8dp"
android:layout_marginLeft="48dp">
<LinearLayout <Space
android:id="@+id/user_and_timestamp_container" android:layout_width="4dp"
android:layout_width="match_parent" android:layout_height="wrap_content" />
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView <TextView
android:id="@+id/username" android:id="@+id/sub_username"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAppearance="@style/TextAppearance.RocketChat.Message.Username" android:textAppearance="@style/TextAppearance.RocketChat.Message.SubUsername"
tools:text="John Doe" /> tools:text="\@John Doe" />
<Space <Space
android:layout_width="4dp" android:layout_width="@dimen/margin_8"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
<TextView <TextView
android:id="@+id/sub_username" android:id="@+id/timestamp"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAppearance="@style/TextAppearance.RocketChat.Message.SubUsername" android:enabled="false"
tools:text="\@John Doe" /> tools:text="12:34" />
<Space <View
android:layout_width="@dimen/margin_8" android:layout_width="0dp"
android:layout_height="wrap_content" /> android:layout_height="0dp"
android:layout_weight="1" />
<TextView <ImageView
android:id="@+id/timestamp" android:id="@+id/errorImageView"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="16dp"
android:enabled="false" android:layout_gravity="end"
tools:text="12:34" /> android:gravity="end"
</LinearLayout> android:tint="@color/colorRed400"
app:srcCompat="@drawable/ic_error_black_24dp"
android:visibility="gone" />
</LinearLayout>
<chat.rocket.android.widget.message.RocketChatMessageLayout <chat.rocket.android.widget.message.RocketChatMessageLayout
android:id="@+id/message_body" android:id="@+id/message_body"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
<chat.rocket.android.widget.message.RocketChatMessageUrlsLayout <chat.rocket.android.widget.message.RocketChatMessageUrlsLayout
android:id="@+id/message_urls" android:id="@+id/message_urls"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
<chat.rocket.android.widget.message.RocketChatMessageAttachmentsLayout <chat.rocket.android.widget.message.RocketChatMessageAttachmentsLayout
android:id="@+id/message_attachments" android:id="@+id/message_attachments"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
</LinearLayout> </LinearLayout>
</FrameLayout> </FrameLayout>
</LinearLayout> </LinearLayout>
\ No newline at end of file
app/src/main/res/layout/list_item_system_message.xml
View file @ 2884d2dc
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:theme="@style/AppTheme">
<include layout="@layout/list_item_message_newday" />
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<chat.rocket.android.widget.RocketChatAvatar
android:id="@+id/user_avatar"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_margin="8dp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_marginStart="48dp"
android:orientation="vertical"
android:layout_marginRight="8dp"
android:layout_marginLeft="48dp">
<LinearLayout
android:id="@+id/user_and_timestamp_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="horizontal">
android:theme="@style/AppTheme">
<TextView
android:id="@+id/username"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="@style/TextAppearance.RocketChat.Message.Username"
tools:text="John Doe" />
<include layout="@layout/list_item_message_newday" /> <Space
android:layout_width="@dimen/margin_8"
android:layout_height="wrap_content" />
<FrameLayout <TextView
android:layout_width="match_parent" android:id="@+id/timestamp"
android:layout_height="wrap_content"> android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:enabled="false"
tools:text="12:34" />
<chat.rocket.android.widget.RocketChatAvatar <View
android:id="@+id/user_avatar" android:layout_width="0dp"
android:layout_width="32dp" android:layout_height="0dp"
android:layout_height="32dp" android:layout_weight="1" />
android:layout_margin="8dp" />
<ImageView <ImageView
android:id="@+id/errorImageView" android:id="@+id/errorImageView"
android:layout_width="32dp" android:layout_width="wrap_content"
android:layout_height="32dp" android:layout_height="16dp"
android:layout_margin="8dp" android:layout_gravity="end"
android:tint="@color/colorAccent" android:gravity="end"
android:tint="@color/colorRed400"
app:srcCompat="@drawable/ic_error_black_24dp" app:srcCompat="@drawable/ic_error_black_24dp"
android:visibility="gone" /> android:visibility="gone" />
</LinearLayout>
<LinearLayout <TextView
android:layout_width="match_parent" android:id="@+id/message_body"
android:layout_height="wrap_content" android:layout_width="match_parent"
android:layout_marginEnd="8dp" android:layout_height="wrap_content"
android:layout_marginStart="48dp" android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:orientation="vertical" android:textStyle="italic"
android:layout_marginRight="8dp" android:enabled="false" />
android:layout_marginLeft="48dp"> </LinearLayout>
</FrameLayout>
<LinearLayout
android:id="@+id/user_and_timestamp_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:id="@+id/username"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="@style/TextAppearance.RocketChat.Message.Username"
tools:text="John Doe" />
<Space
android:layout_width="@dimen/margin_8"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/timestamp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:enabled="false"
tools:text="12:34" />
</LinearLayout>
<TextView
android:id="@+id/message_body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textStyle="italic"
android:enabled="false" />
</LinearLayout>
</FrameLayout>
</LinearLayout> </LinearLayout>
\ No newline at end of file
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