feat: Public share Matomo (#1376)

Infomaniak · Jan 21, 2025 · 50a874a · 50a874a
2 parents eb38f35 + ee2f193
commit 50a874a
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 1 deletion.
diff --git a/kDrive/UI/Controller/Files/FileActionsFloatingPanelViewController+Actions.swift b/kDrive/UI/Controller/Files/FileActionsFloatingPanelViewController+Actions.swift
@@ -544,6 +544,9 @@ extension FileActionsFloatingPanelViewController {
             onPresentViewController: { saveNavigationViewController, animated in
                 self.present(saveNavigationViewController, animated: animated, completion: nil)
             },
+            onSave: {
+                MatomoUtils.trackAddToMyDrive()
+            },
             onDismissViewController: { [weak self] in
                 guard let self else { return }
                 self.dismiss(animated: true)

diff --git a/kDrive/UI/Controller/Files/PublicShareAction.swift b/kDrive/UI/Controller/Files/PublicShareAction.swift
@@ -26,13 +26,15 @@ struct PublicShareAction {
         selectedItemsIds: [Int],
         exceptItemIds: [Int],
         onPresentViewController: (UIViewController, Bool) -> Void,
+        onSave: (() -> Void)?,
         onDismissViewController: (() -> Void)?
     ) {
         let saveNavigationViewController = SaveFileViewController.instantiateInNavigationController(
             driveFileManager: currentUserDriveFileManager,
             publicShareProxy: publicShareProxy,
             publicShareFileIds: selectedItemsIds,
             publicShareExceptIds: exceptItemIds,
+            onSave: onSave,
             onDismissViewController: onDismissViewController
         )
 

diff --git a/kDrive/UI/Controller/Files/Save File/SaveFileViewController+FooterButtonDelegate.swift b/kDrive/UI/Controller/Files/Save File/SaveFileViewController+FooterButtonDelegate.swift
@@ -46,7 +46,11 @@ extension SaveFileViewController: FooterButtonDelegate {
         }
 
         Task {
-            defer { dismissViewController() }
+            defer {
+                onSave?()
+                dismissViewController()
+            }
+
             try await savePublicShareToDrive(sourceDriveId: publicShareProxy.driveId,
                                              destinationDriveId: drive.id,
                                              destinationFolderId: directory.id,

diff --git a/kDrive/UI/Controller/Files/Save File/SaveFileViewController.swift b/kDrive/UI/Controller/Files/Save File/SaveFileViewController.swift
@@ -118,6 +118,7 @@ class SaveFileViewController: UIViewController {
     }
 
     @MainActor var onDismissViewController: (() -> Void)?
+    @MainActor var onSave: (() -> Void)?
 
     @IBOutlet var tableView: UITableView!
     @IBOutlet var closeBarButtonItem: UIBarButtonItem!
@@ -353,13 +354,16 @@ class SaveFileViewController: UIViewController {
                                                  publicShareProxy: PublicShareProxy,
                                                  publicShareFileIds: [Int],
                                                  publicShareExceptIds: [Int],
+                                                 onSave: (() -> Void)?,
                                                  onDismissViewController: (() -> Void)?)
         -> TitleSizeAdjustingNavigationController {
         let saveViewController = instantiate(driveFileManager: driveFileManager)
 
         saveViewController.publicShareFileIds = publicShareFileIds
         saveViewController.publicShareExceptIds = publicShareExceptIds
         saveViewController.publicShareProxy = publicShareProxy
+        saveViewController.onSave = onSave
+        saveViewController.onDismissViewController = onDismissViewController
 
         return wrapInNavigationController(saveViewController)
     }

diff --git a/kDrive/UI/Controller/Menu/Share/PublicShareViewModel.swift b/kDrive/UI/Controller/Menu/Share/PublicShareViewModel.swift
@@ -191,6 +191,9 @@ final class PublicShareViewModel: InMemoryFileListViewModel {
             onPresentViewController: { saveNavigationViewController, animated in
                 onPresentViewController?(.modal, saveNavigationViewController, animated)
             },
+            onSave: {
+                MatomoUtils.trackAddBulkToMykDrive()
+            },
             onDismissViewController: { [weak self] in
                 guard let self else { return }
                 self.onDismissViewController?()

diff --git a/kDrive/UI/View/Upsale/UpsaleViewController.swift b/kDrive/UI/View/Upsale/UpsaleViewController.swift
@@ -65,6 +65,8 @@ public class UpsaleViewController: UIViewController {
         configureHeader()
         setupBody()
         layoutStackView()
+
+        MatomoUtils.trackUpsalePresented()
     }
 
     func configureHeader() {

diff --git a/kDriveCore/Utils/MatomoUtils.swift b/kDriveCore/Utils/MatomoUtils.swift
@@ -147,4 +147,8 @@ public enum MatomoUtils {
     public static func trackPublicSharePasswordAction() {
         track(eventWithCategory: .publicSharePasswordAction, name: "openInBrowser")
     }
+
+    public static func trackUpsalePresented() {
+        track(eventWithCategory: .publicShareAction, name: "adBottomSheet")
+    }
 }