mirror of
				https://github.com/mihonapp/mihon.git
				synced 2025-10-30 22:07:57 +01:00 
			
		
		
		
	Don't show completed notification if download error notification was shown
This commit is contained in:
		| @@ -119,7 +119,7 @@ internal class DownloadNotifier(private val context: Context) { | ||||
|     /** | ||||
|      * Show notification when download is paused. | ||||
|      */ | ||||
|     fun onDownloadPaused() { | ||||
|     fun onPaused() { | ||||
|         with(progressNotificationBuilder) { | ||||
|             setContentTitle(context.getString(R.string.chapter_paused)) | ||||
|             setContentText(context.getString(R.string.download_notifier_download_paused)) | ||||
| @@ -151,18 +151,20 @@ internal class DownloadNotifier(private val context: Context) { | ||||
|     /** | ||||
|      *  This function shows a notification to inform download tasks are done. | ||||
|      */ | ||||
|     fun downloadFinished() { | ||||
|         // Create notification | ||||
|         with(completeNotificationBuilder) { | ||||
|             setContentTitle(context.getString(R.string.download_notifier_downloader_title)) | ||||
|             setContentText(context.getString(R.string.download_notifier_download_finish)) | ||||
|             setSmallIcon(android.R.drawable.stat_sys_download_done) | ||||
|             clearActions() | ||||
|             setAutoCancel(true) | ||||
|             setContentIntent(NotificationHandler.openDownloadManagerPendingActivity(context)) | ||||
|             setProgress(0, 0, false) | ||||
|     fun onComplete() { | ||||
|         if (!errorThrown) { | ||||
|             // Create notification | ||||
|             with(completeNotificationBuilder) { | ||||
|                 setContentTitle(context.getString(R.string.download_notifier_downloader_title)) | ||||
|                 setContentText(context.getString(R.string.download_notifier_download_finish)) | ||||
|                 setSmallIcon(android.R.drawable.stat_sys_download_done) | ||||
|                 clearActions() | ||||
|                 setAutoCancel(true) | ||||
|                 setContentIntent(NotificationHandler.openDownloadManagerPendingActivity(context)) | ||||
|                 setProgress(0, 0, false) | ||||
|             } | ||||
|             completeNotificationBuilder.show(Notifications.ID_DOWNLOAD_CHAPTER_COMPLETE) | ||||
|         } | ||||
|         completeNotificationBuilder.show(Notifications.ID_DOWNLOAD_CHAPTER_COMPLETE) | ||||
|  | ||||
|         // Reset states to default | ||||
|         errorThrown = false | ||||
|   | ||||
| @@ -137,9 +137,9 @@ class Downloader( | ||||
|         } else { | ||||
|             if (notifier.paused) { | ||||
|                 notifier.paused = false | ||||
|                 notifier.onDownloadPaused() | ||||
|                 notifier.onPaused() | ||||
|             } else { | ||||
|                 notifier.downloadFinished() | ||||
|                 notifier.onComplete() | ||||
|             } | ||||
|         } | ||||
|     } | ||||
|   | ||||
| @@ -238,7 +238,7 @@ class ReaderActivity : BaseRxActivity<ReaderActivityBinding, ReaderPresenter>() | ||||
|             R.id.action_settings -> ReaderSettingsSheet(this).show() | ||||
|             R.id.action_custom_filter -> { | ||||
|                 val sheet = ReaderColorFilterSheet(this) | ||||
|                     // Remove dimmed backdrop so changes can be previewd | ||||
|                     // Remove dimmed backdrop so changes can be previewed | ||||
|                     .apply { window?.setDimAmount(0f) } | ||||
|  | ||||
|                 // Hide toolbars while sheet is open for better preview | ||||
|   | ||||
		Reference in New Issue
	
	Block a user