Open calendar event by factorizing code with attachments opening

LunarX · LunarX · commit f5f634566db6 · 2024-01-23T09:48:19.000+01:00
diff --git a/app/src/main/java/com/infomaniak/mail/data/models/Attachment.kt b/app/src/main/java/com/infomaniak/mail/data/models/Attachment.kt
@@ -38,6 +38,7 @@ import java.io.File
 @Serializable
 class Attachment : EmbeddedRealmObject {
 
+    //region Remote data
     var uuid: String = ""
     @SerialName("mime_type")
     var mimeType: String = ""
@@ -52,12 +53,15 @@ class Attachment : EmbeddedRealmObject {
     var resource: String? = null
     @SerialName("drive_url")
     var driveUrl: String? = null
+    //endregion
 
     //region Local data (Transient)
     @Transient
     var uploadLocalUri: String? = null
     //endregion
 
+    val isCalendarEvent: Boolean get() = mimeType == "application/ics"
+
     val disposition: AttachmentDisposition?
         get() = enumValueOfOrNull<AttachmentDisposition>(_disposition)
 
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadAdapter.kt b/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadAdapter.kt
@@ -20,6 +20,7 @@ package com.infomaniak.mail.ui.main.thread
 import android.annotation.SuppressLint
 import android.content.Context
 import android.net.Uri
+import android.os.Bundle
 import android.text.format.Formatter
 import android.view.*
 import android.webkit.WebView
@@ -46,6 +47,7 @@ import com.infomaniak.mail.data.models.message.Message.*
 import com.infomaniak.mail.databinding.ItemMessageBinding
 import com.infomaniak.mail.ui.main.thread.ThreadAdapter.*
 import com.infomaniak.mail.utils.*
+import com.infomaniak.mail.utils.AttachmentIntentUtils.createDownloadDialogNavArgs
 import com.infomaniak.mail.utils.SharedUtils.Companion.createHtmlForPlainText
 import com.infomaniak.mail.utils.UiUtils.getPrettyNameAndEmail
 import com.infomaniak.mail.utils.Utils
@@ -72,6 +74,8 @@ class ThreadAdapter(
     onAllExpandedMessagesLoaded: () -> Unit,
     navigateToNewMessageActivity: (Uri) -> Unit,
     navigateToAttendeeBottomSheet: (List<Attendee>) -> Unit,
+    navigateToDownloadProgressDialog: (Int, Bundle) -> Unit,
+    showSnackBar: (String) -> Unit,
     promptLink: (String, ContextMenuType) -> Unit,
 ) : ListAdapter<Message, ThreadViewHolder>(MessageDiffCallback()) {
 
@@ -114,6 +118,8 @@ class ThreadAdapter(
             onAllExpandedMessagesLoaded,
             navigateToNewMessageActivity,
             navigateToAttendeeBottomSheet,
+            navigateToDownloadProgressDialog,
+            showSnackBar,
             promptLink,
         )
     }
@@ -174,18 +180,29 @@ class ThreadAdapter(
     }
 
     private fun ThreadViewHolder.bindCalendarEvent(message: Message) {
+        val attachment = message.attachments.singleOrNull(Attachment::isCalendarEvent) ?: return
         val calendarEvent = message.latestCalendarEventResponse?.calendarEvent
+
         binding.calendarEvent.apply {
             isVisible = calendarEvent != null
 
             calendarEvent?.let {
                 val hasBeenDeleted = message.latestCalendarEventResponse!!.userStoredEventDeleted
-                loadCalendarEvent(it, hasBeenDeleted)
+                loadCalendarEvent(it, hasBeenDeleted, attachment)
             }
 
-            initCallback { attendees ->
-                threadAdapterCallbacks?.navigateToAttendeeBottomSheet?.invoke(attendees)
-            }
+            initCallback(
+                navigateToAttendeesBottomSheet = { attendees ->
+                    threadAdapterCallbacks?.navigateToAttendeeBottomSheet?.invoke(attendees)
+                },
+                navigateToDownloadProgressDialog = {
+                    threadAdapterCallbacks?.navigateToDownloadProgressDialog?.invoke(
+                        R.id.downloadAttachmentProgressDialog,
+                        attachment.createDownloadDialogNavArgs(AttachmentIntentUtils.AttachmentIntentType.OPEN_WITH),
+                    )
+                },
+                showSnackBar = { threadAdapterCallbacks?.showSnackBar?.invoke(it) }
+            )
         }
     }
 
@@ -669,6 +686,8 @@ class ThreadAdapter(
         var onAllExpandedMessagesLoaded: () -> Unit,
         var navigateToNewMessageActivity: (Uri) -> Unit,
         var navigateToAttendeeBottomSheet: (List<Attendee>) -> Unit,
+        var navigateToDownloadProgressDialog: (Int, Bundle) -> Unit,
+        var showSnackBar: (String) -> Unit,
         var promptLink: (String, ContextMenuType) -> Unit,
     )
 
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt
@@ -239,6 +239,8 @@ class ThreadFragment : Fragment() {
                 )
             },
             navigateToNewMessageActivity = { twoPaneViewModel.navigateToNewMessage(mailToUri = it) },
+            navigateToDownloadProgressDialog = { resId, args -> safeNavigate(resId, args) },
+            showSnackBar = { message -> mainViewModel.snackBarManager.setValue(message) },
             promptLink = { data, type ->
                 // When adding a phone number to contacts, Google decodes this value in case it's url-encoded. But I could not
                 // reproduce this issue when manually creating a url-encoded href. If this is triggered, fix it by also
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadViewModel.kt b/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadViewModel.kt
@@ -28,6 +28,7 @@ import com.infomaniak.mail.data.cache.mailboxContent.RefreshController
 import com.infomaniak.mail.data.cache.mailboxContent.RefreshController.RefreshMode
 import com.infomaniak.mail.data.cache.mailboxContent.ThreadController
 import com.infomaniak.mail.data.cache.mailboxInfo.MailboxController
+import com.infomaniak.mail.data.models.Attachment
 import com.infomaniak.mail.data.models.mailbox.Mailbox
 import com.infomaniak.mail.data.models.message.Message
 import com.infomaniak.mail.data.models.thread.Thread
@@ -199,7 +200,7 @@ class ThreadViewModel @Inject constructor(
                     val alreadyTreated = !treatedMessagesForCalendarEvent.add(message.uid)
                     if (alreadyTreated) return@forEach
 
-                    val icsAttachments = message.attachments.filter { it.mimeType == "application/ics" }
+                    val icsAttachments = message.attachments.filter(Attachment::isCalendarEvent)
                     if (icsAttachments.count() != 1) return@forEach
 
                     val icsAttachment = icsAttachments.single()
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/thread/actions/AttachmentActionsBottomSheetDialog.kt b/app/src/main/java/com/infomaniak/mail/ui/main/thread/actions/AttachmentActionsBottomSheetDialog.kt
@@ -1,6 +1,6 @@
 /*
  * Infomaniak Mail - Android
- * Copyright (C) 2023 Infomaniak Network SA
+ * Copyright (C) 2023-2024 Infomaniak Network SA
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,7 +25,6 @@ import androidx.fragment.app.activityViewModels
 import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
 import com.infomaniak.lib.core.utils.context
-import com.infomaniak.lib.core.utils.hasSupportedApplications
 import com.infomaniak.lib.core.utils.safeBinding
 import com.infomaniak.lib.core.utils.safeNavigate
 import com.infomaniak.mail.MatomoMail.trackAttachmentActionsEvent
@@ -34,14 +33,13 @@ import com.infomaniak.mail.data.models.Attachment
 import com.infomaniak.mail.databinding.BottomSheetAttachmentActionsBinding
 import com.infomaniak.mail.ui.MainViewModel
 import com.infomaniak.mail.utils.AttachmentIntentUtils.AttachmentIntentType
-import com.infomaniak.mail.utils.AttachmentIntentUtils.AttachmentIntentType.OPEN_WITH
 import com.infomaniak.mail.utils.AttachmentIntentUtils.AttachmentIntentType.SAVE_TO_DRIVE
-import com.infomaniak.mail.utils.AttachmentIntentUtils.getIntentOrGoToPlaystore
-import com.infomaniak.mail.utils.AttachmentIntentUtils.openWithIntent
+import com.infomaniak.mail.utils.AttachmentIntentUtils.createDownloadDialogNavArgs
+import com.infomaniak.mail.utils.AttachmentIntentUtils.executeIntent
+import com.infomaniak.mail.utils.AttachmentIntentUtils.openAttachment
 import com.infomaniak.mail.utils.PermissionUtils
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
-import com.infomaniak.lib.core.R as RCore
 
 @AndroidEntryPoint
 class AttachmentActionsBottomSheetDialog : ActionsBottomSheetDialog() {
@@ -71,45 +69,37 @@ class AttachmentActionsBottomSheetDialog : ActionsBottomSheetDialog() {
     }
 
     private fun setupListeners(attachment: Attachment) = with(binding) {
+
+        fun navigateToDownloadProgressDialog(attachmentIntentType: AttachmentIntentType) {
+            safeNavigate(
+                resId = R.id.downloadAttachmentProgressDialog,
+                args = attachment.createDownloadDialogNavArgs(attachmentIntentType),
+                currentClassName = AttachmentActionsBottomSheetDialog::class.java.name,
+            )
+        }
+
         openWithItem.setClosingOnClickListener {
             trackAttachmentActionsEvent("open")
-            if (attachment.openWithIntent(context).hasSupportedApplications(context)) {
-                attachment.executeIntent(OPEN_WITH)
-            } else {
-                mainViewModel.snackBarManager.setValue(getString(RCore.string.errorNoSupportingAppFound))
-            }
+            attachment.openAttachment(
+                context,
+                navigateToDownloadProgressDialog = { navigateToDownloadProgressDialog(it) },
+                showSnackBar = { snackBarErrorMessage -> mainViewModel.snackBarManager.setValue(snackBarErrorMessage) }
+            )
         }
         kDriveItem.setClosingOnClickListener {
             trackAttachmentActionsEvent("saveToKDrive")
-            attachment.executeIntent(SAVE_TO_DRIVE)
+            attachment.executeIntent(
+                context,
+                SAVE_TO_DRIVE,
+                navigateToDownloadProgressDialog = { navigateToDownloadProgressDialog(it) },
+            )
         }
         deviceItem.setOnClickListener {
             trackAttachmentActionsEvent("download")
             scheduleDownloadManager(attachment.downloadUrl, attachment.name)
         }
     }
 
-    private fun Attachment.executeIntent(intentType: AttachmentIntentType) {
-        if (hasUsableCache(requireContext()) || isInlineCachedFile(requireContext())) {
-            getIntentOrGoToPlaystore(requireContext(), intentType)?.let(::startActivity)
-        } else {
-            navigateToDownloadProgressDialog(intentType)
-        }
-    }
-
-    private fun Attachment.navigateToDownloadProgressDialog(intentType: AttachmentIntentType) {
-        safeNavigate(
-            resId = R.id.downloadAttachmentProgressDialog,
-            args = DownloadAttachmentProgressDialogArgs(
-                attachmentResource = resource!!,
-                attachmentName = name,
-                attachmentType = getFileTypeFromMimeType(),
-                intentType = intentType,
-            ).toBundle(),
-            currentClassName = AttachmentActionsBottomSheetDialog::class.java.name,
-        )
-    }
-
     private fun scheduleDownloadManager(downloadUrl: String, filename: String) {
         if (permissionUtils.hasDownloadManagerPermission) {
             scheduleDownloadAndPopBack(downloadUrl, filename)
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/thread/calendar/CalendarEventBannerView.kt b/app/src/main/java/com/infomaniak/mail/ui/main/thread/calendar/CalendarEventBannerView.kt
@@ -27,9 +27,12 @@ import androidx.core.view.isVisible
 import com.google.android.material.button.MaterialButton
 import com.infomaniak.lib.core.utils.*
 import com.infomaniak.mail.R
+import com.infomaniak.mail.data.models.Attachment
 import com.infomaniak.mail.data.models.calendar.Attendee
 import com.infomaniak.mail.data.models.calendar.CalendarEvent
 import com.infomaniak.mail.databinding.ViewCalendarEventBannerBinding
+import com.infomaniak.mail.utils.AttachmentIntentUtils
+import com.infomaniak.mail.utils.AttachmentIntentUtils.openAttachment
 import com.infomaniak.mail.utils.UiUtils.getPrettyNameAndEmail
 import com.infomaniak.mail.utils.toDate
 import io.realm.kotlin.types.RealmList
@@ -48,6 +51,8 @@ class CalendarEventBannerView @JvmOverloads constructor(
     private val allDayLong by lazy { context.getString(R.string.calendarAllDayLong) }
 
     private var navigateToAttendeesBottomSheet: ((List<Attendee>) -> Unit)? = null
+    private var navigateToDownloadProgressDialog: (Attachment.(AttachmentIntentUtils.AttachmentIntentType) -> Unit)? = null
+    private var showSnackBar: ((String) -> Unit)? = null
 
     init {
         with(binding) {
@@ -61,7 +66,7 @@ class CalendarEventBannerView @JvmOverloads constructor(
         }
     }
 
-    fun loadCalendarEvent(calendarEvent: CalendarEvent, hasBeenDeleted: Boolean) = with(binding) {
+    fun loadCalendarEvent(calendarEvent: CalendarEvent, hasBeenDeleted: Boolean, attachment: Attachment) = with(binding) {
         val startDate = calendarEvent.start.toDate()
         val endDate = calendarEvent.end.toDate()
 
@@ -74,6 +79,12 @@ class CalendarEventBannerView @JvmOverloads constructor(
         }
 
         setAttendees(calendarEvent.attendees)
+
+        addToCalendarButton.setOnClickListener {
+            val navigationCallback = navigateToDownloadProgressDialog ?: return@setOnClickListener
+            val snackBarCallback = showSnackBar ?: return@setOnClickListener
+            attachment.openAttachment(context, navigationCallback, snackBarCallback)
+        }
     }
 
     private fun setWarnings(startDate: Date, hasBeenDeleted: Boolean) = with(binding) {
@@ -122,8 +133,14 @@ class CalendarEventBannerView @JvmOverloads constructor(
         manyAvatarsView.setAttendees(attendees)
     }
 
-    fun initCallback(navigateToAttendeesBottomSheet: (List<Attendee>) -> Unit) {
+    fun initCallback(
+        navigateToAttendeesBottomSheet: (List<Attendee>) -> Unit,
+        navigateToDownloadProgressDialog: Attachment.(AttachmentIntentUtils.AttachmentIntentType) -> Unit,
+        showSnackBar: (String) -> Unit,
+    ) {
         this.navigateToAttendeesBottomSheet = navigateToAttendeesBottomSheet
+        this.navigateToDownloadProgressDialog = navigateToDownloadProgressDialog
+        this.showSnackBar = showSnackBar
     }
 
     private fun MaterialButton.handleChoiceButtonBehavior() {
diff --git a/app/src/main/java/com/infomaniak/mail/utils/AttachmentIntentUtils.kt b/app/src/main/java/com/infomaniak/mail/utils/AttachmentIntentUtils.kt
@@ -1,6 +1,6 @@
 /*
  * Infomaniak Mail - Android
- * Copyright (C) 2023 Infomaniak Network SA
+ * Copyright (C) 2023-2024 Infomaniak Network SA
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,10 +21,13 @@ import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
+import android.os.Bundle
 import androidx.core.content.FileProvider
 import com.infomaniak.lib.core.utils.goToPlayStore
+import com.infomaniak.lib.core.utils.hasSupportedApplications
 import com.infomaniak.mail.R
 import com.infomaniak.mail.data.models.Attachment
+import com.infomaniak.mail.ui.main.thread.actions.DownloadAttachmentProgressDialogArgs
 import com.infomaniak.mail.utils.AttachmentIntentUtils.AttachmentIntentType.OPEN_WITH
 import com.infomaniak.mail.utils.AttachmentIntentUtils.AttachmentIntentType.SAVE_TO_DRIVE
 import io.sentry.Sentry
@@ -73,6 +76,39 @@ object AttachmentIntentUtils {
         }
     }
 
+    fun Attachment.executeIntent(
+        context: Context,
+        intentType: AttachmentIntentType,
+        navigateToDownloadProgressDialog: Attachment.(intentType: AttachmentIntentType) -> Unit,
+    ) {
+        if (hasUsableCache(context) || isInlineCachedFile(context)) {
+            getIntentOrGoToPlaystore(context, intentType)?.let(context::startActivity)
+        } else {
+            navigateToDownloadProgressDialog(intentType)
+        }
+    }
+
+    fun Attachment.openAttachment(
+        context: Context,
+        navigateToDownloadProgressDialog: Attachment.(intentType: AttachmentIntentType) -> Unit,
+        showSnackBar: (String) -> Unit,
+    ) {
+        if (openWithIntent(context).hasSupportedApplications(context)) {
+            executeIntent(context, OPEN_WITH, navigateToDownloadProgressDialog)
+        } else {
+            showSnackBar(context.getString(com.infomaniak.lib.core.R.string.errorNoSupportingAppFound))
+        }
+    }
+
+    fun Attachment.createDownloadDialogNavArgs(intentType: AttachmentIntentType): Bundle {
+        return DownloadAttachmentProgressDialogArgs(
+            attachmentResource = resource!!,
+            attachmentName = name,
+            attachmentType = getFileTypeFromMimeType(),
+            intentType = intentType,
+        ).toBundle()
+    }
+
     enum class AttachmentIntentType {
         OPEN_WITH, SAVE_TO_DRIVE
     }

Original file line number	Diff line number	Diff line change
`@@ -239,6 +239,8 @@ class ThreadFragment : Fragment() {`
`239`	`239`	`)`
`240`	`240`	`},`
`241`	`241`	`navigateToNewMessageActivity = { twoPaneViewModel.navigateToNewMessage(mailToUri = it) },`
	`242`	`+ navigateToDownloadProgressDialog = { resId, args -> safeNavigate(resId, args) },`
	`243`	`+ showSnackBar = { message -> mainViewModel.snackBarManager.setValue(message) },`
`242`	`244`	`promptLink = { data, type ->`
`243`	`245`	`// When adding a phone number to contacts, Google decodes this value in case it's url-encoded. But I could not`
`244`	`246`	`// reproduce this issue when manually creating a url-encoded href. If this is triggered, fix it by also`