self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-12-02 22:49:09 +02:00
Code Issues Releases Activity

Android: Fixes #321: Changed notification library to Firebase to get more reliable notifications

Browse Source
This commit is contained in:
Laurent Cozic
2018-12-16 14:11:45 +01:00
parent f05929cd17
commit 35d3fe03ab
16 changed files with 189 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
ReactNativeClient/lib/services/AlarmServiceDriver.android.js
View File

@@ -1,4 +1,4 @@
const PushNotification = require('react-native-push-notification');
import firebase from 'react-native-firebase';
class AlarmServiceDriver {
@@ -10,25 +10,25 @@ class AlarmServiceDriver {
throw new Error('Available only for non-persistent alarms');
}
firebaseNotificationId_(joplinNotificationId) {
return 'net.cozic.joplin-' + joplinNotificationId;
}
async clearNotification(id) {
PushNotification.cancelLocalNotifications({ id: id + '' });
return firebase.notifications().cancelNotification(this.firebaseNotificationId_(id))
}
async scheduleNotification(notification) {
// Arguments must be set in a certain way and certain format otherwise it cannot be
// cancelled later on. See:
// https://github.com/zo0r/react-native-push-notification/issues/570#issuecomment-337642922
const androidNotification = {
id: notification.id + '',
message: notification.title,
date: notification.date,
userInfo: { id: notification.id + '' },
number: 0,
};
const firebaseNotification = new firebase.notifications.Notification()
firebaseNotification.setNotificationId(this.firebaseNotificationId_(notification.id));
firebaseNotification.setTitle(notification.title)
if ('body' in notification) firebaseNotification.body = notification.body;
firebaseNotification.android.setChannelId('com.google.firebase.messaging.default_notification_channel_id');
firebaseNotification.android.setSmallIcon('ic_stat_access_alarm');
if ('body' in notification) androidNotification.body = notification.body;
PushNotification.localNotificationSchedule(androidNotification);
firebase.notifications().scheduleNotification(firebaseNotification, {
fireDate: notification.date.getTime(),
});
}
}