Solve git conflicts

Signed-off-by: alperozturk <[email protected]>
nextcloud · Dec 21, 2023 · ae39d1a · ae39d1a
1 parent 4bfcfb7
commit ae39d1a
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 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
@@ -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
@@ -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,