prifak/Kotatsu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix DownloadService foreground notification #50

Browse Source
This commit is contained in:
Koitharu
2022-04-06 17:24:10 +03:00
parent 48ec9a1ea9
commit 36a7a3ebbc
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/org/koitharu/kotatsu/download/ui/service/DownloadService.kt
View File

@@ -10,6 +10,8 @@ import android.os.PowerManager
import android.widget.Toast import android.widget.Toast
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import java.util.concurrent.TimeUnit
import kotlin.collections.set
import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.mapLatest import kotlinx.coroutines.flow.mapLatest
@@ -33,8 +35,6 @@ import org.koitharu.kotatsu.utils.ext.connectivityManager
import org.koitharu.kotatsu.utils.ext.throttle import org.koitharu.kotatsu.utils.ext.throttle
import org.koitharu.kotatsu.utils.ext.toArraySet import org.koitharu.kotatsu.utils.ext.toArraySet
import org.koitharu.kotatsu.utils.progress.ProgressJob import org.koitharu.kotatsu.utils.progress.ProgressJob
import java.util.concurrent.TimeUnit
import kotlin.collections.set
class DownloadService : BaseService() { class DownloadService : BaseService() {
@@ -70,7 +70,6 @@ class DownloadService : BaseService() {
return if (manga != null) { return if (manga != null) {
jobs[startId] = downloadManga(startId, manga, chapters) jobs[startId] = downloadManga(startId, manga, chapters)
jobCount.value = jobs.size jobCount.value = jobs.size
Toast.makeText(this, R.string.manga_downloading_, Toast.LENGTH_SHORT).show()
START_REDELIVER_INTENT START_REDELIVER_INTENT
} else { } else {
stopSelf(startId) stopSelf(startId)
@@ -184,6 +183,7 @@ class DownloadService : BaseService() {
intent.putExtra(EXTRA_CHAPTERS_IDS, chaptersIds.toLongArray()) intent.putExtra(EXTRA_CHAPTERS_IDS, chaptersIds.toLongArray())
} }
ContextCompat.startForegroundService(context, intent) ContextCompat.startForegroundService(context, intent)
Toast.makeText(context, R.string.manga_downloading_, Toast.LENGTH_SHORT).show()
} }
} }

5
app/src/main/java/org/koitharu/kotatsu/download/ui/service/ForegroundNotificationSwitcher.kt
View File

@@ -24,9 +24,10 @@ class ForegroundNotificationSwitcher(
@Synchronized @Synchronized
fun notify(startId: Int, notification: Notification) { fun notify(startId: Int, notification: Notification) {
if (notifications.isEmpty()) { if (notifications.isEmpty()) {
handler.postDelayed(StartForegroundRunnable(startId, notification), DEFAULT_DELAY) StartForegroundRunnable(startId, notification)
} else {
notificationManager.notify(startId, notification)
} }
notificationManager.notify(startId, notification)
notifications[startId] = notification notifications[startId] = notification
} }