From fd430b90846417d0ef77cb597ab0877bb370efea Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Thu, 22 Jul 2021 22:58:22 +0200 Subject: [PATCH] use proper context Signed-off-by: Andy Scherzinger --- .../messages/MagicPreviewMessageViewHolder.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicPreviewMessageViewHolder.java b/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicPreviewMessageViewHolder.java index 7a4fec8b0..5cc616ad3 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicPreviewMessageViewHolder.java +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicPreviewMessageViewHolder.java @@ -69,6 +69,7 @@ import java.util.concurrent.ExecutionException; import javax.inject.Inject; +import androidx.appcompat.view.ContextThemeWrapper; import androidx.core.content.ContextCompat; import androidx.core.content.FileProvider; import androidx.emoji.widget.EmojiTextView; @@ -407,7 +408,19 @@ public abstract class MagicPreviewMessageViewHolder extends MessageHolders.Incom return; } - PopupMenu popupMenu = new PopupMenu(this.context, itemView, Gravity.START); + Context viewContext; + + if (itemView != null && itemView.getContext() != null) { + viewContext = itemView.getContext(); + } else { + viewContext = this.context; + } + + PopupMenu popupMenu = new PopupMenu( + new ContextThemeWrapper(viewContext, R.style.appActionBarPopupMenu), + itemView, + Gravity.START + ); popupMenu.inflate(R.menu.chat_preview_message_menu); popupMenu.setOnMenuItemClickListener(item -> {