Refactored code.| #1631

Author: DenBond7

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

@@ -39,7 +39,7 @@ import org.apache.commons.io.FileUtils
 import java.io.File
 import java.io.FileOutputStream
 import java.io.InputStream
-import java.util.*
+import java.util.UUID
 import javax.mail.Folder
 import javax.mail.Store
 
@@ -66,13 +66,13 @@ class ForwardedAttachmentsDownloaderWorker(context: Context, params: WorkerParam
       try {
         if (!attCacheDir.exists()) {
           if (!attCacheDir.mkdirs()) {
-            throw IllegalStateException("Create cache directory " + attCacheDir.name + " filed!")
+            throw IllegalStateException("Create cache directory " + attCacheDir.name + " failed!")
           }
         }
 
         if (!fwdAttsCacheDir.exists()) {
           if (!fwdAttsCacheDir.mkdirs()) {
-            throw IllegalStateException("Create cache directory " + fwdAttsCacheDir.name + " filed!")
+            throw IllegalStateException("Create cache directory " + fwdAttsCacheDir.name + " failed!")
           }
         }
 

FlowCrypt/src/main/java/com/flowcrypt/email/service/ProcessingOutgoingMessageInfoHelper.kt

@@ -106,7 +106,7 @@ object ProcessingOutgoingMessageInfoHelper {
         if (hasAtts) {
           if (!msgAttsCacheDir.exists()) {
             if (!msgAttsCacheDir.mkdir()) {
-              throw IOException("Create cache directory for outgoing attachments filed!")
+              throw IOException("Create cache directory for outgoing attachments failed!")
             }
           }
 
@@ -188,7 +188,7 @@ object ProcessingOutgoingMessageInfoHelper {
     val attsCacheDir = File(context.cacheDir, Constants.ATTACHMENTS_CACHE_DIR)
     if (!attsCacheDir.exists()) {
       if (!attsCacheDir.mkdirs()) {
-        throw IllegalStateException("Create cache directory " + attsCacheDir.name + " filed!")
+        throw IllegalStateException("Create cache directory " + attsCacheDir.name + " failed!")
       }
     }
     return attsCacheDir
@@ -224,15 +224,18 @@ object ProcessingOutgoingMessageInfoHelper {
 
     val hasAtts = msgInfo.atts?.isNotEmpty() == true || msgInfo.forwardedAtts?.isNotEmpty() == true
     val isEncrypted = msgInfo.encryptionType === MessageEncryptionType.ENCRYPTED
-    val msgStateValue =
-      if (msgInfo.messageType == MessageType.FORWARD) MessageState.NEW_FORWARDED.value else MessageState.NEW.value
+    val msgState = if (msgInfo.messageType == MessageType.FORWARD) {
+      MessageState.NEW_FORWARDED
+    } else {
+      MessageState.NEW
+    }
 
     return messageEntity.copy(
       hasAttachments = hasAtts,
       rawMessageWithoutAttachments = rawMsg,
       flags = MessageFlag.SEEN.value,
       isEncrypted = isEncrypted,
-      state = msgStateValue,
+      state = msgState.value,
       attachmentsDirectory = attsCacheDir.name,
       password = msgInfo.password?.let { KeyStoreCryptoManager.encrypt(String(it)).toByteArray() }
     )

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

@@ -634,7 +634,7 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
 
     if (draftCacheDir.exists()) {
       if (!draftCacheDir.mkdir()) {
-        Log.e(TAG, "Create cache directory " + draftCacheDir.name + " filed!")
+        Log.e(TAG, "Create cache directory " + draftCacheDir.name + " failed!")
       }
     }
   }
@@ -686,7 +686,7 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
           ExceptionUtil.handleError(e)
 
           if (!draftAtt.delete()) {
-            Log.e(TAG, "Delete " + draftAtt.name + " filed!")
+            Log.e(TAG, "Delete " + draftAtt.name + " failed!")
           }
         }