From 34fa18d5227ed809ea803e4a0e0459d53b5319df Mon Sep 17 00:00:00 2001 From: Patrick Wardle Date: Tue, 22 Nov 2022 09:11:33 -1000 Subject: [PATCH] v2.1.1 version bump code cleanup --- .../Application.xcodeproj/project.pbxproj | 12 ++++++++---- Application/Application/AVMonitor.m | 7 ++++--- Installer/Installer.xcodeproj/project.pbxproj | 16 ++++++++-------- .../xcshareddata/xcschemes/Installer.xcscheme | 2 +- Installer/Source/ConfigureWindowController.h | 17 ----------------- Installer/Source/ConfigureWindowController.m | 3 --- 6 files changed, 21 insertions(+), 36 deletions(-) diff --git a/Application/Application.xcodeproj/project.pbxproj b/Application/Application.xcodeproj/project.pbxproj index 7e2913e..1b6673d 100644 --- a/Application/Application.xcodeproj/project.pbxproj +++ b/Application/Application.xcodeproj/project.pbxproj @@ -469,16 +469,18 @@ CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = NO; CODE_SIGN_IDENTITY = "Developer ID Application"; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 2.1.0; + CURRENT_PROJECT_VERSION = 2.1.1; DEVELOPMENT_TEAM = VBG97UB4TA; ENABLE_HARDENED_RUNTIME = YES; FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../Carthage/Build/Mac"; GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO; INFOPLIST_FILE = Application/Info.plist; + INFOPLIST_KEY_CFBundleDisplayName = OverSight; + INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities"; LD_RUNPATH_SEARCH_PATHS = "$(LD_RUNPATH_SEARCH_PATHS_$(IS_MACCATALYST)) @executable_path/../Frameworks"; LIBRARY_SEARCH_PATHS = ""; MACOSX_DEPLOYMENT_TARGET = 12.0; - MARKETING_VERSION = 2.1.0; + MARKETING_VERSION = 2.1.1; ONLY_ACTIVE_ARCH = NO; PRODUCT_BUNDLE_IDENTIFIER = "com.objective-see.oversight"; PRODUCT_NAME = OverSight; @@ -493,16 +495,18 @@ CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = NO; CODE_SIGN_IDENTITY = "Developer ID Application"; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 2.1.0; + CURRENT_PROJECT_VERSION = 2.1.1; DEVELOPMENT_TEAM = VBG97UB4TA; ENABLE_HARDENED_RUNTIME = YES; FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../Carthage/Build/Mac"; GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO; INFOPLIST_FILE = Application/Info.plist; + INFOPLIST_KEY_CFBundleDisplayName = OverSight; + INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities"; LD_RUNPATH_SEARCH_PATHS = "$(LD_RUNPATH_SEARCH_PATHS_$(IS_MACCATALYST)) @executable_path/../Frameworks"; LIBRARY_SEARCH_PATHS = ""; MACOSX_DEPLOYMENT_TARGET = 12.0; - MARKETING_VERSION = 2.1.0; + MARKETING_VERSION = 2.1.1; 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 c188755..65df252 100644 --- a/Application/Application/AVMonitor.m +++ b/Application/Application/AVMonitor.m @@ -1075,20 +1075,21 @@ bail: result = NOTIFICATION_SPURIOUS; //dbg msg - os_log_debug(logHandle, "ignoring mic event, as it happened <0.5s "); + os_log_debug(logHandle, "ignoring mic event, as it happened <0.5s ago"); //bail goto bail; } //ignore if mic's last event was same state - if(deviceLastEvent.state == event.state) + if( (deviceLastEvent.state == event.state) && + ([event.timestamp timeIntervalSinceDate:deviceLastEvent.timestamp] < 2.0f) ) { //set result result = NOTIFICATION_SPURIOUS; //dbg msg - os_log_debug(logHandle, "ignoring mic event as it was same state as last (%ld)", (long)event.state); + os_log_debug(logHandle, "ignoring mic event as it was same state as last (%ld), and happened <2.0s ago", (long)event.state); //bail goto bail; diff --git a/Installer/Installer.xcodeproj/project.pbxproj b/Installer/Installer.xcodeproj/project.pbxproj index 09e8a79..4e6ed4c 100644 --- a/Installer/Installer.xcodeproj/project.pbxproj +++ b/Installer/Installer.xcodeproj/project.pbxproj @@ -384,14 +384,14 @@ CODE_SIGN_ENTITLEMENTS = ""; CODE_SIGN_IDENTITY = "Developer ID Application"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 2.1.0; + CURRENT_PROJECT_VERSION = 2.1.1; 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 = 12.0; - MARKETING_VERSION = 2.1.0; + MARKETING_VERSION = 2.1.1; ONLY_ACTIVE_ARCH = NO; OTHER_CODE_SIGN_FLAGS = ""; OTHER_LDFLAGS = ( @@ -419,14 +419,14 @@ CODE_SIGN_ENTITLEMENTS = ""; CODE_SIGN_IDENTITY = "Developer ID Application"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 2.1.0; + CURRENT_PROJECT_VERSION = 2.1.1; 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 = 12.0; - MARKETING_VERSION = 2.1.0; + MARKETING_VERSION = 2.1.1; ONLY_ACTIVE_ARCH = NO; OTHER_CODE_SIGN_FLAGS = ""; OTHER_LDFLAGS = ( @@ -455,7 +455,7 @@ CODE_SIGN_IDENTITY = "Developer ID Application"; CODE_SIGN_STYLE = Manual; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 2.1.0; + CURRENT_PROJECT_VERSION = 2.1.1; DEVELOPMENT_TEAM = VBG97UB4TA; ENABLE_HARDENED_RUNTIME = YES; FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../Carthage/Build/Mac"; @@ -467,7 +467,7 @@ ); LIBRARY_SEARCH_PATHS = ""; MACOSX_DEPLOYMENT_TARGET = 12.0; - MARKETING_VERSION = 2.1.0; + MARKETING_VERSION = 2.1.1; OTHER_CODE_SIGN_FLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = "com.objective-see.oversight.installer"; PRODUCT_NAME = "OverSight Installer"; @@ -484,7 +484,7 @@ CODE_SIGN_IDENTITY = "Developer ID Application"; CODE_SIGN_STYLE = Manual; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 2.1.0; + CURRENT_PROJECT_VERSION = 2.1.1; DEVELOPMENT_TEAM = VBG97UB4TA; ENABLE_HARDENED_RUNTIME = YES; FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../Carthage/Build/Mac"; @@ -496,7 +496,7 @@ ); LIBRARY_SEARCH_PATHS = ""; MACOSX_DEPLOYMENT_TARGET = 12.0; - MARKETING_VERSION = 2.1.0; + MARKETING_VERSION = 2.1.1; OTHER_CODE_SIGN_FLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = "com.objective-see.oversight.installer"; PRODUCT_NAME = "OverSight Installer"; diff --git a/Installer/Installer.xcodeproj/xcshareddata/xcschemes/Installer.xcscheme b/Installer/Installer.xcodeproj/xcshareddata/xcschemes/Installer.xcscheme index 810a7d7..7a1ac14 100644 --- a/Installer/Installer.xcodeproj/xcshareddata/xcschemes/Installer.xcscheme +++ b/Installer/Installer.xcodeproj/xcshareddata/xcschemes/Installer.xcscheme @@ -59,7 +59,7 @@