Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Attempt to fix crashes and race conditions in User Properties manager #552

Merged
merged 2 commits into from
Oct 17, 2024
Merged

Attempt to fix crashes and race conditions in User Properties manager #552

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
234b847
Attempt to fix crashes and race conditions in User Properties manager
SpertsyanKM Oct 17, 2024
f0c0825
Private members access fixes
SpertsyanKM Oct 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 41 additions & 27 deletions Sources/Qonversion/Qonversion/Main/QNUserPropertiesManager/QNUserPropertiesManager.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ @interface QNUserPropertiesManager()

@property (nonatomic) QNInMemoryStorage *inMemoryStorage;

@property (nonatomic, strong) NSMutableArray<QONUserPropertiesEmptyCompletionHandler> *completionBlocks;
@property (atomic, strong) NSMutableArray<QONUserPropertiesEmptyCompletionHandler> *completionBlocks;

@property (nonatomic, assign, readwrite) BOOL sendingScheduled;
@property (nonatomic, assign, readwrite) BOOL updatingCurrently;
@property (atomic, assign, readwrite) BOOL sendingScheduled;
@property (atomic, assign, readwrite) BOOL updatingCurrently;
@property (nonatomic, assign, readwrite) NSUInteger retryDelay;
@property (nonatomic, assign, readwrite) NSUInteger retriesCounter;

Expand Down Expand Up @@ -94,25 +94,31 @@ - (void)forceSendProperties:(QONUserPropertiesEmptyCompletionHandler)completion
return;
}

[self.completionBlocks addObject:completion];
@synchronized (self) {
[self.completionBlocks addObject:completion];
}

[self sendProperties:YES];
}

- (void)sendPropertiesWithDelay:(NSUInteger)delay {
if (!_sendingScheduled) {
_sendingScheduled = YES;
__block __weak QNUserPropertiesManager *weakSelf = self;
[_backgroundQueue addOperationWithBlock:^{
dispatch_async(dispatch_get_main_queue(), ^{
[weakSelf performSelector:@selector(sendPropertiesInBackground) withObject:nil afterDelay:delay];
});
}];
@synchronized (self) {
if (!self.sendingScheduled) {
self.sendingScheduled = YES;
__block __weak QNUserPropertiesManager *weakSelf = self;
[self.backgroundQueue addOperationWithBlock:^{
dispatch_async(dispatch_get_main_queue(), ^{
[weakSelf performSelector:@selector(sendPropertiesInBackground) withObject:nil afterDelay:delay];
});
}];
}
}
}

- (void)sendPropertiesInBackground {
_sendingScheduled = NO;
@synchronized (self) {
self.sendingScheduled = NO;
}
[self sendProperties];
}

Expand All @@ -121,44 +127,52 @@ - (void)sendProperties {
}

- (void)sendProperties:(BOOL)force {
if ([QNUtils isEmptyString:_apiClient.apiKey]) {
if ([QNUtils isEmptyString:self.apiClient.apiKey]) {
QONVERSION_ERROR(@"ERROR: apiKey cannot be nil or empty, set apiKey with launchWithKey:");
return;
}

@synchronized (self) {
if (_updatingCurrently && !force) {
if (self.updatingCurrently && !force) {
return;
}
_updatingCurrently = YES;
self.updatingCurrently = YES;
}

[self runOnBackgroundQueue:^{
NSDictionary *properties = [self->_inMemoryStorage.storageDictionary copy];
NSDictionary *properties = [self.inMemoryStorage.storageDictionary copy];

if (!properties || ![properties respondsToSelector:@selector(valueForKey:)]) {
self->_updatingCurrently = NO;
@synchronized (self) {
self.updatingCurrently = NO;
}
return;
}

if (properties.count == 0) {
self->_updatingCurrently = NO;
@synchronized (self) {
self.updatingCurrently = NO;
}
return;
}

self.inMemoryStorage.storageDictionary = @{};
__block __weak QNUserPropertiesManager *weakSelf = self;
[self.apiClient sendProperties:properties
completion:^(NSDictionary * _Nullable dict, NSError * _Nullable error) {
weakSelf.updatingCurrently = NO;

NSArray *completions = [weakSelf.completionBlocks copy];
NSArray *completions = @[];
@synchronized (self) {
weakSelf.updatingCurrently = NO;

completions = [weakSelf.completionBlocks copy];
[weakSelf.completionBlocks removeAllObjects];
}

for (QONUserPropertiesEmptyCompletionHandler storedCompletion in completions) {
storedCompletion();
}

[weakSelf.completionBlocks removeAllObjects];

if (error) {
// copy of an existing array to prevent erasing properties set while the current request is in progress
NSMutableDictionary *allProperties = [self.inMemoryStorage.storageDictionary mutableCopy];
Expand Down Expand Up @@ -210,7 +224,7 @@ - (BOOL)runOnBackgroundQueue:(void (^)(void))block {
block();
return NO;
} else {
[_backgroundQueue addOperationWithBlock:block];
[self.backgroundQueue addOperationWithBlock:block];
return YES;
}
}
Expand All @@ -223,18 +237,18 @@ - (void)collectIntegrationsData {
}

- (void)collectIntegrationsDataInBackground {
[_device adjustUserIDWithCompletion:^(NSString * _Nullable userId) {
[self.device adjustUserIDWithCompletion:^(NSString * _Nullable userId) {
if (![QNUtils isEmptyString:userId]) {
[self setUserProperty:@"_q_adjust_adid" value:userId];
}
}];

NSString *fbAnonID = _device.fbAnonID;
NSString *fbAnonID = self.device.fbAnonID;
if (![QNUtils isEmptyString:fbAnonID]) {
[self setUserProperty:@"_q_fb_anon_id" value:fbAnonID];
}

NSString *afUserID = _device.afUserID;
NSString *afUserID = self.device.afUserID;
if (![QNUtils isEmptyString:afUserID]) {
[self setUserProperty:@"_q_appsflyer_user_id" value:afUserID];
}
Expand Down
Loading