From 6f3da5ccf0c4bc7bfdce1f1929390ed92edfcbcc Mon Sep 17 00:00:00 2001 From: Maarten Billemont Date: Sat, 16 May 2020 22:34:49 -0400 Subject: [PATCH] Harmonize consent features. --- platform-darwin/Source/Mac/MPMacAppDelegate.m | 8 ++------ .../Source/Mac/MPSitesWindowController.m | 11 ++++------ platform-darwin/Source/iOS/MPiOSAppDelegate.m | 20 +++++++------------ 3 files changed, 13 insertions(+), 26 deletions(-) diff --git a/platform-darwin/Source/Mac/MPMacAppDelegate.m b/platform-darwin/Source/Mac/MPMacAppDelegate.m index eeb585da..1041210c 100644 --- a/platform-darwin/Source/Mac/MPMacAppDelegate.m +++ b/platform-darwin/Source/Mac/MPMacAppDelegate.m @@ -763,13 +763,9 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven // Send info NSArray *countlyFeatures = @[ - CLYConsentEvents, CLYConsentUserDetails, CLYConsentCrashReporting, CLYConsentViewTracking, CLYConsentStarRating + CLYConsentSessions, CLYConsentEvents, CLYConsentUserDetails, CLYConsentCrashReporting, CLYConsentViewTracking, CLYConsentStarRating ]; - if ([[MPConfig get].sendInfo boolValue] || ![[MPConfig get].sendInfoDecided boolValue]) - [Countly.sharedInstance giveConsentForFeature:CLYConsentSessions]; - else - [Countly.sharedInstance cancelConsentForFeature:CLYConsentSessions]; - if ([[MPMacConfig get].sendInfo boolValue]) { + if ([[MPMacConfig get].sendInfo boolValue] || ![[MPMacConfig get].sendInfoDecided boolValue]) { if ([PearlLogger get].printLevel > PearlLogLevelInfo) [PearlLogger get].printLevel = PearlLogLevelInfo; diff --git a/platform-darwin/Source/Mac/MPSitesWindowController.m b/platform-darwin/Source/Mac/MPSitesWindowController.m index b15d1466..f7a1a347 100644 --- a/platform-darwin/Source/Mac/MPSitesWindowController.m +++ b/platform-darwin/Source/Mac/MPSitesWindowController.m @@ -53,13 +53,10 @@ if (![[MPMacConfig get].sendInfoDecided boolValue]) { NSAlert *alert = [NSAlert new]; - alert.messageText = @"Welcome to Master Password!"; - alert.informativeText = @"We want you to have a top-notch experience.\n" - @"Using diagnostics, we ensure the application keeps working as designed for you.\n" - @"\n" - @"We look out for application bugs, runtime issues, sudden crashes & usage counters.\n" - @"Needless to say, diagnostics are always scrubbed and personal details will never leave your device."; - [alert addButtonWithTitle:@"Thanks!"]; + alert.messageText = @"Diagnostics"; + alert.informativeText = @"We look for bugs, sudden crashes, runtime issues & statistics.\n\n" + @"Diagnostics are scrubbed and personal details will never leave your device."; + [alert addButtonWithTitle:@"Engage"]; [alert addButtonWithTitle:@"Disable"]; [alert beginSheetModalForWindow:self.window completionHandler:^(NSModalResponse returnCode) { [MPMacConfig get].sendInfo = @(returnCode != NSAlertSecondButtonReturn); diff --git a/platform-darwin/Source/iOS/MPiOSAppDelegate.m b/platform-darwin/Source/iOS/MPiOSAppDelegate.m index 0d94a92a..e58dba36 100644 --- a/platform-darwin/Source/iOS/MPiOSAppDelegate.m +++ b/platform-darwin/Source/iOS/MPiOSAppDelegate.m @@ -190,8 +190,8 @@ [migrateVC loadProductWithParameters:@{ SKStoreProductParameterCampaignToken : @"app-masterpassword.ios", /* Campaign: From MasterPassword iOS */ SKStoreProductParameterProviderToken : @153897, /* Provider: Maarten Billemont */ - SKStoreProductParameterITunesItemIdentifier: @510296984, /* Application: MasterPassword iOS */ - //SKStoreProductParameterITunesItemIdentifier: @1500430196, /* Application: Volto iOS */ +// SKStoreProductParameterITunesItemIdentifier: @510296984, /* Application: MasterPassword iOS */ + SKStoreProductParameterITunesItemIdentifier: @1500430196, /* Application: Volto iOS */ } completionBlock:^(BOOL result, NSError *error) { if (error) err( @"Failed loading Volto product information: %@", error ); @@ -205,7 +205,6 @@ }]; PearlMainQueueOperation( ^{ - [self.navigationController performSegueWithIdentifier:@"web" sender:[NSURL URLWithString:@"masterpassword://foo?bar=quux"]]; if ([[MPiOSConfig get].showSetup boolValue]) [self.navigationController performSegueWithIdentifier:@"setup" sender:self]; @@ -841,20 +840,16 @@ // Send info NSArray *countlyFeatures = @[ - CLYConsentEvents, CLYConsentUserDetails, CLYConsentCrashReporting, CLYConsentViewTracking, CLYConsentStarRating + CLYConsentSessions, CLYConsentEvents, CLYConsentUserDetails, CLYConsentCrashReporting, CLYConsentViewTracking, CLYConsentStarRating ]; - if ([[MPConfig get].sendInfo boolValue] || ![[MPConfig get].sendInfoDecided boolValue]) - [Countly.sharedInstance giveConsentForFeature:CLYConsentSessions]; - else - [Countly.sharedInstance cancelConsentForFeature:CLYConsentSessions]; - if ([[MPConfig get].sendInfo boolValue]) { + if ([[MPiOSConfig get].sendInfo boolValue] || ![[MPiOSConfig get].sendInfoDecided boolValue]) { if ([PearlLogger get].printLevel > PearlLogLevelInfo) [PearlLogger get].printLevel = PearlLogLevelInfo; [SentrySDK.currentHub getClient].options.enabled = @YES; [SentrySDK configureScope:^(SentryScope *scope) { - [scope setExtraValue:[MPConfig get].rememberLogin forKey:@"rememberLogin"]; - [scope setExtraValue:[MPConfig get].sendInfo forKey:@"sendInfo"]; + [scope setExtraValue:[MPiOSConfig get].rememberLogin forKey:@"rememberLogin"]; + [scope setExtraValue:[MPiOSConfig get].sendInfo forKey:@"sendInfo"]; [scope setExtraValue:[MPiOSConfig get].helpHidden forKey:@"helpHidden"]; [scope setExtraValue:[MPiOSConfig get].showSetup forKey:@"showQuickStart"]; [scope setExtraValue:[PearlConfig get].firstRun forKey:@"firstRun"]; @@ -871,9 +866,8 @@ #else [scope setExtraValue:@(NO) forKey:@"reviewedVersion"]; #endif - - [Countly.sharedInstance giveConsentForFeatures:countlyFeatures]; }]; + [Countly.sharedInstance giveConsentForFeatures:countlyFeatures]; } else { [Countly.sharedInstance cancelConsentForFeatures:countlyFeatures];