real fix in the push notifications (#542)

Author: danieltigse

build.gradle

@@ -47,8 +47,8 @@ android {
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode 84
-        versionName "0.21.7"
+        versionCode 85
+        versionName "0.21.8"
         applicationId "com.criptext.mail"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true

src/main/kotlin/com/criptext/mail/push/data/PushAPIRequestHandler.kt

@@ -204,10 +204,10 @@ class PushAPIRequestHandler(private val not: CriptextNotification,
     private fun handleNotificationCount(notificationId: Int, key: KeyValueStorage.StringKey, id: Int){
         val notCount = storage.getInt(key, 0)
         manager.cancel(notificationId)
-        if((notCount - 1) == 0) {
+        if((notCount - 1) <= 0) {
             manager.cancel(id)
         }
-        storage.putInt(key, notCount - 1)
+        storage.putInt(key, if(notCount <= 0) 0 else notCount - 1)
     }
 
     private fun postNotification(cn: CriptextNotification,

src/main/kotlin/com/criptext/mail/push/services/NewMailActionService.kt

@@ -50,11 +50,11 @@ class NewMailActionService : IntentService("New Mail Action Service") {
             }
             DELETE -> {
                 val notCount = storage.getInt(KeyValueStorage.StringKey.NewMailNotificationCount, 0)
-                if((notCount - 1) == 0) {
+                if((notCount - 1) <= 0) {
                     manager.cancel(CriptextNotification.INBOX_ID)
                 }
-                val newNotCount = if(notCount == 0) notCount else notCount - 1
-                storage.putInt(KeyValueStorage.StringKey.NewMailNotificationCount, newNotCount)
+                storage.putInt(KeyValueStorage.StringKey.NewMailNotificationCount,
+                        if(notCount <= 0) 0 else notCount - 1)
             }
             else -> throw IllegalArgumentException("Unsupported action: " + data.action)
         }

src/main/kotlin/com/criptext/mail/services/MessagingService.kt

@@ -58,10 +58,10 @@ class MessagingService : FirebaseMessagingService(){
                 .getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
         val notCount = storage.getInt(key, 0)
         manager.cancel(notificationId)
-        if((notCount - 1) == 0) {
+        if((notCount - 1) <= 0) {
             manager.cancel(headerId)
         }
-        storage.putInt(key, notCount - 1)
+        storage.putInt(key, if(notCount <= 0) 0 else notCount - 1)
     }
 
     companion object {