소스 검색

Remove lateinit

Signed-off-by: alperozturk <alper_ozturk@proton.me>
alperozturk 11 달 전
부모
커밋
88b7aee1b1
1개의 변경된 파일12개의 추가작업 그리고 10개의 파일을 삭제
  1. 12 10
      app/src/main/java/com/nextcloud/client/jobs/download/FileDownloadWorker.kt

+ 12 - 10
app/src/main/java/com/nextcloud/client/jobs/download/FileDownloadWorker.kt

@@ -43,7 +43,7 @@ import java.util.Vector
 
 
 @Suppress("LongParameterList", "TooManyFunctions")
 @Suppress("LongParameterList", "TooManyFunctions")
 class FileDownloadWorker(
 class FileDownloadWorker(
-    private val viewThemeUtils: ViewThemeUtils,
+    viewThemeUtils: ViewThemeUtils,
     private val accountManager: UserAccountManager,
     private val accountManager: UserAccountManager,
     private var localBroadcastManager: LocalBroadcastManager,
     private var localBroadcastManager: LocalBroadcastManager,
     private val context: Context,
     private val context: Context,
@@ -94,7 +94,7 @@ class FileDownloadWorker(
     private var lastPercent = 0
     private var lastPercent = 0
 
 
     private val intents = FileDownloadIntents(context)
     private val intents = FileDownloadIntents(context)
-    private lateinit var notificationManager: DownloadNotificationManager
+    private var notificationManager: DownloadNotificationManager
     private var downloadProgressListener = FileDownloadProgressListener()
     private var downloadProgressListener = FileDownloadProgressListener()
 
 
     private var user: User? = null
     private var user: User? = null
@@ -106,17 +106,20 @@ class FileDownloadWorker(
     private var workerId: Int? = null
     private var workerId: Int? = null
     private var downloadError: FileDownloadError? = null
     private var downloadError: FileDownloadError? = null
 
 
+    init {
+        workerId = inputData.keyValueMap[WORKER_ID] as Int
+        notificationManager =
+            DownloadNotificationManager(
+                workerId ?: SecureRandom().nextInt(),
+                context,
+                viewThemeUtils
+            )
+    }
+
     @Suppress("TooGenericExceptionCaught")
     @Suppress("TooGenericExceptionCaught")
     override fun doWork(): Result {
     override fun doWork(): Result {
         return try {
         return try {
             val requestDownloads = getRequestDownloads()
             val requestDownloads = getRequestDownloads()
-
-            notificationManager =
-                DownloadNotificationManager(
-                    workerId ?: SecureRandom().nextInt(),
-                    context,
-                    viewThemeUtils
-                )
             addAccountUpdateListener()
             addAccountUpdateListener()
 
 
             val foregroundInfo = ForegroundServiceHelper.createWorkerForegroundInfo(
             val foregroundInfo = ForegroundServiceHelper.createWorkerForegroundInfo(
@@ -170,7 +173,6 @@ class FileDownloadWorker(
     }
     }
 
 
     private fun getRequestDownloads(): AbstractList<String> {
     private fun getRequestDownloads(): AbstractList<String> {
-        workerId = inputData.keyValueMap[WORKER_ID] as Int
         Log_OC.e(TAG, "FilesDownloadWorker started for $workerId")
         Log_OC.e(TAG, "FilesDownloadWorker started for $workerId")
 
 
         setUser()
         setUser()