[Messages] Disable showing 0-byte attachment sizes.

This commit is contained in:
Kuba Szczodrzyński 2021-10-07 11:43:54 +02:00
parent fe82c86c93
commit 6611fc5843
No known key found for this signature in database
GPG Key ID: 70CB8A85BA1633CB

View File

@ -6,7 +6,6 @@ package pl.szczodrzynski.edziennik.ui.modules.views
import android.content.Context import android.content.Context
import android.os.Bundle import android.os.Bundle
import android.os.Environment
import android.util.AttributeSet import android.util.AttributeSet
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import androidx.appcompat.widget.PopupMenu import androidx.appcompat.widget.PopupMenu
@ -68,7 +67,10 @@ class AttachmentsView @JvmOverloads constructor(
attachmentIds.forEachIndexed { index, id -> attachmentIds.forEachIndexed { index, id ->
val name = attachmentNames[index] ?: return@forEachIndexed val name = attachmentNames[index] ?: return@forEachIndexed
val size = attachmentSizes?.getOrNull(index) var size = attachmentSizes?.getOrNull(index)
// hide the size if less than 1 byte
if (size?.compareTo(1) == -1)
size = null
val item = AttachmentAdapter.Item(profileId, owner, id, name, size) val item = AttachmentAdapter.Item(profileId, owner, id, name, size)
adapter.items += item adapter.items += item
@ -100,6 +102,8 @@ class AttachmentsView @JvmOverloads constructor(
val fileUrl = item.name.substringAfter(":", missingDelimiterValue = "") val fileUrl = item.name.substringAfter(":", missingDelimiterValue = "")
// update file name with the downloaded one // update file name with the downloaded one
item.name = attachmentFile.name item.name = attachmentFile.name
// update file size (useful for items with no defined size)
item.size = attachmentFile.length()
// save the download url back // save the download url back
if (fileUrl != "") if (fileUrl != "")
item.name += ":$fileUrl" item.name += ":$fileUrl"