From 9c6e1fed2a3cf2ca21abfe51be7d4ca74b3b8bc4 Mon Sep 17 00:00:00 2001
From: Sergey Abramchuk <dev@ss-abramchuk.me>
Date: Tue, 23 Jan 2018 16:02:16 +0300
Subject: [PATCH] Apply style guide rules to the openvpn configuration class

---
 .../OpenVPNConfiguration+Internal.h            | 18 +++++++++++-------
 OpenVPN Adapter/OpenVPNConfiguration.h         | 10 +++++-----
 OpenVPN Adapter/OpenVPNConfiguration.mm        |  9 ++++++++-
 3 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/OpenVPN Adapter/OpenVPNConfiguration+Internal.h b/OpenVPN Adapter/OpenVPNConfiguration+Internal.h
index 62d01cf..4bd4030 100644
--- a/OpenVPN Adapter/OpenVPNConfiguration+Internal.h	
+++ b/OpenVPN Adapter/OpenVPNConfiguration+Internal.h	
@@ -6,29 +6,33 @@
 //
 //
 
-#import <client/ovpncli.hpp>
-
 #import "OpenVPNConfiguration.h"
 
+#include <client/ovpncli.hpp>
+
 using namespace openvpn;
 
+NS_ASSUME_NONNULL_BEGIN
+
 @interface OpenVPNConfiguration (Internal)
 
 @property (readonly) ClientAPI::Config config;
 
 + (OpenVPNTransportProtocol)getTransportProtocolFromValue:(nullable NSString *)value;
-+ (nonnull NSString *)getValueFromTransportProtocol:(OpenVPNTransportProtocol)protocol;
++ (NSString *)getValueFromTransportProtocol:(OpenVPNTransportProtocol)protocol;
 
 + (OpenVPNIPv6Preference)getIPv6PreferenceFromValue:(nullable NSString *)value;
-+ (nonnull NSString *)getValueFromIPv6Preference:(OpenVPNIPv6Preference)preference;
++ (NSString *)getValueFromIPv6Preference:(OpenVPNIPv6Preference)preference;
 
 + (OpenVPNCompressionMode)getCompressionModeFromValue:(nullable NSString *)value;
-+ (nonnull NSString *)getValueFromCompressionMode:(OpenVPNCompressionMode)compressionMode;
++ (NSString *)getValueFromCompressionMode:(OpenVPNCompressionMode)compressionMode;
 
 + (OpenVPNMinTLSVersion)getMinTLSFromValue:(nullable NSString *)value;
-+ (nonnull NSString *)getValueFromMinTLS:(OpenVPNMinTLSVersion)minTLS;
++ (NSString *)getValueFromMinTLS:(OpenVPNMinTLSVersion)minTLS;
 
 + (OpenVPNTLSCertProfile)getTLSCertProfileFromValue:(nullable NSString *)value;
-+ (nonnull NSString *)getValueFromTLSCertProfile:(OpenVPNTLSCertProfile)tlsCertProfile;
++ (NSString *)getValueFromTLSCertProfile:(OpenVPNTLSCertProfile)tlsCertProfile;
 
 @end
+
+NS_ASSUME_NONNULL_END
diff --git a/OpenVPN Adapter/OpenVPNConfiguration.h b/OpenVPN Adapter/OpenVPNConfiguration.h
index 617593f..4ef4934 100644
--- a/OpenVPN Adapter/OpenVPNConfiguration.h	
+++ b/OpenVPN Adapter/OpenVPNConfiguration.h	
@@ -8,11 +8,11 @@
 
 #import <Foundation/Foundation.h>
 
-#import "OpenVPNTransportProtocol.h"
-#import "OpenVPNIPv6Preference.h"
-#import "OpenVPNCompressionMode.h"
-#import "OpenVPNMinTLSVersion.h"
-#import "OpenVPNTLSCertProfile.h"
+typedef NS_ENUM(NSInteger, OpenVPNTransportProtocol);
+typedef NS_ENUM(NSInteger, OpenVPNIPv6Preference);
+typedef NS_ENUM(NSInteger, OpenVPNCompressionMode);
+typedef NS_ENUM(NSInteger, OpenVPNMinTLSVersion);
+typedef NS_ENUM(NSInteger, OpenVPNTLSCertProfile);
 
 /**
  Class used to pass configuration
diff --git a/OpenVPN Adapter/OpenVPNConfiguration.mm b/OpenVPN Adapter/OpenVPNConfiguration.mm
index da8c049..208f23f 100644
--- a/OpenVPN Adapter/OpenVPNConfiguration.mm	
+++ b/OpenVPN Adapter/OpenVPNConfiguration.mm	
@@ -6,8 +6,15 @@
 //
 //
 
+#import "OpenVPNConfiguration.h"
 #import "OpenVPNConfiguration+Internal.h"
 
+#import "OpenVPNTransportProtocol.h"
+#import "OpenVPNIPv6Preference.h"
+#import "OpenVPNCompressionMode.h"
+#import "OpenVPNMinTLSVersion.h"
+#import "OpenVPNTLSCertProfile.h"
+
 using namespace openvpn;
 
 NSString *const OpenVPNTransportProtocolUDPValue = @"udp";
@@ -494,7 +501,7 @@ NSString *const OpenVPNTLSCertProfileDefaultValue = @"default";
 }
 
 - (instancetype)initWithCoder:(NSCoder *)aDecoder {
-    if ((self = [self init])) {
+    if (self = [self init]) {
         self.fileContent = [aDecoder decodeObjectOfClass:[NSData class] forKey:NSStringFromSelector(@selector(fileContent))];
         self.settings = [aDecoder decodeObjectOfClass:[NSDictionary class] forKey:NSStringFromSelector(@selector(settings))];
         self.guiVersion = [aDecoder decodeObjectOfClass:[NSString class] forKey:NSStringFromSelector(@selector(guiVersion))];