From b569ec6bd5ef8e331e38de23aaaae8f931f796fd Mon Sep 17 00:00:00 2001 From: X1nto Date: Tue, 30 Jun 2020 12:32:51 +0400 Subject: [PATCH] testing --- .../core/downloader/DownloadBroadcastReceiver.kt | 5 ++--- .../com/vanced/manager/utils/NotificationHelper.kt | 13 +++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/com/vanced/manager/core/downloader/DownloadBroadcastReceiver.kt b/app/src/main/java/com/vanced/manager/core/downloader/DownloadBroadcastReceiver.kt index 8d4c81a0..f950b98a 100644 --- a/app/src/main/java/com/vanced/manager/core/downloader/DownloadBroadcastReceiver.kt +++ b/app/src/main/java/com/vanced/manager/core/downloader/DownloadBroadcastReceiver.kt @@ -9,9 +9,8 @@ import com.downloader.PRDownloader class DownloadBroadcastReceiver: BroadcastReceiver() { override fun onReceive(context: Context?, intent: Intent?) { - val tag: Int? = intent?.getIntExtra("dwnldId", 0) + val tag: Int? = intent?.getIntExtra("tag", 0) PRDownloader.cancel(tag) - Log.d("VMNotification", "Canceled ${intent?.getIntExtra("dwnldId", 0)} download") - + Log.d("VMNotification", "Canceled $tag download") } } \ No newline at end of file diff --git a/app/src/main/java/com/vanced/manager/utils/NotificationHelper.kt b/app/src/main/java/com/vanced/manager/utils/NotificationHelper.kt index b71921fe..6937486a 100644 --- a/app/src/main/java/com/vanced/manager/utils/NotificationHelper.kt +++ b/app/src/main/java/com/vanced/manager/utils/NotificationHelper.kt @@ -17,29 +17,30 @@ object NotificationHelper { val notifChannel = NotificationChannel( "69420", context.getString(R.string.notif_channel_name), - NotificationManager.IMPORTANCE_LOW + NotificationManager.IMPORTANCE_HIGH ) val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager notificationManager.createNotificationChannel(notifChannel) } } - fun displayDownloadNotif(channel: Int, progress:Int, filename: String, downId: Int, context: Context) { + fun displayDownloadNotif(channel: Int, progress:Int, filename: String, tag: Int, context: Context) { val notifBuilder = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) Notification.Builder(context, channel.toString()).setChannelId("69420") else - Notification.Builder(context).setPriority(Notification.PRIORITY_LOW) + Notification.Builder(context).setPriority(Notification.PRIORITY_HIGH) + + val cancelDownload = Intent(context, DownloadBroadcastReceiver::class.java) + cancelDownload.putExtra("tag", tag) - val cancelDownload = Intent(context, DownloadBroadcastReceiver::class.java).apply { - putExtra("dwnldId", downId) - } val cancelPendingIntent = PendingIntent.getBroadcast(context, 0, cancelDownload, PendingIntent.FLAG_UPDATE_CURRENT) notifBuilder.apply { setContentTitle(context.getString(R.string.app_name)) setContentText(context.getString(R.string.downloading_file, filename)) setSmallIcon(R.drawable.ic_stat_name) + setOnlyAlertOnce(true) if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) addAction(Notification.Action.Builder(null, context.getString(R.string.cancel), cancelPendingIntent).build()) else