From 791e270578614a3d8bdc7a3fe8450ffb6e196fa7 Mon Sep 17 00:00:00 2001
From: Matthew Chen <charlesmchen@gmail.com>
Date: Thu, 3 Aug 2017 10:29:40 -0400
Subject: [PATCH] Terminate call if call view presentation is delayed.

// FREEBIE
---
 Signal/src/call/CallService.swift              | 2 +-
 SignalServiceKit/src/Util/OWSAnalyticsEvents.h | 2 ++
 SignalServiceKit/src/Util/OWSAnalyticsEvents.m | 5 +++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/Signal/src/call/CallService.swift b/Signal/src/call/CallService.swift
index 1fe1b5c9d..4695e6959 100644
--- a/Signal/src/call/CallService.swift
+++ b/Signal/src/call/CallService.swift
@@ -1610,7 +1610,7 @@ protocol CallServiceObserver: class {
         }
 
         guard nil != UIApplication.shared.frontmostViewController as? CallViewController else {
-            OWSProdError("call_service_call_view_could_not_present", file:#file, function:#function, line:#line)
+            OWSProdError(OWSAnalyticsEvents.callServiceCallViewCouldNotPresent(), file:#file, function:#function, line:#line)
             owsFail("\(TAG) in \(#function) CallViewController should already be visible.")
             self.terminateCall()
             return
diff --git a/SignalServiceKit/src/Util/OWSAnalyticsEvents.h b/SignalServiceKit/src/Util/OWSAnalyticsEvents.h
index c456aa2fb..8256147ea 100755
--- a/SignalServiceKit/src/Util/OWSAnalyticsEvents.h
+++ b/SignalServiceKit/src/Util/OWSAnalyticsEvents.h
@@ -36,6 +36,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 + (NSString *)callServiceCallUnexpectedlyIdle;
 
++ (NSString *)callServiceCallViewCouldNotPresent;
+
 + (NSString *)callServiceCouldNotCreatePeerConnectionClientPromise;
 
 + (NSString *)callServiceCouldNotCreateReadyToSendIceUpdatesPromise;
diff --git a/SignalServiceKit/src/Util/OWSAnalyticsEvents.m b/SignalServiceKit/src/Util/OWSAnalyticsEvents.m
index 8b9e63f1e..05326e2a0 100755
--- a/SignalServiceKit/src/Util/OWSAnalyticsEvents.m
+++ b/SignalServiceKit/src/Util/OWSAnalyticsEvents.m
@@ -72,6 +72,11 @@ NS_ASSUME_NONNULL_BEGIN
     return @"call_service_call_unexpectedly_idle";
 }
 
++ (NSString *)callServiceCallViewCouldNotPresent
+{
+    return @"call_service_call_view_could_not_present";
+}
+
 + (NSString *)callServiceCouldNotCreatePeerConnectionClientPromise
 {
     return @"call_service_could_not_create_peer_connection_client_promise";