Use Content-Type and Content-Length response headers

app/src/main/java/io/heckel/ntfy/data/Database.kt

@@ -59,7 +59,7 @@ data class Notification(
 
 @Entity
 data class Attachment(
-    @ColumnInfo(name = "name") val name: String, // Filename (mandatory, see ntfy server)
+    @ColumnInfo(name = "name") val name: String, // Filename
     @ColumnInfo(name = "type") val type: String?, // MIME type
     @ColumnInfo(name = "size") val size: Long?, // Size in bytes
     @ColumnInfo(name = "expires") val expires: Long?, // Unix timestamp

app/src/main/java/io/heckel/ntfy/msg/DownloadManager.kt

@@ -18,12 +18,15 @@ class DownloadManager {
         private const val TAG = "NtfyDownloadManager"
         private const val DOWNLOAD_WORK_NAME_PREFIX = "io.heckel.ntfy.DOWNLOAD_FILE_"
 
-        fun enqueue(context: Context, id: String) {
+        fun enqueue(context: Context, id: String, userAction: Boolean) {
             val workManager = WorkManager.getInstance(context)
             val workName = DOWNLOAD_WORK_NAME_PREFIX + id
             Log.d(TAG,"Enqueuing work to download attachment for notification $id, work: $workName")
             val workRequest = OneTimeWorkRequest.Builder(DownloadWorker::class.java)
-                .setInputData(workDataOf("id" to id))
+                .setInputData(workDataOf(
+                    DownloadWorker.INPUT_DATA_ID to id,
+                    DownloadWorker.INPUT_DATA_USER_ACTION to userAction
+                ))
                 .build()
             workManager.enqueueUniqueWork(workName, ExistingWorkPolicy.KEEP, workRequest)
         }

app/src/main/java/io/heckel/ntfy/msg/DownloadWorker.kt

@@ -9,6 +9,7 @@ import android.os.Handler
 import android.os.Looper
 import android.provider.MediaStore
 import android.util.Log
+import android.webkit.MimeTypeMap
 import android.widget.Toast
 import androidx.core.content.FileProvider
 import androidx.work.Worker
@@ -20,40 +21,48 @@ import io.heckel.ntfy.data.*
 import io.heckel.ntfy.util.queryFilename
 import okhttp3.OkHttpClient
 import okhttp3.Request
+import okhttp3.Response
 import java.io.File
 import java.util.concurrent.TimeUnit
 
+
 class DownloadWorker(private val context: Context, params: WorkerParameters) : Worker(context, params) {
     private val client = OkHttpClient.Builder()
-        .callTimeout(5, TimeUnit.MINUTES) // Total timeout for entire request
+        .callTimeout(15, TimeUnit.MINUTES) // Total timeout for entire request
         .connectTimeout(15, TimeUnit.SECONDS)
         .readTimeout(15, TimeUnit.SECONDS)
         .writeTimeout(15, TimeUnit.SECONDS)
         .build()
     private val notifier = NotificationService(context)
+    private lateinit var repository: Repository
+    private lateinit var subscription: Subscription
+    private lateinit var notification: Notification
+    private lateinit var attachment: Attachment
     private var uri: Uri? = null
 
     override fun doWork(): Result {
         if (context.applicationContext !is Application) return Result.failure()
-        val notificationId = inputData.getString("id") ?: return Result.failure()
+        val notificationId = inputData.getString(INPUT_DATA_ID) ?: return Result.failure()
+        val userAction = inputData.getBoolean(INPUT_DATA_USER_ACTION, false)
         val app = context.applicationContext as Application
-        val repository = app.repository
-        val notification = repository.getNotification(notificationId) ?: return Result.failure()
-        val subscription = repository.getSubscription(notification.subscriptionId) ?: return Result.failure()
-        downloadAttachment(repository, subscription, notification)
+        repository = app.repository
+        notification = repository.getNotification(notificationId) ?: return Result.failure()
+        subscription = repository.getSubscription(notification.subscriptionId) ?: return Result.failure()
+        attachment = notification.attachment ?: return Result.failure()
+        try {
+            downloadAttachment(userAction)
+        } catch (e: Exception) {
+            failed(e)
+        }
         return Result.success()
     }
 
     override fun onStopped() {
-        val uriCopy = uri
-        if (uriCopy != null) {
-            val resolver = applicationContext.contentResolver
-            resolver.delete(uriCopy, null, null)
-        }
+        Log.d(TAG, "Attachment download was canceled")
+        maybeDeleteFile()
     }
 
-    private fun downloadAttachment(repository: Repository, subscription: Subscription, notification: Notification) {
-        val attachment = notification.attachment ?: return
+    private fun downloadAttachment(userAction: Boolean) {
         Log.d(TAG, "Downloading attachment from ${attachment.url}")
 
         try {
@@ -63,77 +72,80 @@ class DownloadWorker(private val context: Context, params: WorkerParameters) : W
                 .build()
             client.newCall(request).execute().use { response ->
                 if (!response.isSuccessful || response.body == null) {
-                    throw Exception("Attachment download failed: ${response.code}")
+                    throw Exception("Unexpected response: ${response.code}")
+                }
+                save(updateAttachmentFromResponse(response))
+                if (!userAction && shouldAbortDownload()) {
+                    Log.d(TAG, "Aborting download: Content-Length is larger than auto-download setting")
+                    return
                 }
-                val name = attachment.name
-                val size = attachment.size ?: 0
                 val resolver = applicationContext.contentResolver
-                val uri = if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.P) {
-                    val file = ensureSafeNewFile(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS), name)
-                    FileProvider.getUriForFile(context, FILE_PROVIDER_AUTHORITY, file)
-                } else {
-                    val details = ContentValues().apply {
-                        put(MediaStore.MediaColumns.DISPLAY_NAME, name)
-                        if (attachment.type != null) {
-                            put(MediaStore.MediaColumns.MIME_TYPE, attachment.type)
-                        }
+                val values = ContentValues().apply {
+                    put(MediaStore.MediaColumns.DISPLAY_NAME, attachment.name)
+                    if (attachment.type != null) {
+                        put(MediaStore.MediaColumns.MIME_TYPE, attachment.type)
+                    }
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
                         put(MediaStore.MediaColumns.RELATIVE_PATH, Environment.DIRECTORY_DOWNLOADS)
                         put(MediaStore.MediaColumns.IS_DOWNLOAD, 1)
+                        put(MediaStore.MediaColumns.IS_PENDING, 1) // While downloading
                     }
-                    resolver.insert(MediaStore.Files.getContentUri(MediaStore.VOLUME_EXTERNAL), details)
-                        ?: throw Exception("Cannot get content URI")
+                }
+                val uri = if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.P) {
+                    val file = ensureSafeNewFile(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS), attachment.name)
+                    FileProvider.getUriForFile(context, FILE_PROVIDER_AUTHORITY, file)
+                } else {
+                    val contentUri = MediaStore.Files.getContentUri(MediaStore.VOLUME_EXTERNAL)
+                    resolver.insert(contentUri, values) ?: throw Exception("Cannot insert content")
                 }
                 this.uri = uri // Required for cleanup in onStopped()
+
                 Log.d(TAG, "Starting download to content URI: $uri")
+                val contentLength = response.headers["Content-Length"]?.toLongOrNull()
                 var bytesCopied: Long = 0
-                val out = resolver.openOutputStream(uri) ?: throw Exception("Cannot open output stream")
-                out.use { fileOut ->
+                val outFile = resolver.openOutputStream(uri) ?: throw Exception("Cannot open output stream")
+                outFile.use { fileOut ->
                     val fileIn = response.body!!.byteStream()
                     val buffer = ByteArray(BUFFER_SIZE)
                     var bytes = fileIn.read(buffer)
                     var lastProgress = 0L
                     while (bytes >= 0) {
                         if (System.currentTimeMillis() - lastProgress > NOTIFICATION_UPDATE_INTERVAL_MILLIS) {
-                            if (isStopped) {
-                                Log.d(TAG, "Attachment download was canceled")
-                                val newAttachment = attachment.copy(progress = PROGRESS_NONE)
-                                val newNotification = notification.copy(attachment = newAttachment)
-                                notifier.update(subscription, newNotification)
-                                repository.updateNotification(newNotification)
+                            if (isStopped) { // Canceled by user
+                                save(attachment.copy(progress = PROGRESS_NONE))
                                 return // File will be deleted in onStopped()
                             }
-                            val progress = if (size > 0) (bytesCopied.toFloat()/size.toFloat()*100).toInt() else PROGRESS_INDETERMINATE
-                            val newAttachment = attachment.copy(progress = progress)
-                            val newNotification = notification.copy(attachment = newAttachment)
-                            notifier.update(subscription, newNotification)
-                            repository.updateNotification(newNotification)
+                            val progress = if (attachment.size != null && attachment.size!! > 0) {
+                                (bytesCopied.toFloat()/attachment.size!!.toFloat()*100).toInt()
+                            } else {
+                                PROGRESS_INDETERMINATE
+                            }
+                            save(attachment.copy(progress = progress))
                             lastProgress = System.currentTimeMillis()
                         }
+                        if (contentLength != null && bytesCopied > contentLength) {
+                            throw Exception("Attachment is longer than response headers said.")
+                        }
                         fileOut.write(buffer, 0, bytes)
                         bytesCopied += bytes
                         bytes = fileIn.read(buffer)
                     }
                 }
                 Log.d(TAG, "Attachment download: successful response, proceeding with download")
-                val actualName = queryFilename(context, uri.toString(), name)
-                val newAttachment = attachment.copy(
+                val actualName = queryFilename(context, uri.toString(), attachment.name)
+                save(attachment.copy(
                     name = actualName,
                     size = bytesCopied,
                     contentUri = uri.toString(),
                     progress = PROGRESS_DONE
-                )
-                val newNotification = notification.copy(attachment = newAttachment)
-                repository.updateNotification(newNotification)
-                notifier.update(subscription, newNotification)
+                ))
+                if (Build.VERSION.SDK_INT > Build.VERSION_CODES.P) {
+                    values.put(MediaStore.MediaColumns.IS_PENDING, 0)
+                    resolver.update(uri, values, null, null)
+                }
             }
         } catch (e: Exception) {
-            Log.w(TAG, "Attachment download failed", e)
-
-            // Mark attachment download as failed
-            val newAttachment = attachment.copy(progress = PROGRESS_FAILED)
-            val newNotification = notification.copy(attachment = newAttachment)
-            notifier.update(subscription, newNotification)
-            repository.updateNotification(newNotification)
+            failed(e)
 
             // Toast in a Worker: https://stackoverflow.com/a/56428145/1440785
             val handler = Handler(Looper.getMainLooper())
@@ -145,6 +157,64 @@ class DownloadWorker(private val context: Context, params: WorkerParameters) : W
         }
     }
 
+    private fun updateAttachmentFromResponse(response: Response): Attachment {
+        val size = if (response.headers["Content-Length"]?.toLongOrNull() != null) {
+            response.headers["Content-Length"]?.toLong()
+        } else {
+            attachment.size // May be null!
+        }
+        val mimeType = if (response.headers["Content-Type"] != null) {
+            response.headers["Content-Type"]
+        } else {
+            val ext = MimeTypeMap.getFileExtensionFromUrl(attachment.url)
+            if (ext != null) {
+                val typeFromExt = MimeTypeMap.getSingleton().getMimeTypeFromExtension(ext)
+                typeFromExt ?: attachment.type // May be null!
+            } else {
+                attachment.type // May be null!
+            }
+        }
+        return attachment.copy(
+            size = size,
+            type = mimeType
+        )
+    }
+
+    private fun failed(e: Exception) {
+        Log.w(TAG, "Attachment download failed", e)
+        save(attachment.copy(progress = PROGRESS_FAILED))
+        maybeDeleteFile()
+    }
+
+    private fun maybeDeleteFile() {
+        val uriCopy = uri
+        if (uriCopy != null) {
+            Log.d(TAG, "Deleting leftover attachment $uriCopy")
+            val resolver = applicationContext.contentResolver
+            resolver.delete(uriCopy, null, null)
+        }
+    }
+
+    private fun save(newAttachment: Attachment) {
+        Log.d(TAG, "Updating attachment: $newAttachment")
+        attachment = newAttachment
+        notification = notification.copy(attachment = newAttachment)
+        notifier.update(subscription, notification)
+        repository.updateNotification(notification)
+    }
+
+    private fun shouldAbortDownload(): Boolean {
+        val maxAutoDownloadSize = repository.getAutoDownloadMaxSize()
+        when (maxAutoDownloadSize) {
+            Repository.AUTO_DOWNLOAD_NEVER -> return true
+            Repository.AUTO_DOWNLOAD_ALWAYS -> return false
+            else -> {
+                val size = attachment.size ?: return true // Abort if size unknown
+                return size > maxAutoDownloadSize
+            }
+        }
+    }
+
     private fun ensureSafeNewFile(dir: File, name: String): File {
         val safeName = name.replace("[^-_.()\\w]+".toRegex(), "_");
         val file = File(dir, safeName)
@@ -165,6 +235,9 @@ class DownloadWorker(private val context: Context, params: WorkerParameters) : W
     }
 
     companion object {
+        const val INPUT_DATA_ID = "id"
+        const val INPUT_DATA_USER_ACTION = "userAction"
+
         private const val TAG = "NtfyAttachDownload"
         private const val FILE_PROVIDER_AUTHORITY = BuildConfig.APPLICATION_ID + ".provider" // See AndroidManifest.xml
         private const val BUFFER_SIZE = 8 * 1024

app/src/main/java/io/heckel/ntfy/msg/NotificationDispatcher.kt

@@ -41,7 +41,7 @@ class NotificationDispatcher(val context: Context, val repository: Repository) {
             }
         }
         if (download) {
-            DownloadManager.enqueue(context, notification.id)
+            DownloadManager.enqueue(context, notification.id, userAction = false)
         }
     }
 
@@ -55,7 +55,7 @@ class NotificationDispatcher(val context: Context, val repository: Repository) {
             Repository.AUTO_DOWNLOAD_NEVER -> return false
             else -> {
                 if (notification.attachment.size == null) {
-                    return false
+                    return true // DownloadWorker will bail out if attachment is too large!
                 }
                 return notification.attachment.size <= maxAutoDownloadSize
             }

app/src/main/java/io/heckel/ntfy/msg/NotificationService.kt

@@ -199,7 +199,7 @@ class NotificationService(val context: Context) {
             val id = intent.getStringExtra("id") ?: return
             val action = intent.getStringExtra("action") ?: return
             when (action) {
-                DOWNLOAD_ACTION_START -> DownloadManager.enqueue(context, id)
+                DOWNLOAD_ACTION_START -> DownloadManager.enqueue(context, id, userAction = true)
                 DOWNLOAD_ACTION_CANCEL -> DownloadManager.cancel(context, id)
             }
         }
@@ -236,7 +236,7 @@ class NotificationService(val context: Context) {
                     channel
                 }
                 5 -> {
-                    val channel = NotificationChannel(CHANNEL_ID_MAX, context.getString(R.string.channel_notifications_max_name), NotificationManager.IMPORTANCE_MAX)
+                    val channel = NotificationChannel(CHANNEL_ID_MAX, context.getString(R.string.channel_notifications_max_name), NotificationManager.IMPORTANCE_HIGH) // IMPORTANCE_MAX does not exist
                     channel.enableLights(true)
                     channel.enableVibration(true)
                     channel.vibrationPattern = longArrayOf(

app/src/main/java/io/heckel/ntfy/ui/DetailAdapter.kt

@@ -18,14 +18,10 @@ import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
-import androidx.work.OneTimeWorkRequest
-import androidx.work.WorkManager
-import androidx.work.workDataOf
 import com.stfalcon.imageviewer.StfalconImageViewer
 import io.heckel.ntfy.R
 import io.heckel.ntfy.data.*
 import io.heckel.ntfy.msg.DownloadManager
-import io.heckel.ntfy.msg.DownloadWorker
 import io.heckel.ntfy.util.*
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
@@ -254,7 +250,7 @@ class DetailAdapter(private val activity: Activity, private val repository: Repo
                     ActivityCompat.requestPermissions(activity, arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE), REQUEST_CODE_WRITE_STORAGE_PERMISSION_FOR_DOWNLOAD)
                     return@setOnMenuItemClickListener true
                 }
-                DownloadManager.enqueue(context, notification.id)
+                DownloadManager.enqueue(context, notification.id, userAction = true)
                 true
             }
             cancelItem.setOnMenuItemClickListener {