Merge pull request #325 from kvyatkovskys/feature/v_0.6.16

use the new method to get access to calendar events
kvyatkovskys · Sep 11, 2023 · cea71e0 · cea71e0
2 parents 5c4d8e6 + 2924898
commit cea71e0
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/KVKCalendar.podspec b/KVKCalendar.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'KVKCalendar'
-  s.version          = '0.6.15'
+  s.version          = '0.6.16'
   s.summary          = 'A most fully customization calendar for Apple platforms.'
 
   s.description      = <<-DESC

diff --git a/Sources/KVKCalendar/KVKCalendarView+Extension.swift b/Sources/KVKCalendar/KVKCalendarView+Extension.swift
@@ -180,12 +180,25 @@ extension KVKCalendarView {
     private func requestAccessSystemCalendars(_ calendars: Set<String>,
                                               store: EKEventStore,
                                               completion: @escaping (Bool) -> Void) {
-        let status = EKEventStore.authorizationStatus(for: .event)
-
-        store.requestAccess(to: .event) { (access, error) in
-            print("System calendars = \(calendars) - access = \(access), error = \(error?.localizedDescription ?? "nil"), status = \(status.rawValue)")
+        func proxyCompletion(access: Bool, status: EKAuthorizationStatus, error: Error?) {
+            print("System calendars = \(calendars) - access = \(access), error = \(error?.localizedDescription ?? "nil"), status = \(status)")
             completion(access)
         }
+        let status = EKEventStore.authorizationStatus(for: .event)
+        switch status {
+        case .fullAccess, .authorized:
+            completion(true)
+        default:
+            if #available(iOS 17.0, *) {
+                store.requestFullAccessToEvents { (access, error) in
+                    proxyCompletion(access: access, status: status, error: error)
+                }
+            } else {
+                store.requestAccess(to: .event) { (access, error) in
+                    proxyCompletion(access: access, status: status, error: error)
+                }
+            }
+        }
     }
 
     private func switchCalendarType(_ type: CalendarType) {