diff --git a/ios/Podfile b/ios/Podfile index d333a2853..e7da91e0a 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -56,7 +56,6 @@ target 'JitsiMeetSDK' do pod 'amplitude-react-native', :path => '../node_modules/@amplitude/react-native' pod 'react-native-background-timer', :path => '../node_modules/react-native-background-timer' - pod 'react-native-calendar-events', :path => '../node_modules/react-native-calendar-events' pod 'react-native-get-random-values', :path => '../node_modules/react-native-get-random-values' pod 'react-native-keep-awake', :path => '../node_modules/react-native-keep-awake' pod 'react-native-netinfo', :path => '../node_modules/@react-native-community/netinfo' @@ -68,6 +67,7 @@ target 'JitsiMeetSDK' do pod 'react-native-webview', :path => '../node_modules/react-native-webview' pod 'react-native-webrtc', :path => '../node_modules/react-native-webrtc' pod 'RNCAsyncStorage', :path => '../node_modules/@react-native-async-storage/async-storage' + pod 'RNCalendarEvents', :path => '../node_modules/react-native-calendar-events' pod 'RNCClipboard', :path => '../node_modules/@react-native-community/clipboard' pod 'RNCMaskedView', :path => '../node_modules/@react-native-masked-view/masked-view' pod 'RNDefaultPreference', :path => '../node_modules/react-native-default-preference' diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 41afb90d9..629e8443d 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -282,8 +282,6 @@ PODS: - React-jsinspector (0.61.5-jitsi.2) - react-native-background-timer (2.4.1): - React-Core - - react-native-calendar-events (2.0.0): - - React - react-native-get-random-values (1.7.0): - React-Core - react-native-keep-awake (4.0.0): @@ -361,6 +359,8 @@ PODS: - React-jsi (= 0.61.5-jitsi.2) - ReactCommon/jscallinvoker (= 0.61.5-jitsi.2) - ReactCommon/turbomodule/core (= 0.61.5-jitsi.2) + - RNCalendarEvents (2.2.0): + - React - RNCAsyncStorage (1.15.14): - React-Core - RNCClipboard (1.5.1): @@ -415,7 +415,6 @@ DEPENDENCIES: - React-jsiexecutor (from `../node_modules/react-native/ReactCommon/jsiexecutor`) - React-jsinspector (from `../node_modules/react-native/ReactCommon/jsinspector`) - react-native-background-timer (from `../node_modules/react-native-background-timer`) - - react-native-calendar-events (from `../node_modules/react-native-calendar-events`) - react-native-get-random-values (from `../node_modules/react-native-get-random-values`) - react-native-keep-awake (from `../node_modules/react-native-keep-awake`) - "react-native-netinfo (from `../node_modules/@react-native-community/netinfo`)" @@ -436,6 +435,7 @@ DEPENDENCIES: - React-RCTText (from `../node_modules/react-native/Libraries/Text`) - React-RCTVibration (from `../node_modules/react-native/Libraries/Vibration`) - ReactCommon/turbomodule (from `../node_modules/react-native/ReactCommon`) + - RNCalendarEvents (from `../node_modules/react-native-calendar-events`) - "RNCAsyncStorage (from `../node_modules/@react-native-async-storage/async-storage`)" - "RNCClipboard (from `../node_modules/@react-native-community/clipboard`)" - "RNCMaskedView (from `../node_modules/@react-native-masked-view/masked-view`)" @@ -506,8 +506,6 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native/ReactCommon/jsinspector" react-native-background-timer: :path: "../node_modules/react-native-background-timer" - react-native-calendar-events: - :path: "../node_modules/react-native-calendar-events" react-native-get-random-values: :path: "../node_modules/react-native-get-random-values" react-native-keep-awake: @@ -548,6 +546,8 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native/Libraries/Vibration" ReactCommon: :path: "../node_modules/react-native/ReactCommon" + RNCalendarEvents: + :path: "../node_modules/react-native-calendar-events" RNCAsyncStorage: :path: "../node_modules/@react-native-async-storage/async-storage" RNCClipboard: @@ -612,7 +612,6 @@ SPEC CHECKSUMS: React-jsiexecutor: 67106691c60030ec888d7cbbc4f48a3168e27a02 React-jsinspector: 92ceee6c66dc19886289b52436ade7e020b89602 react-native-background-timer: 17ea5e06803401a379ebf1f20505b793ac44d0fe - react-native-calendar-events: 82dc6c915653a1a8a266e43fdbbfdb3b1022ca99 react-native-get-random-values: 237bffb1c7e05fb142092681531810a29ba53015 react-native-keep-awake: afad8a51dfef9fe9655a6344771be32c8596d774 react-native-netinfo: 27f287f2d191693f3b9d01a4273137fcf91c3b5d @@ -633,6 +632,7 @@ SPEC CHECKSUMS: React-RCTText: 4f1b99f228278d2a5e9008eced8dc9c974c4a270 React-RCTVibration: c1041024893fdfdb8371e7c720c437751b711676 ReactCommon: 18014e1d98dbeb9141e935cfe35fc93bd511ffb6 + RNCalendarEvents: 7e65eb4a94f53c1744d1e275f7fafcfaa619f7a3 RNCAsyncStorage: ea6b5c280997b2b32a587793163b1f10e580c4f7 RNCClipboard: 41d8d918092ae8e676f18adada19104fa3e68495 RNCMaskedView: c298b644a10c0c142055b3ae24d83879ecb13ccd @@ -647,6 +647,6 @@ SPEC CHECKSUMS: RNWatch: a5320c959c75e72845c07985f3e935e58998f1d3 Yoga: 96b469c5e81ff51b917b92e8c3390642d4ded30c -PODFILE CHECKSUM: c199ad2ae940ea667c3bda71afa858301694e9b9 +PODFILE CHECKSUM: 2e6a49cec4d0e9eb135654df2dddb3448d26cb4a COCOAPODS: 1.11.2 diff --git a/package-lock.json b/package-lock.json index 53d436d8f..14ba2f4ae 100644 --- a/package-lock.json +++ b/package-lock.json @@ -82,7 +82,7 @@ "react-linkify": "1.0.0-alpha", "react-native": "github:jitsi/react-native#891986ec5ecaef65d1c8a7fe472f86cf84fe7551", "react-native-background-timer": "2.4.1", - "react-native-calendar-events": "github:jitsi/react-native-calendar-events#df48ecdc4e1e90c5352f803ddbab1fa7269b74a7", + "react-native-calendar-events": "2.2.0", "react-native-callstats": "3.70.1", "react-native-collapsible": "1.5.1", "react-native-default-preference": "1.4.2", @@ -15788,12 +15788,11 @@ } }, "node_modules/react-native-calendar-events": { - "version": "2.0.0", - "resolved": "git+ssh://git@github.com/jitsi/react-native-calendar-events.git#df48ecdc4e1e90c5352f803ddbab1fa7269b74a7", - "integrity": "sha512-BDZMAaMdNsuZuzxpT7LpfRDqgFMiXbQfrXXUo55qD49RnbpmtcGKLUMkoqoOU8ywvL9ZQiCqXtymUSGJQhOpCQ==", - "license": "MIT", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/react-native-calendar-events/-/react-native-calendar-events-2.2.0.tgz", + "integrity": "sha512-tNUbhT6Ief0JM4OQzQAaz1ri0+MCcAoHptBcEXCz2g7q3A05pg62PR2Dio4F9t2fCAD7Y2+QggdY1ycAsF3Tsg==", "peerDependencies": { - "react-native": ">=0.40.0" + "react-native": ">=0.60.0" } }, "node_modules/react-native-callstats": { @@ -32648,9 +32647,9 @@ "integrity": "sha512-TE4Kiy7jUyv+hugxDxitzu38sW1NqjCk4uE5IgU2WevLv7sZacaBc6PZKOShNRPGirLl1NWkaG3LDEkdb9Um5g==" }, "react-native-calendar-events": { - "version": "git+ssh://git@github.com/jitsi/react-native-calendar-events.git#df48ecdc4e1e90c5352f803ddbab1fa7269b74a7", - "integrity": "sha512-BDZMAaMdNsuZuzxpT7LpfRDqgFMiXbQfrXXUo55qD49RnbpmtcGKLUMkoqoOU8ywvL9ZQiCqXtymUSGJQhOpCQ==", - "from": "react-native-calendar-events@github:jitsi/react-native-calendar-events#df48ecdc4e1e90c5352f803ddbab1fa7269b74a7" + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/react-native-calendar-events/-/react-native-calendar-events-2.2.0.tgz", + "integrity": "sha512-tNUbhT6Ief0JM4OQzQAaz1ri0+MCcAoHptBcEXCz2g7q3A05pg62PR2Dio4F9t2fCAD7Y2+QggdY1ycAsF3Tsg==" }, "react-native-callstats": { "version": "3.70.1", diff --git a/package.json b/package.json index c80d014e0..5bda29141 100644 --- a/package.json +++ b/package.json @@ -87,7 +87,7 @@ "react-linkify": "1.0.0-alpha", "react-native": "github:jitsi/react-native#891986ec5ecaef65d1c8a7fe472f86cf84fe7551", "react-native-background-timer": "2.4.1", - "react-native-calendar-events": "github:jitsi/react-native-calendar-events#df48ecdc4e1e90c5352f803ddbab1fa7269b74a7", + "react-native-calendar-events": "2.2.0", "react-native-callstats": "3.70.1", "react-native-collapsible": "1.5.1", "react-native-default-preference": "1.4.2", diff --git a/react/features/calendar-sync/functions.native.js b/react/features/calendar-sync/functions.native.js index 7c582a95e..c2fa6ecd2 100644 --- a/react/features/calendar-sync/functions.native.js +++ b/react/features/calendar-sync/functions.native.js @@ -128,12 +128,12 @@ export function _fetchCalendarEntries( */ function _ensureCalendarAccess(promptForPermission, dispatch) { return new Promise((resolve, reject) => { - RNCalendarEvents.authorizationStatus() + RNCalendarEvents.checkPermissions() .then(status => { if (status === 'authorized') { resolve(true); } else if (promptForPermission) { - RNCalendarEvents.authorizeEventStore() + RNCalendarEvents.requestPermissions() .then(result => { dispatch(setCalendarAuthorization(result)); resolve(result === 'authorized');