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

Merge pull request #2600 from dpalou/MOBILE-3507 

Mobile 3507
main
Juan Leyva 2020-11-11 12:20:38 +01:00 committed by GitHub
parent 0197e5c446 e46aab5ed0
commit dbe0b86821
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 4 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';
} }
/** /**

5
src/core/pushnotifications/providers/delegate.ts
View File

@ -124,7 +124,10 @@ export class CorePushNotificationsDelegate {
* @return Promise resolved with boolean: whether the handler feature is disabled. * @return Promise resolved with boolean: whether the handler feature is disabled.
*/ */
protected isFeatureDisabled(handler: CorePushNotificationsClickHandler, siteId: string): Promise<boolean> { protected isFeatureDisabled(handler: CorePushNotificationsClickHandler, siteId: string): Promise<boolean> {
if (handler.featureName) { if (!siteId) {
// Notification doesn't belong to a site. Assume all handlers are enabled.
return Promise.resolve(false);
} else if (handler.featureName) {
// Check if the feature is disabled. // Check if the feature is disabled.
return this.sitesProvider.isFeatureDisabled(handler.featureName, siteId); return this.sitesProvider.isFeatureDisabled(handler.featureName, siteId);
} else { } else {