Merge pull request #551 from jorgeblacio/link_cancel

Implemented link and sync cancel, as well as some bug fuxes.

Author: danieltigse

src/main/AndroidManifest.xml

@@ -149,6 +149,7 @@
         </service>
         <service android:name=".push.services.NewMailActionService" />
         <service android:name=".push.services.SyncDeviceActionService" />
+        <service android:name=".push.services.HeaderActionService" />
 
         <meta-data
             android:name="io.fabric.ApiKey"

src/main/kotlin/com/criptext/mail/BaseActivity.kt

@@ -263,6 +263,11 @@ abstract class BaseActivity: PinCompatActivity(), IHostActivity {
             activityMessage = null
     }
 
+    override fun onPause() {
+        super.onPause()
+        controller.onPause()
+    }
+
     override fun onStop() {
         handler.removeCallbacksAndMessages(null)
         mFirebaseAnalytics = null

src/main/kotlin/com/criptext/mail/androidui/CriptextNotification.kt

@@ -12,6 +12,7 @@ import androidx.annotation.RequiresApi
 import androidx.core.app.NotificationCompat
 import com.criptext.mail.R
 import com.criptext.mail.push.PushData
+import com.criptext.mail.push.services.HeaderActionService
 import com.criptext.mail.push.services.NewMailActionService
 
 /**
@@ -56,6 +57,18 @@ abstract class CriptextNotification(open val ctx: Context) {
                 else -> "DEFAULT_CHANNEL"
             }
         }
+
+        fun getNotificationId(action: String): Int {
+            return when(action){
+                ACTION_OPEN -> OPEN_ID
+                ACTION_INBOX -> INBOX_ID
+                ACTION_LINK_DEVICE -> LINK_DEVICE_ID
+                ACTION_SYNC_DEVICE -> LINK_DEVICE_ID
+                ACTION_ERROR -> ERROR_ID
+                ACTION_JOB_BACKUP -> JOB_BACKUP_ID
+                else -> -1
+            }
+        }
     }
 
     abstract fun buildNotification(builder: NotificationCompat.Builder): Notification
@@ -82,12 +95,10 @@ abstract class CriptextNotification(open val ctx: Context) {
                 .setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_CHILDREN)
                 .setGroup(group)
 
-        if(channelId == CHANNEL_ID_NEW_EMAIL) {
-            val deleteAction = Intent(ctx, NewMailActionService::class.java)
-            deleteAction.action = NewMailActionService.DELETE
-            val deletePendingIntent = PendingIntent.getService(ctx, INBOX_ID, deleteAction,0)
-            builder.setDeleteIntent(deletePendingIntent)
-        }
+        val deleteAction = Intent(ctx, HeaderActionService::class.java)
+        deleteAction.action = group
+        val deletePendingIntent = PendingIntent.getService(ctx, getNotificationId(group), deleteAction,0)
+        builder.setDeleteIntent(deletePendingIntent)
 
         if(pendingIntent != null) builder.setContentIntent(pendingIntent)
 

src/main/kotlin/com/criptext/mail/db/ComposerLocalDB.kt

@@ -138,7 +138,7 @@ class ComposerLocalDB(val contactDao: ContactDao, val emailDao: EmailDao, val fi
                         headers = emailContent.second),
                 totalEmails = getEmailCount(emailsInSelectedLabel, emails.size, selectedLabel),
                 hasFiles = totalFiles > 0,
-                allFilesAreInline = files.filter { it.cid != null }.size == totalFiles,
+                allFilesAreInline = files.filter { it.cid != null && it.cid != "" }.size == totalFiles,
                 headerData = headerData.distinctBy { it.name }
         )
     }

src/main/kotlin/com/criptext/mail/db/EventLocalDB.kt

@@ -383,7 +383,7 @@ class EventLocalDB(private val db: AppDatabase, private val filesDir: File, priv
                         headers = emailContent.second),
                 totalEmails = emails.size,
                 hasFiles = totalFiles > 0,
-                allFilesAreInline = files.filter { it.cid != null }.size == totalFiles,
+                allFilesAreInline = files.filter { it.cid != null && it.cid != "" }.size == totalFiles,
                 headerData = headerData.distinctBy { it.name }
         )
     }

src/main/kotlin/com/criptext/mail/db/MailboxLocalDB.kt

@@ -548,7 +548,7 @@ interface MailboxLocalDB {
                             headers = emailContent.second),
                     totalEmails = getEmailCount(emailsInSelectedLabel, emails.size, selectedLabel),
                     hasFiles = totalFiles > 0,
-                    allFilesAreInline = files.filter { it.cid != null }.size == totalFiles,
+                    allFilesAreInline = files.filter { it.cid != null && it.cid != "" }.size == totalFiles,
                     headerData = headerData.distinctBy { it.name }
             )
         }

src/main/kotlin/com/criptext/mail/db/SearchLocalDB.kt

@@ -134,7 +134,7 @@ interface SearchLocalDB{
                             headers = emailContent.second),
                     totalEmails = emails.size,
                     hasFiles = totalFiles > 0,
-                    allFilesAreInline = files.filter { it.cid != null }.size == totalFiles,
+                    allFilesAreInline = files.filter { it.cid != null && it.cid != "" }.size == totalFiles,
                     headerData = headerData.distinctBy { it.name }
             )
         }

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

@@ -0,0 +1,39 @@
+package com.criptext.mail.push.services
+
+import android.app.IntentService
+import android.content.Intent
+import com.criptext.mail.androidui.CriptextNotification
+import com.criptext.mail.db.KeyValueStorage
+import com.criptext.mail.db.models.ActiveAccount
+import com.criptext.mail.db.models.Contact
+
+
+class HeaderActionService : IntentService("Header Action Service") {
+
+    public override fun onHandleIntent(intent: Intent?) {
+        val storage = KeyValueStorage.SharedPrefs(this)
+        val activeAccount = ActiveAccount.loadFromStorage(storage)!!
+        val data = getIntentData(intent, activeAccount.recipientId)
+
+
+        when (data.action){
+            CriptextNotification.ACTION_INBOX -> storage.putInt(KeyValueStorage.StringKey.NewMailNotificationCount, 0)
+            CriptextNotification.ACTION_LINK_DEVICE,
+            CriptextNotification.ACTION_SYNC_DEVICE -> storage.putInt(KeyValueStorage.StringKey.SyncNotificationCount, 0)
+            CriptextNotification.ACTION_JOB_BACKUP -> storage.putInt(KeyValueStorage.StringKey.CloudBackupNotificationCount, 0)
+            else -> {}
+        }
+    }
+
+    private fun getIntentData(intent: Intent?, activeRecipientId: String): IntentData {
+        val action = intent!!.action ?: ""
+        val notificationId = intent.getIntExtra("notificationId", 0)
+        val metadataKey = intent.getLongExtra("metadataKey", 0)
+        val recipientId = intent.getStringExtra("account") ?: activeRecipientId
+        val domain = intent.getStringExtra("domain") ?: Contact.mainDomain
+        return IntentData(action, metadataKey, notificationId, recipientId, domain)
+    }
+
+    private data class IntentData(val action: String, val metadataKey: Long, val notificationId: Int,
+                                  val recipientId: String, val domain: String)
+}

src/main/kotlin/com/criptext/mail/push/workers/GetPushEmailWorker.kt

@@ -129,7 +129,7 @@ class GetPushEmailWorker(
                         val files = fullEmail.files
                         newData["preview"] = email.preview
                         newData["subject"] = email.subject
-                        newData["hasInlineImages"] = (files.firstOrNull { it.cid != null }  != null).toString()
+                        newData["hasInlineImages"] = (files.firstOrNull { it.cid != null && it.cid != "" }  != null).toString()
                         newData["name"] = dbEvents.getFromContactByEmailId(email.id)[0].name
                         newData["email"] = dbEvents.getFromContactByEmailId(email.id)[0].email
                         val emailAddress = newData["email"]

src/main/kotlin/com/criptext/mail/scenes/SceneController.kt

@@ -28,6 +28,12 @@ abstract class SceneController {
      */
     abstract fun onResume(activityMessage: ActivityMessage?): Boolean
 
+    /**
+     * Called during the host activity's `onStop()`. This where your controller's "teardown" code
+     * should go.
+     */
+    abstract fun onPause()
+
     /**
      * Called during the host activity's `onStop()`. This where your controller's "teardown" code
      * should go.