From 3507367a908464e857ab59af2d7514ce524af131 Mon Sep 17 00:00:00 2001
From: Michael Kirk <michael@signal.org>
Date: Mon, 23 Jul 2018 13:38:33 -0600
Subject: [PATCH] Don't report feedback for HTTP errors.
// FREEBIE
---
.../src/Contacts/OWSContactDiscoveryOperation.swift | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/SignalServiceKit/src/Contacts/OWSContactDiscoveryOperation.swift b/SignalServiceKit/src/Contacts/OWSContactDiscoveryOperation.swift
index e5efbc83b..8b2c7d99f 100644
--- a/SignalServiceKit/src/Contacts/OWSContactDiscoveryOperation.swift
+++ b/SignalServiceKit/src/Contacts/OWSContactDiscoveryOperation.swift
@@ -416,8 +416,6 @@ class CDSFeedbackOperation: OWSOperation {
enum FeedbackResult: String {
case ok
case mismatch
- case serverError = "server-error"
- case clientError = "client-error"
case attestationError = "attestation-error"
case unexpectedError = "unexpected-error"
}
@@ -464,10 +462,9 @@ class CDSFeedbackOperation: OWSOperation {
if let error = cdsOperation.failingError {
switch error {
- case ContactDiscoveryError.serverError:
- self.makeRequest(result: .serverError)
- case ContactDiscoveryError.clientError:
- self.makeRequest(result: .clientError)
+ case ContactDiscoveryError.serverError, ContactDiscoveryError.clientError:
+ // Server already has this information, no need to report.
+ self.reportSuccess()
case ContactDiscoveryError.attestationError:
self.makeRequest(result: .attestationError)
default: