Skip to content

Commit

Permalink
uninstaller/error reporting++
Browse files Browse the repository at this point in the history
updated icon for uninstaller
improved disabling of error reporting
  • Loading branch information
objective-see committed May 23, 2023
1 parent 9188176 commit 50478cd
Show file tree
Hide file tree
Showing 17 changed files with 66 additions and 62 deletions.
Binary file modified DMG/LuLu.icns
Binary file not shown.
4 changes: 2 additions & 2 deletions DMG/createDMG.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
create-dmg \
--volname "LuLu v2.4.3" \
--volname "LuLu v2.5.0" \
--volicon "LuLu.icns" \
--background "background.png" \
--window-pos 200 120 \
Expand All @@ -8,5 +8,5 @@ create-dmg \
--icon "LuLu.app" 200 190 \
--hide-extension "LuLu.app" \
--app-drop-link 600 190 \
"LuLu_2.4.3.dmg" \
"LuLu_2.5.0.dmg" \
"Release/"
3 changes: 3 additions & 0 deletions LuLu/App/PrefsWindowController.m
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,9 @@ -(IBAction)togglePreference:(id)sender
//dbg msg
os_log_debug(logHandle, "turning off error/crash reporting");

//end session
[SentrySDK endSession];

//stop
[SentrySDK close];
}
Expand Down
38 changes: 19 additions & 19 deletions LuLu/App/Rules.xib
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21701" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<dependencies>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21701"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
Expand All @@ -24,31 +24,31 @@
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
<window identifier="Rules" title="LuLu Rules" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="F0z-JX-Cv5">
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
<rect key="contentRect" x="913" y="419" width="1015" height="574"/>
<rect key="screenRect" x="0.0" y="0.0" width="3440" height="1415"/>
<rect key="contentRect" x="913" y="419" width="1020" height="550"/>
<rect key="screenRect" x="0.0" y="0.0" width="1512" height="944"/>
<value key="minSize" type="size" width="1020" height="550"/>
<view key="contentView" wantsLayer="YES" id="se5-gp-TjO">
<rect key="frame" x="0.0" y="0.0" width="1015" height="574"/>
<rect key="frame" x="0.0" y="0.0" width="1020" height="550"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<userGuides>
<userLayoutGuide location="994" affinity="minX"/>
</userGuides>
<subviews>
<scrollView fixedFrame="YES" autohidesScrollers="YES" horizontalLineScroll="52" horizontalPageScroll="10" verticalLineScroll="52" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tn9-NJ-2RM">
<rect key="frame" x="0.0" y="46" width="1016" height="529"/>
<rect key="frame" x="0.0" y="46" width="1021" height="505"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<clipView key="contentView" id="6Xv-R4-m4F">
<rect key="frame" x="1" y="1" width="1014" height="527"/>
<rect key="frame" x="1" y="1" width="1019" height="503"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<outlineView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="firstColumnOnly" alternatingRowBackgroundColors="YES" columnReordering="NO" multipleSelection="NO" autosaveColumns="NO" rowHeight="50" rowSizeStyle="automatic" headerView="0ZG-mg-rCP" viewBased="YES" indentationPerLevel="8" outlineTableColumn="Iaf-If-UX3" id="ass-Hi-FMe" customClass="RulesTable">
<rect key="frame" x="0.0" y="0.0" width="1015" height="502"/>
<rect key="frame" x="0.0" y="0.0" width="1019" height="478"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<size key="intercellSpacing" width="3" height="2"/>
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
<color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
<tableColumns>
<tableColumn width="800" minWidth="800" maxWidth="3.4028234663852886e+38" id="Iaf-If-UX3" userLabel="Main">
<tableColumn width="804" minWidth="800" maxWidth="3.4028234663852886e+38" id="Iaf-If-UX3" userLabel="Main">
<tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left">
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
Expand All @@ -61,7 +61,7 @@
<tableColumnResizingMask key="resizingMask" resizeWithTable="YES"/>
<prototypeCellViews>
<tableCellView identifier="processCell" id="hYC-a4-Gp3" userLabel="Process">
<rect key="frame" x="1" y="1" width="805" height="50"/>
<rect key="frame" x="1" y="1" width="809" height="50"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" tag="100" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bkx-JF-q5i">
Expand Down Expand Up @@ -94,7 +94,7 @@
</connections>
</tableCellView>
<tableCellView identifier="simpleCell" id="Tec-Zl-6cm" userLabel="Connection">
<rect key="frame" x="1" y="53" width="805" height="50"/>
<rect key="frame" x="1" y="53" width="809" height="50"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jpF-QT-jfh">
Expand Down Expand Up @@ -126,7 +126,7 @@
<tableColumnResizingMask key="resizingMask" resizeWithTable="YES"/>
<prototypeCellViews>
<tableCellView identifier="ruleCell" id="5sm-If-Eqg" customClass="RuleRowCell">
<rect key="frame" x="809" y="1" width="204" height="54"/>
<rect key="frame" x="813" y="1" width="204" height="54"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<button verticalHuggingPriority="750" fixedFrame="YES" tag="110" translatesAutoresizingMaskIntoConstraints="NO" id="ZYK-WR-Jeh">
Expand Down Expand Up @@ -170,7 +170,7 @@
</outlineView>
</subviews>
</clipView>
<scroller key="horizontalScroller" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="djS-lX-Nkf">
<scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="djS-lX-Nkf">
<rect key="frame" x="1" y="512" width="1014" height="16"/>
<autoresizingMask key="autoresizingMask"/>
</scroller>
Expand All @@ -179,12 +179,12 @@
<autoresizingMask key="autoresizingMask"/>
</scroller>
<tableHeaderView key="headerView" wantsLayer="YES" id="0ZG-mg-rCP">
<rect key="frame" x="0.0" y="0.0" width="1015" height="25"/>
<rect key="frame" x="0.0" y="0.0" width="1019" height="25"/>
<autoresizingMask key="autoresizingMask"/>
</tableHeaderView>
</scrollView>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="eUD-fD-sWd">
<rect key="frame" x="894" y="10" width="78" height="20"/>
<rect key="frame" x="899" y="10" width="78" height="20"/>
<constraints>
<constraint firstAttribute="width" constant="74" id="Mxq-DQ-euD"/>
<constraint firstAttribute="height" constant="20" id="eie-Hn-5SE"/>
Expand All @@ -196,7 +196,7 @@
</textFieldCell>
</textField>
<customView translatesAutoresizingMaskIntoConstraints="NO" id="VUa-5Z-QAG" userLabel="Overlay" customClass="NSVisualEffectView">
<rect key="frame" x="258" y="187" width="500" height="200"/>
<rect key="frame" x="260" y="175" width="500" height="200"/>
<subviews>
<progressIndicator wantsLayer="YES" horizontalHuggingPriority="750" verticalHuggingPriority="750" fixedFrame="YES" maxValue="100" displayedWhenStopped="NO" bezeled="NO" indeterminate="YES" style="spinning" translatesAutoresizingMaskIntoConstraints="NO" id="XFi-AG-WZ4">
<rect key="frame" x="234" y="84" width="32" height="32"/>
Expand All @@ -218,7 +218,7 @@
</constraints>
</customView>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="QQG-tM-Qn1" userLabel="LuLu Button">
<rect key="frame" x="453" y="3" width="110" height="38"/>
<rect key="frame" x="455" y="3" width="110" height="38"/>
<constraints>
<constraint firstAttribute="height" constant="38" id="Xte-zr-TuP"/>
<constraint firstAttribute="width" constant="110" id="eFM-io-YLf"/>
Expand All @@ -232,7 +232,7 @@
</connections>
</button>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="XnJ-SV-lDg">
<rect key="frame" x="984" y="11" width="21" height="21"/>
<rect key="frame" x="989" y="11" width="21" height="21"/>
<constraints>
<constraint firstAttribute="height" constant="19" id="dB8-Rh-IY3"/>
<constraint firstAttribute="width" constant="21" id="xp2-P3-CWL"/>
Expand Down Expand Up @@ -349,7 +349,7 @@
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES" utility="YES"/>
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
<rect key="contentRect" x="272" y="172" width="276" height="378"/>
<rect key="screenRect" x="0.0" y="0.0" width="3440" height="1415"/>
<rect key="screenRect" x="0.0" y="0.0" width="1512" height="944"/>
<view key="contentView" id="cna-Y1-PEc">
<rect key="frame" x="0.0" y="0.0" width="276" height="378"/>
<autoresizingMask key="autoresizingMask"/>
Expand Down
2 changes: 1 addition & 1 deletion Uninstaller/Helper/HelperListener.m
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ -(BOOL)listener:(NSXPCListener *)listener shouldAcceptNewConnection:(NSXPCConnec
}

//step 2: validate
// check that client is signed with Objective-See's dev cert and it's the BB's installer
// check that client is signed with Objective-See's dev cert and it's the LuLu installer
if(0 != SecTaskValidateForRequirement(taskRef, (__bridge CFStringRef)(requirement)))
{
//err msg
Expand Down
16 changes: 8 additions & 8 deletions Uninstaller/Uninstaller.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -349,13 +349,13 @@
CLANG_ENABLE_OBJC_ARC = YES;
CODE_SIGN_IDENTITY = "Developer ID Application";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 2.4.3;
CURRENT_PROJECT_VERSION = 2.5.0;
DEVELOPMENT_TEAM = VBG97UB4TA;
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.4.3;
MARKETING_VERSION = 2.5.0;
OTHER_CODE_SIGN_FLAGS = "-o hard,kill,library";
OTHER_LDFLAGS = (
"-sectcreate",
Expand Down Expand Up @@ -384,13 +384,13 @@
CLANG_ENABLE_OBJC_ARC = YES;
CODE_SIGN_IDENTITY = "Developer ID Application";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 2.4.3;
CURRENT_PROJECT_VERSION = 2.5.0;
DEVELOPMENT_TEAM = VBG97UB4TA;
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.4.3;
MARKETING_VERSION = 2.5.0;
OTHER_CODE_SIGN_FLAGS = "-o hard,kill,library";
OTHER_LDFLAGS = (
"-sectcreate",
Expand Down Expand Up @@ -422,15 +422,15 @@
CODE_SIGN_IDENTITY = "Developer ID Application";
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 2.4.3;
CURRENT_PROJECT_VERSION = 2.5.0;
DEVELOPMENT_TEAM = VBG97UB4TA;
ENABLE_HARDENED_RUNTIME = YES;
FRAMEWORK_SEARCH_PATHS = "";
GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = NO;
INFOPLIST_FILE = Uninstaller/Info.plist;
LIBRARY_SEARCH_PATHS = "";
MACOSX_DEPLOYMENT_TARGET = 10.15;
MARKETING_VERSION = 2.4.3;
MARKETING_VERSION = 2.5.0;
OTHER_CODE_SIGN_FLAGS = "-o hard,kill,library";
PRODUCT_BUNDLE_IDENTIFIER = "com.objective-see.lulu.config";
PRODUCT_NAME = "LuLu Uninstaller";
Expand All @@ -451,15 +451,15 @@
CODE_SIGN_IDENTITY = "Developer ID Application";
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 2.4.3;
CURRENT_PROJECT_VERSION = 2.5.0;
DEVELOPMENT_TEAM = VBG97UB4TA;
ENABLE_HARDENED_RUNTIME = YES;
FRAMEWORK_SEARCH_PATHS = "";
GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = NO;
INFOPLIST_FILE = Uninstaller/Info.plist;
LIBRARY_SEARCH_PATHS = "";
MACOSX_DEPLOYMENT_TARGET = 10.15;
MARKETING_VERSION = 2.4.3;
MARKETING_VERSION = 2.5.0;
OTHER_CODE_SIGN_FLAGS = "-o hard,kill,library";
PRODUCT_BUNDLE_IDENTIFIER = "com.objective-see.lulu.config";
PRODUCT_NAME = "LuLu Uninstaller";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,67 +1,68 @@
{
"images" : [
{
"size" : "16x16",
"idiom" : "mac",
"filename" : "icon_16x16.png",
"scale" : "1x"
"idiom" : "mac",
"scale" : "1x",
"size" : "16x16"
},
{
"size" : "16x16",
"idiom" : "mac",
"filename" : "[email protected]",
"scale" : "2x"
"idiom" : "mac",
"scale" : "2x",
"size" : "16x16"
},
{
"size" : "32x32",
"idiom" : "mac",
"filename" : "icon_32x32.png",
"scale" : "1x"
"idiom" : "mac",
"scale" : "1x",
"size" : "32x32"
},
{
"size" : "32x32",
"idiom" : "mac",
"filename" : "[email protected]",
"scale" : "2x"
"idiom" : "mac",
"scale" : "2x",
"size" : "32x32"
},
{
"size" : "128x128",
"idiom" : "mac",
"filename" : "icon_128x128.png",
"scale" : "1x"
"idiom" : "mac",
"scale" : "1x",
"size" : "128x128"
},
{
"size" : "128x128",
"idiom" : "mac",
"filename" : "[email protected]",
"scale" : "2x"
"idiom" : "mac",
"scale" : "2x",
"size" : "128x128"
},
{
"size" : "256x256",
"idiom" : "mac",
"filename" : "icon_256x256.png",
"scale" : "1x"
"idiom" : "mac",
"scale" : "1x",
"size" : "256x256"
},
{
"size" : "256x256",
"idiom" : "mac",
"filename" : "[email protected]",
"scale" : "2x"
"idiom" : "mac",
"scale" : "2x",
"size" : "256x256"
},
{
"size" : "512x512",
"idiom" : "mac",
"filename" : "icon_512x512.png",
"scale" : "1x"
"idiom" : "mac",
"scale" : "1x",
"size" : "512x512"
},
{
"filename" : "[email protected]",
"idiom" : "mac",
"size" : "512x512",
"scale" : "2x"
"scale" : "2x",
"size" : "512x512"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
"author" : "xcode",
"version" : 1
}
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 50478cd

Please sign in to comment.