Skip to content

Commit deca53b

Browse files
committed
Revert "Merge pull request #1021 from mendix/moo-1800/update-dependencies"
This reverts commit e26943f, reversing changes made to f3a6f1e.
1 parent 8d306ef commit deca53b

5 files changed

Lines changed: 57 additions & 41 deletions

File tree

android/app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
2323
<!-- Required for scheduling local notifications -->
2424
<uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
25-
<uses-permission android:name="android.permission.USE_EXACT_ALARM" />
25+
2626
<!-- If this app uses ads, remove 'tools:node="remove"' to enable ad ID access. -->
2727
<uses-permission android:name="com.google.android.gms.permission.AD_ID" tools:node="remove"/>
2828

ios/Podfile.lock

Lines changed: 20 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@ PODS:
99
- hermes-engine/Pre-built (= 0.77.1)
1010
- hermes-engine/Pre-built (0.77.1)
1111
- IQKeyboardManager (6.5.19)
12-
- libwebp (1.3.2):
13-
- libwebp/demux (= 1.3.2)
14-
- libwebp/mux (= 1.3.2)
15-
- libwebp/sharpyuv (= 1.3.2)
16-
- libwebp/webp (= 1.3.2)
17-
- libwebp/demux (1.3.2):
12+
- libwebp (1.5.0):
13+
- libwebp/demux (= 1.5.0)
14+
- libwebp/mux (= 1.5.0)
15+
- libwebp/sharpyuv (= 1.5.0)
16+
- libwebp/webp (= 1.5.0)
17+
- libwebp/demux (1.5.0):
1818
- libwebp/webp
19-
- libwebp/mux (1.3.2):
19+
- libwebp/mux (1.5.0):
2020
- libwebp/demux
21-
- libwebp/sharpyuv (1.3.2)
22-
- libwebp/webp (1.3.2):
21+
- libwebp/sharpyuv (1.5.0)
22+
- libwebp/webp (1.5.0):
2323
- libwebp/sharpyuv
2424
- op-sqlite (12.0.2):
2525
- OpenSSL-Universal
@@ -1636,9 +1636,11 @@ PODS:
16361636
- React-Core
16371637
- RNCPicker (2.11.0):
16381638
- React-Core
1639+
- RNCPushNotificationIOS (1.10.1):
1640+
- React-Core
16391641
- RNDateTimePicker (8.2.0):
16401642
- React-Core
1641-
- RNDeviceInfo (14.0.4):
1643+
- RNDeviceInfo (13.0.0):
16421644
- React-Core
16431645
- RNFastImage (8.6.3):
16441646
- React-Core
@@ -1667,11 +1669,6 @@ PODS:
16671669
- Yoga
16681670
- RNLocalize (3.2.1):
16691671
- React-Core
1670-
- RNNotifee (9.1.8):
1671-
- React-Core
1672-
- RNNotifee/NotifeeCore (= 9.1.8)
1673-
- RNNotifee/NotifeeCore (9.1.8):
1674-
- React-Core
16751672
- RNPermissions (4.1.5):
16761673
- React-Core
16771674
- RNReanimated (3.16.1):
@@ -1898,12 +1895,12 @@ DEPENDENCIES:
18981895
- "RNCAsyncStorage (from `../node_modules/@react-native-async-storage/async-storage`)"
18991896
- "RNCMaskedView (from `../node_modules/@react-native-masked-view/masked-view`)"
19001897
- "RNCPicker (from `../node_modules/@react-native-picker/picker`)"
1898+
- "RNCPushNotificationIOS (from `../node_modules/@react-native-community/push-notification-ios`)"
19011899
- "RNDateTimePicker (from `../node_modules/@react-native-community/datetimepicker`)"
19021900
- RNDeviceInfo (from `../node_modules/react-native-device-info`)
19031901
- RNFastImage (from `../node_modules/react-native-fast-image`)
19041902
- RNGestureHandler (from `../node_modules/react-native-gesture-handler`)
19051903
- RNLocalize (from `../node_modules/react-native-localize`)
1906-
- "RNNotifee (from `../node_modules/@notifee/react-native`)"
19071904
- RNPermissions (from `../node_modules/react-native-permissions`)
19081905
- RNReanimated (from `../node_modules/react-native-reanimated`)
19091906
- RNScreens (from `../node_modules/react-native-screens`)
@@ -2077,6 +2074,8 @@ EXTERNAL SOURCES:
20772074
:path: "../node_modules/@react-native-masked-view/masked-view"
20782075
RNCPicker:
20792076
:path: "../node_modules/@react-native-picker/picker"
2077+
RNCPushNotificationIOS:
2078+
:path: "../node_modules/@react-native-community/push-notification-ios"
20802079
RNDateTimePicker:
20812080
:path: "../node_modules/@react-native-community/datetimepicker"
20822081
RNDeviceInfo:
@@ -2087,8 +2086,6 @@ EXTERNAL SOURCES:
20872086
:path: "../node_modules/react-native-gesture-handler"
20882087
RNLocalize:
20892088
:path: "../node_modules/react-native-localize"
2090-
RNNotifee:
2091-
:path: "../node_modules/@notifee/react-native"
20922089
RNPermissions:
20932090
:path: "../node_modules/react-native-permissions"
20942091
RNReanimated:
@@ -2113,8 +2110,8 @@ SPEC CHECKSUMS:
21132110
glog: eb93e2f488219332457c3c4eafd2738ddc7e80b8
21142111
hermes-engine: ccc24d29d650ea725d582a9a53d57cd417fbdb53
21152112
IQKeyboardManager: c8665b3396bd0b79402b4c573eac345a31c7d485
2116-
libwebp: 1786c9f4ff8a279e4dac1e8f385004d5fc253009
2117-
op-sqlite: 7c3a6a7f84f0969b96266dbd143a3793bc2bc9cf
2113+
libwebp: 02b23773aedb6ff1fd38cec7a77b81414c6842a8
2114+
op-sqlite: 137cd6d3df9b86e147fb7e2f70c8d6f97bd0941b
21182115
OpenSSL-Universal: 6082b0bf950e5636fe0d78def171184e2b3899c2
21192116
RCT-Folly: 36fe2295e44b10d831836cc0d1daec5f8abcf809
21202117
RCTDeprecation: 664055db806cce35c3c1b43c84414dd66e117ae6
@@ -2184,12 +2181,12 @@ SPEC CHECKSUMS:
21842181
RNCAsyncStorage: d35c79ffba52c1013013e16b1fc295aec2feabb6
21852182
RNCMaskedView: 090213d32d8b3bb83a4dcb7d12c18f0152591906
21862183
RNCPicker: 4f6d5e8d107064be32dfc8f1bcb5a3741135db0b
2184+
RNCPushNotificationIOS: 87b8d16d3ede4532745e05b03c42cff33a36cc45
21872185
RNDateTimePicker: 40ffda97d071a98a10fdca4fa97e3977102ccd14
2188-
RNDeviceInfo: feea80a690d2bde1fe51461cf548039258bd03f2
2186+
RNDeviceInfo: 55264dd7cc939dad6e9c231a7621311f5277f1dc
21892187
RNFastImage: 5c9c9fed9c076e521b3f509fe79e790418a544e8
21902188
RNGestureHandler: de78ee811b577ae76d679715e5e9298b23a8c278
21912189
RNLocalize: 4f22418187ecd5ca693231093ff1d912d1b3c9bc
2192-
RNNotifee: 4a6ee5c7deaf00e005050052d73ee6315dff7ec9
21932190
RNPermissions: 4da8c626e4ac9d71c1a199d500d52dd54da62e38
21942191
RNReanimated: 280140e1989bc33d5586cbca10bd199fd1fbdbf1
21952192
RNScreens: e9bb7c3063237983e75d01bb45ce591cc4e7afc2
@@ -2200,7 +2197,7 @@ SPEC CHECKSUMS:
22002197
SDWebImageWebPCoder: 908b83b6adda48effe7667cd2b7f78c897e5111d
22012198
SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
22022199
SSZipArchive: 8a6ee5677c8e304bebc109e39cf0da91ccef22ea
2203-
Yoga: 2957d0e744897870b5a377f26522e3f08cadd7ac
2200+
Yoga: 1fd059161b449018342943b095a6d4e69bcaa719
22042201

22052202
PODFILE CHECKSUM: 0721d8defdcee9bbb168ccd39c73b4972842a2af
22062203

package-lock.json

Lines changed: 17 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
"@react-native-community/datetimepicker": "8.2.0",
1616
"@react-native-masked-view/masked-view": "0.3.1",
1717
"@react-native-community/netinfo": "11.4.1",
18+
"@react-native-community/push-notification-ios": "1.10.1",
1819
"@react-native-picker/picker": "2.11.0",
1920
"@react-navigation/native": "6.1.18",
2021
"@gorhom/bottom-sheet": "^5.1.1",
21-
"@notifee/react-native": "9.1.8",
2222
"react-native": "0.77.1",
2323
"@react-native-community/cli": "16.0.2",
2424
"@react-native-community/cli-platform-android": "16.0.2",
2525
"@react-native-community/cli-platform-ios": "16.0.2",
26-
"react-native-device-info": "14.0.4",
26+
"react-native-device-info": "13.0.0",
2727
"react-native-fast-image": "8.6.3",
2828
"react-native-gesture-handler": "2.23.1",
2929
"react-native-image-picker": "7.2.3",
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
diff --git a/node_modules/react-native-push-notification/android/src/main/java/com/dieam/reactnativepushnotification/modules/RNPushNotificationHelper.java b/node_modules/react-native-push-notification/android/src/main/java/com/dieam/reactnativepushnotification/modules/RNPushNotificationHelper.java
2+
index 248ff08..0ab1b34 100644
3+
--- a/node_modules/react-native-push-notification/android/src/main/java/com/dieam/reactnativepushnotification/modules/RNPushNotificationHelper.java
4+
+++ b/node_modules/react-native-push-notification/android/src/main/java/com/dieam/reactnativepushnotification/modules/RNPushNotificationHelper.java
5+
@@ -171,6 +171,12 @@ public class RNPushNotificationHelper {
6+
return;
7+
}
8+
9+
+ // call canScheduleExactAlarms to confirm the user has allowed alarms to be set. otherwise,
10+
+ // attempting to set an alarm below will crash the app!
11+
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S && !getAlarmManager().canScheduleExactAlarms()) {
12+
+ return;
13+
+ }
14+
+
15+
Log.d(LOG_TAG, String.format("Setting a notification with id %s at time %s",
16+
bundle.getString("id"), Long.toString(fireDate)));
17+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {

0 commit comments

Comments
 (0)