Skip to content
This repository was archived by the owner on Nov 20, 2024. It is now read-only.

Commit

Permalink
Fixed a preferences key typo, and updated signatures
Browse files Browse the repository at this point in the history
  • Loading branch information
Tyler Morgan committed Oct 5, 2020
1 parent da91de8 commit a6b0c65
Show file tree
Hide file tree
Showing 39 changed files with 145 additions and 76 deletions.
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
# 1.1

- Fixed typo in preferences key `supress` to `suppress`
- Offically have an Apple Signed release (Yes I ended up buying a developer license finally)
- Officially notarized release.
- New Icon
- Icon was switched to prevent confusion between the native macOS Filevault app and this app.


# 0.1 Beta Release

- Reissue recovery key automatically using admin provided credentials.
Expand Down
12 changes: 7 additions & 5 deletions Filevault Reissue/Filevault Reissue.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 1130;
LastUpgradeCheck = 1130;
LastUpgradeCheck = 1160;
ORGANIZATIONNAME = "Tyler Morgan";
TargetAttributes = {
816AF0062408624900A4C85E = {
Expand Down Expand Up @@ -326,9 +326,10 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = "Filevault Reissue/Filevault_Reissue.entitlements";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 204;
CURRENT_PROJECT_VERSION = 3;
DEVELOPMENT_TEAM = 55JHL22EU7;
ENABLE_HARDENED_RUNTIME = YES;
INFOPLIST_FILE = "Filevault Reissue/Info.plist";
Expand All @@ -337,7 +338,7 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.13;
MARKETING_VERSION = 0.1;
MARKETING_VERSION = 1.1;
PRODUCT_BUNDLE_IDENTIFIER = "com.github.cybertunnel.Filevault-Reissue";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
Expand All @@ -349,9 +350,10 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = "Filevault Reissue/Filevault_Reissue.entitlements";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 204;
CURRENT_PROJECT_VERSION = 3;
DEVELOPMENT_TEAM = 55JHL22EU7;
ENABLE_HARDENED_RUNTIME = YES;
INFOPLIST_FILE = "Filevault Reissue/Info.plist";
Expand All @@ -360,7 +362,7 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.13;
MARKETING_VERSION = 0.1;
MARKETING_VERSION = 1.1;
PRODUCT_BUNDLE_IDENTIFIER = "com.github.cybertunnel.Filevault-Reissue";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1130"
LastUpgradeVersion = "1160"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ class ViewController: NSViewController {
// Successful, shows user the new recovery key

DispatchQueue.main.async {
if !Preferences.sharedInstance.supressRecoveryKey {
if !Preferences.sharedInstance.suppressRecoveryKey {
Log.write("Successfully reissued recovery key using provided credentials, providing the user with the new recovery key.", level: .info, category: .view)
let alert = NSAlert()
alert.alertStyle = .informational
Expand Down
4 changes: 2 additions & 2 deletions Filevault Reissue/Filevault Reissue/Models/Preferences.swift
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ class Preferences {
}
}

internal var supressRecoveryKey: Bool {
internal var suppressRecoveryKey: Bool {
get {
return self.userDefaults.bool(forKey: "supressRecoveryKey")
return self.userDefaults.bool(forKey: "suppressRecoveryKey")
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,62 +1,60 @@
{
"images" : [
{
"size" : "16x16",
"idiom" : "mac",
"filename" : "SmallFileVaultIcon.png",
"scale" : "1x"
"scale" : "1x",
"size" : "16x16"
},
{
"idiom" : "mac",
"size" : "16x16",
"scale" : "2x"
"scale" : "2x",
"size" : "16x16"
},
{
"size" : "32x32",
"filename" : "icons8-safe-32.png",
"idiom" : "mac",
"filename" : "SmallFileVaultIcon-1.png",
"scale" : "1x"
"scale" : "1x",
"size" : "32x32"
},
{
"filename" : "icons8-safe-64.png",
"idiom" : "mac",
"size" : "32x32",
"scale" : "2x"
"scale" : "2x",
"size" : "32x32"
},
{
"size" : "128x128",
"idiom" : "mac",
"filename" : "SmallFileVaultIcon-2.png",
"scale" : "1x"
"scale" : "1x",
"size" : "128x128"
},
{
"idiom" : "mac",
"size" : "128x128",
"scale" : "2x"
"scale" : "2x",
"size" : "128x128"
},
{
"size" : "256x256",
"idiom" : "mac",
"filename" : "SmallFileVaultIcon-3.png",
"scale" : "1x"
"scale" : "1x",
"size" : "256x256"
},
{
"idiom" : "mac",
"size" : "256x256",
"scale" : "2x"
"scale" : "2x",
"size" : "256x256"
},
{
"idiom" : "mac",
"size" : "512x512",
"scale" : "1x"
"scale" : "1x",
"size" : "512x512"
},
{
"idiom" : "mac",
"size" : "512x512",
"scale" : "2x"
"scale" : "2x",
"size" : "512x512"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
"author" : "xcode",
"version" : 1
}
}
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
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.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@
<plist version="1.0">
<dict>
<key>BuildMachineOSBuild</key>
<string>19E234g</string>
<string>19G2021</string>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
<string>Filevault Reissue</string>
<key>CFBundleIconName</key>
<string>AppIcon</string>
<key>CFBundleIdentifier</key>
<string>com.github.cybertunnel.Filevault-Reissue</string>
<key>CFBundleInfoDictionaryVersion</key>
Expand All @@ -17,27 +19,29 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.1</string>
<string>1.1</string>
<key>CFBundleSupportedPlatforms</key>
<array>
<string>MacOSX</string>
</array>
<key>CFBundleVersion</key>
<string>204</string>
<string>3</string>
<key>DTCompiler</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>DTPlatformBuild</key>
<string>11C504</string>
<string>12A7300</string>
<key>DTPlatformName</key>
<string>macosx</string>
<key>DTPlatformVersion</key>
<string>GM</string>
<string>10.15.6</string>
<key>DTSDKBuild</key>
<string>19B90</string>
<string>19G68</string>
<key>DTSDKName</key>
<string>macosx10.15</string>
<key>DTXcode</key>
<string>1130</string>
<string>1201</string>
<key>DTXcodeBuild</key>
<string>11C504</string>
<string>12A7300</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.utilities</string>
<key>LSMinimumSystemVersion</key>
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading

0 comments on commit a6b0c65

Please sign in to comment.