Skip to content

Hotfix: Prevent handler being ARC on iOS before resolving the request #391

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

Merged
merged 2 commits into from
Jan 5, 2020
Merged

Hotfix: Prevent handler being ARC on iOS before resolving the request #391

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c02d876
Store handlers in dictionary to prevent ARC
Jan 3, 2020
3dbee48
Make handlers private
Jan 3, 2020
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
28 changes: 28 additions & 0 deletions ios/RNPermissions.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,10 @@ @implementation RCTConvert(RNPermission)

@end

@interface RNPermissions ()
@property (nonatomic, strong) NSMutableDictionary<NSString *, id<RNPermissionHandler>> *_Nonnull handlers;
@end

@implementation RNPermissions

RCT_EXPORT_MODULE();
Expand Down Expand Up @@ -225,6 +229,18 @@ - (NSString *)stringForStatus:(RNPermissionStatus)status {
}
}

- (NSString *)insertHandler:(id<RNPermissionHandler>)handler {
if(_handlers == nil){
_handlers = [NSMutableDictionary new];
}

NSString *randomId = [[NSUUID UUID] UUIDString];

[_handlers setObject:handler forKey:randomId];

return randomId;
}

+ (bool)isFlaggedAsRequested:(NSString * _Nonnull)handlerId {
NSArray<NSString *> *requested = [[NSUserDefaults standardUserDefaults] arrayForKey:SETTING_KEY];
return requested == nil ? false : [requested containsObject:handlerId];
Expand Down Expand Up @@ -271,13 +287,19 @@ + (void)flagAsRequested:(NSString * _Nonnull)handlerId {
rejecter:(RCTPromiseRejectBlock)reject) {
id<RNPermissionHandler> handler = [self handlerForPermission:permission];

NSString *randomId = [self insertHandler: handler];

[handler checkWithResolver:^(RNPermissionStatus status) {
NSString *strStatus = [self stringForStatus:status];
NSLog(@"[react-native-permissions] %@ permission checked: %@", [[handler class] handlerUniqueId], strStatus);
resolve(strStatus);

[self.handlers removeObjectForKey:randomId];
} rejecter:^(NSError *error) {
NSLog(@"[react-native-permissions] %@ permission failed: %@", [[handler class] handlerUniqueId], error.localizedDescription);
reject([NSString stringWithFormat:@"%ld", (long)error.code], error.localizedDescription, error);

[self.handlers removeObjectForKey:randomId];
}];
}

Expand All @@ -287,13 +309,19 @@ + (void)flagAsRequested:(NSString * _Nonnull)handlerId {
rejecter:(RCTPromiseRejectBlock)reject) {
id<RNPermissionHandler> handler = [self handlerForPermission:permission];

NSString *randomId = [self insertHandler: handler];

[handler requestWithResolver:^(RNPermissionStatus status) {
NSString *strStatus = [self stringForStatus:status];
NSLog(@"[react-native-permissions] %@ permission checked: %@", [[handler class] handlerUniqueId], strStatus);
resolve(strStatus);

[self.handlers removeObjectForKey:randomId];
} rejecter:^(NSError *error) {
NSLog(@"[react-native-permissions] %@ permission failed: %@", [[handler class] handlerUniqueId], error.localizedDescription);
reject([NSString stringWithFormat:@"%ld", (long)error.code], error.localizedDescription, error);

[self.handlers removeObjectForKey:randomId];
}];
}

Expand Down