diff --git a/ZeroTier One.xcodeproj/project.pbxproj b/ZeroTier One.xcodeproj/project.pbxproj index 657f5150c..9bf8375ea 100644 --- a/ZeroTier One.xcodeproj/project.pbxproj +++ b/ZeroTier One.xcodeproj/project.pbxproj @@ -13,6 +13,7 @@ 932D47331D1CD861004BCFE2 /* PreferencesViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 932D47311D1CD861004BCFE2 /* PreferencesViewController.xib */; }; 932D47361D1CDC9B004BCFE2 /* AboutViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 932D47341D1CDC9B004BCFE2 /* AboutViewController.swift */; }; 932D47371D1CDC9B004BCFE2 /* AboutViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 932D47351D1CDC9B004BCFE2 /* AboutViewController.xib */; }; + 932D473A1D220D63004BCFE2 /* LaunchAtLoginController.m in Sources */ = {isa = PBXBuildFile; fileRef = 932D47391D220D63004BCFE2 /* LaunchAtLoginController.m */; }; 9330F1351CEAB4C400687EC8 /* ServiceCom.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9330F1341CEAB4C400687EC8 /* ServiceCom.swift */; }; 9330F1371CEBF87200687EC8 /* Network.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9330F1361CEBF87200687EC8 /* Network.swift */; }; 9330F13B1CF534E500687EC8 /* NetworkInfoCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9330F13A1CF534E500687EC8 /* NetworkInfoCell.swift */; }; @@ -33,6 +34,8 @@ 932D47311D1CD861004BCFE2 /* PreferencesViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PreferencesViewController.xib; sourceTree = ""; }; 932D47341D1CDC9B004BCFE2 /* AboutViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AboutViewController.swift; sourceTree = ""; }; 932D47351D1CDC9B004BCFE2 /* AboutViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = AboutViewController.xib; sourceTree = ""; }; + 932D47381D220D63004BCFE2 /* LaunchAtLoginController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LaunchAtLoginController.h; sourceTree = ""; }; + 932D47391D220D63004BCFE2 /* LaunchAtLoginController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LaunchAtLoginController.m; sourceTree = ""; }; 9330F1341CEAB4C400687EC8 /* ServiceCom.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ServiceCom.swift; sourceTree = ""; }; 9330F1361CEBF87200687EC8 /* Network.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Network.swift; sourceTree = ""; }; 9330F13A1CF534E500687EC8 /* NetworkInfoCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NetworkInfoCell.swift; sourceTree = ""; }; @@ -100,6 +103,8 @@ 932D47311D1CD861004BCFE2 /* PreferencesViewController.xib */, 932D47341D1CDC9B004BCFE2 /* AboutViewController.swift */, 932D47351D1CDC9B004BCFE2 /* AboutViewController.xib */, + 932D47381D220D63004BCFE2 /* LaunchAtLoginController.h */, + 932D47391D220D63004BCFE2 /* LaunchAtLoginController.m */, ); path = "ZeroTier One"; sourceTree = ""; @@ -182,6 +187,7 @@ 9330F1371CEBF87200687EC8 /* Network.swift in Sources */, 932D472D1D138B0C004BCFE2 /* NetworkMonitor.swift in Sources */, 932D47321D1CD861004BCFE2 /* PreferencesViewController.swift in Sources */, + 932D473A1D220D63004BCFE2 /* LaunchAtLoginController.m in Sources */, 93326BDC1CE7C816005CA2AC /* AppDelegate.swift in Sources */, 93DAFE4B1CFE53CA00547CC4 /* AuthtokenCopy.m in Sources */, 9330F13B1CF534E500687EC8 /* NetworkInfoCell.swift in Sources */, diff --git a/ZeroTier One/AppDelegate.swift b/ZeroTier One/AppDelegate.swift index 15560dc4c..b7e4a0553 100644 --- a/ZeroTier One/AppDelegate.swift +++ b/ZeroTier One/AppDelegate.swift @@ -28,6 +28,27 @@ class AppDelegate: NSObject, NSApplicationDelegate { var networks = [Network]() func applicationDidFinishLaunching(aNotification: NSNotification) { + + let defaults = NSUserDefaults.standardUserDefaults() + let defaultsDict = ["firstRun": true] + defaults.registerDefaults(defaultsDict) + + + if defaults.boolForKey("firstRun") { + defaults.setBool(false, forKey: "firstRun") + defaults.synchronize() + + let loginController = LaunchAtLoginController() + + let bundle = NSBundle.mainBundle() + let bundleURL = bundle.bundleURL + + loginController.setLaunchAtLogin(true, forURL: bundleURL) + } + + + + let nc = NSNotificationCenter.defaultCenter() nc.addObserver(self, selector: #selector(onNetworkListUpdated(_:)), name: networkUpdateKey, object: nil) diff --git a/ZeroTier One/LaunchAtLoginController.h b/ZeroTier One/LaunchAtLoginController.h new file mode 100644 index 000000000..8892c9fbc --- /dev/null +++ b/ZeroTier One/LaunchAtLoginController.h @@ -0,0 +1,34 @@ +// +// LaunchAtLoginController.h +// +// Copyright 2011 Tomáš Znamenáček +// Copyright 2010 Ben Clark-Robinson +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the ‘Software’), +// to deal in the Software without restriction, including without limitation +// the rights to use, copy, modify, merge, publish, distribute, sublicense, +// and/or sell copies of the Software, and to permit persons to whom the +// Software is furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED ‘AS IS’, WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +#import + +@interface LaunchAtLoginController : NSObject {} + +@property(assign) BOOL launchAtLogin; + +- (BOOL) willLaunchAtLogin: (NSURL*) itemURL; +- (void) setLaunchAtLogin: (BOOL) enabled forURL: (NSURL*) itemURL; + +@end diff --git a/ZeroTier One/LaunchAtLoginController.m b/ZeroTier One/LaunchAtLoginController.m new file mode 100644 index 000000000..f8aaafa00 --- /dev/null +++ b/ZeroTier One/LaunchAtLoginController.m @@ -0,0 +1,123 @@ +// +// LaunchAtLoginController.m +// +// Copyright 2011 Tomáš Znamenáček +// Copyright 2010 Ben Clark-Robinson +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the ‘Software’), +// to deal in the Software without restriction, including without limitation +// the rights to use, copy, modify, merge, publish, distribute, sublicense, +// and/or sell copies of the Software, and to permit persons to whom the +// Software is furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED ‘AS IS’, WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +#import "LaunchAtLoginController.h" + +static NSString *const StartAtLoginKey = @"launchAtLogin"; + +@interface LaunchAtLoginController () +@property(assign) LSSharedFileListRef loginItems; +@end + +@implementation LaunchAtLoginController +@synthesize loginItems; + +#pragma mark Change Observing + +void sharedFileListDidChange(LSSharedFileListRef inList, void *context) +{ + LaunchAtLoginController *self = (__bridge id) context; + [self willChangeValueForKey:StartAtLoginKey]; + [self didChangeValueForKey:StartAtLoginKey]; +} + +#pragma mark Initialization + +- (id) init +{ + self = [super init]; + if(self) { + loginItems = LSSharedFileListCreate(NULL, kLSSharedFileListSessionLoginItems, NULL); + LSSharedFileListAddObserver(loginItems, CFRunLoopGetMain(), + (CFStringRef)NSDefaultRunLoopMode, sharedFileListDidChange, (__bridge void*)self); + } + return self; +} + +- (void) dealloc +{ + LSSharedFileListRemoveObserver(loginItems, CFRunLoopGetMain(), + (CFStringRef)NSDefaultRunLoopMode, sharedFileListDidChange, (__bridge void*)self); + CFRelease(loginItems); +} + +#pragma mark Launch List Control + +- (LSSharedFileListItemRef) findItemWithURL: (NSURL*) wantedURL inFileList: (LSSharedFileListRef) fileList +{ + if (wantedURL == NULL || fileList == NULL) + return NULL; + + NSArray *listSnapshot = (__bridge NSArray*)LSSharedFileListCopySnapshot(fileList, NULL); + for (id itemObject in listSnapshot) { + LSSharedFileListItemRef item = (__bridge LSSharedFileListItemRef) itemObject; + UInt32 resolutionFlags = kLSSharedFileListNoUserInteraction | kLSSharedFileListDoNotMountVolumes; + CFURLRef currentItemURL = NULL; + LSSharedFileListItemResolve(item, resolutionFlags, ¤tItemURL, NULL); + if (currentItemURL && CFEqual(currentItemURL, (__bridge CFTypeRef)wantedURL)) { + CFRelease(currentItemURL); + return item; + } + if (currentItemURL) + CFRelease(currentItemURL); + } + + return NULL; +} + +- (BOOL) willLaunchAtLogin: (NSURL*) itemURL +{ + return !![self findItemWithURL:itemURL inFileList:loginItems]; +} + +- (void) setLaunchAtLogin: (BOOL) enabled forURL: (NSURL*) itemURL +{ + LSSharedFileListItemRef appItem = [self findItemWithURL:itemURL inFileList:loginItems]; + if (enabled && !appItem) { + LSSharedFileListInsertItemURL(loginItems, kLSSharedFileListItemBeforeFirst, + NULL, NULL, (__bridge CFURLRef)itemURL, NULL, NULL); + } else if (!enabled && appItem) + LSSharedFileListItemRemove(loginItems, appItem); +} + +#pragma mark Basic Interface + +- (NSURL*) appURL +{ + return [NSURL fileURLWithPath:[[NSBundle mainBundle] bundlePath]]; +} + +- (void) setLaunchAtLogin: (BOOL) enabled +{ + [self willChangeValueForKey:StartAtLoginKey]; + [self setLaunchAtLogin:enabled forURL:[self appURL]]; + [self didChangeValueForKey:StartAtLoginKey]; +} + +- (BOOL) launchAtLogin +{ + return [self willLaunchAtLogin:[self appURL]]; +} + +@end diff --git a/ZeroTier One/ZeroTier One-Bridging-Header.h b/ZeroTier One/ZeroTier One-Bridging-Header.h index 68795a0e2..de44090e2 100644 --- a/ZeroTier One/ZeroTier One-Bridging-Header.h +++ b/ZeroTier One/ZeroTier One-Bridging-Header.h @@ -3,3 +3,4 @@ // #import "AuthtokenCopy.h" +#import "LaunchAtLoginController.h"