Picture Upload: Make UX more instant

..by running uploads 10sec after app comes to foreground

For #78

Author: guruz

opencloudApp/src/main/java/eu/opencloud/android/MainApp.kt

@@ -67,6 +67,7 @@ import eu.opencloud.android.presentation.settings.logging.SettingsLogsFragment.C
 import eu.opencloud.android.providers.CoroutinesDispatcherProvider
 import eu.opencloud.android.providers.LogsProvider
 import eu.opencloud.android.providers.MdmProvider
+import eu.opencloud.android.providers.WorkManagerProvider
 import eu.opencloud.android.ui.activity.FileDisplayActivity
 import eu.opencloud.android.ui.activity.FileDisplayActivity.Companion.PREFERENCE_CLEAR_DATA_ALREADY_TRIGGERED
 import eu.opencloud.android.ui.activity.WhatsNewActivity
@@ -78,6 +79,8 @@ import eu.opencloud.android.utils.FILE_SYNC_NOTIFICATION_CHANNEL_ID
 import eu.opencloud.android.utils.MEDIA_SERVICE_NOTIFICATION_CHANNEL_ID
 import eu.opencloud.android.utils.UPLOAD_NOTIFICATION_CHANNEL_ID
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
 import org.koin.android.ext.android.inject
@@ -117,10 +120,11 @@ class MainApp : Application() {
 
         SingleSessionManager.setUserAgent(userAgent)
 
-
-
         initDependencyInjection()
 
+        val workManagerProvider: WorkManagerProvider by inject()
+        var startedActivities = 0
+
         // register global protection with pass code, pattern lock and biometric lock
         registerActivityLifecycleCallbacks(object : ActivityLifecycleCallbacks {
             override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {
@@ -219,6 +223,16 @@ class MainApp : Application() {
 
             override fun onActivityStarted(activity: Activity) {
                 Timber.v("${activity.javaClass.simpleName} onStart() starting")
+                if (startedActivities == 0) {
+                    // App entered foreground — ensure the periodic worker is registered
+                    // (recovers if the chain was dropped) and trigger an immediate scan
+                    // so the user doesn't have to wait up to 15 min.
+                    CoroutineScope(Dispatchers.IO).launch {
+                        workManagerProvider.enqueueAutomaticUploadsWorker()
+                        workManagerProvider.enqueueImmediateAutomaticUploadsWorker()
+                    }
+                }
+                startedActivities++
                 PassCodeManager.onActivityStarted(activity)
                 PatternManager.onActivityStarted(activity)
                 BiometricManager.onActivityStarted(activity)
@@ -233,6 +247,7 @@ class MainApp : Application() {
             }
 
             override fun onActivityStopped(activity: Activity) {
+                startedActivities--
                 Timber.v("${activity.javaClass.simpleName} onStop() ending")
                 PassCodeManager.onActivityStopped(activity)
                 PatternManager.onActivityStopped(activity)

opencloudApp/src/main/java/eu/opencloud/android/providers/WorkManagerProvider.kt

@@ -25,6 +25,7 @@ import android.content.Context
 import androidx.lifecycle.LiveData
 import androidx.work.Constraints
 import androidx.work.ExistingPeriodicWorkPolicy
+import androidx.work.ExistingWorkPolicy
 import androidx.work.NetworkType
 import androidx.work.OneTimeWorkRequestBuilder
 import androidx.work.PeriodicWorkRequestBuilder
@@ -40,6 +41,7 @@ import eu.opencloud.android.workers.OldLogsCollectorWorker
 import eu.opencloud.android.workers.RemoveLocallyFilesWithLastUsageOlderThanGivenTimeWorker
 import eu.opencloud.android.workers.UploadFileFromContentUriWorker
 import eu.opencloud.android.workers.UploadFileFromFileSystemWorker
+import timber.log.Timber
 
 class WorkManagerProvider(
     val context: Context
@@ -55,6 +57,36 @@ class WorkManagerProvider(
             .enqueueUniquePeriodicWork(AutomaticUploadsWorker.AUTOMATIC_UPLOADS_WORKER, ExistingPeriodicWorkPolicy.KEEP, automaticUploadsWorker)
     }
 
+    /**
+     * Trigger an immediate one-time upload scan, e.g. when the app enters foreground.
+     * Skips if either the periodic or immediate worker is already running to avoid
+     * concurrent scans or redundant enqueues on rapid foreground/background switches.
+     */
+    fun enqueueImmediateAutomaticUploadsWorker() {
+        val wm = WorkManager.getInstance(context)
+
+        val periodicRunning = wm.getWorkInfosForUniqueWork(AutomaticUploadsWorker.AUTOMATIC_UPLOADS_WORKER)
+            .get().any { it.state == WorkInfo.State.RUNNING }
+        val immediateRunning = wm.getWorkInfosForUniqueWork(AutomaticUploadsWorker.IMMEDIATE_UPLOADS_WORKER)
+            .get().any { it.state == WorkInfo.State.RUNNING }
+
+        if (periodicRunning || immediateRunning) {
+            Timber.d("Automatic uploads worker already running, skipping immediate run")
+            return
+        }
+
+        val immediateWorker = OneTimeWorkRequestBuilder<AutomaticUploadsWorker>()
+            .addTag(AutomaticUploadsWorker.IMMEDIATE_UPLOADS_WORKER)
+            .setInitialDelay(AutomaticUploadsWorker.WRITE_SAFETY_BUFFER_MS, java.util.concurrent.TimeUnit.MILLISECONDS)
+            .build()
+
+        wm.enqueueUniqueWork(
+            AutomaticUploadsWorker.IMMEDIATE_UPLOADS_WORKER,
+            ExistingWorkPolicy.KEEP,
+            immediateWorker
+        )
+    }
+
     fun enqueueOldLogsCollectorWorker() {
         val constraintsRequired = Constraints.Builder().setRequiredNetworkType(NetworkType.NOT_REQUIRED).build()
 

opencloudApp/src/main/java/eu/opencloud/android/workers/AutomaticUploadsWorker.kt

@@ -174,7 +174,10 @@ class AutomaticUploadsWorker(
                 chargingOnly = folderBackUpConfiguration.chargingOnly
             )
         }
-        updateTimestamp(folderBackUpConfiguration, syncType, currentTimestamp)
+        // Save safeTimestamp (not currentTimestamp) so that files skipped by the
+        // write-safety buffer are re-evaluated on the next run instead of being lost.
+        val safeTimestamp = currentTimestamp - WRITE_SAFETY_BUFFER_MS
+        updateTimestamp(folderBackUpConfiguration, syncType, safeTimestamp)
     }
 
     private fun showNotification(
@@ -255,10 +258,15 @@ class AutomaticUploadsWorker(
         val documentTree = DocumentFile.fromTreeUri(applicationContext, sourceUri)
         val arrayOfLocalFiles = documentTree?.listFiles() ?: arrayOf()
 
+        // Exclude files modified within the last few seconds. Camera apps may still be
+        // writing the file (not all apps use atomic rename), so picking it up too early
+        // can result in uploading a truncated or 0-byte JPEG.
+        val safeTimestamp = currentTimestamp - WRITE_SAFETY_BUFFER_MS
+
         val filteredList: List<DocumentFile> = arrayOfLocalFiles
             .sortedBy { it.lastModified() }
             .filter { it.lastModified() >= lastSyncTimestamp }
-            .filter { it.lastModified() < currentTimestamp }
+            .filter { it.lastModified() < safeTimestamp }
             .filter { MimetypeIconUtil.getBestMimeTypeByFilename(it.name).startsWith(syncType.prefixForType) }
 
         Timber.i("Last sync ${syncType.name}: ${Date(lastSyncTimestamp)}")
@@ -321,9 +329,11 @@ class AutomaticUploadsWorker(
 
     companion object {
         const val AUTOMATIC_UPLOADS_WORKER = "AUTOMATIC_UPLOADS_WORKER"
+        const val IMMEDIATE_UPLOADS_WORKER = "IMMEDIATE_AUTOMATIC_UPLOADS_WORKER"
         const val repeatInterval: Long = 15L
         val repeatIntervalTimeUnit: TimeUnit = TimeUnit.MINUTES
         private const val pictureUploadsNotificationId = 101
         private const val videoUploadsNotificationId = 102
+        const val WRITE_SAFETY_BUFFER_MS = 10_000L
     }
 }