From b88254244a8022303e82f89a0eed8d6c2382ed81 Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Wed, 20 Jun 2018 16:39:53 -0400
Subject: [PATCH] Respond to CR.

---
 Pods                                     |  2 +-
 SignalServiceKit/src/Util/OWSAnalytics.m | 19 +++++++++++++------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/Pods b/Pods
index 9f0128211..5caa906cf 160000
--- a/Pods
+++ b/Pods
@@ -1 +1 @@
-Subproject commit 9f01282113e10d50ff87e76ee5fa8d2c09d19f7f
+Subproject commit 5caa906cfd9c24f464247747004cc8335b96040c
diff --git a/SignalServiceKit/src/Util/OWSAnalytics.m b/SignalServiceKit/src/Util/OWSAnalytics.m
index e819a8673..121831c96 100755
--- a/SignalServiceKit/src/Util/OWSAnalytics.m
+++ b/SignalServiceKit/src/Util/OWSAnalytics.m
@@ -340,7 +340,7 @@ NSString *NSStringForOWSAnalyticsSeverity(OWSAnalyticsSeverity severity)
         }
     };
 
-    if ([self isSeverityAsync:severity]) {
+    if ([self shouldReportAsync:severity]) {
         dispatch_async(self.serialQueue, addEvent);
     } else {
         dispatch_sync(self.serialQueue, addEvent);
@@ -383,12 +383,19 @@ NSString *NSStringForOWSAnalyticsSeverity(OWSAnalyticsSeverity severity)
     // Log the event.
     NSString *logString = [NSString stringWithFormat:@"%s:%d %@", location, line, eventName];
     if (!parameters) {
-        LOG_MAYBE([self isSeverityAsync:severity], LOG_LEVEL_DEF, logFlag, 0, nil, location, @"%@", logString);
+        LOG_MAYBE([self shouldReportAsync:severity], LOG_LEVEL_DEF, logFlag, 0, nil, location, @"%@", logString);
     } else {
-        LOG_MAYBE(
-            [self isSeverityAsync:severity], LOG_LEVEL_DEF, logFlag, 0, nil, location, @"%@ %@", logString, parameters);
+        LOG_MAYBE([self shouldReportAsync:severity],
+            LOG_LEVEL_DEF,
+            logFlag,
+            0,
+            nil,
+            location,
+            @"%@ %@",
+            logString,
+            parameters);
     }
-    if (![self isSeverityAsync:severity]) {
+    if (![self shouldReportAsync:severity]) {
         [DDLog flushLog];
     }
 
@@ -397,7 +404,7 @@ NSString *NSStringForOWSAnalyticsSeverity(OWSAnalyticsSeverity severity)
     [self addEvent:eventName severity:severity properties:eventProperties];
 }
 
-- (BOOL)isSeverityAsync:(OWSAnalyticsSeverity)severity
+- (BOOL)shouldReportAsync:(OWSAnalyticsSeverity)severity
 {
     return severity != OWSAnalyticsSeverityCritical;
 }