Replace NodeStatus object with Obj-C Class

4 files changed, 57 insertions, 59 deletions

diff --git a/ZeroTier One/NodeStatus.h b/ZeroTier One/NodeStatus.h
new file mode 100644
index 00000000..074928b4
--- /dev/null
+++ b/ZeroTier One/NodeStatus.h
@@ -0,0 +1,25 @@
+//
+//  NodeStatus.h
+//  ZeroTier One
+//
+//  Created by Grant Limberg on 8/4/16.
+//  Copyright © 2016 ZeroTier, Inc. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface NodeStatus : NSObject
+
+@property (readonly) NSString *address;
+@property (readonly) NSString *publicIdentity;
+@property (readonly) BOOL online;
+@property (readonly) BOOL tcpFallbackActive;
+@property (readonly) int versionMajor;
+@property (readonly) int versionMinor;
+@property (readonly) int versionRev;
+@property (readonly) NSString *version;
+@property (readonly) UInt64 clock;
+
+- (id)initWithJsonData:(NSDictionary*)jsonData;
+
+@end
diff --git a/ZeroTier One/NodeStatus.m b/ZeroTier One/NodeStatus.m
new file mode 100644
index 00000000..5a368491
--- /dev/null
+++ b/ZeroTier One/NodeStatus.m
@@ -0,0 +1,31 @@
+//
+//  NodeStatus.m
+//  ZeroTier One
+//
+//  Created by Grant Limberg on 8/4/16.
+//  Copyright © 2016 ZeroTier, Inc. All rights reserved.
+//
+
+#import "NodeStatus.h"
+
+@implementation NodeStatus
+
+- (id)initWithJsonData:(NSDictionary*)jsonData
+{
+    self = [super init];
+
+    if(self) {
+        _address = (NSString*)[jsonData objectForKey:@"address"];
+        _publicIdentity = (NSString*)[jsonData objectForKey:@"publicIdentity"];
+        _online = [(NSNumber*)[jsonData objectForKey:@"online"] boolValue];
+        _tcpFallbackActive = [(NSNumber*)[jsonData objectForKey:@"tcpFallbackActive"] boolValue];
+        _versionMajor = [(NSNumber*)[jsonData objectForKey:@"versionMajor"] intValue];
+        _versionMinor = [(NSNumber*)[jsonData objectForKey:@"versionMinor"] intValue];
+        _versionRev = [(NSNumber*)[jsonData objectForKey:@"versionRev"] intValue];
+        _version = (NSString*)[jsonData objectForKey:@"version"];
+        _clock = [(NSNumber*)[jsonData objectForKey:@"clock"] unsignedLongLongValue];
+    }
+
+    return self;
+}
+@end
diff --git a/ZeroTier One/NodeStatus.swift b/ZeroTier One/NodeStatus.swift
deleted file mode 100644
index e2ba0820..00000000
--- a/ZeroTier One/NodeStatus.swift
+++ /dev/null
@@ -1,59 +0,0 @@
-//
-//  NodeStatus.swift
-//  ZeroTier One
-//
-//  Created by Grant Limberg on 6/30/16.
-//  Copyright © 2016 ZeroTier, Inc. All rights reserved.
-//
-
-import Cocoa
-
-class NodeStatus: NSObject {
-    var address: String = ""
-    var publicIdentity: String = ""
-    var online: Bool = false
-    var tcpFallbackActive: Bool = false
-    var versionMajor: Int = 0
-    var versionMinor: Int = 0
-    var versionRev: Int = 0
-    var version: String = ""
-    var clock: UInt64 = 0
-
-    init(jsonData: [String: AnyObject]) {
-        if let a = jsonData["address"] as? String {
-            self.address = a
-        }
-
-        if let p = jsonData["publicIdentity"] as? String {
-            self.publicIdentity = p
-        }
-
-        if let o = jsonData["online"] as? NSNumber {
-            self.online = o.boolValue
-        }
-
-        if let t = jsonData["tcpFallbackActive"] as? NSNumber {
-            self.tcpFallbackActive = t.boolValue
-        }
-
-        if let v = jsonData["versionMajor"] as? NSNumber {
-            self.versionMajor = v.integerValue
-        }
-
-        if let v = jsonData["versionMinor"] as? NSNumber {
-            self.versionMinor = v.integerValue
-        }
-
-        if let v = jsonData["versionRev"] as? NSNumber {
-            self.versionRev = v.integerValue
-        }
-
-        if let v = jsonData["version"] as? String {
-            self.version = v
-        }
-
-        if let c = jsonData["version"] as? NSNumber {
-            self.clock = c.unsignedLongLongValue
-        }
-    }
-}
diff --git a/ZeroTier One/ZeroTier One-Bridging-Header.h b/ZeroTier One/ZeroTier One-Bridging-Header.h
index de44090e..423afe5c 100644
--- a/ZeroTier One/ZeroTier One-Bridging-Header.h
+++ b/ZeroTier One/ZeroTier One-Bridging-Header.h
@@ -4,3 +4,4 @@
 
 #import "AuthtokenCopy.h"
 #import "LaunchAtLoginController.h"
+#import "NodeStatus.h"
\ No newline at end of file