From ae39d1ac0236aeec7d89c366feafd6740b5ccd0c Mon Sep 17 00:00:00 2001 From: alperozturk Date: Thu, 21 Dec 2023 14:50:00 +0100 Subject: [PATCH] Solve git conflicts Signed-off-by: alperozturk --- .../client/files/downloader/FilesDownloadIntents.kt | 1 - .../com/nextcloud/client/jobs/BackgroundJobFactory.kt | 11 ----------- 2 files changed, 12 deletions(-) diff --git a/app/src/main/java/com/nextcloud/client/files/downloader/FilesDownloadIntents.kt b/app/src/main/java/com/nextcloud/client/files/downloader/FilesDownloadIntents.kt index 4c5a5b2c780c..d8d6e67a2c8f 100644 --- a/app/src/main/java/com/nextcloud/client/files/downloader/FilesDownloadIntents.kt +++ b/app/src/main/java/com/nextcloud/client/files/downloader/FilesDownloadIntents.kt @@ -80,5 +80,4 @@ class FilesDownloadIntents(private val context: Context) { Intent() } } - } diff --git a/app/src/main/java/com/nextcloud/client/jobs/BackgroundJobFactory.kt b/app/src/main/java/com/nextcloud/client/jobs/BackgroundJobFactory.kt index 9526f41150fe..38debc763eed 100644 --- a/app/src/main/java/com/nextcloud/client/jobs/BackgroundJobFactory.kt +++ b/app/src/main/java/com/nextcloud/client/jobs/BackgroundJobFactory.kt @@ -266,17 +266,6 @@ class BackgroundJobFactory @Inject constructor( ) } - private fun createFilesDownloadWorker(context: Context, params: WorkerParameters): FilesDownloadWorker { - return FilesDownloadWorker( - viewThemeUtils.get(), - accountManager, - uploadsStorageManager, - localBroadcastManager.get(), - context, - params - ) - } - private fun createPDFGenerateWork(context: Context, params: WorkerParameters): GeneratePdfFromImagesWork { return GeneratePdfFromImagesWork( appContext = context,