Reduce lint & fix condition for start service

Signed-off-by: alperozturk <[email protected]>
nextcloud · Jun 6, 2024 · 50e398f · 50e398f
1 parent 08c2c3a
commit 50e398f
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/app/src/main/java/com/nextcloud/client/jobs/transfer/FileTransferService.kt b/app/src/main/java/com/nextcloud/client/jobs/transfer/FileTransferService.kt
@@ -95,14 +95,16 @@ class FileTransferService : LifecycleService() {
 
     override fun onCreate() {
         AndroidInjection.inject(this)
+        super.onCreate()
     }
 
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+        super.onStartCommand(intent, flags, startId)
         if (intent == null || intent.action != ACTION_TRANSFER) {
             return START_NOT_STICKY
         }
 
-        if (!isRunning && lifecycle.currentState == Lifecycle.State.STARTED) {
+        if (!isRunning && lifecycle.currentState.isAtLeast(Lifecycle.State.RESUMED)) {
             ForegroundServiceHelper.startService(
                 this,
                 AppNotificationManager.TRANSFER_NOTIFICATION_ID,
@@ -112,15 +114,18 @@ class FileTransferService : LifecycleService() {
         }
 
         val request: Request = intent.getParcelableArgument(EXTRA_REQUEST, Request::class.java)!!
-        val transferManager = getTransferManager(request.user)
-        transferManager.enqueue(request)
+
+        getTransferManager(request.user).run {
+            enqueue(request)
+        }
 
         logger.d(TAG, "Enqueued new transfer: ${request.uuid} ${request.file.remotePath}")
 
         return START_NOT_STICKY
     }
 
     override fun onBind(intent: Intent): IBinder? {
+        super.onBind(intent)
         val user = intent.getParcelableArgument(EXTRA_USER, User::class.java) ?: return null
         return Binder(getTransferManager(user), this)
     }
@@ -129,7 +134,7 @@ class FileTransferService : LifecycleService() {
         if (!isRunning) {
             logger.d(TAG, "All downloads completed")
             notificationsManager.cancelTransferNotification()
-            stopForeground(true)
+            stopForeground(STOP_FOREGROUND_DETACH)
             stopSelf()
         } else if (transfer.direction == Direction.DOWNLOAD) {
             notificationsManager.postDownloadTransferProgress(