Merge pull request #4571 from owncloud/fix/duplicated_autouploads

[FIX] Image autoupload uploads images twice under certain conditions

Author: joragua

CHANGELOG.md

@@ -36,6 +36,7 @@ ownCloud admins and users.
 
 ## Summary
 
+* Bugfix - Changes in the automatic uploads algorithm to prevent duplications: [#3983](https://github.com/owncloud/android/issues/3983)
 * Bugfix - Token request with Bearer returns error: [#4080](https://github.com/owncloud/android/issues/4080)
 * Bugfix - Side menu collapses info in landscape: [#4513](https://github.com/owncloud/android/issues/4513)
 * Bugfix - Content in Spaces not shown from third-party apps: [#4522](https://github.com/owncloud/android/issues/4522)
@@ -51,6 +52,16 @@ ownCloud admins and users.
 
 ## Details
 
+* Bugfix - Changes in the automatic uploads algorithm to prevent duplications: [#3983](https://github.com/owncloud/android/issues/3983)
+
+   The timestamp for automatic uploads is now updated at the beginning of the
+   upload process instead of at the end. Additionally, the filter used in
+   AutomaticUploadsWorker to select the files to upload has been modified in order
+   to reduce time and charge when evaluating all files.
+
+   https://github.com/owncloud/android/issues/3983
+   https://github.com/owncloud/android/pull/4571
+
 * Bugfix - Token request with Bearer returns error: [#4080](https://github.com/owncloud/android/issues/4080)
 
    A new condition has been added into the network client to check if the network

changelog/unreleased/4571

@@ -0,0 +1,7 @@
+Bugfix: Changes in the automatic uploads algorithm to prevent duplications
+
+The timestamp for automatic uploads is now updated at the beginning of the upload process instead of at the end. Additionally, the filter
+used in AutomaticUploadsWorker to select the files to upload has been modified in order to reduce time and charge when evaluating all files.
+
+https://github.com/owncloud/android/issues/3983
+https://github.com/owncloud/android/pull/4571

owncloudApp/src/main/java/com/owncloud/android/presentation/releasenotes/ReleaseNotesViewModel.kt

@@ -48,6 +48,11 @@ class ReleaseNotesViewModel(
                 subtitle = R.string.release_notes_4_6_0_subtitle_shares_space_docs_provider,
                 type = ReleaseNoteType.ENHANCEMENT
             ),
+            ReleaseNote(
+                title = R.string.release_notes_4_6_0_title_duplicated_automatic_uploads,
+                subtitle = R.string.release_notes_4_6_0_subtitle_duplicated_automatic_uploads,
+                type = ReleaseNoteType.BUGFIX
+            ),
             ReleaseNote(
                 title = R.string.release_notes_bugfixes_title,
                 subtitle = R.string.release_notes_bugfixes_subtitle,

owncloudApp/src/main/java/com/owncloud/android/presentation/settings/automaticuploads/SettingsPictureUploadsFragment.kt

@@ -173,7 +173,7 @@ class SettingsPictureUploadsFragment : PreferenceFragmentCompat() {
                 picturesViewModel.enablePictureUploads(selectedAccount)
                 showAlertDialog(
                     title = getString(R.string.common_important),
-                    message = getString(R.string.proper_pics_folder_warning_camera_upload)
+                    message = getString(R.string.proper_pics_folder_warning_camera_upload, getString(R.string.app_name))
                 )
                 true
             } else {

owncloudApp/src/main/java/com/owncloud/android/presentation/settings/automaticuploads/SettingsVideoUploadsFragment.kt

@@ -171,7 +171,7 @@ class SettingsVideoUploadsFragment : PreferenceFragmentCompat() {
                 videosViewModel.enableVideoUploads(selectedAccount)
                 showAlertDialog(
                     title = getString(R.string.common_important),
-                    message = getString(R.string.proper_videos_folder_warning_camera_upload)
+                    message = getString(R.string.proper_videos_folder_warning_camera_upload, getString(R.string.app_name))
                 )
                 true
             } else {

owncloudApp/src/main/java/com/owncloud/android/workers/AutomaticUploadsWorker.kt

@@ -3,8 +3,9 @@
  *
  * @author Abel García de Prada
  * @author Juan Carlos Garrote Gascón
+ * @author Jorge Aguado Recio
  *
- * Copyright (C) 2022 ownCloud GmbH.
+ * Copyright (C) 2025 ownCloud GmbH.
  * <p>
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2,
@@ -122,9 +123,7 @@ class AutomaticUploadsWorker(
         WorkManager.getInstance(appContext).cancelUniqueWork(AUTOMATIC_UPLOADS_WORKER)
     }
 
-    private fun syncFolder(folderBackUpConfiguration: FolderBackUpConfiguration?) {
-        if (folderBackUpConfiguration == null) return
-
+    private fun syncFolder(folderBackUpConfiguration: FolderBackUpConfiguration) {
         val syncType = when {
             folderBackUpConfiguration.isPictureUploads -> SyncType.PICTURE_UPLOADS
             folderBackUpConfiguration.isVideoUploads -> SyncType.VIDEO_UPLOADS
@@ -133,6 +132,7 @@ class AutomaticUploadsWorker(
         }
 
         val currentTimestamp = System.currentTimeMillis()
+        updateTimestamp(folderBackUpConfiguration, syncType, currentTimestamp)
 
         val localPicturesDocumentFiles: List<DocumentFile> = getFilesReadyToUpload(
             syncType = syncType,
@@ -166,7 +166,6 @@ class AutomaticUploadsWorker(
                 chargingOnly = folderBackUpConfiguration.chargingOnly
             )
         }
-        updateTimestamp(folderBackUpConfiguration, syncType, currentTimestamp)
     }
 
     private fun showNotification(
@@ -248,10 +247,14 @@ class AutomaticUploadsWorker(
         val arrayOfLocalFiles = documentTree?.listFiles() ?: arrayOf()
 
         val filteredList: List<DocumentFile> = arrayOfLocalFiles
+            .asSequence()
+            .filter {
+                it.lastModified() in lastSyncTimestamp..<currentTimestamp &&
+                        MimetypeIconUtil.getBestMimeTypeByFilename(it.name).startsWith(syncType.prefixForType) &&
+                        !it.name.orEmpty().startsWith(".")
+            }
             .sortedBy { it.lastModified() }
-            .filter { it.lastModified() >= lastSyncTimestamp }
-            .filter { it.lastModified() < currentTimestamp }
-            .filter { MimetypeIconUtil.getBestMimeTypeByFilename(it.name).startsWith(syncType.prefixForType) }
+            .toList()
 
         Timber.i("Last sync ${syncType.name}: ${Date(lastSyncTimestamp)}")
         Timber.i("CurrentTimestamp ${Date(currentTimestamp)}")

owncloudApp/src/main/res/values-ar/strings.xml

@@ -356,8 +356,6 @@
   <string name="confirmation_disable_camera_uploads_title">تأكيد</string>
   <string name="confirmation_disable_pictures_upload_message">هل أنت متأكد أنك ترغب في تعطيل هذه الميزة؟ لن يتم تحميل الصور المعلقة</string>
   <string name="confirmation_disable_videos_upload_message">هل أنت متأكد أنك ترغب في تعطيل هذه الميزة؟ لن يتم تحميل مقاطع الفيديو المعلقة</string>
-  <string name="proper_pics_folder_warning_camera_upload">يُرجى التأكد من أن المجلد المحدد هو المكان الذي تحفظ فيه الكاميرا التي تستخدمها الصور الملتقطة. وإلا لن تتمكن الميزة من العثور على صورك. يُرجى مراعاة أن عملية تحميل الصور ستتم في غضون 15 دقيقة على الأقل من التقاطها.</string>
-  <string name="proper_videos_folder_warning_camera_upload">يُرجى التأكد من أن المجلد المحدد هو المكان الذي تحفظ فيه الكاميرا التي تستخدمها مقاطع الفيديو المسجلة. وإلا لن تتمكن الميزة من العثور على مقاطع الفيديو. يُرجى مراعاة أن عملية تحميل مقاطع الفيديو ستتم في غضون 15 دقيقة على الأقل من تسجيلها.</string>
   <string name="conflict_description">حدث تعارض في ملف %1$s، انقر لحل هذه المشكلة</string>
   <string name="conflict_message">ما الملفات التي ترغب في حفظها؟ إن حددت كلا الإصدارَين، فستتم إضافة رقم إلى اسم الملف المحلي.</string>
   <string name="conflict_keep_both">احتفظ بالإصدارين</string>

owncloudApp/src/main/res/values-bg-rBG/strings.xml

@@ -356,8 +356,6 @@
   <string name="placeholder_timestamp">2012/05/18 12:23 PM</string>
   <string name="placeholder_media_time">12:23:45</string>
   <string name="confirmation_disable_camera_uploads_title">Потвърждаване</string>
-  <string name="proper_pics_folder_warning_camera_upload">Моля уверете се, че избраната папка е мястото където камерата, която използвате запазва направените изображения. В противен случай функцията няма да може да ги открие. Имайте предвид, че изображенията ще бъдат качени най-малко 15 минути след заснемането им.</string>
-  <string name="proper_videos_folder_warning_camera_upload">Моля уверете се, че избраната папка е мястото където камерата, която използвате запазва записаните видеоклипове. В противен случай функцията няма да може да открие вашите видеоклипове. Имайте предвид, че видеоклиповете ще бъдат качени най-малко 15 минути след записването им.</string>
   <string name="conflict_title">Файл в конфликт</string>
   <string name="conflict_message">Кои файлове искате да запазите? Ако изберете и двете версии, локалния файл ще има числа добавени към името си.</string>
   <string name="conflict_keep_both">Запазване и на двата</string>

owncloudApp/src/main/res/values-ca/strings.xml

@@ -340,8 +340,6 @@
   <string name="confirmation_disable_camera_uploads_title">Confirma</string>
   <string name="confirmation_disable_pictures_upload_message">Estàs segur que vols desactivar aquesta funció? Les fotos pendents no es carregaran.</string>
   <string name="confirmation_disable_videos_upload_message">Estàs segur que vols desactivar aquesta funció? Les fotos pendents no es carregaran.</string>
-  <string name="proper_pics_folder_warning_camera_upload">Si us plau assegura\'t de que la carpeta que has seleccionat és on la càmara que estàs fent servir guarda les fotografies fetes. En cas contrari l\'aplicació no podrà detectar les vostres imatges. Tingueu en compte que les imatges es penjarant al menys 15 minuts després de fer-les.</string>
-  <string name="proper_videos_folder_warning_camera_upload">Si us plau assegura\'t de que la carpeta que has seleccionat és on la càmara que estàs fent servir guarda els videos fets. En cas contrari l\'aplicació no podrà detectar els vostres videos. Tingueu en compte que els videos es penjarant al menys 15 minuts després de fer-los.</string>
   <string name="conflict_description">Hi ha un conflicte en l\'arxiu 1%1$s, clicka per arreglar-ho</string>
   <string name="conflict_message">Quins fitxers vols mantenir? Si seleccioneu les dues versions, el fitxer local tindrà un número afegit al seu nom.</string>
   <string name="conflict_keep_both">Mantén-los ambdós</string>

owncloudApp/src/main/res/values-cs-rCZ/strings.xml

@@ -410,8 +410,6 @@
   <string name="confirmation_disable_camera_uploads_title">Potvrzení</string>
   <string name="confirmation_disable_pictures_upload_message">Opravdu chcete tuto funkci deaktivovat? Nevyřízené obrázky nebudou nahrány.</string>
   <string name="confirmation_disable_videos_upload_message">Opravdu chcete tuto funkci deaktivovat? Nevyřízená videa nebudou nahrána.</string>
-  <string name="proper_pics_folder_warning_camera_upload">Prosím ujistěte se, že vybraná složka obsahuje fotografie pořízené fotoaparátem. Jinak aplikace nebude schopna rozpoznat vaše fotografie. Mějte na paměti, že budou nahrány nejdříve 15 minut po jejich pořízení.</string>
-  <string name="proper_videos_folder_warning_camera_upload">Prosím ujistěte se, že vybraná složka obsahuje videa pořízená fotoaparátem. Jinak aplikace nebude schopna rozpoznat vaše videa. Mějte na paměti, že budou nahrána nejdříve 15 minut po jejich pořízení.</string>
   <string name="conflict_title">Konflikt souboru</string>
   <string name="conflict_description">Soubor %1$s obsahuje konflikt, kliknutím na tlačítko jej vyřešíte.</string>
   <string name="conflict_message">Které soubory chcete ponechat? Pokud zvolíte obě verze, zkopírovaný soubor bude mít název doplněný o číslo.</string>