chore: on android use notification to display file upload progress instead of toast (#2628) [skip e2e]
This commit is contained in:
@@ -50,6 +50,7 @@ import { Database } from './Database/Database'
|
||||
import { isLegacyIdentifier } from './Database/LegacyIdentifier'
|
||||
import { LegacyKeyValueStore } from './Database/LegacyKeyValueStore'
|
||||
import Keychain from './Keychain'
|
||||
import notifee, { AuthorizationStatus, Notification } from '@notifee/react-native'
|
||||
|
||||
export type BiometricsType = 'Fingerprint' | 'Face ID' | 'Biometrics' | 'Touch ID'
|
||||
|
||||
@@ -75,7 +76,40 @@ export class MobileDevice implements MobileDeviceInterface {
|
||||
private stateObserverService?: AppStateObserverService,
|
||||
private androidBackHandlerService?: AndroidBackHandlerService,
|
||||
private colorSchemeService?: ColorSchemeObserverService,
|
||||
) {}
|
||||
) {
|
||||
this.initializeNotifications().catch(console.error)
|
||||
}
|
||||
|
||||
async initializeNotifications() {
|
||||
if (Platform.OS !== 'android') {
|
||||
return
|
||||
}
|
||||
|
||||
await notifee.createChannel({
|
||||
id: 'files',
|
||||
name: 'File Upload/Download',
|
||||
})
|
||||
}
|
||||
|
||||
async canDisplayNotifications(): Promise<boolean> {
|
||||
const settings = await notifee.requestPermission()
|
||||
|
||||
return settings.authorizationStatus >= AuthorizationStatus.AUTHORIZED
|
||||
}
|
||||
|
||||
async displayNotification(options: Notification): Promise<string> {
|
||||
return await notifee.displayNotification({
|
||||
...options,
|
||||
android: {
|
||||
...options.android,
|
||||
channelId: 'files',
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
async cancelNotification(notificationId: string): Promise<void> {
|
||||
await notifee.cancelNotification(notificationId)
|
||||
}
|
||||
|
||||
async removeRawStorageValuesForIdentifier(identifier: string): Promise<void> {
|
||||
await this.removeRawStorageValue(namespacedKey(identifier, RawStorageKey.SnjsVersion))
|
||||
|
||||
@@ -14,6 +14,7 @@ import { MobileDevice, MobileDeviceEvent } from './Lib/MobileDevice'
|
||||
import { IsDev } from './Lib/Utils'
|
||||
import { ReceivedSharedItemsHandler } from './ReceivedSharedItemsHandler'
|
||||
import { ReviewService } from './ReviewService'
|
||||
import notifee, { EventType } from '@notifee/react-native'
|
||||
|
||||
const LoggingEnabled = IsDev
|
||||
|
||||
@@ -117,6 +118,34 @@ const MobileWebAppContents = ({ destroyAndReload }: { destroyAndReload: () => vo
|
||||
}
|
||||
}, [webViewRef, stateService, device, androidBackHandlerService, colorSchemeService])
|
||||
|
||||
useEffect(() => {
|
||||
return notifee.onForegroundEvent(({ type, detail }) => {
|
||||
if (type !== EventType.ACTION_PRESS) {
|
||||
return
|
||||
}
|
||||
|
||||
const { notification, pressAction } = detail
|
||||
|
||||
if (!notification || !pressAction) {
|
||||
return
|
||||
}
|
||||
|
||||
if (pressAction.id !== 'open-file') {
|
||||
return
|
||||
}
|
||||
|
||||
webViewRef.current?.postMessage(
|
||||
JSON.stringify({
|
||||
reactNativeEvent: ReactNativeToWebEvent.OpenFilePreview,
|
||||
messageType: 'event',
|
||||
messageData: {
|
||||
id: notification.id,
|
||||
},
|
||||
}),
|
||||
)
|
||||
})
|
||||
}, [])
|
||||
|
||||
useEffect(() => {
|
||||
const observer = device.addMobileDeviceEventReceiver((event) => {
|
||||
if (event === MobileDeviceEvent.RequestsWebViewReload) {
|
||||
|
||||
Reference in New Issue
Block a user