EVOgeek
/
Vmeda.Online
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MOBILE-3507 push: Support notifications without component

main
Dani Palou 2020-11-11 12:05:38 +01:00
parent ca172baba8
commit e46aab5ed0
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/addon/notifications/providers/push-click-handler.ts
View File

@ -39,6 +39,11 @@ export class AddonNotificationsPushClickHandler implements CorePushNotifications
* @return Whether the notification click is handled by this handler * @return Whether the notification click is handled by this handler
*/ */
handles(notification: any): boolean | Promise<boolean> { handles(notification: any): boolean | Promise<boolean> {
if (!notification.moodlecomponent) {
// The notification doesn't come from Moodle. Handle it.
return true;
}
if (this.utils.isTrueOrOne(notification.notif)) { if (this.utils.isTrueOrOne(notification.notif)) {
// Notification clicked, mark as read. Don't block for this. // Notification clicked, mark as read. Don't block for this.
const notifId = notification.savedmessageid || notification.id; const notifId = notification.savedmessageid || notification.id;
@ -74,7 +79,7 @@ export class AddonNotificationsPushClickHandler implements CorePushNotifications
// Try to handle the appurl. // Try to handle the appurl.
if (notification.customdata && notification.customdata.appurl) { if (notification.customdata && notification.customdata.appurl) {
switch (notification.customdata.appurlopenin) { switch (notification.customdata.appurlopenin) {
case 'inappbrowser': case 'inapp':
this.utils.openInApp(notification.customdata.appurl); this.utils.openInApp(notification.customdata.appurl);
return; return;

4
src/core/courses/providers/enrol-push-click-handler.ts
View File

@ -37,8 +37,8 @@ export class CoreCoursesEnrolPushClickHandler implements CorePushNotificationsCl
* @return Whether the notification click is handled by this handler * @return Whether the notification click is handled by this handler
*/ */
handles(notification: any): boolean | Promise<boolean> { handles(notification: any): boolean | Promise<boolean> {
return this.utils.isTrueOrOne(notification.notif) && notification.moodlecomponent.indexOf('enrol_') === 0 && return this.utils.isTrueOrOne(notification.notif) && notification.moodlecomponent &&
notification.name == 'expiry_notification'; notification.moodlecomponent.indexOf('enrol_') === 0 && notification.name == 'expiry_notification';
} }
/** /**