From fdd070c1dd6399134ac8363a819f926924537f32 Mon Sep 17 00:00:00 2001
From: Christian Ascheberg <c.ascheberg@gmx.de>
Date: Wed, 4 Oct 2017 20:50:12 +0200
Subject: [PATCH] Do not show sent checkmark for verification status changes

Fixes #6743
Closes #7041
// FREEBIE
---
 src/org/thoughtcrime/securesms/ConversationListItem.java      | 2 +-
 .../thoughtcrime/securesms/database/model/DisplayRecord.java  | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/org/thoughtcrime/securesms/ConversationListItem.java b/src/org/thoughtcrime/securesms/ConversationListItem.java
index d4b04c49ab..8cf9ea0c6d 100644
--- a/src/org/thoughtcrime/securesms/ConversationListItem.java
+++ b/src/org/thoughtcrime/securesms/ConversationListItem.java
@@ -207,7 +207,7 @@ public class ConversationListItem extends RelativeLayout
   }
 
   private void setStatusIcons(ThreadRecord thread) {
-    if (!thread.isOutgoing() || thread.isOutgoingCall()) {
+    if (!thread.isOutgoing() || thread.isOutgoingCall() || thread.isVerificationStatusChange()) {
       deliveryStatusIndicator.setNone();
       alertView.setNone();
     } else if (thread.isFailed()) {
diff --git a/src/org/thoughtcrime/securesms/database/model/DisplayRecord.java b/src/org/thoughtcrime/securesms/database/model/DisplayRecord.java
index b5bad1f4b1..d721bda09f 100644
--- a/src/org/thoughtcrime/securesms/database/model/DisplayRecord.java
+++ b/src/org/thoughtcrime/securesms/database/model/DisplayRecord.java
@@ -144,6 +144,10 @@ public abstract class DisplayRecord {
     return SmsDatabase.Types.isMissedCall(type);
   }
 
+  public boolean isVerificationStatusChange() {
+    return SmsDatabase.Types.isIdentityDefault(type) || SmsDatabase.Types.isIdentityVerified(type);
+  }
+
   public int getDeliveryStatus() {
     return deliveryStatus;
   }