From 385119f0734fb8c35e8b0b9615eee85bfacfd727 Mon Sep 17 00:00:00 2001 From: Sergey Abramchuk Date: Fri, 21 Jul 2017 14:31:47 +0300 Subject: [PATCH] Provide even empty error message --- OpenVPN Adapter/OpenVPNAdapter.mm | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/OpenVPN Adapter/OpenVPNAdapter.mm b/OpenVPN Adapter/OpenVPNAdapter.mm index 7e8508e..533cd25 100644 --- a/OpenVPN Adapter/OpenVPNAdapter.mm +++ b/OpenVPN Adapter/OpenVPNAdapter.mm @@ -343,19 +343,15 @@ static void socketCallback(CFSocketRef socket, CFSocketCallBackType type, CFData if (event->error) { OpenVPNError errorCode = [self errorByName:name]; + NSString *errorReason = [self reasonForError:errorCode]; NSMutableDictionary *userInfo = [NSMutableDictionary new]; [userInfo setObject:@"OpenVPN error occured." forKey:NSLocalizedDescriptionKey]; [userInfo setObject:@(event->fatal) forKey:OpenVPNAdapterErrorFatalKey]; - - NSString *errorReason = [self reasonForError:errorCode]; [userInfo setObject:errorReason != nil ? errorReason : @"See error message." forKey:NSLocalizedFailureReasonErrorKey]; [userInfo setObject:errorReason != nil ? @(YES) : @(NO) forKey:OpenVPNAdapterErrorContainsReasonKey]; - - if (message != nil && ![message isEqualToString:@""]) { - [userInfo setObject:message forKey:OpenVPNAdapterErrorMessageKey]; - } + [userInfo setObject:message != nil ? message : @"" forKey:OpenVPNAdapterErrorMessageKey]; NSError *error = [NSError errorWithDomain:OpenVPNAdapterErrorDomain code:errorCode