From ea0f97408614d4add5cfe7f6d62413b50cab185e Mon Sep 17 00:00:00 2001
From: Tom Hacohen <tom@stosb.com>
Date: Wed, 26 Aug 2020 08:20:39 +0300
Subject: [PATCH] Account activity: lock the cache when using it and cleanup
 color parsing

---
 .../etesync/syncadapter/ui/AccountActivity.kt | 27 ++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/com/etesync/syncadapter/ui/AccountActivity.kt b/app/src/main/java/com/etesync/syncadapter/ui/AccountActivity.kt
index 819dda45..9bf4d69e 100644
--- a/app/src/main/java/com/etesync/syncadapter/ui/AccountActivity.kt
+++ b/app/src/main/java/com/etesync/syncadapter/ui/AccountActivity.kt
@@ -362,21 +362,24 @@ class AccountActivity : BaseActivity(), Toolbar.OnMenuItemClickListener, PopupMe
                 CollectionInfo.Type.TASKS -> ETEBASE_TYPE_TASKS
             }
 
-            return etebaseLocalCache.collectionList(colMgr).map {
-                val meta = it.meta
+            synchronized(etebaseLocalCache) {
+                return etebaseLocalCache.collectionList(colMgr).map {
+                    val meta = it.meta
 
-                if (strType != meta.collectionType) {
-                    return@map null
-                }
+                    if (strType != meta.collectionType) {
+                        return@map null
+                    }
 
-                val accessLevel = it.col.accessLevel
-                val isReadOnly = accessLevel == "ro"
-                val isAdmin = accessLevel == "adm"
+                    val accessLevel = it.col.accessLevel
+                    val isReadOnly = accessLevel == "ro"
+                    val isAdmin = accessLevel == "adm"
 
-                val metaColor = meta.color
-                val color = if (metaColor != null && metaColor != "") parseColor(metaColor) else null
-                CollectionListItemInfo(it.col.uid, type, meta.name, meta.description ?: "", color, isReadOnly, isAdmin, null)
-            }.filterNotNull()
+                    val metaColor = meta.color
+                    val color = if (!metaColor.isNullOrBlank()) parseColor(metaColor) else null
+                    CollectionListItemInfo(it.col.uid, type, meta.name, meta.description
+                            ?: "", color, isReadOnly, isAdmin, null)
+                }.filterNotNull()
+            }
         }
 
         override fun loadInBackground(): AccountInfo {