From a113151563ef7ffb1e5c84849cd0e88bf1a1f589 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= Date: Wed, 27 May 2020 14:20:43 +0200 Subject: [PATCH] deps: update react-native-calendar-events Rebase our patches (in PR) on top of latest master. Sshould fix a crash when requesting permisssions. --- .../org/jitsi/meet/sdk/JitsiMeetActivityDelegate.java | 9 +-------- ios/Podfile.lock | 4 ++-- package-lock.json | 4 ++-- package.json | 2 +- 4 files changed, 6 insertions(+), 13 deletions(-) diff --git a/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetActivityDelegate.java b/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetActivityDelegate.java index d6377f688..7b214320a 100644 --- a/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetActivityDelegate.java +++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetActivityDelegate.java @@ -22,7 +22,6 @@ import android.app.Activity; import android.content.Intent; import android.os.Build; -import com.calendarevents.CalendarEventsPackage; import com.facebook.react.ReactInstanceManager; import com.facebook.react.bridge.Callback; import com.facebook.react.bridge.ReactContext; @@ -167,13 +166,7 @@ public class JitsiMeetActivityDelegate { } public static void onRequestPermissionsResult( - final int requestCode, - final String[] permissions, - final int[] grantResults) { - CalendarEventsPackage.onRequestPermissionsResult( - requestCode, - permissions, - grantResults); + final int requestCode, final String[] permissions, final int[] grantResults) { permissionsCallback = new Callback() { @Override public void invoke(Object... args) { diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 1afa315ed..96da4a5f3 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -287,7 +287,7 @@ PODS: - React-jsinspector (0.61.5-jitsi.1) - react-native-background-timer (2.1.1): - React - - react-native-calendar-events (1.7.3): + - react-native-calendar-events (2.0.0): - React - react-native-keep-awake (4.0.0): - React @@ -566,7 +566,7 @@ SPEC CHECKSUMS: React-jsiexecutor: de1c37cf59ae9adcbf2be82eea0e090dc3f3205e React-jsinspector: b76c4e84a7833bb4c90549d59ed53ec299ff912b react-native-background-timer: 0d34748e53a972507c66963490c775321a88f6f2 - react-native-calendar-events: 2fe35a9294af05de0ed819d3a1b5dac048d2c010 + react-native-calendar-events: 1442fad71a00388f933cfa25512588fec300fcf8 react-native-keep-awake: eba3137546b10003361b37c761f6c429b59814ae react-native-netinfo: 8d8db463bcc5db66a8ac5c48a7d86beb3b92f61a react-native-webrtc: 86d841823e66d68cc1f86712db1c2956056bf0c2 diff --git a/package-lock.json b/package-lock.json index 20942a0b2..ee03e01e3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14933,8 +14933,8 @@ "integrity": "sha512-cuXIIv+dcG8a8qkTD8pMzeqOEZCO+UGKglZWIe1osve+yJslmCowYQff+bI9xa7NOt2w+Vtd4L3d9JonlSqODg==" }, "react-native-calendar-events": { - "version": "github:jitsi/react-native-calendar-events#902e6e92d6bae450a6052f76ba4d02f977ffd8f2", - "from": "github:jitsi/react-native-calendar-events#902e6e92d6bae450a6052f76ba4d02f977ffd8f2" + "version": "github:jitsi/react-native-calendar-events#928a80e2ffef0d7e84936d7e7e0acc4f53ee8470", + "from": "github:jitsi/react-native-calendar-events#928a80e2ffef0d7e84936d7e7e0acc4f53ee8470" }, "react-native-callstats": { "version": "3.61.0", diff --git a/package.json b/package.json index ab2636f33..24ca211e3 100644 --- a/package.json +++ b/package.json @@ -69,7 +69,7 @@ "react-linkify": "1.0.0-alpha", "react-native": "github:jitsi/react-native#efd2aff5661d75a230e36406b698cfe0ee545be2", "react-native-background-timer": "2.1.1", - "react-native-calendar-events": "github:jitsi/react-native-calendar-events#902e6e92d6bae450a6052f76ba4d02f977ffd8f2", + "react-native-calendar-events": "github:jitsi/react-native-calendar-events#928a80e2ffef0d7e84936d7e7e0acc4f53ee8470", "react-native-callstats": "3.61.0", "react-native-collapsible": "1.5.1", "react-native-default-preference": "1.4.2",