Consent tweaks.

Don't conditional Countly events on sendInfo, it already turns Countly
on/off.

Keep Sentry enabled for longer while turning on/off for sendInfo to
cache more errors.

Use sendInfoDecided event only for initial sendInfo prompt, can use
Countly's censent tools to view overall opt-in/opt-outs.

platform-darwin/Source/MPAppDelegate_InApp.m

@@ -197,7 +197,6 @@ PearlAssociatedObjectProperty( NSMutableArray*, ProductObservers, productObserve
                                                           forKey:transaction.payment.productIdentifier];
                 [queue finishTransaction:transaction];
 
-                if ([[MPConfig get].sendInfo boolValue]) {
                 SKProduct *product = self.products[transaction.payment.productIdentifier];
                 [attributes addEntriesFromDictionary:@{
                         @"id": product.productIdentifier,
@@ -208,7 +207,6 @@ PearlAssociatedObjectProperty( NSMutableArray*, ProductObservers, productObserve
                         @"quantity": @(transaction.payment.quantity).description,
                 }];
                 [Countly.sharedInstance recordEvent:@"purchase" segmentation:attributes];
-                }
                 break;
             }
             case SKPaymentTransactionStateRestored: {
@@ -224,7 +222,6 @@ PearlAssociatedObjectProperty( NSMutableArray*, ProductObservers, productObserve
                 MPError( transaction.error, @"Transaction failed: %@.", transaction.payment.productIdentifier );
                 [queue finishTransaction:transaction];
 
-                if ([[MPConfig get].sendInfo boolValue]) {
                 SKProduct *product = self.products[transaction.payment.productIdentifier];
                 [Countly.sharedInstance recordEvent:@"purchase" segmentation:@{
                         @"id": product.productIdentifier,
@@ -235,7 +232,6 @@ PearlAssociatedObjectProperty( NSMutableArray*, ProductObservers, productObserve
                         @"quantity": @(transaction.payment.quantity).description,
                         @"reason"  : [transaction.error localizedFailureReason]?: [transaction.error localizedDescription],
                 }];
-                }
                 break;
         }
     }

platform-darwin/Source/MPAppDelegate_Key.m

@@ -173,13 +173,11 @@
         else
             dbg( @"Automatic login failed for user: %@", user.userID );
 
-        if ([[MPConfig get].sendInfo boolValue]) {
         [Countly.sharedInstance recordEvent:@"login" segmentation:@{
                 @"method"   : password? @"Password": @"Automatic",
                 @"state"  : @"failed",
                 @"algorithm": @(user.algorithm.version).description,
         }];
-        }
 
         return NO;
     }
@@ -203,7 +201,6 @@
     }
 
     @try {
-        if ([[MPConfig get].sendInfo boolValue]) {
         [Countly.sharedInstance userLoggedIn:user.userID];
 
         [Countly.sharedInstance recordEvent:@"login" segmentation:@{
@@ -212,7 +209,6 @@
                 @"algorithm": @(user.algorithm.version).description,
         }];
     }
-    }
     @catch (id exception) {
         err( @"While setting username: %@", exception );
     }

platform-darwin/Source/MPAppDelegate_Shared.m

@@ -119,7 +119,6 @@ static MPAppDelegate_Shared *instance;
     if (self.key)
         self.key = nil;
 
-    if ([[MPConfig get].sendInfo boolValue])
     [Countly.sharedInstance userLoggedOut];
 
     self.activeUserOID = activeUserOID;

platform-darwin/Source/Mac/MPMacAppDelegate.m

@@ -408,14 +408,8 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven
 
 - (IBAction)togglePreference:(id)sender {
 
-    if (sender == self.diagnosticsItem) {
+    if (sender == self.diagnosticsItem)
-        BOOL sendInfo = self.diagnosticsItem.state != NSOnState;
+        [MPMacConfig get].sendInfo = @(self.diagnosticsItem.state != NSOnState);
-        [[Countly sharedInstance] recordEvent:@"sendInfoDecided" segmentation:@{
-                @"from": @"preferences",
-                @"sendInfo": [@(sendInfo) description],
-            }];
-        [MPMacConfig get].sendInfo = @(sendInfo);
-    }
     if (sender == self.hidePasswordsItem)
         [MPMacConfig get].hidePasswords = @(self.hidePasswordsItem.state != NSOnState);
     if (sender == self.rememberPasswordItem)
@@ -778,7 +772,6 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven
             CLYConsentSessions, CLYConsentEvents, CLYConsentUserDetails, CLYConsentCrashReporting, CLYConsentViewTracking, CLYConsentStarRating
     ];
     if ([[MPMacConfig get].sendInfo boolValue]) {
-        [Countly.sharedInstance giveConsentForFeatures:countlyFeatures];
         if ([PearlLogger get].printLevel > PearlLogLevelInfo)
             [PearlLogger get].printLevel = PearlLogLevelInfo;
 
@@ -796,10 +789,12 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven
             [scope setExtraValue:@([PearlDeviceUtils isAppEncrypted]) forKey:@"encrypted"];
             [scope setExtraValue:[PearlDeviceUtils platform] forKey:@"platform"];
         }];
+
+        [Countly.sharedInstance giveConsentForFeatures:countlyFeatures];
     }
     else {
-        [SentrySDK.currentHub getClient].options.enabled = @NO;
         [Countly.sharedInstance cancelConsentForFeatures:countlyFeatures];
+        [SentrySDK.currentHub getClient].options.enabled = @NO;
     }
 }
 

platform-darwin/Source/Mac/MPSitesWindowController.m

@@ -63,7 +63,6 @@
                     [alert beginSheetModalForWindow:self.window completionHandler:^(NSModalResponse returnCode) {
                         BOOL sendInfo = returnCode != NSAlertSecondButtonReturn;
                         [[Countly sharedInstance] recordEvent:@"sendInfoDecided" segmentation:@{
-                                @"from": @"initial",
                                 @"sendInfo": [@(sendInfo) description],
                         }];
                         [MPMacConfig get].sendInfo = @(sendInfo);

platform-darwin/Source/iOS/MPUsersViewController.m

@@ -231,13 +231,11 @@ typedef NS_ENUM( NSUInteger, MPActiveUserState ) {
                         user.avatar = newUserAvatar;
                         user.name = newUserName;
 
-                        if ([[MPConfig get].sendInfo boolValue]) {
                         [Countly.sharedInstance recordEvent:@"new-user" segmentation:@{
                                 @"algorithm": @(user.algorithm.version).description,
                                 @"avatar"   : @(user.avatar).description,
                         }];
                     }
-                    }
 
                     BOOL signedIn = [[MPiOSAppDelegate get] signInAsUser:user saveInContext:context
                                                      usingMasterPassword:masterPassword];

platform-darwin/Source/iOS/MPiOSAppDelegate.m

@@ -646,7 +646,6 @@
             CLYConsentSessions, CLYConsentEvents, CLYConsentUserDetails, CLYConsentCrashReporting, CLYConsentViewTracking, CLYConsentStarRating
     ];
     if ([[MPConfig get].sendInfo boolValue]) {
-        [Countly.sharedInstance giveConsentForFeatures:countlyFeatures];
         if ([PearlLogger get].printLevel > PearlLogLevelInfo)
             [PearlLogger get].printLevel = PearlLogLevelInfo;
 
@@ -670,11 +669,13 @@
 #else
             [scope setExtraValue:@(NO) forKey:@"reviewedVersion"];
 #endif
+
+            [Countly.sharedInstance giveConsentForFeatures:countlyFeatures];
         }];
     }
     else {
-        [SentrySDK.currentHub getClient].options.enabled = @NO;
         [Countly.sharedInstance cancelConsentForFeatures:countlyFeatures];
+        [SentrySDK.currentHub getClient].options.enabled = @NO;
     }
 }