Always request permission instead of skipping if already granted (#3211)

urbanairship · Sep 23, 2024 · ee60b94 · ee60b94
1 parent d44016f
commit ee60b94
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 13 deletions.
diff --git a/Airship/AirshipCore/Source/PermissionsManager.swift b/Airship/AirshipCore/Source/PermissionsManager.swift
@@ -183,14 +183,9 @@ public final class AirshipPermissionsManager: NSObject, @unchecked Sendable {
             }
 
             let startingStatus = await delegate.checkPermissionStatus()
-            var endStatus: AirshipPermissionStatus = .notDetermined
-
-            switch(startingStatus) {
-            case .granted:
-                endStatus = .granted
-            case .notDetermined:
-                endStatus = await delegate.requestPermission()
-            case .denied:
+            var endStatus: AirshipPermissionStatus = await delegate.requestPermission()
+
+            if startingStatus == .denied, endStatus == .denied {
                 switch fallback {
                 case .none:
                     endStatus = .denied

diff --git a/Airship/AirshipCore/Tests/PermissionsManagerTests.swift b/Airship/AirshipCore/Tests/PermissionsManagerTests.swift
@@ -103,7 +103,7 @@ class PermissionsManagerTests: XCTestCase {
         let status = await self.permissionsManager.requestPermission(.location)
 
         XCTAssertEqual(AirshipPermissionStatus.denied, status)
-        XCTAssertFalse(self.delegate.requestCalled)
+        XCTAssertTrue(self.delegate.requestCalled)
         XCTAssertTrue(self.delegate.checkCalled)
     }
 
@@ -117,7 +117,7 @@ class PermissionsManagerTests: XCTestCase {
         let status = await self.permissionsManager.requestPermission(.location)
 
         XCTAssertEqual(AirshipPermissionStatus.granted, status)
-        XCTAssertFalse(self.delegate.requestCalled)
+        XCTAssertTrue(self.delegate.requestCalled)
         XCTAssertTrue(self.delegate.checkCalled)
     }
 
@@ -131,7 +131,7 @@ class PermissionsManagerTests: XCTestCase {
 
         _ = await self.permissionsManager.requestPermission(.location, enableAirshipUsageOnGrant: false, fallback: .systemSettings)
 
-        XCTAssertFalse(self.delegate.requestCalled)
+        XCTAssertTrue(self.delegate.requestCalled)
         XCTAssertTrue(self.delegate.checkCalled)
         XCTAssertEqual(systemSettingsNavigator.permissionOpens, [.location])
     }
@@ -148,7 +148,7 @@ class PermissionsManagerTests: XCTestCase {
 
         _ = await self.permissionsManager.requestPermission(.location, enableAirshipUsageOnGrant: false, fallback: .systemSettings)
 
-        XCTAssertFalse(self.delegate.requestCalled)
+        XCTAssertTrue(self.delegate.requestCalled)
         XCTAssertTrue(self.delegate.checkCalled)
         XCTAssertEqual(systemSettingsNavigator.permissionOpens, [.location])
     }
@@ -170,7 +170,7 @@ class PermissionsManagerTests: XCTestCase {
         )
 
         XCTAssertEqual(AirshipPermissionStatus.granted, status.endStatus)
-        XCTAssertFalse(self.delegate.requestCalled)
+        XCTAssertTrue(self.delegate.requestCalled)
         XCTAssertTrue(self.delegate.checkCalled)
     }