diff --git a/res/layout/conversation_item_received.xml b/res/layout/conversation_item_received.xml
index 00a2706b9..5c9e8ad78 100644
--- a/res/layout/conversation_item_received.xml
+++ b/res/layout/conversation_item_received.xml
@@ -122,7 +122,7 @@
android:id="@+id/sticker_view_stub"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout="@layout/conversation_item_received_sticker" />
+ android:layout="@layout/conversation_item_sticker" />
-
-
+ android:layout="@layout/conversation_item_sticker" />
-
-
-
diff --git a/res/layout/conversation_item_received_sticker.xml b/res/layout/conversation_item_sticker.xml
similarity index 100%
rename from res/layout/conversation_item_received_sticker.xml
rename to res/layout/conversation_item_sticker.xml
diff --git a/res/layout/sticker_view.xml b/res/layout/sticker_view.xml
index 37976599e..d82561430 100644
--- a/res/layout/sticker_view.xml
+++ b/res/layout/sticker_view.xml
@@ -23,4 +23,17 @@
app:minHeight="@dimen/media_bubble_min_height"
app:maxHeight="@dimen/media_bubble_max_height" />
+
+
diff --git a/src/org/thoughtcrime/securesms/ConversationItem.java b/src/org/thoughtcrime/securesms/ConversationItem.java
index 2e7b5089a..8ab6b2bee 100644
--- a/src/org/thoughtcrime/securesms/ConversationItem.java
+++ b/src/org/thoughtcrime/securesms/ConversationItem.java
@@ -100,7 +100,6 @@ public class ConversationItem extends BaseConversationItem
protected View replyView;
@Nullable private QuoteView quoteView;
private ConversationItemFooter footer;
- private ConversationItemFooter stickerFooter;
private ReactionsConversationView reactionsView;
private TextView groupSender;
private View groupSenderHolder;
@@ -138,7 +137,6 @@ public class ConversationItem extends BaseConversationItem
this.bodyText = findViewById(R.id.conversation_item_body);
this.footer = findViewById(R.id.conversation_item_footer);
- this.stickerFooter = findViewById(R.id.conversation_item_sticker_footer);
this.reactionsView = findViewById(R.id.reactions_view);
this.groupSender = findViewById(R.id.group_message_sender);
this.contactPhoto = findViewById(R.id.contact_photo);
@@ -324,7 +322,7 @@ public class ConversationItem extends BaseConversationItem
} else if (mediaThumbnailStub.resolved() && mediaThumbnailStub.get().getVisibility() == View.VISIBLE) {
desc += mediaThumbnailStub.get().getDescription() + "\n";
} else if (stickerStub.resolved() && stickerStub.get().getVisibility() == View.VISIBLE) {
- desc += context.getString(R.string.sticker) + "\n";
+ desc += stickerStub.get().getDescription() + "\n";
}
if (bodyText.getVisibility() == View.VISIBLE) {
@@ -332,9 +330,7 @@ public class ConversationItem extends BaseConversationItem
}
if (footer.getVisibility() == View.VISIBLE) {
- desc += footer.getDescription() + "\n";
- } else if (stickerFooter.getVisibility() == View.VISIBLE) {
- desc += stickerFooter.getDescription() + "\n";
+ desc += footer.getDescription();
}
this.setContentDescription(desc);
@@ -714,7 +710,6 @@ public class ConversationItem extends BaseConversationItem
ViewUtil.updateLayoutParams(footer, LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
footer.setVisibility(GONE);
- stickerFooter.setVisibility(GONE);
if (mediaThumbnailStub.resolved()) mediaThumbnailStub.get().getFooter().setVisibility(GONE);
ConversationItemFooter activeFooter = getActiveFooter(current);
@@ -744,7 +739,7 @@ public class ConversationItem extends BaseConversationItem
private ConversationItemFooter getActiveFooter(@NonNull DcMsg messageRecord) {
if (hasSticker(messageRecord)) {
- return stickerFooter;
+ return stickerStub.get().getFooter();
} else if (hasOnlyThumbnail(messageRecord) && TextUtils.isEmpty(messageRecord.getText())) {
return mediaThumbnailStub.get().getFooter();
} else {
diff --git a/src/org/thoughtcrime/securesms/components/BorderlessImageView.java b/src/org/thoughtcrime/securesms/components/BorderlessImageView.java
index d4b2af102..4d134588d 100644
--- a/src/org/thoughtcrime/securesms/components/BorderlessImageView.java
+++ b/src/org/thoughtcrime/securesms/components/BorderlessImageView.java
@@ -18,6 +18,7 @@ public class BorderlessImageView extends FrameLayout {
private ThumbnailView image;
private View missingShade;
+ private ConversationItemFooter footer;
public BorderlessImageView(@NonNull Context context) {
super(context);
@@ -34,6 +35,7 @@ public class BorderlessImageView extends FrameLayout {
this.image = findViewById(R.id.sticker_thumbnail);
this.missingShade = findViewById(R.id.sticker_missing_shade);
+ this.footer = findViewById(R.id.sticker_footer);
}
@Override
@@ -65,6 +67,14 @@ public class BorderlessImageView extends FrameLayout {
missingShade.setVisibility(showControls ? View.VISIBLE : View.GONE);
}
+ public String getDescription() {
+ return getContext().getString(R.string.sticker) + "\n" + footer.getDescription();
+ }
+
+ public ConversationItemFooter getFooter() {
+ return footer;
+ }
+
public void setThumbnailClickListener(@NonNull SlideClickListener listener) {
image.setThumbnailClickListener(listener);
}