Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: allow nullable content-type #966

Merged
merged 7 commits into from
Jul 25, 2024
Merged

feat: allow nullable content-type #966

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
81cf085
feat: allow empty content-type on android
ryzizub Jul 17, 2024
9659216
feat: add nullable places for content type
ryzizub Jul 17, 2024
825de55
feat: add nullable mimeType do worker
ryzizub Jul 18, 2024
a1e4474
fix: add unknown type
ryzizub Jul 18, 2024
d0b8975
fix: add unknown type
ryzizub Jul 18, 2024
8bba23a
Merge remote-tracking branch 'origin/master'
ryzizub Jul 18, 2024
fb2dc9a
chore: fix lint issues
ryzizub Jul 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion android/src/main/kotlin/vn/hunghd/flutterdownloader/DownloadTask.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ data class DownloadTask(
var filename: String?,
var savedDir: String,
var headers: String,
var mimeType: String,
var mimeType: String?,
var resumable: Boolean,
var showNotification: Boolean,
var openFileFromNotification: Boolean,
Expand Down
10 changes: 6 additions & 4 deletions android/src/main/kotlin/vn/hunghd/flutterdownloader/DownloadWorker.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,12 +338,14 @@ class DownloadWorker(context: Context, params: WorkerParameters) :
break
}
httpConn!!.connect()
val contentType: String
val contentType: String?
if ((responseCode == HttpURLConnection.HTTP_OK || isResume && responseCode == HttpURLConnection.HTTP_PARTIAL) && !isStopped) {
contentType = httpConn.contentType
val contentLength: Long =
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) httpConn.contentLengthLong else httpConn.contentLength.toLong()
log("Content-Type = $contentType")
if (contentType != null){
log("Content-Type = $contentType")
}
log("Content-Length = $contentLength")
val charset = getCharsetFromContentType(contentType)
log("Charset = $charset")
Expand Down Expand Up @@ -517,7 +519,7 @@ class DownloadWorker(context: Context, params: WorkerParameters) :
* Create a file inside the Download folder using MediaStore API
*/
@RequiresApi(Build.VERSION_CODES.Q)
private fun createFileInPublicDownloadsDir(filename: String?, mimeType: String): Uri? {
private fun createFileInPublicDownloadsDir(filename: String?, mimeType: String?): Uri? {
val collection: Uri = MediaStore.Downloads.EXTERNAL_CONTENT_URI
val values = ContentValues()
values.put(MediaStore.Downloads.DISPLAY_NAME, filename)
Expand Down Expand Up @@ -770,7 +772,7 @@ class DownloadWorker(context: Context, params: WorkerParameters) :
return contentType?.split(";")?.toTypedArray()?.get(0)?.trim { it <= ' ' }
}

private fun isImageOrVideoFile(contentType: String): Boolean {
private fun isImageOrVideoFile(contentType: String?): Boolean {
val newContentType = getContentTypeWithoutCharset(contentType)
return newContentType != null && (newContentType.startsWith("image/") || newContentType.startsWith("video"))
}
Expand Down
2 changes: 1 addition & 1 deletion android/src/main/kotlin/vn/hunghd/flutterdownloader/TaskDao.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ class TaskDao(private val dbHelper: TaskDbHelper) {
val db = dbHelper.writableDatabase
val values = ContentValues()
values.put(TaskEntry.COLUMN_NAME_FILE_NAME, filename)
values.put(TaskEntry.COLUMN_NAME_MIME_TYPE, mimeType)
values.put(TaskEntry.COLUMN_NAME_MIME_TYPE, mimeType ?: "unknown")
db.beginTransaction()
try {
db.update(
Expand Down
Loading