Kotlin conversion of UploadFileOperation

Signed-off-by: Hannes Achleitner <hannes.software@gmx.at>

Author: hannesa2

.idea/codeStyles/Project.xml

@@ -71,7 +71,7 @@ abstract class FileUploaderIT : AbstractOnServerIT() {
     //
     //     assertTrue(
     //         UploadFileOperation(
-    //             uploadsStorageManager,
+    //             uploadsStorageManager!!,
     //             connectivityServiceMock,
     //             powerManagementServiceMock,
     //             user,
@@ -97,7 +97,7 @@ abstract class FileUploaderIT : AbstractOnServerIT() {
     //
     //     assertTrue(
     //         UploadFileOperation(
-    //             uploadsStorageManager,
+    //             uploadsStorageManager!!,
     //             connectivityServiceMock,
     //             powerManagementServiceMock,
     //             user,
@@ -175,7 +175,7 @@ abstract class FileUploaderIT : AbstractOnServerIT() {
 
         assertTrue(
             UploadFileOperation(
-                uploadsStorageManager,
+                uploadsStorageManager!!,
                 connectivityServiceMock,
                 powerManagementServiceMock,
                 user,
@@ -203,7 +203,7 @@ abstract class FileUploaderIT : AbstractOnServerIT() {
 
         assertTrue(
             UploadFileOperation(
-                uploadsStorageManager,
+                uploadsStorageManager!!,
                 connectivityServiceMock,
                 powerManagementServiceMock,
                 user,
@@ -215,10 +215,11 @@ abstract class FileUploaderIT : AbstractOnServerIT() {
                 false,
                 false,
                 storageManager
-            )
-                .addRenameUploadListener {
+            ).addRenameUploadListener(object : UploadFileOperation.OnRenameListener {
+                override fun onRenameUpload() {
                     renameListenerWasTriggered = true
                 }
+            })
                 .execute(client)
                 .isSuccess
         )
@@ -294,7 +295,7 @@ abstract class FileUploaderIT : AbstractOnServerIT() {
 
         assertTrue(
             UploadFileOperation(
-                uploadsStorageManager,
+                uploadsStorageManager!!,
                 connectivityServiceMock,
                 powerManagementServiceMock,
                 user,
@@ -321,7 +322,7 @@ abstract class FileUploaderIT : AbstractOnServerIT() {
 
         assertFalse(
             UploadFileOperation(
-                uploadsStorageManager,
+                uploadsStorageManager!!,
                 connectivityServiceMock,
                 powerManagementServiceMock,
                 user,
@@ -397,7 +398,7 @@ abstract class FileUploaderIT : AbstractOnServerIT() {
 
         assertTrue(
             UploadFileOperation(
-                uploadsStorageManager,
+                uploadsStorageManager!!,
                 connectivityServiceMock,
                 powerManagementServiceMock,
                 user,
@@ -423,7 +424,7 @@ abstract class FileUploaderIT : AbstractOnServerIT() {
         val ocUpload2 = OCUpload(getDummyFile("empty.txt").absolutePath, "/testFile.txt", account.name)
 
         val uploadResult = UploadFileOperation(
-            uploadsStorageManager,
+            uploadsStorageManager!!,
             connectivityServiceMock,
             powerManagementServiceMock,
             user,

app/src/androidTest/java/com/owncloud/android/files/services/FileUploaderIT.kt

@@ -52,6 +52,7 @@ import kotlinx.coroutines.withContext
 import java.io.File
 import java.util.concurrent.ConcurrentHashMap
 import kotlin.random.Random
+import kotlin.time.Duration.Companion.milliseconds
 
 @Suppress("LongParameterList", "TooGenericExceptionCaught")
 class FileUploadWorker(
@@ -250,7 +251,7 @@ class FileUploadWorker(
         for ((index, upload) in uploads.withIndex()) {
             ensureActive()
 
-            delay(retryPolicy.getDelay())
+            delay(retryPolicy.getDelay().milliseconds)
 
             if (!skipAutoUploadCheck && isBelongToAnySyncedFolder(upload, syncFolderHelper, syncedFolders)) {
                 Log_OC.d(TAG, "skipping upload, will be handled by AutoUploadWorker: ${upload.localPath}")
@@ -368,7 +369,7 @@ class FileUploadWorker(
             result = operation.execute(client)
             val task = ThumbnailsCacheManager.ThumbnailGenerationTask(storageManager, user)
             val file = File(operation.originalStoragePath)
-            val remoteId: String? = operation.file.remoteId
+            val remoteId: String? = operation.file!!.remoteId
             task.execute(ThumbnailsCacheManager.ThumbnailGenerationTaskObject(file, remoteId))
             fileUploadEventBroadcaster.sendUploadStarted(operation, context)
         } catch (e: Exception) {
@@ -387,7 +388,7 @@ class FileUploadWorker(
                         val showSameFileAlreadyExistsNotification =
                             inputData.getBoolean(SHOW_SAME_FILE_ALREADY_EXISTS_NOTIFICATION, false)
                         if (showSameFileAlreadyExistsNotification) {
-                            notificationManager.showSameFileAlreadyExistsNotification(operation.fileName)
+                            notificationManager.showSameFileAlreadyExistsNotification(operation.fileName!!)
                         }
                     }
                 },

app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadWorker.kt

@@ -99,7 +99,7 @@ class UploadNotificationManager(private val context: Context, viewThemeUtils: Vi
             setProgress(0, 0, false)
         }.build()
 
-        showNotification(operation.file.fileId.toInt(), notification)
+        showNotification(operation.file!!.fileId.toInt(), notification)
     }
 
     fun showConnectionErrorNotification() {

app/src/main/java/com/nextcloud/client/jobs/upload/UploadNotificationManager.kt

@@ -57,7 +57,7 @@ object UploadErrorNotificationManager {
     ) {
         Log_OC.d(TAG, "handle upload result with result code: " + result.code)
 
-        if (result.isSuccess || operation.isMissingPermissionThrown) {
+        if (result.isSuccess || operation.isMissingPermissionThrown()) {
             Log_OC.d(TAG, "operation is successful, cancelled or lack of storage permission, notification skipped")
             return
         }

app/src/main/java/com/nextcloud/client/jobs/utils/UploadErrorNotificationManager.kt

@@ -70,7 +70,7 @@ protected RemoteOperationResult run(OwnCloudClient client) {
             if (file.isFolder()) {
                 targetPath = targetParentPath + file.getFileName();
             }
-            targetPath = UploadFileOperation.getNewAvailableRemotePath(client, targetPath, null, false);
+            targetPath = UploadFileOperation.Companion.getNewAvailableRemotePath(client, targetPath, null, false);
 
             if (file.isFolder()) {
                 targetPath += OCFile.PATH_SEPARATOR;

app/src/main/java/com/owncloud/android/operations/CopyFileOperation.java

@@ -0,0 +1,16 @@
+/*
+ * Nextcloud - Android Client
+ *
+ * SPDX-FileCopyrightText: 2019 Andy Scherzinger <info@andy-scherzinger.de>
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
+ */
+package com.owncloud.android.operations
+
+class UploadException : Exception {
+
+    constructor(message: String?) : super(message)
+
+    companion object {
+        private const val serialVersionUID = 5931153844211429915L
+    }
+}