TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-04-07 18:14:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify HomeActivity

Browse Source
This commit is contained in:
Andrew 2024-05-07 10:58:41 +09:30
parent 0c0fa9ead3
commit afd240dcce
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt
View File

@ -300,9 +300,8 @@ class HomeActivity : PassphraseRequiredActionBarActivity(),
} }
val unreadThreadMap = result.messages val unreadThreadMap = result.messages
.groupBy { it.threadId }.keys .map { it.threadId }.toSet()
.map { it to mmsSmsDatabase.getUnreadCount(it) } .associateWith { mmsSmsDatabase.getUnreadCount(it) }
.toMap()
val messageResults: MutableList<GlobalSearchAdapter.Model> = result.messages val messageResults: MutableList<GlobalSearchAdapter.Model> = result.messages
.map { messageResult -> .map { messageResult ->
@ -330,11 +329,9 @@ class HomeActivity : PassphraseRequiredActionBarActivity(),
.request(Manifest.permission.POST_NOTIFICATIONS) .request(Manifest.permission.POST_NOTIFICATIONS)
.execute() .execute()
} }
configFactory.user?.let { user -> configFactory.user
if (!user.isBlockCommunityMessageRequestsSet()) { ?.takeUnless { it.isBlockCommunityMessageRequestsSet() }
user.setCommunityMessageRequests(false) ?.setCommunityMessageRequests(false)
}
}
} }
} }
@ -441,7 +438,7 @@ class HomeActivity : PassphraseRequiredActionBarActivity(),
Locale.getDefault(), Locale.getDefault(),
threadDb.latestUnapprovedConversationTimestamp threadDb.latestUnapprovedConversationTimestamp
) )
root.setOnClickListener { showMessageRequests() } root.setOnClickListener { push<MessageRequestsActivity>() }
root.setOnLongClickListener { hideMessageRequests(); true } root.setOnLongClickListener { hideMessageRequests(); true }
root.layoutParams = RecyclerView.LayoutParams(RecyclerView.LayoutParams.MATCH_PARENT, RecyclerView.LayoutParams.WRAP_CONTENT) root.layoutParams = RecyclerView.LayoutParams(RecyclerView.LayoutParams.MATCH_PARENT, RecyclerView.LayoutParams.WRAP_CONTENT)
val hadHeader = homeAdapter.hasHeaderView() val hadHeader = homeAdapter.hasHeaderView()
@ -770,11 +767,6 @@ class HomeActivity : PassphraseRequiredActionBarActivity(),
show(intent, isForResult = true) show(intent, isForResult = true)
} }
private fun showMessageRequests() {
val intent = Intent(this, MessageRequestsActivity::class.java)
push(intent)
}
private fun hideMessageRequests() { private fun hideMessageRequests() {
showSessionDialog { showSessionDialog {
text(getString(R.string.hide_message_requests)) text(getString(R.string.hide_message_requests))