Fixes + API 16 support

app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadNotifier.kt

@@ -41,11 +41,6 @@ class DownloadNotifier(private val context: Context) {
      */
     internal var multipleDownloadThreads = false
 
-    /**
-     * Value determining if notification should be shown
-     */
-    internal var showNotification = true
-
     /**
      * Called when download progress changes.
      * Note: Only accepted when multi download active.
@@ -53,7 +48,7 @@ class DownloadNotifier(private val context: Context) {
      * @param queue the queue containing downloads.
      */
     internal fun onProgressChange(queue: DownloadQueue) {
-        if (multipleDownloadThreads && showNotification)
+        if (multipleDownloadThreads)
             doOnProgressChange(null, queue)
     }
 
@@ -65,7 +60,7 @@ class DownloadNotifier(private val context: Context) {
      * @param queue the queue containing downloads
      */
     internal fun onProgressChange(download: Download, queue: DownloadQueue) {
-        if (!multipleDownloadThreads && showNotification)
+        if (!multipleDownloadThreads)
             doOnProgressChange(download, queue)
     }
 
@@ -131,18 +126,17 @@ class DownloadNotifier(private val context: Context) {
      * @param download download object containing download information
      */
     private fun onComplete(download: Download?) {
-        if (showNotification) {
-            // Create notification.
-            with(notificationBuilder) {
-                setContentTitle(download?.chapter?.name ?: context.getString(R.string.app_name))
-                setContentText(context.getString(R.string.update_check_notification_download_complete))
-                setSmallIcon(android.R.drawable.stat_sys_download_done)
-                setProgress(0, 0, false)
-            }
-
-            // Show notification.
-            context.notificationManager.notify(notificationId, notificationBuilder.build())
+        // Create notification.
+        with(notificationBuilder) {
+            setContentTitle(download?.chapter?.name ?: context.getString(R.string.app_name))
+            setContentText(context.getString(R.string.update_check_notification_download_complete))
+            setSmallIcon(android.R.drawable.stat_sys_download_done)
+            setProgress(0, 0, false)
         }
+
+        // Show notification.
+        context.notificationManager.notify(notificationId, notificationBuilder.build())
+
         // Reset initial values
         isDownloading = false
         initialQueueSize = 0
@@ -163,17 +157,13 @@ class DownloadNotifier(private val context: Context) {
      */
     internal fun onError(error: String? = null, chapter: String? = null) {
         // Create notification
-        if (showNotification) {
-            with(notificationBuilder) {
-                setContentTitle(chapter ?: context.getString(R.string.download_notifier_title_error))
-                setContentText(error ?: context.getString(R.string.download_notifier_unkown_error))
-                setSmallIcon(android.R.drawable.stat_sys_warning)
-                setProgress(0, 0, false)
-            }
-            context.notificationManager.notify(Constants.NOTIFICATION_DOWNLOAD_CHAPTER_ERROR_ID, notificationBuilder.build())
-        } else {
-            context.toast(error ?: context.getString(R.string.download_notifier_unkown_error))
+        with(notificationBuilder) {
+            setContentTitle(chapter ?: context.getString(R.string.download_notifier_title_error))
+            setContentText(error ?: context.getString(R.string.download_notifier_unkown_error))
+            setSmallIcon(android.R.drawable.stat_sys_warning)
+            setProgress(0, 0, false)
         }
+        context.notificationManager.notify(Constants.NOTIFICATION_DOWNLOAD_CHAPTER_ERROR_ID, notificationBuilder.build())
         // Reset download information
         onClear()
         isDownloading = false

app/src/main/java/eu/kanade/tachiyomi/data/download/ImageNotificationReceiver.kt

@@ -1,90 +0,0 @@
-package eu.kanade.tachiyomi.data.download
-
-import android.app.PendingIntent
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import android.net.Uri
-import eu.kanade.tachiyomi.R
-import eu.kanade.tachiyomi.util.notificationManager
-import java.io.File
-
-class ImageNotificationReceiver : BroadcastReceiver() {
-    override fun onReceive(context: Context, intent: Intent) {
-        when (intent.action) {
-            ACTION_SHARE_IMAGE -> {
-                shareImage(context, intent.getStringExtra(EXTRA_FILE_LOCATION))
-                context.notificationManager.cancel(intent.getIntExtra(NOTIFICATION_ID, 5))
-            }
-            ACTION_SHOW_IMAGE ->
-                showImage(context, intent.getStringExtra(EXTRA_FILE_LOCATION))
-            ACTION_DELETE_IMAGE -> {
-                deleteImage(intent.getStringExtra(EXTRA_FILE_LOCATION))
-                context.notificationManager.cancel(intent.getIntExtra(NOTIFICATION_ID, 5))
-            }
-        }
-    }
-
-    fun deleteImage(path: String) {
-        val file = File(path)
-        if (file.exists()) file.delete()
-    }
-
-    fun shareImage(context: Context, path: String) {
-        val shareIntent = Intent().apply {
-            action = Intent.ACTION_SEND
-            putExtra(Intent.EXTRA_STREAM, Uri.parse(path))
-            flags = Intent.FLAG_ACTIVITY_NEW_TASK
-            type = "image/jpeg"
-        }
-        context.startActivity(Intent.createChooser(shareIntent, context.resources.getText(R.string.action_share))
-                .apply { flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_MULTIPLE_TASK })
-    }
-
-    fun showImage(context: Context, path: String) {
-        val intent = Intent().apply {
-            action = Intent.ACTION_VIEW
-            flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_MULTIPLE_TASK
-            setDataAndType(Uri.parse("file://" + path), "image/*")
-        }
-        context.startActivity(intent)
-    }
-
-    companion object {
-        const val ACTION_SHARE_IMAGE = "eu.kanade.SHARE_IMAGE"
-
-        const val ACTION_SHOW_IMAGE = "eu.kanade.SHOW_IMAGE"
-
-        const val ACTION_DELETE_IMAGE = "eu.kanade.DELETE_IMAGE"
-
-        const val EXTRA_FILE_LOCATION = "file_location"
-
-        const val NOTIFICATION_ID = "notification_id"
-
-        fun shareImageIntent(context: Context, path: String, notificationId: Int): PendingIntent {
-            val intent = Intent(context, ImageNotificationReceiver::class.java).apply {
-                action = ACTION_SHARE_IMAGE
-                putExtra(EXTRA_FILE_LOCATION, path)
-                putExtra(NOTIFICATION_ID, notificationId)
-            }
-            return PendingIntent.getBroadcast(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT)
-        }
-
-        fun showImageIntent(context: Context, path: String): PendingIntent {
-            val intent = Intent(context, ImageNotificationReceiver::class.java).apply {
-                action = ACTION_SHOW_IMAGE
-                putExtra(EXTRA_FILE_LOCATION, path)
-            }
-            return PendingIntent.getBroadcast(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT)
-        }
-
-        fun deleteImageIntent(context: Context, path: String, notificationId: Int): PendingIntent {
-            val intent = Intent(context, ImageNotificationReceiver::class.java).apply {
-                action = ACTION_DELETE_IMAGE
-                putExtra(EXTRA_FILE_LOCATION, path)
-                putExtra(NOTIFICATION_ID, notificationId)
-            }
-            return PendingIntent.getBroadcast(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT)
-        }
-    }
-}

app/src/main/java/eu/kanade/tachiyomi/data/download/ImageNotifier.kt

@@ -1,132 +0,0 @@
-package eu.kanade.tachiyomi.data.download
-
-import android.content.Context
-import android.graphics.Bitmap
-import android.support.v4.app.NotificationCompat
-import com.bumptech.glide.Glide
-import com.bumptech.glide.request.animation.GlideAnimation
-import com.bumptech.glide.request.target.SimpleTarget
-import eu.kanade.tachiyomi.Constants
-import eu.kanade.tachiyomi.R
-import eu.kanade.tachiyomi.util.notificationManager
-import java.io.File
-
-
-class ImageNotifier(private val context: Context) {
-    /**
-     * Notification builder.
-     */
-    private val notificationBuilder = NotificationCompat.Builder(context)
-
-    /**
-     * Id of the notification.
-     */
-    private val notificationId: Int
-        get() = Constants.NOTIFICATION_DOWNLOAD_IMAGE_ID
-
-    /**
-     * Status of download. Used for correct notification icon.
-     */
-    private var isDownloading = false
-
-    /**
-     * Called when download progress changes.
-     * @param progress progress value in range [0,100]
-     */
-    fun onProgressChange(progress: Int) {
-        with(notificationBuilder) {
-            if (!isDownloading) {
-                setContentTitle(context.getString(R.string.saving_picture))
-                setSmallIcon(android.R.drawable.stat_sys_download)
-                setLargeIcon(null)
-                setStyle(null)
-                // Clear old actions if they exist
-                if (!mActions.isEmpty())
-                    mActions.clear()
-                isDownloading = true
-            }
-
-            setProgress(100, progress, false)
-        }
-        // Displays the progress bar on notification
-        context.notificationManager.notify(notificationId, notificationBuilder.build())
-    }
-
-    /**
-     * Called when image download is complete
-     * @param file image file containing downloaded page image
-     */
-    fun onComplete(file: File) {
-        with(notificationBuilder) {
-            if (isDownloading) {
-                setProgress(0, 0, false)
-                isDownloading = false
-            }
-            setContentTitle(context.getString(R.string.picture_saved))
-            setSmallIcon(R.drawable.ic_insert_photo_black_24dp)
-            Glide.with(context).load(file).asBitmap().into(object : SimpleTarget<Bitmap>(96, 96) {
-                /**
-                 * The method that will be called when the resource load has finished.
-                 * @param resource the loaded resource.
-                 */
-                override fun onResourceReady(resource: Bitmap?, glideAnimation: GlideAnimation<in Bitmap>?) {
-                    setLargeIcon(resource)
-                    context.notificationManager.notify(notificationId, notificationBuilder.build())
-                }
-            })
-            Glide.with(context).load(file).asBitmap().into(object : SimpleTarget<Bitmap>(720, 1280) {
-                /**
-                 * The method that will be called when the resource load has finished.
-                 * @param resource the loaded resource.
-                 */
-                override fun onResourceReady(resource: Bitmap?, glideAnimation: GlideAnimation<in Bitmap>?) {
-                    setStyle(NotificationCompat.BigPictureStyle().bigPicture(resource))
-                    context.notificationManager.notify(notificationId, notificationBuilder.build())
-                }
-            })
-
-            setAutoCancel(true)
-
-            // Clear old actions if they exist
-            if (!mActions.isEmpty())
-                mActions.clear()
-
-            setContentIntent(ImageNotificationReceiver.showImageIntent(context, file.absolutePath))
-            // Share action
-            addAction(R.drawable.ic_share_white_24dp,
-                    context.getString(R.string.action_share),
-                    ImageNotificationReceiver.shareImageIntent(context, file.absolutePath, notificationId))
-            // Delete action
-            addAction(R.drawable.ic_delete_white_24dp,
-                    context.getString(R.string.action_delete),
-                    ImageNotificationReceiver.deleteImageIntent(context, file.absolutePath, notificationId))
-        }
-        // Displays the progress bar on notification
-        context.notificationManager.notify(notificationId, notificationBuilder.build())
-    }
-
-    /**
-     * Clears the notification message
-     */
-    internal fun onClear() {
-        context.notificationManager.cancel(notificationId)
-    }
-
-
-    /**
-     * Called on error while downloading image
-     * @param error string containing error information
-     */
-    internal fun onError(error: String?) {
-        // Create notification
-        with(notificationBuilder) {
-            setContentTitle(context.getString(R.string.download_notifier_title_error))
-            setContentText(error ?: context.getString(R.string.download_notifier_unkown_error))
-            setSmallIcon(android.R.drawable.ic_menu_report_image)
-            setProgress(0, 0, false)
-        }
-        context.notificationManager.notify(notificationId, notificationBuilder.build())
-        isDownloading = false
-    }
-
-}