From 56cb98d96f64f9f3f4458ae072c3507a4db0b268 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Wed, 1 Nov 2017 12:02:09 -0700
Subject: [PATCH] Make inspection cert work

---
 .../InspectionCertificate.qml                 | 40 +++++++++----------
 .../ui/overlays/ContextOverlayInterface.cpp   |  3 +-
 2 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/interface/resources/qml/hifi/commerce/inspectionCertificate/InspectionCertificate.qml b/interface/resources/qml/hifi/commerce/inspectionCertificate/InspectionCertificate.qml
index 06e04d6929..bd8808f05f 100644
--- a/interface/resources/qml/hifi/commerce/inspectionCertificate/InspectionCertificate.qml
+++ b/interface/resources/qml/hifi/commerce/inspectionCertificate/InspectionCertificate.qml
@@ -67,27 +67,25 @@ Rectangle {
         }
 
         onUpdateCertificateStatus: {
-            if (root.certificateId === certID) {
-                if (certStatus === 1) { // CERTIFICATE_STATUS_VERIFICATION_SUCCESS
-                
-                } else if (certStatus === 2) { // CERTIFICATE_STATUS_VERIFICATION_TIMEOUT
-                    errorText.text = "Verification of this certificate timed out.";
-                    errorText.color = hifi.colors.redHighlight;
-                } else if (certStatus === 3) { // CERTIFICATE_STATUS_STATIC_VERIFICATION_FAILED
-                    titleBarText.text = "Invalid Certificate";
-                    titleBarText.color = hifi.colors.redHighlight;
-                    root.itemEdition = "Uncertified Copy";
-                    errorText.text = "The certificate associated with this entity is invalid.";
-                    errorText.color = hifi.colors.redHighlight;
-                } else if (certStatus === 4) { // CERTIFICATE_STATUS_OWNER_VERIFICATION_FAILED
-                    titleBarText.text = "Invalid Certificate";
-                    titleBarText.color = hifi.colors.redHighlight;
-                    root.itemEdition = "Uncertified Copy";
-                    errorText.text = "The certificate associated with this entity is invalid.";
-                    errorText.color = hifi.colors.redHighlight;
-                } else {
-                    console.log("Unknown certificate status received from ledger signal!");
-                }
+            if (certStatus === 1) { // CERTIFICATE_STATUS_VERIFICATION_SUCCESS
+                // NOP
+            } else if (certStatus === 2) { // CERTIFICATE_STATUS_VERIFICATION_TIMEOUT
+                errorText.text = "Verification of this certificate timed out.";
+                errorText.color = hifi.colors.redHighlight;
+            } else if (certStatus === 3) { // CERTIFICATE_STATUS_STATIC_VERIFICATION_FAILED
+                titleBarText.text = "Invalid Certificate";
+                titleBarText.color = hifi.colors.redHighlight;
+                root.itemEdition = "Uncertified Copy";
+                errorText.text = "The certificate associated with this entity is invalid.";
+                errorText.color = hifi.colors.redHighlight;
+            } else if (certStatus === 4) { // CERTIFICATE_STATUS_OWNER_VERIFICATION_FAILED
+                titleBarText.text = "Invalid Certificate";
+                titleBarText.color = hifi.colors.redHighlight;
+                root.itemEdition = "Uncertified Copy";
+                errorText.text = "The certificate associated with this entity is invalid.";
+                errorText.color = hifi.colors.redHighlight;
+            } else {
+                console.log("Unknown certificate status received from ledger signal!");
             }
         }
     }
diff --git a/interface/src/ui/overlays/ContextOverlayInterface.cpp b/interface/src/ui/overlays/ContextOverlayInterface.cpp
index 75aefdc585..5990c710ad 100644
--- a/interface/src/ui/overlays/ContextOverlayInterface.cpp
+++ b/interface/src/ui/overlays/ContextOverlayInterface.cpp
@@ -279,8 +279,7 @@ void ContextOverlayInterface::openInspectionCertificate() {
         QUuid nodeToChallenge = entityProperties.getOwningAvatarID();
         auto nodeList = DependencyManager::get<NodeList>();
 
-        // ZRF FIXME: Don't challenge ownership of avatar entities that I own
-        if (entityProperties.getClientOnly()/* && nodeToChallenge != nodeList->getSessionUUID()*/) {
+        if (entityProperties.getClientOnly()) {
             if (entityProperties.verifyStaticCertificateProperties()) {
                 SharedNodePointer entityServer = nodeList->soloNodeOfType(NodeType::EntityServer);