Skip to content

teams: smoother voices set data splitting (fixes #13086) #13019

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dogi merged 3 commits into from
Apr 22, 2026
Merged

teams: smoother voices set data splitting (fixes #13086) #13019

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3983bb5
refactor: extract setData logic into smaller helper functions in Voic…
dogi Apr 16, 2026
bfc9435
Update build.gradle
dogi Apr 22, 2026
61f15b7
Merge branch 'master' into code-health-refactor-voices-setData-138560…
dogi Apr 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ android {
applicationId "org.ole.planet.myplanet"
minSdk = 26
targetSdk = 36
versionCode = 5360
versionName = "0.53.60"
versionCode = 5361
versionName = "0.53.61"
ndkVersion = '26.3.11579264'
vectorDrawables.useSupportLibrary = true
}
Expand Down
194 changes: 103 additions & 91 deletions app/src/main/java/org/ole/planet/myplanet/ui/voices/VoicesFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,102 +177,114 @@ class VoicesFragment : BaseVoicesFragment() {

if (binding.rvNews.adapter == null) {
changeLayoutManager(resources.configuration.orientation, binding.rvNews)
val resourceIds = mutableSetOf<String>()
list.forEach { news ->
if ((news?.imagesArray?.size() ?: 0) > 0) {
val ob = news?.imagesArray?.get(0)?.asJsonObject
val resourceId = getString("resourceId", ob?.asJsonObject)
if (!resourceId.isNullOrBlank()) {
resourceIds.add(resourceId)
}
}
}
viewLifecycleOwner.lifecycleScope.launch {
if (resourceIds.isNotEmpty()) {
val libraries = resourcesRepository.getLibraryItemsByIds(resourceIds)
resourcesRepository.downloadResources(libraries)
downloadResourcesForNews(list)
val sortedList = sortNews(list)
setupVoicesAdapter(sortedList)
} else {
(binding.rvNews.adapter as? VoicesAdapter)?.submitList(list)
}
adapterNews?.let { showNoData(binding.tvMessage, it.itemCount, currentEmptyStateSource) }
}

private fun downloadResourcesForNews(list: List<RealmNews?>) {
val resourceIds = mutableSetOf<String>()
list.forEach { news ->
if ((news?.imagesArray?.size() ?: 0) > 0) {
val ob = news?.imagesArray?.get(0)?.asJsonObject
val resourceId = getString("resourceId", ob?.asJsonObject)
if (!resourceId.isNullOrBlank()) {
resourceIds.add(resourceId)
}
}
val updatedListAsMutable: MutableList<RealmNews?> = list.toMutableList()
Trace.beginSection("VoicesFragment.sort")
val sortedList = try {
updatedListAsMutable.sortedWith(compareByDescending { news ->
news?.sortDate ?: 0L
})
} finally {
Trace.endSection()
}
viewLifecycleOwner.lifecycleScope.launch {
if (resourceIds.isNotEmpty()) {
val libraries = resourcesRepository.getLibraryItemsByIds(resourceIds)
resourcesRepository.downloadResources(libraries)
}
val labelManager = VoicesLabelManager(requireActivity(), voicesRepository, viewLifecycleOwner.lifecycleScope)
adapterNews = VoicesAdapter(
context = requireActivity(),
currentUser = user,
parentNews = null,
teamName = "",
teamId = null,
userSessionManager = userSessionManager,
isTeamLeaderFn = { onResult ->
val job = viewLifecycleOwner.lifecycleScope.launch {
onResult(false)
}
return@VoicesAdapter { job.cancel() }
},
getUserFn = { userId, onResult ->
val job = viewLifecycleOwner.lifecycleScope.launch(Dispatchers.IO) {
val result = userRepository.getUserById(userId)
withContext(Dispatchers.Main) { onResult(result) }
}
return@VoicesAdapter { job.cancel() }
},
getReplyCountFn = { newsId, onResult ->
val job = viewLifecycleOwner.lifecycleScope.launch(Dispatchers.IO) {
try {
val result = voicesRepository.getReplyCount(newsId)
withContext(Dispatchers.Main) { onResult(result) }
} catch (e: Exception) {
e.printStackTrace()
}
}
return@VoicesAdapter { job.cancel() }
},
deletePostFn = { newsId, onComplete ->
val job = viewLifecycleOwner.lifecycleScope.launch(Dispatchers.IO) {
voicesRepository.deletePost(newsId, "")
withContext(Dispatchers.Main) { onComplete() }
}
return@VoicesAdapter { job.cancel() }
},
shareNewsFn = { newsId, userId, planetCode, parentCode, teamName, onResult ->
val job = viewLifecycleOwner.lifecycleScope.launch(Dispatchers.IO) {
val result = voicesRepository.shareNewsToCommunity(newsId, userId, planetCode, parentCode, teamName)
withContext(Dispatchers.Main) { onResult(result) }
}
return@VoicesAdapter { job.cancel() }
},
getLibraryResourceFn = { resourceId, onResult ->
val job = viewLifecycleOwner.lifecycleScope.launch(Dispatchers.IO) {
val result = voicesRepository.getLibraryResource(resourceId)
}
}

private fun sortNews(list: List<RealmNews?>): List<RealmNews?> {
val updatedListAsMutable: MutableList<RealmNews?> = list.toMutableList()
Trace.beginSection("VoicesFragment.sort")
return try {
updatedListAsMutable.sortedWith(compareByDescending { news ->
news?.sortDate ?: 0L
})
} finally {
Trace.endSection()
}
}

private fun setupVoicesAdapter(sortedList: List<RealmNews?>) {
val labelManager = VoicesLabelManager(requireActivity(), voicesRepository, viewLifecycleOwner.lifecycleScope)
adapterNews = VoicesAdapter(
context = requireActivity(),
currentUser = user,
parentNews = null,
teamName = "",
teamId = null,
userSessionManager = userSessionManager,
isTeamLeaderFn = { onResult ->
val job = viewLifecycleOwner.lifecycleScope.launch {
onResult(false)
}
return@VoicesAdapter { job.cancel() }
},
getUserFn = { userId, onResult ->
val job = viewLifecycleOwner.lifecycleScope.launch(Dispatchers.IO) {
val result = userRepository.getUserById(userId)
withContext(Dispatchers.Main) { onResult(result) }
}
return@VoicesAdapter { job.cancel() }
},
getReplyCountFn = { newsId, onResult ->
val job = viewLifecycleOwner.lifecycleScope.launch(Dispatchers.IO) {
try {
val result = voicesRepository.getReplyCount(newsId)
withContext(Dispatchers.Main) { onResult(result) }
} catch (e: Exception) {
e.printStackTrace()
}
return@VoicesAdapter { job.cancel() }
},
launchCoroutine = { action ->
val job = viewLifecycleOwner.lifecycleScope.launch { action() }
return@VoicesAdapter { job.cancel() }
},
labelManager = labelManager,
voicesRepository = voicesRepository,
userRepository = userRepository
)
adapterNews?.sharedPrefManager = sharedPrefManager
adapterNews?.setFromLogin(requireArguments().getBoolean("fromLogin"))
adapterNews?.setListener(this)
adapterNews?.registerAdapterDataObserver(observer)
adapterNews?.submitList(sortedList)
binding.rvNews.adapter = adapterNews
} else {
(binding.rvNews.adapter as? VoicesAdapter)?.submitList(list)
}
adapterNews?.let { showNoData(binding.tvMessage, it.itemCount, currentEmptyStateSource) }
}
return@VoicesAdapter { job.cancel() }
},
deletePostFn = { newsId, onComplete ->
val job = viewLifecycleOwner.lifecycleScope.launch(Dispatchers.IO) {
voicesRepository.deletePost(newsId, "")
withContext(Dispatchers.Main) { onComplete() }
}
return@VoicesAdapter { job.cancel() }
},
shareNewsFn = { newsId, userId, planetCode, parentCode, teamName, onResult ->
val job = viewLifecycleOwner.lifecycleScope.launch(Dispatchers.IO) {
val result = voicesRepository.shareNewsToCommunity(newsId, userId, planetCode, parentCode, teamName)
withContext(Dispatchers.Main) { onResult(result) }
}
return@VoicesAdapter { job.cancel() }
},
getLibraryResourceFn = { resourceId, onResult ->
val job = viewLifecycleOwner.lifecycleScope.launch(Dispatchers.IO) {
val result = voicesRepository.getLibraryResource(resourceId)
withContext(Dispatchers.Main) { onResult(result) }
}
return@VoicesAdapter { job.cancel() }
},
launchCoroutine = { action ->
val job = viewLifecycleOwner.lifecycleScope.launch { action() }
return@VoicesAdapter { job.cancel() }
},
labelManager = labelManager,
voicesRepository = voicesRepository,
userRepository = userRepository
)
adapterNews?.sharedPrefManager = sharedPrefManager
adapterNews?.setFromLogin(requireArguments().getBoolean("fromLogin"))
adapterNews?.setListener(this)
adapterNews?.registerAdapterDataObserver(observer)
adapterNews?.submitList(sortedList)
binding.rvNews.adapter = adapterNews
Copy link
Copy Markdown

@qltysh qltysh Bot Apr 16, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Function with many returns (count = 7): setupVoicesAdapter [qlty:return-statements]

}

override fun onNewsItemClick(news: RealmNews?) {
Expand Down
Loading