mirror of
https://github.com/laurent22/joplin.git
synced 2024-12-30 10:36:35 +02:00
cb3e1cf1e9
commit2fb6cee901
Merge:4e303be85f
db509955f6
Author: Laurent Cozic <laurent@cozic.net> Date: Fri Oct 16 16:24:07 2020 +0100 Merge branch 'dev' into rn_63 commit4e303be85f
Author: Laurent Cozic <laurent@cozic.net> Date: Fri Oct 16 16:14:39 2020 +0100 Clean up commite3a37ec2d6
Author: Laurent Cozic <laurent@cozic.net> Date: Fri Oct 16 15:57:55 2020 +0100 Use different script for pre-commit and manual start commitbd236648fc
Author: Laurent Cozic <laurent@cozic.net> Date: Fri Oct 16 15:56:45 2020 +0100 Removed RN eslint config commite7feda41c9
Author: Laurent Cozic <laurent@cozic.net> Date: Fri Oct 16 15:27:08 2020 +0100 Revert "Disable git hook for now" This reverts commit89263ac742
. commitcfd63fe46f
Author: Laurent Cozic <laurent@cozic.net> Date: Fri Oct 16 13:02:32 2020 +0100 Ask permission to use geo-location commit66059939a3
Author: Laurent Cozic <laurent@cozic.net> Date: Fri Oct 16 12:26:20 2020 +0100 Fixed WebView race condition commit1e0d2b7b86
Author: Laurent Cozic <laurent@cozic.net> Date: Fri Oct 16 11:56:21 2020 +0100 Fixed webview issues commitf537d22d7f
Author: Laurent Cozic <laurent@cozic.net> Date: Fri Oct 16 11:08:29 2020 +0100 Improve resource file watching commiteec32cf70a
Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 18:40:13 2020 +0100 Removed cache package dependency and implemented one more suitable for React Native commitefa346fea4
Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 14:57:21 2020 +0100 iOS: Added fonts to Info.plist although it was working without it commit572b647bc0
Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 14:56:49 2020 +0100 Specify content-type header for OneDrive to prevent network error commitbcedf6c7f0
Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 12:45:01 2020 +0100 iOS: Disable long press menu since it is already built-in commit7359dd61d1
Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 12:37:40 2020 +0100 Removed unused react-native-device-info commit2d63ab36d3
Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 12:35:54 2020 +0100 iOS: Fixed taking a picture commit8e2875a91c
Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 12:11:13 2020 +0100 iOS: Restored camera roll functionality commit75f5edf2ad
Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 11:40:13 2020 +0100 iOS: Fixed build settings commitb220c98419
Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 11:40:03 2020 +0100 iOS: Got images to work with WebKit commitc34b43e841
Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 10:24:52 2020 +0100 iOS: Restore more settings commit32997611e6
Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 10:15:14 2020 +0100 iOS: Added back icons and other properties commitb5811d7f7c
Author: Laurent Cozic <laurent@cozic.net> Date: Wed Oct 14 23:53:14 2020 +0100 Got iOS build to work commitdc6d7c00e0
Author: Laurent Cozic <laurent@cozic.net> Date: Wed Oct 14 18:40:06 2020 +0100 Imported old settings in gradle build commitdff59f5603
Author: Laurent Cozic <laurent@cozic.net> Date: Wed Oct 14 18:20:00 2020 +0100 Restored sharing commit0bdb449e72
Author: Laurent Cozic <laurent@cozic.net> Date: Wed Oct 14 17:25:40 2020 +0100 Updated NoteBodyViewer commit0c0d228815
Author: Laurent Cozic <laurent@cozic.net> Date: Wed Oct 14 16:54:42 2020 +0100 Fixed networking commit6ff45ce485
Author: Laurent Cozic <laurent@cozic.net> Date: Wed Oct 14 13:11:00 2020 +0100 Fixed document picker commitcc889182b6
Author: Laurent Cozic <laurent@cozic.net> Date: Wed Oct 14 12:56:27 2020 +0100 Added back support for alarms commit040261abfa
Author: Laurent Cozic <laurent@cozic.net> Date: Tue Oct 13 22:04:49 2020 +0100 Fixed Clipboard and remove image-picker package commit1077ad8f16
Author: Laurent Cozic <laurent@cozic.net> Date: Tue Oct 13 21:54:52 2020 +0100 Fixed Select Alarm dialog and PoorManIntervals class commit8296676fd5
Author: Laurent Cozic <laurent@cozic.net> Date: Tue Oct 13 21:32:52 2020 +0100 Fixed icons and warnings commit3b0e3f6f43
Author: Laurent Cozic <laurent@cozic.net> Date: Tue Oct 13 17:02:59 2020 +0100 Got app to build again commit89263ac742
Author: Laurent Cozic <laurent@cozic.net> Date: Tue Oct 13 15:41:17 2020 +0100 Disable git hook for now commitd6da162f67
Author: Laurent Cozic <laurent@cozic.net> Date: Tue Oct 13 15:39:12 2020 +0100 Restored back all RN packages commit7f8ce3732c
Author: Laurent Cozic <laurent@cozic.net> Date: Tue Oct 13 15:13:12 2020 +0100 Restored base packages commitea59726eb3
Author: Laurent Cozic <laurent@cozic.net> Date: Tue Oct 13 15:05:17 2020 +0100 Started over from scratch
107 lines
3.5 KiB
TypeScript
107 lines
3.5 KiB
TypeScript
import eventManager from 'lib/eventManager';
|
|
import { Notification } from 'lib/models/Alarm';
|
|
import shim from 'lib/shim';
|
|
|
|
const notifier = require('node-notifier');
|
|
const bridge = require('electron').remote.require('./bridge').default;
|
|
|
|
interface Options {
|
|
appName: string,
|
|
}
|
|
|
|
export default class AlarmServiceDriverNode {
|
|
|
|
private appName_:string;
|
|
private notifications_:any = {};
|
|
private service_:any = null;
|
|
|
|
constructor(options:Options) {
|
|
// Note: appName is required to get the notification to work. It must be the same as the appId defined in package.json
|
|
// https://github.com/mikaelbr/node-notifier/issues/144#issuecomment-319324058
|
|
this.appName_ = options.appName;
|
|
}
|
|
|
|
setService(s:any) {
|
|
this.service_ = s;
|
|
}
|
|
|
|
logger() {
|
|
return this.service_.logger();
|
|
}
|
|
|
|
hasPersistentNotifications() {
|
|
return false;
|
|
}
|
|
|
|
notificationIsSet(id:number) {
|
|
return id in this.notifications_;
|
|
}
|
|
|
|
async clearNotification(id:number) {
|
|
if (!this.notificationIsSet(id)) return;
|
|
shim.clearTimeout(this.notifications_[id].timeoutId);
|
|
delete this.notifications_[id];
|
|
}
|
|
|
|
async scheduleNotification(notification:Notification) {
|
|
const now = Date.now();
|
|
const interval = notification.date.getTime() - now;
|
|
if (interval < 0) return;
|
|
|
|
if (isNaN(interval)) {
|
|
throw new Error(`Trying to create a notification from an invalid object: ${JSON.stringify(notification)}`);
|
|
}
|
|
|
|
this.logger().info(`AlarmServiceDriverNode::scheduleNotification: Notification ${notification.id} with interval: ${interval}ms`);
|
|
|
|
if (this.notifications_[notification.id]) shim.clearTimeout(this.notifications_[notification.id].timeoutId);
|
|
|
|
let timeoutId = null;
|
|
|
|
// Note: setTimeout will break for values larger than Number.MAX_VALUE - in which case the timer
|
|
// will fire immediately. So instead, if the interval is greater than a set max, reschedule after
|
|
// that max interval.
|
|
// https://stackoverflow.com/questions/3468607/why-does-settimeout-break-for-large-millisecond-delay-values/3468699
|
|
|
|
const maxInterval = 60 * 60 * 1000;
|
|
if (interval >= maxInterval) {
|
|
this.logger().info(`AlarmServiceDriverNode::scheduleNotification: Notification interval is greater than ${maxInterval}ms - will reschedule in ${maxInterval}ms`);
|
|
|
|
timeoutId = shim.setTimeout(() => {
|
|
if (!this.notifications_[notification.id]) {
|
|
this.logger().info(`AlarmServiceDriverNode::scheduleNotification: Notification ${notification.id} has been deleted - not rescheduling it`);
|
|
return;
|
|
}
|
|
this.scheduleNotification(this.notifications_[notification.id]);
|
|
}, maxInterval);
|
|
} else {
|
|
timeoutId = shim.setTimeout(() => {
|
|
const o:any = {
|
|
appID: this.appName_,
|
|
title: notification.title,
|
|
icon: `${bridge().electronApp().buildDir()}/icons/512x512.png`,
|
|
};
|
|
if ('body' in notification) o.message = notification.body;
|
|
|
|
// Message is required on Windows 7 however we don't want to repeat the title so
|
|
// make it an empty string.
|
|
// https://github.com/laurent22/joplin/issues/2144
|
|
if (!o.message) o.message = '-';
|
|
|
|
this.logger().info('AlarmServiceDriverNode::scheduleNotification: Triggering notification:', o);
|
|
|
|
notifier.notify(o, (error:any, response:any) => {
|
|
this.logger().info('AlarmServiceDriverNode::scheduleNotification: node-notifier response:', error, response);
|
|
});
|
|
|
|
this.clearNotification(notification.id);
|
|
|
|
eventManager.emit('noteAlarmTrigger', { noteId: notification.noteId });
|
|
}, interval);
|
|
}
|
|
|
|
this.notifications_[notification.id] = Object.assign({}, notification);
|
|
this.notifications_[notification.id].timeoutId = timeoutId;
|
|
}
|
|
}
|