expo-calendar 11.3.0 → 11.3.2

package/CHANGELOG.md

@@ -10,6 +10,18 @@
 
 ### 💡 Others
 
+## 11.3.2 — 2023-09-28
+
+### 🐛 Bug fixes
+
+- On `iOS`, fix check that determines if the version of Xcode supports `iOS 17`. ([#24655](https://github.com/expo/expo/pull/24655) by [@alanjhughes](https://github.com/alanjhughes))
+
+## 11.3.1 — 2023-09-25
+
+### 🐛 Bug fixes
+
+- On `iOS`, fix permissions error on `iOS 17`. ([#24545](https://github.com/expo/expo/pull/24545) by [@alanjhughes](https://github.com/alanjhughes))
+
 ## 11.3.0 — 2023-06-21
 
 ### 🐛 Bug fixes

package/android/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
-version = '11.3.0'
+version = '11.3.2'
 
 buildscript {
   def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
@@ -67,7 +67,7 @@ android {
     minSdkVersion safeExtGet("minSdkVersion", 21)
     targetSdkVersion safeExtGet("targetSdkVersion", 33)
     versionCode 17
-    versionName '11.3.0'
+    versionName '11.3.2'
   }
   lintOptions {
     abortOnError false

package/ios/EXCalendar/EXCalendar.m

@@ -381,11 +381,11 @@ EX_EXPORT_METHOD_AS(saveEventAsync,
     calendarEvent.recurrenceRules = nil;
   }
 
-  NSURL *URL = [NSURL URLWithString:[url stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLHostAllowedCharacterSet]]];
-  if (URL) {
-    calendarEvent.URL = URL;
-  } else if (details[@"url"] == [NSNull null]) {
-    calendarEvent.URL = nil;
+  if (url) {
+    NSURLComponents *URLComponents = [NSURLComponents componentsWithString:url];
+    if (URLComponents && URLComponents.URL) {
+      calendarEvent.URL = URLComponents.URL;
+    }
   }
 
   if (startDate) {
@@ -651,11 +651,11 @@ EX_EXPORT_METHOD_AS(saveReminderAsync,
     reminder.recurrenceRules = nil;
   }
 
-  NSURL *URL = [NSURL URLWithString:[url stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLHostAllowedCharacterSet]]];
-  if (URL) {
-    reminder.URL = URL;
-  } else if (details[@"url"] == [NSNull null]) {
-    reminder.URL = nil;
+  if (url) {
+    NSURLComponents *URLComponents = [NSURLComponents componentsWithString:url];
+    if (URLComponents && URLComponents.URL) {
+      reminder.URL = URLComponents.URL;
+    }
   }
 
   if (startDate) {
@@ -773,7 +773,7 @@ EX_EXPORT_METHOD_AS(requestCalendarPermissionsAsync,
   [EXPermissionsMethodsDelegate askForPermissionWithPermissionsManager:_permissionsManager
                                                          withRequester:[EXCalendarPermissionRequester class]
                                                                resolve:resolve
-                                                                reject:reject];
+                                                                reject:reject];  
 }
 
 EX_EXPORT_METHOD_AS(getRemindersPermissionsAsync,

package/ios/EXCalendar/EXCalendarPermissionRequester.m

@@ -14,13 +14,23 @@
   EXPermissionStatus status;
   EKAuthorizationStatus permissions;
   
-  NSString *calendarUsageDescription = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"NSCalendarsUsageDescription"];
+  NSString *description;
+  if (@available(iOS 17, *)) {
+    description = @"NSCalendarsFullAccessUsageDescription";
+  } else {
+    description = @"NSCalendarsUsageDescription";
+  }
+  
+  NSString *calendarUsageDescription = [[NSBundle mainBundle] objectForInfoDictionaryKey:description];
+  
   if (!calendarUsageDescription) {
-    EXFatal(EXErrorWithMessage(@"This app is missing NSCalendarsUsageDescription, so calendar methods will fail. Add this key to your bundle's Info.plist."));
+    NSString *message = [NSString stringWithFormat:@"This app is missing %@, so calendar methods will fail. Add this key to your bundle's Info.plist.", description];
+    EXFatal(EXErrorWithMessage(message));
     permissions = EKAuthorizationStatusDenied;
   } else {
     permissions = [EKEventStore authorizationStatusForEntityType:EKEntityTypeEvent];
   }
+  
   switch (permissions) {
     case EKAuthorizationStatusAuthorized:
       status = EXPermissionStatusGranted;
@@ -33,6 +43,7 @@
       status = EXPermissionStatusUndetermined;
       break;
   }
+  
   return @{
     @"status": @(status)
   };
@@ -42,15 +53,38 @@
 {
   EKEventStore *eventStore = [[EKEventStore alloc] init];
   EX_WEAKIFY(self)
-  [eventStore requestAccessToEntityType:EKEntityTypeEvent completion:^(BOOL granted, NSError *error) {
-    EX_STRONGIFY(self)
-    // Error code 100 is a when the user denies permission; in that case we don't want to reject.
-    if (error && error.code != 100) {
-      reject(@"E_CALENDAR_ERROR_UNKNOWN", error.localizedDescription, error);
-    } else {
-      resolve([self getPermissions]);
-    }
-  }];
+#if defined(__IPHONE_17_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >=__IPHONE_17_0 
+  if (@available(iOS 17.0, *)) {
+    [eventStore requestFullAccessToEventsWithCompletion:^(BOOL granted, NSError * _Nullable error) {
+      EX_STRONGIFY(self)
+      if (error && error.code != 100) {
+        reject(@"E_CALENDAR_ERROR_UNKNOWN", error.localizedDescription, error);
+      } else {
+        resolve([self getPermissions]);
+      }
+    }];
+  } else {
+    [eventStore requestAccessToEntityType:EKEntityTypeEvent completion:^(BOOL granted, NSError *error) {
+      EX_STRONGIFY(self)
+      // Error code 100 is a when the user denies permission; in that case we don't want to reject.
+      if (error && error.code != 100) {
+        reject(@"E_CALENDAR_ERROR_UNKNOWN", error.localizedDescription, error);
+      } else {
+        resolve([self getPermissions]);
+      }
+    }];
+  }
+#else
+    [eventStore requestAccessToEntityType:EKEntityTypeEvent completion:^(BOOL granted, NSError *error) {
+      EX_STRONGIFY(self)
+      // Error code 100 is a when the user denies permission; in that case we don't want to reject.
+      if (error && error.code != 100) {
+        reject(@"E_CALENDAR_ERROR_UNKNOWN", error.localizedDescription, error);
+      } else {
+        resolve([self getPermissions]);
+      }
+    }];
+#endif
 }
 
 

package/ios/EXCalendar/EXRemindersPermissionRequester.m

@@ -14,13 +14,23 @@
   EXPermissionStatus status;
   EKAuthorizationStatus permissions;
   
-  NSString *remindersUsageDescription = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"NSRemindersUsageDescription"];
+  NSString *description;
+  if (@available(iOS 17, *)) {
+    description = @"NSRemindersFullAccessUsageDescription";
+  } else {
+    description = @"NSRemindersUsageDescription";
+  }
+  
+  NSString *remindersUsageDescription = [[NSBundle mainBundle] objectForInfoDictionaryKey:description];
+  
   if (!remindersUsageDescription) {
-    EXFatal(EXErrorWithMessage(@"This app is missing NSRemindersUsageDescription, so reminders methods will fail. Add this key to your bundle's Info.plist."));
+    NSString *message = [NSString stringWithFormat:@"This app is missing %@, so reminders methods will fail. Add this key to your bundle's Info.plist.", description];
+    EXFatal(EXErrorWithMessage(message));
     permissions = EKAuthorizationStatusDenied;
   } else {
     permissions = [EKEventStore authorizationStatusForEntityType:EKEntityTypeReminder];
   }
+  
   switch (permissions) {
     case EKAuthorizationStatusAuthorized:
       status = EXPermissionStatusGranted;
@@ -33,6 +43,7 @@
       status = EXPermissionStatusUndetermined;
       break;
   }
+  
   return @{
            @"status": @(status)
           };
@@ -42,6 +53,28 @@
 {
   EKEventStore *eventStore = [[EKEventStore alloc] init];
   EX_WEAKIFY(self)
+#if defined(__IPHONE_17_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_17_0
+  if (@available(iOS 17.0, *)) {
+    [eventStore requestFullAccessToRemindersWithCompletion:^(BOOL granted, NSError * _Nullable error) {
+      EX_STRONGIFY(self)
+      if (error && error.code != 100) {
+        reject(@"E_CALENDAR_ERROR_UNKNOWN", error.localizedDescription, error);
+      } else {
+        resolve([self getPermissions]);
+      }
+    }];
+  } else {
+    [eventStore requestAccessToEntityType:EKEntityTypeReminder completion:^(BOOL granted, NSError *error) {
+      EX_STRONGIFY(self)
+      // Error code 100 is a when the user denies permission; in that case we don't want to reject.
+      if (error && error.code != 100) {
+        reject(@"E_REMINDERS_ERROR_UNKNOWN", error.localizedDescription, error);
+      } else {
+        resolve([self getPermissions]);
+      }
+    }];
+  }
+#else
   [eventStore requestAccessToEntityType:EKEntityTypeReminder completion:^(BOOL granted, NSError *error) {
     EX_STRONGIFY(self)
     // Error code 100 is a when the user denies permission; in that case we don't want to reject.
@@ -51,6 +84,7 @@
       resolve([self getPermissions]);
     }
   }];
+#endif
 }
 
 @end

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-calendar",
-  "version": "11.3.0",
+  "version": "11.3.2",
   "description": "Provides an API for interacting with the device's system calendars, events, reminders, and associated records.",
   "main": "build/Calendar.js",
   "types": "build/Calendar.d.ts",
@@ -40,5 +40,5 @@
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "fa5ecca8251986b9f197cc14074eec0ab6dfb6db"
+  "gitHead": "b0019af6dd5a36e908618c388ab5f3053afc61c0"
 }

package/plugin/build/withCalendar.js

@@ -13,6 +13,14 @@ const withCalendar = (config, { calendarPermission, remindersPermission } = {})
         calendarPermission || config.ios.infoPlist.NSCalendarsUsageDescription || CALENDARS_USAGE;
     config.ios.infoPlist.NSRemindersUsageDescription =
         remindersPermission || config.ios.infoPlist.NSRemindersUsageDescription || REMINDERS_USAGE;
+    config.ios.infoPlist.NSCalendarsFullAccessUsageDescription =
+        calendarPermission ||
+            config.ios.infoPlist.NSCalendarsFullAccessUsageDescription ||
+            CALENDARS_USAGE;
+    config.ios.infoPlist.NSRemindersFullAccessUsageDescription =
+        remindersPermission ||
+            config.ios.infoPlist.NSRemindersFullAccessUsageDescription ||
+            REMINDERS_USAGE;
     return config_plugins_1.AndroidConfig.Permissions.withPermissions(config, [
         'android.permission.READ_CALENDAR',
         'android.permission.WRITE_CALENDAR',

package/plugin/src/withCalendar.ts

@@ -18,6 +18,15 @@ const withCalendar: ConfigPlugin<
   config.ios.infoPlist.NSRemindersUsageDescription =
     remindersPermission || config.ios.infoPlist.NSRemindersUsageDescription || REMINDERS_USAGE;
 
+  config.ios.infoPlist.NSCalendarsFullAccessUsageDescription =
+    calendarPermission ||
+    config.ios.infoPlist.NSCalendarsFullAccessUsageDescription ||
+    CALENDARS_USAGE;
+  config.ios.infoPlist.NSRemindersFullAccessUsageDescription =
+    remindersPermission ||
+    config.ios.infoPlist.NSRemindersFullAccessUsageDescription ||
+    REMINDERS_USAGE;
+
   return AndroidConfig.Permissions.withPermissions(config, [
     'android.permission.READ_CALENDAR',
     'android.permission.WRITE_CALENDAR',