fixes after resolving merge conflicts

App compiles but the upload progress is buggy

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>

Author: mahibi

app/src/main/java/com/nextcloud/talk/jobs/UploadAndShareFilesWorker.kt

@@ -145,7 +145,12 @@ class UploadAndShareFilesWorker(val context: Context, workerParameters: WorkerPa
                 currentUser.capabilities!!.spreedCapability!!
             )
             file?.let { isChunkedUploading = it.length() > CHUNK_UPLOAD_THRESHOLD_SIZE }
-            val uploadSuccess: Boolean = uploadFile(sourceFileUri, remotePath, useConversationSubfolders)
+            val uploadSuccess: Boolean = uploadFile(
+                sourceFileUri = sourceFileUri,
+                metaData = metaData,
+                remotePath = remotePath,
+                useConversationSubfolders = useConversationSubfolders
+            )
 
             if (uploadSuccess) {
                 val shareSuccess = shareFile(remotePath, metaData)

app/src/main/java/com/nextcloud/talk/ui/chat/ChatView.kt

@@ -429,7 +429,7 @@ fun ChatView(
                                     onQuotedMessageClick = handleQuotedMessageClick,
                                     onSystemMessageExpandClick = callbacks.messageCallbacks.onSystemMessageExpandClick,
                                     onAvatarClick = callbacks.messageCallbacks.onAvatarClick,
-                                    onCancelUpload = callbacks.onCancelUpload
+                                    onCancelUpload = callbacks.messageCallbacks.onCancelUpload
                                 )
                             )
                         }

app/src/main/java/com/nextcloud/talk/upload/chunked/ChunkedFileUploader.kt

@@ -32,8 +32,6 @@ import com.nextcloud.talk.filebrowser.models.properties.OCFavorite
 import com.nextcloud.talk.filebrowser.models.properties.OCId
 import com.nextcloud.talk.filebrowser.models.properties.OCSize
 import com.nextcloud.talk.jobs.ShareOperationWorker
-import com.nextcloud.talk.dagger.modules.RestModule
-import com.nextcloud.talk.data.user.model.User
 import com.nextcloud.talk.remotefilebrowser.model.RemoteFileBrowserItem
 import com.nextcloud.talk.utils.ApiUtils
 import com.nextcloud.talk.utils.FileUtils