fix: Fixed handling multiple location permissions issue

chore: Bumped version to 1.1.1

Author: manwithsteelnerves

Assets/Plugins/VoxelBusters/PermissionsKit/Editor/BuildPipeline/Xcode/PBXNativePluginsProcessor.cs

@@ -167,7 +167,7 @@ void AddPermission(string key, params Permission[] permissions)
             AddPermission("NSBluetoothAlwaysUsageDescription", Permission.ACCESS_BLUETOOTH);
             AddPermission("NSBluetoothPeripheralUsageDescription", Permission.ACCESS_BLUETOOTH);
             AddPermission("NSLocationWhenInUseUsageDescription", Permission.ACCESS_FINE_LOCATION, Permission.ACCESS_COARSE_LOCATION);
-            AddPermission("NSLocationAlwaysUsageDescription", Permission.ACCESS_LOCATION_IN_BACKGROUND);
+            AddPermission("NSLocationAlwaysAndWhenInUseUsageDescription", Permission.ACCESS_LOCATION_IN_BACKGROUND);
             AddPermission("NSLocationUsageDescription", Permission.ACCESS_COARSE_LOCATION);
             AddPermission("NSLocalNetworkUsageDescription", Permission.ACCESS_LOCAL_NETWORK);
             AddPermission("NSUserTrackingUsageDescription", Permission.PUSH_NOTIFICATIONS);

Assets/Plugins/VoxelBusters/PermissionsKit/Plugins/iOS/PermissionsKit/NPLocationManagerListener.h

@@ -13,7 +13,9 @@ typedef void (^LocationAuthorizationStatusCallback) (CLAuthorizationStatus authS
 
 @interface NPLocationManagerListener : NSObject<CLLocationManagerDelegate>
 
--(NPLocationManagerListener*) init:(LocationAuthorizationStatusCallback) completion  withInitialStatus:(CLAuthorizationStatus) initialStatus;
+-(NPLocationManagerListener*) initwithInitialStatus:(CLAuthorizationStatus) initialStatus;
+
+-(void) addListener:(LocationAuthorizationStatusCallback) completion;
 
 @end
 #endif

Assets/Plugins/VoxelBusters/PermissionsKit/Plugins/iOS/PermissionsKit/NPLocationManagerListener.mm

@@ -12,30 +12,36 @@
 
 @interface NPLocationManagerListener ()
 
-@property (nonatomic, copy) LocationAuthorizationStatusCallback callback;
+@property (nonatomic, strong) NSMutableArray<LocationAuthorizationStatusCallback> *callbackList;
 @property (nonatomic) CLAuthorizationStatus initialStatus;
 
 @end
 
 @implementation NPLocationManagerListener
 
-@synthesize callback;
+@synthesize callbackList;
 @synthesize initialStatus;
 
--(NPLocationManagerListener*) init:(LocationAuthorizationStatusCallback) callback withInitialStatus:(CLAuthorizationStatus) initialStatus
+-(NPLocationManagerListener*) initwithInitialStatus:(CLAuthorizationStatus) initialStatus
 {
-    self.callback = callback;
+    self.callbackList = [[NSMutableArray alloc] init];
     self.initialStatus = initialStatus;
     return self;
 }
 
+-(void) addListener:(LocationAuthorizationStatusCallback) completion
+{
+    [callbackList addObject:completion];
+}
+
 - (void)locationManagerDidChangeAuthorization:(CLLocationManager *)manager
 {
 
     CLAuthorizationStatus authStatus = [CLLocationManager authorizationStatus];
-    
     if(initialStatus != authStatus) {
-        self.callback(authStatus);
+        for (LocationAuthorizationStatusCallback eachCallback in callbackList) {
+            eachCallback(authStatus);
+        }
     }
 }
 

Assets/Plugins/VoxelBusters/PermissionsKit/Plugins/iOS/PermissionsKit/NPPermissionsKit.mm

@@ -186,17 +186,23 @@ -(void) request:(NSArray<NPPermission*>*) permissions withPurposeDescription:(NS
 #if PERMISSIONS_KIT_USES_LOCATION_FRAMEWORK
 - (void)requestLocationPermission:(BOOL)requestAlways
                        completion:(void (^)(PermissionsKitStatus status, NSError * _Nullable error))completion {
-    
-    self.locationManager = [[CLLocationManager alloc] init];
+
     CLAuthorizationStatus authStatus = [CLLocationManager authorizationStatus];
     PermissionsKitStatus status = PermissionsKitStatusUnknown;
 
-    self.locationStatusListener = [[NPLocationManagerListener alloc] init:^(CLAuthorizationStatus authStatus) {
-        PermissionsKitStatus newStatus = [self convertStatus:authStatus withRequestAlways:requestAlways];
+    if(self.locationManager == nil) {
+        self.locationManager = [[CLLocationManager alloc] init];
+        self.locationStatusListener = [[NPLocationManagerListener alloc] initwithInitialStatus:authStatus];
+    }
+    
+    __weak NPPermissionsKit *weakSelf = self;
+    
+    [self.locationStatusListener addListener:^(CLAuthorizationStatus authStatus) {
+        PermissionsKitStatus newStatus = [weakSelf convertStatus:authStatus withRequestAlways:requestAlways];
         completion(newStatus, nil);
-        self.locationManager = nil;
-        self.locationStatusListener = nil;
-    } withInitialStatus:authStatus];
+        weakSelf.locationManager = nil;
+        weakSelf.locationStatusListener = nil;
+    }];
 
     status = [self convertStatus:authStatus withRequestAlways:requestAlways];
 

Assets/Plugins/VoxelBusters/PermissionsKit/Runtime/Core/Setup/PermissionsKitSettings.cs

@@ -47,7 +47,7 @@ public class PermissionsKitSettings : SettingsObject
             {
                 return new UnityPackageDefinition(name: "com.voxelbusters.permissionskit",
                                                   displayName: "Permissions Kit",
-                                                  version: "1.1.0",
+                                                  version: "1.1.1",
                                                   defaultInstallPath: $"Assets/Plugins/VoxelBusters/PermissionsKit",
                                                   dependencies: CoreLibrarySettings.Package);
             });