DROID-2731 Vault | Tech | Persist vault settings (#1609)

core-models/src/main/java/com/anytypeio/anytype/core_models/settings/VaultSettings.kt

@@ -0,0 +1,7 @@
+package com.anytypeio.anytype.core_models.settings
+
+import com.anytypeio.anytype.core_models.Id
+
+data class VaultSettings(
+    val orderOfSpaces: List<Id> = emptyList()
+)

data/src/main/java/com/anytypeio/anytype/data/auth/repo/UserSettingsCache.kt

@@ -1,5 +1,6 @@
 package com.anytypeio.anytype.data.auth.repo
 
+import com.anytypeio.anytype.core_models.Account
 import com.anytypeio.anytype.core_models.GlobalSearchHistory
 import com.anytypeio.anytype.core_models.Id
 import com.anytypeio.anytype.core_models.ThemeMode
@@ -7,9 +8,15 @@ import com.anytypeio.anytype.core_models.Wallpaper
 import com.anytypeio.anytype.core_models.WidgetSession
 import com.anytypeio.anytype.core_models.primitives.SpaceId
 import com.anytypeio.anytype.core_models.primitives.TypeId
+import com.anytypeio.anytype.core_models.settings.VaultSettings
 import kotlinx.coroutines.flow.Flow
 
 interface UserSettingsCache {
+
+    suspend fun getVaultSettings(account: Account): VaultSettings
+    suspend fun observeVaultSettings(account: Account): Flow<VaultSettings>
+    suspend fun setVaultSpaceOrder(account: Account, order: List<Id>)
+
     suspend fun setCurrentSpace(space: SpaceId)
     suspend fun getCurrentSpace(): SpaceId?
     suspend fun clearCurrentSpace()

data/src/main/java/com/anytypeio/anytype/data/auth/repo/UserSettingsDataRepository.kt

@@ -1,5 +1,6 @@
 package com.anytypeio.anytype.data.auth.repo
 
+import com.anytypeio.anytype.core_models.Account
 import com.anytypeio.anytype.core_models.GlobalSearchHistory
 import com.anytypeio.anytype.core_models.Id
 import com.anytypeio.anytype.core_models.ThemeMode
@@ -7,6 +8,7 @@ import com.anytypeio.anytype.core_models.Wallpaper
 import com.anytypeio.anytype.core_models.WidgetSession
 import com.anytypeio.anytype.core_models.primitives.SpaceId
 import com.anytypeio.anytype.core_models.primitives.TypeId
+import com.anytypeio.anytype.core_models.settings.VaultSettings
 import com.anytypeio.anytype.domain.config.UserSettingsRepository
 import kotlinx.coroutines.flow.Flow
 
@@ -88,4 +90,19 @@ class UserSettingsDataRepository(private val cache: UserSettingsCache) : UserSet
     override suspend fun clearGlobalSearchHistory(space: SpaceId) {
         cache.clearGlobalSearchHistory(space)
     }
+
+    override suspend fun getVaultSettings(account: Account): VaultSettings {
+        return cache.getVaultSettings(account)
+    }
+
+    override suspend fun observeVaultSettings(account: Account): Flow<VaultSettings> {
+        return cache.observeVaultSettings(account)
+    }
+
+    override suspend fun setVaultSpaceOrder(account: Account, order: List<Id>) {
+        cache.setVaultSpaceOrder(
+            account = account,
+            order = order
+        )
+    }
 }

domain/src/main/java/com/anytypeio/anytype/domain/config/UserSettingsRepository.kt

@@ -1,16 +1,22 @@
 package com.anytypeio.anytype.domain.config
 
-import com.anytypeio.anytype.core_models.Id
+import com.anytypeio.anytype.core_models.Account
 import com.anytypeio.anytype.core_models.GlobalSearchHistory
+import com.anytypeio.anytype.core_models.Id
 import com.anytypeio.anytype.core_models.ThemeMode
 import com.anytypeio.anytype.core_models.Wallpaper
 import com.anytypeio.anytype.core_models.WidgetSession
 import com.anytypeio.anytype.core_models.primitives.SpaceId
 import com.anytypeio.anytype.core_models.primitives.TypeId
+import com.anytypeio.anytype.core_models.settings.VaultSettings
 import kotlinx.coroutines.flow.Flow
 
 interface UserSettingsRepository {
 
+    suspend fun getVaultSettings(account: Account): VaultSettings
+    suspend fun observeVaultSettings(account: Account): Flow<VaultSettings>
+    suspend fun setVaultSpaceOrder(account: Account, order: List<Id>)
+
     suspend fun setCurrentSpace(space: SpaceId)
     suspend fun getCurrentSpace(): SpaceId?
     suspend fun clearCurrentSpace()

persistence/src/main/java/com/anytypeio/anytype/persistence/preferences/Preferences.kt

@@ -2,6 +2,7 @@ package com.anytypeio.anytype.persistence.preferences
 
 import androidx.datastore.core.Serializer
 import com.anytypeio.anytype.persistence.SpacePreferences
+import com.anytypeio.anytype.persistence.VaultPreferences
 import java.io.InputStream
 import java.io.OutputStream
 
@@ -20,4 +21,22 @@ object SpacePrefSerializer : Serializer<SpacePreferences> {
     }
 }
 
-const val SPACE_PREFERENCE_FILENAME = "space-preferences.pb"
+object VaultPrefsSerializer : Serializer<VaultPreferences> {
+    override val defaultValue: VaultPreferences = VaultPreferences(
+        preferences = emptyMap()
+    )
+
+    override suspend fun readFrom(input: InputStream): VaultPreferences {
+        return VaultPreferences.ADAPTER.decode(input)
+    }
+
+    override suspend fun writeTo(t: VaultPreferences, output: OutputStream) {
+        VaultPreferences.ADAPTER.encode(
+            stream = output,
+            value = t
+        )
+    }
+}
+
+const val SPACE_PREFERENCE_FILENAME = "space-preferences.pb"
+const val VAULT_PREFERENCE_FILENAME = "vault-preferences.pb"

persistence/src/main/java/com/anytypeio/anytype/persistence/repo/DefaultUserSettingsCache.kt

@@ -4,6 +4,7 @@ import android.content.Context
 import android.content.SharedPreferences
 import androidx.datastore.core.DataStore
 import androidx.datastore.dataStore
+import com.anytypeio.anytype.core_models.Account
 import com.anytypeio.anytype.core_models.GlobalSearchHistory
 import com.anytypeio.anytype.core_models.Id
 import com.anytypeio.anytype.core_models.NO_VALUE
@@ -12,10 +13,13 @@ import com.anytypeio.anytype.core_models.Wallpaper
 import com.anytypeio.anytype.core_models.WidgetSession
 import com.anytypeio.anytype.core_models.primitives.SpaceId
 import com.anytypeio.anytype.core_models.primitives.TypeId
+import com.anytypeio.anytype.core_models.settings.VaultSettings
 import com.anytypeio.anytype.data.auth.repo.UserSettingsCache
 import com.anytypeio.anytype.persistence.GlobalSearchHistoryProto
 import com.anytypeio.anytype.persistence.SpacePreference
 import com.anytypeio.anytype.persistence.SpacePreferences
+import com.anytypeio.anytype.persistence.VaultPreference
+import com.anytypeio.anytype.persistence.VaultPreferences
 import com.anytypeio.anytype.persistence.common.JsonString
 import com.anytypeio.anytype.persistence.common.deserializeWallpaperSettings
 import com.anytypeio.anytype.persistence.common.serializeWallpaperSettings
@@ -25,6 +29,8 @@ import com.anytypeio.anytype.persistence.model.asSettings
 import com.anytypeio.anytype.persistence.model.asWallpaper
 import com.anytypeio.anytype.persistence.preferences.SPACE_PREFERENCE_FILENAME
 import com.anytypeio.anytype.persistence.preferences.SpacePrefSerializer
+import com.anytypeio.anytype.persistence.preferences.VAULT_PREFERENCE_FILENAME
+import com.anytypeio.anytype.persistence.preferences.VaultPrefsSerializer
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.map
@@ -39,6 +45,11 @@ class DefaultUserSettingsCache(
         serializer = SpacePrefSerializer
     )
 
+    private val Context.vaultPrefsStore: DataStore<VaultPreferences> by dataStore(
+        fileName = VAULT_PREFERENCE_FILENAME,
+        serializer = VaultPrefsSerializer
+    )
+
     override suspend fun setCurrentSpace(space: SpaceId) {
         prefs.edit()
             .putString(CURRENT_SPACE_KEY, space.id)
@@ -380,6 +391,49 @@ class DefaultUserSettingsCache(
         }
     }
 
+    override suspend fun getVaultSettings(account: Account): VaultSettings {
+        return context.vaultPrefsStore
+            .data
+            .map { prefs ->
+                VaultSettings(
+                    orderOfSpaces = prefs.preferences.getOrDefault(
+                        key = account.id,
+                        defaultValue = VaultPreference()
+                    ).orderOfSpaces
+                )
+            }
+            .first()
+    }
+
+    override suspend fun observeVaultSettings(account: Account): Flow<VaultSettings> {
+        return context.vaultPrefsStore
+            .data
+            .map { prefs ->
+                VaultSettings(
+                    orderOfSpaces = prefs.preferences.getOrDefault(
+                        key = account.id,
+                        defaultValue = VaultPreference()
+                    ).orderOfSpaces
+                )
+            }
+    }
+
+    override suspend fun setVaultSpaceOrder(account: Account, order: List<Id>) {
+        context.vaultPrefsStore.updateData { existingPreferences ->
+            val curr = existingPreferences.preferences.getOrDefault(
+                key = account.id,
+                defaultValue = VaultPreference()
+            )
+            existingPreferences.copy(
+                preferences = existingPreferences.preferences + mapOf(
+                    account.id to curr.copy(
+                        orderOfSpaces = order
+                    )
+                )
+            )
+        }
+    }
+
     companion object {
         const val CURRENT_SPACE_KEY = "prefs.user_settings.current_space"
         const val DEFAULT_OBJECT_TYPE_ID_KEY = "prefs.user_settings.default_object_type.id"

persistence/src/main/proto/preferences.proto

@@ -8,6 +8,15 @@ message SpacePreferences {
   map <string, SpacePreference> preferences = 1;
 }
 
+message VaultPreferences {
+  // maps account id to vault preference
+  map <string, VaultPreference> preferences = 1;
+}
+
+message VaultPreference {
+  repeated string orderOfSpaces = 1;
+}
+
 message SpacePreference {
   optional string defaultObjectTypeKey = 1;
   repeated string pinnedObjectTypeIds = 2;