Skip to content
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

Open general settings performance #8086

Merged
merged 2 commits into from
Feb 7, 2023
Merged

Open general settings performance #8086

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa47c4b
Ensure storage is computed in background, to not block display of gen…
bmarty Feb 7, 2023
ae2fbf1
Changelog
bmarty Feb 7, 2023
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
1 change: 1 addition & 0 deletions changelog.d/5918.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
If media cache is large, Settings > General takes a long time to open
2 changes: 2 additions & 0 deletions vector/src/main/java/im/vector/app/core/utils/FileUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package im.vector.app.core.utils

import android.content.Context
import androidx.annotation.WorkerThread
import timber.log.Timber
import java.io.File
import java.util.Locale
Expand Down Expand Up @@ -125,6 +126,7 @@ fun getFileExtension(fileUri: String): String? {
* Size
* ========================================================================================== */

@WorkerThread
fun getSizeOfFiles(root: File): Long {
return root.walkTopDown()
.onEnter {
Expand Down
50 changes: 23 additions & 27 deletions vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,37 +250,28 @@ class VectorSettingsGeneralFragment :

// clear medias cache
findPreference<VectorPreference>(VectorPreferences.SETTINGS_CLEAR_MEDIA_CACHE_PREFERENCE_KEY)!!.let {
val size = getSizeOfFiles(File(requireContext().cacheDir, DiskCache.Factory.DEFAULT_DISK_CACHE_DIR)) + session.fileService().getCacheSize()

it.summary = TextUtils.formatFileSize(requireContext(), size.toLong())

it.onPreferenceClickListener = Preference.OnPreferenceClickListener {
lifecycleScope.launch(Dispatchers.Main) {
// On UI Thread
displayLoadingView()

Glide.get(requireContext()).clearMemory()
session.fileService().clearCache()

var newSize: Long

withContext(Dispatchers.IO) {
// On BG thread
Glide.get(requireContext()).clearDiskCache()

newSize = getSizeOfFiles(File(requireContext().cacheDir, DiskCache.Factory.DEFAULT_DISK_CACHE_DIR))
newSize += session.fileService().getCacheSize()
lifecycleScope.launch(Dispatchers.Main) {
it.summary = getString(R.string.loading)
val size = getCacheSize()
BillCarsonFr marked this conversation as resolved.
Show resolved Hide resolved
it.summary = TextUtils.formatFileSize(requireContext(), size)
it.onPreferenceClickListener = Preference.OnPreferenceClickListener {
lifecycleScope.launch(Dispatchers.Main) {
// On UI Thread
displayLoadingView()
Glide.get(requireContext()).clearMemory()
session.fileService().clearCache()
val newSize = withContext(Dispatchers.IO) {
// On BG thread
Glide.get(requireContext()).clearDiskCache()
getCacheSize()
}
it.summary = TextUtils.formatFileSize(requireContext(), newSize)
hideLoadingView()
}

it.summary = TextUtils.formatFileSize(requireContext(), newSize)

hideLoadingView()
false
}

false
}
}

// Sign out
findPreference<VectorPreference>("SETTINGS_SIGN_OUT_KEY")!!
.onPreferenceClickListener = Preference.OnPreferenceClickListener {
Expand All @@ -292,6 +283,11 @@ class VectorSettingsGeneralFragment :
}
}

private suspend fun getCacheSize(): Long = withContext(Dispatchers.IO) {
getSizeOfFiles(File(requireContext().cacheDir, DiskCache.Factory.DEFAULT_DISK_CACHE_DIR)) +
session.fileService().getCacheSize()
}

override fun onResume() {
super.onResume()
// Refresh identity server summary
Expand Down