Fixed updating drafts on the thread details screen. Step 3.| #74

Author: DenBond7

FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/workmanager/MessagesSenderWorker.kt

@@ -482,6 +482,13 @@ class MessagesSenderWorker(context: Context, params: WorkerParameters) :
                   .messages()
                   .send(GmailApiHelper.DEFAULT_USER_ID, gmailMsg, mediaContent)
                   .execute()
+                  .apply {
+                    setProgress(
+                      workDataOf(
+                        EXTRA_KEY_THREAD_ID_OF_SENT_MESSAGE to msgEntity.threadId,
+                      )
+                    )
+                  }
               } else {
                 try {
                   gmail
@@ -495,7 +502,12 @@ class MessagesSenderWorker(context: Context, params: WorkerParameters) :
                       },
                       mediaContent
                     ).execute().apply {
-                      setProgress(workDataOf(EXTRA_KEY_ID_OF_SENT_DRAFT to msgEntity.draftId))
+                      setProgress(
+                        workDataOf(
+                          EXTRA_KEY_ID_OF_SENT_DRAFT to msgEntity.draftId,
+                          EXTRA_KEY_THREAD_ID_OF_SENT_MESSAGE to msgEntity.threadId,
+                        )
+                      )
                     }
                 } catch (e: GoogleJsonResponseException) {
                   val isDraftNotFound = e.details.errors.any {
@@ -509,6 +521,13 @@ class MessagesSenderWorker(context: Context, params: WorkerParameters) :
                       .messages()
                       .send(GmailApiHelper.DEFAULT_USER_ID, gmailMsg, mediaContent)
                       .execute()
+                      .apply {
+                        setProgress(
+                          workDataOf(
+                            EXTRA_KEY_THREAD_ID_OF_SENT_MESSAGE to msgEntity.threadId,
+                          )
+                        )
+                      }
                   } else {
                     throw e
                   }
@@ -592,6 +611,7 @@ class MessagesSenderWorker(context: Context, params: WorkerParameters) :
 
   companion object {
     const val EXTRA_KEY_ID_OF_SENT_DRAFT = "ID_OF_SENT_DRAFT"
+    const val EXTRA_KEY_THREAD_ID_OF_SENT_MESSAGE = "THREAD_ID_OF_SENT_MESSAGE"
 
     private val TAG = MessagesSenderWorker::class.java.simpleName
     private val NOTIFICATION_ID = R.id.notification_id_sending_msgs_worker

FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/workmanager/sync/UploadDraftsWorker.kt

@@ -131,22 +131,14 @@ class UploadDraftsWorker(context: Context, params: WorkerParameters) :
           setProgress(
             workDataOf(
               EXTRA_KEY_MESSAGE_UID to existingDraftEntity.uid,
+              EXTRA_KEY_THREAD_ID to existingDraftEntity.threadId,
               EXTRA_KEY_STATE to STATE_UPLOADING
             )
           )
           val lastVersion = drafts.maxBy { it.lastModified() }
           val inputStream = KeyStoreCryptoManager.getCipherInputStream(lastVersion.inputStream())
           val mimeMessage = MimeMessage(Session.getInstance(Properties()), inputStream)
           action.invoke(existingDraftEntity, mimeMessage)
-
-          if (existingDraftEntity.threadId != null) {
-            val threadEntity = roomDatabase.msgDao().getThreadMessageEntity(
-              existingDraftEntity.account,
-              existingDraftEntity.folder,
-              existingDraftEntity.threadId
-            )
-            setProgress(workDataOf("threadId" to (threadEntity?.id ?: 0L)))
-          }
           drafts.forEach { FileAndDirectoryUtils.deleteFile(it) }
           if ((directory.listFiles() ?: emptyArray<File>()).isEmpty()) {
             FileAndDirectoryUtils.deleteDir(directory)
@@ -179,6 +171,7 @@ class UploadDraftsWorker(context: Context, params: WorkerParameters) :
           setProgress(
             workDataOf(
               EXTRA_KEY_MESSAGE_UID to existingDraftEntity.uid,
+              EXTRA_KEY_THREAD_ID to existingDraftEntity.threadId,
               EXTRA_KEY_STATE to STATE_UPLOAD_COMPLETED
             )
           )
@@ -195,6 +188,7 @@ class UploadDraftsWorker(context: Context, params: WorkerParameters) :
 
   companion object {
     const val EXTRA_KEY_MESSAGE_UID = "MESSAGE_UID"
+    const val EXTRA_KEY_THREAD_ID = "THREAD_ID"
     const val EXTRA_KEY_STATE = "STATE"
 
     const val STATE_UPLOADING = 0

FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/ThreadDetailsFragment.kt

@@ -858,30 +858,41 @@ class ThreadDetailsFragment : BaseFragment<FragmentThreadDetailsBinding>(), Prog
         .collect { workInfoList ->
           val workInfo = workInfoList.firstOrNull() ?: return@collect
           val messageUID = workInfo.progress.getLong(UploadDraftsWorker.EXTRA_KEY_MESSAGE_UID, -1)
+          val threadId = workInfo.progress.getLong(UploadDraftsWorker.EXTRA_KEY_THREAD_ID, -1)
           val state = workInfo.progress.getInt(UploadDraftsWorker.EXTRA_KEY_STATE, -1)
+          val currentThreadId = threadDetailsViewModel.threadMessageEntityFlow.value?.threadId
 
           val message = messagesInThreadListAdapter.currentList.firstOrNull {
             it is MessagesInThreadListAdapter.Message && it.messageEntity.uid == messageUID
           } as? MessagesInThreadListAdapter.Message
 
-          if (message != null) {
-            when (state) {
-              UploadDraftsWorker.STATE_UPLOADING -> {
-                threadDetailsViewModel.onMessageChanged(
-                  message.copy(hasActiveDraftUploadingProcess = true)
-                )
-              }
+          when {
+            message != null -> {
+              when (state) {
+                UploadDraftsWorker.STATE_UPLOADING -> {
+                  threadDetailsViewModel.onMessageChanged(
+                    message.copy(hasActiveDraftUploadingProcess = true)
+                  )
+                }
 
-              UploadDraftsWorker.STATE_UPLOAD_COMPLETED -> {
-                threadDetailsViewModel.loadMessages(silentUpdate = true)
+                UploadDraftsWorker.STATE_UPLOAD_COMPLETED -> {
+                  threadDetailsViewModel.loadMessages(silentUpdate = true)
+                }
               }
             }
-          } else if (state == UploadDraftsWorker.STATE_COMMON_UPLOAD_COMPLETED) {
-            if (messagesInThreadListAdapter.currentList.any {
-                it is MessagesInThreadListAdapter.Message && it.hasActiveDraftUploadingProcess
-              }) {
+
+            threadId == currentThreadId
+                && state == UploadDraftsWorker.STATE_UPLOAD_COMPLETED -> {
               threadDetailsViewModel.loadMessages(silentUpdate = true)
             }
+
+            state == UploadDraftsWorker.STATE_COMMON_UPLOAD_COMPLETED -> {
+              if (messagesInThreadListAdapter.currentList.any {
+                  it is MessagesInThreadListAdapter.Message && it.hasActiveDraftUploadingProcess
+                }) {
+                threadDetailsViewModel.loadMessages(silentUpdate = true)
+              }
+            }
           }
         }
     }
@@ -891,10 +902,22 @@ class ThreadDetailsFragment : BaseFragment<FragmentThreadDetailsBinding>(), Prog
         .getWorkInfosForUniqueWorkFlow(MessagesSenderWorker.NAME)
         .collect { workInfoList ->
           val workInfo = workInfoList.firstOrNull() ?: return@collect
+          val threadIdOfSentMessage =
+            workInfo.progress.getLong(MessagesSenderWorker.EXTRA_KEY_THREAD_ID_OF_SENT_MESSAGE, -1)
           val draftId = workInfo.progress.getString(MessagesSenderWorker.EXTRA_KEY_ID_OF_SENT_DRAFT)
-            ?: return@collect
 
-          deleteDraftFromLocalCache(draftId)
+          when {
+            !draftId.isNullOrEmpty() -> {
+              deleteDraftFromLocalCache(draftId)
+            }
+
+            threadIdOfSentMessage != -1L -> {
+              val currentThreadId = threadDetailsViewModel.threadMessageEntityFlow.value?.threadId
+              if (currentThreadId == threadIdOfSentMessage) {
+                threadDetailsViewModel.loadMessages(silentUpdate = true)
+              }
+            }
+          }
         }
     }
   }