From 093ccc9f00c9d8f7528cf0bc94eccc2296844ca8 Mon Sep 17 00:00:00 2001
From: Ammar Githam <ammargitham786@gmail.com>
Date: Sat, 2 Jan 2021 15:28:18 +0900
Subject: [PATCH] Handle null client context for action log direct items

---
 .../instagrabber/adapters/DirectItemsAdapter.java      | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/awais/instagrabber/adapters/DirectItemsAdapter.java b/app/src/main/java/awais/instagrabber/adapters/DirectItemsAdapter.java
index f910dfdb..151667cf 100644
--- a/app/src/main/java/awais/instagrabber/adapters/DirectItemsAdapter.java
+++ b/app/src/main/java/awais/instagrabber/adapters/DirectItemsAdapter.java
@@ -70,7 +70,15 @@ public final class DirectItemsAdapter extends RecyclerView.Adapter<RecyclerView.
                 return oldItem.date.equals(newItem.date);
             }
             if (oldItem.item != null && newItem.item != null) {
-                return oldItem.item.getClientContext().equals(newItem.item.getClientContext());
+                String oldClientContext = oldItem.item.getClientContext();
+                if (oldClientContext == null) {
+                    oldClientContext = oldItem.item.getItemId();
+                }
+                String newClientContext = newItem.item.getClientContext();
+                if (newClientContext == null) {
+                    newClientContext = newItem.item.getItemId();
+                }
+                return oldClientContext.equals(newClientContext);
             }
             return false;
         }