ProtonMail
/
proton-mail-android
mirror of https://github.com/ProtonMail/proton-mail-android
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Mailbox Adapter shows 'sending' and 'upload atts' loaders 

At now, this logic will be kept in the Adapter instead of being a field
on MailboxUiItem

MAILAND-1646
This commit is contained in:
Marino Meneghel 2021-04-01 18:37:57 +02:00
parent fec0c417cb
commit 01a88f3fff
7 changed files with 18 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/ch/protonmail/android/activities/MailboxViewModel.kt
View File

@ -209,8 +209,6 @@ class MailboxViewModel @Inject constructor(
message.isReplied ?: false,
message.isRepliedAll ?: false,
message.isForwarded ?: false,
message.isBeingSent,
message.isAttachmentsBeingUploaded,
message.isInline,
)

2
app/src/main/java/ch/protonmail/android/activities/SearchActivity.java
View File

@ -165,8 +165,6 @@ public class SearchActivity extends BaseActivity {
message.isReplied() != null ? message.isReplied() : false,
message.isRepliedAll() != null ? message.isRepliedAll() : false,
message.isForwarded() != null ? message.isForwarded() : false,
message.isBeingSent(),
message.isAttachmentsBeingUploaded(),
message.isInline());
String senderName = message.getSenderEmail();

18
app/src/main/java/ch/protonmail/android/adapters/messages/MessagesRecyclerViewAdapter.kt
View File

@ -158,14 +158,18 @@ class MessagesRecyclerViewAdapter(
val mailboxItem = mailboxItems[position]
val messageLabels = mailboxItem.labelIds.mapNotNull { labels[it] }
// val pendingSend = pendingSendList?.find { it.messageId == mailboxItem.itemId }
// mailboxItem.isBeingSent = pendingSend != null && pendingSend.sent == null
// mailboxItem.isAttachmentsBeingUploaded = pendingUploadList?.find { it.messageId == mailboxItem.messageId } != null
val pendingSend = pendingSendList?.find { it.messageId == mailboxItem.itemId }
val isBeingSent = pendingSend != null && pendingSend.sent == null
val isAttachmentsBeingUploaded = pendingUploadList?.find { it.messageId == mailboxItem.itemId } != null
this.view.bind(mailboxItem, messageLabels, selectedMessageIds.isNotEmpty(), mMailboxLocation)
val isSelected = selectedMessageIds.contains(message.messageId)
this.view.checkImageView.isActivated = isSelected
this.view.bind(
mailboxItem,
messageLabels,
selectedMessageIds.isNotEmpty(),
mMailboxLocation,
isBeingSent,
isAttachmentsBeingUploaded
)
this.view.tag = mailboxItem.itemId
this.view.senderInitialView.tag = mailboxItem.itemId

13
app/src/main/java/ch/protonmail/android/data/local/model/Message.kt
View File

@ -127,7 +127,6 @@ data class Message @JvmOverloads constructor(
@ColumnInfo(name = COLUMN_MESSAGE_NUM_ATTACHMENTS)
var numAttachments: Int = 0,
// TODO merge methods
@ColumnInfo(name = COLUMN_MESSAGE_IS_ENCRYPTED)
var messageEncryption: MessageEncryption? = null,
@ -286,13 +285,15 @@ data class Message @JvmOverloads constructor(
Constants.MessageLocationType.STARRED,
Constants.MessageLocationType.ALL_MAIL,
Constants.MessageLocationType.INVALID
) && newLocation.messageLocationTypeValue < location.messageLocationTypeValue) {
) && newLocation.messageLocationTypeValue < location.messageLocationTypeValue
) {
newLocation
} else if (newLocation in listOf(
Constants.MessageLocationType.DRAFT,
Constants.MessageLocationType.SENT
)) {
)
) {
newLocation
} else {
@ -300,12 +301,6 @@ data class Message @JvmOverloads constructor(
}
}
@Ignore
var isBeingSent: Boolean = false
@Ignore
var isAttachmentsBeingUploaded: Boolean = false
val isSent: Boolean
get() {
if (Type in listOf(MessageType.SENT, MessageType.INBOX_AND_SENT)) {

2
app/src/main/java/ch/protonmail/android/mailbox/presentation/MailboxUiItem.kt
View File

@ -40,7 +40,5 @@ data class MessageData(
val isReplied: Boolean,
val isRepliedAll: Boolean,
val isForwarded: Boolean,
val isBeingSent: Boolean,
val isAttachmentsBeingUploaded: Boolean,
val isInline: Boolean
)

4
app/src/main/java/ch/protonmail/android/views/messagesList/MessagesListItemView.kt
View File

@ -112,7 +112,9 @@ class MessagesListItemView constructor(
mailboxUiItem: MailboxUiItem,
labels: List<Label>,
isMultiSelectionMode: Boolean,
mailboxLocation: Constants.MessageLocationType
mailboxLocation: Constants.MessageLocationType,
isBeingSent: Boolean,
isAttachmentsBeingUploaded: Boolean
) {
val readStatus = mailboxUiItem.isRead
val messageLocation = Constants.MessageLocationType.fromInt(mailboxUiItem.messageData?.location)

12
app/src/test/java/ch/protonmail/android/activities/MailboxViewModelTest.kt
View File

@ -138,8 +138,6 @@ class MailboxViewModelTest : CoroutinesTest {
isReplied = false,
isRepliedAll = false,
isForwarded = false,
isBeingSent = false,
isAttachmentsBeingUploaded = false,
isInline = false
)
)
@ -189,8 +187,6 @@ class MailboxViewModelTest : CoroutinesTest {
isReplied = false,
isRepliedAll = false,
isForwarded = false,
isBeingSent = false,
isAttachmentsBeingUploaded = false,
isInline = false
)
)
@ -237,8 +233,6 @@ class MailboxViewModelTest : CoroutinesTest {
isReplied = false,
isRepliedAll = false,
isForwarded = false,
isBeingSent = false,
isAttachmentsBeingUploaded = false,
isInline = false
)
)
@ -284,8 +278,6 @@ class MailboxViewModelTest : CoroutinesTest {
isReplied = false,
isRepliedAll = false,
isForwarded = false,
isBeingSent = false,
isAttachmentsBeingUploaded = false,
isInline = false
)
)
@ -314,8 +306,6 @@ class MailboxViewModelTest : CoroutinesTest {
isReplied = true
isRepliedAll = false
isForwarded = false
isBeingSent = false
isAttachmentsBeingUploaded = false
isInline = false
}
)
@ -348,8 +338,6 @@ class MailboxViewModelTest : CoroutinesTest {
isReplied = true,
isRepliedAll = false,
isForwarded = false,
isBeingSent = false,
isAttachmentsBeingUploaded = false,
isInline = false
)
)