Skip to content

Commit a113151

Browse files
committed
deps: update react-native-calendar-events
Rebase our patches (in PR) on top of latest master. Sshould fix a crash when requesting permisssions.
1 parent 470fda3 commit a113151

File tree

4 files changed

+6
-13
lines changed

4 files changed

+6
-13
lines changed

android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetActivityDelegate.java

+1-8
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import android.content.Intent;
2323
import android.os.Build;
2424

25-
import com.calendarevents.CalendarEventsPackage;
2625
import com.facebook.react.ReactInstanceManager;
2726
import com.facebook.react.bridge.Callback;
2827
import com.facebook.react.bridge.ReactContext;
@@ -167,13 +166,7 @@ public static void onNewIntent(Intent intent) {
167166
}
168167

169168
public static void onRequestPermissionsResult(
170-
final int requestCode,
171-
final String[] permissions,
172-
final int[] grantResults) {
173-
CalendarEventsPackage.onRequestPermissionsResult(
174-
requestCode,
175-
permissions,
176-
grantResults);
169+
final int requestCode, final String[] permissions, final int[] grantResults) {
177170
permissionsCallback = new Callback() {
178171
@Override
179172
public void invoke(Object... args) {

ios/Podfile.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ PODS:
287287
- React-jsinspector (0.61.5-jitsi.1)
288288
- react-native-background-timer (2.1.1):
289289
- React
290-
- react-native-calendar-events (1.7.3):
290+
- react-native-calendar-events (2.0.0):
291291
- React
292292
- react-native-keep-awake (4.0.0):
293293
- React
@@ -566,7 +566,7 @@ SPEC CHECKSUMS:
566566
React-jsiexecutor: de1c37cf59ae9adcbf2be82eea0e090dc3f3205e
567567
React-jsinspector: b76c4e84a7833bb4c90549d59ed53ec299ff912b
568568
react-native-background-timer: 0d34748e53a972507c66963490c775321a88f6f2
569-
react-native-calendar-events: 2fe35a9294af05de0ed819d3a1b5dac048d2c010
569+
react-native-calendar-events: 1442fad71a00388f933cfa25512588fec300fcf8
570570
react-native-keep-awake: eba3137546b10003361b37c761f6c429b59814ae
571571
react-native-netinfo: 8d8db463bcc5db66a8ac5c48a7d86beb3b92f61a
572572
react-native-webrtc: 86d841823e66d68cc1f86712db1c2956056bf0c2

package-lock.json

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
"react-linkify": "1.0.0-alpha",
7070
"react-native": "github:jitsi/react-native#efd2aff5661d75a230e36406b698cfe0ee545be2",
7171
"react-native-background-timer": "2.1.1",
72-
"react-native-calendar-events": "github:jitsi/react-native-calendar-events#902e6e92d6bae450a6052f76ba4d02f977ffd8f2",
72+
"react-native-calendar-events": "github:jitsi/react-native-calendar-events#928a80e2ffef0d7e84936d7e7e0acc4f53ee8470",
7373
"react-native-callstats": "3.61.0",
7474
"react-native-collapsible": "1.5.1",
7575
"react-native-default-preference": "1.4.2",

0 commit comments

Comments
 (0)