From 06d1710da906ea80e88ead693e39837310cb4a63 Mon Sep 17 00:00:00 2001
From: Stephen Paul Weber <singpolyma@singpolyma.net>
Date: Tue, 18 Apr 2023 09:38:31 -0500
Subject: [PATCH] Fix NPE

---
 .../eu/siacs/conversations/ui/adapter/MessageAdapter.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
index e75c2b588e995437c9f8120d0cfc66d343914d1f..0369c35184da08f00cd2fc7e72f677e6551a43e8 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
@@ -252,9 +252,11 @@ public class MessageAdapter extends ArrayAdapter<Message> {
                 break;
             case Message.STATUS_SEND_RECEIVED:
             case Message.STATUS_SEND_DISPLAYED:
-                viewHolder.indicatorReceived.setImageResource(darkBackground ? R.drawable.ic_done_white_18dp : R.drawable.ic_done_black_18dp);
-                viewHolder.indicatorReceived.setAlpha(darkBackground ? 0.7f : 0.57f);
-                viewHolder.indicatorReceived.setVisibility(View.VISIBLE);
+                if (viewHolder.indicatorReceived != null) {
+                    viewHolder.indicatorReceived.setImageResource(darkBackground ? R.drawable.ic_done_white_18dp : R.drawable.ic_done_black_18dp);
+                    viewHolder.indicatorReceived.setAlpha(darkBackground ? 0.7f : 0.57f);
+                    viewHolder.indicatorReceived.setVisibility(View.VISIBLE);
+                }
                 break;
             case Message.STATUS_SEND_FAILED:
                 final String errorMessage = message.getErrorMessage();