1 files changed, 10 insertions, 1 deletions
diff --git a/SmartDeviceLink/private/SDLCheckChoiceVROptionalOperation.m b/SmartDeviceLink/private/SDLCheckChoiceVROptionalOperation.m
index 0615cb01a..f9ee3168b 100644
--- a/SmartDeviceLink/private/SDLCheckChoiceVROptionalOperation.m
+++ b/SmartDeviceLink/private/SDLCheckChoiceVROptionalOperation.m
@@ -20,18 +20,21 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property (strong, nonatomic) NSUUID *operationId;
 @property (weak, nonatomic) id<SDLConnectionManagerType> connectionManager;
+@property (assign, nonatomic, getter=isVROptional) BOOL vrOptional;
 @property (copy, nonatomic, nullable) NSError *internalError;
+@property (copy, nonatomic) SDLCheckChoiceVROptionalCompletionHandler vrOptionalCompletionHandler;
 
 @end
 
 @implementation SDLCheckChoiceVROptionalOperation
 
-- (instancetype)initWithConnectionManager:(id<SDLConnectionManagerType>)connectionManager {
+- (instancetype)initWithConnectionManager:(id<SDLConnectionManagerType>)connectionManager completionHandler:(nonnull SDLCheckChoiceVROptionalCompletionHandler)completionHandler {
     self = [super init];
     if (!self) { return nil; }
 
     _connectionManager = connectionManager;
     _operationId = [NSUUID UUID];
+    _vrOptionalCompletionHandler = completionHandler;
 
     return self;
 }
@@ -96,6 +99,12 @@ NS_ASSUME_NONNULL_BEGIN
 
 #pragma mark - Property Overrides
 
+- (void)finishOperation {
+    self.vrOptionalCompletionHandler(self.isVROptional, self.internalError);
+
+    [super finishOperation];
+}
+
 - (nullable NSString *)name {
     return [NSString stringWithFormat:@"%@ - %@", self.class, self.operationId];
 }