diff --git a/AppDelegate.m b/AppDelegate.m index d3c8d99..186c7a8 100755 --- a/AppDelegate.m +++ b/AppDelegate.m @@ -89,6 +89,8 @@ //make app front [NSApp activateIgnoringOtherApps:YES]; + //TODO: remove + /* //check that OS is supported if(YES != isSupportedOS()) { @@ -98,6 +100,7 @@ //exit exit(0); } + */ //check [self check4Update:nil]; diff --git a/Items/Binary.m b/Items/Binary.m index e414668..b74b50f 100644 --- a/Items/Binary.m +++ b/Items/Binary.m @@ -52,6 +52,14 @@ //determine if its on disk self.notFound = ![[NSFileManager defaultManager] fileExistsAtPath:self.path]; + + //though maybe its in the dyld shared cache + if( (YES == self.notFound) && + (isInSharedCache(self.path)) ) + { + //unset + self.notFound = NO; + } //get attributes self.attributes = [[NSFileManager defaultManager] attributesOfItemAtPath:self.path error:nil]; diff --git a/RequestRootWindowController.m b/RequestRootWindowController.m index 85e021e..8b3b374 100644 --- a/RequestRootWindowController.m +++ b/RequestRootWindowController.m @@ -39,7 +39,6 @@ } //automatically invoked when window is loaded -// ->set to white -(void)windowDidLoad { //super @@ -201,31 +200,18 @@ // ->then hide window & kick off action { - //dispatch, then action - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(.50 * NSEC_PER_SEC)), dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{ - - //close window - [self.window close]; - - //exec UI actions etc on main thread - dispatch_async(dispatch_get_main_queue(), ^{ - - //make sure app's key window is (still) front + //dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.50 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ + + [self.window close]; + + // Other UI updates [((AppDelegate*)[[NSApplication sharedApplication] delegate]).window makeKeyAndOrderFront:self]; - - //make sure app is (still) front [NSApp activateIgnoringOtherApps:YES]; - - //call back into app delegate - // ->kick off task enum, etc [((AppDelegate*)[[NSApplication sharedApplication] delegate]) go]; - - }); - }); + // }); } -//bail bail: //free auth ref diff --git a/TaskExplorer.xcodeproj/project.pbxproj b/TaskExplorer.xcodeproj/project.pbxproj index 5bf35d6..0d0fcfd 100755 --- a/TaskExplorer.xcodeproj/project.pbxproj +++ b/TaskExplorer.xcodeproj/project.pbxproj @@ -33,8 +33,6 @@ CD1508DA21BA4B9D0081F1AF /* Update.m in Sources */ = {isa = PBXBuildFile; fileRef = CD1508D821BA4B9D0081F1AF /* Update.m */; }; CD1508DC21BA4BAC0081F1AF /* UpdateWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = CD1508DB21BA4BAC0081F1AF /* UpdateWindow.xib */; }; CD1508DF21BB13990081F1AF /* Signing.m in Sources */ = {isa = PBXBuildFile; fileRef = CD1508DD21BB13980081F1AF /* Signing.m */; }; - CD1D14EF21B7A67600FF7F4B /* Sentry.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = CD1D14EB21B7A5DB00FF7F4B /* Sentry.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - CD1D14F121B7A69300FF7F4B /* Sentry.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = CD1D14EB21B7A5DB00FF7F4B /* Sentry.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; CD1D14F321B8F2FC00FF7F4B /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = CD1D14F221B8F2FC00FF7F4B /* Assets.xcassets */; }; CD1D14F421B8F2FC00FF7F4B /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = CD1D14F221B8F2FC00FF7F4B /* Assets.xcassets */; }; CD3F4CE81AF5CF68002A2647 /* TaskEnumerator.m in Sources */ = {isa = PBXBuildFile; fileRef = CD3F4CE61AF5CF68002A2647 /* TaskEnumerator.m */; }; @@ -150,7 +148,6 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - CD1D14EF21B7A67600FF7F4B /* Sentry.framework in Copy Frameworks */, ); name = "Copy Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -161,7 +158,6 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - CD1D14F121B7A69300FF7F4B /* Sentry.framework in Copy Frameworks */, ); name = "Copy Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -193,8 +189,8 @@ 7D73480C1BCB82C900CD7235 /* flaggedRed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = flaggedRed.png; path = images/flaggedRed.png; sourceTree = SOURCE_ROOT; }; 7D73480D1BCB82C900CD7235 /* flaggedRedBG.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = flaggedRedBG.png; path = images/flaggedRedBG.png; sourceTree = SOURCE_ROOT; }; 7D73480E1BCB82C900CD7235 /* flaggedRedOver.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = flaggedRedOver.png; path = images/flaggedRedOver.png; sourceTree = SOURCE_ROOT; }; - 7DA5CA0D1C7AA8CB00627DD7 /* MachO.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MachO.h; path = ../MachO/MachOParser/MachO.h; sourceTree = ""; }; - 7DA5CA0E1C7AA8CB00627DD7 /* MachO.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MachO.m; path = ../MachO/MachOParser/MachO.m; sourceTree = ""; }; + 7DA5CA0D1C7AA8CB00627DD7 /* MachO.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MachO.h; path = "../Mach-O/MachOParser/MachO.h"; sourceTree = ""; }; + 7DA5CA0E1C7AA8CB00627DD7 /* MachO.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MachO.m; path = "../Mach-O/MachOParser/MachO.m"; sourceTree = ""; }; 7DAA78071B903BF1004840B9 /* CustomTextField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CustomTextField.h; sourceTree = ""; }; 7DAA78081B903BF1004840B9 /* CustomTextField.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CustomTextField.m; sourceTree = ""; }; CD001B351AB903040089014A /* logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = logo.png; path = images/logo.png; sourceTree = SOURCE_ROOT; }; @@ -218,7 +214,6 @@ CD1508DB21BA4BAC0081F1AF /* UpdateWindow.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = UpdateWindow.xib; path = UI/UpdateWindow.xib; sourceTree = ""; }; CD1508DD21BB13980081F1AF /* Signing.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Signing.m; sourceTree = SOURCE_ROOT; }; CD1508DE21BB13980081F1AF /* Signing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Signing.h; sourceTree = SOURCE_ROOT; }; - CD1D14EB21B7A5DB00FF7F4B /* Sentry.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sentry.framework; path = Carthage/Build/Mac/Sentry.framework; sourceTree = ""; }; CD1D14F221B8F2FC00FF7F4B /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = SOURCE_ROOT; }; CD24FE7621C6FC3D00900B61 /* main.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = main.h; sourceTree = SOURCE_ROOT; }; CD3F4CE61AF5CF68002A2647 /* TaskEnumerator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TaskEnumerator.m; sourceTree = SOURCE_ROOT; }; @@ -417,7 +412,6 @@ 1D21BC4D172AF43D009D1CFD /* Frameworks */ = { isa = PBXGroup; children = ( - CD1D14EB21B7A5DB00FF7F4B /* Sentry.framework */, CD7FBF241B6EDAC000578C5D /* SystemConfiguration.framework */, CDF08CE91AC8D97B009B3423 /* Quartz.framework */, CD6095721A87067D00E091CD /* Security.framework */, @@ -731,6 +725,7 @@ developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( + English, en, ); mainGroup = 1D21BC42172AF43D009D1CFD; @@ -1019,6 +1014,7 @@ GCC_PREFIX_HEADER = "TaskExplorer-Prefix.pch"; INFOPLIST_FILE = "TaskExplorer-Info.plist"; LD_RUNPATH_SEARCH_PATHS = "@executable_path/../Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 11.5; PRODUCT_BUNDLE_IDENTIFIER = "com.objective-see.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = TaskExplorer; PROVISIONING_PROFILE = ""; @@ -1043,6 +1039,7 @@ GCC_PREFIX_HEADER = "TaskExplorer-Prefix.pch"; INFOPLIST_FILE = "TaskExplorer-Info.plist"; LD_RUNPATH_SEARCH_PATHS = "@executable_path/../Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 11.5; PRODUCT_BUNDLE_IDENTIFIER = "com.objective-see.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = TaskExplorer; PROVISIONING_PROFILE = ""; diff --git a/UI/AboutWindow.xib b/UI/AboutWindow.xib index b0a9b43..2fa1792 100644 --- a/UI/AboutWindow.xib +++ b/UI/AboutWindow.xib @@ -1,8 +1,8 @@ - + - + @@ -19,7 +19,7 @@ - + @@ -37,11 +37,11 @@ - + - + @@ -70,7 +70,7 @@ - + @@ -79,7 +79,7 @@ - + @@ -88,7 +88,7 @@ - -