Refactored code.| #2137

FlowCrypt · May 5, 2023 · 40e3b3b · 40e3b3b
1 parent 81e727b
commit 40e3b3b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 19 deletions.
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/database/entity/AccountEntity.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/database/entity/AccountEntity.kt
@@ -227,6 +227,12 @@ data class AccountEntity constructor(
     return clientConfiguration?.hasProperty(configurationProperty) ?: false
   }
 
+  fun isHandlingAttachmentRestricted(): Boolean {
+    return hasClientConfigurationProperty(
+      ClientConfiguration.ConfigurationProperty.RESTRICT_ANDROID_ATTACHMENT_HANDLING
+    )
+  }
+
   companion object {
     const val TABLE_NAME = "accounts"
     const val ACCOUNT_TYPE_GOOGLE = "com.google"

diff --git a/.../src/main/java/com/flowcrypt/email/service/attachment/AttachmentDownloadManagerService.kt b/.../src/main/java/com/flowcrypt/email/service/attachment/AttachmentDownloadManagerService.kt
@@ -32,7 +32,6 @@ import com.flowcrypt.email.api.email.gmail.GmailApiHelper
 import com.flowcrypt.email.api.email.model.AttachmentInfo
 import com.flowcrypt.email.api.email.protocol.ImapProtocolUtil
 import com.flowcrypt.email.api.email.protocol.OpenStoreHelper
-import com.flowcrypt.email.api.retrofit.response.model.ClientConfiguration
 import com.flowcrypt.email.database.FlowCryptRoomDatabase
 import com.flowcrypt.email.database.entity.AccountEntity
 import com.flowcrypt.email.extensions.android.content.getParcelableExtraViaExt
@@ -463,9 +462,7 @@ class AttachmentDownloadManagerService : Service() {
               listener?.onAttDownloaded(
                 attInfo = att.copy(name = finalFileName),
                 uri = uri,
-                useContentApp = account.hasClientConfigurationProperty(
-                  ClientConfiguration.ConfigurationProperty.RESTRICT_ANDROID_ATTACHMENT_HANDLING
-                )
+                useContentApp = account.isHandlingAttachmentRestricted()
               )
             }
 
@@ -488,9 +485,7 @@ class AttachmentDownloadManagerService : Service() {
               ).use { inputStream ->
                 handleAttachmentInputStream(
                   inputStream = inputStream,
-                  useContentApp = account.hasClientConfigurationProperty(
-                    ClientConfiguration.ConfigurationProperty.RESTRICT_ANDROID_ATTACHMENT_HANDLING
-                  )
+                  useContentApp = account.isHandlingAttachmentRestricted()
                 )
               }
             }
@@ -517,9 +512,7 @@ class AttachmentDownloadManagerService : Service() {
               )?.inputStream?.let { inputStream ->
                 handleAttachmentInputStream(
                   inputStream = inputStream,
-                  useContentApp = account.hasClientConfigurationProperty(
-                    ClientConfiguration.ConfigurationProperty.RESTRICT_ANDROID_ATTACHMENT_HANDLING
-                  )
+                  useContentApp = account.isHandlingAttachmentRestricted()
                 )
               } ?: throw ManualHandledException(context.getString(R.string.attachment_not_found))
             }

diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/MessageDetailsFragment.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/MessageDetailsFragment.kt
@@ -52,7 +52,6 @@ import com.flowcrypt.email.api.email.model.IncomingMessageInfo
 import com.flowcrypt.email.api.email.model.LocalFolder
 import com.flowcrypt.email.api.email.model.ServiceInfo
 import com.flowcrypt.email.api.retrofit.response.base.Result
-import com.flowcrypt.email.api.retrofit.response.model.ClientConfiguration
 import com.flowcrypt.email.api.retrofit.response.model.DecryptErrorMsgBlock
 import com.flowcrypt.email.api.retrofit.response.model.DecryptedAttMsgBlock
 import com.flowcrypt.email.api.retrofit.response.model.MsgBlock
@@ -206,9 +205,7 @@ class MessageDetailsFragment : BaseFragment<FragmentMessageDetailsBinding>(), Pr
         if (attachmentInfo.uri != null || attachmentInfo.rawData?.isNotEmpty() == true) {
           previewAttachment(
             attachmentInfo = attachmentInfo,
-            useContentApp = account?.hasClientConfigurationProperty(
-              ClientConfiguration.ConfigurationProperty.RESTRICT_ANDROID_ATTACHMENT_HANDLING
-            ) == true
+            useContentApp = account?.isHandlingAttachmentRestricted() == true
           )
         }
       }
@@ -217,9 +214,7 @@ class MessageDetailsFragment : BaseFragment<FragmentMessageDetailsBinding>(), Pr
         if (attachmentInfo.uri != null || attachmentInfo.rawData?.isNotEmpty() == true) {
           previewAttachment(
             attachmentInfo = attachmentInfo,
-            useContentApp = account?.hasClientConfigurationProperty(
-              ClientConfiguration.ConfigurationProperty.RESTRICT_ANDROID_ATTACHMENT_HANDLING
-            ) == true
+            useContentApp = account?.isHandlingAttachmentRestricted() == true
           )
         } else {
           navController?.navigate(
@@ -1611,7 +1606,7 @@ class MessageDetailsFragment : BaseFragment<FragmentMessageDetailsBinding>(), Pr
       if (attInfo.rawData?.isNotEmpty() == true) {
         downloadInlinedAtt(attInfo)
       } else {
-        if (account?.hasClientConfigurationProperty(ClientConfiguration.ConfigurationProperty.RESTRICT_ANDROID_ATTACHMENT_HANDLING) == true) {
+        if (account?.isHandlingAttachmentRestricted() == true) {
           navController?.navigate(
             MessageDetailsFragmentDirections
               .actionMessageDetailsFragmentToDownloadAttachmentDialogFragment(
@@ -1720,7 +1715,7 @@ class MessageDetailsFragment : BaseFragment<FragmentMessageDetailsBinding>(), Pr
             previewAttachment(
               attachmentInfo = it,
               useContentApp =
-              account?.hasClientConfigurationProperty(ClientConfiguration.ConfigurationProperty.RESTRICT_ANDROID_ATTACHMENT_HANDLING) == true
+              account?.isHandlingAttachmentRestricted() == true
             )
           }
         }