Don't crash if decrypt fails.

Ignore backup files.
Automatic configuration cleanup.
2020-04-09 21:46:09 -04:00 · 2020-04-09 21:33:05 -04:00 · 2020-04-09 21:04:35 -04:00 · 2020-04-09 21:03:59 -04:00 · 2020-04-09 21:03:11 -04:00
6 changed files with 12 additions and 11 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 # OS-Specific junk.
 .DS_Store
 Thumbs.db
+*~

 # IntelliJ
 .idea
--- a/platform-darwin/External/Pearl
+++ b/platform-darwin/External/Pearl
--- a/platform-darwin/MasterPassword-macOS.xcodeproj/project.pbxproj
+++ b/platform-darwin/MasterPassword-macOS.xcodeproj/project.pbxproj
@@ -3370,8 +3370,6 @@
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CODE_SIGN_ENTITLEMENTS = Source/Mac/MasterPassword.entitlements;
-				CODE_SIGN_IDENTITY = "Mac Developer";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development";
 				COMBINE_HIDPI_IMAGES = YES;
 				ENABLE_HARDENED_RUNTIME = YES;
 				GCC_PREFIX_HEADER = "Source/MasterPassword-Prefix.pch";
@@ -3410,8 +3408,6 @@
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CODE_SIGN_ENTITLEMENTS = Source/Mac/MasterPassword.entitlements;
-				CODE_SIGN_IDENTITY = "Mac Developer";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development";
 				COMBINE_HIDPI_IMAGES = YES;
 				ENABLE_HARDENED_RUNTIME = YES;
 				GCC_PREFIX_HEADER = "Source/MasterPassword-Prefix.pch";
--- a/platform-darwin/Source/Mac/MPMacAppDelegate.m
+++ b/platform-darwin/Source/Mac/MPMacAppDelegate.m
@@ -70,7 +70,7 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven
    @try {
        // Sentry
        [SentrySDK initWithOptions:@{
-                @"dsn"        : decrypt( sentryDSN ),
+                @"dsn"        : NilToNSNull( decrypt( sentryDSN ) ),
 #ifdef DEBUG
                @"debug"      : @(YES),
                @"environment": @"Development",
@@ -728,8 +728,10 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven

    // Send info
    if ([[MPConfig get].sendInfo boolValue]) {
-        [Countly.sharedInstance giveConsentForAllFeatures];
-        [Countly.sharedInstance askForNotificationPermission];
+        PearlMainQueue( ^{
+            [Countly.sharedInstance giveConsentForAllFeatures];
+            [Countly.sharedInstance askForNotificationPermission];
+        });

        if ([PearlLogger get].printLevel > PearlLogLevelInfo)
            [PearlLogger get].printLevel = PearlLogLevelInfo;
@@ -755,7 +757,9 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven
    }
    else {
        [SentrySDK.currentHub getClient].options.enabled = @NO;
-        [Countly.sharedInstance cancelConsentForAllFeatures];
+        PearlMainQueue( ^{
+            [Countly.sharedInstance cancelConsentForAllFeatures];
+        });
    }
 }

--- a/platform-darwin/Source/Mac/MPSitesWindowController.m
+++ b/platform-darwin/Source/Mac/MPSitesWindowController.m
@@ -609,7 +609,7 @@
 - (void)updateSelection {
    self.showVersionContainer = self.alternatePressed || self.selectedSite.outdated;
    [self.sitePasswordTipField setAttributedStringValue:
-            straf( @"Your %@ for %@:", self.shiftPressed? @"login": @"password", self.selectedSite.displayedName )];
+            straf( @"Your %@ for %@:", self.shiftPressed? @"login": @"password", self.selectedSite.displayedName, nil )];
 }

 - (void)createNewSite:(NSString *)siteName {
--- a/platform-darwin/Source/iOS/MPiOSAppDelegate.m
+++ b/platform-darwin/Source/iOS/MPiOSAppDelegate.m
@@ -45,7 +45,7 @@
    @try {
        // Sentry
        [SentrySDK initWithOptions:@{
-                @"dsn"        : decrypt( sentryDSN ),
+                @"dsn"        : NilToNSNull( decrypt( sentryDSN ) ),
 #ifdef DEBUG
                @"debug"      : @(YES),
                @"environment": @"Development",
Author	SHA1	Message	Date
Maarten Billemont	8eeba2e005	Don't crash if decrypt fails.	2020-04-09 21:46:09 -04:00
Maarten Billemont	fd6cbaa9a5	Ignore backup files.	2020-04-09 21:33:05 -04:00
Maarten Billemont	1651e9ad4a	Automatic configuration cleanup.	2020-04-09 21:04:35 -04:00
Maarten Billemont	02c1e2af46	straf relies on a nil terminator.	2020-04-09 21:03:59 -04:00
Maarten Billemont	b275286b2d	Consent and notification permissions on the main thread.	2020-04-09 21:03:11 -04:00