use isFlaggedAsRequested when checking local network permission

Author: Geraint White

ios/LocalNetworkPrivacy/LocalNetworkPrivacy.h

@@ -1,12 +1,5 @@
-typedef enum {
-  OptionalBoolNone,
-  OptionalBoolYes,
-  OptionalBoolNo,
-} OptionalBool;
-
 @interface LocalNetworkPrivacy : NSObject
 
-+ (OptionalBool)authorizationStatus;
 - (void)checkAccessState:(void (^)(BOOL))completion;
 
 @end

ios/LocalNetworkPrivacy/LocalNetworkPrivacy.m

@@ -7,14 +7,11 @@ @interface LocalNetworkPrivacy () <NSNetServiceDelegate>
 @property (nonatomic) void (^completion)(BOOL);
 @property (nonatomic) NSTimer *timer;
 @property (nonatomic) BOOL publishing;
-@property (class, nonatomic) OptionalBool granted;
 
 @end
 
 @implementation LocalNetworkPrivacy
 
-static OptionalBool granted = OptionalBoolNone;
-
 - (instancetype)init {
     if (self = [super init]) {
         self.service = [[NSNetService alloc] initWithDomain:@"local." type:@"_lnp._tcp." name:@"LocalNetworkPrivacy" port:1100];
@@ -26,36 +23,23 @@ - (void)dealloc {
     [self.service stop];
 }
 
-+ (OptionalBool)authorizationStatus {
-    return granted;
-}
-
 - (void)checkAccessState:(void (^)(BOOL))completion {
     self.completion = completion;
 
-    self.timer = [NSTimer scheduledTimerWithTimeInterval:2 repeats:YES block:^(NSTimer * _Nonnull timer) {
-        if (UIApplication.sharedApplication.applicationState != UIApplicationStateActive) {
-            return;
-        }
-
-        if (self.publishing) {
-            granted = OptionalBoolNo;
-            [self.timer invalidate];
-            self.completion(NO);
-        }
-        else {
-            self.publishing = YES;
-            self.service.delegate = self;
-            [self.service publish];
-        }
+    self.publishing = YES;
+    self.service.delegate = self;
+    [self.service publish];
+
+    self.timer = [NSTimer scheduledTimerWithTimeInterval:2 repeats:NO block:^(NSTimer * _Nonnull timer) {
+        [self.timer invalidate];
+        self.completion(NO);
     }];
 }
 
 
 #pragma mark - NSNetServiceDelegate
 
 - (void)netServiceDidPublish:(NSNetService *)sender {
-    granted = OptionalBoolYes;
     [self.timer invalidate];
     self.completion(YES);
 }

ios/LocalNetworkPrivacy/RNPermissionHandlerLocalNetworkPrivacy.m

@@ -13,21 +13,20 @@ + (NSString * _Nonnull)handlerUniqueId {
 
 - (void)checkWithResolver:(void (^ _Nonnull)(RNPermissionStatus))resolve
                  rejecter:(void (__unused ^ _Nonnull)(NSError * _Nonnull))reject {
-  switch ([LocalNetworkPrivacy authorizationStatus]) {
-    case OptionalBoolNone:
-      return resolve(RNPermissionStatusNotDetermined);
-    case OptionalBoolNo:
-      return resolve(RNPermissionStatusDenied);
-    case OptionalBoolYes:
-      return resolve(RNPermissionStatusAuthorized);
+  if (![RNPermissions isFlaggedAsRequested:[[self class] handlerUniqueId]]) {
+    return resolve(RNPermissionStatusNotDetermined);
   }
+
+  [self requestWithResolver:resolve rejecter:reject];
 }
 
 - (void)requestWithResolver:(void (^ _Nonnull)(RNPermissionStatus))resolve
                    rejecter:(void (^ _Nonnull)(NSError * _Nonnull))reject {
+  [RNPermissions flagAsRequested:[[self class] handlerUniqueId]];
+
   LocalNetworkPrivacy *local = [LocalNetworkPrivacy new];
   [local checkAccessState:^(BOOL granted) {
-      [self checkWithResolver:resolve rejecter:reject];
+      resolve(granted ? RNPermissionStatusAuthorized : RNPermissionStatusDenied);
   }];
 }