Migrate call proto wrappers.

Signal/src/Signal-Bridging-Header.h

@@ -82,7 +82,6 @@
 #import <SignalServiceKit/OWSAsserts.h>
 #import <SignalServiceKit/OWSAttachmentsProcessor.h>
 #import <SignalServiceKit/OWSBackgroundTask.h>
-#import <SignalServiceKit/OWSCallAnswerMessage.h>
 #import <SignalServiceKit/OWSCallBusyMessage.h>
 #import <SignalServiceKit/OWSCallHangupMessage.h>
 #import <SignalServiceKit/OWSCallIceUpdateMessage.h>

Signal/src/call/CallService.swift

@@ -712,10 +712,18 @@ private class SignalCallData: NSObject {
                 throw CallError.obsoleteCall(description: "negotiateSessionDescription() response for obsolete call")
             }
 
-            let answerMessage = OWSCallAnswerMessage(callId: newCall.signalingId, sessionDescription: negotiatedSessionDescription.sdp)
+            let answerBuilder = SSKProtoCallMessageAnswer.SSKProtoCallMessageAnswerBuilder()
-            let callAnswerMessage = OWSOutgoingCallMessage(thread: thread, answerMessage: answerMessage)
+            answerBuilder.setId(newCall.signalingId)
+            answerBuilder.setSessionDescription(negotiatedSessionDescription.sdp)
+            do {
+                let answer = try answerBuilder.build()
+                let callAnswerMessage = OWSOutgoingCallMessage(thread: thread, answerMessage: answer)
 
                 return self.messageSender.sendPromise(message: callAnswerMessage)
+            } catch {
+                owsFail("Couldn't build proto in \(#function)")
+                throw CallError.protoErro(description: "Couldn't build proto in \(#function)")
+            }
         }.then {
             guard self.call == newCall else {
                 throw CallError.obsoleteCall(description: "sendPromise(message: ) response for obsolete call")

SignalServiceKit/src/Messages/OWSCallAnswerMessage.h

@@ -1,23 +0,0 @@
-//
-//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
-//
-
-NS_ASSUME_NONNULL_BEGIN
-
-@class SSKProtoCallMessageAnswer;
-
-/**
- * Sent by the call recipient upon accepting a CallOffer
- */
-@interface OWSCallAnswerMessage : NSObject
-
-- (instancetype)initWithCallId:(UInt64)callId sessionDescription:(NSString *)sessionDescription;
-
-@property (nonatomic, readonly) UInt64 callId;
-@property (nonatomic, readonly, copy) NSString *sessionDescription;
-
-- (nullable SSKProtoCallMessageAnswer *)asProtobuf;
-
-@end
-
-NS_ASSUME_NONNULL_END

SignalServiceKit/src/Messages/OWSCallAnswerMessage.m

@@ -1,43 +0,0 @@
-//
-//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
-//
-
-#import "OWSCallAnswerMessage.h"
-#import <SignalServiceKit/SignalServiceKit-Swift.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@implementation OWSCallAnswerMessage
-
-- (instancetype)initWithCallId:(UInt64)callId sessionDescription:(NSString *)sessionDescription
-{
-    self = [super init];
-    if (!self) {
-        return self;
-    }
-
-    _callId = callId;
-    _sessionDescription = sessionDescription;
-
-    return self;
-}
-
-- (nullable SSKProtoCallMessageAnswer *)asProtobuf
-{
-    SSKProtoCallMessageAnswerBuilder *builder = [SSKProtoCallMessageAnswerBuilder new];
-
-    builder.id = self.callId;
-    builder.sessionDescription = self.sessionDescription;
-    
-    NSError *error;
-    SSKProtoCallMessageAnswer *_Nullable result = [builder buildAndReturnError:&error];
-    if (error || !result) {
-        OWSFail(@"%@ could not build protobuf: %@", self.logTag, error);
-        return nil;
-    }
-    return result;
-}
-
-@end
-
-NS_ASSUME_NONNULL_END

SignalServiceKit/src/Messages/OWSOutgoingCallMessage.h

@@ -6,10 +6,10 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@class OWSCallAnswerMessage;
 @class OWSCallBusyMessage;
 @class OWSCallHangupMessage;
 @class OWSCallIceUpdateMessage;
+@class SSKProtoCallMessageAnswer;
 @class SSKProtoCallMessageOffer;
 @class TSThread;
 
@@ -30,7 +30,7 @@ NS_ASSUME_NONNULL_BEGIN
                                     contactShare:(nullable OWSContact *)contactShare NS_UNAVAILABLE;
 
 - (instancetype)initWithThread:(TSThread *)thread offerMessage:(SSKProtoCallMessageOffer *)offerMessage;
-- (instancetype)initWithThread:(TSThread *)thread answerMessage:(OWSCallAnswerMessage *)answerMessage;
+- (instancetype)initWithThread:(TSThread *)thread answerMessage:(SSKProtoCallMessageAnswer *)answerMessage;
 - (instancetype)initWithThread:(TSThread *)thread iceUpdateMessage:(OWSCallIceUpdateMessage *)iceUpdateMessage;
 - (instancetype)initWithThread:(TSThread *)thread
              iceUpdateMessages:(NSArray<OWSCallIceUpdateMessage *> *)iceUpdateMessage;
@@ -38,7 +38,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (instancetype)initWithThread:(TSThread *)thread busyMessage:(OWSCallBusyMessage *)busyMessage;
 
 @property (nullable, nonatomic, readonly) SSKProtoCallMessageOffer *offerMessage;
-@property (nullable, nonatomic, readonly) OWSCallAnswerMessage *answerMessage;
+@property (nullable, nonatomic, readonly) SSKProtoCallMessageAnswer *answerMessage;
 @property (nullable, nonatomic, readonly) NSArray<OWSCallIceUpdateMessage *> *iceUpdateMessages;
 @property (nullable, nonatomic, readonly) OWSCallHangupMessage *hangupMessage;
 @property (nullable, nonatomic, readonly) OWSCallBusyMessage *busyMessage;

SignalServiceKit/src/Messages/OWSOutgoingCallMessage.m

@@ -4,7 +4,6 @@
 
 #import "OWSOutgoingCallMessage.h"
 #import "NSDate+OWS.h"
-#import "OWSCallAnswerMessage.h"
 #import "OWSCallBusyMessage.h"
 #import "OWSCallHangupMessage.h"
 #import "OWSCallIceUpdateMessage.h"
@@ -50,7 +49,7 @@ NS_ASSUME_NONNULL_BEGIN
     return self;
 }
 
-- (instancetype)initWithThread:(TSThread *)thread answerMessage:(OWSCallAnswerMessage *)answerMessage
+- (instancetype)initWithThread:(TSThread *)thread answerMessage:(SSKProtoCallMessageAnswer *)answerMessage
 {
     self = [self initWithThread:thread];
     if (!self) {
@@ -150,11 +149,7 @@ NS_ASSUME_NONNULL_BEGIN
     }
 
     if (self.answerMessage) {
-        SSKProtoCallMessageAnswer *_Nullable proto = [self.answerMessage asProtobuf];
+        [builder setAnswer:self.answerMessage];
-        if (!proto) {
-            return nil;
-        }
-        [builder setAnswer:proto];
     }
 
     if (self.iceUpdateMessages) {