From 5798df62bfa3d3450dcf1bac460440b9a8141b9a Mon Sep 17 00:00:00 2001
From: Pierre <pierre@hubert.fr>
Date: Wed, 11 Apr 2018 08:30:15 +0200
Subject: [PATCH] Fix notifications issue.

---
 .../data/services/NotificationsService.java   | 36 ++++++++++++++-----
 1 file changed, 28 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/org/communiquons/android/comunic/client/data/services/NotificationsService.java b/app/src/main/java/org/communiquons/android/comunic/client/data/services/NotificationsService.java
index 42de071..b814fa6 100644
--- a/app/src/main/java/org/communiquons/android/comunic/client/data/services/NotificationsService.java
+++ b/app/src/main/java/org/communiquons/android/comunic/client/data/services/NotificationsService.java
@@ -30,6 +30,16 @@ public class NotificationsService extends IntentService {
      */
     private static final String TAG = "NotificationsService";
 
+    /**
+     * Notification channel ID
+     */
+    private final String CHANNEL_ID = "MainNotifChannel";
+
+    /**
+     * Main notification ID
+     */
+    private final static int MAIN_NOTIFICATION_ID = 0;
+
     /**
      * Keep run status
      */
@@ -40,15 +50,12 @@ public class NotificationsService extends IntentService {
      */
     private NotificationsHelper mNotifHelper;
 
-    /**
-     * Notification channel ID
-     */
-    private final String CHANNEL_ID = "MainNotifChannel";
 
     /**
-     * Main notification ID
+     * Last notification count
      */
-    private final static int MAIN_NOTIFICATION_ID = 0;
+    private NotificationsCount mLastCount;
+
 
     /**
      * Public constructor
@@ -105,8 +112,18 @@ public class NotificationsService extends IntentService {
 
             if(count.getNotificationsCount() > 0 || count.getConversationsCount() > 0){
 
-                //Show notification
-                showNotification(count);
+                //Check notification count
+                if(mLastCount != null){
+
+                    //Check if it is required to push a new notification
+                    if(mLastCount.getNotificationsCount() != count.getNotificationsCount()
+                            || mLastCount.getConversationsCount() != count.getConversationsCount())
+
+                        showNotification(count);
+                }
+                else
+                    //Show notification
+                    showNotification(count);
             }
 
             else {
@@ -116,6 +133,9 @@ public class NotificationsService extends IntentService {
 
             }
 
+            //Save last notifications count
+            mLastCount = count;
+
         }
 
         Log.v(TAG, "Stop service");