From 1bd654621c1649c309216e8641f2bd6a301fa15f Mon Sep 17 00:00:00 2001 From: Maarten Billemont Date: Tue, 21 Apr 2020 13:26:12 -0400 Subject: [PATCH] Fix persistence of sendInfoDecided. Don't log it as an event, event logging is probably disabled at this point anyway. --- platform-darwin/External/Pearl | 2 +- platform-darwin/Source/MPConfig.h | 4 ++-- platform-darwin/Source/MPConfig.m | 2 +- platform-darwin/Source/Mac/MPSitesWindowController.m | 6 +----- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/platform-darwin/External/Pearl b/platform-darwin/External/Pearl index d4de9198..72de3d1b 160000 --- a/platform-darwin/External/Pearl +++ b/platform-darwin/External/Pearl @@ -1 +1 @@ -Subproject commit d4de9198ec8d5ded44d443093d0b56737f3581b3 +Subproject commit 72de3d1b49b4a9c9cd86f865f7a1c3da18fbc582 diff --git a/platform-darwin/Source/MPConfig.h b/platform-darwin/Source/MPConfig.h index 487383e2..636f2e51 100644 --- a/platform-darwin/Source/MPConfig.h +++ b/platform-darwin/Source/MPConfig.h @@ -23,11 +23,11 @@ @property(nonatomic, retain) NSNumber *sendInfo; @property(nonatomic, retain) NSNumber *sendInfoDecided; @property(nonatomic, retain) NSNumber *notificationsDecided; + @property(nonatomic, retain) NSNumber *rememberLogin; @property(nonatomic, retain) NSNumber *hidePasswords; +@property(nonatomic, strong) NSNumber *siteAttacker; @property(nonatomic, retain) NSNumber *checkInconsistency; -@property(nonatomic, strong) NSNumber *siteAttacker; - @end diff --git a/platform-darwin/Source/MPConfig.m b/platform-darwin/Source/MPConfig.m index b15e68a9..1a0fe98a 100644 --- a/platform-darwin/Source/MPConfig.m +++ b/platform-darwin/Source/MPConfig.m @@ -21,7 +21,7 @@ @implementation MPConfig -@dynamic sendInfo, rememberLogin, checkInconsistency, hidePasswords, siteAttacker; +@dynamic sendInfo, sendInfoDecided, notificationsDecided, rememberLogin, hidePasswords, siteAttacker, checkInconsistency; - (id)init { diff --git a/platform-darwin/Source/Mac/MPSitesWindowController.m b/platform-darwin/Source/Mac/MPSitesWindowController.m index 0f6eeb5d..ee6b51a1 100644 --- a/platform-darwin/Source/Mac/MPSitesWindowController.m +++ b/platform-darwin/Source/Mac/MPSitesWindowController.m @@ -61,11 +61,7 @@ [alert addButtonWithTitle:@"Thanks!"]; [alert addButtonWithTitle:@"Disable"]; [alert beginSheetModalForWindow:self.window completionHandler:^(NSModalResponse returnCode) { - BOOL sendInfo = returnCode != NSAlertSecondButtonReturn; - [[Countly sharedInstance] recordEvent:@"sendInfoDecided" segmentation:@{ - @"sendInfo": [@(sendInfo) description], - }]; - [MPMacConfig get].sendInfo = @(sendInfo); + [MPMacConfig get].sendInfo = @(returnCode != NSAlertSecondButtonReturn); [MPMacConfig get].sendInfoDecided = @(YES); }]; }