Dependency segregation

Author: surinder-tsys

app/build.gradle

@@ -53,7 +53,8 @@ apply plugin: 'com.google.devtools.ksp'
 
 
 println "Gradle uses Java ${Jvm.current()}"
-
+// apply MoEngage SDK for NMC
+apply from: "$rootProject.projectDir/nmc_moengage-dependencies.gradle"
 configurations {
     configureEach {
         exclude group: 'org.jetbrains', module: 'annotations-java5' // via prism4j, already using annotations explicitly
@@ -109,8 +110,6 @@ android {
         targetSdkVersion 35
         compileSdk 35
 
-        // NMC Customization
-        buildConfigField "String", "MOENGAGE_APP_ID", "${MOENGAGE_APP_ID}"
         buildConfigField 'boolean', 'CI', ciBuild.toString()
         buildConfigField 'boolean', 'RUNTIME_PERF_ANALYSIS', perfAnalysis.toString()
 
@@ -430,19 +429,11 @@ dependencies {
 
     implementation "io.coil-kt:coil:2.7.0"
 
-    // NMC: MoEngage Dependencies
-    // core moengage features
-    implementation(moengage.core)
-    // optionally add this to use the Push Templates feature
-    implementation(moengage.richNotification)
-    // optionally add this to use the InApp feature
-    implementation(moengage.inapp)
-    // Required for MoEngage to provide accurate analytics based on Advertising Identifier
-    implementation 'com.google.android.gms:play-services-ads-identifier:18.0.1'
-    // NMC: end
-
     // splash screen dependency ref: https://developer.android.com/develop/ui/views/launch/splash-screen/migrate
     implementation 'androidx.core:core-splashscreen:1.0.1'
+
+    // NMC: dependency required to capture Advertising ID for Adjust & MoEngage SDK
+    implementation 'com.google.android.gms:play-services-ads-identifier:18.0.1'
 }
 
 configurations.configureEach {

app/src/main/java/com/nmc/android/marketTracking/MoEngageSdkUtils.kt

@@ -40,6 +40,7 @@ import com.owncloud.android.utils.MimeTypeUtil
 import com.owncloud.android.utils.PermissionUtil
 import kotlin.math.ceil
 import kotlin.math.floor
+import kotlin.math.round
 
 object MoEngageSdkUtils {
 
@@ -95,7 +96,9 @@ object MoEngageSdkUtils {
             .configureNotificationMetaData(
                 NotificationConfig(
                     R.drawable.notification_icon,
-                    R.drawable.notification_icon
+                    R.drawable.notification_icon,
+                    R.color.primary,
+                    false
                 )
             )
             .build()
@@ -227,9 +230,10 @@ object MoEngageSdkUtils {
 
         val properties = Properties()
         properties.addAttribute(PROPERTIES__FILE_TYPE, getOfficeFileType(type) { getFileType(file) }.fileType)
-        properties.addAttribute(PROPERTIES__FILE_SIZE, bytesToMB(file.fileLength).toString())
+        properties.addAttribute(PROPERTIES__FILE_SIZE, bytesToMBInDecimal(file.fileLength).toString())
         properties.addAttribute(
             PROPERTIES__CREATION_DATE,
+            // using modification timestamp as this will always have value
             file.modificationTimestamp.getFormattedStringDate(DATE_FORMAT)
         )
 
@@ -244,6 +248,7 @@ object MoEngageSdkUtils {
         properties.addAttribute(PROPERTIES__FOLDER_TYPE, getFolderType(file).folderType)
         properties.addAttribute(
             PROPERTIES__CREATION_DATE,
+            // using modification timestamp because for folder creationTimeStamp is always 0
             file.modificationTimestamp.getFormattedStringDate(DATE_FORMAT)
         )
 
@@ -323,21 +328,23 @@ object MoEngageSdkUtils {
     private fun getCommonProperties(file: OCFile, isScan: Boolean = false): Properties {
         val properties = Properties()
         properties.addAttribute(PROPERTIES__FILE_TYPE, getFileType(file, isScan).fileType)
-        properties.addAttribute(PROPERTIES__FILE_SIZE, bytesToMB(file.fileLength).toString())
+        properties.addAttribute(PROPERTIES__FILE_SIZE, bytesToMBInDecimal(file.fileLength).toString())
         properties.addAttribute(
             PROPERTIES__CREATION_DATE,
+            // using modification timestamp as this will always have value
             file.modificationTimestamp.getFormattedStringDate(DATE_FORMAT)
         )
-        properties.addAttribute(PROPERTIES__UPLOAD_DATE, file.modificationTimestamp.getFormattedStringDate(DATE_FORMAT))
+        properties.addAttribute(PROPERTIES__UPLOAD_DATE, file.uploadTimestamp.getFormattedStringDate(DATE_FORMAT))
         return properties
     }
 
     private fun bytesToGB(bytes: Long): Int {
         return floor((bytes / GIGABYTE).toDouble()).toInt()
     }
 
-    private fun bytesToMB(bytes: Long): Int {
-        return floor((bytes / MEGABYTE).toDouble()).toInt()
+     private fun bytesToMBInDecimal(bytes: Long): Double {
+         val mb = bytes.toDouble() / MEGABYTE
+         return round((mb * 10)) / 10 // Round down to 1 decimal place
     }
 
     private fun getFileType(file: OCFile, isScan: Boolean = false): EventFileType {

app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java

@@ -601,8 +601,6 @@ private void onNavigationItemClicked(final MenuItem menuItem) {
             startActivity(UploadListActivity.class, Intent.FLAG_ACTIVITY_CLEAR_TOP);
         } else if (itemId == R.id.nav_trashbin) {
             startActivity(TrashbinActivity.class, Intent.FLAG_ACTIVITY_CLEAR_TOP);
-            // NMC: track deleted files screen event
-            MoEngageSdkUtils.trackDeletedFilesScreenEvent(this);
         } else if (itemId == R.id.nav_activity) {
             startActivity(ActivitiesActivity.class, Intent.FLAG_ACTIVITY_CLEAR_TOP);
         } else if (itemId == R.id.nav_settings) {

app/src/main/java/com/owncloud/android/ui/activity/NotificationsActivity.kt

@@ -28,6 +28,7 @@ import com.nextcloud.client.network.ClientFactory.CreationException
 import com.nextcloud.client.preferences.AppPreferences
 import com.nextcloud.common.NextcloudClient
 import com.owncloud.android.R
+import com.nmc.android.marketTracking.MoEngageSdkUtils
 import com.owncloud.android.databinding.NotificationsLayoutBinding
 import com.owncloud.android.datamodel.ArbitraryDataProvider
 import com.owncloud.android.datamodel.ArbitraryDataProviderImpl
@@ -86,6 +87,9 @@ class NotificationsActivity : AppCompatActivity(), NotificationsContract.View, I
         if (optionalUser?.isPresent == false) {
             showError()
         }
+
+        // NMC: track notification screen event
+        MoEngageSdkUtils.trackNotificationsScreenEvent(this)
     }
 
     private fun initUser() {

app/src/main/java/com/owncloud/android/ui/dialog/ChooseRichDocumentsTemplateDialogFragment.kt

@@ -29,6 +29,7 @@ import com.nextcloud.client.network.ClientFactory.CreationException
 import com.nextcloud.utils.extensions.getParcelableArgument
 import com.nextcloud.utils.fileNameValidator.FileNameValidator
 import com.owncloud.android.MainApp
+import com.nmc.android.marketTracking.MoEngageSdkUtils
 import com.owncloud.android.R
 import com.owncloud.android.databinding.ChooseTemplateBinding
 import com.owncloud.android.datamodel.FileDataStorageManager
@@ -401,6 +402,12 @@ class ChooseRichDocumentsTemplateDialogFragment :
                 putExtra(ExternalSiteWebView.EXTRA_TEMPLATE, template)
             }
 
+            // NMC: track create office file event & open event
+            file?.let {
+                MoEngageSdkUtils.trackCreateFileEvent(MainApp.getAppContext(), it, template.type)
+                MoEngageSdkUtils.trackOnlineOfficeUsedEvent(MainApp.getAppContext(), it)
+            }
+
             fragment.run {
                 startActivity(intent)
                 dismiss()

app/src/main/java/com/owncloud/android/ui/trashbin/TrashbinActivity.kt

@@ -35,6 +35,7 @@ import com.nextcloud.client.preferences.AppPreferences
 import com.nextcloud.client.utils.Throttler
 import com.nextcloud.ui.trashbinFileActions.TrashbinFileActionsBottomSheet
 import com.owncloud.android.R
+import com.nmc.android.marketTracking.MoEngageSdkUtils
 import com.owncloud.android.databinding.TrashbinActivityBinding
 import com.owncloud.android.datamodel.SyncedFolderProvider
 import com.owncloud.android.lib.resources.trashbin.model.TrashbinFile
@@ -131,6 +132,9 @@ class TrashbinActivity :
 
         active = true
         setupContent()
+
+        // NMC: track deleted files screen event
+        MoEngageSdkUtils.trackDeletedFilesScreenEvent(this)
     }
 
     private fun setupContent() {

nmc_moengage-dependencies.gradle

@@ -0,0 +1,21 @@
+/*
+ * Nextcloud - Android Client
+ *
+ * SPDX-FileCopyrightText: 2024 Your Name <your@email.com>
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+android {
+    buildTypes.each {
+        it.buildConfigField "String", "MOENGAGE_APP_ID", "${MOENGAGE_APP_ID}"
+    }
+}
+
+dependencies {
+    // core moengage features
+    implementation(moengage.core)
+    // optionally add this to use the Push Templates feature
+    implementation(moengage.richNotification)
+    // optionally add this to use the InApp feature
+    implementation(moengage.inapp)
+}