arno/etesync-android
1
0
Fork 0
mirror of https://github.com/etesync/android synced 2025-02-08 13:42:43 +00:00
Code Issues Releases Wiki Activity

Account activity: lock the cache when using it and cleanup color parsing

Browse Source
This commit is contained in:
Tom Hacohen 2020-08-26 08:20:39 +03:00
parent deb1bb831b
commit ea0f974086
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/src/main/java/com/etesync/syncadapter/ui/AccountActivity.kt
View File

@ -362,21 +362,24 @@ class AccountActivity : BaseActivity(), Toolbar.OnMenuItemClickListener, PopupMe
CollectionInfo.Type.TASKS -> ETEBASE_TYPE_TASKS CollectionInfo.Type.TASKS -> ETEBASE_TYPE_TASKS
} }
return etebaseLocalCache.collectionList(colMgr).map { synchronized(etebaseLocalCache) {
val meta = it.meta return etebaseLocalCache.collectionList(colMgr).map {
val meta = it.meta
if (strType != meta.collectionType) { if (strType != meta.collectionType) {
return@map null return@map null
} }
val accessLevel = it.col.accessLevel val accessLevel = it.col.accessLevel
val isReadOnly = accessLevel == "ro" val isReadOnly = accessLevel == "ro"
val isAdmin = accessLevel == "adm" val isAdmin = accessLevel == "adm"
val metaColor = meta.color val metaColor = meta.color
val color = if (metaColor != null && metaColor != "") parseColor(metaColor) else null val color = if (!metaColor.isNullOrBlank()) parseColor(metaColor) else null
CollectionListItemInfo(it.col.uid, type, meta.name, meta.description ?: "", color, isReadOnly, isAdmin, null) CollectionListItemInfo(it.col.uid, type, meta.name, meta.description
}.filterNotNull() ?: "", color, isReadOnly, isAdmin, null)
}.filterNotNull()
}
} }
override fun loadInBackground(): AccountInfo { override fun loadInBackground(): AccountInfo {