Fixed a bug with messages which have a state = "Sending". | #381

Author: DenBond7

FlowCrypt/src/main/java/com/flowcrypt/email/database/dao/source/imap/MessageDaoSource.java

@@ -1087,6 +1087,27 @@ JavaEmailConstants.FOLDER_OUTBOX, new MessageDaoSource().getOutboxMessages(conte
     return deletedRows;
   }
 
+  /**
+   * Add the messages which have a current state equal {@link MessageState#SENDING} to the sending queue again.
+   *
+   * @param context Interface to global information about an application environment
+   * @param email   The email that the message linked
+   * @return The count of the updated row or -1 up.
+   */
+  public int resetMsgsWithSendingState(Context context, String email) {
+    ContentValues contentValues = new ContentValues();
+    contentValues.put(COL_STATE, MessageState.QUEUED.getValue());
+
+    ContentResolver contentResolver = context.getContentResolver();
+    if (email != null && contentResolver != null) {
+      return contentResolver.update(getBaseContentUri(), contentValues,
+          COL_EMAIL + "= ? AND "
+              + COL_FOLDER + " = ? AND "
+              + COL_STATE + " = ? ",
+          new String[]{email, JavaEmailConstants.FOLDER_OUTBOX, String.valueOf(MessageState.SENDING.getValue())});
+    } else return -1;
+  }
+
   private static String[] parseArray(String attributesAsString, String regex) {
     if (attributesAsString != null && attributesAsString.length() > 0) {
       return attributesAsString.split(regex);

FlowCrypt/src/main/java/com/flowcrypt/email/jobscheduler/MessagesSenderJobService.java

@@ -164,6 +164,8 @@ protected JobParameters doInBackground(JobParameters... params) {
           File attachmentsCacheDirectory = new File(context.getCacheDir(), Constants.ATTACHMENTS_CACHE_DIR);
 
           if (accountDao != null) {
+            messageDaoSource.resetMsgsWithSendingState(context, accountDao.getEmail());
+
             List<GeneralMessageDetails> listOfQueuedMessages = messageDaoSource.getOutboxMessages
                 (context, accountDao.getEmail(), MessageState.QUEUED);
 
@@ -244,6 +246,7 @@ private void sendQueuedMessages(Context context, AccountDao accountDao, MessageD
         uidOfLastMessage = genMsgDetails.getUid();
 
         try {
+          msgDaoSource.resetMsgsWithSendingState(context, accountDao.getEmail());
           msgDaoSource.updateMessageState(context, genMsgDetails.getEmail(), genMsgDetails.getLabel(),
               genMsgDetails.getUid(), MessageState.SENDING);
           Thread.sleep(2000);