Merge pull request nextcloud#15125 from nextcloud/add-logs-for-auto-upload

tobiasKaminsky · web-flow · commit 3aac1987b706 · 2025-07-10T12:22:17.000+02:00
Add Logs for AutoUpload
diff --git a/app/src/main/java/com/nextcloud/client/jobs/FilesSyncWork.kt b/app/src/main/java/com/nextcloud/client/jobs/FilesSyncWork.kt
@@ -70,7 +70,7 @@ class FilesSyncWork(
         val changedFiles = inputData.getStringArray(CHANGED_FILES)
 
         backgroundJobManager.logStartOfWorker(BackgroundJobManagerImpl.formatClassTag(this::class) + "_" + syncFolderId)
-        Log_OC.d(TAG, "File-sync worker started for folder ID: $syncFolderId")
+        Log_OC.d(TAG, "AutoUpload started folder ID: $syncFolderId")
 
         // Create all the providers we'll need
         val resources = context.resources
@@ -81,7 +81,7 @@ class FilesSyncWork(
         dateFormat.timeZone = TimeZone.getTimeZone(TimeZone.getDefault().id)
 
         if (!setSyncedFolder(syncFolderId)) {
-            Log_OC.d(TAG, "File-sync kill worker since syncedFolder ($syncFolderId) is not enabled!")
+            Log_OC.w(TAG, "AutoUpload skipped since syncedFolder ($syncFolderId) is not enabled!")
             return logEndOfWorker(syncFolderId)
         }
 
@@ -97,6 +97,7 @@ class FilesSyncWork(
         )
 
         if (canExitEarly(changedFiles, syncFolderId)) {
+            Log_OC.w(TAG, "AutoUpload skipped canExit conditions are met")
             return logEndOfWorker(syncFolderId)
         }
 
@@ -108,11 +109,11 @@ class FilesSyncWork(
         // Get changed files from ContentObserverWork (only images and videos) or by scanning filesystem
         Log_OC.d(
             TAG,
-            "File-sync worker (${syncedFolder.remotePath}) changed files from observer: " +
+            "AutoUpload (${syncedFolder.remotePath}) changed files from observer: " +
                 changedFiles.contentToString()
         )
         collectChangedFiles(changedFiles)
-        Log_OC.d(TAG, "File-sync worker (${syncedFolder.remotePath}) finished checking files.")
+        Log_OC.d(TAG, "AutoUpload (${syncedFolder.remotePath}) finished checking files.")
 
         uploadFilesFromFolder(
             context,
@@ -135,7 +136,7 @@ class FilesSyncWork(
     }
 
     private fun logEndOfWorker(syncFolderId: Long): Result {
-        Log_OC.d(TAG, "File-sync worker (${syncedFolder.remotePath}) finished")
+        Log_OC.d(TAG, "AutoUpload worker (${syncedFolder.remotePath}) finished")
         val result = Result.success()
         backgroundJobManager.logEndOfWorker(
             BackgroundJobManagerImpl.formatClassTag(this::class) +
@@ -159,35 +160,37 @@ class FilesSyncWork(
         // If we are in power save mode better to postpone scan and upload
         val overridePowerSaving = inputData.getBoolean(OVERRIDE_POWER_SAVING, false)
         if ((powerManagementService.isPowerSavingEnabled && !overridePowerSaving)) {
-            Log_OC.d(TAG, "File-sync kill worker since powerSaving is enabled!")
+            Log_OC.w(TAG, "AutoUpload skipped powerSaving is enabled!")
             return true
         }
 
         if (syncedFolderID < 0) {
-            Log_OC.d(TAG, "File-sync kill worker since no valid syncedFolderID provided!")
+            Log_OC.w(TAG, "AutoUpload skipped no valid syncedFolderID provided")
             return true
         }
 
         // or sync worker already running
         if (backgroundJobManager.bothFilesSyncJobsRunning(syncedFolderID)) {
-            Log_OC.d(
-                TAG,
-                "File-sync kill worker since another instance of the worker " +
-                    "($syncedFolderID) seems to be running already!"
-            )
+            Log_OC.w(TAG, "AutoUpload skipped another worker instance is running for $syncedFolderID")
             return true
         }
 
-        val passedScanInterval = (
-            syncedFolder.lastScanTimestampMs +
-                FilesSyncHelper.calculateScanInterval(syncedFolder, connectivityService, powerManagementService)
-            ) <= System.currentTimeMillis()
+        val calculatedScanInterval =
+            FilesSyncHelper.calculateScanInterval(syncedFolder, connectivityService, powerManagementService)
+        val totalScanInterval = (syncedFolder.lastScanTimestampMs + calculatedScanInterval)
+        val currentTime = System.currentTimeMillis()
+        val passedScanInterval = totalScanInterval <= currentTime
+
+        Log_OC.d(TAG, "AutoUpload lastScanTimestampMs: " + syncedFolder.lastScanTimestampMs)
+        Log_OC.d(TAG, "AutoUpload calculatedScanInterval: $calculatedScanInterval")
+        Log_OC.d(TAG, "AutoUpload totalScanInterval: $totalScanInterval")
+        Log_OC.d(TAG, "AutoUpload currentTime: $currentTime")
+        Log_OC.d(TAG, "AutoUpload passedScanInterval: $passedScanInterval")
 
         if (!passedScanInterval && changedFiles.isNullOrEmpty() && !overridePowerSaving) {
-            Log_OC.d(
+            Log_OC.w(
                 TAG,
-                "File-sync kill worker since started before scan " +
-                    "Interval and nothing todo (${syncedFolder.localPath})!"
+                "AutoUpload skipped since started before scan interval and nothing todo: " + syncedFolder.localPath
             )
             return true
         }
@@ -196,7 +199,10 @@ class FilesSyncWork(
             !powerManagementService.battery.isCharging &&
             !powerManagementService.battery.isFull
         ) {
-            Log_OC.d(TAG, "File-sync kill worker since phone is not charging (${syncedFolder.localPath})!")
+            Log_OC.w(
+                TAG,
+                "AutoUpload skipped since phone is not charging: " + syncedFolder.localPath
+            )
             return true
         }
 
@@ -233,6 +239,7 @@ class FilesSyncWork(
 
         val optionalUser = userAccountManager.getUser(accountName)
         if (!optionalUser.isPresent) {
+            Log_OC.w(TAG, "AutoUpload:uploadFilesFromFolder skipped user not present")
             return
         }
 
@@ -252,23 +259,34 @@ class FilesSyncWork(
             syncedFolder.id.toString()
         )
         if (paths.isEmpty()) {
+            Log_OC.w(TAG, "AutoUpload:uploadFilesFromFolder skipped paths is empty")
             return
         }
 
         val pathsAndMimes = paths.map { path ->
             val file = File(path)
             val localPath = file.absolutePath
+            val remotePath = getRemotePath(file, syncedFolder, sFormatter, lightVersion, resources, currentLocale)
+            val mimeType = MimeTypeUtil.getBestMimeTypeByFilename(localPath)
+
+            Log_OC.d(TAG, "AutoUpload:pathsAndMimes file.path: ${file.path}")
+            Log_OC.d(TAG, "AutoUpload:pathsAndMimes localPath: $localPath")
+            Log_OC.d(TAG, "AutoUpload:pathsAndMimes remotePath: $remotePath")
+            Log_OC.d(TAG, "AutoUpload:pathsAndMimes mimeType: $mimeType")
+
             Triple(
                 localPath,
-                getRemotePath(file, syncedFolder, sFormatter, lightVersion, resources, currentLocale),
-                MimeTypeUtil.getBestMimeTypeByFilename(localPath)
+                remotePath,
+                mimeType
             )
         }
 
         val localPaths = pathsAndMimes.map { it.first }.toTypedArray()
         val remotePaths = pathsAndMimes.map { it.second }.toTypedArray()
 
         if (lightVersion) {
+            Log_OC.d(TAG, "AutoUpload:uploadFilesFromFolder light version is used")
+
             needsCharging = resources.getBoolean(R.bool.syncedFolder_light_on_charging)
             needsWifi = arbitraryDataProvider?.getBooleanValue(
                 accountName,
@@ -277,7 +295,10 @@ class FilesSyncWork(
 
             val uploadActionString = resources.getString(R.string.syncedFolder_light_upload_behaviour)
             uploadAction = getUploadAction(uploadActionString)
+            Log_OC.d(TAG, "AutoUpload upload action is: $uploadAction")
         } else {
+            Log_OC.d(TAG, "AutoUpload:uploadFilesFromFolder not light version is used")
+
             needsCharging = syncedFolder.isChargingOnly
             needsWifi = syncedFolder.isWifiOnly
             uploadAction = syncedFolder.uploadAction
@@ -287,7 +308,7 @@ class FilesSyncWork(
             user,
             localPaths,
             remotePaths,
-            uploadAction!!,
+            uploadAction,
             // create parent folder if not existent
             true,
             UploadFileOperation.CREATED_AS_INSTANT_PICTURE,
@@ -317,10 +338,14 @@ class FilesSyncWork(
         val useSubfolders: Boolean
         val subFolderRule: SubFolderRule
         if (lightVersion) {
+            Log_OC.d(TAG, "AutoUpload:getRemotePath light version is used")
+
             useSubfolders = resources.getBoolean(R.bool.syncedFolder_light_use_subfolders)
             remoteFolder = resources.getString(R.string.syncedFolder_remote_folder)
             subFolderRule = SubFolderRule.YEAR_MONTH
         } else {
+            Log_OC.d(TAG, "AutoUpload:getRemotePath not light version is used")
+
             useSubfolders = syncedFolder.isSubfolderByDate
             remoteFolder = syncedFolder.remotePath
             subFolderRule = syncedFolder.subfolderRule
@@ -348,6 +373,8 @@ class FilesSyncWork(
     ): Long {
         var lastModificationTime = file.lastModified()
         if (MediaFolderType.IMAGE == syncedFolder.type && hasExif(file)) {
+            Log_OC.d(TAG, "AutoUpload:calculateLastModificationTime exif found")
+
             @Suppress("TooGenericExceptionCaught") // legacy code
             try {
                 val exifInterface = ExifInterface(file.absolutePath)
@@ -356,6 +383,9 @@ class FilesSyncWork(
                     val pos = ParsePosition(0)
                     val dateTime = formatter.parse(exifDate, pos)
                     lastModificationTime = dateTime.time
+                    Log_OC.w(TAG, "AutoUpload:calculateLastModificationTime calculatedTime is: $lastModificationTime")
+                } else {
+                    Log_OC.w(TAG, "AutoUpload:calculateLastModificationTime exifDate is empty")
                 }
             } catch (e: Exception) {
                 Log_OC.d(TAG, "Failed to get the proper time " + e.localizedMessage)
@@ -364,7 +394,7 @@ class FilesSyncWork(
         return lastModificationTime
     }
 
-    private fun getUploadAction(action: String): Int? {
+    private fun getUploadAction(action: String): Int {
         return when (action) {
             "LOCAL_BEHAVIOUR_FORGET" -> FileUploadWorker.LOCAL_BEHAVIOUR_FORGET
             "LOCAL_BEHAVIOUR_MOVE" -> FileUploadWorker.LOCAL_BEHAVIOUR_MOVE
diff --git a/app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadWorker.kt b/app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadWorker.kt
@@ -97,6 +97,7 @@ class FileUploadWorker(
     @Suppress("TooGenericExceptionCaught")
     override fun doWork(): Result {
         return try {
+            Log_OC.d(TAG, "FileUploadWorker started")
             backgroundJobManager.logStartOfWorker(BackgroundJobManagerImpl.formatClassTag(this::class))
             val result = retrievePagesBySortingUploadsByID()
             backgroundJobManager.logEndOfWorker(BackgroundJobManagerImpl.formatClassTag(this::class), result)
@@ -135,7 +136,8 @@ class FileUploadWorker(
         var uploadsPerPage = uploadsStorageManager.getCurrentUploadsForAccountPageAscById(-1, accountName)
         val totalUploadSize = uploadsStorageManager.getTotalUploadSize(accountName)
 
-        Log_OC.d(TAG, "Total upload size: $totalUploadSize")
+        Log_OC.d(TAG, "FileUploadWorker:retrievePagesBySortingUploadsByID: $uploadsPerPage")
+        Log_OC.d(TAG, "FileUploadWorker:totalUploadSize: $totalUploadSize")
 
         while (uploadsPerPage.isNotEmpty() && !isStopped) {
             if (preferences.isGlobalUploadPaused) {
diff --git a/app/src/main/java/com/nextcloud/client/logger/Level.kt b/app/src/main/java/com/nextcloud/client/logger/Level.kt
@@ -6,6 +6,8 @@
  */
 package com.nextcloud.client.logger
 
+import com.owncloud.android.R
+
 enum class Level(val tag: String) {
     UNKNOWN("U"),
     VERBOSE("V"),
@@ -15,6 +17,18 @@ enum class Level(val tag: String) {
     ERROR("E"),
     ASSERT("A");
 
+    fun getColor(): Int {
+        return when (this) {
+            UNKNOWN -> R.color.log_level_unknown
+            VERBOSE -> R.color.log_level_verbose
+            DEBUG -> R.color.log_level_debug
+            INFO -> R.color.log_level_info
+            WARNING -> R.color.log_level_warning
+            ASSERT -> R.color.log_level_assert
+            ERROR -> R.color.log_level_error
+        }
+    }
+
     companion object {
         @JvmStatic
         fun fromTag(tag: String): Level = when (tag) {
diff --git a/app/src/main/java/com/nextcloud/client/logger/ui/LogsActivity.kt b/app/src/main/java/com/nextcloud/client/logger/ui/LogsActivity.kt
@@ -20,17 +20,13 @@ import com.nextcloud.client.di.ViewModelFactory
 import com.owncloud.android.R
 import com.owncloud.android.databinding.LogsActivityBinding
 import com.owncloud.android.ui.activity.ToolbarActivity
-import com.owncloud.android.utils.theme.ViewThemeUtils
 import javax.inject.Inject
 
 class LogsActivity : ToolbarActivity() {
 
     @Inject
     lateinit var viewModelFactory: ViewModelFactory
 
-    @Inject
-    lateinit var viewThemeUtils: ViewThemeUtils
-
     private lateinit var vm: LogsViewModel
     private lateinit var binding: LogsActivityBinding
     private lateinit var logsAdapter: LogsAdapter
diff --git a/app/src/main/java/com/nextcloud/client/logger/ui/LogsAdapter.kt b/app/src/main/java/com/nextcloud/client/logger/ui/LogsAdapter.kt
@@ -6,18 +6,20 @@
  */
 package com.nextcloud.client.logger.ui
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
+import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
 import com.nextcloud.client.logger.LogEntry
 import com.owncloud.android.R
 import java.text.SimpleDateFormat
 import java.util.Locale
 
-class LogsAdapter(context: Context) : RecyclerView.Adapter<LogsAdapter.ViewHolder>() {
+class LogsAdapter(private val context: Context) : RecyclerView.Adapter<LogsAdapter.ViewHolder>() {
 
     class ViewHolder(view: View) : RecyclerView.ViewHolder(view) {
         val header = view.findViewById<TextView>(R.id.log_entry_list_item_header)
@@ -28,6 +30,7 @@ class LogsAdapter(context: Context) : RecyclerView.Adapter<LogsAdapter.ViewHolde
     private val inflater = LayoutInflater.from(context)
 
     var entries: List<LogEntry> = listOf()
+        @SuppressLint("NotifyDataSetChanged")
         set(value) {
             field = value
             notifyDataSetChanged()
@@ -42,7 +45,12 @@ class LogsAdapter(context: Context) : RecyclerView.Adapter<LogsAdapter.ViewHolde
         val reversedPosition = entries.size - position - 1
         val entry = entries[reversedPosition]
         val header = "${timestampFormat.format(entry.timestamp)} ${entry.level.tag} ${entry.tag}"
+        val entryColor = ContextCompat.getColor(context, entry.level.getColor())
+
+        holder.header.setTextColor(entryColor)
         holder.header.text = header
+
+        holder.message.setTextColor(entryColor)
         holder.message.text = entry.message
     }
 }
diff --git a/app/src/main/java/com/nextcloud/utils/mdm/MDMConfig.kt b/app/src/main/java/com/nextcloud/utils/mdm/MDMConfig.kt
@@ -9,7 +9,6 @@ package com.nextcloud.utils.mdm
 
 import android.content.Context
 import android.content.RestrictionsManager
-import com.owncloud.android.BuildConfig
 import com.owncloud.android.R
 import com.owncloud.android.utils.appConfig.AppConfigKeys
 
@@ -108,7 +107,7 @@ object MDMConfig {
 
         val loggerEnabled = context.resources.getBoolean(R.bool.logger_enabled)
 
-        return loggerEnabled && !disableLogViaMDM && BuildConfig.DEBUG
+        return loggerEnabled && !disableLogViaMDM
     }
 
     fun getBaseUrl(context: Context): String = context.getRestriction(AppConfigKeys.BaseUrl, "")
diff --git a/app/src/main/java/com/owncloud/android/operations/UploadFileOperation.java b/app/src/main/java/com/owncloud/android/operations/UploadFileOperation.java
diff --git a/app/src/main/java/com/owncloud/android/utils/FileStorageUtils.java b/app/src/main/java/com/owncloud/android/utils/FileStorageUtils.java
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
