From 666be5f3580c1db4b9a516d3c60bf8c51e823aa5 Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Wed, 14 Jun 2017 11:01:24 -0700
Subject: [PATCH] Preserve unverified status if aleady unverified on update

// FREEBIE
---
 .../securesms/crypto/storage/TextSecureIdentityKeyStore.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/org/thoughtcrime/securesms/crypto/storage/TextSecureIdentityKeyStore.java b/src/org/thoughtcrime/securesms/crypto/storage/TextSecureIdentityKeyStore.java
index 5ecb7d5bd1..68f1dbfa9f 100644
--- a/src/org/thoughtcrime/securesms/crypto/storage/TextSecureIdentityKeyStore.java
+++ b/src/org/thoughtcrime/securesms/crypto/storage/TextSecureIdentityKeyStore.java
@@ -61,7 +61,9 @@ public class TextSecureIdentityKeyStore implements IdentityKeyStore {
         Log.w(TAG, "Replacing existing identity...");
         VerifiedStatus verifiedStatus;
 
-        if (identityRecord.get().getVerifiedStatus() == VerifiedStatus.VERIFIED) {
+        if (identityRecord.get().getVerifiedStatus() == VerifiedStatus.VERIFIED ||
+            identityRecord.get().getVerifiedStatus() == VerifiedStatus.UNVERIFIED)
+        {
           verifiedStatus = VerifiedStatus.UNVERIFIED;
         } else {
           verifiedStatus = VerifiedStatus.DEFAULT;