Browse Source

rename last remaining FileDownload occurrences
early exit in FilesExportWork.kt

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>

tobiasKaminsky 3 years ago
parent
commit
72044454c1

+ 2 - 2
app/src/main/java/com/nextcloud/client/jobs/BackgroundJobFactory.kt

@@ -100,13 +100,13 @@ class BackgroundJobFactory @Inject constructor(
                 AccountRemovalWork::class -> createAccountRemovalWork(context, workerParameters)
                 CalendarBackupWork::class -> createCalendarBackupWork(context, workerParameters)
                 CalendarImportWork::class -> createCalendarImportWork(context, workerParameters)
-                FilesExportWork::class -> createFilesDownloadWork(context, workerParameters)
+                FilesExportWork::class -> createFilesExportWork(context, workerParameters)
                 else -> null // caller falls back to default factory
             }
         }
     }
 
-    private fun createFilesDownloadWork(
+    private fun createFilesExportWork(
         context: Context,
         params: WorkerParameters
     ): ListenableWorker {

+ 1 - 1
app/src/main/java/com/nextcloud/client/jobs/BackgroundJobManager.kt

@@ -127,7 +127,7 @@ interface BackgroundJobManager {
      */
     fun startImmediateCalendarImport(calendarPaths: Map<String, Int>): LiveData<JobInfo?>
 
-    fun startImmediateFilesDownloadJob(files: Collection<OCFile>): LiveData<JobInfo?>
+    fun startImmediateFilesExportJob(files: Collection<OCFile>): LiveData<JobInfo?>
 
     fun schedulePeriodicFilesSyncJob()
     fun startImmediateFilesSyncJob(skipCustomFolders: Boolean = false, overridePowerSaving: Boolean = false)

+ 4 - 4
app/src/main/java/com/nextcloud/client/jobs/BackgroundJobManagerImpl.kt

@@ -79,7 +79,7 @@ internal class BackgroundJobManagerImpl(
         const val JOB_NOTIFICATION = "notification"
         const val JOB_ACCOUNT_REMOVAL = "account_removal"
         const val JOB_IMMEDIATE_CALENDAR_BACKUP = "immediate_calendar_backup"
-        const val JOB_IMMEDIATE_FILES_DOWNLOAD = "immediate_files_download"
+        const val JOB_IMMEDIATE_FILES_EXPORT = "immediate_files_export"
 
         const val JOB_TEST = "test_job"
 
@@ -300,18 +300,18 @@ internal class BackgroundJobManagerImpl(
         return workManager.getJobInfo(request.id)
     }
 
-    override fun startImmediateFilesDownloadJob(files: Collection<OCFile>): LiveData<JobInfo?> {
+    override fun startImmediateFilesExportJob(files: Collection<OCFile>): LiveData<JobInfo?> {
         val ids = files.map { it.fileId }.toLongArray()
 
         val data = Data.Builder()
             .putLongArray(FilesExportWork.FILES_TO_DOWNLOAD, ids)
             .build()
 
-        val request = oneTimeRequestBuilder(FilesExportWork::class, JOB_IMMEDIATE_FILES_DOWNLOAD)
+        val request = oneTimeRequestBuilder(FilesExportWork::class, JOB_IMMEDIATE_FILES_EXPORT)
             .setInputData(data)
             .build()
 
-        workManager.enqueueUniqueWork(JOB_IMMEDIATE_FILES_DOWNLOAD, ExistingWorkPolicy.APPEND_OR_REPLACE, request)
+        workManager.enqueueUniqueWork(JOB_IMMEDIATE_FILES_EXPORT, ExistingWorkPolicy.APPEND_OR_REPLACE, request)
 
         return workManager.getJobInfo(request.id)
     }

+ 6 - 1
app/src/main/java/com/nextcloud/client/jobs/FilesExportWork.kt

@@ -38,6 +38,7 @@ import com.owncloud.android.R
 import com.owncloud.android.datamodel.FileDataStorageManager
 import com.owncloud.android.datamodel.OCFile
 import com.owncloud.android.files.services.FileDownloader
+import com.owncloud.android.lib.common.utils.Log_OC
 import com.owncloud.android.operations.DownloadType
 import com.owncloud.android.ui.dialog.SendShareDialog
 import com.owncloud.android.ui.notifications.NotificationUtils
@@ -55,12 +56,16 @@ class FilesExportWork(
 ) : Worker(appContext, params) {
     companion object {
         const val FILES_TO_DOWNLOAD = "files_to_download"
-        private const val NUMERIC_NOTIFICATION_ID = "NUMERIC_NOTIFICATION_ID"
     }
 
     override fun doWork(): Result {
         val fileIDs = inputData.getLongArray(FILES_TO_DOWNLOAD) ?: LongArray(0)
 
+        if (fileIDs.isEmpty()) {
+            Log_OC.w(this, "File export was started without any file")
+            return Result.success()
+        }
+
         val storageManager = FileDataStorageManager(user, contentResolver)
 
         var successfulExports = 0

+ 1 - 1
app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java

@@ -1844,7 +1844,7 @@ public class OCFileListFragment extends ExtendedListFragment implements
                                                            ));
         }
 
-        backgroundJobManager.startImmediateFilesDownloadJob(files);
+        backgroundJobManager.startImmediateFilesExportJob(files);
     }
 
     private void showSpaceErrorDialog(OCFile file, long availableSpaceOnDevice) {