MessagesListFragment. Restored swiping functionality.| #1806

Author: DenBond7

FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/MessagesListFragment.kt

@@ -581,7 +581,7 @@ class MessagesListFragment : BaseFragment<FragmentMessagesListBinding>(),
       ): Int {
         val position = viewHolder.bindingAdapterPosition
         return if (position != RecyclerView.NO_POSITION) {
-          val msgEntity: MessageEntity? = null//adapter.getMsgEntity(position)
+          val msgEntity: MessageEntity? = adapter.getMessageEntity(position)
           if (msgEntity?.msgState == MessageState.PENDING_ARCHIVING) {
             0
           } else
@@ -594,10 +594,10 @@ class MessagesListFragment : BaseFragment<FragmentMessagesListBinding>(),
       override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) {
         val position = viewHolder.bindingAdapterPosition
         if (position != RecyclerView.NO_POSITION) {
-          val item = adapter.getItemId(position)
+          val itemId = adapter.getMessageEntity(position)?.id ?: return
           currentFolder?.let {
             msgsViewModel.changeMsgsState(
-              listOf(element = item),
+              ids = listOf(itemId),
               localFolder = it,
               newMsgState = MessageState.PENDING_ARCHIVING,
               notifyMsgStatesListener = false
@@ -611,7 +611,12 @@ class MessagesListFragment : BaseFragment<FragmentMessagesListBinding>(),
             duration = Snackbar.LENGTH_LONG
           ) {
             currentFolder?.let {
-              msgsViewModel.changeMsgsState(listOf(item), it, MessageState.NONE, false)
+              msgsViewModel.changeMsgsState(
+                ids = listOf(itemId),
+                localFolder = it,
+                newMsgState = MessageState.NONE,
+                notifyMsgStatesListener = false
+              )
               //we should force archiving action because we can have other messages in the pending archiving states
               msgsViewModel.msgStatesLiveData.postValue(MessageState.PENDING_ARCHIVING)
             }
@@ -823,7 +828,7 @@ class MessagesListFragment : BaseFragment<FragmentMessagesListBinding>(),
 
   private fun setupMsgsViewModel() {
     msgsViewModel.msgsCountLiveData.observe(viewLifecycleOwner) {
-      if (it ?: 0 == 0) {
+      if ((it ?: 0) == 0) {
         showEmptyView()
       } else {
         showContent()

FlowCrypt/src/main/java/com/flowcrypt/email/ui/adapter/MsgsPagedListAdapter.kt

@@ -15,6 +15,7 @@ import android.text.style.ForegroundColorSpan
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.annotation.IntRange
 import androidx.core.content.ContextCompat
 import androidx.paging.PagingDataAdapter
 import androidx.recyclerview.selection.ItemDetailsLookup
@@ -60,6 +61,10 @@ class MsgsPagedListAdapter(
     )
   }
 
+  fun getMessageEntity(@IntRange(from = 0) position: Int): MessageEntity? {
+    return getItem(position)
+  }
+
   /**
    * Prepare a [Pattern] which will be used for finding some information in the sender name.
    * This pattern is case insensitive.