MOBILE-2103 notifications: Fix update counter

Author: crazyserver

www/addons/messages/services/handlers.js

@@ -371,7 +371,8 @@ angular.module('mm.addons.messages')
                     }
 
                     function updateUnreadConversationsCount(siteId) {
-                        return $mmaMessages.getUnreadConversationsCount().then(function(unread) {
+                        siteId = siteId || $mmSite.getId();
+                        return $mmaMessages.getUnreadConversationsCount(undefined, siteId).then(function(unread) {
                             // Leave badge enter if there is a 0+ or a 0.
                             $scope.badge = parseInt(unread, 10) > 0 ? unread : '';
                             // Update badge.

www/addons/notifications/services/handlers.js

@@ -23,7 +23,7 @@ angular.module('mm.addons.notifications')
  * @ngdoc service
  * @name $mmaNotificationsHandlers
  */
-.factory('$mmaNotificationsHandlers', function($log, $mmaNotifications, $mmEvents, $mmSitesManager, $mmUtil,
+.factory('$mmaNotificationsHandlers', function($log, $mmaNotifications, $mmEvents, $mmSitesManager, $mmUtil, $mmSite,
         mmaNotificationsReadChangedEvent, mmaNotificationsReadCronEvent, $mmAddonManager) {
     $log = $log.getInstance('$mmaNotificationsHandlers');
 
@@ -106,7 +106,8 @@ angular.module('mm.addons.notifications')
                     }
 
                     function updateUnreadNotificationsCount(siteId) {
-                        return $mmaNotifications.getUnreadNotificationsCount().then(function(unread) {
+                        siteId = siteId || $mmSite.getId();
+                        return $mmaNotifications.getUnreadNotificationsCount(undefined, siteId).then(function(unread) {
                             // Leave badge enter if there is a 0+ or a 0.
                             $scope.badge = parseInt(unread, 10) > 0 ? unread : '';
                             // Update badge.

www/addons/pushnotifications/services/pushnotifications.js

@@ -260,10 +260,10 @@ angular.module('mm.addons.pushnotifications')
      * @module mm.addons.pushnotifications
      * @ngdoc method
      * @name $mmaPushNotifications#updateAddonCounter
-     * @param  {String} siteId Site ID.
-     * @param  {String} addon  Registered addon name to set the badge number.
-     * @param  {Number} number The number to be stored.
-     * @return {Promise}       Promise resolved with the stored badge counter for the addon on the site.
+     * @param  {String} [siteId] Site ID. If not defined, use current site.
+     * @param  {String} addon    Registered addon name to set the badge number.
+     * @param  {Number} number   The number to be stored.
+     * @return {Promise}         Promise resolved with the stored badge counter for the addon on the site.
      */
     self.updateAddonCounter = function(siteId, addon, number) {
         if ($mmPushNotificationsDelegate.isCounterHandlerRegistered(addon)) {
@@ -403,12 +403,14 @@ angular.module('mm.addons.pushnotifications')
     /**
      * Save the addon/site badgecounter on the database.
      *
-     * @param  {String} siteId   Site ID.
+     * @param  {String} [siteId] Site ID. If not defined, use current site.
      * @param  {Number} number   The number to be stored.
      * @param  {String} [addon]  Registered addon name. If not defined it will store the site total.
      * @return {Promise}         Promise resolved with the stored badge counter for the addon or site.
      */
     function saveAddonBadge(siteId, number, addon) {
+        siteId = siteId || $mmSite.getId();
+
         var entry = {
             siteid: siteId,
             addon: addon || 'site',