Fixed a bug of creation a new message.| #793

FlowCrypt · Jan 13, 2020 · 0f085e9 · 0f085e9
1 parent 6150144
commit 0f085e9
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 19 deletions.
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/database/dao/MessageDao.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/database/dao/MessageDao.kt
@@ -66,14 +66,13 @@ abstract class MessageDao : BaseDao<MessageEntity> {
   abstract fun delete(email: String?, label: String?, msgsUID: Collection<Long>): Int
 
   @Query("SELECT * FROM messages WHERE email = :account AND folder = :label AND state NOT IN (:msgStates)")
-  abstract fun getOutboxMessages(account: String?, label: String = JavaEmailConstants.FOLDER_OUTBOX,
-                                 msgStates: Collection<Int> = listOf(
-                                     MessageState.SENDING.value,
-                                     MessageState.SENT_WITHOUT_LOCAL_COPY.value)): List<MessageEntity>
-
-  @Query("SELECT * FROM messages WHERE email = :account AND folder = :label AND state NOT IN (:msgStateValue)")
-  abstract fun getOutboxMessages(account: String?, label: String = JavaEmailConstants.FOLDER_OUTBOX,
-                                 msgStateValue: Int): List<MessageEntity>
+  abstract fun getOutboxMsgsExceptSent(account: String?, label: String = JavaEmailConstants.FOLDER_OUTBOX,
+                                       msgStates: Collection<Int> = listOf(MessageState.SENDING.value,
+                                           MessageState.SENT_WITHOUT_LOCAL_COPY.value)): List<MessageEntity>
+
+  @Query("SELECT * FROM messages WHERE email = :account AND folder = :label AND state IN (:msgStateValue)")
+  abstract fun getOutboxMsgsByState(account: String?, label: String = JavaEmailConstants.FOLDER_OUTBOX,
+                                    msgStateValue: Int): List<MessageEntity>
 
   @Query("DELETE FROM messages WHERE email = :email AND folder = :label AND uid = :uid AND state NOT IN (:msgStates)")
   abstract suspend fun deleteOutgoingMsg(email: String?, label: String?, uid: Long?,

diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/MessagesViewModel.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/MessagesViewModel.kt
@@ -110,7 +110,7 @@ class MessagesViewModel(application: Application) : BaseAndroidViewModel(applica
 
       if (isMsgDeleted) {
         val account = getActiveAccountSuspend()
-        val outgoingMsgCount = roomDatabase.msgDao().getOutboxMessages(account?.email).size
+        val outgoingMsgCount = roomDatabase.msgDao().getOutboxMsgsExceptSent(account?.email).size
         val outboxLabel = roomDatabase.labelDao().getLabelSuspend(account?.email,
             JavaEmailConstants.FOLDER_OUTBOX)
 

diff --git a/...rc/main/java/com/flowcrypt/email/jobscheduler/ForwardedAttachmentsDownloaderJobService.kt b/...rc/main/java/com/flowcrypt/email/jobscheduler/ForwardedAttachmentsDownloaderJobService.kt
@@ -120,7 +120,7 @@ class ForwardedAttachmentsDownloaderJobService : JobService() {
           val account = AccountDaoSource().getActiveAccountInformation(context)
 
           if (account != null) {
-            val newMsgs = roomDatabase.msgDao().getOutboxMessages(account = account.email,
+            val newMsgs = roomDatabase.msgDao().getOutboxMsgsByState(account = account.email,
                 msgStateValue = MessageState.NEW_FORWARDED.value)
 
             if (!CollectionUtils.isEmpty(newMsgs)) {
@@ -167,7 +167,7 @@ class ForwardedAttachmentsDownloaderJobService : JobService() {
       val attDaoSource = AttachmentDaoSource()
 
       while (true) {
-        val detailsList = roomDatabase.msgDao().getOutboxMessages(account = account.email,
+        val detailsList = roomDatabase.msgDao().getOutboxMsgsByState(account = account.email,
             msgStateValue = MessageState.NEW_FORWARDED.value)
 
         if (CollectionUtils.isEmpty(detailsList)) {

diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/jobscheduler/MessagesSenderJobService.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/jobscheduler/MessagesSenderJobService.kt
@@ -118,10 +118,10 @@ class MessagesSenderJobService : JobService() {
           if (account != null) {
             roomDatabase.msgDao().resetMsgsWithSendingState(account.email)
 
-            val queuedMsgs = roomDatabase.msgDao().getOutboxMessages(account = account.email,
+            val queuedMsgs = roomDatabase.msgDao().getOutboxMsgsByState(account = account.email,
                 msgStateValue = MessageState.QUEUED.value)
 
-            val sentButNotSavedMsgs = roomDatabase.msgDao().getOutboxMessages(account = account.email,
+            val sentButNotSavedMsgs = roomDatabase.msgDao().getOutboxMsgsByState(account = account.email,
                 msgStateValue = MessageState.SENT_WITHOUT_LOCAL_COPY.value)
 
             if (!CollectionUtils.isEmpty(queuedMsgs) || !CollectionUtils.isEmpty(sentButNotSavedMsgs)) {
@@ -183,7 +183,7 @@ class MessagesSenderJobService : JobService() {
       val email = account.email
       val roomDatabase = FlowCryptRoomDatabase.getDatabase(context)
       while (true) {
-        list = roomDatabase.msgDao().getOutboxMessages(account = account.email,
+        list = roomDatabase.msgDao().getOutboxMsgsByState(account = account.email,
             msgStateValue = MessageState.QUEUED.value)
 
         if (CollectionUtils.isEmpty(list)) {
@@ -231,7 +231,7 @@ class MessagesSenderJobService : JobService() {
               deleteMsgAtts(context, account, attsCacheDir, msgEntity, attsDaoSource)
             }
 
-            val outgoingMsgCount = roomDatabase.msgDao().getOutboxMessages(email).size
+            val outgoingMsgCount = roomDatabase.msgDao().getOutboxMsgsExceptSent(email).size
             val outboxLabel = roomDatabase.labelDao().getLabel(email, JavaEmailConstants.FOLDER_OUTBOX)
 
             outboxLabel?.let {
@@ -282,7 +282,7 @@ class MessagesSenderJobService : JobService() {
       val email = account.email
       val roomDatabase = FlowCryptRoomDatabase.getDatabase(context)
       while (true) {
-        list = roomDatabase.msgDao().getOutboxMessages(account = account.email,
+        list = roomDatabase.msgDao().getOutboxMsgsByState(account = account.email,
             msgStateValue = MessageState.SENT_WITHOUT_LOCAL_COPY.value)
         if (CollectionUtils.isEmpty(list)) {
           break

diff --git a/...rypt/src/main/java/com/flowcrypt/email/service/PrepareOutgoingMessagesJobIntentService.kt b/...rypt/src/main/java/com/flowcrypt/email/service/PrepareOutgoingMessagesJobIntentService.kt
@@ -136,8 +136,12 @@ class PrepareOutgoingMessagesJobIntentService : JobIntentService() {
           }
 
           if (CollectionUtils.isEmpty(outgoingMsgInfo.forwardedAtts)) {
-            roomDatabase.msgDao().update(msgEntity.copy(state = MessageState.QUEUED.value))
-            MessagesSenderJobService.schedule(applicationContext)
+            val insertedMsgEntity = roomDatabase.msgDao().getMsg(
+                msgEntity.email, msgEntity.folder, msgEntity.uid)
+            insertedMsgEntity?.let {
+              roomDatabase.msgDao().update(it.copy(state = MessageState.QUEUED.value))
+              MessagesSenderJobService.schedule(applicationContext)
+            }
           } else {
             ForwardedAttachmentsDownloaderJobService.schedule(applicationContext)
           }
@@ -170,7 +174,7 @@ class PrepareOutgoingMessagesJobIntentService : JobIntentService() {
   }
 
   private fun updateOutgoingMsgCount(email: String, roomDatabase: FlowCryptRoomDatabase) {
-    val outgoingMsgCount = roomDatabase.msgDao().getOutboxMessages(email).size
+    val outgoingMsgCount = roomDatabase.msgDao().getOutboxMsgsExceptSent(email).size
     val outboxLabel = roomDatabase.labelDao().getLabel(email, JavaEmailConstants.FOLDER_OUTBOX)
 
     outboxLabel?.let {