Merge pull request #1507 from albertgasset/MOBILE-2567

Mobile 2567
main
Juan Leyva 2018-09-10 12:38:06 +02:00 committed by GitHub
commit fff448f763
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 6 deletions

View File

@ -114,7 +114,7 @@
<plugin name="cordova-plugin-splashscreen" spec="^5.0.2" />
<plugin name="cordova-clipboard" spec="^1.2.1" />
<plugin name="nl.kingsquare.cordova.background-audio" spec="^1.0.1" />
<plugin name="phonegap-plugin-push" spec="1.11.1">
<plugin name="phonegap-plugin-push" spec="https://github.com/moodlemobile/phonegap-plugin-push.git#moodle">
<variable name="SENDER_ID" value="694767596569" />
</plugin>
<plugin name="cordova-plugin-customurlscheme" spec="^4.3.0">

View File

@ -102,7 +102,7 @@ export class AddonMessagesModule {
return;
}
messagesProvider.invalidateDiscussionsCache().finally(() => {
messagesProvider.invalidateDiscussionsCache(notification.site).finally(() => {
linkHelper.goInSite(undefined, 'AddonMessagesIndexPage', undefined, notification.site);
});
});

View File

@ -344,9 +344,11 @@ export class AddonPushNotificationsProvider {
// Execute the callback in the Angular zone, so change detection doesn't stop working.
this.zone.run(() => {
this.pushID = data.registrationId;
this.registerDeviceOnMoodle().catch((error) => {
this.logger.warn('Can\'t register device', error);
});
if (this.sitesProvider.isLoggedIn()) {
this.registerDeviceOnMoodle().catch((error) => {
this.logger.warn('Can\'t register device', error);
});
}
});
});

View File

@ -70,7 +70,7 @@ export class AddonPushNotificationsModule {
// Listen for local notification clicks (generated by the app).
localNotificationsProvider.registerClick(AddonPushNotificationsProvider.COMPONENT,
pushNotificationsProvider.notificationClicked);
pushNotificationsProvider.notificationClicked.bind(pushNotificationsProvider));
// Allow migrating the table from the old app to the new schema.
updateManager.registerAppTableMigration({