Merge pull request #191 from AlbertoPellitteri/master

Mark as unread chats from the main messages cab
This commit is contained in:
Tibor Kaputa 2021-09-08 15:06:21 +02:00 committed by GitHub
commit 857c9d8735
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 0 deletions

View File

@ -23,8 +23,10 @@ import com.simplemobiletools.commons.views.MyRecyclerView
import com.simplemobiletools.smsmessenger.R import com.simplemobiletools.smsmessenger.R
import com.simplemobiletools.smsmessenger.activities.SimpleActivity import com.simplemobiletools.smsmessenger.activities.SimpleActivity
import com.simplemobiletools.smsmessenger.extensions.deleteConversation import com.simplemobiletools.smsmessenger.extensions.deleteConversation
import com.simplemobiletools.smsmessenger.extensions.markThreadMessagesUnread
import com.simplemobiletools.smsmessenger.helpers.refreshMessages import com.simplemobiletools.smsmessenger.helpers.refreshMessages
import com.simplemobiletools.smsmessenger.models.Conversation import com.simplemobiletools.smsmessenger.models.Conversation
import com.simplemobiletools.smsmessenger.models.Events
import kotlinx.android.synthetic.main.item_conversation.view.* import kotlinx.android.synthetic.main.item_conversation.view.*
class ConversationsAdapter( class ConversationsAdapter(
@ -60,6 +62,7 @@ class ConversationsAdapter(
R.id.cab_copy_number -> copyNumberToClipboard() R.id.cab_copy_number -> copyNumberToClipboard()
R.id.cab_delete -> askConfirmDelete() R.id.cab_delete -> askConfirmDelete()
R.id.cab_select_all -> selectAll() R.id.cab_select_all -> selectAll()
R.id.cab_mark_as_unread -> markAsUnread()
} }
} }
@ -184,6 +187,23 @@ class ConversationsAdapter(
} }
} }
private fun markAsUnread() {
if (selectedKeys.isEmpty()) {
return
}
val conversationsMarkedAsUnread = conversations.filter { selectedKeys.contains(it.hashCode()) } as ArrayList<Conversation>
ensureBackgroundThread {
conversationsMarkedAsUnread.filter { conversation -> conversation.read }.forEach {
activity.markThreadMessagesUnread(it.threadId)
}
activity.runOnUiThread {
refreshMessages()
finishActMode()
}
}
}
private fun addNumberToContact() { private fun addNumberToContact() {
val conversation = getSelectedItems().firstOrNull() ?: return val conversation = getSelectedItems().firstOrNull() ?: return
Intent().apply { Intent().apply {

View File

@ -25,6 +25,10 @@
android:id="@+id/cab_copy_number" android:id="@+id/cab_copy_number"
android:title="@string/copy_number_to_clipboard" android:title="@string/copy_number_to_clipboard"
app:showAsAction="never" /> app:showAsAction="never" />
<item
android:id="@+id/cab_mark_as_unread"
android:title="@string/mark_as_unread"
app:showAsAction="never" />
<item <item
android:id="@+id/cab_select_all" android:id="@+id/cab_select_all"
android:title="@string/select_all" android:title="@string/select_all"