From 90c47ee243f8f786a7c3fe29d4908ada40ac2f17 Mon Sep 17 00:00:00 2001 From: Fabian Devel Date: Thu, 26 Sep 2024 11:26:23 +0200 Subject: [PATCH] chore(PublicShareMatomo): Add matomo for multiselect actions --- app/src/main/java/com/infomaniak/drive/MatomoDrive.kt | 4 +++- .../multiSelect/MultiSelectActionsBottomSheetDialog.kt | 9 ++------- .../PublicShareMultiSelectActionsBottomSheetDialog.kt | 3 ++- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/com/infomaniak/drive/MatomoDrive.kt b/app/src/main/java/com/infomaniak/drive/MatomoDrive.kt index daf05dd89b..e416806ba7 100644 --- a/app/src/main/java/com/infomaniak/drive/MatomoDrive.kt +++ b/app/src/main/java/com/infomaniak/drive/MatomoDrive.kt @@ -36,6 +36,8 @@ object MatomoDrive : MatomoCore { const val ACTION_SAVE_TO_KDRIVE_NAME = "saveToKDrive" const val ACTION_SEND_FILE_COPY_NAME = "sendFileCopy" + const val PUBLIC_SHARE_ACTION_CATEGORY = "publicShareAction" + fun Fragment.trackCategoriesEvent(name: String, action: TrackerAction = TrackerAction.CLICK, value: Float? = null) { trackEvent("categories", name, action, value) } @@ -45,7 +47,7 @@ object MatomoDrive : MatomoCore { } fun Context.trackPublicShareActionEvent(name: String, action: TrackerAction = TrackerAction.CLICK, value: Float? = null) { - trackEvent("publicShareAction", name, action, value) + trackEvent(PUBLIC_SHARE_ACTION_CATEGORY, name, action, value) } fun Context.trackPdfActivityActionEvent(name: String, action: TrackerAction = TrackerAction.CLICK, value: Float? = null) { diff --git a/app/src/main/java/com/infomaniak/drive/ui/fileList/multiSelect/MultiSelectActionsBottomSheetDialog.kt b/app/src/main/java/com/infomaniak/drive/ui/fileList/multiSelect/MultiSelectActionsBottomSheetDialog.kt index d5c747bb6a..b3016d90c8 100644 --- a/app/src/main/java/com/infomaniak/drive/ui/fileList/multiSelect/MultiSelectActionsBottomSheetDialog.kt +++ b/app/src/main/java/com/infomaniak/drive/ui/fileList/multiSelect/MultiSelectActionsBottomSheetDialog.kt @@ -149,13 +149,7 @@ abstract class MultiSelectActionsBottomSheetDialog(private val matomoCategory: S } binding.downloadFile.apply { - setOnClickListener { - if (drivePermissions.checkWriteStoragePermission()) { - trackEvent(matomoCategory, "bulkDownload") - download() - } - } - + setOnClickListener { if (drivePermissions.checkWriteStoragePermission()) download() } isVisible = navigationArgs.fileIds.isNotEmpty() || navigationArgs.isAllSelected } } @@ -181,6 +175,7 @@ abstract class MultiSelectActionsBottomSheetDialog(private val matomoCategory: S } private fun download() { + trackEvent(matomoCategory, "bulkDownload") if (navigationArgs.areAllFromTheSameFolder) downloadArchive() else downloadFiles() } diff --git a/app/src/main/java/com/infomaniak/drive/ui/publicShare/PublicShareMultiSelectActionsBottomSheetDialog.kt b/app/src/main/java/com/infomaniak/drive/ui/publicShare/PublicShareMultiSelectActionsBottomSheetDialog.kt index da27bcf607..637f49a333 100644 --- a/app/src/main/java/com/infomaniak/drive/ui/publicShare/PublicShareMultiSelectActionsBottomSheetDialog.kt +++ b/app/src/main/java/com/infomaniak/drive/ui/publicShare/PublicShareMultiSelectActionsBottomSheetDialog.kt @@ -22,6 +22,7 @@ import android.view.View import androidx.core.view.isGone import androidx.core.view.isVisible import androidx.fragment.app.activityViewModels +import com.infomaniak.drive.MatomoDrive.PUBLIC_SHARE_ACTION_CATEGORY import com.infomaniak.drive.data.api.ApiRoutes import com.infomaniak.drive.ui.fileList.multiSelect.MultiSelectActionsBottomSheetDialog import com.infomaniak.lib.core.utils.DownloadManagerUtils @@ -67,6 +68,6 @@ class PublicShareMultiSelectActionsBottomSheetDialog : MultiSelectActionsBottomS } companion object { - const val MATOMO_CATEGORY = "publicShare" + const val MATOMO_CATEGORY = PUBLIC_SHARE_ACTION_CATEGORY } }