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

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

@@ -362,6 +362,7 @@ class AccountActivity : BaseActivity(), Toolbar.OnMenuItemClickListener, PopupMe
                 CollectionInfo.Type.TASKS -> ETEBASE_TYPE_TASKS
             }
 
+            synchronized(etebaseLocalCache) {
                 return etebaseLocalCache.collectionList(colMgr).map {
                     val meta = it.meta
 
@@ -374,10 +375,12 @@ class AccountActivity : BaseActivity(), Toolbar.OnMenuItemClickListener, PopupMe
                     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)
+                    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 {
             val info = AccountInfo()