diff options
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/hooks/useNotificationHandler.ts | 12 | ||||
-rw-r--r-- | src/lib/hooks/usePermissions.ts | 4 |
2 files changed, 13 insertions, 3 deletions
diff --git a/src/lib/hooks/useNotificationHandler.ts b/src/lib/hooks/useNotificationHandler.ts index 625ec9e6a..69ae536d0 100644 --- a/src/lib/hooks/useNotificationHandler.ts +++ b/src/lib/hooks/useNotificationHandler.ts @@ -177,7 +177,14 @@ export function useNotificationsHandler() { Notifications.setNotificationHandler({ handleNotification: async e => { - if (e.request.trigger.type !== 'push') return DEFAULT_HANDLER_OPTIONS + if ( + e.request.trigger == null || + typeof e.request.trigger !== 'object' || + !('type' in e.request.trigger) || + e.request.trigger.type !== 'push' + ) { + return DEFAULT_HANDLER_OPTIONS + } logger.debug( 'Notifications: received', @@ -220,6 +227,9 @@ export function useNotificationsHandler() { if ( e.actionIdentifier === Notifications.DEFAULT_ACTION_IDENTIFIER && + e.notification.request.trigger != null && + typeof e.notification.request.trigger === 'object' && + 'type' in e.notification.request.trigger && e.notification.request.trigger.type === 'push' ) { logger.debug( diff --git a/src/lib/hooks/usePermissions.ts b/src/lib/hooks/usePermissions.ts index 6da14232f..af4358c78 100644 --- a/src/lib/hooks/usePermissions.ts +++ b/src/lib/hooks/usePermissions.ts @@ -1,5 +1,5 @@ import {Linking} from 'react-native' -import {Camera} from 'expo-camera/legacy' // TODO: Migrate to the new one. +import {useCameraPermissions as useExpoCameraPermissions} from 'expo-camera' import * as MediaLibrary from 'expo-media-library' import {isWeb} from '#/platform/detection' @@ -78,7 +78,7 @@ export function useVideoLibraryPermission() { } export function useCameraPermission() { - const [res, requestPermission] = Camera.useCameraPermissions() + const [res, requestPermission] = useExpoCameraPermissions() const requestCameraAccessIfNeeded = async () => { if (res?.granted) { |