diff --git a/Application/Application.xcodeproj/project.pbxproj b/Application/Application.xcodeproj/project.pbxproj index 923c6fa..d1ddeb3 100644 --- a/Application/Application.xcodeproj/project.pbxproj +++ b/Application/Application.xcodeproj/project.pbxproj @@ -457,7 +457,7 @@ CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = NO; CODE_SIGN_IDENTITY = "Developer ID Application"; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 2.0.1; + CURRENT_PROJECT_VERSION = 2.0.2; DEVELOPMENT_TEAM = VBG97UB4TA; ENABLE_HARDENED_RUNTIME = YES; FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../Carthage/Build/Mac"; @@ -466,7 +466,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(LD_RUNPATH_SEARCH_PATHS_$(IS_MACCATALYST)) @executable_path/../Frameworks"; LIBRARY_SEARCH_PATHS = ""; MACOSX_DEPLOYMENT_TARGET = 10.15; - MARKETING_VERSION = 2.0.1; + MARKETING_VERSION = 2.0.2; ONLY_ACTIVE_ARCH = NO; PRODUCT_BUNDLE_IDENTIFIER = "com.objective-see.oversight"; PRODUCT_NAME = OverSight; @@ -481,7 +481,7 @@ CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = NO; CODE_SIGN_IDENTITY = "Developer ID Application"; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 2.0.1; + CURRENT_PROJECT_VERSION = 2.0.2; DEVELOPMENT_TEAM = VBG97UB4TA; ENABLE_HARDENED_RUNTIME = YES; FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../Carthage/Build/Mac"; @@ -490,7 +490,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(LD_RUNPATH_SEARCH_PATHS_$(IS_MACCATALYST)) @executable_path/../Frameworks"; LIBRARY_SEARCH_PATHS = ""; MACOSX_DEPLOYMENT_TARGET = 10.15; - MARKETING_VERSION = 2.0.1; + MARKETING_VERSION = 2.0.2; ONLY_ACTIVE_ARCH = NO; PRODUCT_BUNDLE_IDENTIFIER = "com.objective-see.oversight"; PRODUCT_NAME = OverSight; diff --git a/Application/Application/AVMonitor.m b/Application/Application/AVMonitor.m index e3248cc..f6d4e6f 100644 --- a/Application/Application/AVMonitor.m +++ b/Application/Application/AVMonitor.m @@ -180,8 +180,8 @@ extern os_log_t logHandle; //init client client = [[Client alloc] init]; client.pid = pid; - client.path = getProcessPath(pid.intValue); - client.name = getProcessName(client.path); + client.path = valueForStringItem(getProcessPath(pid.intValue)); + client.name = valueForStringItem(getProcessName(client.path)); //dbg msg os_log_debug(logHandle, "new (video) client: %{public}@", client); @@ -340,8 +340,8 @@ extern os_log_t logHandle; client = [[Client alloc] init]; client.msgCount = msgCount; client.pid = pid; - client.path = getProcessPath(pid.intValue); - client.name = getProcessName(client.path); + client.path = valueForStringItem(getProcessPath(pid.intValue)); + client.name = valueForStringItem(getProcessName(client.path)); //dbg msg os_log_debug(logHandle, "new (video) client: %{public}@", client); @@ -669,8 +669,8 @@ extern os_log_t logHandle; client = [[Client alloc] init]; client.msgCount = msgCount; client.pid = @(htons(pid)); - client.path = getProcessPath(client.pid.intValue); - client.name = getProcessName(client.path); + client.path = valueForStringItem(getProcessPath(client.pid.intValue)); + client.name = valueForStringItem(getProcessName(client.path)); //dbg msg os_log_debug(logHandle, "new (audio) client: %{public}@", client); @@ -1305,7 +1305,7 @@ bail: if(nil != event.client) { //set body - content.body = [NSString stringWithFormat:@"Process: %@ (%@)", getProcessName(event.client.path), event.client.pid]; + content.body = [NSString stringWithFormat:@"Process: %@ (%@)", event.client.name, (0 != event.client.pid.intValue) ? event.client.pid : @"pid: unknown"]; //set category content.categoryIdentifier = CATEGORY_ACTION; @@ -1451,7 +1451,7 @@ bail: processID = response.notification.request.content.userInfo[EVENT_PROCESS_ID]; //get process name - processName = getProcessName(processPath); + processName = valueForStringItem(getProcessName(processPath)); //close? // nothing to do diff --git a/Installer/Installer.xcodeproj/project.pbxproj b/Installer/Installer.xcodeproj/project.pbxproj index 4083ec7..53a5682 100644 --- a/Installer/Installer.xcodeproj/project.pbxproj +++ b/Installer/Installer.xcodeproj/project.pbxproj @@ -383,14 +383,14 @@ CODE_SIGN_ENTITLEMENTS = ""; CODE_SIGN_IDENTITY = "Developer ID Application"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 2.0.1; + CURRENT_PROJECT_VERSION = 2.0.2; DEVELOPMENT_TEAM = VBG97UB4TA; ENABLE_HARDENED_RUNTIME = YES; FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../Carthage/Build/Mac"; GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = NO; INFOPLIST_FILE = Helper/Info.plist; MACOSX_DEPLOYMENT_TARGET = 10.15; - MARKETING_VERSION = 2.0.1; + MARKETING_VERSION = 2.0.2; ONLY_ACTIVE_ARCH = NO; OTHER_CODE_SIGN_FLAGS = ""; OTHER_LDFLAGS = ( @@ -418,14 +418,14 @@ CODE_SIGN_ENTITLEMENTS = ""; CODE_SIGN_IDENTITY = "Developer ID Application"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 2.0.1; + CURRENT_PROJECT_VERSION = 2.0.2; DEVELOPMENT_TEAM = VBG97UB4TA; ENABLE_HARDENED_RUNTIME = YES; FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../Carthage/Build/Mac"; GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = NO; INFOPLIST_FILE = Helper/Info.plist; MACOSX_DEPLOYMENT_TARGET = 10.15; - MARKETING_VERSION = 2.0.1; + MARKETING_VERSION = 2.0.2; ONLY_ACTIVE_ARCH = NO; OTHER_CODE_SIGN_FLAGS = ""; OTHER_LDFLAGS = ( @@ -454,7 +454,7 @@ CODE_SIGN_IDENTITY = "Developer ID Application"; CODE_SIGN_STYLE = Manual; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 2.0.1; + CURRENT_PROJECT_VERSION = 2.0.2; DEVELOPMENT_TEAM = VBG97UB4TA; ENABLE_HARDENED_RUNTIME = YES; FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../Carthage/Build/Mac"; @@ -463,7 +463,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(LD_RUNPATH_SEARCH_PATHS_$(IS_MACCATALYST)) @executable_path/../Frameworks"; LIBRARY_SEARCH_PATHS = ""; MACOSX_DEPLOYMENT_TARGET = 10.15; - MARKETING_VERSION = 2.0.1; + MARKETING_VERSION = 2.0.2; OTHER_CODE_SIGN_FLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = "com.objective-see.oversight.installer"; PRODUCT_NAME = "OverSight Installer"; @@ -480,7 +480,7 @@ CODE_SIGN_IDENTITY = "Developer ID Application"; CODE_SIGN_STYLE = Manual; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 2.0.1; + CURRENT_PROJECT_VERSION = 2.0.2; DEVELOPMENT_TEAM = VBG97UB4TA; ENABLE_HARDENED_RUNTIME = YES; FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../Carthage/Build/Mac"; @@ -489,7 +489,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(LD_RUNPATH_SEARCH_PATHS_$(IS_MACCATALYST)) @executable_path/../Frameworks"; LIBRARY_SEARCH_PATHS = ""; MACOSX_DEPLOYMENT_TARGET = 10.15; - MARKETING_VERSION = 2.0.1; + MARKETING_VERSION = 2.0.2; OTHER_CODE_SIGN_FLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = "com.objective-see.oversight.installer"; PRODUCT_NAME = "OverSight Installer"; diff --git a/Installer/Source/ConfigureWindowController.xib b/Installer/Source/ConfigureWindowController.xib index ddd0c2e..e1440a8 100644 --- a/Installer/Source/ConfigureWindowController.xib +++ b/Installer/Source/ConfigureWindowController.xib @@ -1,8 +1,8 @@ - + - +