fix: clear import progress notification stuck at 100%
The progress notification was detached from the foreground service on pipeline finish, so a process killed mid-import left an ongoing notification orphaned in the shade until the next app launch. Terminal notifications now use their own id, and finishing the pipeline removes the bound progress notification; swiping the app from recents cleans it up as well.
This commit is contained in:
1 parent
1d84eaf9c0
commit
451267688a
3 files changed
+20
-5
No files matched your search
@@ -120,7 +120,7 @@ object DictionaryProgressModel {
|
|||||||
} else {
|
} else {
|
||||||
DOWNLOAD_WEIGHT + EXTRACT_WEIGHT + idx * INDEX_WEIGHT
|
DOWNLOAD_WEIGHT + EXTRACT_WEIGHT + idx * INDEX_WEIGHT
|
||||||
}
|
}
|
||||||
val pct = (p * 100f).toInt().coerceIn(0, 100)
|
val pct = (p * 100f).toInt().coerceIn(0, 99)
|
||||||
|
|
||||||
return Snapshot(
|
return Snapshot(
|
||||||
progress = p,
|
progress = p,
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ class NotificationHelper(private val context: Context) : NotificationPort {
|
|||||||
companion object {
|
companion object {
|
||||||
const val CHANNEL_ID = "download_progress_channel"
|
const val CHANNEL_ID = "download_progress_channel"
|
||||||
const val NOTIFICATION_ID = 1
|
const val NOTIFICATION_ID = 1
|
||||||
|
const val TERMINAL_NOTIFICATION_ID = 2
|
||||||
}
|
}
|
||||||
private val notificationManager = NotificationManagerCompat.from(context)
|
private val notificationManager = NotificationManagerCompat.from(context)
|
||||||
private var lastNotificationKey: Int = 0
|
private var lastNotificationKey: Int = 0
|
||||||
@@ -91,7 +92,7 @@ class NotificationHelper(private val context: Context) : NotificationPort {
|
|||||||
.setContentIntent(mainActivityPendingIntent)
|
.setContentIntent(mainActivityPendingIntent)
|
||||||
.setAutoCancel(true)
|
.setAutoCancel(true)
|
||||||
.build()
|
.build()
|
||||||
safeNotify(notification)
|
safeNotifyTerminal(notification)
|
||||||
}
|
}
|
||||||
fun showErrorNotification() {
|
fun showErrorNotification() {
|
||||||
if (!canShowNotification()) return
|
if (!canShowNotification()) return
|
||||||
@@ -103,7 +104,7 @@ class NotificationHelper(private val context: Context) : NotificationPort {
|
|||||||
.setContentIntent(mainActivityPendingIntent)
|
.setContentIntent(mainActivityPendingIntent)
|
||||||
.setAutoCancel(true)
|
.setAutoCancel(true)
|
||||||
.build()
|
.build()
|
||||||
safeNotify(notification)
|
safeNotifyTerminal(notification)
|
||||||
}
|
}
|
||||||
fun cancelNotification() {
|
fun cancelNotification() {
|
||||||
lastNotificationKey = 0
|
lastNotificationKey = 0
|
||||||
@@ -161,6 +162,14 @@ class NotificationHelper(private val context: Context) : NotificationPort {
|
|||||||
// Notification permission denied or security policy blocked
|
// Notification permission denied or security policy blocked
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@SuppressLint("MissingPermission")
|
||||||
|
private fun safeNotifyTerminal(notification: Notification) {
|
||||||
|
try {
|
||||||
|
notificationManager.notify(TERMINAL_NOTIFICATION_ID, notification)
|
||||||
|
} catch (_: SecurityException) {
|
||||||
|
}
|
||||||
|
}
|
||||||
fun showImportSuccessNotification() {
|
fun showImportSuccessNotification() {
|
||||||
if (!canShowNotification()) return
|
if (!canShowNotification()) return
|
||||||
lastNotificationKey = 0
|
lastNotificationKey = 0
|
||||||
@@ -171,7 +180,7 @@ class NotificationHelper(private val context: Context) : NotificationPort {
|
|||||||
.setContentIntent(mainActivityPendingIntent)
|
.setContentIntent(mainActivityPendingIntent)
|
||||||
.setAutoCancel(true)
|
.setAutoCancel(true)
|
||||||
.build()
|
.build()
|
||||||
safeNotify(notification)
|
safeNotifyTerminal(notification)
|
||||||
}
|
}
|
||||||
fun createForegroundNotification(): Notification {
|
fun createForegroundNotification(): Notification {
|
||||||
val notification = NotificationCompat.Builder(context, CHANNEL_ID)
|
val notification = NotificationCompat.Builder(context, CHANNEL_ID)
|
||||||
|
|||||||
+7
-1
@@ -88,6 +88,12 @@ class DictionaryForegroundService : Service() {
|
|||||||
stopForTimeout(startId)
|
stopForTimeout(startId)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
override fun onTaskRemoved(rootIntent: Intent?) {
|
||||||
|
cancelAllWork()
|
||||||
|
ServiceCompat.stopForeground(this, ServiceCompat.STOP_FOREGROUND_REMOVE)
|
||||||
|
stopSelf()
|
||||||
|
}
|
||||||
|
|
||||||
override fun onTimeout(startId: Int, fgsType: Int) {
|
override fun onTimeout(startId: Int, fgsType: Int) {
|
||||||
stopForTimeout(startId)
|
stopForTimeout(startId)
|
||||||
}
|
}
|
||||||
@@ -125,7 +131,7 @@ class DictionaryForegroundService : Service() {
|
|||||||
startForegroundService()
|
startForegroundService()
|
||||||
}
|
}
|
||||||
ACTION_FINISH -> {
|
ACTION_FINISH -> {
|
||||||
stopForegroundService(removeNotification = false)
|
stopForegroundService(removeNotification = true)
|
||||||
}
|
}
|
||||||
ACTION_STOP -> {
|
ACTION_STOP -> {
|
||||||
try {
|
try {
|
||||||
|
|||||||
Reference in new issue
Block a user