Skip to content

MOBILE-1494 push: Use new push notifications plugin #464

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 4, 2016
Merged

MOBILE-1494 push: Use new push notifications plugin #464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"devDependencies": {
"ionic": "driftyco/ionic-bower#v1.1.1",
"ydn.db": ">=1.0.3",
"ngCordova": ">=0.1.12-alpha",
"ngCordova": ">=0.1.24-alpha",
"angular-mocks": "1.4.3",
"angular-md5": "0.1.8",
"angular-translate": ">=2.7.0",
Expand Down
15 changes: 9 additions & 6 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,6 @@
"cordova-plugin-splashscreen",
"cordova-plugin-statusbar",
"cordova-plugin-whitelist",
{
"locator": "https://github.com/phonegap-build/PushPlugin",
"id": "com.phonegap.plugins.pushplugin"
},
{
"locator": "https://github.com/Tunts/WebIntent",
"id": "net.tunts.webintent"
Expand All @@ -62,10 +58,17 @@
"id": "ch.ti8m.documenthandler"
},
"cordova-plugin-local-notifications-mm",
"cordova-plugin-zip"
"cordova-plugin-zip",
{
"variables": {
"SENDER_ID": "694767596569"
},
"locator": "phonegap-plugin-push",
"id": "phonegap-plugin-push"
}
],
"cordovaPlatforms": [
"android",
"ios"
]
}
}
8 changes: 2 additions & 6 deletions www/addons/pushnotifications/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,8 @@ angular.module('mm.addons.pushnotifications', [])
});

// Notification received.
$rootScope.$on('$cordovaPush:notificationReceived', function(e, notification) {
if (ionic.Platform.isAndroid()) {
$mmaPushNotifications.onGCMReceived(notification);
} else if (ionic.Platform.isIOS()) {
$mmaPushNotifications.onMessageReceived(notification);
}
$rootScope.$on('$cordovaPushV5:notificationReceived', function(e, notification) {
$mmaPushNotifications.onMessageReceived(notification);
});

// Register device on Moodle site when login.
Expand Down
166 changes: 59 additions & 107 deletions www/addons/pushnotifications/services/pushnotifications.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ angular.module('mm.addons.pushnotifications')
* @ngdoc service
* @name $mmaPushNotifications
*/
.factory('$mmaPushNotifications', function($mmSite, $log, $cordovaPush, $mmText, $q, $cordovaDevice, $mmUtil, mmCoreConfigConstants,
.factory('$mmaPushNotifications', function($mmSite, $log, $cordovaPushV5, $mmText, $q, $cordovaDevice, $mmUtil, mmCoreConfigConstants,
$mmApp, $mmLocalNotifications, $mmPushNotificationsDelegate, $mmSitesManager, mmaPushNotificationsComponent) {
$log = $log.getInstance('$mmaPushNotifications');

Expand All @@ -48,50 +48,14 @@ angular.module('mm.addons.pushnotifications')
* @module mm.addons.pushnotifications
* @ngdoc method
* @name $mmaPushNotifications#notificationClicked
* @param {Object} data Notification data.
* @param {Object} notification Notification.
*/
self.notificationClicked = function(data) {
self.notificationClicked = function(notification) {
$mmApp.ready().then(function() {
$mmPushNotificationsDelegate.clicked(data);
$mmPushNotificationsDelegate.clicked(notification);
});
};

/**
* This function is called from the PushPlugin when we receive a Notification from GCM.
* The app can be in foreground or background,
* if we are in background this code is executed when we open the app clicking in the notification bar.
*
* @module mm.addons.pushnotifications
* @ngdoc method
* @name $mmaPushNotifications#onGCMReceived
* @param {Object} notification Notification data.
*/
self.onGCMReceived = function(notification) {
$log.debug('GCM notification received. Type: '+notification.event);

switch (notification.event) {
case 'registered':
if (notification.regid.length > 0) {
pushID = notification.regid;
return self.registerDeviceOnMoodle();
} else {
$log.debug('Device NOT registered in GCM, invalid regid');
break;
}

case 'message':
notification.payload.foreground = notification.foreground;
return self.onMessageReceived(notification.payload);

case 'error':
$log.debug('Push messages error');
break;

default:
$log.debug('Push unknown message');
}
};

/**
* This function is called when we receive a Notification from APNS or a message notification from GCM.
* The app can be in foreground or background,
Expand All @@ -100,12 +64,13 @@ angular.module('mm.addons.pushnotifications')
* @module mm.addons.pushnotifications
* @ngdoc method
* @name $mmaPushNotifications#onMessageReceived
* @param {Object} data Notification data.
* @param {Object} notification Notification received.
*/
self.onMessageReceived = function(data) {
var promise;
self.onMessageReceived = function(notification) {
var promise,
data = notification ? notification.additionalData : {};

if (data && data.site) {
if (data.site) {
promise = $mmSitesManager.getSite(data.site); // Check if site exists.
} else {
promise = $q.when(); // No site specified, resolve.
Expand All @@ -115,25 +80,39 @@ angular.module('mm.addons.pushnotifications')
if ($mmUtil.isTrueOrOne(data.foreground)) {
// If the app is in foreground when the notification is received, it's not shown. Let's show it ourselves.
if ($mmLocalNotifications.isAvailable()) {
var localNotif = {
id: 1,
at: new Date(),
smallIcon: 'res://icon',
data: {
notif: data.notif,
site: data.site
}
},
promises = [];

// Apply formatText to title and message.
$mmText.formatText(data.title, true, true).then(function(formattedTitle) {
$mmText.formatText(data.message, true, true).then(function(formattedMessage) {
var localNotif = {
id: 1,
title: formattedTitle,
message: formattedMessage,
at: new Date(),
smallIcon: 'res://icon',
data: {
notif: data.notif,
site: data.site
}
};
$mmLocalNotifications.schedule(localNotif, mmaPushNotificationsComponent, data.site);
});
promises.push($mmText.formatText(notification.title, true, true).then(function(formattedTitle) {
localNotif.title = formattedTitle;
}).catch(function() {
localNotif.title = notification.title;
}));

promises.push($mmText.formatText(notification.message, true, true).then(function(formattedMessage) {
localNotif.message = formattedMessage;
}).catch(function() {
localNotif.message = notification.message;
}));

$q.all(promises).then(function() {
$mmLocalNotifications.schedule(localNotif, mmaPushNotificationsComponent, data.site);
});
}
} else {
// The notification was clicked. For compatibility with old push plugin implementation
// we'll merge all the notification data in a single object.
data.title = notification.title;
data.message = notification.message;
self.notificationClicked(data);
}
});
Expand All @@ -149,59 +128,32 @@ angular.module('mm.addons.pushnotifications')
*/
self.registerDevice = function() {
try {
if (ionic.Platform.isIOS()) {
return self._registerDeviceAPNS();
} else if (ionic.Platform.isAndroid()) {
return self._registerDeviceGCM();
}
var options = {
android: {
senderID: mmCoreConfigConstants.gcmpn
},
ios: {
alert: true,
badge: true,
sound: true
}
};
return $cordovaPushV5.initialize(options).then(function() {
// Start listening for notifications and errors.
$cordovaPushV5.onNotification();
$cordovaPushV5.onError();

// Register the device in GCM or APNS.
return $cordovaPushV5.register().then(function(token) {
pushID = token;
return self.registerDeviceOnMoodle();
});
});
} catch(ex) {}

return $q.reject();
};

/**
* Register a device in Apple APNS (Apple Push Notificaiton System) using the Phonegap PushPlugin.
* It also registers the device in the Moodle site using the core_user_add_user_device WebService.
* We need the device registered in Moodle so we can connect the device with the message output Moode plugin airnotifier.
*
* @module mm.addons.pushnotifications
* @ngdoc method
* @name $mmaPushNotifications#_registerDeviceAPNS
* @return {Promise} Promise resolved when the device is registered.
* @protected
*/
self._registerDeviceAPNS = function() {
var options = {
alert: 'true',
badge: 'true',
sound: 'true'
};
return $cordovaPush.register(options).then(function(token) {
pushID = token;
return self.registerDeviceOnMoodle();
}, function(error) {
return $q.reject();
});
};

/**
* Register a device in Google GCM using the Phonegap PushPlugin.
*
* @module mm.addons.pushnotifications
* @ngdoc method
* @name $mmaPushNotifications#_registerDeviceGCM
* @return {Promise} Promise resolved when the device is registered.
* @protected
*/
self._registerDeviceGCM = function() {
if (mmCoreConfigConstants.gcmpn) {
return $cordovaPush.register({
senderID: mmCoreConfigConstants.gcmpn
});
}
return $q.reject();
};

/**
* Registers a device on current Moodle site.
*
Expand Down